SPECS: openssh.spec - dropped disabled for long time pam-conv patc...

[qboosh]

Author: qboosh                       Date: Tue Oct 30 20:21:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped disabled for long time pam-conv patch, renumbered remaining ones

---- Files affected:
SPECS:
   openssh.spec (1.288 -> 1.289) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.288 SPECS/openssh.spec:1.289
--- SPECS/openssh.spec:1.288	Mon Oct 22 08:42:56 2007
+++ SPECS/openssh.spec	Tue Oct 30 21:20:57 2007
@@ -45,24 +45,23 @@
 Source5:	ssh-agent.sh
 Source6:	ssh-agent.conf
 Patch0:		%{name}-no_libnsl.patch
-Patch2:		%{name}-linux-ipv6.patch
-Patch3:		%{name}-pam_misc.patch
-Patch4:		%{name}-sigpipe.patch
+Patch1:		%{name}-linux-ipv6.patch
+Patch2:		%{name}-pam_misc.patch
+Patch3:		%{name}-sigpipe.patch
 # http://www.opendarwin.org/projects/openssh-lpk/
-Patch5:		%{name}-lpk-4.3p1-0.3.7.patch
-Patch6:		%{name}-config.patch
-Patch7:		%{name}-pam-conv.patch
+Patch4:		%{name}-lpk-4.3p1-0.3.7.patch
+Patch5:		%{name}-config.patch
 # http://chrootssh.sourceforge.net/download/osshChroot-3.7.1p2.diff
-Patch8:		%{name}-chroot.patch
-Patch9:		%{name}-selinux.patch
+Patch6:		%{name}-chroot.patch
+Patch7:		%{name}-selinux.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
-Patch10:	%{name}-4.3p1-hpn11.patch
+Patch8:		%{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
-Patch11:	%{name}-4.3p1-hpn11-none.patch
-Patch12:	%{name}-include.patch
+Patch9:		%{name}-4.3p1-hpn11-none.patch
+Patch10:	%{name}-include.patch
 URL:		http://www.openssh.com/
 BuildRequires:	%{__perl}
 BuildRequires:	autoconf
@@ -471,17 +470,16 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%{?with_ldap:%patch5 -p1}
+%{?with_ldap:%patch4 -p1}
+%patch5 -p1
 %patch6 -p1
-#%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%{?with_hpn:%patch10 -p1}
-%{?with_hpn_none:%patch11 -p1}
-%patch12 -p1
+%patch7 -p1
+%{?with_hpn:%patch8 -p1}
+%{?with_hpn_none:%patch9 -p1}
+%patch10 -p1
 
 %build
 cp /usr/share/automake/config.sub .
@@ -683,6 +681,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.289  2007/10/30 20:20:57  qboosh
+- dropped disabled for long time pam-conv patch, renumbered remaining ones
+
 Revision 1.288  2007/10/22 06:42:56  arekm
 - up to 4.7p1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssh.spec?r1=1.288&r2=1.289&f=u