Author: qboosh Date: Thu Oct 5 08:41:11 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - updated chroot patch - selinux patch merged, now it contains just one fix - removed obsolete selinux-pld patch
---- Files affected: SPECS: openssh.spec (1.265 -> 1.266) ---- Diffs: ================================================================ Index: SPECS/openssh.spec diff -u SPECS/openssh.spec:1.265 SPECS/openssh.spec:1.266 --- SPECS/openssh.spec:1.265 Fri Sep 29 00:38:54 2006 +++ SPECS/openssh.spec Thu Oct 5 10:41:06 2006 @@ -61,15 +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 +Patch11: %{name}-4.3p1-hpn11-none.patch +Patch12: %{name}-include.patch URL: http://www.openssh.com/ BuildRequires: %{__perl} BuildRequires: autoconf @@ -460,15 +459,14 @@ %{?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"} @@ -672,6 +670,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.266 2006/10/05 08:41:06 qboosh +- updated chroot patch +- selinux patch merged, now it contains just one fix +- removed obsolete selinux-pld patch + Revision 1.265 2006/09/28 22:38:54 glen - ac_fix patch outdated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openssh.spec?r1=1.265&r2=1.266&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
