- updated chroot patch

- selinux patch merged, now it contains just one fix
- removed obsolete selinux-pld patch

Changed files:
    openssh.spec -> 1.266

diff --git a/openssh.spec b/openssh.spec
index c0fb8c150cae57f92363e3045bfd2791dda9ec96..d6f1a4dcb17c3f6ff702478e675c1ae2601f1051 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -60,15 +60,14 @@ Patch7:             %{name}-pam-conv.patch
 # 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
+Patch11:       %{name}-4.3p1-hpn11-none.patch
+Patch12:       %{name}-include.patch
 URL:           http://www.openssh.com/
 BuildRequires: %{__perl}
 BuildRequires: autoconf
@@ -459,15 +458,14 @@ GNOME.
 %{?with_ldap:%patch5 -p1}
 %{?with_kerberos5:%patch6 -p1}
 #%patch7 -p1
-#%patch8 -p1 ? MERGED IN?
-#%{?with_selinux:%patch9 -p1} ? MERGED IN?
-#%{?with_selinux:%patch10 -p1} ? NEEDS MERGE?
-%{?with_hpn:%patch11 -p1}
-%{?with_hpn_none:%patch12 -p1}
-%patch13 -p1
+%patch8 -p1
+%patch9 -p1
+%{?with_hpn:%patch10 -p1}
+%{?with_hpn_none:%patch11 -p1}
+%patch12 -p1
 
 %build
-cp %{_datadir}/automake/config.sub .
+cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{?with_chroot:CPPFLAGS="-DCHROOT"}