SPECS: openssh.spec - 4.4p1, selinux patches need review

glen glen at pld-linux.org
Thu Sep 28 23:38:07 CEST 2006


Author: glen                         Date: Thu Sep 28 21:38:07 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 4.4p1, selinux patches need review

---- Files affected:
SPECS:
   openssh.spec (1.263 -> 1.264) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.263 SPECS/openssh.spec:1.264
--- SPECS/openssh.spec:1.263	Wed Sep 27 21:42:52 2006
+++ SPECS/openssh.spec	Thu Sep 28 23:38:02 2006
@@ -17,7 +17,7 @@
 %endif
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
-%define		_rel	7
+%define		_rel	0.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
@@ -71,7 +71,6 @@
 # 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
@@ -456,20 +455,19 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %{?with_ldap:%patch5 -p1}
 %{?with_kerberos5:%patch6 -p1}
 #%patch7 -p1
-%patch8 -p1
-%{?with_selinux:%patch9 -p1}
-%{?with_selinux:%patch10 -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
-%patch14 -p3
 
 %build
 cp %{_datadir}/automake/config.sub .
@@ -676,6 +674,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.264  2006/09/28 21:38:02  glen
+- 4.4p1, selinux patches need review
+
 Revision 1.263  2006/09/27 19:42:52  glen
 - rel 7; fixes CVE-2006-4924
 
================================================================

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



More information about the pld-cvs-commit mailing list