4 files changed, 5 insertions, 27 deletions
diff --git a/security/krb5/files/patch-config::pre.in b/security/krb5/files/patch-config::pre.in
index fc3ff4c7a047..bdd183e98ad4 100644
--- a/security/krb5/files/patch-config::pre.in
+++ b/security/krb5/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/files/patch-config::shlib.conf b/security/krb5/files/patch-config::shlib.conf
index 48d5e9a51f8b..afd4eb259ea2 100644
--- a/security/krb5/files/patch-config::shlib.conf
+++ b/security/krb5/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/files/patch-kadmin::cli::Makefile.in b/security/krb5/files/patch-kadmin::cli::Makefile.in
deleted file mode 100644
index 266deea90231..000000000000
--- a/security/krb5/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/files/patch-lib::krb5::krb::srv_rcache.c b/security/krb5/files/patch-lib::krb5::krb::srv_rcache.c
deleted file mode 100644
index 79e16f93110d..000000000000
--- a/security/krb5/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;