old

Package-Manager: portage-2.0.51-r15

5 files changed, 1 insertions, 286 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e6d3b10cada0..2eb81e34bf54 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -2,13 +2,10 @@ MD5 e8036f17e10e1e3725f50d5c1dfd8a1b ChangeLog 18630
 MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329
 MD5 4f34b1b754e5edfc6b35aa0f9c030aeb openssh-3.7.1_p2-r1.ebuild 4111
 MD5 f4a6163b12bd6719b350f7a24c7e092b openssh-3.9_p1-r1.ebuild 4555
-MD5 16b491dc2a52314a4cbcada2213654ca openssh-3.9_p1.ebuild 4420
 MD5 d1055a8536e068dc46b4c99f5bc8be04 openssh-3.8.1_p1-r1.ebuild 4239
-MD5 0546a736933829d7c8af0f8a6363414d openssh-3.8.1_p1-r2.ebuild 4264
 MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142
 MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r1 141
-MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r2 141
-MD5 2cce94a742ab0721d87b1ff63c32d0f9 files/digest-openssh-3.9_p1 136
+MD5 3a36e663618004d3c7f599fe43b100f3 files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 5964
 MD5 2cce94a742ab0721d87b1ff63c32d0f9 files/digest-openssh-3.9_p1-r1 136
 MD5 5b057f6a1a7c2c0f94f83bc19c4d6a9b files/openssh-3.5_p1-gentoo-sshd-gcc3.patch.bz2 253
 MD5 7880e18b2a91e5927810dddc7bda270f files/openssh-3.7.1_p1-selinux.diff.bz2 1353
@@ -32,7 +29,6 @@ MD5 ba87dbfc3be0ab9d70fe24278d9deb02 files/openssh-3.9_p1-infoleak.patch 2496
 MD5 f08e067b7000e994a23291e15c9e53f3 files/openssh-3.9_p1-largekey.patch.bz2 1352
 MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.9_p1-opensc.patch.bz2 1381
 MD5 93d19c0ef91091a730510c46ab8e811e files/openssh-3.9_p1-selinux.diff.bz2 1307
-MD5 3a36e663618004d3c7f599fe43b100f3 files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 5964
 MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.9_p1-skey.patch.bz2 270
 MD5 b912e51afc37c43afef30d1f4aaee55a files/openssh-skeychallenge-args.diff.bz2 424
 MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
