David Runge pushed to branch main at Arch Linux / Packaging / Packages / pam_wrapper
Commits: 14235dd6 by David Runge at 2024-04-06T19:13:25+02:00 Switch to correct SPDX license identifier Signed-off-by: David Runge <[email protected]> - - - - - 79f95b96 by David Runge at 2024-04-06T19:14:33+02:00 Add nvchecker integration Signed-off-by: David Runge <[email protected]> - - - - - 9c7278e7 by David Runge at 2024-04-06T19:16:42+02:00 Switch to locked tag commit Signed-off-by: David Runge <[email protected]> - - - - - 5a9913a2 by David Runge at 2024-04-06T19:30:21+02:00 upgpkg: 1.1.5-2: Rebuild against Python 3.12 - - - - - 4 changed files: - .SRCINFO - + .nvchecker.toml - PKGBUILD - + pam_wrapper-1.1.5-site-packages.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,21 +1,24 @@ pkgbase = pam_wrapper pkgdesc = Tool to test PAM applications and PAM modules pkgver = 1.1.5 - pkgrel = 1 + pkgrel = 2 url = https://cwrap.org/pam_wrapper.html arch = x86_64 - license = GPL3 + license = GPL-3.0-or-later makedepends = cmake makedepends = cmocka makedepends = doxygen makedepends = git makedepends = graphviz makedepends = ninja + depends = glibc depends = pam depends = python provides = libpam_wrapper.so provides = libpamtest.so - source = git+https://git.samba.org/pam_wrapper.git#commit=b223df9f35e750811f812c8cfb85bc81c196102e - b2sums = SKIP + source = git+https://git.samba.org/pam_wrapper.git#tag=pam_wrapper-1.1.5 + source = pam_wrapper-1.1.5-site-packages.patch + b2sums = c147d5fc2aa8abc65ed18725e80ecaa2bbe2018fb58cf99ff81ce0ea095c029dd69049bfc06da0ff5f8a4e91dc0ca19976038203ea5580a700fdd75d0cb0dab7 + b2sums = 721fc27dc18ea2ad727486ee08a1acdf9e71c44cd5519d468c14efd5f165ae048aee2ccf352e174e590c50a5b1ccfe2891e601fa20a163f960f968c7f6a54e1a pkgname = pam_wrapper ===================================== .nvchecker.toml ===================================== @@ -0,0 +1,4 @@ +[pam_wrapper] +source = "git" +git = "https://git.samba.org/pam_wrapper.git"; +prefix = "pam_wrapper-" ===================================== PKGBUILD ===================================== @@ -2,12 +2,13 @@ pkgname=pam_wrapper pkgver=1.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to test PAM applications and PAM modules" url="https://cwrap.org/pam_wrapper.html"; arch=(x86_64) -license=(GPL3) +license=(GPL-3.0-or-later) depends=( + glibc pam python ) @@ -23,9 +24,12 @@ provides=( libpam_wrapper.so libpamtest.so ) -_commit=b223df9f35e750811f812c8cfb85bc81c196102e # tags/pam_wrapper-1.1.5^0 -source=("git+https://git.samba.org/pam_wrapper.git#commit=$_commit";) -b2sums=('SKIP') +source=( + "git+https://git.samba.org/pam_wrapper.git#tag=$pkgname-$pkgver"; + $pkgname-1.1.5-site-packages.patch +) +b2sums=('c147d5fc2aa8abc65ed18725e80ecaa2bbe2018fb58cf99ff81ce0ea095c029dd69049bfc06da0ff5f8a4e91dc0ca19976038203ea5580a700fdd75d0cb0dab7' + '721fc27dc18ea2ad727486ee08a1acdf9e71c44cd5519d468c14efd5f165ae048aee2ccf352e174e590c50a5b1ccfe2891e601fa20a163f960f968c7f6a54e1a') pkgver() { cd $pkgname @@ -34,6 +38,9 @@ pkgver() { prepare() { cd $pkgname + # do not rely on distutils to get site-packages location (minus prefix) + # (this is a bit hacky but works for our use-case) + patch -Np1 -i ../$pkgname-1.1.5-site-packages.patch } build() { ===================================== pam_wrapper-1.1.5-site-packages.patch ===================================== @@ -0,0 +1,22 @@ +diff --git i/cmake/Modules/FindPythonSiteLibs.cmake w/cmake/Modules/FindPythonSiteLibs.cmake +index ab2931e..ecf6910 100644 +--- i/cmake/Modules/FindPythonSiteLibs.cmake ++++ w/cmake/Modules/FindPythonSiteLibs.cmake +@@ -29,7 +29,7 @@ if (PYTHON_EXECUTABLE) + ### PYTHON_SITELIB + execute_process( + COMMAND +- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" ++ ${PYTHON_EXECUTABLE} -c "import site; print(site.getsitepackages()[0].lstrip('/usr'))" + OUTPUT_VARIABLE + PYTHON_SITELIB_OUTPUT_VARIABLE + RESULT_VARIABLE +@@ -43,7 +43,7 @@ if (PYTHON_EXECUTABLE) + ### PYTHON_SITEINC + execute_process( + COMMAND +- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(plat_specific=True, prefix=''))" ++ ${PYTHON_EXECUTABLE} -c "import site; print(site.getsitepackages()[0].lstrip('/usr'))" + OUTPUT_VARIABLE + PYTHON_SITEINC_OUTPUT_VARIABLE + RESULT_VARIABLE View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/pam_wrapper/-/compare/9d1c4931291611cc379dd85b5e1f94c92ba6ee0a...5a9913a27609341f06b9911fa1ac470544ae981e -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/pam_wrapper/-/compare/9d1c4931291611cc379dd85b5e1f94c92ba6ee0a...5a9913a27609341f06b9911fa1ac470544ae981e You're receiving this email because of your account on gitlab.archlinux.org.
