rpms/openssh/devel openssh-3.9p1-skip-used.patch, NONE, 1.1 openssh-4.0p1-exit-deadlock.patch, NONE, 1.1 openssh.spec, 1.62, 1.63

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26194

Modified Files:
	openssh.spec 
Added Files:
	openssh-3.9p1-skip-used.patch 
	openssh-4.0p1-exit-deadlock.patch 
Log Message:
* Wed Jul 27 2005 Tomas Mraz <tmraz at redhat.com> 4.1p1-4
- don't deadlock on exit with multiple X forwarded channels (#152432)
- don't use X11 port which can't be bound on all IP families (#163732)


openssh-3.9p1-skip-used.patch:
 channels.c |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE openssh-3.9p1-skip-used.patch ---
--- openssh-3.9p1/channels.c.skip-used	2005-07-08 22:42:35.000000000 +0200
+++ openssh-3.9p1/channels.c	2005-07-25 21:34:29.000000000 +0200
@@ -2653,9 +2653,6 @@
 				debug2("bind port %d: %.100s", port, strerror(errno));
 				close(sock);
 
-				if (ai->ai_next)
-					continue;
-
 				for (n = 0; n < num_socks; n++) {
 					close(socks[n]);
 				}

openssh-4.0p1-exit-deadlock.patch:
 channels.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE openssh-4.0p1-exit-deadlock.patch ---
--- openssh-4.0p1/channels.c.exit-deadlock	2005-03-01 11:24:33.000000000 +0100
+++ openssh-4.0p1/channels.c	2005-04-05 22:25:15.197226237 +0200
@@ -1403,6 +1403,10 @@
 	u_int dlen;
 	int len;
 
+	if(c->wfd != -1 && buffer_len(&c->output) > 0 && c->ostate == CHAN_OUTPUT_WAIT_DRAIN) {
+		debug("channel %d: forcing write", c->self);
+		FD_SET(c->wfd, writeset);
+	}
 	/* Send buffered output data to the socket. */
 	if (c->wfd != -1 &&
 	    FD_ISSET(c->wfd, writeset) &&


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- openssh.spec	29 Jun 2005 11:24:36 -0000	1.62
+++ openssh.spec	27 Jul 2005 11:42:36 -0000	1.63
@@ -74,7 +74,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.1p1
-%define rel 3
+%define rel 4
 %if %{rescue}
 Release: %{rel}rescue
 %else
@@ -103,6 +103,8 @@
 Patch27: openssh-4.1p1-pam-loginuid.patch
 Patch28: openssh-4.1p1-nologin.patch
 Patch29: openssh-4.1p1-getpeername-race.patch
+Patch30: openssh-4.0p1-exit-deadlock.patch
+Patch31: openssh-3.9p1-skip-used.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -162,7 +164,7 @@
 Obsoletes: ssh-server
 PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9, /usr/sbin/useradd
 %if ! %{build6x}
-Requires: pam >= 0.78-7, /etc/pam.d/system-auth
+Requires: /etc/pam.d/system-auth, /%{_lib}/security/pam_loginuid.so
 %endif
 
 %package askpass
@@ -243,6 +245,8 @@
 %patch27 -p1 -b .loginuid
 %patch28 -p1 -b .nologin
 %patch29 -p0 -b .getpeername-race
+%patch30 -p1 -b .exit-deadlock
+%patch31 -p1 -b .skip-used
 
 autoreconf
 
@@ -511,6 +515,10 @@
 %endif
 
 %changelog
+* Wed Jul 27 2005 Tomas Mraz <tmraz at redhat.com> 4.1p1-4
+- don't deadlock on exit with multiple X forwarded channels (#152432)
+- don't use X11 port which can't be bound on all IP families (#163732)
+
 * Wed Jun 29 2005 Tomas Mraz <tmraz at redhat.com> 4.1p1-3
 - fix small regression caused by the nologin patch (#161956)
 - fix race in getpeername error checking (mindrot #1054)