From c9ec730ac1847d9e61bbba417ac702a659bea91d Mon Sep 17 00:00:00 2001 From: snoweay Date: Sat, 17 Dec 2022 10:05:25 +0000 Subject: [PATCH] check release of source pkg & debuginfo pkg Signed-off-by: snoweay --- syscare.spec | 6 ++-- v1.0.0-4.patch => v1.0.0-5.patch | 59 ++++++++++++++++++++++++++------ 2 files changed, 53 insertions(+), 12 deletions(-) rename v1.0.0-4.patch => v1.0.0-5.patch (89%) diff --git a/syscare.spec b/syscare.spec index 48977fc..404c507 100644 --- a/syscare.spec +++ b/syscare.spec @@ -2,13 +2,13 @@ Name: syscare Version: 1.0.0 -Release: 4 +Release: 5 Summary: system hot-fix service License: MulanPSL-2.0 GPL-2.0-only URL: https://gitee.com/openeuler/syscare Source0: %{name}-%{version}.tar.gz -Patch1: v1.0.0-4.patch +Patch1: v1.0.0-5.patch BuildRequires: rust cargo gcc gcc-g++ cmake make BuildRequires: elfutils-libelf-devel @@ -107,6 +107,8 @@ depmod -a > /dev/null 2>&1 || true %endif %changelog +* Sat Dec 17 2022 snoweay - 1.0.0-5 +- Check version-release of source pkg & debuginfo pkg. * Fri Dec 16 2022 snoweay - 1.0.0-4 - Avoid duplicate elfs by not following symlinks at build. * Thu Dec 15 2022 snoweay - 1.0.0-3 diff --git a/v1.0.0-4.patch b/v1.0.0-5.patch similarity index 89% rename from v1.0.0-4.patch rename to v1.0.0-5.patch index 749625f..1536a39 100644 --- a/v1.0.0-4.patch +++ b/v1.0.0-5.patch @@ -1,7 +1,7 @@ From 81008c77dba79eb311ad537051086f10ba1ccd22 Mon Sep 17 00:00:00 2001 From: Longjun Luo Date: Tue, 13 Dec 2022 16:08:45 +0800 -Subject: [PATCH 01/10] kmod: make it normal when using hack-gcc without env +Subject: [PATCH 01/11] kmod: make it normal when using hack-gcc without env Signed-off-by: Longjun Luo --- @@ -30,7 +30,7 @@ index 87cdc3e..9f45cb7 100755 From 024e9cd683055ca1702710a60d9c8abebfdbcbb3 Mon Sep 17 00:00:00 2001 From: snoweay Date: Wed, 14 Dec 2022 01:37:26 +0000 -Subject: [PATCH 02/10] manager: Allow apply to actived kernel patch +Subject: [PATCH 02/11] manager: Allow apply to actived kernel patch Signed-off-by: snoweay --- @@ -57,7 +57,7 @@ index 6e6c86a..8ee3bd0 100755 From 5874b79701fe7854575f710277f241a63a50afeb Mon Sep 17 00:00:00 2001 From: renoseven Date: Wed, 14 Dec 2022 03:34:01 +0800 -Subject: [PATCH 03/10] build: only 'NOT-APPLIED' patch package can be removed +Subject: [PATCH 03/11] build: only 'NOT-APPLIED' patch package can be removed Signed-off-by: renoseven --- @@ -86,7 +86,7 @@ index 9781eb1..917e12e 100644 From 1506b703935004b04fbf73f8875f33b5a8b8fe87 Mon Sep 17 00:00:00 2001 From: renoseven Date: Wed, 14 Dec 2022 23:50:03 +0800 -Subject: [PATCH 04/10] build: fix 'kernel patch cannot be insmod during system +Subject: [PATCH 04/11] build: fix 'kernel patch cannot be insmod during system start' issue 1. change ko file(s) security context type to 'modules_object_t' after @@ -119,7 +119,7 @@ index 917e12e..f76e109 100644 From dc73e5833888096518321e6ba15503d9806199fb Mon Sep 17 00:00:00 2001 From: Longjun Luo Date: Wed, 14 Dec 2022 12:43:46 +0800 -Subject: [PATCH 05/10] kmod: adjust order of the misc device (un)register +Subject: [PATCH 05/11] kmod: adjust order of the misc device (un)register After all init finished, then provides the device for users. @@ -186,7 +186,7 @@ index c96836b..d1328aa 100644 From d54264a83c2cc997ebaba0be8c32fc90682a9c04 Mon Sep 17 00:00:00 2001 From: lzwycc Date: Wed, 14 Dec 2022 19:44:23 +0800 -Subject: [PATCH 06/10] kmod: unregister when rmmod upatch +Subject: [PATCH 06/11] kmod: unregister when rmmod upatch unregister compiler and assembler when rmmod upatch @@ -327,7 +327,7 @@ index 9f45cb7..899b83f 100755 From 8b8a62377a425c273c2a584ff9f299f88b70f0e5 Mon Sep 17 00:00:00 2001 From: snoweay Date: Thu, 15 Dec 2022 18:34:53 +0800 -Subject: [PATCH 07/10] Revert "build: fix 'kernel patch cannot be insmod +Subject: [PATCH 07/11] Revert "build: fix 'kernel patch cannot be insmod during system start' issue" This reverts commit 1506b703935004b04fbf73f8875f33b5a8b8fe87. @@ -357,7 +357,7 @@ index f76e109..917e12e 100644 From 5171debddcbd632cb25c30d2325f0a655945c0f2 Mon Sep 17 00:00:00 2001 From: snoweay Date: Thu, 15 Dec 2022 18:37:42 +0800 -Subject: [PATCH 08/10] manager: Set kpatch's scontext to modules_object_t +Subject: [PATCH 08/11] manager: Set kpatch's scontext to modules_object_t Signed-off-by: snoweay --- @@ -425,7 +425,7 @@ index 8ee3bd0..c056f62 100755 From d8ef956b6e5ee05e95c757fe79a1bde58908efb4 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 16 Dec 2022 19:37:53 +0800 -Subject: [PATCH 09/10] upatch: file searching would not follow symlinks +Subject: [PATCH 09/11] upatch: file searching would not follow symlinks Signed-off-by: renoseven --- @@ -483,7 +483,7 @@ index 17fd307..9f15dc2 100644 From 7c61c25746a4f9ef82b3383d093123da7888c532 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 16 Dec 2022 19:42:42 +0800 -Subject: [PATCH 10/10] build: file searching would not follow symlinks +Subject: [PATCH 10/11] build: file searching would not follow symlinks Signed-off-by: renoseven --- @@ -537,3 +537,42 @@ index 8ac2e9e..3343256 100644 -- 2.33.0 + +From 641b7a2cc731cf3a1fe4874ed5cfc51f328b764e Mon Sep 17 00:00:00 2001 +From: renoseven +Date: Sat, 17 Dec 2022 11:51:31 +0800 +Subject: [PATCH 11/11] build: match release of source pkg & debuginfo pkg + +Signed-off-by: renoseven +--- + build/src/cli/cli.rs | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/build/src/cli/cli.rs b/build/src/cli/cli.rs +index 79dec44..a8980c2 100644 +--- a/build/src/cli/cli.rs ++++ b/build/src/cli/cli.rs +@@ -129,17 +129,14 @@ impl PatchBuildCLI { + info!("{}", dbg_pkg_info); + info!("------------------------------\n"); + +- let src_pkg_name = src_pkg_info.get_name(); +- let src_pkg_ver = src_pkg_info.get_version(); +- let dbg_pkg_name = dbg_pkg_info.get_name(); +- let dbg_pkg_ver = dbg_pkg_info.get_version(); +- if !dbg_pkg_name.contains(src_pkg_name) || (src_pkg_ver != dbg_pkg_ver) { ++ if !dbg_pkg_info.get_name().contains(src_pkg_info.get_name()) || ++ (src_pkg_info.get_version() != dbg_pkg_info.get_version()) || ++ (src_pkg_info.get_release() != dbg_pkg_info.get_release()) { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + format!("Debuginfo package does not match the source package"), + )); + } +- + Ok(src_pkg_info) + } + +-- +2.33.0 + -- Gitee