diff options
Diffstat (limited to 'security/openssh')
-rw-r--r-- | security/openssh/Makefile | 7 | ||||
-rw-r--r-- | security/openssh/distinfo | 12 | ||||
-rw-r--r-- | security/openssh/patches/patch-aa | 50 | ||||
-rw-r--r-- | security/openssh/patches/patch-ab | 48 |
4 files changed, 58 insertions, 59 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 4ca40b8cfd0..41ecc134269 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.173 2006/11/07 07:08:26 taca Exp $ +# $NetBSD: Makefile,v 1.174 2006/11/08 01:49:22 taca Exp $ -DISTNAME= openssh-4.4p1 -PKGNAME= openssh-4.4.1 -PKGREVISION= 1 +DISTNAME= openssh-4.5p1 +PKGNAME= openssh-4.5.1 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/openssh/distinfo b/security/openssh/distinfo index f16c4c7f5f5..d910d165df4 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.56 2006/11/07 07:08:26 taca Exp $ +$NetBSD: distinfo,v 1.57 2006/11/08 01:49:22 taca Exp $ SHA1 (openssh-4.4p1-hpn12v13.diff.gz) = 00a677a7dd75c98db14a91814da49b8fd7b7d814 RMD160 (openssh-4.4p1-hpn12v13.diff.gz) = b057f9a1068ddce106a94465953bdac58d0ffac8 Size (openssh-4.4p1-hpn12v13.diff.gz) = 15392 bytes -SHA1 (openssh-4.4p1.tar.gz) = 6a52b1dee1c2c9862923c0008d201d98a7fd9d6c -RMD160 (openssh-4.4p1.tar.gz) = 13eb79a54e95037fff1902b659319df1c5f79bbc -Size (openssh-4.4p1.tar.gz) = 1044334 bytes -SHA1 (patch-aa) = f29644c520908ed5489890515c0f8cea1b871480 -SHA1 (patch-ab) = 81d7c002eb83147ef80513b16bd3041af0b07ddc +SHA1 (openssh-4.5p1.tar.gz) = 2eefcbbeb9e4fa16fa4500dec107d1a09d3d02d7 +RMD160 (openssh-4.5p1.tar.gz) = 3f70b6f4228e84c7b9b8b3bee7fd3875f3e3bad3 +Size (openssh-4.5p1.tar.gz) = 965925 bytes +SHA1 (patch-aa) = 8b7a16e9a63cfff3b73d70b9cebb6627b96396e0 +SHA1 (patch-ab) = a105c238c8dc774ed6992791b131da56824869e9 SHA1 (patch-ac) = dfb054ef02fbb5d206f6adaf82944f16da20eaf9 SHA1 (patch-ad) = 7921e029b56c0e4769a7ada03dff3eb2e275db7d SHA1 (patch-ae) = 9585221f9e49b4ebea31c374066d70e11aa804a1 diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa index 0dd61a862d3..20e523159f8 100644 --- a/security/openssh/patches/patch-aa +++ b/security/openssh/patches/patch-aa @@ -1,8 +1,26 @@ -$NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $ +$NetBSD: patch-aa,v 1.43 2006/11/08 01:49:22 taca Exp $ ---- configure.orig 2006-09-26 20:03:41.000000000 +0900 +--- configure.orig 2006-11-07 22:07:18.000000000 +0900 +++ configure -@@ -7326,6 +7326,36 @@ _ACEOF +@@ -5835,6 +5835,9 @@ if test "${with_rpath+set}" = set; then + fi + + ++# pkgsrc handles any rpath settings this package needs ++need_dash_r= ++ + # Allow user to specify flags + + # Check whether --with-cflags was given. +@@ -5976,6 +5979,7 @@ for ac_header in \ + maillock.h \ + ndir.h \ + net/if_tun.h \ ++ net/tun/if_tun.h \ + netdb.h \ + netgroup.h \ + pam/pam_appl.h \ +@@ -7919,6 +7923,36 @@ _ACEOF ;; esac ;; @@ -39,7 +57,7 @@ $NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $ *-*-irix5*) PATH="$PATH:/usr/etc" -@@ -7931,7 +7961,7 @@ cat >>confdefs.h <<\_ACEOF +@@ -8524,7 +8558,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF ;; @@ -48,25 +66,7 @@ $NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $ check_for_libcrypt_later=1 cat >>confdefs.h <<\_ACEOF -@@ -9144,6 +9174,9 @@ _ACEOF - ;; - esac - -+# pkgsrc handles any rpath settings this package needs -+need_dash_r= -+ - # Allow user to specify flags - - # Check whether --with-cflags was given. -@@ -9344,6 +9377,7 @@ for ac_header in \ - maillock.h \ - ndir.h \ - net/if_tun.h \ -+ net/tun/if_tun.h \ - netdb.h \ - netgroup.h \ - pam/pam_appl.h \ -@@ -32055,14 +32089,21 @@ fi +@@ -32058,14 +32092,21 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test -z "$conf_utmpx_location"; then if test x"$system_utmpx_path" = x"no" ; then @@ -92,7 +92,7 @@ $NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $ #define CONF_UTMPX_FILE "$conf_utmpx_location" _ACEOF -@@ -32143,14 +32184,20 @@ fi +@@ -32146,14 +32187,20 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test -z "$conf_wtmpx_location"; then if test x"$system_wtmpx_path" = x"no" ; then @@ -118,7 +118,7 @@ $NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $ #define CONF_WTMPX_FILE "$conf_wtmpx_location" _ACEOF -@@ -33383,7 +33430,7 @@ echo "OpenSSH has been configured with t +@@ -33386,7 +33433,7 @@ echo "OpenSSH has been configured with t echo " User binaries: $B" echo " System binaries: $C" echo " Configuration files: $D" diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab index 6e8f34f8387..102af7061a3 100644 --- a/security/openssh/patches/patch-ab +++ b/security/openssh/patches/patch-ab @@ -1,8 +1,26 @@ -$NetBSD: patch-ab,v 1.24 2006/10/31 03:31:20 taca Exp $ +$NetBSD: patch-ab,v 1.25 2006/11/08 01:49:22 taca Exp $ ---- configure.ac.orig 2006-09-25 04:08:59.000000000 +0900 +--- configure.ac.orig 2006-10-07 08:07:21.000000000 +0900 +++ configure.ac -@@ -324,6 +324,15 @@ main() { if (NSVersionOfRunTimeLibrary(" +@@ -127,6 +127,9 @@ AC_ARG_WITH(rpath, + ] + ) + ++# pkgsrc handles any rpath settings this package needs ++need_dash_r= ++ + # Allow user to specify flags + AC_ARG_WITH(cflags, + [ --with-cflags Specify additional flags to pass to compiler], +@@ -194,6 +197,7 @@ AC_CHECK_HEADERS( \ + maillock.h \ + ndir.h \ + net/if_tun.h \ ++ net/tun/if_tun.h \ + netdb.h \ + netgroup.h \ + pam/pam_appl.h \ +@@ -454,6 +458,15 @@ main() { if (NSVersionOfRunTimeLibrary(" ;; esac ;; @@ -18,25 +36,7 @@ $NetBSD: patch-ab,v 1.24 2006/10/31 03:31:20 taca Exp $ *-*-irix5*) PATH="$PATH:/usr/etc" AC_DEFINE(BROKEN_INET_NTOA, 1, -@@ -663,6 +672,9 @@ mips-sony-bsd|mips-sony-newsos4) - ;; - esac - -+# pkgsrc handles any rpath settings this package needs -+need_dash_r= -+ - # Allow user to specify flags - AC_ARG_WITH(cflags, - [ --with-cflags Specify additional flags to pass to compiler], -@@ -745,6 +757,7 @@ AC_CHECK_HEADERS( \ - maillock.h \ - ndir.h \ - net/if_tun.h \ -+ net/tun/if_tun.h \ - netdb.h \ - netgroup.h \ - pam/pam_appl.h \ -@@ -3873,9 +3886,17 @@ AC_TRY_COMPILE([ +@@ -3876,9 +3889,17 @@ AC_TRY_COMPILE([ ) if test -z "$conf_utmpx_location"; then if test x"$system_utmpx_path" = x"no" ; then @@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.24 2006/10/31 03:31:20 taca Exp $ AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location", [Define if you want to specify the path to your utmpx file]) fi -@@ -3899,9 +3920,17 @@ AC_TRY_COMPILE([ +@@ -3902,9 +3923,17 @@ AC_TRY_COMPILE([ ) if test -z "$conf_wtmpx_location"; then if test x"$system_wtmpx_path" = x"no" ; then @@ -76,7 +76,7 @@ $NetBSD: patch-ab,v 1.24 2006/10/31 03:31:20 taca Exp $ AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location", [Define if you want to specify the path to your wtmpx file]) fi -@@ -3941,7 +3970,7 @@ echo "OpenSSH has been configured with t +@@ -3944,7 +3973,7 @@ echo "OpenSSH has been configured with t echo " User binaries: $B" echo " System binaries: $C" echo " Configuration files: $D" |