diff options
| author | cjs <cjs@pkgsrc.org> | 2007-03-16 05:46:06 +0000 |
|---|---|---|
| committer | cjs <cjs@pkgsrc.org> | 2007-03-16 05:46:06 +0000 |
| commit | 1396e199a58aa6f04939f507e90d1ba50575aad2 (patch) | |
| tree | af10499265800c4498cde88826eebff55762a01b /security | |
| parent | c2a0edb2e363561603b98e0abc8b931b1f50276a (diff) | |
| download | pkgsrc-1396e199a58aa6f04939f507e90d1ba50575aad2.tar.gz | |
Bring in patch suggested in http://bugzilla.mindrot.org/show_bug.cgi?id=1299 .
This fixes the issue that, when "options edns0" is turned on (usually in
/etc/resolv.conf), ssh doesn't see it, and thus fails to request a DNSSEC
response, which in turn leads to SSHFP records being considered insecure.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 4 | ||||
| -rw-r--r-- | security/openssh/distinfo | 3 | ||||
| -rw-r--r-- | security/openssh/patches/patch-ax | 21 |
3 files changed, 25 insertions, 3 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index f9e886490e5..2f061e271e9 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.177 2007/02/22 19:27:08 wiz Exp $ +# $NetBSD: Makefile,v 1.178 2007/03/16 05:46:06 cjs Exp $ DISTNAME= openssh-4.5p1 PKGNAME= openssh-4.5.1 -PKGREVISION= 1 +PKGREVISION= 2 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 df9004e8884..f284abbfac4 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.60 2007/01/27 22:57:35 schwarz Exp $ +$NetBSD: distinfo,v 1.61 2007/03/16 05:46:06 cjs Exp $ SHA1 (openssh-4.5p1-hpn12v14.diff.gz) = 8bea17b13e7e91135785f4222252c28d08c9c887 RMD160 (openssh-4.5p1-hpn12v14.diff.gz) = 1f937174d5418d578da5d9dfab16b5cc8960efc5 @@ -29,3 +29,4 @@ SHA1 (patch-at) = 1053afa04babc82374d7356aa0cc5fa55cf184e2 SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f SHA1 (patch-av) = 00f54c3fae7318b278b16bd0b01881a90bd31365 SHA1 (patch-aw) = 2a88b7563c6f52163c6c5f716e437ecaea613a30 +SHA1 (patch-ax) = a6708b956341ff373835a6789541c7547b3b85e5 diff --git a/security/openssh/patches/patch-ax b/security/openssh/patches/patch-ax new file mode 100644 index 00000000000..0d3cbaafe7a --- /dev/null +++ b/security/openssh/patches/patch-ax @@ -0,0 +1,21 @@ +$NetBSD: patch-ax,v 1.3 2007/03/16 05:46:07 cjs Exp $ + +# http://bugzilla.mindrot.org/show_bug.cgi?id=1299 + +--- openbsd-compat/getrrsetbyname.c.orig 2006-09-02 14:32:40.000000000 +0900 ++++ openbsd-compat/getrrsetbyname.c 2007-03-16 14:07:32.000000000 +0900 +@@ -67,14 +67,6 @@ + #endif + #define _THREAD_PRIVATE(a,b,c) (c) + +-/* to avoid conflicts where a platform already has _res */ +-#ifdef _res +-# undef _res +-#endif +-#define _res _compat_res +- +-struct __res_state _res; +- + /* Necessary functions and macros */ + + /* |