Tue Apr 8 06:36:47 2008 UTC ()
Fix build problem with hpn-patch option enabled.


(taca)
diff -r1.67 -r1.68 pkgsrc/security/openssh/distinfo
diff -r1.10 -r1.11 pkgsrc/security/openssh/patches/patch-ao
cvs diff -r1.67 -r1.68 pkgsrc/security/openssh/distinfo (expand / switch to unified diff)

--- pkgsrc/security/openssh/distinfo 2008/04/03 07:59:08 1.67
+++ pkgsrc/security/openssh/distinfo 2008/04/08 06:36:47 1.68
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: distinfo,v 1.67 2008/04/03 07:59:08 tonnerre Exp $ 1$NetBSD: distinfo,v 1.68 2008/04/08 06:36:47 taca Exp $
2 2
3SHA1 (openssh-4.7.1-20070919/openssh-4.7p1-hpn12v18.diff.gz) = 8ab61d12b5bcf70d0ffe9cb1d157136d20ebb22c 3SHA1 (openssh-4.7.1-20070919/openssh-4.7p1-hpn12v18.diff.gz) = 8ab61d12b5bcf70d0ffe9cb1d157136d20ebb22c
4RMD160 (openssh-4.7.1-20070919/openssh-4.7p1-hpn12v18.diff.gz) = 7b35eb1a3f6f3b703ac7f155f620bff63a900a0e 4RMD160 (openssh-4.7.1-20070919/openssh-4.7p1-hpn12v18.diff.gz) = 7b35eb1a3f6f3b703ac7f155f620bff63a900a0e
5Size (openssh-4.7.1-20070919/openssh-4.7p1-hpn12v18.diff.gz) = 16094 bytes 5Size (openssh-4.7.1-20070919/openssh-4.7p1-hpn12v18.diff.gz) = 16094 bytes
6SHA1 (openssh-4.7.1-20070919/openssh-4.7p1.tar.gz) = 58357db9e64ba6382bef3d73d1d386fcdc0508f4 6SHA1 (openssh-4.7.1-20070919/openssh-4.7p1.tar.gz) = 58357db9e64ba6382bef3d73d1d386fcdc0508f4
7RMD160 (openssh-4.7.1-20070919/openssh-4.7p1.tar.gz) = b828e79d3d1a931cb77651ec7d7276cf3ba22d90 7RMD160 (openssh-4.7.1-20070919/openssh-4.7p1.tar.gz) = b828e79d3d1a931cb77651ec7d7276cf3ba22d90
8Size (openssh-4.7.1-20070919/openssh-4.7p1.tar.gz) = 991119 bytes 8Size (openssh-4.7.1-20070919/openssh-4.7p1.tar.gz) = 991119 bytes
9SHA1 (patch-aa) = 8b7a16e9a63cfff3b73d70b9cebb6627b96396e0 9SHA1 (patch-aa) = 8b7a16e9a63cfff3b73d70b9cebb6627b96396e0
10SHA1 (patch-ab) = a105c238c8dc774ed6992791b131da56824869e9 10SHA1 (patch-ab) = a105c238c8dc774ed6992791b131da56824869e9
11SHA1 (patch-ac) = dfb054ef02fbb5d206f6adaf82944f16da20eaf9 11SHA1 (patch-ac) = dfb054ef02fbb5d206f6adaf82944f16da20eaf9
12SHA1 (patch-ad) = 7921e029b56c0e4769a7ada03dff3eb2e275db7d 12SHA1 (patch-ad) = 7921e029b56c0e4769a7ada03dff3eb2e275db7d
13SHA1 (patch-ae) = 9585221f9e49b4ebea31c374066d70e11aa804a1 13SHA1 (patch-ae) = 9585221f9e49b4ebea31c374066d70e11aa804a1
14SHA1 (patch-af) = ca3224af0b648803404776a8c12ed678db4f8ff6 14SHA1 (patch-af) = ca3224af0b648803404776a8c12ed678db4f8ff6
15SHA1 (patch-ag) = b6f92a5394a3442fcc0c2a2ee204c10df5a4aea5 15SHA1 (patch-ag) = b6f92a5394a3442fcc0c2a2ee204c10df5a4aea5
16SHA1 (patch-ah) = bc0d7c2903ecf264e62b53f3864812af5f2f04ce 16SHA1 (patch-ah) = bc0d7c2903ecf264e62b53f3864812af5f2f04ce
17SHA1 (patch-ai) = becad6262e5daeef2a6db14097a8971c40088403 17SHA1 (patch-ai) = becad6262e5daeef2a6db14097a8971c40088403
18SHA1 (patch-aj) = 4f477f40d1d891dcda9083cec5521e80410ebd54 18SHA1 (patch-aj) = 4f477f40d1d891dcda9083cec5521e80410ebd54
19SHA1 (patch-ak) = 3720afb4e95356d5310762cda881820d524dcffc 19SHA1 (patch-ak) = 3720afb4e95356d5310762cda881820d524dcffc
20SHA1 (patch-al) = d312a068047a375e52180026554bab745efdcdb7 20SHA1 (patch-al) = d312a068047a375e52180026554bab745efdcdb7
21SHA1 (patch-am) = 4e2278b20e87e530e1819efde976d4414e160e38 21SHA1 (patch-am) = 4e2278b20e87e530e1819efde976d4414e160e38
22SHA1 (patch-an) = 2f955b8891bedd79986490d282eb09acd4910250 22SHA1 (patch-an) = 2f955b8891bedd79986490d282eb09acd4910250
23SHA1 (patch-ao) = 1061066758f7fe2fca630b15a55cbdc1ab041758 23SHA1 (patch-ao) = f2188b57baff4c88a793eee37dad69ffc523f7e5
24SHA1 (patch-ap) = 2c0c092637661328046b71292a7412d09e92bb2a 24SHA1 (patch-ap) = 2c0c092637661328046b71292a7412d09e92bb2a
25SHA1 (patch-aq) = a619b57361b04d5ab3d41375c18f7b99d71c8b34 25SHA1 (patch-aq) = a619b57361b04d5ab3d41375c18f7b99d71c8b34
26SHA1 (patch-ar) = fce4dc1011a124f02b8e14980cda1d633b36aa7d 26SHA1 (patch-ar) = fce4dc1011a124f02b8e14980cda1d633b36aa7d
27SHA1 (patch-as) = 19660f5983931ea3b053e6f4289cf6fae2ce50f3 27SHA1 (patch-as) = 19660f5983931ea3b053e6f4289cf6fae2ce50f3
28SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f 28SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f
29SHA1 (patch-av) = 00f54c3fae7318b278b16bd0b01881a90bd31365 29SHA1 (patch-av) = 00f54c3fae7318b278b16bd0b01881a90bd31365
30SHA1 (patch-aw) = 2a88b7563c6f52163c6c5f716e437ecaea613a30 30SHA1 (patch-aw) = 2a88b7563c6f52163c6c5f716e437ecaea613a30
31SHA1 (patch-ax) = 1ddf59636b6f3b544850f787ca63287fd93cae88 31SHA1 (patch-ax) = 1ddf59636b6f3b544850f787ca63287fd93cae88
cvs diff -r1.10 -r1.11 pkgsrc/security/openssh/patches/Attic/patch-ao (expand / switch to unified diff)

