From b8d4e6c1d84a58e9356eb8383b9fcbb0603df997dd476aabbc483c50c8c87cda Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 10 Dec 2007 23:29:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=13 --- openssh-4.7p1-default-protocol.diff | 2 +- openssh-4.7p1-gcc-fix.patch | 2 +- openssh-4.7p1-xauth.diff | 18 +++++++++++------- openssh-askpass-gnome.spec | 2 +- openssh.changes | 5 +++++ openssh.spec | 4 +++- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/openssh-4.7p1-default-protocol.diff b/openssh-4.7p1-default-protocol.diff index 252229a..cefb1ad 100644 --- a/openssh-4.7p1-default-protocol.diff +++ b/openssh-4.7p1-default-protocol.diff @@ -8,4 +8,4 @@ + Protocol 2 # Cipher 3des # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc - # EscapeChar ~ + # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 diff --git a/openssh-4.7p1-gcc-fix.patch b/openssh-4.7p1-gcc-fix.patch index 17f02cc..8015d5c 100644 --- a/openssh-4.7p1-gcc-fix.patch +++ b/openssh-4.7p1-gcc-fix.patch @@ -6,5 +6,5 @@ +#include #include + #include - #include diff --git a/openssh-4.7p1-xauth.diff b/openssh-4.7p1-xauth.diff index 7d76714..5cde110 100644 --- a/openssh-4.7p1-xauth.diff +++ b/openssh-4.7p1-xauth.diff @@ -1,21 +1,21 @@ --- session.c +++ session.c -@@ -2250,8 +2250,37 @@ +@@ -2250,8 +2250,41 @@ session_close(Session *s) { u_int i; -+ pid_t pid; -+ FILE *f = NULL; -+ char cmd[1024]; + int do_xauth; -+ struct passwd * pw = s->pw; -+ do_xauth = s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL; debug("session_close: session %d pid %ld", s->self, (long)s->pid); + ++ do_xauth = s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL; + if (do_xauth && options.xauth_location != NULL) { ++ pid_t pid; ++ FILE *f; ++ char cmd[1024]; ++ struct passwd * pw = s->pw; + -+ if ((pid = fork()) == 0) { ++ if (!(pid = fork())) { + permanently_set_uid(pw); + + /* Remove authority data from .Xauthority if appropriate. */ @@ -31,6 +31,10 @@ + } else + error("Could not run %s\n", cmd); + exit(0); ++ } else if (pid > 0) { ++ int status; ++ ++ waitpid(pid, &status, 0); + } + } + diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index 5cabd00..c839114 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -15,7 +15,7 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev License: BSD 3-Clause Group: Productivity/Networking/SSH Version: 4.7p1 -Release: 1 +Release: 3 Requires: openssh = %{version} openssh-askpass = %{version} AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH diff --git a/openssh.changes b/openssh.changes index ed84d47..058fadb 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 7 22:28:40 CET 2007 - anicka@suse.cz + +- fix race condition in xauth patch + ------------------------------------------------------------------- Wed Dec 5 10:45:36 CET 2007 - anicka@suse.cz diff --git a/openssh.spec b/openssh.spec index 5f11cfe..6faf07d 100644 --- a/openssh.spec +++ b/openssh.spec @@ -29,7 +29,7 @@ PreReq: /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq %fillup_pr Conflicts: nonfreessh AutoReqProv: on Version: 4.7p1 -Release: 1 +Release: 3 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ @@ -296,6 +296,8 @@ rm -rf $RPM_BUILD_ROOT %config %_appdefdir/SshAskpass %changelog +* Fri Dec 07 2007 - anicka@suse.cz +- fix race condition in xauth patch * Wed Dec 05 2007 - anicka@suse.cz - update to 4.7p1 * Add "-K" flag for ssh to set GSSAPIAuthentication=yes and