maj kerberos#1.8.1-1

3 files changed, 33 insertions, 69 deletions

diff --git a/base/kerberos/.footprint b/base/kerberos/.footprint
index fcf23644a..28db4340f 100644
--- a/base/kerberos/.footprint
+++ b/base/kerberos/.footprint
@@ -10,26 +10,23 @@ lrwxrwxrwx	root/root	lib/libkrb5support.so.0 -> libkrb5support.so.0.1
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gss-client
+-rwxr-xr-x	root/root	usr/bin/k5srvutil
+-rwxr-xr-x	root/root	usr/bin/kadmin
 -rwxr-xr-x	root/root	usr/bin/kdestroy
--rwxr-xr-x	root/root	usr/bin/kftp
 -rwxr-xr-x	root/root	usr/bin/kinit
 -rwxr-xr-x	root/root	usr/bin/klist
 -rwxr-xr-x	root/root	usr/bin/kpasswd
 -rwxr-xr-x	root/root	usr/bin/krb5-config
--rwxr-xr-x	root/root	usr/bin/krb524init
--rwxr-xr-x	root/root	usr/bin/krcp
--rwxr-xr-x	root/root	usr/bin/krlogin
--rwxr-xr-x	root/root	usr/bin/krsh
--rwxr-xr-x	root/root	usr/bin/ktelnet
--rwxr-xr-x	root/root	usr/bin/kuuclient
+-rwxr-xr-x	root/root	usr/bin/ktutil
+-rwxr-xr-x	root/root	usr/bin/kuucclient
 -rwxr-xr-x	root/root	usr/bin/kvno
 -rwxr-xr-x	root/root	usr/bin/sclient
 -rwxr-xr-x	root/root	usr/bin/sim_client
--rwsr-xr-x	root/root	usr/bin/v4rcp
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/gssapi.h
 drwxr-xr-x	root/root	usr/include/gssapi/
 -rw-r--r--	root/root	usr/include/gssapi/gssapi.h
+-rw-r--r--	root/root	usr/include/gssapi/gssapi_ext.h
 -rw-r--r--	root/root	usr/include/gssapi/gssapi_generic.h
 -rw-r--r--	root/root	usr/include/gssapi/gssapi_krb5.h
 -rw-r--r--	root/root	usr/include/gssapi/mechglue.h
@@ -50,12 +47,11 @@ drwxr-xr-x	root/root	usr/include/gssrpc/
 -rw-r--r--	root/root	usr/include/gssrpc/svc_auth.h
 -rw-r--r--	root/root	usr/include/gssrpc/types.h
 -rw-r--r--	root/root	usr/include/gssrpc/xdr.h
-drwxr-xr-x	root/root	usr/include/kerberosIV/
--rw-r--r--	root/root	usr/include/kerberosIV/des.h
--rw-r--r--	root/root	usr/include/kerberosIV/kadm_err.h
--rw-r--r--	root/root	usr/include/kerberosIV/krb.h
--rw-r--r--	root/root	usr/include/kerberosIV/krb_err.h
--rw-r--r--	root/root	usr/include/kerberosIV/mit-copyright.h
+drwxr-xr-x	root/root	usr/include/kadm5/
+-rw-r--r--	root/root	usr/include/kadm5/admin.h
+-rw-r--r--	root/root	usr/include/kadm5/chpass_util_strings.h
+-rw-r--r--	root/root	usr/include/kadm5/kadm_err.h
+-rw-r--r--	root/root	usr/include/kdb.h
 -rw-r--r--	root/root	usr/include/krb5.h
 drwxr-xr-x	root/root	usr/include/krb5/
 -rw-r--r--	root/root	usr/include/krb5/krb5.h
@@ -64,56 +60,46 @@ drwxr-xr-x	root/root	usr/include/krb5/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/krb5/
 drwxr-xr-x	root/root	usr/lib/krb5/plugins/
+drwxr-xr-x	root/root	usr/lib/krb5/plugins/authdata/
 drwxr-xr-x	root/root	usr/lib/krb5/plugins/kdb/
 -rw-r--r--	root/root	usr/lib/krb5/plugins/kdb/db2.so
 drwxr-xr-x	root/root	usr/lib/krb5/plugins/libkrb5/
 drwxr-xr-x	root/root	usr/lib/krb5/plugins/preauth/
+-rw-r--r--	root/root	usr/lib/krb5/plugins/preauth/encrypted_challenge.so
 -rw-r--r--	root/root	usr/lib/krb5/plugins/preauth/pkinit.so
