SPECS (AC-branch): openssh.spec - updated to 4.4p1

[glen]

Author: glen                         Date: Thu Oct 12 22:02:14 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 4.4p1

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

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.251.2.9 SPECS/openssh.spec:1.251.2.10
--- SPECS/openssh.spec:1.251.2.9	Wed Sep 27 21:41:11 2006
+++ SPECS/openssh.spec	Fri Oct 13 00:02:09 2006
@@ -17,7 +17,7 @@
 %endif
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
-%define		_rel	7
+%define		_rel	1
 Summary:	OpenSSH free Secure Shell (SSH) implementation
 Summary(de):	OpenSSH - freie Implementation der Secure Shell (SSH)
 Summary(es):	Implementación libre de SSH
@@ -29,13 +29,13 @@
 Summary(ru):	OpenSSH - Ó×ĎÂĎÄÎÁŃ ŇĹÁĚÉÚÁĂÉŃ ĐŇĎÔĎËĎĚÁ Secure Shell (SSH)
 Summary(uk):	OpenSSH - ׌ĚŘÎÁ ŇĹÁĚŚÚÁĂŚŃ ĐŇĎÔĎËĎĚŐ Secure Shell (SSH)
 Name:		openssh
-Version:	4.3p2
+Version:	4.4p1
 Release:	%{_rel}%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
 Source0:	ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	7e9880ac20a9b9db0d3fea30a9ff3d46
+# Source0-md5:	793a709a8de695c22f523024d7e9bf07
 Source1:	%{name}d.conf
 Source2:	%{name}.conf
 Source3:	%{name}d.init
@@ -51,7 +51,6 @@
 Source11:	ssh-agent.sh
 Source12:	ssh-agent.conf
 Patch0:		%{name}-no_libnsl.patch
-Patch1:		%{name}-ac_fix.patch
 Patch2:		%{name}-linux-ipv6.patch
 Patch3:		%{name}-pam_misc.patch
 Patch4:		%{name}-sigpipe.patch
@@ -62,16 +61,14 @@
 # http://chrootssh.sourceforge.net/download/osshChroot-3.7.1p2.diff
 Patch8:		%{name}-chroot.patch
 Patch9:		%{name}-selinux.patch
-Patch10:	%{name}-selinux-pld.patch
 # HPN patches rediffed due sigpipe patch.
 # High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.2p1-hpn11.diff
-Patch11:	%{name}-4.3p1-hpn11.patch
+Patch10:	%{name}-4.3p1-hpn11.patch
 # Adds HPN (see p11) and an undocumented -z none cipher flag
 # 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
+Patch11:	%{name}-4.3p1-hpn11-none.patch
+Patch12:	%{name}-include.patch
 URL:		http://www.openssh.com/
 BuildRequires:	%{__perl}
 BuildRequires:	autoconf
@@ -456,7 +453,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -464,15 +460,16 @@
 %{?with_kerberos5:%patch6 -p1}
 #%patch7 -p1
 %patch8 -p1
-%{?with_selinux:%patch9 -p1}
-%{?with_selinux:%patch10 -p1}
-%{?with_hpn:%patch11 -p1}
-%{?with_hpn_none:%patch12 -p1}
-%patch13 -p1
-%patch14 -p3
+%patch9 -p1
+%{?with_hpn:%patch10 -p1}
+%{?with_hpn_none:%patch11 -p1}
+%patch12 -p1
+
+cp -a %{SOURCE9} .
+cp -a %{SOURCE10} .
 
 %build
-cp %{_datadir}/automake/config.sub .
+cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{?with_chroot:CPPFLAGS="-DCHROOT"}
@@ -499,9 +496,6 @@
 echo '#define LOGIN_PROGRAM		   "/bin/login"' >>config.h
 
 %{__make}
-
-cp -f %{SOURCE9} .
-cp -f %{SOURCE10} .
 %{__cc} %{rpmcflags} %{rpmldflags} connect.c -o connect
 
 cd contrib
@@ -676,6 +670,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.251.2.10  2006/10/12 22:02:09  glen
+- updated to 4.4p1
+
 Revision 1.251.2.9  2006/09/27 19:41:11  glen
 - rel 7; fixes CVE-2006-4924
 
================================================================

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