diff options
| author | Leigh Arber <builder@Adelie-A7EEA3.vpn.adelielinux.org> | 2024-01-26 15:42:48 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2024-03-17 10:44:33 +0000 |
| commit | 38b76d7a964a1cb82ea6e6f2c7f6fb4db47372d8 (patch) | |
| tree | 493db9f2f62a59765a36c1438476534f6e31ee2e | |
| parent | ea2ac106d239bd13d7322940c5821ab09c194a2a (diff) | |
| download | packages-38b76d7a964a1cb82ea6e6f2c7f6fb4db47372d8.tar.gz packages-38b76d7a964a1cb82ea6e6f2c7f6fb4db47372d8.tar.bz2 packages-38b76d7a964a1cb82ea6e6f2c7f6fb4db47372d8.tar.xz packages-38b76d7a964a1cb82ea6e6f2c7f6fb4db47372d8.zip | |
user/krb5: Update 1.18.2 to 1.21.2
Closes: #374
| -rw-r--r-- | user/krb5/APKBUILD | 29 | ||||
| -rw-r--r-- | user/krb5/mit-krb5_krb5-config_LDFLAGS.patch | 12 |
2 files changed, 22 insertions, 19 deletions
diff --git a/user/krb5/APKBUILD b/user/krb5/APKBUILD index 731bc7c08..030f62fe3 100644 --- a/user/krb5/APKBUILD +++ b/user/krb5/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krb5 -pkgver=1.18.2 +pkgver=1.21.2 pkgrel=0 case $pkgver in *.*.*) _ver=${pkgver%.*};; @@ -9,17 +9,16 @@ esac pkgdesc="The Kerberos network authentication system" url="http://web.mit.edu/kerberos/www/" arch="all" -options="suid !check" # Tests require Python 2. +options="suid !check" # FIXME license="MIT" depends="krb5-conf" depends_dev="e2fsprogs-dev" makedepends="$depends_dev keyutils-dev libverto-dev openssl-dev byacc flex perl" +checkdepends="python3" subpackages="$pkgname-dev $pkgname-doc $pkgname-pkinit $pkgname-server $pkgname-libs" -source="http://web.mit.edu/kerberos/dist/krb5/${_ver}/krb5-$pkgver.tar.gz - mit-krb5_krb5-config_LDFLAGS.patch - +source="https://web.mit.edu/kerberos/dist/krb5/${_ver}/krb5-$pkgver.tar.gz krb5kadmind.initd krb5kdc.initd krb5kpropd.initd @@ -45,6 +44,23 @@ build() { make } +check() { + cd "$builddir"/src + + # temporarily skip tests that fail to run out of the box + # (refer to comments on !743) + sed -i tests/Makefile \ + -e '/^SUBDIRS =/s@gssapi@@g' \ + -e '/t_keytab/d' \ + ; + make check + + # manually run skipped tests + make -C tests/gssapi check + #PYTHONPATH=util python3 tests/t_keytab.py -v +} + + package() { cd "$builddir"/src make install DESTDIR="$pkgdir" @@ -87,8 +103,7 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c krb5-1.18.2.tar.gz -5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801 mit-krb5_krb5-config_LDFLAGS.patch +sha512sums="4e09296b412383d53872661718dbfaa90201e0d85f69db48e57a8d4bd73c95a90c7ec7b6f0f325f6bc967f8d203b256b071c0191facf080aca0e2caec5d0ac49 krb5-1.21.2.tar.gz 43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682 krb5kadmind.initd ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec krb5kdc.initd 45be0d421efd41e9dd056125a750c90856586e990317456b68170d733b03cba9ecd18ab87603b20e49575e7839fb4a6d628255533f2631f9e8ddb7f3cc493a90 krb5kpropd.initd" diff --git a/user/krb5/mit-krb5_krb5-config_LDFLAGS.patch b/user/krb5/mit-krb5_krb5-config_LDFLAGS.patch deleted file mode 100644 index 1b8508673..000000000 --- a/user/krb5/mit-krb5_krb5-config_LDFLAGS.patch +++ /dev/null @@ -1,12 +0,0 @@ -Bug #448778 ---- krb5-1.11/src/build-tools/krb5-config.in 2012-12-18 02:47:04.000000000 +0000 -+++ krb5-1.11/src/build-tools/krb5-config.in 2012-12-28 07:13:16.582693363 +0000 -@@ -217,7 +217,7 @@ - -e 's#\$(PROG_RPATH)#'$libdir'#' \ - -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ - -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ -- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ -+ -e 's#\$(LDFLAGS)##' \ - -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ - -e 's#\$(CFLAGS)##'` - |