-lrwxrwxrwx	root/root	usr/lib/libdes425.so -> libdes425.so.3.0
-lrwxrwxrwx	root/root	usr/lib/libdes425.so.3 -> libdes425.so.3.0
--rw-r--r--	root/root	usr/lib/libdes425.so.3.0
 lrwxrwxrwx	root/root	usr/lib/libgssapi_krb5.so -> libgssapi_krb5.so.2.2
 lrwxrwxrwx	root/root	usr/lib/libgssapi_krb5.so.2 -> libgssapi_krb5.so.2.2
 -rw-r--r--	root/root	usr/lib/libgssapi_krb5.so.2.2
-lrwxrwxrwx	root/root	usr/lib/libgssrpc.so -> libgssrpc.so.4.0
-lrwxrwxrwx	root/root	usr/lib/libgssrpc.so.4 -> libgssrpc.so.4.0
--rw-r--r--	root/root	usr/lib/libgssrpc.so.4.0
+lrwxrwxrwx	root/root	usr/lib/libgssrpc.so -> libgssrpc.so.4.1
+lrwxrwxrwx	root/root	usr/lib/libgssrpc.so.4 -> libgssrpc.so.4.1
+-rw-r--r--	root/root	usr/lib/libgssrpc.so.4.1
 lrwxrwxrwx	root/root	usr/lib/libk5crypto.so -> ../../lib/libk5crypto.so.3.1
-lrwxrwxrwx	root/root	usr/lib/libkadm5clnt.so -> libkadm5clnt.so.5.1
-lrwxrwxrwx	root/root	usr/lib/libkadm5clnt.so.5 -> libkadm5clnt.so.5.1
--rw-r--r--	root/root	usr/lib/libkadm5clnt.so.5.1
-lrwxrwxrwx	root/root	usr/lib/libkadm5srv.so -> libkadm5srv.so.5.1
-lrwxrwxrwx	root/root	usr/lib/libkadm5srv.so.5 -> libkadm5srv.so.5.1
--rw-r--r--	root/root	usr/lib/libkadm5srv.so.5.1
+lrwxrwxrwx	root/root	usr/lib/libkadm5clnt.so -> libkadm5clnt_mit.so
+lrwxrwxrwx	root/root	usr/lib/libkadm5clnt_mit.so -> libkadm5clnt_mit.so.7.0
+lrwxrwxrwx	root/root	usr/lib/libkadm5clnt_mit.so.7 -> libkadm5clnt_mit.so.7.0
+-rw-r--r--	root/root	usr/lib/libkadm5clnt_mit.so.7.0
+lrwxrwxrwx	root/root	usr/lib/libkadm5srv.so -> libkadm5srv_mit.so
+lrwxrwxrwx	root/root	usr/lib/libkadm5srv_mit.so -> libkadm5srv_mit.so.7.0
+lrwxrwxrwx	root/root	usr/lib/libkadm5srv_mit.so.7 -> libkadm5srv_mit.so.7.0
+-rw-r--r--	root/root	usr/lib/libkadm5srv_mit.so.7.0
 lrwxrwxrwx	root/root	usr/lib/libkdb5.so -> libkdb5.so.4.0
 lrwxrwxrwx	root/root	usr/lib/libkdb5.so.4 -> libkdb5.so.4.0
 -rw-r--r--	root/root	usr/lib/libkdb5.so.4.0
-lrwxrwxrwx	root/root	usr/lib/libkrb4.so -> libkrb4.so.2.0
-lrwxrwxrwx	root/root	usr/lib/libkrb4.so.2 -> libkrb4.so.2.0
--rw-r--r--	root/root	usr/lib/libkrb4.so.2.0
 lrwxrwxrwx	root/root	usr/lib/libkrb5.so -> ../../lib/libkrb5.so.3.3
 lrwxrwxrwx	root/root	usr/lib/libkrb5support.so -> ../../lib/libkrb5support.so.0.1
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/gss-server
--rwxr-xr-x	root/root	usr/sbin/k5srvutil
--rwxr-xr-x	root/root	usr/sbin/kadmin
 -rwxr-xr-x	root/root	usr/sbin/kadmin.local
 -rwxr-xr-x	root/root	usr/sbin/kadmind
 -rwxr-xr-x	root/root	usr/sbin/kdb5_util
--rwxr-xr-x	root/root	usr/sbin/kftpd
--rwxr-xr-x	root/root	usr/sbin/klogind
 -rwxr-xr-x	root/root	usr/sbin/kprop
 -rwxr-xr-x	root/root	usr/sbin/kpropd
