diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/krb5/APKBUILD | 19 | ||||
| -rw-r--r-- | main/krb5/mit-krb5_krb5-config_LDFLAGS.patch | 6 | ||||
| -rw-r--r-- | main/krb5/musl-util_plugins.patch | 15 |
3 files changed, 31 insertions, 9 deletions
diff --git a/main/krb5/APKBUILD b/main/krb5/APKBUILD index a5eee006c3..0663100a21 100644 --- a/main/krb5/APKBUILD +++ b/main/krb5/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=krb5 -pkgver=1.17.1 +pkgver=1.18 pkgrel=0 pkgdesc="The Kerberos network authentication system" url="https://web.mit.edu/kerberos/www/" @@ -10,7 +10,7 @@ depends="krb5-conf" depends_dev="e2fsprogs-dev" makedepends="$depends_dev libverto-dev openldap-dev openssl-dev keyutils-dev bison flex perl" -options="suid !check" +options="suid" subpackages="$pkgname-dev $pkgname-doc $pkgname-server $pkgname-server-ldap:ldap $pkgname-pkinit $pkgname-libs" @@ -21,11 +21,13 @@ esac source="https://web.mit.edu/kerberos/dist/krb5/$_maj_min/krb5-$pkgver.tar.gz mit-krb5_krb5-config_LDFLAGS.patch + musl-util_plugins.patch krb5kadmind.initd krb5kdc.initd krb5kpropd.initd " +builddir="$srcdir/$pkgname-$pkgver/src" # secfixes: # 1.15.4-r0: @@ -36,7 +38,6 @@ source="https://web.mit.edu/kerberos/dist/krb5/$_maj_min/krb5-$pkgver.tar.gz # - CVE-2018-5710 build() { - cd "$builddir"/src ./configure \ CPPFLAGS="$CPPFLAGS -fPIC -I/usr/include/et" \ WARN_CFLAGS= \ @@ -45,6 +46,7 @@ build() { --prefix=/usr \ --localstatedir=/var/lib \ --enable-shared \ + --disable-nls \ --disable-static \ --disable-rpath \ --with-system-et \ @@ -55,8 +57,11 @@ build() { make } +check() { + make check-unix +} + package() { - cd "$builddir"/src make install DESTDIR="$pkgdir" mkdir -p "$pkgdir"/usr/share/doc/$pkgname mv "$pkgdir"/usr/share/examples "$pkgdir"/usr/share/doc/$pkgname/ @@ -105,8 +110,10 @@ libs() { mkdir -p "$subpkgdir"/usr/ mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="e0c3dc0a6554ab3105ac32f3f01519f56064500213aa743816235d83250abc1db9a9ca38a2ba93a938d562b4af135a013017ce96346d6742bca0c812b842ceef krb5-1.17.1.tar.gz -5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801 mit-krb5_krb5-config_LDFLAGS.patch + +sha512sums="36a01ea310b4b3d0a3d209b641739575239e1ca5e93b3de99cb1fec83e82f9a70ad0761dd6eb77cda5c18c53044ab80168b00725642a0c2dfde0e492c42af6a9 krb5-1.18.tar.gz +5c62cbcbf1ef0462323f3392a362b42ed301967a1de80ddcb27eece4fad23efeeb5f04f5af521cfffff36b918bb93813262aa62785e59d6cb5af437a2c9e886d mit-krb5_krb5-config_LDFLAGS.patch +82f4c92dfcfc3e9ac819502f6ab2f9b65b534edf7e8f3d9ef08a6091f378914056779d9b5172e7066a41c2d2f1e929c8fc9d67537c449c3b88a7508486e5f293 musl-util_plugins.patch 43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682 krb5kadmind.initd ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec krb5kdc.initd 45be0d421efd41e9dd056125a750c90856586e990317456b68170d733b03cba9ecd18ab87603b20e49575e7839fb4a6d628255533f2631f9e8ddb7f3cc493a90 krb5kpropd.initd" diff --git a/main/krb5/mit-krb5_krb5-config_LDFLAGS.patch b/main/krb5/mit-krb5_krb5-config_LDFLAGS.patch index 1b85086739..9ae52264cd 100644 --- a/main/krb5/mit-krb5_krb5-config_LDFLAGS.patch +++ b/main/krb5/mit-krb5_krb5-config_LDFLAGS.patch @@ -1,7 +1,7 @@ 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 @@ +--- a/build-tools/krb5-config.in ++++ b/build-tools/krb5-config.in +@@ -221,7 +221,7 @@ -e 's#\$(PROG_RPATH)#'$libdir'#' \ -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ diff --git a/main/krb5/musl-util_plugins.patch b/main/krb5/musl-util_plugins.patch new file mode 100644 index 0000000000..7723dae8e3 --- /dev/null +++ b/main/krb5/musl-util_plugins.patch @@ -0,0 +1,15 @@ +--- a/util/support/plugins.c ++++ b/util/support/plugins.c +@@ -64,10 +64,12 @@ + */ + #ifdef __linux__ + #include <features.h> ++#if defined(__GLIBC__) + #if ! __GLIBC_PREREQ(2, 25) + #define dlclose(x) + #endif + #endif ++#endif + + #if USE_DLOPEN && USE_CFBUNDLE + #include <CoreFoundation/CoreFoundation.h> |