SPECS (AC-branch): openssh.spec - rel 7; fixes CVE-2006-4924

[glen]

Author: glen                         Date: Wed Sep 27 19:41:17 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rel 7; fixes CVE-2006-4924

---- Files affected:
SPECS:
   openssh.spec (1.251.2.8 -> 1.251.2.9) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.251.2.8 SPECS/openssh.spec:1.251.2.9
--- SPECS/openssh.spec:1.251.2.8	Sat Sep  9 03:29:17 2006
+++ SPECS/openssh.spec	Wed Sep 27 21:41:11 2006
@@ -17,7 +17,7 @@
 %endif
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
-%define		_rel	6
+%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
@@ -71,6 +71,7 @@
 # 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
@@ -468,6 +469,7 @@
 %{?with_hpn:%patch11 -p1}
 %{?with_hpn_none:%patch12 -p1}
 %patch13 -p1
+%patch14 -p3
 
 %build
 cp %{_datadir}/automake/config.sub .
@@ -494,7 +496,7 @@
 	--enable-utmpx \
 	--enable-wtmpx
 
-echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h
+echo '#define LOGIN_PROGRAM		   "/bin/login"' >>config.h
 
 %{__make}
 
@@ -558,10 +560,10 @@
 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
 
@@ -674,6 +676,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.251.2.9  2006/09/27 19:41:11  glen
+- rel 7; fixes CVE-2006-4924
+
 Revision 1.251.2.8  2006/09/09 01:29:17  glen
 - rel 6 (rebuild with fixed %useradd/%groupadd macros)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openssh.spec?r1=1.251.2.8&r2=1.251.2.9&f=u