diff --git a/openssh-5.1p1-strnvis.diff b/openssh-5.1p1-strnvis.diff new file mode 100644 index 0000000..ccae325 --- /dev/null +++ b/openssh-5.1p1-strnvis.diff @@ -0,0 +1,17 @@ +--- sshconnect2.c ++++ sshconnect2.c +@@ -387,11 +387,11 @@ + debug3("input_userauth_banner"); + raw = packet_get_string(&len); + lang = packet_get_string(NULL); +- if (options.log_level >= SYSLOG_LEVEL_INFO) { ++ if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO) { + if (len > 65536) + len = 65536; +- msg = xmalloc(len * 4); /* max expansion from strnvis() */ +- strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); ++ msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ ++ strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL|VIS_NOSLASH); + fprintf(stderr, "%s", msg); + xfree(msg); + } diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index e13044a..1376bb6 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -23,7 +23,7 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev License: BSD 3-Clause Group: Productivity/Networking/SSH Version: 5.1p1 -Release: 39 +Release: 40 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 0771afb..1fc833b 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 10 16:01:27 CET 2008 - anicka@suse.cz + +- fix printing banner (bnc#443380) + ------------------------------------------------------------------- Fri Oct 24 16:24:34 CEST 2008 - anicka@suse.cz diff --git a/openssh.spec b/openssh.spec index a34544c..986c698 100644 --- a/openssh.spec +++ b/openssh.spec @@ -38,7 +38,7 @@ PreReq: /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq %fillup_pr Conflicts: nonfreessh AutoReqProv: on Version: 5.1p1 -Release: 39 +Release: 40 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ @@ -70,6 +70,7 @@ Patch43: %{name}-%{version}-default-protocol.diff Patch44: %{name}-%{version}-audit.patch Patch45: %{name}-%{version}-pts.diff Patch46: %{name}-%{version}-pam-fix4.diff +Patch47: %{name}-%{version}-strnvis.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package askpass @@ -160,6 +161,7 @@ Authors: %patch44 -p1 %patch45 %patch46 -p1 +%patch47 cp -v %{SOURCE4} . cp -v %{SOURCE6} . cd ../x11-ssh-askpass-%{xversion} @@ -303,6 +305,8 @@ rm -rf $RPM_BUILD_ROOT %config %_appdefdir/SshAskpass %changelog +* Mon Nov 10 2008 anicka@suse.cz +- fix printing banner (bnc#443380) * Fri Oct 24 2008 anicka@suse.cz - call pam functions in the right order (bnc#438292) - mention default forwarding of locale settings in @@ -461,7 +465,7 @@ rm -rf $RPM_BUILD_ROOT * Sat Dec 15 2007 anicka@suse.cz - add patch calling pam with root privileges [#334559] - drop pwname-home patch [#104773] -* Sat Dec 08 2007 anicka@suse.cz +* Fri Dec 07 2007 anicka@suse.cz - fix race condition in xauth patch * Wed Dec 05 2007 anicka@suse.cz - update to 4.7p1 @@ -773,7 +777,7 @@ rm -rf $RPM_BUILD_ROOT - added the new version of patch for GSSAPI (gssapi-20030430.diff), the older one was removed (gssapi.patch) - added README.kerberos to filelist -* Tue Jun 03 2003 mmj@suse.de +* Mon Jun 02 2003 mmj@suse.de - Remove files we don't package * Wed Apr 02 2003 postadal@suse.cz - fixed bad behaviour after receiving SIGHUP (this bug caused not working reload of init script) @@ -792,7 +796,7 @@ rm -rf $RPM_BUILD_ROOT - added ssh-copy-id shell script [#23745] * Fri Feb 14 2003 postadal@suse.cz - given back gssapi and dns-lookups patches -* Thu Jan 23 2003 postadal@suse.cz +* Wed Jan 22 2003 postadal@suse.cz - updated to version 3.5p1 - removed obsolete patches: owl-mm, forced-commands-only, krb - added patch krb5 (for heimdal) @@ -981,7 +985,7 @@ rm -rf $RPM_BUILD_ROOT - path to ssh-askpass fixed - stop in %%preun removed - new init style -* Mon Nov 27 2000 schwab@suse.de +* Sun Nov 26 2000 schwab@suse.de - Restore rcsshd link. * Sun Nov 26 2000 kukuk@suse.de - Add openssl-devel to neededforbuild @@ -992,7 +996,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Jul 05 2000 garloff@suse.de - ... and tell the sysadmin and user more about what they can do about it (schwab). -* Wed Jul 05 2000 garloff@suse.de +* Tue Jul 04 2000 garloff@suse.de - Inform the user (admin) about the fact that the default behaviour with respect to X11-forwarding has been changed to be disabled. * Wed Jun 28 2000 smid@suse.cz