From 0ee0f71602015d4c9b8594526dae4b37efb02795bc8e195541d2fcd004f23f34 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 20 Apr 2008 23:48:39 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=17 --- openssh-5.0p1-pts.diff | 22 ++++++++++++++++++++++ openssh-askpass-gnome.spec | 2 +- openssh.changes | 5 +++++ openssh.spec | 6 +++++- 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 openssh-5.0p1-pts.diff diff --git a/openssh-5.0p1-pts.diff b/openssh-5.0p1-pts.diff new file mode 100644 index 0000000..142ee18 --- /dev/null +++ b/openssh-5.0p1-pts.diff @@ -0,0 +1,22 @@ +--- loginrec.c ++++ loginrec.c 2008-04-18 17:58:59.585065028 +0200 +@@ -549,7 +549,7 @@ getlast_entry(struct logininfo *li) + * 1. The full filename (including '/dev') + * 2. The stripped name (excluding '/dev') + * 3. The abbreviated name (e.g. /dev/ttyp00 -> yp00 +- * /dev/pts/1 -> ts/1 ) ++ * /dev/pts/1 -> /1 ) + * + * Form 3 is used on some systems to identify a .tmp.? entry when + * attempting to remove it. Typically both addition and removal is +@@ -610,6 +610,10 @@ line_abbrevname(char *dst, const char *s + if (strncmp(src, "tty", 3) == 0) + src += 3; + #endif ++ if (strncmp(src, "pts/", 4) == 0) { ++ src += 3; ++ if (strlen(src) > 4) src++; ++ } + + len = strlen(src); + diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index b0d8f20..1fc8963 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -16,7 +16,7 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev License: BSD 3-Clause Group: Productivity/Networking/SSH Version: 5.0p1 -Release: 1 +Release: 5 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 58af6b4..46712dd 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 18 17:53:30 CEST 2008 - werner@suse.de + +- Handle pts slave lines like utemper + ------------------------------------------------------------------- Wed Apr 9 14:37:57 CEST 2008 - anicka@suse.cz diff --git a/openssh.spec b/openssh.spec index 20d8de6..55b54a2 100644 --- a/openssh.spec +++ b/openssh.spec @@ -30,7 +30,7 @@ PreReq: /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq %fillup_pr Conflicts: nonfreessh AutoReqProv: on Version: 5.0p1 -Release: 1 +Release: 4 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ @@ -61,6 +61,7 @@ Patch41: %{name}-%{version}-gcc-fix.patch Patch42: %{name}-gssapi_krb5-fix.patch Patch43: %{name}-%{version}-default-protocol.diff Patch44: %{name}-%{version}-audit.patch +Patch45: %{name}-%{version}-pts.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package askpass @@ -150,6 +151,7 @@ Authors: %patch42 %patch43 %patch44 -p1 +%patch45 cp -v %{SOURCE4} . cp -v %{SOURCE6} . cd ../x11-ssh-askpass-%{xversion} @@ -292,6 +294,8 @@ rm -rf $RPM_BUILD_ROOT %config %_appdefdir/SshAskpass %changelog +* Fri Apr 18 2008 werner@suse.de +- Handle pts slave lines like utemper * Wed Apr 09 2008 anicka@suse.cz - update to 5.0p1 * CVE-2008-1483: Avoid possible hijacking of X11-forwarded