+-rwxr-xr-x	root/root	usr/sbin/kproplog
 -rwxr-xr-x	root/root	usr/sbin/krb5-send-pr
--rwxr-xr-x	root/root	usr/sbin/krb524d
 -rwxr-xr-x	root/root	usr/sbin/krb5kdc
--rwxr-xr-x	root/root	usr/sbin/kshd
--rwxr-xr-x	root/root	usr/sbin/ktelnetd
--rwxr-xr-x	root/root	usr/sbin/ktutil
--rwxr-xr-x	root/root	usr/sbin/kuuserver
--rwxr-xr-x	root/root	usr/sbin/login.krb5
 -rwxr-xr-x	root/root	usr/sbin/sim_server
 -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/examples/
 drwxr-xr-x	root/root	usr/share/examples/krb5/
@@ -124,44 +110,31 @@ drwxr-xr-x	root/root	usr/share/gnats/
 -rw-r--r--	root/root	usr/share/gnats/mit
 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
+-rw-r--r--	root/root	usr/share/man/man1/kadmin.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/kdestroy.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/kerberos.1.gz
--rw-r--r--	root/root	usr/share/man/man1/kftp.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/kinit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/klist.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/kpasswd.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/krb5-config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/krb5-send-pr.1.gz
--rw-r--r--	root/root	usr/share/man/man1/krb524init.1.gz
--rw-r--r--	root/root	usr/share/man/man1/krcp.1.gz
--rw-r--r--	root/root	usr/share/man/man1/krlogin.1.gz
--rw-r--r--	root/root	usr/share/man/man1/krsh.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ksu.1.gz
--rw-r--r--	root/root	usr/share/man/man1/ktelnet.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ktutil.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/kvno.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/sclient.1.gz
--rw-r--r--	root/root	usr/share/man/man1/tmac.doc.gz
--rw-r--r--	root/root	usr/share/man/man1/v4rcp.1.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/.k5login.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/kdc.conf.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/krb5.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/k5srvutil.8.gz
--rw-r--r--	root/root	usr/share/man/man8/kadmin.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/kadmin.local.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/kadmind.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/kdb5_util.8.gz
--rw-r--r--	root/root	usr/share/man/man8/kftpd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/klogind.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/kprop.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/kpropd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/krb524d.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/kproplog.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/krb5kdc.8.gz
--rw-r--r--	root/root	usr/share/man/man8/kshd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/ktelnetd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/ktutil.8.gz
--rw-r--r--	root/root	usr/share/man/man8/login.krb5.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/sserver.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
diff --git a/base/kerberos/.md5sum b/base/kerberos/.md5sum
index 9ccc41a9b..ccaaa66ad 100644
--- a/base/kerberos/.md5sum
+++ b/base/kerberos/.md5sum
@@ -1 +1 @@
-2dc1307686eb1c2bf1ab08ea805dad46  krb5-1.6.3-signed.tar
+e29a78b108c4687f7e7937110d1d0415  krb5-1.8.1-signed.tar
diff --git a/base/kerberos/Pkgfile b/base/kerberos/Pkgfile
index 9c42a43ae..903bac153 100644
--- a/base/kerberos/Pkgfile
+++ b/base/kerberos/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on:
 
 name=kerberos
-version=1.6.3
+version=1.8.1
 release=1
-source=(http://web.mit.edu/$name/www/dist/krb5/1.6/krb5-$version-signed.tar)
+source=(http://web.mit.edu/$name/www/dist/krb5/1.8/krb5-$version-signed.tar)
 build()  {
 	tar xf krb5-${version}-signed.tar
 	tar xzf krb5-${version}.tar.gz
@@ -25,16 +25,7 @@ build()  {
 	make -j3
 	make DESTDIR=$PKG install
 
-	for file in telnet ftp rcp rlogin rsh uuclient; do
-		mv ${PKG}/usr/bin/$file ${PKG}/usr/bin/k${file}
-	done
-	for file in ftpd telnetd uuserver; do
-		mv ${PKG}/usr/sbin/$file ${PKG}/usr/sbin/k${file}
-	done
-	for file in telnet.1 ftp.1 rcp.1 rsh.1 rlogin.1 telnetd.8 ftpd.8; do
-		mv ${PKG}/usr/share/man/man`echo $file | cut -f2 -d.`/$file \
-		${PKG}/usr/share/man/man`echo $file | cut -f2 -d.`/k${file}
-	done
+	mv ${PKG}/usr/bin/uuclient ${PKG}/usr/bin/kuucclient
 
 	mkdir -p $PKG/{lib,bin}
 	mv -v $PKG/usr/bin/ksu $PKG/bin