From df8a1eb479170277de354b73af31601eb6f583be Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 22 Jun 2023 16:35:51 +0200 Subject: *.patch: fix malformed Upstream-Status and SOB lines * as reported by openembedded-core/scripts/contrib/patchreview.py -v . Malformed Signed-off-by 'Signed-Off-By:' (./recipes-mac/AppArmor/files/crosscompile_perl_bindings.patch) Malformed Signed-off-by 'Signed-Off-By:' (./recipes-mac/AppArmor/files/disable_perl_h_check.patch) Missing Upstream-Status tag (./recipes-compliance/scap-security-guide/files/0001-standard.profile-expand-checks.patch) Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-ids/samhain/files/samhain-not-run-ptest-on-host.patch Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-ids/samhain/files/samhain-pid-path.patch Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-ids/suricata/files/fixup.patch Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-scanners/clamav/files/fix2_libcurl_check.patch Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-security/isic/files/configure_fix.patch Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-security/krill/files/panic_workaround.patch Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-security/opendnssec/files/libdns_conf_fix.patch Malformed Upstream-Status 'Malformed Upstream-Status in patch ./recipes-security/opendnssec/files/libxml2_conf.patch Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- .../files/0001-standard.profile-expand-checks.patch | 1 + .../samhain/files/samhain-not-run-ptest-on-host.patch | 2 +- recipes-ids/samhain/files/samhain-pid-path.patch | 12 ++++++------ recipes-ids/suricata/files/fixup.patch | 2 +- recipes-mac/AppArmor/files/crosscompile_perl_bindings.patch | 2 +- recipes-mac/AppArmor/files/disable_perl_h_check.patch | 2 +- recipes-scanners/clamav/files/fix2_libcurl_check.patch | 2 +- .../ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch | 2 +- recipes-security/isic/files/configure_fix.patch | 2 +- recipes-security/krill/files/panic_workaround.patch | 2 +- recipes-security/opendnssec/files/libdns_conf_fix.patch | 2 +- recipes-security/opendnssec/files/libxml2_conf.patch | 2 +- 12 files changed, 17 insertions(+), 16 deletions(-) diff --git a/recipes-compliance/scap-security-guide/files/0001-standard.profile-expand-checks.patch b/recipes-compliance/scap-security-guide/files/0001-standard.profile-expand-checks.patch index a272d04..061c5f0 100644 --- a/recipes-compliance/scap-security-guide/files/0001-standard.profile-expand-checks.patch +++ b/recipes-compliance/scap-security-guide/files/0001-standard.profile-expand-checks.patch @@ -3,6 +3,7 @@ From: Armin Kuster Date: Wed, 21 Jun 2023 07:46:38 -0400 Subject: [PATCH] standard.profile: expand checks +Upstream-Status: Pending Signed-off-by: Armin Kuster Upstream-status: Pending diff --git a/recipes-ids/samhain/files/samhain-not-run-ptest-on-host.patch b/recipes-ids/samhain/files/samhain-not-run-ptest-on-host.patch index 5284313..e00fc2a 100644 --- a/recipes-ids/samhain/files/samhain-not-run-ptest-on-host.patch +++ b/recipes-ids/samhain/files/samhain-not-run-ptest-on-host.patch @@ -1,6 +1,6 @@ not run test on host, since we are doing cross-compile -Upstream-status: Inappropriate [cross compile specific] +Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Roy Li --- diff --git a/recipes-ids/samhain/files/samhain-pid-path.patch b/recipes-ids/samhain/files/samhain-pid-path.patch index 592bd16..8fdadd1 100644 --- a/recipes-ids/samhain/files/samhain-pid-path.patch +++ b/recipes-ids/samhain/files/samhain-pid-path.patch @@ -2,15 +2,15 @@ commit a932b03b65edeb02ccad2fce06bfa68a8f2fbb04 Author: Aws Ismail Date: Thu Jan 10 16:29:05 2013 -0500 - Set the PID Lock path for samhain.pid +Set the PID Lock path for samhain.pid - The explicit path for samhain.pid inorder - for samhain to work properly after it initial - database build. +The explicit path for samhain.pid inorder +for samhain to work properly after it initial +database build. - Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] - Signed-off-by: Aws Ismail +Signed-off-by: Aws Ismail diff --git a/samhainrc.linux b/samhainrc.linux index 10a8176..a7b06e6 100644 diff --git a/recipes-ids/suricata/files/fixup.patch b/recipes-ids/suricata/files/fixup.patch index fc44ce6..4646aa9 100644 --- a/recipes-ids/suricata/files/fixup.patch +++ b/recipes-ids/suricata/files/fixup.patch @@ -1,6 +1,6 @@ Skip pkg Makefile from using its own rust steps -Upstream-Status: OE Specific +Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Armin Kuster diff --git a/recipes-mac/AppArmor/files/crosscompile_perl_bindings.patch b/recipes-mac/AppArmor/files/crosscompile_perl_bindings.patch index ef55de7..585f306 100644 --- a/recipes-mac/AppArmor/files/crosscompile_perl_bindings.patch +++ b/recipes-mac/AppArmor/files/crosscompile_perl_bindings.patch @@ -5,7 +5,7 @@ stuck in the generated Makefile with our cross tools. In this case, linking is done via the compiler rather than the linker directly so pass in CC not LD here. -Signed-Off-By: Tom Rini +Signed-off-by: Tom Rini --- a/libraries/libapparmor/swig/perl/Makefile.am.orig 2017-06-13 19:04:43.296676212 -0400 +++ b/libraries/libapparmor/swig/perl/Makefile.am 2017-06-13 19:05:03.488676693 -0400 diff --git a/recipes-mac/AppArmor/files/disable_perl_h_check.patch b/recipes-mac/AppArmor/files/disable_perl_h_check.patch index cf2640f..7ffdf2f 100644 --- a/recipes-mac/AppArmor/files/disable_perl_h_check.patch +++ b/recipes-mac/AppArmor/files/disable_perl_h_check.patch @@ -5,7 +5,7 @@ cross compilation. Rather than try and get a compile check to work here, we know that we have what's required via our metadata so remove only this check. -Signed-Off-By: Tom Rini +Signed-off-by: Tom Rini --- a/libraries/libapparmor/configure.ac.orig 2017-06-13 16:41:38.668471495 -0400 +++ b/libraries/libapparmor/configure.ac 2017-06-13 16:41:40.708471543 -0400 diff --git a/recipes-scanners/clamav/files/fix2_libcurl_check.patch b/recipes-scanners/clamav/files/fix2_libcurl_check.patch index 46406e9..8b500f3 100644 --- a/recipes-scanners/clamav/files/fix2_libcurl_check.patch +++ b/recipes-scanners/clamav/files/fix2_libcurl_check.patch @@ -1,6 +1,6 @@ clamav .102.2 tries to find clamav using culf_config. Use EO pkg_config instead -Upstream-Status: OE specific +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster Index: git/configure diff --git a/recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch b/recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch index 4252f97..a457d79 100644 --- a/recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch +++ b/recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch @@ -14,7 +14,7 @@ the patch comes from: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-6224 https://bazaar.launchpad.net/~ecryptfs/ecryptfs/trunk/revision/882 -Upstream-Status: backport +Upstream-Status: Backport Signed-off-by: Li Zhou --- diff --git a/recipes-security/isic/files/configure_fix.patch b/recipes-security/isic/files/configure_fix.patch index 7c3e033..ed2bf7a 100644 --- a/recipes-security/isic/files/configure_fix.patch +++ b/recipes-security/isic/files/configure_fix.patch @@ -1,6 +1,6 @@ isic: add with-libnet remove libnet test -Upstream-Status: Inappropriate[embedded specific] +Upstream-Status: Inappropriate [embedded specific] builds fine on non-oe systems. We need to exlude cross compile libnet test. Pass in the location for libnet.a. Path did not support mulitlib either. diff --git a/recipes-security/krill/files/panic_workaround.patch b/recipes-security/krill/files/panic_workaround.patch index dc26416..f63169f 100644 --- a/recipes-security/krill/files/panic_workaround.patch +++ b/recipes-security/krill/files/panic_workaround.patch @@ -1,4 +1,4 @@ -Upstream-Status: OE specific +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster Index: git/Cargo.toml diff --git a/recipes-security/opendnssec/files/libdns_conf_fix.patch b/recipes-security/opendnssec/files/libdns_conf_fix.patch index 31d7252..220a2b8 100644 --- a/recipes-security/opendnssec/files/libdns_conf_fix.patch +++ b/recipes-security/opendnssec/files/libdns_conf_fix.patch @@ -1,6 +1,6 @@ Configure does not work with OE pkg-config for the ldns option -Upstream-Status: OE specific +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster diff --git a/recipes-security/opendnssec/files/libxml2_conf.patch b/recipes-security/opendnssec/files/libxml2_conf.patch index b4ed430..c20d5d2 100644 --- a/recipes-security/opendnssec/files/libxml2_conf.patch +++ b/recipes-security/opendnssec/files/libxml2_conf.patch @@ -1,6 +1,6 @@ configure does not work with OE pkg-config for the libxml2 option -Upstream-Status: OE specific +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster -- cgit v1.2.3-54-g00ecf