15 files changed, 14 insertions, 341 deletions

diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 795c2fcd2e1e..f1f4e150315a 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.5
-PORTREVISION=		1
+PORTVERSION=		1.5.1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
diff --git a/security/krb5/distinfo b/security/krb5/distinfo
index b50af585ebd2..7f4fba77bb52 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/distinfo
@@ -1,3 +1,3 @@
-MD5 (krb5-1.5-signed.tar) = 5be6ec9d69cc73339e5bfda421eea5bc
-SHA256 (krb5-1.5-signed.tar) = ac8e85284d9997807406938bc9f785c7997fd6eb5e6a2a5807b3d6cba62137b1
-SIZE (krb5-1.5-signed.tar) = 9984000
+MD5 (krb5-1.5.1-signed.tar) = c8618ca9d87f794b8d71d447a202e12d
+SHA256 (krb5-1.5.1-signed.tar) = af3011fee19c696fac4e7a7d85365b4351d98cbee57a9d45f6c229c72aca8fb5
+SIZE (krb5-1.5.1-signed.tar) = 10065920
diff --git a/security/krb5/files/patch-appl-bsd-configure b/security/krb5/files/patch-appl-bsd-configure
deleted file mode 100644
index 8217a378868c..000000000000
--- a/security/krb5/files/patch-appl-bsd-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/bsd/configure.orig	Fri Jun 30 22:09:38 2006
-+++ appl/bsd/configure	Sun Jul 16 08:39:50 2006
-@@ -5307,13 +5307,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5372,7 +5372,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-appl-configure b/security/krb5/files/patch-appl-configure
deleted file mode 100644
index 7958b2d6c82b..000000000000
--- a/security/krb5/files/patch-appl-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/configure.orig	Fri Jun 30 22:09:59 2006
-+++ appl/configure	Sun Jul 16 08:38:49 2006
-@@ -5305,13 +5305,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5370,7 +5370,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-appl-gssftp-configure b/security/krb5/files/patch-appl-gssftp-configure
deleted file mode 100644
index ca5a5bec02a4..000000000000
--- a/security/krb5/files/patch-appl-gssftp-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/gssftp/configure.orig	Fri Jun 30 22:09:46 2006
-+++ appl/gssftp/configure	Sun Jul 16 08:40:49 2006
-@@ -5303,13 +5303,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5368,7 +5368,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-appl-libpty-configure b/security/krb5/files/patch-appl-libpty-configure
deleted file mode 100644
index 47cd9e21262d..000000000000
--- a/security/krb5/files/patch-appl-libpty-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/libpty/configure.orig	Fri Jun 30 22:09:27 2006
-+++ appl/libpty/configure	Sun Jul 16 08:41:51 2006
-@@ -5304,13 +5304,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5369,7 +5369,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-appl-telnet-configure b/security/krb5/files/patch-appl-telnet-configure
deleted file mode 100644
index c3aa120125c3..000000000000
--- a/security/krb5/files/patch-appl-telnet-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/telnet/configure.orig	Fri Jun 30 22:09:57 2006
-+++ appl/telnet/configure	Sun Jul 16 08:37:35 2006
-@@ -5304,13 +5304,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5369,7 +5369,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-configure b/security/krb5/files/patch-configure
deleted file mode 100644
index d4e8f7f756d4..000000000000
--- a/security/krb5/files/patch-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Fri Jun 30 22:10:17 2006
-+++ configure	Sun Jul 16 08:03:41 2006
-@@ -5337,13 +5337,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -c... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5402,7 +5402,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-lib-krb5-os-dnsglue.c b/security/krb5/files/patch-lib-krb5-os-dnsglue.c
new file mode 100644
index 000000000000..756d04289133
--- /dev/null
+++ b/security/krb5/files/patch-lib-krb5-os-dnsglue.c
@@ -0,0 +1,10 @@
+--- lib/krb5/os/dnsglue.c.orig	Sat Sep 16 22:57:46 2006
++++ lib/krb5/os/dnsglue.c	Sat Sep 16 22:58:25 2006
+@@ -100,6 +100,7 @@
+ #endif
+ 
+ #if USE_RES_NINIT
++    memset(&statbuf, 0, sizeof statbuf);
+     ret = res_ninit(&statbuf);
+ #else
+     ret = res_init();
diff --git a/security/krb5/files/patch-plugins-kdb-db2-configure b/security/krb5/files/patch-plugins-kdb-db2-configure
deleted file mode 100644
index 11f54c68b352..000000000000
--- a/security/krb5/files/patch-plugins-kdb-db2-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- plugins/kdb/db2/configure.orig	Fri Jun 30 22:09:11 2006
-+++ plugins/kdb/db2/configure	Sun Jul 16 08:30:10 2006
-@@ -5306,13 +5306,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5371,7 +5371,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-plugins-kdb-db2-libdb2-configure b/security/krb5/files/patch-plugins-kdb-db2-libdb2-configure
deleted file mode 100644
index eb7b508bd287..000000000000
--- a/security/krb5/files/patch-plugins-kdb-db2-libdb2-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- plugins/kdb/db2/libdb2/configure.orig	Fri Jun 30 22:09:08 2006
-+++ plugins/kdb/db2/libdb2/configure	Sun Jul 16 08:44:43 2006
-@@ -5306,13 +5306,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5371,7 +5371,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-plugins-lib-apputils-configure b/security/krb5/files/patch-plugins-lib-apputils-configure
deleted file mode 100644
index 01af89e918d7..000000000000
--- a/security/krb5/files/patch-plugins-lib-apputils-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/apputils/configure.orig	Fri Jun 30 22:08:53 2006
-+++ lib/apputils/configure	Sun Jul 16 08:35:35 2006
-@@ -5266,13 +5266,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5331,7 +5331,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-plugins-locate-python-configure b/security/krb5/files/patch-plugins-locate-python-configure
deleted file mode 100644
index 91e3817787fd..000000000000
--- a/security/krb5/files/patch-plugins-locate-python-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- plugins/locate/python/configure.orig	Fri Jun 30 22:10:13 2006
-+++ plugins/locate/python/configure	Sun Jul 16 08:43:12 2006
-@@ -5305,13 +5305,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5370,7 +5370,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-plugins-util-ss-configure b/security/krb5/files/patch-plugins-util-ss-configure
deleted file mode 100644
index ed4794749ac6..000000000000
--- a/security/krb5/files/patch-plugins-util-ss-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- util/ss/configure.orig	Fri Jun 30 22:08:47 2006
-+++ util/ss/configure	Sun Jul 16 08:34:15 2006
-@@ -5303,13 +5303,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5368,7 +5368,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1
diff --git a/security/krb5/files/patch-tests-configure b/security/krb5/files/patch-tests-configure
deleted file mode 100644
index da346a961424..000000000000
--- a/security/krb5/files/patch-tests-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- tests/configure.orig	Fri Jun 30 22:10:06 2006
-+++ tests/configure	Sun Jul 16 08:36:33 2006
-@@ -5303,13 +5303,13 @@
- CFLAGS="$old_CFLAGS"
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5368,7 +5368,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  DL_LIB=-ldl
-+  DL_LIB=""
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_DLOPEN 1