SPECS (AC-branch): openssh.spec - merge 5.0p1 update from HEAD, (c...

[glen]

Author: glen                         Date: Fri Apr  4 07:30:03 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge 5.0p1 update from HEAD, (chroot patch obsoleted; CVE-2008-1483 fixed)

---- Files affected:
SPECS:
   openssh.spec (1.286.2.7 -> 1.286.2.8) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.286.2.7 SPECS/openssh.spec:1.286.2.8
--- SPECS/openssh.spec:1.286.2.7	Fri Feb 29 17:51:06 2008
+++ SPECS/openssh.spec	Fri Apr  4 09:29:57 2008
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	chroot		# without chrooted user environment support
 %bcond_with	gnome		# with gnome-askpass (GNOME 1.x) utility
 %bcond_without	gtk		# without GTK+ (2.x)
 %bcond_with	ldap		# with ldap support
@@ -24,13 +23,13 @@
 Summary(ru.UTF-8):	OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
-Version:	4.7p1
-Release:	3
+Version:	5.0p1
+Release:	1
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
 Source0:	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	50a800fd2c6def9e9a53068837e87b91
+# Source0-md5:	1f1dfaa775f33dd3328169de9bdc292a
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	66943d481cc422512b537bcc2c7400d1
 Source2:	%{name}d.init
@@ -45,10 +44,7 @@
 # http://www.opendarwin.org/projects/openssh-lpk/
 Patch4:		%{name}-lpk-4.3p1-0.3.7.patch
 Patch5:		%{name}-config.patch
-# http://chrootssh.sourceforge.net/download/osshChroot-3.7.1p2.diff
-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
 Patch9:	%{name}-4.7p1-hpn13v1.diff
@@ -467,7 +463,6 @@
 %patch3 -p1
 %{?with_ldap:%patch4 -p1}
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %{?with_hpn:%patch9 -p1}
 %patch10 -p1
@@ -478,7 +473,6 @@
 cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
-%{?with_chroot:CPPFLAGS="-DCHROOT"}
 %configure \
 	PERL=%{__perl} \
 	--with-dns \
@@ -670,6 +664,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.286.2.8  2008-04-04 07:29:57  glen
+- merge 5.0p1 update from HEAD, (chroot patch obsoleted; CVE-2008-1483 fixed)
+
 Revision 1.286.2.7  2008-02-29 16:51:06  glen
 - enable hpn, rel 3
 
================================================================

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