upg p11-kit shadow
This commit is contained in:
parent
73b42345c2
commit
846ef3bca1
11 changed files with 109 additions and 60 deletions
24
p11-kit/0001-iter-Fix-recursive-attribute-loading.patch
Normal file
24
p11-kit/0001-iter-Fix-recursive-attribute-loading.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||||
Date: Tue, 2 Jul 2024 22:34:26 +0200
|
||||
Subject: [PATCH] iter: Fix recursive attribute loading
|
||||
|
||||
Fixes: https://github.com/p11-glue/p11-kit/issues/641
|
||||
Signed-off-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
|
||||
---
|
||||
p11-kit/iter.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/p11-kit/iter.c b/p11-kit/iter.c
|
||||
index d423b06e18b2..955d098393d7 100644
|
||||
--- a/p11-kit/iter.c
|
||||
+++ b/p11-kit/iter.c
|
||||
@@ -1048,7 +1048,7 @@ prepare_recursive_attribute (P11KitIter *iter,
|
||||
templ[i].pValue = malloc (templ[i].ulValueLen);
|
||||
return_val_if_fail (templ[i].pValue != NULL, CKR_HOST_MEMORY);
|
||||
|
||||
- if (IS_ATTRIBUTE_ARRAY (attr)) {
|
||||
+ if (IS_ATTRIBUTE_ARRAY (templ + i)) {
|
||||
rv = prepare_recursive_attribute (iter, attr, templ[i].pValue,
|
||||
templ[i].ulValueLen);
|
||||
return_val_if_fail (rv == CKR_OK, rv);
|
||||
|
|
@ -7,18 +7,22 @@
|
|||
|
||||
pkgbase=p11-kit
|
||||
pkgname=(p11-kit libp11-kit) # p11-kit-docs)
|
||||
pkgver=0.25.3
|
||||
pkgver=0.25.4
|
||||
pkgrel=01
|
||||
pkgdesc="Loads and enumerates PKCS#11 modules - w/o systemd"
|
||||
url="https://p11-glue.freedesktop.org"
|
||||
depends=(glibc libffi libtasn1)
|
||||
makedepends=(bash-completion gtk-doc meson)
|
||||
depends=(glibc libtasn1)
|
||||
makedepends=(libffi bash-completion gtk-doc meson)
|
||||
checkdepends=(gnutls)
|
||||
source=(https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig})
|
||||
source=(https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig}
|
||||
0001-iter-Fix-recursive-attribute-loading.patch)
|
||||
|
||||
prepare() {
|
||||
cd p11-kit-$pkgver
|
||||
|
||||
# https://github.com/p11-glue/p11-kit/issues/641
|
||||
patch -Np1 -i ../0001-iter-Fix-recursive-attribute-loading.patch
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -48,7 +52,7 @@ _pick() {
|
|||
}
|
||||
|
||||
package_p11-kit() {
|
||||
depends=("libp11-kit=$pkgver-$pkgrel" coreutils libp11-kit.so)
|
||||
depends=("libp11-kit=$pkgver-$pkgrel" libp11-kit.so)
|
||||
# install=p11-kit.install
|
||||
|
||||
meson install -C build --destdir "$pkgdir"
|
||||
|
|
@ -68,6 +72,7 @@ package_p11-kit() {
|
|||
package_libp11-kit() {
|
||||
pkgdesc+=" (library)"
|
||||
provides=(libp11-kit.so)
|
||||
depends=( glibc libffi libtasn1)
|
||||
|
||||
mv lib/* "$pkgdir"
|
||||
|
||||
|
|
@ -87,15 +92,20 @@ package_libp11-kit() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(BSD)
|
||||
license=(BSD-3-Clause)
|
||||
|
||||
validpgpkeys=(C0F67099B808FB063E2C81117BFB1108D92765AF # Stef Walter <stef@thewalter.net>
|
||||
462225C3B46F34879FC8496CD605848ED7E69871 # Daiki Ueno <ueno@unixuser.org>
|
||||
5D46CB0F763405A7053556F47A75A648B3F9220C) # Zoltan Fridrich <zfridric@redhat.com>
|
||||
|
||||
sha256sums=(d8ddce1bb7e898986f9d250ccae7c09ce14d82f1009046d202a0eb1b428b2adc # p11-kit-0.25.3.tar.xz
|
||||
75f3540542bed6dcfdca553eb7efa4d4d6694e539a09a455209eceae7bc630be) # p11-kit-0.25.3.tar.xz.sig
|
||||
b2sums=('51bfaf02de0cf251542d86dfcabcfd15817b90b11e7c6d2f534d99598a7e7e08109ec665835a5fee63da77fc183baccdeb8a7d526fbdacaf90d6fb9bf593e7d6'
|
||||
'SKIP'
|
||||
'0395e962c245fc8d16190fe4bc88f7d8a3e6f892ba59cf982d7b172ca0c2dda40fa4db9348760d181d3e136d6b8b12476bffb17554bc44e67f618061f1d2c1c5')
|
||||
|
||||
## 21d1a12e0a980949500ba6c5b0e91940bee6d8de424950fbbf3b310c8fd5ae80 libp11-kit-0.25.3-01-x86_64.pkg.tar.lz
|
||||
## 3b8dafaaeec62f17e0ff208c4286d3695034ecd678ae18533181aacb56bb3a45 p11-kit-0.25.3-01-x86_64.pkg.tar.lz
|
||||
sha256sums=(4c4153f81167444ff6d5e7ca118472ae607bd25c0cf6346fcc5dcc30451e97ce # p11-kit-0.25.4.tar.xz
|
||||
de806d8a30cb443c08752ca5728faaa4356187b45a715bc2c99a8c2bbef02e4e # p11-kit-0.25.4.tar.xz.sig
|
||||
bf61db5719d29763fb7bc011341f8067fb735ba96c8024211455eb6f73c97475) # 0001-iter-Fix-recursive-attribute-loading.patch
|
||||
|
||||
## c84e79cd1b66d3acf79c2ba7904f07efdbb1bfd46d464f995d234151af9f8179 libp11-kit-0.25.4-01-x86_64.pkg.tar.lz
|
||||
## bc38a64af93db79f2ba38c5e37d855a0702bf8daf5fda6aa83a08c4c64a6ef39 p11-kit-0.25.4-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -7,20 +7,22 @@ pkgname=(
|
|||
libp11-kit
|
||||
p11-kit-docs
|
||||
)
|
||||
pkgver=0.25.3
|
||||
pkgver=0.25.4
|
||||
pkgrel=1
|
||||
pkgdesc="Loads and enumerates PKCS#11 modules"
|
||||
url="https://p11-glue.freedesktop.org"
|
||||
arch=(x86_64)
|
||||
license=(BSD)
|
||||
license=(BSD-3-Clause)
|
||||
depends=(
|
||||
coreutils
|
||||
glibc
|
||||
libffi
|
||||
libtasn1
|
||||
systemd-libs
|
||||
)
|
||||
makedepends=(
|
||||
bash-completion
|
||||
gtk-doc
|
||||
libffi
|
||||
meson
|
||||
systemd
|
||||
)
|
||||
|
|
@ -29,9 +31,11 @@ checkdepends=(
|
|||
)
|
||||
source=(
|
||||
https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig}
|
||||
0001-iter-Fix-recursive-attribute-loading.patch
|
||||
)
|
||||
b2sums=('5c695c1ef95edf4bbbab001aa634076c433df0bc89cb8104deaec2ce00c6908640e467755b49c6900e5d7d5d81e1a3871f4978a212c6f6ae088386ac0b95289a'
|
||||
'SKIP')
|
||||
b2sums=('51bfaf02de0cf251542d86dfcabcfd15817b90b11e7c6d2f534d99598a7e7e08109ec665835a5fee63da77fc183baccdeb8a7d526fbdacaf90d6fb9bf593e7d6'
|
||||
'SKIP'
|
||||
'0395e962c245fc8d16190fe4bc88f7d8a3e6f892ba59cf982d7b172ca0c2dda40fa4db9348760d181d3e136d6b8b12476bffb17554bc44e67f618061f1d2c1c5')
|
||||
validpgpkeys=(
|
||||
C0F67099B808FB063E2C81117BFB1108D92765AF # Stef Walter <stef@thewalter.net>
|
||||
462225C3B46F34879FC8496CD605848ED7E69871 # Daiki Ueno <ueno@unixuser.org>
|
||||
|
|
@ -40,6 +44,9 @@ validpgpkeys=(
|
|||
|
||||
prepare() {
|
||||
cd p11-kit-$pkgver
|
||||
|
||||
# https://github.com/p11-glue/p11-kit/issues/641
|
||||
patch -Np1 -i ../0001-iter-Fix-recursive-attribute-loading.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -68,9 +75,8 @@ _pick() {
|
|||
}
|
||||
|
||||
package_p11-kit() {
|
||||
depends=(
|
||||
depends+=(
|
||||
"libp11-kit=$pkgver-$pkgrel"
|
||||
coreutils
|
||||
libp11-kit.so
|
||||
libsystemd.so
|
||||
)
|
||||
|
|
@ -91,6 +97,11 @@ package_p11-kit() {
|
|||
|
||||
package_libp11-kit() {
|
||||
pkgdesc+=" (library)"
|
||||
depends=(
|
||||
glibc
|
||||
libffi
|
||||
libtasn1
|
||||
)
|
||||
provides=(libp11-kit.so)
|
||||
|
||||
mv lib/* "$pkgdir"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From fd7fac6b8488ddade1adbb18bdceeaf41a049e9f Mon Sep 17 00:00:00 2001
|
||||
From 1ca73aa52e1ab298eed75a6777c2a2152e92d978 Mon Sep 17 00:00:00 2001
|
||||
From: David Runge <dvzrv@archlinux.org>
|
||||
Date: Sat, 5 Nov 2022 23:40:18 +0100
|
||||
Subject: [PATCH 1/3] Disable replaced tools, their man pages and PAM
|
||||
|
|
@ -723,5 +723,5 @@ index b6cb09ef..bfe73b09 100644
|
|||
chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \
|
||||
done
|
||||
--
|
||||
2.44.0
|
||||
2.45.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 51121d5484938ec0e939deebf216f94402bf0552 Mon Sep 17 00:00:00 2001
|
||||
From 81b4093db458e214a686aca5bdcc887581b6095d Mon Sep 17 00:00:00 2001
|
||||
From: David Runge <dvzrv@archlinux.org>
|
||||
Date: Mon, 31 Oct 2022 09:45:13 +0100
|
||||
Subject: [PATCH 2/3] Adapt login.defs for PAM and util-linux
|
||||
|
|
@ -695,5 +695,5 @@ index 05ef5125..1ddf537e 100644
|
|||
</refsect1>
|
||||
|
||||
--
|
||||
2.44.0
|
||||
2.45.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
From 3d08c402ec9ee72151c585de07b840a5dcb71c0b Mon Sep 17 00:00:00 2001
|
||||
From f64c9a21c0b86076eee11fbf580d4cf2d417973f Mon Sep 17 00:00:00 2001
|
||||
From: David Runge <dvzrv@archlinux.org>
|
||||
Date: Mon, 31 Oct 2022 10:10:22 +0100
|
||||
Subject: [PATCH 3/3] Add Arch Linux defaults for login.defs
|
||||
|
||||
etc/login.defs:
|
||||
- Change `ENV_SUPATH` and `ENV_SUPATH` to only use
|
||||
- Change `ENV_PATH` and `ENV_SUPATH` to only use
|
||||
/usr/local/sbin:/usr/local/bin:/usr/bin as Arch Linux is a /usr and
|
||||
bin merge distribution.
|
||||
- Set `HOME_MODE` to `0700` to be able to rely on a `UMASK` of `022`
|
||||
|
|
@ -69,5 +69,5 @@ index 797ca6b3..c4accbf8 100644
|
|||
#
|
||||
# Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
|
||||
--
|
||||
2.44.0
|
||||
2.45.2
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=shadow
|
||||
pkgver=4.15.1
|
||||
pkgrel=02
|
||||
pkgver=4.16.0
|
||||
pkgrel=01
|
||||
pkgdesc="Password and account management tool suite with support for shadow files and PAM w/o systemd"
|
||||
url="https://github.com/shadow-maint/shadow"
|
||||
depends=( glibc )
|
||||
makedepends=(acl attr audit docbook-xsl itstool libcap libxcrypt libxslt pam)
|
||||
makedepends=(acl attr audit docbook-xsl git itstool libcap libxcrypt libxslt pam)
|
||||
backup=(
|
||||
etc/default/useradd
|
||||
etc/login.defs
|
||||
|
|
@ -23,9 +23,9 @@ backup=(
|
|||
)
|
||||
#options=(debug !emptydirs)
|
||||
options=('!emptydirs')
|
||||
# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.15.1.arch1
|
||||
source=(
|
||||
$url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
|
||||
# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.16.0.arch1
|
||||
source=(git+$url.git?signed#tag=$pkgver
|
||||
# $url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
|
||||
0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch
|
||||
0002-Adapt-login.defs-for-PAM-and-util-linux.patch
|
||||
0003-Add-Arch-Linux-defaults-for-login.defs.patch
|
||||
|
|
@ -37,7 +37,8 @@ source=(
|
|||
prepare() {
|
||||
local filename
|
||||
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname
|
||||
# cd $pkgname-$pkgver
|
||||
for filename in "${source[@]}"; do
|
||||
if [[ "$filename" =~ \.patch$ ]]; then
|
||||
printf "Applying patch %s\n" "${filename##*/}"
|
||||
|
|
@ -71,7 +72,8 @@ build() {
|
|||
--without-systemd
|
||||
)
|
||||
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname
|
||||
# cd $pkgname-$pkgver
|
||||
# add extra check, preventing accidental deletion of other user's home dirs when using `userdel -r <user with home in />`
|
||||
export CFLAGS="$CFLAGS -DEXTRA_CHECK_HOME_DIR"
|
||||
./configure "${configure_options[@]}"
|
||||
|
|
@ -82,7 +84,8 @@ build() {
|
|||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname
|
||||
# cd $pkgname-$pkgver
|
||||
depends=(acl libacl.so attr libattr.so audit libaudit.so libxcrypt libcrypt.so
|
||||
pam libpam.so libpam_misc.so)
|
||||
|
||||
|
|
@ -114,13 +117,13 @@ license=(BSD-3-Clause)
|
|||
validpgpkeys=(66D0387DB85D320F8408166DB175CFA98F192AF2 # Serge Hallyn <sergeh@kernel.org>
|
||||
A9348594CE31283A826FBDD8D57633D441E25BB5) # Alejandro Colomar <alx@kernel.org>
|
||||
|
||||
sha256sums=(bb5f70639a0581f9d626f227ce45b31ac137daa7c451c0f672ce14f2731a96ee # shadow-4.15.1.tar.xz
|
||||
1dae9f9c9064bbe46c8ba19198c87cbce0d14b57f625c5d1ccab8413213730a0 # shadow-4.15.1.tar.xz.asc
|
||||
93077d921967eb3e8c0af6b0bd016e75da35fccd4d2bca7d455aa1e24289b3ab # 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch
|
||||
3bb214e05f428aa2e0ee0561c86a109b892fb7c97b1484714296d0efb81cc974 # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch
|
||||
11549cd64a218332dfa712853bb4618c58f8c1c09d7fbc90e2323e0c7bae3bf2 # 0003-Add-Arch-Linux-defaults-for-login.defs.patch
|
||||
sha256sums=(d437433a225d7315bc6760d337f6866bf4260f3205c7a57c2124dff10951f1ca # shadow 4.16.0
|
||||
32545b60b581d6179fd10f712dc9bad1f4a9a12b2a1fe16335cffcdd23e47b19 # 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch.1
|
||||
5468e221cdec6eb4fd6c0f6318f003c303f42bd577e302ea6cae077a20c981c8 # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch.1
|
||||
b6cd9045eab0e6fad38cf568e4a532fb2687866afaa16308a26bfd0458f7e300 # 0003-Add-Arch-Linux-defaults-for-login.defs.patch.1
|
||||
29448220f2ecfeab0a1a7aae296f07ca522d0a75a5b20df30f83950f9d54531f # shadow.sysusers
|
||||
c2faa81b894de452e6cd23660ad7e30a4e03d6a4eacb94ff209c6e578df05e61 # shadow.tmpfiles
|
||||
2d4b7b85ea1d5cddf93c2d636a11b0e76c1f484474449bdb018e3af0fcbd93c3) # useradd.defaults
|
||||
|
||||
## c696c84683c9775cab6fb5fdf5dfb57d03f3f24b7f253a5f5f2b3bc17098e68a shadow-4.15.1-02-x86_64.pkg.tar.lz
|
||||
## d58c2d418bcbc43ad7b6b367a6e9c48c4805ee1a0c99ff9d8bdcd5191e27abb6 shadow-4.16.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# Contributor: Aaron Griffin <aaron@archlinux.org>
|
||||
|
||||
pkgname=shadow
|
||||
pkgver=4.15.1
|
||||
pkgrel=2
|
||||
pkgver=4.16.0
|
||||
pkgrel=1
|
||||
pkgdesc="Password and account management tool suite with support for shadow files and PAM"
|
||||
arch=(x86_64)
|
||||
url="https://github.com/shadow-maint/shadow"
|
||||
|
|
@ -17,6 +17,7 @@ makedepends=(
|
|||
attr
|
||||
audit
|
||||
docbook-xsl
|
||||
git
|
||||
itstool
|
||||
libcap
|
||||
libxcrypt
|
||||
|
|
@ -32,9 +33,9 @@ backup=(
|
|||
etc/pam.d/passwd
|
||||
)
|
||||
options=(!emptydirs)
|
||||
# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.15.1.arch1
|
||||
# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.16.0.arch1
|
||||
source=(
|
||||
$url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
|
||||
git+$url.git?signed#tag=$pkgver
|
||||
0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch
|
||||
0002-Adapt-login.defs-for-PAM-and-util-linux.patch
|
||||
0003-Add-Arch-Linux-defaults-for-login.defs.patch
|
||||
|
|
@ -42,21 +43,19 @@ source=(
|
|||
shadow.{sysusers,tmpfiles}
|
||||
useradd.defaults
|
||||
)
|
||||
sha512sums=('e3ae51bf53bfa1662d81bbe0150ada19c116514f1e56391d877045d48e16776326446561759edbf5006c0f97ab1d5f4bae63521bf1fae67e118ddda0d4a8f6cb'
|
||||
'SKIP'
|
||||
'839b83a3824be89930207e635f7aaa10cf3660ba2f4a6e95b3366d083fe2c76295d1d54b108bdfe317e5ebb049a8bbbf7b5859907d201cee43af330abb2091b6'
|
||||
'a3da00d0368a9397be00ce1fc06416e5261f2000b99f69bd83202cf56e7d0ebea34562fbf35fdf43e7cf52a82f6720f6299defed9fa1d6436648e2f29d10512b'
|
||||
'c41e2cef30930a79a6ad4eb63a8106688fde49b3bfc22ec68833e1974d6932e856244dc5f0fbe63943dcd09c05d06db6aa71783aa09a25708f78898189436683'
|
||||
sha512sums=('9b01725da77dd76efc3a22f2a31c6727e5cf2bab64e803c3e5e3bfb4921ed5344de2b359c07253bbb6a1cd846c4fc6168604ba6ac455e32d5f3ec2ebac2ebf2a'
|
||||
'8550c2df5d38b375aa2da28ba65e9c658c69a18a455e3f5977aa2cc7af976a69a86a71d22a8857bf3a1ebedcc1fa4bc169c51655a7636bed2242bd420b9a084f'
|
||||
'4b1ff03841cb924e82d0d118158105d4a0d1d19285610b0b81cb640c3dcfcd83f3ee384ea451934adcbf13aadc731140a1e963d6f5d31761847ff8f5dc8128d8'
|
||||
'173d9607e4010d1d7d7fcd9f0ee2eb68b55998816228447a4e02bef150bb475c40aa23bfdce2de4260b02f448513975791bd1d88d1b6ff17ede7631f0b76f5a2'
|
||||
'e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621'
|
||||
'2c8689b52029f6aa27d75b8b05b0b36e2fc322cab40fdfbb50cdbe331f61bc84e8db20f012cf9af3de8c4e7fdb10c2d5a4925ca1ba3b70eb5627772b94da84b3'
|
||||
'5afac4a96b599b0b8ed7be751e7160037c3beb191629928c6520bfd3f2adcd1c55c31029c92c2ff8543e6cd9e37e2cd515ba4e1789c6d66f9c93b4e7f209ee7a'
|
||||
'97a6a57c07502e02669dc1a91bffc447dba7d98d208b798d80e07de0d2fdf9d23264453978d2d3d1ba6652ca1f2e22cdadc4309c7b311e83fa71b00ad144f877'
|
||||
'706ba6e7fa8298475f2605a28daffef421c9fa8d269cbd5cbcf7f7cb795b40a24d52c20e8d0b73e29e6cd35cd7226b3e9738dc513703e87dde04c1d24087a69c')
|
||||
b2sums=('a24f492cb2a7721b165c70237b1a9290acc0063bdf493f061752ca41d23a1154b26e16ee00dd96a19e825eff7f711391892eeb08a314d9277514d4d32a4adafe'
|
||||
'SKIP'
|
||||
'8d49018484533f1e9d0a2bdc81d6550a1662b275ffb5bb6dbe3d3062aa7d25e7acd3234bcbd3eb3e00dd8cd3a480cab9753d72b6970c44dc6e814ca5b45b554c'
|
||||
'5fa58287e123fac7ba2cde8c98e0dfd52cbff0d0d67306b359881ebc54997907fe64b59012880f8750a152d05c05063888a03e43c19eabc7a2de0590bae0b1df'
|
||||
'0ae11bf0ded3e6d6be3d960f5b75fdc885d936f499d162944ef27f0c3997be4fd1fc4f08cba60be6f81eddefbbb576cc37aeaf13993d80bfc8d452e496d286f4'
|
||||
b2sums=('4829db7d27b60648e0697d183023d7813b9215b812644b4767872669ad4eafe5e91de40a1a1a4c6f5f2cc6c091b1867c31f5d011a34adb0e37e9fd632d6afab5'
|
||||
'c828510e0be5062d020b904a45bfe73ed70b4f2821d0af0c0fb349465315b8b3f478b0d84c175e9bbe2f326e1741705f52b7549cd51e6983cab8689d66227877'
|
||||
'190e4248cd13d7e4d2d51360e62d89f6498ac6208abf536f9bfcb98893d6d0f0dfc53037787e1a738ef16ace75484096cba997e5bd95083b38693797f78dfdb4'
|
||||
'76859eff360cf1cfaf58296c4a42b38daa4709a130dfdeaffc3666d56351479fa9131e3ee6ecd491142bf1b093e47465477739c08368d496e2c1b7c9d66f0795'
|
||||
'5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b'
|
||||
'a69191ab966f146c35e7e911e7e57c29fffd54436ea014aa8ffe0dd46aaf57c635d0a652b35916745c75d82b3fca7234366ea5f810b622e94730b45ec86f122c'
|
||||
'511c4ad9f3be530dc17dd68f2a3387d748dcdb84192d35f296b88f82442224477e2a74b1841ec3f107b39a5c41c2d961480e396a48d0578f8fd5f65dbe8d9f04'
|
||||
|
|
@ -70,7 +69,7 @@ validpgpkeys=(
|
|||
prepare() {
|
||||
local filename
|
||||
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname
|
||||
for filename in "${source[@]}"; do
|
||||
if [[ "$filename" =~ \.patch$ ]]; then
|
||||
printf "Applying patch %s\n" "${filename##*/}"
|
||||
|
|
@ -103,7 +102,7 @@ build() {
|
|||
--without-su # su is provided by util-linux
|
||||
)
|
||||
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname
|
||||
# add extra check, preventing accidental deletion of other user's home dirs when using `userdel -r <user with home in />`
|
||||
export CFLAGS="$CFLAGS -DEXTRA_CHECK_HOME_DIR"
|
||||
./configure "${configure_options[@]}"
|
||||
|
|
@ -122,7 +121,7 @@ package() {
|
|||
pam libpam.so libpam_misc.so
|
||||
)
|
||||
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname
|
||||
|
||||
make DESTDIR="$pkgdir" install
|
||||
make DESTDIR="$pkgdir" -C man install
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
rm -rf {src,pkg,shad*.tar.xz*}
|
||||
rm -rf {src,pkg,shad*.tar.xz*,shadow}
|
||||
|
|
|
|||
|
|
@ -4,5 +4,7 @@ automake
|
|||
docbook-xsl
|
||||
itstool
|
||||
libxslt
|
||||
git
|
||||
|
||||
|
||||
bison
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 3m44.477s
|
||||
user 3m24.431s
|
||||
sys 0m21.421s
|
||||
real 4m27.076s
|
||||
user 4m4.815s
|
||||
sys 0m23.817s
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue