From ac4bba456a2c5c49ee529f0b6897dceff4d28e7f Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 6 Apr 2026 02:12:37 +0100 Subject: [PATCH] sys-libs/pam_wrapper: drop 1.1.5 Signed-off-by: Sam James --- sys-libs/pam_wrapper/Manifest | 1 - .../pam_wrapper-1.1.5-env-var-typo.patch | 25 ------ .../files/pam_wrapper-1.1.5-mkdir-race.patch | 40 --------- sys-libs/pam_wrapper/pam_wrapper-1.1.5.ebuild | 90 ------------------- 4 files changed, 156 deletions(-) delete mode 100644 sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-env-var-typo.patch delete mode 100644 sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-mkdir-race.patch delete mode 100644 sys-libs/pam_wrapper/pam_wrapper-1.1.5.ebuild diff --git a/sys-libs/pam_wrapper/Manifest b/sys-libs/pam_wrapper/Manifest index 009c5097c5334..cfcad057c314f 100644 --- a/sys-libs/pam_wrapper/Manifest +++ b/sys-libs/pam_wrapper/Manifest @@ -1,2 +1 @@ -DIST pam_wrapper-1.1.5.tar.gz 95037 BLAKE2B 78adeaac3994349460c2c9966e1145c3c6b78189cf1e6092cf0272bc82498c2182b114d718ce47b3403e32255d8ae5e65dee22e7bc261442323a661a4dbd1b38 SHA512 eee2c0683bd87c5416b52115105a9a2397cbec261e358ff20d9b272509f64ee5ea50a4adcb04f7791d451ca904ffd31c3bc07dc53555c3808f50f71634ab6323 DIST pam_wrapper-1.1.8.tar.gz 93569 BLAKE2B 52fd3f25bc2426e3b66a0b1a85598c1fd6e1bff67858eed524fb4531f300bc4828e2471c595457a907cf595506dc49545c9256d96219d2869433fb3e44f4ff3b SHA512 f79362f451b1fc6562cf06b35522502c4055474f33a24262c83df8bc598ab8672cfe410ebc8f6713050db84aa5ce5aeca28a81092928e6fbb51f51e29583feb5 diff --git a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-env-var-typo.patch b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-env-var-typo.patch deleted file mode 100644 index 0874e5daaf248..0000000000000 --- a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-env-var-typo.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://git.samba.org/?p=pam_wrapper.git;a=commit;h=9f0cccf7432dd9be1de953f9b13a7f9b06c40442 - -From 9f0cccf7432dd9be1de953f9b13a7f9b06c40442 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Fri, 10 Nov 2023 15:38:37 +0100 -Subject: [PATCH] pwrap: Fix PAM_WRAPPER_DISABLE_DEEPBIND environment variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Schneider -Reviewed-by: Pavel Filipenský ---- a/src/pam_wrapper.c -+++ b/src/pam_wrapper.c -@@ -336,7 +336,7 @@ static void *pwrap_load_lib_handle(enum pwrap_lib lib) - - #ifdef RTLD_DEEPBIND - const char *env_preload = getenv("LD_PRELOAD"); -- const char *env_deepbind = getenv("UID_WRAPPER_DISABLE_DEEPBIND"); -+ const char *env_deepbind = getenv("PAM_WRAPPER_DISABLE_DEEPBIND"); - bool enable_deepbind = true; - - /* Don't do a deepbind if we run with libasan */ --- -2.34.1 diff --git a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-mkdir-race.patch b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-mkdir-race.patch deleted file mode 100644 index f3c1458d6dce2..0000000000000 --- a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-mkdir-race.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://git.samba.org/?p=pam_wrapper.git;a=commitdiff;h=7bd24b0e54995da5f333575f97c9f1fa796fe0f1 - -From 7bd24b0e54995da5f333575f97c9f1fa796fe0f1 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Jan=20Kundr=C3=A1t?= -Date: Mon, 6 Nov 2023 18:34:58 +0100 -Subject: [PATCH] die quickly upon mkdir failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -We just had this failure in our CI system that's currently running just -three PAM-wrapped tests in parallel. Since this is a classic TOCTOU race -(albeit in a test code, and therefore with little to no security -implications), the `mkdir` can fail, and when that happens it's much -better to just die quickly rather than continuing as if nothing -happened. - -Signed-off-by: Jan Kundrát -Reviewed-by: Pavel Filipenský -Reviewed-by: Andreas Schneider ---- a/src/pam_wrapper.c -+++ b/src/pam_wrapper.c -@@ -893,6 +893,7 @@ static void pwrap_init(void) - PWRAP_LOG(PWRAP_LOG_ERROR, - "Failed to create pam_wrapper config dir: %s - %s", - tmp_config_dir, strerror(errno)); -+ exit(1); - } - - /* Create file with the PID of the the process */ -@@ -1121,6 +1122,7 @@ static void pwrap_init(void) - PWRAP_LOG(PWRAP_LOG_ERROR, - "Failed to create pam_wrapper config dir: %s - %s", - tmp_config_dir, strerror(errno)); -+ exit(1); - } - - /* Create file with the PID of the the process */ --- -2.34.1 diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.5.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.5.ebuild deleted file mode 100644 index 21d0c4405406d..0000000000000 --- a/sys-libs/pam_wrapper/pam_wrapper-1.1.5.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake-multilib python-r1 - -DESCRIPTION="A tool to test PAM applications and PAM modules" -HOMEPAGE="https://cwrap.org/pam_wrapper.html" -SRC_URI=" - https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz - https://ftp.samba.org/pub/cwrap/${P}.tar.gz -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Require newer PAM so we know where it's located, bug #825078 -RDEPEND=" - ${PYTHON_DEPS} - >=sys-libs/pam-1.5.3-r1:0=[${MULTILIB_USEDEP}] -" -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka[${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.5-tests-import.patch - "${FILESDIR}"/${P}-mkdir-race.patch - "${FILESDIR}"/${P}-env-var-typo.patch -) - -multilib_src_configure() { - configure_for_python() { - local mycmakeargs=( -DUNIT_TESTING=OFF ) - cmake_src_configure - } - - if multilib_is_native_abi ; then - # Build the Pythons for each version (but only for the native ABI) - # bug #737468 - python_foreach_impl configure_for_python - fi - - # Do the regular build now - local mycmakeargs=( - -DUNIT_TESTING=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON - ) - cmake_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - python_foreach_impl cmake_src_compile - fi - - # Compile the "proper" version without Python last - cmake_src_compile -} - -multilib_src_test() { - cmake_src_test - - # Fails b/c of sandbox? - #python_test() { - # local -x PYTHONPATH="${BUILD_DIR}/src/python/python3:${PYTHONPATH}" - # elog "${PYTHONPATH}" - # ${EPYTHON} "${S}"/tests/pypamtest_test.py || die "Tests failed with ${EPYTHON}" - #} - - #if multilib_is_native_abi ; then - # python_foreach_impl python_test - #fi -} - -multilib_src_install() { - if multilib_is_native_abi ; then - python_foreach_impl cmake_src_install - fi - - # Install the "proper" version without Python last - cmake_src_install -}