[arch-commits] Commit in lib32-pam/trunk (PKGBUILD)

[Maxime Gauduin via arch-commits]

    Date: Tuesday, September 1, 2020 @ 17:02:43
  Author: alucryd
Revision: 695749

upgpkg: lib32-pam 1.4.0-1

Modified:
  lib32-pam/trunk/PKGBUILD

----------+
 PKGBUILD |   60 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-09-01 17:02:36 UTC (rev 695748)
+++ PKGBUILD    2020-09-01 17:02:43 UTC (rev 695749)
@@ -6,18 +6,47 @@
 # Contributor: judd <jvi...@zeroflux.org>
 
 pkgname=lib32-pam
-pkgver=1.3.1
+pkgver=1.4.0
 pkgrel=1
 pkgdesc='Pluggable Authentication Modules'
-arch=('x86_64')
-url='http://linux-pam.org'
-license=('GPL2')
-depends=('lib32-cracklib' 'lib32-libnsl' 'lib32-libtirpc' 'pam')
-makedepends=('docbook-xml' 'docbook-xsl' 'git' 'lib32-flex' 'w3m')
-source=("git+https://github.com/linux-pam/linux-pam.git#tag=v${pkgver}";)
-sha256sums=('SKIP')
-options=('!emptydirs')
+arch=(x86_64)
+url=http://linux-pam.org
+license=(GPL2)
+depends=(
+  lib32-libnsl
+  lib32-libtirpc
+  lib32-libxcrypt
+  pam
+)
+makedepends=(
+  docbook-xml
+  docbook-xsl
+  git
+  lib32-flex
+  w3m
+)
+_tag=5655b9d7bbf545d02f849888a0ff3a97a0ab6a20
+source=(git+https://github.com/linux-pam/linux-pam.git?signed#tag=${_tag})
+validpgpkeys=(296D6F29A020808E8717A8842DB5BD89A340AEB7) # Dimitry V. Levin 
<l...@altlinux.org>
+b2sums=(SKIP)
+options=(!emptydirs)
 
+pkgver() {
+  cd linux-pam
+
+  git describe --tags | sed 's/^v//'
+}
+
+prepare() {
+  cd linux-pam
+
+  git cherry-pick -n 395915dae1571e10e2766c999974de864655ea3a
+  git cherry-pick -n af0faf666c5008e54dfe43684f210e3581ff1bca
+  git cherry-pick -n 0e9b286afe1224b91ff00936058b084ad4b776e4
+
+  ./autogen.sh
+}
+
 build() {
   cd linux-pam
 
@@ -25,20 +54,17 @@
   export CXX='g++ -m32'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  ./autogen.sh
   ./configure \
-    --prefix='/usr' \
-    --libdir='/usr/lib32' \
-    --sbindir='/usr/bin' \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --sbindir=/usr/bin \
     --disable-db
   make
 }
 
 package() {
-  cd linux-pam
-
-  make DESTDIR="${pkgdir}" SCONFIGDIR='/etc/security' install
-  rm -rf "${pkgdir}"/{etc,usr/{include,share,bin}}
+  make DESTDIR="${pkgdir}" SCONFIGDIR=/etc/security -C linux-pam install
+  rm -rf "${pkgdir}"/{etc,usr/{bin,include,lib,share}}
 }
 
 # vim: ts=2 sw=2 et: