upgpkg: krb5-git 1.21.2.r19.g6c5471176-1

8 files changed, 97 insertions, 135 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7647bb76955d..d46f01e3ddd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,49 @@
 pkgbase = krb5-git
 	pkgdesc = The Kerberos network authentication system
-	pkgver = 1.18.2
+	pkgver = 1.21.2.r19.g6c5471176
 	pkgrel = 1
 	url = https://web.mit.edu/kerberos/
+	arch = i686
 	arch = x86_64
 	license = custom
+	makedepends = git
 	makedepends = perl
+	depends = glibc
 	depends = e2fsprogs
-	depends = libldap
 	depends = keyutils
-	provides = krb5
+	depends = libcom_err.so
+	depends = libkeyutils.so
+	depends = libldap
+	depends = libss.so
+	depends = libverto-module-base
+	depends = libverto.so
+	depends = openssl
+	provides = krb5=1.21.2.r19.g6c5471176
+	provides = libgssapi_krb5.so
+	provides = libgssrpc.so
+	provides = libk5crypto.so
+	provides = libkadm5clnt_mit.so
+	provides = libkadm5srv_mit.so
+	provides = libkdb5.so
+	provides = libkdb_ldap.so
+	provides = libkrad.so
+	provides = libkrb5.so
+	provides = libkrb5support.so
 	conflicts = krb5
 	options = !emptydirs
 	backup = etc/krb5.conf
 	backup = var/lib/krb5kdc/kdc.conf
-	source = git+https://github.com/krb5/krb5
-	source = krb5-config_LDFLAGS.patch
-	source = krb5-kadmind.service
-	source = krb5-kdc.service
-	source = krb5-kpropd.service
-	source = krb5-kpropd@.service
-	source = krb5-kpropd.socket
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
+	source = git+https://github.com/krb5/krb5.git
+	source = https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kadmind.service
+	source = https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kdc.service
+	source = https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kpropd.service
+	source = https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kpropd.socket
+	source = https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kpropd@.service
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = krb5-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 6cf0adefb8f9..8bb01da0a1c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,92 +1,92 @@
-# Maintainer:  Vincent Grande <shoober420@gmail.com>
+# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
+# Previous maintainer:  Vincent Grande <shoober420@gmail.com>
 # Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
 
 pkgname=krb5-git
-pkgver=1.18.2
+pkgver=1.21.2.r19.g6c5471176
 pkgrel=1
-pkgdesc='The Kerberos network authentication system'
-url='https://web.mit.edu/kerberos/'
-arch=('x86_64')
+pkgdesc="The Kerberos network authentication system"
+arch=('i686' 'x86_64')
+url="https://web.mit.edu/kerberos/"
 license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-provides=(krb5)
-conflicts=(krb5)
+depends=('glibc' 'e2fsprogs' 'keyutils' 'libcom_err.so' 'libkeyutils.so' 'libldap' 'libss.so'
+         'libverto-module-base' 'libverto.so' 'openssl')
+makedepends=('git' 'perl')
+provides=("krb5=$pkgver" 'libgssapi_krb5.so' 'libgssrpc.so' 'libk5crypto.so' 'libkadm5clnt_mit.so'
+          'libkadm5srv_mit.so' 'libkdb5.so' 'libkdb_ldap.so' 'libkrad.so' 'libkrb5.so' 'libkrb5support.so')
+conflicts=('krb5')
 backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 options=('!emptydirs')
