SOURCES: openssh-sigpipe.patch, openssh-linux-ipv6.patch - updated...

[hawk]

Author: hawk                         Date: Thu Feb  2 08:42:52 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.3p1

---- Files affected:
SOURCES:
   openssh-sigpipe.patch (1.7 -> 1.8) , openssh-linux-ipv6.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/openssh-sigpipe.patch
diff -u SOURCES/openssh-sigpipe.patch:1.7 SOURCES/openssh-sigpipe.patch:1.8
--- SOURCES/openssh-sigpipe.patch:1.7	Fri Sep  2 21:34:57 2005
+++ SOURCES/openssh-sigpipe.patch	Thu Feb  2 09:42:47 2006
@@ -33,15 +33,15 @@
       -b bind_address
 --- openssh-4.0p1/ssh.1.orig	2005-03-09 01:00:06.000000000 +0100
 +++ openssh-4.0p1/ssh.1	2005-03-10 15:10:40.000000000 +0100
-@@ -44,7 +44,7 @@
+@@ -43,7 +43,7 @@
+ .Nd OpenSSH SSH client (remote login program)
  .Sh SYNOPSIS
  .Nm ssh
- .Bk -words
 -.Op Fl 1246AaCfgkMNnqsTtVvXxY
 +.Op Fl 1246AaBCfgkMNnqsTtVvXxY
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
- .Op Fl D Ar port
+ .Oo Fl D\ \&
 @@ -425,6 +425,10 @@
  on the local machine as the source address
  of the connection.
@@ -71,15 +71,15 @@
  	fprintf(stderr,
 -"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
 +"usage: ssh [-1246AaBCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
- "           [-D port] [-e escape_char] [-F configfile]\n"
+ "           [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
  "           [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
  "           [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
-@@ -240,7 +243,7 @@
+@@ -244,7 +247,7 @@
  
  again:
  	while ((opt = getopt(ac, av,
--	    "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVXY")) != -1) {
-+	    "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:L:MNO:PR:S:TVXY")) != -1) {
+-	    "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
++	    "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
  		switch (opt) {
  		case '1':
  			options.protocol = SSH_PROTO_1;

================================================================
Index: SOURCES/openssh-linux-ipv6.patch
diff -u SOURCES/openssh-linux-ipv6.patch:1.2 SOURCES/openssh-linux-ipv6.patch:1.3
--- SOURCES/openssh-linux-ipv6.patch:1.2	Tue Sep 16 19:15:54 2003
+++ SOURCES/openssh-linux-ipv6.patch	Thu Feb  2 09:42:47 2006
@@ -1,11 +1,10 @@
-diff -Naur openssh-3.1p1/configure.ac openssh-3.1p1-p/configure.ac
---- openssh-3.1p1/configure.ac	Mon Mar 25 12:19:11 2002
-+++ openssh-3.1p1-p/configure.ac	Mon Mar 25 12:19:42 2002
-@@ -121,7 +121,6 @@
+--- openssh.orig/configure.ac	2006-02-02 09:07:47.000000000 +0100
++++ openssh/configure.ac	2006-02-02 09:11:17.000000000 +0100
+@@ -313,7 +313,6 @@
  	no_dev_ptmx=1
  	check_for_libcrypt_later=1
  	check_for_openpty_ctty_bug=1
--	AC_DEFINE(DONT_TRY_OTHER_AF)
- 	AC_DEFINE(PAM_TTY_KLUDGE)
- 	AC_DEFINE(LOCKED_PASSWD_PREFIX, "!!")
- 	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
+-	AC_DEFINE(DONT_TRY_OTHER_AF, 1, [Workaround more Linux IPv6 quirks])
+ 	AC_DEFINE(PAM_TTY_KLUDGE, 1,
+ 		[Work around problematic Linux PAM modules handling of PAM_TTY])
+ 	AC_DEFINE(LOCKED_PASSWD_PREFIX, "!",
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/openssh-sigpipe.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/openssh-linux-ipv6.patch?r1=1.2&r2=1.3&f=u