# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1583080220 -3600
# Node ID 5e70242061ce6fa8f5903d364b94c36c9fdf2f63
# Parent  4dc397f1cd331cb2f572ca8b4df66bf2448da09b
updated krb5 packages (1.17 -> 1.18)

diff -r 4dc397f1cd33 -r 5e70242061ce krb5-clients/receipt
--- a/krb5-clients/receipt	Sun Mar 01 17:01:17 2020 +0100
+++ b/krb5-clients/receipt	Sun Mar 01 17:30:20 2020 +0100
@@ -1,22 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="krb5-clients"
-VERSION="1.17"
+VERSION="1.18"
 CATEGORY="security"
 SHORT_DESC="Miscellaneous clients using MIT Kerberos."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://web.mit.edu/kerberos/"
 
+DEPENDS="libkrb5"
 WANTED="krb5"
-DEPENDS="libkrb5"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	while read file; do
+	while read file
+	  do
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
-		cp -a $install$file $fs$dir
-	done < $wanted_stuff/$PACKAGE.files-list
+		cp -a $install$file	$fs$dir
+	  done < $wanted_stuff/$PACKAGE.files-list
 }
diff -r 4dc397f1cd33 -r 5e70242061ce krb5-dev/receipt
--- a/krb5-dev/receipt	Sun Mar 01 17:01:17 2020 +0100
+++ b/krb5-dev/receipt	Sun Mar 01 17:30:20 2020 +0100
@@ -1,22 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="krb5-dev"
-VERSION="1.17"
+VERSION="1.18"
 CATEGORY="development"
-SHORT_DESC="Network authentication protocol development files."
+SHORT_DESC="Network authentication protocol - development files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://web.mit.edu/kerberos/"
 
+DEPENDS="libkrb5"
 WANTED="krb5"
-DEPENDS="libkrb5"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	while read file; do
+	while read file
+	  do
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
-		cp -a $install$file $fs$dir
-	done < $wanted_stuff/$PACKAGE.files-list
+		cp -a $install$file	$fs$dir
+	  done < $wanted_stuff/$PACKAGE.files-list
 }
diff -r 4dc397f1cd33 -r 5e70242061ce krb5-plugins/receipt
--- a/krb5-plugins/receipt	Sun Mar 01 17:01:17 2020 +0100
+++ b/krb5-plugins/receipt	Sun Mar 01 17:30:20 2020 +0100
@@ -1,22 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="krb5-plugins"
-VERSION="1.17"
+VERSION="1.18"
 CATEGORY="security"
 SHORT_DESC="Plugins for MIT Kerberos."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://web.mit.edu/kerberos/"
 
+DEPENDS="krb5 libcrypto"
 WANTED="krb5"
-DEPENDS="krb5 libcrypto"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	while read file; do
+	while read file
+	  do
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
-		cp -a $install$file $fs$dir
-	done < $wanted_stuff/$PACKAGE.files-list
+		cp -a $install$file	$fs$dir
+	  done < $wanted_stuff/$PACKAGE.files-list
 }
diff -r 4dc397f1cd33 -r 5e70242061ce krb5-user/receipt
--- a/krb5-user/receipt	Sun Mar 01 17:01:17 2020 +0100
+++ b/krb5-user/receipt	Sun Mar 01 17:30:20 2020 +0100
@@ -1,22 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="krb5-user"
-VERSION="1.17"
+VERSION="1.18"
 CATEGORY="security"
 SHORT_DESC="Basic programs to authenticate using MIT Kerberos."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://web.mit.edu/kerberos/"
 
+DEPENDS="krb5"
 WANTED="krb5"
-DEPENDS="krb5"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	while read file; do
+	while read file
+	  do
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
-		cp -a $install$file $fs$dir
-	done < $wanted_stuff/$PACKAGE.files-list
+		cp -a $install$file	$fs$dir
+	  done < $wanted_stuff/$PACKAGE.files-list
 }
diff -r 4dc397f1cd33 -r 5e70242061ce krb5/receipt
--- a/krb5/receipt	Sun Mar 01 17:01:17 2020 +0100
+++ b/krb5/receipt	Sun Mar 01 17:30:20 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="krb5"
-VERSION="1.17"
+VERSION="1.18"
 CATEGORY="security"
 SHORT_DESC="Network authentication protocol with strong authentication."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -11,36 +11,29 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}dist/$PACKAGE/$VERSION/$TARBALL"
 
-
 DEPENDS="libkrb5"
 BUILD_DEPENDS="bison openssl-dev perl"
+
 CONFIG_FILES="/etc/krb5"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-#	srcdir=$PACKAGE-$VERSION
-#	[ -d $src/src ] || tar xzf $src/$srcdir.tar.gz 
-	# This is for cookutils. If more than one file was extracted it create
-	# $PACKAGE-$VERSION to move files in it. Krb5 is the only package like
-	# that so we do the trick here.
-#	if [ -d "$srcdir" -a -x /usr/bin/cook ]; then
-#		mv $srcdir $CACHE && cd .. && rm -rf * && mv -f $CACHE/$srcdir .
-#	else
-#		mv $srcdir/* .
-#	fi
-
 	cd $src/src
 
 	# FS#25384
 #	sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-	patch --input=$stuff/krb5-1.17-ac_check_krb5.m4.patch	\
-		util/ac_check_krb5.m4
+
+#	patch --input=$stuff/krb5-1.17-ac_check_krb5.m4.patch	\
+#		util/ac_check_krb5.m4
+	# in 1.18 replaced by:
+	# --with-kerberos5=/usr
 
 	CFLAGS="-march=$ARCH -O2 -pipe -fomit-frame-pointer"
 	CXXFLAGS="$CFLAGS"
 
 	./configure			\
+		--with-kerberos5=/usr	\
 		--localstatedir=/var	\
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS -j 1 &&
@@ -50,16 +43,18 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/etc
+	mkdir -p $fs/usr
+	mkdir -p $fs/etc
 
 	cp -a $install/usr/share/examples/krb5	$fs/etc
 	cp -a $install/usr/bin			$fs/usr
 	cp -a $install/usr/sbin			$fs/usr
 	cp -a $install/usr/lib			$fs/usr
 
-	cat $stuff/*.files-list | while read file; do
+	cat $stuff/*.files-list | while read file
+	  do
 		rm -rf ${fs}$file
-	done
+	  done
 }
 
 # Pre and post install commands for Tazpkg.