diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 6 | ||||
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool_6.15.bb (renamed from meta/recipes-extended/ethtool/ethtool_6.14.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch | 40 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.7.1.bb (renamed from meta/recipes-extended/pam/libpam_1.7.0.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-extended/screen/screen_5.0.1.bb (renamed from meta/recipes-extended/screen/screen_5.0.0.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow_4.18.0.bb (renamed from meta/recipes-extended/shadow/shadow_4.17.4.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-extended/sudo/sudo_1.9.17p1.bb (renamed from meta/recipes-extended/sudo/sudo_1.9.17.bb) | 2 |
7 files changed, 8 insertions, 49 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 4affc332a9..79232a6b00 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 755cf01b02e6ec8c8acb79558cbad28e301519b3 Mon Sep 17 00:00:00 2001 | 1 | From 27757ce1a8956591d22e7f9dc8cef37e37be8e9f Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | 2 | From: Tudor Florea <tudor.florea@enea.com> |
3 | Date: Wed, 28 May 2014 18:59:54 +0200 | 3 | Date: Wed, 28 May 2014 18:59:54 +0200 |
4 | Subject: [PATCH] ethtool: use serial-tests config needed by ptest. | 4 | Subject: [PATCH] ethtool: use serial-tests config needed by ptest. |
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index db71394..5e93135 100644 | 17 | index f5fdc8b..3eab387 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.14, netdev@vger.kernel.org) | 20 | @@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.15, netdev@vger.kernel.org) |
21 | AC_PREREQ(2.52) | 21 | AC_PREREQ(2.52) |
22 | AC_CONFIG_MACRO_DIR([m4]) | 22 | AC_CONFIG_MACRO_DIR([m4]) |
23 | AC_CONFIG_SRCDIR([ethtool.c]) | 23 | AC_CONFIG_SRCDIR([ethtool.c]) |
diff --git a/meta/recipes-extended/ethtool/ethtool_6.14.bb b/meta/recipes-extended/ethtool/ethtool_6.15.bb index 41164ac6ca..eb6b272d4a 100644 --- a/meta/recipes-extended/ethtool/ethtool_6.14.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.15.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ | |||
11 | file://avoid_parallel_tests.patch \ | 11 | file://avoid_parallel_tests.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "3dbfc910513d1fef683f27ab12325cc88551abffae66d0ad3afe2a13317d2339" | 14 | SRC_URI[sha256sum] = "5d21a75b54c5e617b8ac0fe161e2ef3a75ecdf569ab64831474882dd3ece6077" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" | 16 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" |
17 | 17 | ||
diff --git a/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch b/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch deleted file mode 100644 index ef087ffc06..0000000000 --- a/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 9b5182d4781bcd6fb37a4030faf325965fde3e93 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Thu, 28 Nov 2024 20:32:17 +0100 | ||
4 | Subject: [PATCH] meson: correct check for existence of two preprocessor | ||
5 | defines | ||
6 | |||
7 | sizeof is meant for *types*, and in case of cross compiling | ||
8 | the test program produced by it has incorrect syntax | ||
9 | __NR_keyctl something; | ||
10 | and will always fail to compile. | ||
11 | |||
12 | * meson.build: Use cc.get_define() instead of cc.sizeof() to check for | ||
13 | preprocessor symbols. | ||
14 | |||
15 | Co-authored-by: Dmitry V. Levin <ldv@strace.io> | ||
16 | Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/pull/861] | ||
17 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
18 | --- | ||
19 | meson.build | 4 ++-- | ||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/meson.build b/meson.build | ||
23 | index f6a7dafe9..307fed0aa 100644 | ||
24 | --- a/meson.build | ||
25 | +++ b/meson.build | ||
26 | @@ -198,12 +198,12 @@ foreach ident: check_functions | ||
27 | endif | ||
28 | endforeach | ||
29 | |||
30 | -enable_pam_keyinit = cc.sizeof('__NR_keyctl', prefix: '#include <sys/syscall.h>') > 0 | ||
31 | +enable_pam_keyinit = cc.get_define('__NR_keyctl', prefix: '#include <sys/syscall.h>') != '' | ||
32 | |||
33 | if get_option('mailspool') != '' | ||
34 | cdata.set_quoted('PAM_PATH_MAILDIR', get_option('mailspool')) | ||
35 | else | ||
36 | - have = cc.sizeof('_PATH_MAILDIR', prefix: '#include <paths.h>') > 0 | ||
37 | + have = cc.get_define('_PATH_MAILDIR', prefix: '#include <paths.h>') != '' | ||
38 | cdata.set('PAM_PATH_MAILDIR', have ? '_PATH_MAILDIR' : '"/var/spool/mail"') | ||
39 | endif | ||
40 | |||
diff --git a/meta/recipes-extended/pam/libpam_1.7.0.bb b/meta/recipes-extended/pam/libpam_1.7.1.bb index dea9ff592b..565b00c264 100644 --- a/meta/recipes-extended/pam/libpam_1.7.0.bb +++ b/meta/recipes-extended/pam/libpam_1.7.1.bb | |||
@@ -22,10 +22,9 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ | |||
22 | file://pam.d/other \ | 22 | file://pam.d/other \ |
23 | file://run-ptest \ | 23 | file://run-ptest \ |
24 | file://pam-volatiles.conf \ | 24 | file://pam-volatiles.conf \ |
25 | file://0001-meson.build-correct-check-for-existence-of-two-prepr.patch \ | ||
26 | " | 25 | " |
27 | 26 | ||
28 | SRC_URI[sha256sum] = "57dcd7a6b966ecd5bbd95e1d11173734691e16b68692fa59661cdae9b13b1697" | 27 | SRC_URI[sha256sum] = "21dbcec6e01dd578f14789eac9024a18941e6f2702a05cf91b28c232eeb26ab0" |
29 | 28 | ||
30 | DEPENDS = "bison-native flex-native libxml2-native virtual/crypt" | 29 | DEPENDS = "bison-native flex-native libxml2-native virtual/crypt" |
31 | 30 | ||
diff --git a/meta/recipes-extended/screen/screen_5.0.0.bb b/meta/recipes-extended/screen/screen_5.0.1.bb index fec5663fc2..69f4098519 100644 --- a/meta/recipes-extended/screen/screen_5.0.0.bb +++ b/meta/recipes-extended/screen/screen_5.0.1.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ | |||
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ | 20 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971" | 23 | SRC_URI[sha256sum] = "2dae36f4db379ffcd14b691596ba6ec18ac3a9e22bc47ac239789ab58409869d" |
24 | 24 | ||
25 | inherit autotools-brokensep texinfo | 25 | inherit autotools-brokensep texinfo |
26 | 26 | ||
diff --git a/meta/recipes-extended/shadow/shadow_4.17.4.bb b/meta/recipes-extended/shadow/shadow_4.18.0.bb index 73942888b6..6842a46dd7 100644 --- a/meta/recipes-extended/shadow/shadow_4.17.4.bb +++ b/meta/recipes-extended/shadow/shadow_4.18.0.bb | |||
@@ -25,7 +25,7 @@ SRC_URI:append:class-native = " \ | |||
25 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ | 25 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ |
26 | file://disable_syslog.patch \ | 26 | file://disable_syslog.patch \ |
27 | " | 27 | " |
28 | SRC_URI[sha256sum] = "0a288c251f339846af6bdfd4447b196153204deba42407bce5b0917998322e9b" | 28 | SRC_URI[sha256sum] = "ae486ce4c0bce55c42d76d8478e428c41586f1da2f89fbf5228243fb4d849db4" |
29 | UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" | 29 | UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" |
30 | 30 | ||
31 | # Additional Policy files for PAM | 31 | # Additional Policy files for PAM |
diff --git a/meta/recipes-extended/sudo/sudo_1.9.17.bb b/meta/recipes-extended/sudo/sudo_1.9.17p1.bb index 71d48f448d..83bfc0621c 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.17.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.17p1.bb | |||
@@ -7,7 +7,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ | |||
7 | 7 | ||
8 | PAM_SRC_URI = "file://sudo.pam" | 8 | PAM_SRC_URI = "file://sudo.pam" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "3f212c69d534d5822b492d099abb02a593f91ca99f5afde5cb9bd3e1dcdad069" | 10 | SRC_URI[sha256sum] = "ff607ea717072197738a78f778692cd6df9a7e3e404565f51de063ca27455d32" |
11 | 11 | ||
12 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
13 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" | 13 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" |