upg glibc gnutls shadow util-linux
This commit is contained in:
parent
3c3a642870
commit
0f4c920837
11 changed files with 148 additions and 69 deletions
|
|
@ -11,8 +11,8 @@
|
|||
pkgbase=glibc
|
||||
pkgname=(glibc lib32-glibc)
|
||||
pkgver=2.38
|
||||
_commit=6b99458d197ab779ebb6ff632c168e2cbfa4f543
|
||||
pkgrel=03
|
||||
_commit=0e1ef6779a90bc0f8a05bc367796df2793deecaa
|
||||
pkgrel=04
|
||||
url='https://www.gnu.org/software/libc'
|
||||
makedepends=(git gd lib32-gcc-libs python)
|
||||
#optdepends=('perl: for mtrace')
|
||||
|
|
@ -23,8 +23,6 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
|
|||
locale-gen
|
||||
lib32-glibc.conf
|
||||
sdt.h sdt-config.h
|
||||
fix-malloc-p1.patch
|
||||
fix-malloc-p2.patch
|
||||
reenable_DT_HASH.patch)
|
||||
|
||||
prepare() {
|
||||
|
|
@ -33,9 +31,6 @@ prepare() {
|
|||
[[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
|
||||
cd glibc
|
||||
|
||||
patch -Np1 -i "${srcdir}"/fix-malloc-p1.patch
|
||||
patch -Np1 -i "${srcdir}"/fix-malloc-p2.patch
|
||||
|
||||
# Re-enable `--hash-style=both` for building shared objects due to issues with EPIC's EAC
|
||||
# which relies on DT_HASH to be present in these libs.
|
||||
# reconsider 2023-01
|
||||
|
|
@ -53,6 +48,7 @@ build() {
|
|||
--enable-fortify-source
|
||||
--enable-kernel=4.4
|
||||
--enable-multi-arch
|
||||
--disable-nscd
|
||||
--enable-stack-protector=strong
|
||||
--enable-systemtap
|
||||
--disable-profile
|
||||
|
|
@ -145,8 +141,7 @@ package_glibc() {
|
|||
'perl: for mtrace')
|
||||
install=glibc.install
|
||||
backup=(etc/gai.conf
|
||||
etc/locale.gen
|
||||
etc/nscd.conf)
|
||||
etc/locale.gen)
|
||||
|
||||
make -C glibc-build install_root="$pkgdir" install
|
||||
rm -f "$pkgdir"/etc/ld.so.cache
|
||||
|
|
@ -157,9 +152,6 @@ package_glibc() {
|
|||
cd glibc
|
||||
|
||||
install -dm755 "$pkgdir"/usr/lib/{locale,tmpfiles.d}
|
||||
install -m644 nscd/nscd.conf "$pkgdir/etc/nscd.conf"
|
||||
install -m644 nscd/nscd.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/nscd.conf"
|
||||
install -dm755 "$pkgdir/var/db/nscd"
|
||||
|
||||
install -m644 posix/gai.conf "$pkgdir"/etc/gai.conf
|
||||
|
||||
|
|
@ -224,10 +216,8 @@ sha256sums=(SKIP
|
|||
c27424154a6096ae32c0824b785e05de6acef33d9224fd6147d1936be9b4962b # lib32-glibc.conf
|
||||
774061aff612a377714a509918a9e0e0aafce708b87d2d7e06b1bd1f6542fe70 # sdt.h
|
||||
cdc234959c6fdb43f000d3bb7d1080b0103f4080f5e67bcfe8ae1aaf477812f0 # sdt-config.h
|
||||
1e22a2226fe308154e70981c0036c7c4ebac488b26b9959cb803d7a3d831d0c4 # fix-malloc-p1.patch
|
||||
59f37c6f3a27e08d846c1dcb0ac08c1aebb14c11afb9be10652ca1a80fd54c3e # fix-malloc-p2.patch
|
||||
cf9fe494f7ec69752a63d1b0a9ad689aa620888ae9b902b6383a6fbc7c1726a7) # reenable_DT_HASH.patch
|
||||
|
||||
## 015e5a74aff737d30d0761fa55fd6ef28cb8258985a8dd92c2ff8a2d94279936 glibc-2.38-03-x86_64.pkg.tar.lz
|
||||
## 33e6ef42cb5e209cf03605bb8e3afae39a85696fc78a7a937c78badaec65b980 lib32-glibc-2.38-03-x86_64.pkg.tar.lz
|
||||
## 9f2a51bcf36ab18a74597e9e18acc9550d246e2f454e0d4cba55bcb335b70fda glibc-2.38-04-x86_64.pkg.tar.lz
|
||||
## 69b82aac27ce50144c2ce5a8d3941a6b6182e24e47be1513e2f58cec0151952b lib32-glibc-2.38-04-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
pkgbase=glibc
|
||||
pkgname=(glibc lib32-glibc)
|
||||
pkgver=2.38
|
||||
_commit=6b99458d197ab779ebb6ff632c168e2cbfa4f543
|
||||
pkgrel=3
|
||||
_commit=0e1ef6779a90bc0f8a05bc367796df2793deecaa
|
||||
pkgrel=4
|
||||
arch=(x86_64)
|
||||
url='https://www.gnu.org/software/libc'
|
||||
license=(GPL LGPL)
|
||||
|
|
@ -22,8 +22,6 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
|
|||
lib32-glibc.conf
|
||||
sdt.h sdt-config.h
|
||||
reenable_DT_HASH.patch
|
||||
fix-malloc-p1.patch
|
||||
fix-malloc-p2.patch
|
||||
)
|
||||
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
|
||||
BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
|
||||
|
|
@ -33,9 +31,7 @@ b2sums=('SKIP'
|
|||
'7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a'
|
||||
'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
|
||||
'214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678'
|
||||
'35e03ed912e1b0cd23783ab83ce919412885c141344905b8b67bbad4a86c48cf3e893806060e48d5737514ff80cea0b58b0e1f15707c32224579c416dcd810c0'
|
||||
'28c983bcebc0eeeb37a60756ccee50d587a99d5e2100430d5c0ee51a19d9b2176a4013574a7d72b5857302fbb60d371bbf0b3cdb4fc700a1dbe3aae4a42b04b9'
|
||||
'c3e94f5b0999878ff472e32f49dc13c20eb9db68c633017cb7824617eb824cf6cff7ea53b92962926e0ee84fd39736616298dcb926356625dd124f3754e79932')
|
||||
'35e03ed912e1b0cd23783ab83ce919412885c141344905b8b67bbad4a86c48cf3e893806060e48d5737514ff80cea0b58b0e1f15707c32224579c416dcd810c0')
|
||||
|
||||
prepare() {
|
||||
mkdir -p glibc-build lib32-glibc-build
|
||||
|
|
@ -47,9 +43,6 @@ prepare() {
|
|||
# which relies on DT_HASH to be present in these libs.
|
||||
# reconsider 2023-01
|
||||
patch -Np1 -i "${srcdir}"/reenable_DT_HASH.patch
|
||||
|
||||
patch -Np1 -i "${srcdir}"/fix-malloc-p1.patch
|
||||
patch -Np1 -i "${srcdir}"/fix-malloc-p2.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -64,6 +57,7 @@ build() {
|
|||
--enable-multi-arch
|
||||
--enable-stack-protector=strong
|
||||
--enable-systemtap
|
||||
--disable-nscd
|
||||
--disable-profile
|
||||
--disable-werror
|
||||
)
|
||||
|
|
@ -151,8 +145,7 @@ package_glibc() {
|
|||
'perl: for mtrace')
|
||||
install=glibc.install
|
||||
backup=(etc/gai.conf
|
||||
etc/locale.gen
|
||||
etc/nscd.conf)
|
||||
etc/locale.gen)
|
||||
|
||||
make -C glibc-build install_root="${pkgdir}" install
|
||||
rm -f "${pkgdir}"/etc/ld.so.cache
|
||||
|
|
@ -163,10 +156,6 @@ package_glibc() {
|
|||
cd glibc
|
||||
|
||||
install -dm755 "${pkgdir}"/usr/lib/{locale,systemd/system,tmpfiles.d}
|
||||
install -m644 nscd/nscd.conf "${pkgdir}"/etc/nscd.conf
|
||||
install -m644 nscd/nscd.service "${pkgdir}"/usr/lib/systemd/system
|
||||
install -m644 nscd/nscd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/nscd.conf
|
||||
install -dm755 "${pkgdir}"/var/db/nscd
|
||||
|
||||
install -m644 posix/gai.conf "${pkgdir}"/etc/gai.conf
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=gnutls
|
||||
pkgver=3.8.1
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="A library which provides a secure layer over a reliable transport layer"
|
||||
url="https://www.gnutls.org/"
|
||||
options=('!zipman')
|
||||
|
|
@ -17,7 +17,10 @@ depends=('glibc' 'gcc-libs' 'gmp' 'libtasn1' 'readline' 'zlib' 'nettle'
|
|||
makedepends=('tpm2-tss')
|
||||
checkdepends=('net-tools' 'tpm2-tools')
|
||||
optdepends=('tpm2-tss: support for TPM2 wrapped keys')
|
||||
source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/${pkgname}-${pkgver}.tar.xz{,.sig})
|
||||
backup=(etc/gnutls/config
|
||||
etc/modules-load.d/gnutls.conf)
|
||||
source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/${pkgname}-${pkgver}.tar.xz{,.sig}
|
||||
config)
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
|
|
@ -30,16 +33,13 @@ build() {
|
|||
./configure --prefix=/usr \
|
||||
--disable-static \
|
||||
--with-idn \
|
||||
--enable-openssl-compatibility \
|
||||
--with-brotli \
|
||||
--without-zstd \
|
||||
--with-tpm2 \
|
||||
--enable-openssl-compatibility \
|
||||
--enable-ktls \
|
||||
--with-default-trust-store-pkcs11="pkcs11:"
|
||||
|
||||
# --disable-dependency-tracking
|
||||
# --enable-ktls \ # breaks testsuite
|
||||
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make
|
||||
}
|
||||
|
|
@ -48,6 +48,7 @@ check() {
|
|||
cd ${pkgname}-${pkgver}
|
||||
# disable parallel tests:
|
||||
# FAIL: serv-udp.sh
|
||||
|
||||
make check
|
||||
}
|
||||
|
||||
|
|
@ -55,6 +56,14 @@ package() {
|
|||
cd ${pkgname}-${pkgver}
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
# prepare to load tls module required for ktls
|
||||
install -dm755 "$pkgdir"/etc/modules-load.d
|
||||
echo "#tls" > "$pkgdir"/etc/modules-load.d/gnutls.conf
|
||||
|
||||
# disable ktls by default for now
|
||||
install -dm755 "$pkgdir"/etc/gnutls
|
||||
install -Dm644 "${srcdir}"/config "$pkgdir"/etc/gnutls/config
|
||||
|
||||
# lots of .png files are put into infodir and are gzipped by makepkg! this needs to be fixed by using !zipman
|
||||
# gzip -9 all files in infodir and manpages manually
|
||||
find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -n -9 {} \;
|
||||
|
|
@ -71,7 +80,8 @@ validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@un
|
|||
#validpgpkeys=('5D46CB0F763405A7053556F47A75A648B3F9220C') # "Zoltan Fridrich <zfridric@redhat.com>"
|
||||
|
||||
sha256sums=(ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c # gnutls-3.8.1.tar.xz
|
||||
ef357b9d34ae308f06c0989c203521fb768b3db93b81e1041f85f1926f58ca7d) # gnutls-3.8.1.tar.xz.sig
|
||||
ef357b9d34ae308f06c0989c203521fb768b3db93b81e1041f85f1926f58ca7d # gnutls-3.8.1.tar.xz.sig
|
||||
22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5) # config
|
||||
|
||||
## 1c4a440b59277d80802093c7169777121cde933ae732d956a71d4af4157f4197 gnutls-3.8.1-01-x86_64.pkg.tar.lz
|
||||
## 147938701d2887457a0161911c8ce547e42ce3f29db0d27d15d8d604878dc489 gnutls-3.8.1-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
pkgname=gnutls
|
||||
pkgver=3.8.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A library which provides a secure layer over a reliable transport layer"
|
||||
arch=('x86_64')
|
||||
license=('GPL3' 'LGPL2.1')
|
||||
|
|
@ -14,9 +14,13 @@ depends=('glibc' 'gcc-libs' 'gmp' 'libtasn1' 'readline' 'zlib' 'nettle'
|
|||
makedepends=('tpm2-tss')
|
||||
checkdepends=('net-tools' 'tpm2-tools')
|
||||
optdepends=('tpm2-tss: support for TPM2 wrapped keys')
|
||||
source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/${pkgname}-${pkgver}.tar.xz{,.sig})
|
||||
backup=(etc/gnutls/config
|
||||
etc/modules-load.d/gnutls.conf)
|
||||
source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/${pkgname}-${pkgver}.tar.xz{,.sig}
|
||||
config)
|
||||
sha256sums=('ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c'
|
||||
'SKIP')
|
||||
'SKIP'
|
||||
'22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5')
|
||||
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
|
||||
#validpgpkeys=('5D46CB0F763405A7053556F47A75A648B3F9220C') # "Zoltan Fridrich <zfridric@redhat.com>"
|
||||
|
||||
|
|
@ -29,8 +33,8 @@ build() {
|
|||
--with-zstd \
|
||||
--with-tpm2 \
|
||||
--enable-openssl-compatibility \
|
||||
--with-default-trust-store-pkcs11="pkcs11:"
|
||||
# --enable-ktls \ # breaks testsuite
|
||||
--with-default-trust-store-pkcs11="pkcs11:" \
|
||||
--enable-ktls
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make
|
||||
}
|
||||
|
|
@ -47,6 +51,14 @@ package() {
|
|||
cd ${pkgname}-${pkgver}
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
# prepare to load tls module required for ktls
|
||||
install -dm755 "$pkgdir"/etc/modules-load.d
|
||||
echo "#tls" > "$pkgdir"/etc/modules-load.d/gnutls.conf
|
||||
|
||||
# disable ktls by default for now
|
||||
install -dm755 "$pkgdir"/etc/gnutls
|
||||
install -Dm644 "${srcdir}"/config "$pkgdir"/etc/gnutls/config
|
||||
|
||||
# lots of .png files are put into infodir and are gzipped by makepkg! this needs to be fixed by using !zipman
|
||||
# gzip -9 all files in infodir and manpages manually
|
||||
find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -n -9 {} \;
|
||||
|
|
|
|||
9
gnutls/config
Normal file
9
gnutls/config
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
# https://gnutls.org/manual/html_node/Enabling_002fDisabling-system_002facceleration-protocols.html#Enabling-KTLS
|
||||
#
|
||||
# GnuTLS is built with -–enable-ktls configuration, KTLS is disabled by default.
|
||||
# This can be enabled by setting ktls = true in [global] section.
|
||||
#
|
||||
|
||||
[global]
|
||||
ktls = false
|
||||
#ktls = true
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=shadow
|
||||
pkgver=4.14.0
|
||||
pkgrel=03
|
||||
pkgrel=04
|
||||
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=(
|
||||
|
|
@ -78,14 +78,12 @@ build() {
|
|||
--with-group-name-max-length=32
|
||||
--with-libpam # PAM integration for chpasswd, groupmems, newusers, passwd
|
||||
--without-libbsd # shadow can use internal implementation for getting passphrase
|
||||
--without-nscd # we do not ship nscd anymore
|
||||
--without-selinux
|
||||
--without-su
|
||||
--without-systemd
|
||||
)
|
||||
# --with-bcrypt
|
||||
# --disable-dependency-tracking
|
||||
# --with-yescrypt
|
||||
#
|
||||
|
||||
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"
|
||||
|
|
@ -111,6 +109,9 @@ package() {
|
|||
install -vDm 644 ../$pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
|
||||
install -vDm 644 ../$pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
|
||||
|
||||
# adapt executables to match the modes used by tmpfiles.d, so that pacman does not complain:
|
||||
chmod 750 "$pkgdir/usr/bin/groupmems"
|
||||
|
||||
# manually add PAM config for chpasswd and newusers: https://github.com/shadow-maint/shadow/issues/810
|
||||
install -vDm 644 etc/pam.d/{chpasswd,newusers} -t "$pkgdir/etc/pam.d/"
|
||||
}
|
||||
|
|
@ -129,7 +130,7 @@ sha256sums=(87e1c5cc10109536132f1b4e29b6df6edc99b70f36f71ff042c2783f2fa01d4f #
|
|||
986562e197f1efef60b4ebab5316c388d630d171fdca74237bff864db0bf4970 # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch
|
||||
5cf3e9c0313f6b0c9f1d56e69ec51522f64f002fc0843fc6172fbfa97b8495e2 # 0003-Add-Arch-Linux-defaults-for-login.defs.patch
|
||||
29448220f2ecfeab0a1a7aae296f07ca522d0a75a5b20df30f83950f9d54531f # shadow.sysusers
|
||||
92cbb5eabdef4639066e3f17195191beb43de0a83c9f447fdd4525e6592b52f2 # shadow.tmpfiles
|
||||
c2faa81b894de452e6cd23660ad7e30a4e03d6a4eacb94ff209c6e578df05e61 # shadow.tmpfiles
|
||||
2d4b7b85ea1d5cddf93c2d636a11b0e76c1f484474449bdb018e3af0fcbd93c3) # useradd.defaults
|
||||
|
||||
## d925945caa3ca2da40a5c3aa5c4101b06f660c5596d4e4d94c2ab8680ad8b0a9 shadow-4.14.0-03-x86_64.pkg.tar.lz
|
||||
## 4ba54cd13c99736d4651ba0a12680e0037c6abad95940511b80c6491a6f586e6 shadow-4.14.0-04-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
pkgname=shadow
|
||||
pkgver=4.14.0
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="Password and account management tool suite with support for shadow files and PAM"
|
||||
arch=(x86_64)
|
||||
url="https://github.com/shadow-maint/shadow"
|
||||
|
|
@ -50,8 +50,8 @@ sha512sums=('ff960481d576f9db5a9f10becc4e1a74c03de484ecfdcd7f1ea735fded683d7ba0f
|
|||
'e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621'
|
||||
'2c8689b52029f6aa27d75b8b05b0b36e2fc322cab40fdfbb50cdbe331f61bc84e8db20f012cf9af3de8c4e7fdb10c2d5a4925ca1ba3b70eb5627772b94da84b3'
|
||||
'5afac4a96b599b0b8ed7be751e7160037c3beb191629928c6520bfd3f2adcd1c55c31029c92c2ff8543e6cd9e37e2cd515ba4e1789c6d66f9c93b4e7f209ee7a'
|
||||
'08a56b16673f282404f3ee026236f3d361045b4448bad7d3cc5d7cbeaf06a1d66a3a3e0848accaebde206741a7998699b9f18bd56a44d93422370567fe8cb180'
|
||||
'e9ffea021ee4031b9ad3a534bfb94dbf9d0dfd45a55ecac5dedb2453ea0c17fb80bbb9ad039686bc1f3349dc371977eb548e3a665c56531469c22f29fc4eced8')
|
||||
'97a6a57c07502e02669dc1a91bffc447dba7d98d208b798d80e07de0d2fdf9d23264453978d2d3d1ba6652ca1f2e22cdadc4309c7b311e83fa71b00ad144f877'
|
||||
'706ba6e7fa8298475f2605a28daffef421c9fa8d269cbd5cbcf7f7cb795b40a24d52c20e8d0b73e29e6cd35cd7226b3e9738dc513703e87dde04c1d24087a69c')
|
||||
b2sums=('6e9a6108f856953ec91c597e46ad4f912101a829c7b3ff3389510be43f56f0a70425bd562119282d73df269df45af354e626741ad748f9c1e6f27b74a462a62c'
|
||||
'SKIP'
|
||||
'77b6e4bc6dc070b992728440fc29a8ed04e8f51cc7e58628f294c68bec7f102c8a80af6a41cf9a3c37d33e7a40ead4f4729f2e68412ab5606e6ecbd3008f5048'
|
||||
|
|
@ -60,8 +60,8 @@ b2sums=('6e9a6108f856953ec91c597e46ad4f912101a829c7b3ff3389510be43f56f0a70425bd5
|
|||
'5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b'
|
||||
'a69191ab966f146c35e7e911e7e57c29fffd54436ea014aa8ffe0dd46aaf57c635d0a652b35916745c75d82b3fca7234366ea5f810b622e94730b45ec86f122c'
|
||||
'511c4ad9f3be530dc17dd68f2a3387d748dcdb84192d35f296b88f82442224477e2a74b1841ec3f107b39a5c41c2d961480e396a48d0578f8fd5f65dbe8d9f04'
|
||||
'b425e7b3d48de694114dfdf378e66175b1ef32cb773be2506813ace8a6dfd1035e7d10c30efb6791df2ae920bdec3aa7cb862ed93bac4cde713c549bd896d1b2'
|
||||
'd5bea0cfc2e6d3d1749c65440ca911533d41b6f8117fe09e9efec23524637cfa823d230303a7fbb45d3cd251bf8036d48b9b21049ced208f7ed191fcbd75e879')
|
||||
'd727923dc6ed02e90ef31f10b3427df50afbfe416bd03c6de0c341857d1bb33ab6168312bd4ba18d19d0653020fb332cbcfeeb24e668ae3916add9d01b89ccb4'
|
||||
'f743922062494fe342036b3acb8b747429eb33b1a13aa150daa4bb71a84e9c570cfcc8527a5f846e3ea7020e6f23c0b10d78cf2ba8363eea0224e4c34ea10161')
|
||||
validpgpkeys=(66D0387DB85D320F8408166DB175CFA98F192AF2) # Serge Hallyn <sergeh@kernel.org>
|
||||
|
||||
prepare() {
|
||||
|
|
@ -93,6 +93,7 @@ build() {
|
|||
--with-group-name-max-length=32
|
||||
--with-libpam # PAM integration for chpasswd, groupmems, newusers, passwd
|
||||
--without-libbsd # shadow can use internal implementation for getting passphrase
|
||||
--without-nscd # we do not ship nscd anymore
|
||||
--without-selinux
|
||||
--without-su # su is provided by util-linux
|
||||
)
|
||||
|
|
@ -128,6 +129,9 @@ package() {
|
|||
install -vDm 644 ../$pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
|
||||
install -vDm 644 ../$pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
|
||||
|
||||
# adapt executables to match the modes used by tmpfiles.d, so that pacman does not complain:
|
||||
chmod 750 "$pkgdir/usr/bin/groupmems"
|
||||
|
||||
# manually add PAM config for chpasswd and newusers: https://github.com/shadow-maint/shadow/issues/810
|
||||
install -vDm 644 etc/pam.d/{chpasswd,newusers} -t "$pkgdir/etc/pam.d/"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
z /usr/bin/groupmems 2710 root groups - -
|
||||
z /usr/bin/groupmems 2750 root groups - -
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ pkgver=${_tag_name/-/}
|
|||
#_pkgmajor=2.39
|
||||
#_realver=${_pkgmajor}
|
||||
#pkgver=${_realver/-/}
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='Miscellaneous system utilities for Linux w/o systemd'
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
#url='https://github.com/util-linux/util-linux'
|
||||
|
|
@ -27,6 +27,7 @@ options=('strip')
|
|||
# yet again in a month three sources for the same software ... lead by a man with a redhat account.
|
||||
# need we say more for the puppets in kernel.org?
|
||||
source=("git+https://github.com/util-linux/util-linux#tag=${_tag}?signed"
|
||||
$pkgbase-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
|
||||
# '0001-meson-install-setuid.patch'
|
||||
pam-{login,common,runuser,su}
|
||||
'util-linux.sysusers'
|
||||
|
|
@ -111,8 +112,9 @@ package_util-linux() {
|
|||
provides=('rfkill' 'hardlink')
|
||||
replaces=('rfkill' 'hardlink')
|
||||
depends=('pam' 'shadow' 'coreutils' 'libudev.so'
|
||||
'libeudev' 'libcap-ng' 'libutempter' 'libcrypt.so'
|
||||
'libxcrypt' 'util-linux-libs' 'libmagic.so' 'libncursesw.so')
|
||||
'libeudev' 'libcap-ng' 'libutempter' 'libcrypt.so'
|
||||
'libxcrypt' 'util-linux-libs' 'libmagic.so' 'libncursesw.so'
|
||||
'readline' 'zlib')
|
||||
optdepends=('words: default dictionary for look')
|
||||
backup=(etc/pam.d/chfn
|
||||
etc/pam.d/chsh
|
||||
|
|
@ -156,6 +158,10 @@ package_util-linux() {
|
|||
|
||||
install -Dm0644 60-rfkill.rules \
|
||||
"${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
|
||||
|
||||
install -vDm 644 $pkgbase/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
install -vDm 644 $pkgbase-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
|
||||
}
|
||||
|
||||
package_util-linux-libs() {
|
||||
|
|
@ -171,17 +177,33 @@ package_util-linux-libs() {
|
|||
mv util-linux-libs/include "$pkgdir"/usr/include
|
||||
mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
|
||||
mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
|
||||
|
||||
install -vDm 644 $pkgbase/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
install -vDm 644 $pkgbase-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
|
||||
}
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL2')
|
||||
# license=('GPL2')
|
||||
license=(
|
||||
'BSD-2-Clause'
|
||||
'BSD-3-Clause'
|
||||
'BSD-4-Clause-UC'
|
||||
'GPL-2.0-only'
|
||||
'GPL-2.0-or-later'
|
||||
'GPL-3.0-or-later'
|
||||
'ISC'
|
||||
'LGPL-2.1-or-later'
|
||||
'LicenseRef-PublicDomain'
|
||||
)
|
||||
|
||||
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
|
||||
|
||||
sha256sums=(SKIP # util-linux
|
||||
6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a # util-linux-BSD-2-Clause.txt
|
||||
99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f # pam-login
|
||||
57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af # pam-common
|
||||
48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1 # pam-runuser
|
||||
|
|
@ -189,7 +211,5 @@ sha256sums=(SKIP # util-linux
|
|||
10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3 # util-linux.sysusers
|
||||
7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37) # 60-rfkill.rules
|
||||
|
||||
## a8df5e87c7a094ec3706dee490e8118f8321c9aa351ef5824da72023a27efe8a util-linux-2.39.2-01-x86_64.pkg.tar.lz
|
||||
## b509755f32e890f74e4fb82101421bdb09f94fdbd21bf3ff19d6b9ba62c23faa util-linux-libs-2.39.2-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
## aebada94591e47c3d524688e2d6ae14b90a1d5fe1af7fb74752982e465c5be07 util-linux-2.39.2-02-x86_64.pkg.tar.lz
|
||||
## fdd5ae17afac79b75e4f9eebdb6e96d2313c6a2d3a2a50110cbd16d6274b8a29 util-linux-libs-2.39.2-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -13,16 +13,28 @@ url='https://github.com/util-linux/util-linux'
|
|||
arch=('x86_64')
|
||||
makedepends=('git' 'meson' 'asciidoctor' 'bash-completion' 'libcap-ng'
|
||||
'libutempter' 'libxcrypt' 'python' 'systemd')
|
||||
license=('GPL2')
|
||||
license=(
|
||||
'BSD-2-Clause'
|
||||
'BSD-3-Clause'
|
||||
'BSD-4-Clause-UC'
|
||||
'GPL-2.0-only'
|
||||
'GPL-2.0-or-later'
|
||||
'GPL-3.0-or-later'
|
||||
'ISC'
|
||||
'LGPL-2.1-or-later'
|
||||
'LicenseRef-PublicDomain'
|
||||
)
|
||||
options=('strip')
|
||||
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
|
||||
source=("git+https://github.com/util-linux/util-linux#tag=${_tag}?signed"
|
||||
$pkgbase-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
|
||||
pam-{login,common,runuser,su}
|
||||
'util-linux.sysusers'
|
||||
'60-rfkill.rules'
|
||||
'rfkill-unblock_.service'
|
||||
'rfkill-block_.service')
|
||||
sha256sums=('SKIP'
|
||||
'6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a'
|
||||
'99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
|
||||
'57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
|
||||
'48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
|
||||
|
|
@ -83,9 +95,9 @@ package_util-linux() {
|
|||
conflicts=('rfkill' 'hardlink')
|
||||
provides=('rfkill' 'hardlink')
|
||||
replaces=('rfkill' 'hardlink')
|
||||
depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
|
||||
depends=('glibc' 'pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
|
||||
'libudev.so' 'libcap-ng' 'libutempter' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
|
||||
'libmagic.so' 'libncursesw.so')
|
||||
'libmagic.so' 'libncursesw.so' 'readline' 'zlib')
|
||||
optdepends=('words: default dictionary for look')
|
||||
backup=(etc/pam.d/chfn
|
||||
etc/pam.d/chsh
|
||||
|
|
@ -137,6 +149,9 @@ package_util-linux() {
|
|||
"${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
|
||||
install -Dm0644 rfkill-block_.service \
|
||||
"${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
|
||||
|
||||
install -vDm 644 $pkgbase/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
install -vDm 644 $pkgbase-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_util-linux-libs() {
|
||||
|
|
@ -152,4 +167,7 @@ package_util-linux-libs() {
|
|||
mv util-linux-libs/include "$pkgdir"/usr/include
|
||||
mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
|
||||
mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
|
||||
|
||||
install -vDm 644 $pkgbase/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
install -vDm 644 $pkgbase-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
|
|
|||
26
util-linux/util-linux-BSD-2-Clause.txt
Normal file
26
util-linux/util-linux-BSD-2-Clause.txt
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
xxHash Library
|
||||
Copyright (c) 2012-2021 Yann Collet
|
||||
All rights reserved.
|
||||
|
||||
BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification,
|
||||
are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice, this
|
||||
list of conditions and the following disclaimer in the documentation and/or
|
||||
other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
Loading…
Reference in a new issue