-source=("git+https://github.com/krb5/krb5"
-        krb5-config_LDFLAGS.patch
-        krb5-kadmind.service
-        krb5-kdc.service
-        krb5-kpropd.service
-        krb5-kpropd@.service
-        krb5-kpropd.socket)
-sha512sums=('SKIP'
-            'SKIP'
+source=("git+https://github.com/krb5/krb5.git"
+        "https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kadmind.service"
+        "https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kdc.service"
+        "https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kpropd.service"
+        "https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kpropd.socket"
+        "https://gitlab.archlinux.org/archlinux/packaging/packages/krb5/-/raw/main/krb5-kpropd@.service")
+sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP')
-#validpgpkeys=('2C732B1C0DBEF678AB3AF606A32F17FD0055C305'  # Tom Yu <tlyu@mit.edu>
-#              'C4493CB739F4A89F9852CBC20CBA08575F8372DF') # Greg Hudson <ghudson@mit.edu>
 
-pkgver() {
-    cd krb5
-    git describe --tags --always  | sed 's/-/+/g'
-}
 
 prepare() {
-  cd krb5
+  cd "krb5"
 
-  # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
-  patch -p1 < "${srcdir}"/krb5-config_LDFLAGS.patch
+  sed -i "/KRB5ROOT=/s/\/local//" "src/util/ac_check_krb5.m4"
+}
+
+pkgver() {
+  cd "krb5"
 
-  # FS#25384
-  sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4
+  _tag=$(git tag -l --sort -v:refname | grep -E '^krb5-[0-9\.]+-final' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^krb5-//;s/-final//'
 }
 
 build() {
-   cd krb5/src
-   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
-   export CPPFLAGS+=" -I/usr/include/et"
-
-   autoreconf -fi
-
-   ./configure --prefix=/usr \
-               --sbindir=/usr/bin \
-               --sysconfdir=/etc \
-               --localstatedir=/var/lib \
-               --enable-shared \
-               --with-system-et \
-               --with-system-ss \
-               --disable-rpath \
-               --without-tcl \
-               --enable-dns-for-realm \
-               --with-ldap \
-               --without-system-verto
-   make
+  cd "krb5/src"
+
+  autoreconf -fi
+  ./configure \
+    --prefix="/usr" \
+    --localstatedir="/var/lib" \
+    --sbindir="/usr/bin" \
+    --sysconfdir="/etc" \
+    --enable-dns-for-realm \
+    --with-ldap \
+    --with-system-et \
+    --with-system-ss \
+    --with-system-verto
+  make
+}
+
+check() {
+  cd "krb5/src"
+
+  #make check
 }
 
 package() {
-   cd krb5/src
-   make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/krb5/examples install
+  cd "krb5"
 
-   # Fix FS#29889
-   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} \
-     "${pkgdir}/usr/share/doc/krb5/examples"
+  make \
+    -C "src" \
+    DESTDIR="$pkgdir" \
+    EXAMPLEDIR="/usr/share/doc/krb5/examples" \
+    install
+  install -Dm644 "NOTICE" -t "$pkgdir/usr/share/licenses/krb5"
 
-   install -Dpm 644 config-files/krb5.conf -t "${pkgdir}/etc"
-   install -Dpm 644 config-files/kdc.conf -t "${pkgdir}/var/lib/krb5kdc"
+  # Fix FS#29889
+  install -Dm644 "src/plugins/kdb/ldap/libkdb_ldap"/kerberos.{ldif,schema} -t "$pkgdir/usr/share/doc/$pkgname/examples"
 
-   install -Dm 644 util/ac_check_krb5.m4 -t "${pkgdir}/usr/share/aclocal"
+  install -Dm644 "src/config-files/krb5.conf" -t "$pkgdir/etc"
+  install -Dm644 "src/config-files/kdc.conf" -t "$pkgdir/var/lib/krb5kdc"
 
-   install -Dm 644 "${srcdir}"/krb5/NOTICE \
-     "${pkgdir}/usr/share/licenses/krb5/LICENSE"
+  install -Dm644 "src/util/ac_check_krb5.m4" -t "$pkgdir/usr/share/aclocal"
 
-   # systemd stuff
-   install -Dm 644 "${srcdir}"/krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \
-      -t "${pkgdir}/usr/lib/systemd/system"
+  # systemd stuff
+  install -Dm644 "$srcdir"/krb5-{kadmind.service,kdc.service,kpropd.service,kpropd.socket,kpropd@.service} -t "$pkgdir/usr/lib/systemd/system"
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/krb5-config_LDFLAGS.patch b/krb5-config_LDFLAGS.patch
deleted file mode 100644
index 1b850867398b..000000000000
--- a/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)##'`
- 
diff --git a/krb5-kadmind.service b/krb5-kadmind.service
deleted file mode 100644
index 4819e0df4492..000000000000
--- a/krb5-kadmind.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 administration server
-
-[Service]
-ExecStart=/usr/bin/kadmind -nofork
-
-[Install]
-WantedBy=multi-user.target
diff --git a/krb5-kdc.service b/krb5-kdc.service
deleted file mode 100644
index 4918f600058f..000000000000
--- a/krb5-kdc.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 KDC
-
-[Service]
-ExecStart=/usr/bin/krb5kdc -n
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/krb5-kpropd.service b/krb5-kpropd.service
deleted file mode 100644
index c6c32243185c..000000000000
--- a/krb5-kpropd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Service]
-ExecStart=/usr/bin/kpropd -S
-
-[Install]
-WantedBy=multi-user.target
diff --git a/krb5-kpropd.socket b/krb5-kpropd.socket
deleted file mode 100644
index 4389290c0b16..000000000000
--- a/krb5-kpropd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Socket]
-ListenStream=754
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/krb5-kpropd@.service b/krb5-kpropd@.service
deleted file mode 100644
index 989270f12578..000000000000
--- a/krb5-kpropd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-Conflicts=krb5-kpropd.service
-
-[Service]
-ExecStart=/usr/bin/kpropd
-StandardInput=socket
-StandardError=syslog