diff options
| author | taca <taca> | 2008-04-08 06:36:47 +0000 |
|---|---|---|
| committer | taca <taca> | 2008-04-08 06:36:47 +0000 |
| commit | 2c10e2d818157fe4fbdf1f390385fcf70cc7ff9b (patch) | |
| tree | 6655a1b5c72bdff151d09b30755f987eebdec278 /security | |
| parent | 1c55fa927534f948cb3a1c8a89e31fc96fe89659 (diff) | |
| download | pkgsrc-2c10e2d818157fe4fbdf1f390385fcf70cc7ff9b.tar.gz | |
Fix build problem with hpn-patch option enabled.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/distinfo | 4 | ||||
| -rw-r--r-- | security/openssh/patches/patch-ao | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 99c040501d5..6ee29f80b25 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.67 2008/04/03 07:59:08 tonnerre Exp $ +$NetBSD: distinfo,v 1.68 2008/04/08 06:36:47 taca Exp $ SHA1 (openssh-4.7.1-20070919/openssh-4.7p1-hpn12v18.diff.gz) = 8ab61d12b5bcf70d0ffe9cb1d157136d20ebb22c RMD160 (openssh-4.7.1-20070919/openssh-4.7p1-hpn12v18.diff.gz) = 7b35eb1a3f6f3b703ac7f155f620bff63a900a0e @@ -20,7 +20,7 @@ SHA1 (patch-ak) = 3720afb4e95356d5310762cda881820d524dcffc SHA1 (patch-al) = d312a068047a375e52180026554bab745efdcdb7 SHA1 (patch-am) = 4e2278b20e87e530e1819efde976d4414e160e38 SHA1 (patch-an) = 2f955b8891bedd79986490d282eb09acd4910250 -SHA1 (patch-ao) = 1061066758f7fe2fca630b15a55cbdc1ab041758 +SHA1 (patch-ao) = f2188b57baff4c88a793eee37dad69ffc523f7e5 SHA1 (patch-ap) = 2c0c092637661328046b71292a7412d09e92bb2a SHA1 (patch-aq) = a619b57361b04d5ab3d41375c18f7b99d71c8b34 SHA1 (patch-ar) = fce4dc1011a124f02b8e14980cda1d633b36aa7d diff --git a/security/openssh/patches/patch-ao b/security/openssh/patches/patch-ao index 103c10ac9eb..6b726840be7 100644 --- a/security/openssh/patches/patch-ao +++ b/security/openssh/patches/patch-ao @@ -1,16 +1,11 @@ -$NetBSD: patch-ao,v 1.10 2008/04/03 07:59:08 tonnerre Exp $ +$NetBSD: patch-ao,v 1.11 2008/04/08 06:36:47 taca Exp $ + +One more replacing 0 with ROOTUID is handled by using SUBST framework +because patch can't handle it when hpn-patch option is enabled. +So, don't simply update this file with mkpatch command. --- session.c.orig 2007-08-16 13:28:04.000000000 +0000 +++ session.c -@@ -347,7 +347,7 @@ do_authenticated1(Authctxt *authctxt) - break; - } - debug("Received TCP/IP port forwarding request."); -- if (channel_input_port_forward_request(s->pw->pw_uid == 0, -+ if (channel_input_port_forward_request(s->pw->pw_uid == ROOTUID, - options.gateway_ports) < 0) { - debug("Port forwarding failed."); - break; @@ -954,7 +954,7 @@ read_etc_default_login(char ***env, u_in if (tmpenv == NULL) return; |