krb5: 1.20.1 -> 1.21

krb5/.footprint

@@ -140,6 +140,8 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/sserver
 -rwxr-xr-x	root/root	usr/sbin/uuserver
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/aclocal/
+-rw-r--r--	root/root	usr/share/aclocal/ac_check_krb5.m4
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/k5srvutil.1.gz
@@ -176,5 +178,3 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/sserver.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/krb5kdc/
-drwxr-xr-x	root/root	var/run/
-drwxr-xr-x	root/root	var/run/krb5kdc/

krb5/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bgucI6xEJkSjN2DYxLuiVPoITDeVC9sfV8NI2gsWbtKTK2MWVBZ6h63/5J9HYJtkMpYyoQBpa6TBzciKbT88wk=
-SHA256 (Pkgfile) = b85e073ac13785aebb1d92466727f11c5717360ca72edc8b6825d2ff805869bb
-SHA256 (.footprint) = d7ca1fe941dae718c124da87fef8c5ef43e333847e313fbfd50d4e8c5b51bc37
-SHA256 (krb5-1.20.1.tar.gz) = 704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
-SHA256 (krb5) = e99b414a3c1b788809889c3348ceba7f764ef9185c16c28702bf2d174478e4e1
+RWSE3ohX2g5d/RhBxuSTV3Ig+sEFyHZhFY374YDOzwOL/c2GYv1s4U2OFoMHeYiJ6mXtbgzS4imR+BAq9Vr5pp8UyJ0nmUT7bQg=
+SHA256 (Pkgfile) = b5285f325417b6fb610b59594bc6c275823b481dcf0b1910970e3dfec7b2af81
+SHA256 (.footprint) = 2d2de16dd0eedc10b734016427892590c72c7bc4647eeac047372937446f761a
+SHA256 (krb5-1.21.tar.gz) = 69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b
+SHA256 (krb5) = a213277296ea8a6d3e25996052103e7b3576cefd61a1b5f36d1af0d44e151256

krb5/Pkgfile

@@ -2,9 +2,10 @@
 # URL: https://web.mit.edu/kerberos
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Depends on: e2fsprogs openssl
+# Optional: keyutils openldap
 
 name=krb5
-version=1.20.1
+version=1.21
 release=1
 source=(https://kerberos.org/dist/$name/${version::4}/$name-$version.tar.gz
 	krb5)
@@ -12,10 +13,15 @@ source=(https://kerberos.org/dist/$name/${version::4}/$name-$version.tar.gz
 build() {
 	cd $name-$version/src
 
-	./configure \
+	sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
+
+	prt-get isinst openldap && PKGMK_KRB5+=' --with-ldap'
+	prt-get isinst keyutils || PKGMK_KRB5+=' --without-keyutils'
+
+	./configure $PKGMK_KRB5 \
 		--prefix=/usr \
 		--localstatedir=/var \
-		--runstatedir=/var/run \
+		--runstatedir=/run \
 		--enable-shared \
 		--disable-rpath \
 		--disable-nls \
@@ -28,7 +34,6 @@ build() {
 	make
 	make DESTDIR=$PKG install
 
-
 	# move essential libs and the ksu binary to /lib resp. /bin
 	install -d $PKG/{bin,lib}
 
@@ -42,8 +47,11 @@ build() {
 	ln -sf ../../lib/$(readlink $PKG/usr/lib/libk5crypto.so) $PKG/usr/lib/libk5crypto.so
 	ln -sf ../../lib/$(readlink $PKG/usr/lib/libkrb5support.so) $PKG/usr/lib/libkrb5support.so
 
+	install -Dm 644 util/ac_check_krb5.m4 -t $PKG/usr/share/aclocal
+
 	# cleanup
 	rm -r $PKG/usr/share/{examples,man/cat*}
+	rm -r $PKG/run
 
 	# start script
 	install -D -m 0755 $SRC/krb5 $PKG/etc/rc.d/krb5

krb5/krb5

@@ -8,9 +8,9 @@ KRB5KDC=/usr/sbin/krb5kdc
 KADMIND=/usr/sbin/kadmind
 KPROPD=/usr/sbin/kpropd
 
-
 print_status() {
 	$SSD --status --exec $1
+
 	case $? in
 		0)   echo "$1 is running with pid $(pidof $1)" ;;
 		1|3) echo "$1 is not running" ;;
@@ -19,26 +19,26 @@ print_status() {
 }
 
 case $1 in
-start)
+	start)
 		$SSD --start --exec $KRB5KDC
 		$SSD --start --exec $KADMIND
 		$SSD --start --exec $KPROPD
 	;;
-stop)
+	stop)
 		$SSD --stop --retry 10 --exec $KPROPD
 		$SSD --stop --retry 10 --exec $KADMIND
 		$SSD --stop --retry 10 --exec $KRB5KDC
 	;;
-restart)
+	restart)
 		$0 stop
 		$0 start
 	;;
-status)
+	status)
 		print_status $KRB5KDC
 		print_status $KADMIND
 		print_status $KPROPD
 	;;
-*)
+	*)
 		echo "usage: $0 [start|stop|restart|status]"
 	;;
 esac