--- pkgsrc/security/openssh/patches/Attic/patch-ao 2008/04/03 07:59:08 1.10
+++ pkgsrc/security/openssh/patches/Attic/patch-ao 2008/04/08 06:36:47 1.11
@@ -1,26 +1,21 @@ @@ -1,26 +1,21 @@
1$NetBSD: patch-ao,v 1.10 2008/04/03 07:59:08 tonnerre Exp $ 1$NetBSD: patch-ao,v 1.11 2008/04/08 06:36:47 taca Exp $
 2
 3One more replacing 0 with ROOTUID is handled by using SUBST framework
 4because patch can't handle it when hpn-patch option is enabled.
 5So, don't simply update this file with mkpatch command.
2 6
3--- session.c.orig 2007-08-16 13:28:04.000000000 +0000 7--- session.c.orig 2007-08-16 13:28:04.000000000 +0000
4+++ session.c 8+++ session.c
5@@ -347,7 +347,7 @@ do_authenticated1(Authctxt *authctxt) 
6 break; 
7 } 
8 debug("Received TCP/IP port forwarding request."); 
9- if (channel_input_port_forward_request(s->pw->pw_uid == 0, 
10+ if (channel_input_port_forward_request(s->pw->pw_uid == ROOTUID, 
11 options.gateway_ports) < 0) { 
12 debug("Port forwarding failed."); 
13 break; 
14@@ -954,7 +954,7 @@ read_etc_default_login(char ***env, u_in 9@@ -954,7 +954,7 @@ read_etc_default_login(char ***env, u_in
15 if (tmpenv == NULL) 10 if (tmpenv == NULL)
16 return; 11 return;
17  12
18- if (uid == 0) 13- if (uid == 0)
19+ if (uid == ROOTUID) 14+ if (uid == ROOTUID)
20 var = child_get_env(tmpenv, "SUPATH"); 15 var = child_get_env(tmpenv, "SUPATH");
21 else 16 else
22 var = child_get_env(tmpenv, "PATH"); 17 var = child_get_env(tmpenv, "PATH");
23@@ -1063,7 +1063,7 @@ do_setup_env(Session *s, const char *she 18@@ -1063,7 +1063,7 @@ do_setup_env(Session *s, const char *she
24 # endif /* HAVE_ETC_DEFAULT_LOGIN */ 19 # endif /* HAVE_ETC_DEFAULT_LOGIN */
25 if (path == NULL || *path == '\0') { 20 if (path == NULL || *path == '\0') {
26 child_set_env(&env, &envsize, "PATH", 21 child_set_env(&env, &envsize, "PATH",