From ef4dcf39f7fa3d78ab5d8d6e05c2e7e636257731 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 22 Feb 2018 20:33:10 +0000 Subject: krb5: update to 1.16 --- abs/core/krb5/PKGBUILD | 96 +++++++++++++++------------------ abs/core/krb5/krb5-1.10.1-gcc47.patch | 11 ---- abs/core/krb5/krb5-config_LDFLAGS.patch | 12 +++++ abs/core/krb5/krb5-kadmind | 40 -------------- abs/core/krb5/krb5-kadmind.service | 2 +- abs/core/krb5/krb5-kdc | 40 -------------- abs/core/krb5/krb5-kdc.service | 2 +- abs/core/krb5/krb5-kpropd | 40 -------------- abs/core/krb5/krb5-kpropd.service | 2 +- abs/core/krb5/krb5-kpropd@.service | 2 +- 10 files changed, 59 insertions(+), 188 deletions(-) delete mode 100644 abs/core/krb5/krb5-1.10.1-gcc47.patch create mode 100644 abs/core/krb5/krb5-config_LDFLAGS.patch delete mode 100644 abs/core/krb5/krb5-kadmind delete mode 100644 abs/core/krb5/krb5-kdc delete mode 100644 abs/core/krb5/krb5-kpropd diff --git a/abs/core/krb5/PKGBUILD b/abs/core/krb5/PKGBUILD index 9fce5eb..4f6f841 100644 --- a/abs/core/krb5/PKGBUILD +++ b/abs/core/krb5/PKGBUILD @@ -1,56 +1,52 @@ -# $Id: PKGBUILD 162178 2012-06-22 17:24:25Z stephane $ -# Maintainer: Stéphane Gaudreault +# Maintainer: Levente Polyak pkgname=krb5 -pkgver=1.10.2 -pkgrel=3 -pkgdesc="The Kerberos network authentication system" -arch=('i686' 'x86_64') -url="http://web.mit.edu/kerberos/" +_pkgvermajor=1.16 +pkgver=${_pkgvermajor} +pkgrel=1 +pkgdesc='The Kerberos network authentication system' +url='https://web.mit.edu/kerberos/' +arch=('x86_64') license=('custom') depends=('e2fsprogs' 'libldap' 'keyutils') makedepends=('perl') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') -source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar - krb5-1.10.1-gcc47.patch - krb5-kadmind +options=('!emptydirs') +source=(https://web.mit.edu/kerberos/dist/krb5/${_pkgvermajor}/${pkgname}-${pkgver}.tar.gz{,.asc} + krb5-config_LDFLAGS.patch krb5-kadmind.service - krb5-kdc krb5-kdc.service - krb5-kpropd krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) -sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' - '78b759d566b1fdefd9bbcd06df14f07f12effe96' - '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' - 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' - '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e' - '7f402078fa65bb9ff1beb6cbbbb017450df78560' - '614401dd4ac18e310153240bb26eb32ff1e8cf5b' - '023a8164f8ee7066ac814486a68bc605e79f6101' - 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') -options=('!emptydirs') +sha512sums=('7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9' + 'SKIP' + '5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801' + 'ae1fa980e8e30a83dfef7fe233be70a9ec530ebaffc344a0e7eba61e7de4c800421b45cf203f1e526cc8351754038d6539184b30aa049a567e2a9e80f0d39841' + 'b137ff0154f9af4891e9e78cec692af47ecfd92ca9ce6e00b40ef137d942ba04e8caf483fc5d464b9559ad4a5c4e75ec57b6eab7fc35181115ca1606c0b316c1' + 'b57bbe55c19c92a04cd3e8ad569adcc5aedd4246075b2e6dbcc363e523853332a3e7650be85098b91e495799f8b728ea550495ab303f46ccd9298a2260120b2f' + 'a31ed42e988fed892dd3f1ca1942c3cd4bf391d894c9cebe5e91f52797392261e129727590ae06e2f727bb7b0f8d73a7aa35e8b983d6bad77f22a099091ee944' + '4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55') +validpgpkeys=('2C732B1C0DBEF678AB3AF606A32F17FD0055C305' # Tom Yu + 'C4493CB739F4A89F9852CBC20CBA08575F8372DF') # Greg Hudson -build() { - tar zxvf ${pkgname}-${pkgver}.tar.gz - cd "${srcdir}/${pkgname}-${pkgver}/src" +prepare() { + cd ${pkgname}-${pkgver} - # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized - # in this function [-Werror=maybe-uninitialized] - # As this is generated code, just ignore the complaint. - patch -Np2 -i ../../krb5-1.10.1-gcc47.patch - rm lib/krb5/krb/deltat.c + # cf https://bugs.gentoo.org/show_bug.cgi?id=448778 + patch -p1 < "${srcdir}"/krb5-config_LDFLAGS.patch - # FS#25384 - sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4 +} +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 \ - --mandir=/usr/share/man \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ --localstatedir=/var/lib \ --enable-shared \ --with-system-et \ @@ -64,30 +60,24 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}/src" + cd ${pkgname}-${pkgver}/src make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install # Fix FS#29889 - install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples - - # Sample KDC config file - install -dm 755 "${pkgdir}"/var/lib/krb5kdc - install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} \ + "${pkgdir}/usr/share/doc/${pkgname}/examples" - # Default configuration file - install -dm 755 "${pkgdir}"/etc - install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + install -Dpm 644 config-files/krb5.conf -t "${pkgdir}/etc" + install -Dpm 644 config-files/kdc.conf -t "${pkgdir}/var/lib/krb5kdc" - install -dm 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d + install -Dm 644 util/ac_check_krb5.m4 -t "${pkgdir}/usr/share/aclocal" - install -dm 755 "${pkgdir}"/usr/share/aclocal - install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal - - install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -Dm 644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # systemd stuff - install -dm 755 "${pkgdir}"/usr/lib/systemd/system - install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \ - "${pkgdir}"/usr/lib/systemd/system + install -Dm 644 "${srcdir}"/krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \ + -t "${pkgdir}/usr/lib/systemd/system" } + +# vim: ts=2 sw=2 et: diff --git a/abs/core/krb5/krb5-1.10.1-gcc47.patch b/abs/core/krb5/krb5-1.10.1-gcc47.patch deleted file mode 100644 index ffd01c2..0000000 --- a/abs/core/krb5/krb5-1.10.1-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y ---- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400 -+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400 -@@ -44,6 +44,7 @@ - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wuninitialized" -+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" - #endif - - #include diff --git a/abs/core/krb5/krb5-config_LDFLAGS.patch b/abs/core/krb5/krb5-config_LDFLAGS.patch new file mode 100644 index 0000000..1b85086 --- /dev/null +++ b/abs/core/krb5/krb5-config_LDFLAGS.patch @@ -0,0 +1,12 @@ +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)##'` + diff --git a/abs/core/krb5/krb5-kadmind b/abs/core/krb5/krb5-kadmind deleted file mode 100644 index 04df0dc..0000000 --- a/abs/core/krb5/krb5-kadmind +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kadmind` -case "$1" in - start) - stat_busy "Starting Kerberos Admin Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kadmind - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kadmind - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Admin Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kadmind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/abs/core/krb5/krb5-kadmind.service b/abs/core/krb5/krb5-kadmind.service index f3836c8..4819e0d 100644 --- a/abs/core/krb5/krb5-kadmind.service +++ b/abs/core/krb5/krb5-kadmind.service @@ -2,7 +2,7 @@ Description=Kerberos 5 administration server [Service] -ExecStart=/usr/sbin/kadmind -nofork +ExecStart=/usr/bin/kadmind -nofork [Install] WantedBy=multi-user.target diff --git a/abs/core/krb5/krb5-kdc b/abs/core/krb5/krb5-kdc deleted file mode 100644 index 05a0341..0000000 --- a/abs/core/krb5/krb5-kdc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/krb5kdc` -case "$1" in - start) - stat_busy "Starting Kerberos Authentication" - if [ -z "$PID" ]; then - /usr/sbin/krb5kdc - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kdc - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Authentication" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kdc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/abs/core/krb5/krb5-kdc.service b/abs/core/krb5/krb5-kdc.service index 6ec93bb..4918f60 100644 --- a/abs/core/krb5/krb5-kdc.service +++ b/abs/core/krb5/krb5-kdc.service @@ -2,7 +2,7 @@ Description=Kerberos 5 KDC [Service] -ExecStart=/usr/sbin/krb5kdc -n +ExecStart=/usr/bin/krb5kdc -n Restart=always [Install] diff --git a/abs/core/krb5/krb5-kpropd b/abs/core/krb5/krb5-kpropd deleted file mode 100644 index a0077d6..0000000 --- a/abs/core/krb5/krb5-kpropd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kpropd` -case "$1" in - start) - stat_busy "Starting Kerberos Database Propagation Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kpropd -S - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon kpropd - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Database Propagation Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kpropd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/abs/core/krb5/krb5-kpropd.service b/abs/core/krb5/krb5-kpropd.service index a7c5b57..c6c3224 100644 --- a/abs/core/krb5/krb5-kpropd.service +++ b/abs/core/krb5/krb5-kpropd.service @@ -2,7 +2,7 @@ Description=Kerberos 5 propagation server [Service] -ExecStart=/usr/sbin/kpropd -S +ExecStart=/usr/bin/kpropd -S [Install] WantedBy=multi-user.target diff --git a/abs/core/krb5/krb5-kpropd@.service b/abs/core/krb5/krb5-kpropd@.service index 46f7e36..989270f 100644 --- a/abs/core/krb5/krb5-kpropd@.service +++ b/abs/core/krb5/krb5-kpropd@.service @@ -3,6 +3,6 @@ Description=Kerberos 5 propagation server Conflicts=krb5-kpropd.service [Service] -ExecStart=/usr/sbin/kpropd +ExecStart=/usr/bin/kpropd StandardInput=socket StandardError=syslog -- cgit v0.12