Update 1.3.6 --> 1.4

7 files changed, 18 insertions, 39 deletions

diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index f1bddec939d9..41b23be535aa 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.3.6
-PORTREVISION=		1
+PORTVERSION=		1.4
 CATEGORIES=		security
-MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/
+MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION}/
 EXTRACT_SUFX=		.tar
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
 
@@ -25,9 +24,11 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS?=	--enable-shared
+USE_LIBTOOL_VER=	15
+CONFIGURE_ARGS?=	--enable-shared --enable-static
+CONFIGURE_ARGS+=	--disable-thread-support
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
-			CFLAGS="${CFLAGS}"
+			CFLAGS="${CFLAGS} -DNDEBUG"
 MAKE_ARGS=		INSTALL="${INSTALL}"
 KRB5_KRB4_COMPAT?=	NO
 
@@ -46,7 +47,7 @@ INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
 			krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \
 			krb5-install.info-1 krb5-install.info-2 krb5-user.info
 
-MAN1=			krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \
+MAN1=			krb5-send-pr.1 kpasswd.1 klist.1 kinit.1 \
 			kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1     \
 			ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
 .if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo
index 69f797a0949d..fdd372887903 100644
--- a/security/krb5-17/distinfo
+++ b/security/krb5-17/distinfo
@@ -1,2 +1,2 @@
-MD5 (krb5-1.3.6-signed.tar) = 18d5a6a8e1cce120536718d39a052a87
-SIZE (krb5-1.3.6-signed.tar) = 6533120
+MD5 (krb5-1.4-signed.tar) = 2fa56607677544e3a27b42f7cfa1155b
+SIZE (krb5-1.4-signed.tar) = 6625280
diff --git a/security/krb5-17/files/patch-config::pre.in b/security/krb5-17/files/patch-config::pre.in
index fc3ff4c7a047..bdd183e98ad4 100644
--- a/security/krb5-17/files/patch-config::pre.in
+++ b/security/krb5-17/files/patch-config::pre.in
@@ -1,9 +1,10 @@
---- config/pre.in.orig	Tue May 27 21:06:28 2003
-+++ config/pre.in	Wed Aug  6 11:11:54 2003
-@@ -152,6 +152,7 @@
+--- config/pre.in.orig	Fri Nov 19 13:47:51 2004
++++ config/pre.in	Thu Jan 27 17:43:12 2005
+@@ -177,7 +177,7 @@
  INSTALL=@INSTALL@
  INSTALL_STRIP=
  INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
+-INSTALL_SCRIPT=@INSTALL_PROGRAM@
 +INSTALL_SCRIPT=@INSTALL_SCRIPT@
  INSTALL_DATA=@INSTALL_DATA@
  INSTALL_SHLIB=@INSTALL_SHLIB@
diff --git a/security/krb5-17/files/patch-config::shlib.conf b/security/krb5-17/files/patch-config::shlib.conf
index 48d5e9a51f8b..afd4eb259ea2 100644
--- a/security/krb5-17/files/patch-config::shlib.conf
+++ b/security/krb5-17/files/patch-config::shlib.conf
@@ -4,7 +4,7 @@
  	PICFLAGS=-fpic
  	if test "x$objformat" = "xelf" ; then
  		SHLIBVEXT='.so.$(LIBMAJOR)'
-+		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
++		LDCOMBINE="libtool15 --mode=link cc -shared"
  		RPATH_FLAG='-Wl,-rpath -Wl,'
  	else
 +		LDCOMBINE='ld -Bshareable'
diff --git a/security/krb5-17/files/patch-kadmin::cli::Makefile.in b/security/krb5-17/files/patch-kadmin::cli::Makefile.in
deleted file mode 100644
index 266deea90231..000000000000
--- a/security/krb5-17/files/patch-kadmin::cli::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- kadmin/cli/Makefile.in.orig	Fri Feb  7 13:41:20 2003
-+++ kadmin/cli/Makefile.in	Tue Aug  5 16:32:02 2003
-@@ -21,7 +21,7 @@
- install::
- 	$(INSTALL_PROGRAM) $(PROG).local ${DESTDIR}$(ADMIN_BINDIR)/$(PROG).local
- 	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
--	$(INSTALL_PROGRAM) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil
-+	$(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil
- 	$(INSTALL_DATA) $(srcdir)/k5srvutil.M ${DESTDIR}$(ADMIN_MANDIR)/k5srvutil.8
- 	$(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8
- 	$(INSTALL_DATA) $(srcdir)/$(PROG).local.M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).local.8
diff --git a/security/krb5-17/files/patch-lib::krb5::krb::srv_rcache.c b/security/krb5-17/files/patch-lib::krb5::krb::srv_rcache.c
deleted file mode 100644
index 79e16f93110d..000000000000
--- a/security/krb5-17/files/patch-lib::krb5::krb::srv_rcache.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/krb5/krb/srv_rcache.c	1999-09-24 17:19:48.000000000 -0400
-+++ lib/krb5/krb/srv_rcache.c	2003-02-03 19:29:32.000000000 -0500
-@@ -48,6 +48,9 @@
-     unsigned long uid = geteuid();
- #endif
-     
-+    if (piece == NULL)
-+	return ENOMEM;
-+
-     rcache = (krb5_rcache) malloc(sizeof(*rcache));
-     if (!rcache)
- 	return ENOMEM;
diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist
index 55f03d68c13b..06bc8158a5b0 100644
--- a/security/krb5-17/pkg-plist
+++ b/security/krb5-17/pkg-plist
@@ -21,7 +21,6 @@ bin/sim_client
 bin/telnet
 bin/uuclient
 %%KRB4%%bin/v4rcp
-bin/v5passwd
 include/com_err.h
 include/gssapi/gssapi.h
 include/gssapi/gssapi_generic.h
@@ -53,7 +52,7 @@ lib/libgssapi_krb5.so
 lib/libgssapi_krb5.so.2
 lib/libgssrpc.a
 lib/libgssrpc.so
-lib/libgssrpc.so.3
+lib/libgssrpc.so.4
 lib/libk5crypto.a
 lib/libk5crypto.so
 lib/libk5crypto.so.3
@@ -72,13 +71,15 @@ lib/libkdb5.so.4
 lib/libkrb5.a
 lib/libkrb5.so
 lib/libkrb5.so.3
+lib/libkrb5support.a
+lib/libkrb5support.so
+lib/libkrb5support.so.0
 sbin/ftpd
 sbin/gss-server
 sbin/k5srvutil
 sbin/kadmin
 sbin/kadmin.local
 sbin/kadmind
-%%KRB4%%sbin/kadmind4
 sbin/kdb5_util
 sbin/klogind
 sbin/kprop
@@ -93,7 +94,6 @@ sbin/sim_server
 sbin/sserver
 sbin/telnetd
 sbin/uuserver
-sbin/v5passwdd
 share/doc/krb5/README.FreeBSD
 share/et/et_c.awk
 share/et/et_h.awk