Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / pam_wrapper
Commits:
bd90ba2a by Jan Alexander Steffens (heftig) at 2024-07-29T00:32:22+02:00
1.1.7-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − pam_wrapper-1.1.5-site-packages.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = pam_wrapper
pkgdesc = Tool to test PAM applications and PAM modules
- pkgver = 1.1.5
- pkgrel = 2
+ pkgver = 1.1.7
+ pkgrel = 1
url = https://cwrap.org/pam_wrapper.html
arch = x86_64
license = GPL-3.0-or-later
@@ -11,14 +11,13 @@ pkgbase = pam_wrapper
makedepends = git
makedepends = graphviz
makedepends = ninja
+ makedepends = python-setuptools
depends = glibc
depends = pam
depends = python
provides = libpam_wrapper.so
provides = libpamtest.so
- 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
+ source = git+https://git.samba.org/pam_wrapper.git#tag=pam_wrapper-1.1.7
+ b2sums =
4cf21b6021e43c32656376f43551dd19dcd2683f527cf9705af2befcc4d8d9cf8aa18d333bfa6ba3fe7d321853aed5809ba2389ef3cad56cc32cc0f2f72210d7
pkgname = pam_wrapper
=====================================
PKGBUILD
=====================================
@@ -1,8 +1,8 @@
# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
pkgname=pam_wrapper
-pkgver=1.1.5
-pkgrel=2
+pkgver=1.1.7
+pkgrel=1
pkgdesc="Tool to test PAM applications and PAM modules"
url="https://cwrap.org/pam_wrapper.html";
arch=(x86_64)
@@ -19,28 +19,19 @@ makedepends=(
git
graphviz
ninja
+ python-setuptools
)
provides=(
libpam_wrapper.so
libpamtest.so
)
source=(
- "git+https://git.samba.org/pam_wrapper.git#tag=$pkgname-$pkgver";
- $pkgname-1.1.5-site-packages.patch
+ "git+https://git.samba.org/pam_wrapper.git#tag=pam_wrapper-$pkgver";
)
-b2sums=('c147d5fc2aa8abc65ed18725e80ecaa2bbe2018fb58cf99ff81ce0ea095c029dd69049bfc06da0ff5f8a4e91dc0ca19976038203ea5580a700fdd75d0cb0dab7'
-
'721fc27dc18ea2ad727486ee08a1acdf9e71c44cd5519d468c14efd5f165ae048aee2ccf352e174e590c50a5b1ccfe2891e601fa20a163f960f968c7f6a54e1a')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^pam_wrapper-//;s/[^-]*-g/r&/;s/-/+/g'
-}
+b2sums=('4cf21b6021e43c32656376f43551dd19dcd2683f527cf9705af2befcc4d8d9cf8aa18d333bfa6ba3fe7d321853aed5809ba2389ef3cad56cc32cc0f2f72210d7')
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() {
@@ -56,8 +47,7 @@ build() {
}
check() {
- cd build
- ctest --output-on-failure --stop-on-failure -j$(nproc)
+ ctest --test-dir build --output-on-failure --stop-on-failure -j$(nproc)
}
package() {
=====================================
pam_wrapper-1.1.5-site-packages.patch deleted
=====================================
@@ -1,22 +0,0 @@
-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/-/commit/bd90ba2a0d15e93516e7720bbb893e41e4c8e267
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/pam_wrapper/-/commit/bd90ba2a0d15e93516e7720bbb893e41e4c8e267
You're receiving this email because of your account on gitlab.archlinux.org.
