rpms/openssh/devel openssh-5.5p1-x11.patch, 1.1, 1.2 openssh.spec, 1.218, 1.219
Jan F. Chadima
jfch2222 at fedoraproject.org
Fri Jun 25 12:08:42 UTC 2010
Author: jfch2222
Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15714
Modified Files:
openssh-5.5p1-x11.patch openssh.spec
Log Message:
* Thu Jun 25 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-16 + 0.9.2-26
- improved the x11 patch (#598671)
openssh-5.5p1-x11.patch:
channels.c | 10 ++++++++++
1 file changed, 10 insertions(+)
Index: openssh-5.5p1-x11.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.5p1-x11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssh-5.5p1-x11.patch 24 Jun 2010 07:02:36 -0000 1.1
+++ openssh-5.5p1-x11.patch 25 Jun 2010 12:08:42 -0000 1.2
@@ -1,12 +1,21 @@
-diff -up openssh-5.5p1/pathnames.h.x11 openssh-5.5p1/pathnames.h
---- openssh-5.5p1/pathnames.h.x11 2010-06-23 18:07:59.000000000 +0200
-+++ openssh-5.5p1/pathnames.h 2010-06-23 18:10:20.000000000 +0200
-@@ -137,7 +137,7 @@
+diff -up openssh-5.5p1/channels.c.x11 openssh-5.5p1/channels.c
+--- openssh-5.5p1/channels.c.x11 2010-06-25 13:35:44.000000000 +0200
++++ openssh-5.5p1/channels.c 2010-06-25 13:40:40.000000000 +0200
+@@ -3354,7 +3354,17 @@ static int
+ connect_local_xsocket(u_int dnr)
+ {
+ char buf[1024];
++#ifdef linux
++ int ret;
++#endif
+ snprintf(buf, sizeof buf, _PATH_UNIX_X, dnr);
++#ifdef linux
++ /* try abstract socket first */
++ buf[0] = '\0';
++ if ((ret = connect_local_xsocket_path(buf)) >= 0)
++ return ret;
++ buf[0] = '/';
++#endif
+ return connect_local_xsocket_path(buf);
+ }
- /* UNIX domain socket for X11 server; displaynum will replace %u */
- #ifndef _PATH_UNIX_X
--#define _PATH_UNIX_X "/tmp/.X11-unix/X%u"
-+#define _PATH_UNIX_X "/var/spool/sockets/X11/%u"
- #endif
-
- /* for scp */
Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- openssh.spec 24 Jun 2010 07:02:37 -0000 1.218
+++ openssh.spec 25 Jun 2010 12:08:42 -0000 1.219
@@ -70,7 +70,7 @@
%endif
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
-%define openssh_rel 15
+%define openssh_rel 16
%define openssh_ver 5.5p1
%define pam_ssh_agent_rel 26
%define pam_ssh_agent_ver 0.9.2
@@ -94,7 +94,6 @@ Source4: http://prdownloads.sourceforge.
Source5: pam_ssh_agent-rmheaders
Patch0: openssh-5.4p1-redhat.patch
-Patch1: openssh-5.5p1-x11.patch
#https://bugzilla.mindrot.org/show_bug.cgi?id=1638
Patch2: openssh-5.3p1-skip-initial.patch
#https://bugzilla.mindrot.org/show_bug.cgi?id=1640
@@ -132,6 +131,7 @@ Patch76: openssh-5.5p1-staterr.patch
#https://bugzilla.mindrot.org/show_bug.cgi?id=1750
Patch77: openssh-5.5p1-stderr.patch
Patch78: openssh-5.5p1-kuserok.patch
+Patch79: openssh-5.5p1-x11.patch
License: BSD
Group: Applications/Internet
@@ -267,7 +267,6 @@ The module is most useful for su and sud
%prep
%setup -q -a 4
%patch0 -p1 -b .redhat
-%patch1 -p1 -b .x11
%patch2 -p1 -b .skip-initial
%patch4 -p1 -b .vendor
@@ -305,6 +304,7 @@ popd
%patch76 -p1 -b .staterr
%patch77 -p1 -b .stderr
%patch78 -p1 -b .kuserok
+%patch79 -p1 -b .x11
autoreconf
pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
@@ -586,6 +586,9 @@ fi
%endif
%changelog
+* Thu Jun 25 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-16 + 0.9.2-26
+- improved the x11 patch (#598671)
+
* Thu Jun 24 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-15 + 0.9.2-26
- changed _PATH_UNIX_X to unexistent file name (#598671)
More information about the scm-commits
mailing list