diff --git a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r2 b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r2
deleted file mode 100644
index a63345a1d3fc..000000000000
--- a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1dbfd40ae683f822ae917eebf171ca42 openssh-3.8.1p1.tar.gz 817932
-MD5 52e42ecdf2b0498220661d4bf1cfaeae openssh-3.8.1p1+x509h.diff.gz 143652
diff --git a/net-misc/openssh/files/digest-openssh-3.9_p1 b/net-misc/openssh/files/digest-openssh-3.9_p1
deleted file mode 100644
index d0b53cdb61cf..000000000000
--- a/net-misc/openssh/files/digest-openssh-3.9_p1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8e1774d0b52aff08f817f3987442a16e openssh-3.9p1.tar.gz 854027
-MD5 eedb263c96a1d7bf208eb2ba70c2e238 openssh-3.9p1+x509h.diff.gz 98011
diff --git a/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild b/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild
deleted file mode 100644
index 159a085b8c6e..000000000000
--- a/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild,v 1.5 2005/01/07 21:37:33 aliz Exp $
-
-inherit eutils flag-o-matic ccc gnuconfig
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-X509_PATCH="${PARCH}+x509h.diff.gz"
-SELINUX_PATCH="openssh-3.7.1_p1-selinux.diff"
-
-S=${WORKDIR}/${PARCH}
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard uclibc sftplogging"
-
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.73
-		>=sys-apps/shadow-4.0.2-r2 )
-	!mips? ( kerberos? ( virtual/krb5 ) )
-	selinux? ( sys-libs/libselinux )
-	!ppc64? ( skey? ( >=app-admin/skey-1.1.5-r1 ) )
-	>=dev-libs/openssl-0.9.6d
-	>=sys-libs/zlib-1.1.4
-	x86? ( smartcard? ( dev-libs/opensc ) )
-	!ppc64? ( tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) )"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	dev-lang/perl
-	!uclibc? ( sys-apps/groff )
-	>=sys-apps/sed-4
-	sys-devel/autoconf"
-PROVIDE="virtual/ssh"
-
-src_unpack() {
-	unpack ${PARCH}.tar.gz ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-resolv_functions.patch.bz2
-	epatch ${FILESDIR}/${P}-largekey.patch.bz2
-
-	use X509 && epatch ${DISTDIR}/${X509_PATCH}
-	use sftplogging && epatch ${FILESDIR}/${PARCH}-sftplogging-1.2-gentoo.patch.bz2
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2
-	use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch.bz2
-	use skey && epatch ${FILESDIR}/${P}-skey.patch.bz2
-	use chroot && epatch ${FILESDIR}/${P}-chroot.patch.bz2
-	use smartcard && epatch ${FILESDIR}/${P}-opensc.patch.bz2
-}
-
-src_compile() {
-	addwrite /dev/ptmx
-	gnuconfig_update
-
-	# make sure .sbss is large enough
-	use skey && use alpha && append-ldflags -mlarge-data
-	use ldap && filter-flags -funroll-loops
-	use selinux && append-flags "-DWITH_SELINUX"
-	use static && append-ldflags -static
-	export LDFLAGS
-
-	autoconf
-
-	local myconf="\
-		$( use_with tcpd tcp-wrappers ) \
-		$( use_with pam ) \
-		$( use_with skey )"
-
-	use ipv6 || myconf="${myconf} --with-ipv4-default"
-	use kerberos && myconf="${myconf} --with-kerberos5=/usr" || \
-		myconf="${myconf} --without-kerberos5"
-
-	econf \
-		--sysconfdir=/etc/ssh \
-		--libexecdir=/usr/lib/misc \
-		--datadir=/usr/share/openssh \
-		--disable-suid-ssh \
-		--with-privsep-path=/var/empty \
-		--with-privsep-user=sshd \
-		--with-md5-passwords \
-		`use_with tcpd tcp-wrappers` \
-		`use_with pam` \
-		`use_with skey` \
-		`use_with smartcard opensc` \
-		${myconf} \
-		|| die "bad configure"
-
-#	use static && {
-#		# statically link to libcrypto -- good for the boot cd
-#		sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" Makefile
-#	}
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install-files DESTDIR=${D} || die
-	chmod 600 ${D}/etc/ssh/sshd_config
-	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-	use pam && ( insinto /etc/pam.d  ; newins ${FILESDIR}/sshd.pam sshd )
-	exeinto /etc/init.d ; newexe ${FILESDIR}/sshd.rc6 sshd
-	keepdir /var/empty
-	dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
-	use pam && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config
-}
-
-pkg_postinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 /bin/false /var/empty sshd
-
-	ewarn "Remember to merge your config files in /etc/ssh/ and then"
-	ewarn "restart sshd: '/etc/init.d/sshd restart'."
-	ewarn
-	einfo "As of version 3.4 the default is to enable the UsePrivelegeSeparation"
-	einfo "functionality, but please ensure that you do not explicitly disable"
-	einfo "this in your configuration as disabling it opens security holes"
-	einfo
-	einfo "This revision has removed your sshd user id and replaced it with a"
-	einfo "new one with UID 22.  If you have any scripts or programs that"
-	einfo "that referenced the old UID directly, you will need to update them."
-	einfo
-	use pam >/dev/null 2>&1 && {
-		einfo "Please be aware users need a valid shell in /etc/passwd"
-		einfo "in order to be allowed to login."
-		einfo
-	}
-}
diff --git a/net-misc/openssh/openssh-3.9_p1.ebuild b/net-misc/openssh/openssh-3.9_p1.ebuild
deleted file mode 100644
index d8291f1ffcee..000000000000
--- a/net-misc/openssh/openssh-3.9_p1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.10 2005/01/07 21:37:33 aliz Exp $
-
-inherit eutils flag-o-matic ccc gnuconfig
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-SFTPLOG_PATCH_VER="1.2"
-X509_PATCH="${PARCH}+x509h.diff.gz"
-SELINUX_PATCH="openssh-3.9_p1-selinux.diff"
-
-S=${WORKDIR}/${PARCH}
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard uclibc sftplogging"
-
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.73
-		>=sys-apps/shadow-4.0.2-r2 )
-	!mips? ( kerberos? ( virtual/krb5 ) )
-	selinux? ( sys-libs/libselinux )
-	!ppc64? ( skey? ( >=app-admin/skey-1.1.5-r1 ) )
-	>=dev-libs/openssl-0.9.6d
-	>=sys-libs/zlib-1.1.4
-	x86? ( smartcard? ( dev-libs/opensc ) )
-	!ppc64? ( tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) )"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	dev-lang/perl
-	!uclibc? ( sys-apps/groff )
-	>=sys-apps/sed-4
-	sys-devel/autoconf"
-PROVIDE="virtual/ssh"
-
-src_unpack() {
-	unpack ${PARCH}.tar.gz ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-largekey.patch.bz2
-	epatch ${FILESDIR}/${P}-fix_suid.patch.bz2
-
-	use sftplogging && epatch ${FILESDIR}/${P}-sftplogging-1.2-gentoo.patch.bz2
-	use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch.bz2
-	use skey && epatch ${FILESDIR}/${P}-skey.patch.bz2
-	use chroot && epatch ${FILESDIR}/${P}-chroot.patch
-	use X509 && epatch ${DISTDIR}/${X509_PATCH}
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2
-	use smartcard && epatch ${FILESDIR}/${P}-opensc.patch.bz2
-
-	autoconf || die
-}
-
-src_compile() {
-	local myconf
-
-	addwrite /dev/ptmx
-	gnuconfig_update
-
-	# make sure .sbss is large enough
-	use skey && use alpha && append-ldflags -mlarge-data
-	use ldap && filter-flags -funroll-loops
-	use selinux && append-flags "-DWITH_SELINUX"
-
-	if use static; then
-		append-ldflags -static
-		export LDFLAGS
-		if use pam; then
-			ewarn "Disabling pam support becuse of static flag."
-			myconf="${myconf} --without-pam"
-		else
-			myconf="${myconf} --without-pam"
-		fi
-	else
-		myconf="${myconf} `use_with pam`"
-	fi
-
-	use ipv6 || myconf="${myconf} --with-ipv4-default"
-
-	econf \
-		--sysconfdir=/etc/ssh \
-		--libexecdir=/usr/lib/misc \
-		--datadir=/usr/share/openssh \
-		--disable-suid-ssh \
-		--with-privsep-path=/var/empty \
-		--with-privsep-user=sshd \
-		--with-md5-passwords \
-		`use_with kerberos kerberos5 /usr` \
-		`use_with tcpd tcp-wrappers` \
-		`use_with skey` \
-		`use_with smartcard opensc` \
-		${myconf} \
-		|| die "bad configure"
-
-#	use static && {
-#		# statically link to libcrypto -- good for the boot cd
-#		sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" Makefile
-#	}
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install-files DESTDIR=${D} || die
-	chmod 600 ${D}/etc/ssh/sshd_config
-	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-	use pam && ( insinto /etc/pam.d  ; newins ${FILESDIR}/sshd.pam sshd )
-	exeinto /etc/init.d ; newexe ${FILESDIR}/sshd.rc6 sshd
-	keepdir /var/empty
-	dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
-	use pam \
-		&& dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
-		&& dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
-}
-
-pkg_postinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 /bin/false /var/empty sshd
-
-	ewarn "Remember to merge your config files in /etc/ssh/ and then"
-	ewarn "restart sshd: '/etc/init.d/sshd restart'."
-	ewarn
-	einfo "As of version 3.4 the default is to enable the UsePrivelegeSeparation"
-	einfo "functionality, but please ensure that you do not explicitly disable"
-	einfo "this in your configuration as disabling it opens security holes"
-	einfo
-	einfo "This revision has removed your sshd user id and replaced it with a"
-	einfo "new one with UID 22.  If you have any scripts or programs that"
-	einfo "that referenced the old UID directly, you will need to update them."
-	einfo
-	use pam >/dev/null 2>&1 && {
-		einfo "Please be aware users need a valid shell in /etc/passwd"
-		einfo "in order to be allowed to login."
-		einfo
-	}
-}