diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 9cc62c1..4c80486 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Levente Polyak pkgname=krb5 -_pkgvermajor=1.19 -pkgver=1.19.3 +_pkgvermajor=1.20 +pkgver=1.20 pkgrel=1 pkgdesc='The Kerberos network authentication system' url='https://web.mit.edu/kerberos/' arch=('x86_64') license=('custom') -depends=('glibc' 'e2fsprogs' 'libldap' 'keyutils' - libkeyutils.so libss.so libcom_err.so) +depends=('glibc' 'e2fsprogs' 'libldap' 'keyutils' 'libverto-module' + libkeyutils.so libss.so libcom_err.so libverto.so) makedepends=('perl') provides=( libgssapi_krb5.so @@ -22,7 +22,6 @@ provides=( libkrad.so libkrb5.so libkrb5support.so - libverto.so ) backup=( 'etc/krb5.conf' @@ -36,9 +35,9 @@ source=(https://web.mit.edu/kerberos/dist/krb5/${_pkgvermajor}/${pkgname}-${pkgv krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) -sha512sums=('18235440d6f7d8a72c5d7ca5cd8c6465e8adf091d85c483225c7b00d64b4688c1c7924cb800c2fc17e590b2709f1a9de48e6ec79f6debd11dcb7d6fa16c6f351' +sha512sums=('9aed84a971a4d74188468870260087ec7c3a614cceb5fe32ad7da1cb8db3d66e00df801c9f900f0131ac56eb828674b8be93df474c2d13b892b70c7977388604' 'SKIP' - '5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801' + '5debf9dd2d0da84ff6a9e18887fc1bbd0530cc131ac2292ea725f89da8cc84c4b864ebbd1c92eff11d63b98643bff910da3dda40ddc9e1c43f4ce7bd2b6f54dd' 'ae1fa980e8e30a83dfef7fe233be70a9ec530ebaffc344a0e7eba61e7de4c800421b45cf203f1e526cc8351754038d6539184b30aa049a567e2a9e80f0d39841' 'b137ff0154f9af4891e9e78cec692af47ecfd92ca9ce6e00b40ef137d942ba04e8caf483fc5d464b9559ad4a5c4e75ec57b6eab7fc35181115ca1606c0b316c1' 'b57bbe55c19c92a04cd3e8ad569adcc5aedd4246075b2e6dbcc363e523853332a3e7650be85098b91e495799f8b728ea550495ab303f46ccd9298a2260120b2f' @@ -60,7 +59,6 @@ prepare() { build() { cd ${pkgname}-${pkgver}/src export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" - export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ @@ -69,10 +67,9 @@ build() { --with-system-et \ --with-system-ss \ --disable-rpath \ - --without-tcl \ --enable-dns-for-realm \ --with-ldap \ - --without-system-verto + --with-system-verto make } diff --git a/trunk/krb5-config_LDFLAGS.patch b/trunk/krb5-config_LDFLAGS.patch index 1b85086..83be474 100644 --- a/trunk/krb5-config_LDFLAGS.patch +++ b/trunk/krb5-config_LDFLAGS.patch @@ -1,7 +1,30 @@ -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 @@ +From 0bfd22feb6493f34fdc894daaf680c3a2f2e7784 Mon Sep 17 00:00:00 2001 +From: Greg Hudson +Date: Tue, 3 May 2022 01:56:05 -0400 +Subject: [PATCH] Omit LDFLAGS from krb5-config --libs output + +Linker options supplied at configure time (such as -Wl,--as-needed) +can be harmful when applied to downstream users of the libraries, and +in most cases should not be necessary. + +ticket: 9057 (new) +--- + src/build-tools/krb5-config.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in +index dead0dddce7..8e6eb866018 100755 +--- a/src/build-tools/krb5-config.in ++++ b/src/build-tools/krb5-config.in +@@ -33,7 +33,6 @@ includedir=@includedir@ + libdir=@libdir@ + CC_LINK='@CC_LINK@' + KDB5_DB_LIB=@KDB5_DB_LIB@ +-LDFLAGS='@LDFLAGS@' + RPATH_FLAG='@RPATH_FLAG@' + PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@' + PTHREAD_CFLAGS='@PTHREAD_CFLAGS@' +@@ -220,7 +219,7 @@ if test -n "$do_libs"; then -e 's#\$(PROG_RPATH)#'$libdir'#' \ -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \