From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E54115815E for ; Tue, 6 Feb 2024 22:41:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89895E2A36; Tue, 6 Feb 2024 22:41:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C758E2A36 for ; Tue, 6 Feb 2024 22:41:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59D9234302D for ; Tue, 6 Feb 2024 22:41:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA30214B7 for ; Tue, 6 Feb 2024 22:41:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1707259259.be1b61e0867fc6528c1bdf47556c0da674e4349c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam_wrapper/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild X-VCS-Directories: sys-libs/pam_wrapper/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: be1b61e0867fc6528c1bdf47556c0da674e4349c X-VCS-Branch: master Date: Tue, 6 Feb 2024 22:41:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab276eb0-b4ad-4495-8e33-b75daa05d054 X-Archives-Hash: 00664565e64fbccc6f82a4f25a8dcf91 commit: be1b61e0867fc6528c1bdf47556c0da674e4349c Author: Eli Schwartz gmail com> AuthorDate: Tue Feb 6 05:27:28 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 6 22:40:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1b61e0 sys-libs/pam_wrapper: revbump to force rebuilding against updated pam We got rid of the terrible usr-ldscript hack. It is now possible to build this sanely. Force it to rebuild against the updated pam (for the sake of split-usr profiles). Bug: https://bugs.gentoo.org/825078 Closes: https://bugs.gentoo.org/825758 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild | 88 ++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild new file mode 100644 index 000000000000..7804b800ce5d --- /dev/null +++ b/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +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 ~ia64 ~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.4-tests-import.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 +}