- rel 7; fixes CVE-2006-4924

Changed files:
    openssh.spec -> 1.263

diff --git a/openssh.spec b/openssh.spec
index ae83926214efb7f1c5e8f4078c0fe595be0de47e..a8101cfc366f22742407e13c9e8a85c6f1b9c4b3 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -16,7 +16,7 @@
 %endif
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
-%define                _rel    4
+%define                _rel    7
 Summary:       OpenSSH free Secure Shell (SSH) implementation
 Summary(de):   OpenSSH - freie Implementation der Secure Shell (SSH)
 Summary(es):   Implementación libre de SSH
@@ -70,6 +70,7 @@ Patch11:      %{name}-4.3p1-hpn11.patch
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.2p1-hpn11-none.diff
 Patch12:       %{name}-4.3p1-hpn11-none.patch
 Patch13:       %{name}-include.patch
+Patch14:       %{name}-identical-simple-dos-2.patch
 URL:           http://www.openssh.com/
 BuildRequires: %{__perl}
 BuildRequires: autoconf
@@ -467,6 +468,7 @@ GNOME.
 %{?with_hpn:%patch11 -p1}
 %{?with_hpn_none:%patch12 -p1}
 %patch13 -p1
+%patch14 -p3
 
 %build
 cp %{_datadir}/automake/config.sub .
@@ -493,7 +495,7 @@ cp %{_datadir}/automake/config.sub .
        --enable-utmpx \
        --enable-wtmpx
 
-echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h
+echo '#define LOGIN_PROGRAM               "/bin/login"' >>config.h
 
 %{__make}
 
@@ -557,10 +559,10 @@ echo ".so ssh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
 touch $RPM_BUILD_ROOT/etc/security/blacklist.sshd
 
 %if "%{_lib}" != "lib"
-find $RPM_BUILD_ROOT%{_sysconfdir} -type f -print0 | xargs -0 perl -pi -e "s#/usr/lib#/usr/%{_lib}#"
+find $RPM_BUILD_ROOT%{_sysconfdir} -type f -print0 | xargs -0 sed -i -e 's#%{_prefix}/lib#%{_libdir}#'
 %endif
 
-cat << EOF >$RPM_BUILD_ROOT/etc/env.d/SSH_ASKPASS
+cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/SSH_ASKPASS
 #SSH_ASKPASS="%{_libexecdir}/ssh-askpass"
 EOF