Update x509/hpn patches.

Package-Manager: portage-2.1.3.19

4 files changed, 196 insertions, 8 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 15f3fbad06b9..402c2d885a64 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.269 2007/10/08 22:29:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.270 2007/11/21 04:21:12 vapier Exp $
+
+*openssh-4.7_p1-r3 (21 Nov 2007)
+
+  21 Nov 2007; Mike Frysinger <vapier@gentoo.org> +openssh-4.7_p1-r3.ebuild:
+  Update x509/hpn patches.
 
   08 Oct 2007; Mike Frysinger <vapier@gentoo.org> openssh-4.7_p1-r1.ebuild,
   openssh-4.7_p1-r2.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 5ca1087a478a..d8228806e604 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -84,7 +84,9 @@ DIST openssh-4.6p1+x509-5.5.2.diff.gz 141892 RMD160 3aacab881f28b7e8087481a6fcf6
 DIST openssh-4.6p1-hpn12v17.diff.gz 16145 RMD160 bf418d8274a3b3c631d1f6db217f1d879046599f SHA1 8a401c329e0777398c4371c0746a63e1d9690469 SHA256 61438f6dc8959b038dee4fb365fe79b749053ccc149e768cdb73cb9c8740360b
 DIST openssh-4.6p1.tar.gz 967395 RMD160 2959ac56c9175275bf82847ec64b2b169aedcb82 SHA1 b2aefeb1861b4688b1777436035239ec32a47da8 SHA256 7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a
 DIST openssh-4.7p1+x509-6.0.1.diff.gz 147459 RMD160 4ac66d2422f7137dd0af3aae697308266a0ce0cb SHA1 b3b2d163f4505877d9ec58267edd7ee9dd46793c SHA256 2a5524161ac01e44980d74765f6f843d77aa96643879e9ce16120f1a4eb3ebd0
+DIST openssh-4.7p1+x509-6.1.diff.gz 178405 RMD160 ccf01f9bdc93dba3bc23e9e09cd4d0cee795d407 SHA1 68b6d7d7b2287ceb77125ed97379fd0be93db4ed SHA256 0d4a19809309f520033a6ae11d5bfb068f002c31bfb1031449f3eab9c5f20d57
 DIST openssh-4.7p1-hpn12v18.diff.gz 16094 RMD160 7b35eb1a3f6f3b703ac7f155f620bff63a900a0e SHA1 8ab61d12b5bcf70d0ffe9cb1d157136d20ebb22c SHA256 45e6ea24e2722cab9b4e143952bf6539024aa8cc93353b88807c910330bb735b
+DIST openssh-4.7p1-hpn12v19.diff.gz 15122 RMD160 bf176a84578fac33cc249b49b1014625bb8e78ca SHA1 be45c4363a1d583cc8012138a0dd0c98246653da SHA256 60ba4bfd986f5ee21394387bc8ffd87bd1f2e16c5e8853b7896327faf1595bf3
 DIST openssh-4.7p1.tar.gz 991119 RMD160 b828e79d3d1a931cb77651ec7d7276cf3ba22d90 SHA1 58357db9e64ba6382bef3d73d1d386fcdc0508f4 SHA256 d47133f0c6737d2889bf8da7bdf389fc2268d1c7fa3cd11a52451501eab548bc
 DIST openssh-lpk-4.4p1-0.3.7.patch 61187 RMD160 90b0bbe07a3617f6eecb9f77c1a38c5f4dd4dcaf SHA1 b1854a4391c5d11f1a5ab09059643bbaf2278009 SHA256 c74aa642b4b2eeceb0c3f554752d172f8d5a7cd30f2aae517e93ef3bf1bd24e7
 DIST openssh-lpk-4.5p1-0.3.8-no-configure.patch 58327 RMD160 464eb3e29f77d2d1e9785ea7cbae5c6d6bb0aff5 SHA1 5020b325b845de131236a489f2bbf19da64aff6e SHA256 ffbd706fb543709d1be0d37af50de561ed9a4271508f0df3b951d6a1db5eb1eb
@@ -113,10 +115,14 @@ EBUILD openssh-4.7_p1-r2.ebuild 4929 RMD160 f591978e03991f2026e69bc9c117451cb2ee
 MD5 97f278b2fa45bab8ccb63c0c726e3abe openssh-4.7_p1-r2.ebuild 4929
 RMD160 f591978e03991f2026e69bc9c117451cb2ee7229 openssh-4.7_p1-r2.ebuild 4929
 SHA256 234b17c951f6d52829cdc5b98a04a0b2245f63a2136026a1b547029430b5ff52 openssh-4.7_p1-r2.ebuild 4929
-MISC ChangeLog 42452 RMD160 1b91cae558447087ccf506046b2b2b33b245d5fa SHA1 ff012eafa37e072217725ab798e49f0e2ef99113 SHA256 71c6e0c92b36070cd220687dd154263e97d5d825179460e7d28b57bd53a6ad5d
-MD5 376e7188aad54232b8ea687c420cbd6e ChangeLog 42452
-RMD160 1b91cae558447087ccf506046b2b2b33b245d5fa ChangeLog 42452
-SHA256 71c6e0c92b36070cd220687dd154263e97d5d825179460e7d28b57bd53a6ad5d ChangeLog 42452
+EBUILD openssh-4.7_p1-r3.ebuild 4925 RMD160 8c37eb1e72758dbce7234e5059d950dcb5a55b7a SHA1 52337fd622778585207979b12235286a98ef7528 SHA256 a24a387fad067f8adafec0cf41374a33aa0daf6783790c5d4f74c0dbc0f8faa7
+MD5 e0c0c5e081defffec1bfd0a62810b912 openssh-4.7_p1-r3.ebuild 4925
+RMD160 8c37eb1e72758dbce7234e5059d950dcb5a55b7a openssh-4.7_p1-r3.ebuild 4925
+SHA256 a24a387fad067f8adafec0cf41374a33aa0daf6783790c5d4f74c0dbc0f8faa7 openssh-4.7_p1-r3.ebuild 4925
+MISC ChangeLog 42591 RMD160 2347a93313bdbc2bf8e96f7d06d9100e69176514 SHA1 ec29d53b9f6890b48ba270a7c5f95e2daf6fa2e8 SHA256 5f66e3a0c0f132029fedbcd9f7ab854bc304dc9fc85c291b48b9d9a058ca77c4
+MD5 304d918c10e9f4c1f5a6ad0e13e86988 ChangeLog 42591
+RMD160 2347a93313bdbc2bf8e96f7d06d9100e69176514 ChangeLog 42591
+SHA256 5f66e3a0c0f132029fedbcd9f7ab854bc304dc9fc85c291b48b9d9a058ca77c4 ChangeLog 42591
 MISC metadata.xml 1150 RMD160 4b6c978959df7998b2d7b22ea9dee0fbc9b37fc5 SHA1 2b319d9ed51a8a7a30d37bd4ad55484704355b31 SHA256 ad8ada6ce7414bd3ce222b80899c15998026c7184524b15cb0a8f18097a52d5c
 MD5 21157ed8184cb229572a983dd217ab86 metadata.xml 1150
 RMD160 4b6c978959df7998b2d7b22ea9dee0fbc9b37fc5 metadata.xml 1150
@@ -139,10 +145,13 @@ SHA256 c8d141315a8420711012ab9fca4936ee8c480d10ee3e00f8bca530c0a1437cb1 files/di
 MD5 6c07bd07ea68282f47cae4179a40a21b files/digest-openssh-4.7_p1-r2 1051
 RMD160 1f82940b0b46562f4071c859d8203ae9c958804b files/digest-openssh-4.7_p1-r2 1051
 SHA256 c8d141315a8420711012ab9fca4936ee8c480d10ee3e00f8bca530c0a1437cb1 files/digest-openssh-4.7_p1-r2 1051
+MD5 2d2209996104445e7d7cf725ed08d6bf files/digest-openssh-4.7_p1-r3 1045
+RMD160 610bde7c4a32ac04b35ac697821b0c62a993fc24 files/digest-openssh-4.7_p1-r3 1045
+SHA256 b14e16aeb9464814bea4ac8fc0a5cc13327d7c9c56cdc0e584e63df0a78c19b0 files/digest-openssh-4.7_p1-r3 1045
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHCq9Yp/wUKkr7RBoRAkQ3AKCmwADv0G0GhoolJ5vIkxiM8uquNgCgt+B9
-R4fjAJgOECGVN8HHdFQvKUw=
-=zoLJ
+iD8DBQFHQ7I/p/wUKkr7RBoRAiFHAJ9U0bvge2bKWqP0qVW3L/1c7WC7PQCbBB7A
+6Wpm7e7Ah8Yk6SWZ4uCQ6G0=
+=8hdI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.7_p1-r3 b/net-misc/openssh/files/digest-openssh-4.7_p1-r3
new file mode 100644
index 000000000000..6170764ca75c
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.7_p1-r3
@@ -0,0 +1,12 @@
+MD5 4a67030d64ef907e0139e9b40d806e9f openssh-4.7p1+x509-6.1.diff.gz 178405
+RMD160 ccf01f9bdc93dba3bc23e9e09cd4d0cee795d407 openssh-4.7p1+x509-6.1.diff.gz 178405
+SHA256 0d4a19809309f520033a6ae11d5bfb068f002c31bfb1031449f3eab9c5f20d57 openssh-4.7p1+x509-6.1.diff.gz 178405
+MD5 befa2e169944d1d32216cbf35d182a96 openssh-4.7p1-hpn12v19.diff.gz 15122
+RMD160 bf176a84578fac33cc249b49b1014625bb8e78ca openssh-4.7p1-hpn12v19.diff.gz 15122
+SHA256 60ba4bfd986f5ee21394387bc8ffd87bd1f2e16c5e8853b7896327faf1595bf3 openssh-4.7p1-hpn12v19.diff.gz 15122
+MD5 50a800fd2c6def9e9a53068837e87b91 openssh-4.7p1.tar.gz 991119
+RMD160 b828e79d3d1a931cb77651ec7d7276cf3ba22d90 openssh-4.7p1.tar.gz 991119
+SHA256 d47133f0c6737d2889bf8da7bdf389fc2268d1c7fa3cd11a52451501eab548bc openssh-4.7p1.tar.gz 991119
+MD5 f43a8aae7d69e72f0ec07bc96e46b328 openssh-lpk-4.6p1-0.3.9.patch 61605
+RMD160 1bf1830192c3eba43c66c3c6469740724cb1ecf2 openssh-lpk-4.6p1-0.3.9.patch 61605
+SHA256 e12335e8bf020508ea3866db07b306f4c965e3f9de262c06f62fad494e93107e openssh-lpk-4.6p1-0.3.9.patch 61605
diff --git a/net-misc/openssh/openssh-4.7_p1-r3.ebuild b/net-misc/openssh/openssh-4.7_p1-r3.ebuild
new file mode 100644
index 000000000000..5de945624dac
--- /dev/null
+++ b/net-misc/openssh/openssh-4.7_p1-r3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r3.ebuild,v 1.1 2007/11/21 04:21:12 vapier Exp $
+
+inherit eutils flag-o-matic ccc multilib autotools pam
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_/}
+
+X509_PATCH="${PARCH}+x509-6.1.diff.gz"
+LDAP_PATCH="${PARCH/openssh-4.7/openssh-lpk-4.6}-0.3.9.patch"
+HPN_PATCH="${PARCH}-hpn12v19.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )
+	X509? ( http://roumenpetrov.info/openssh/x509-6.1/${X509_PATCH} )
+	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="static pam tcpd kerberos skey selinux chroot X509 ldap smartcard hpn libedit X"
+
+RDEPEND="pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	selinux? ( >=sys-libs/libselinux-1.28 )
+	skey? ( >=app-admin/skey-1.1.5-r1 )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	>=dev-libs/openssl-0.9.6d
+	>=sys-libs/zlib-1.2.3
+	smartcard? ( dev-libs/opensc )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	X? ( x11-apps/xauth )
+	userland_GNU? ( sys-apps/shadow )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+PROVIDE="virtual/ssh"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_setup() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && use ${1} && echo ${1} ; }
+	local fail="
+		$(maybe_fail X509 X509_PATCH)
+		$(maybe_fail ldap LDAP_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+}
+
+src_unpack() {
+	unpack ${PARCH}.tar.gz
+	cd "${S}"
+
+	sed -i \
+		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
+		pathnames.h || die
+
+	use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-4.4_p1-x509-hpn-glue.patch
+	use chroot && epatch "${FILESDIR}"/openssh-4.3_p1-chroot.patch
+	use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
+	if ! use X509 ; then
+		if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+			epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${PN}-4.4_p1-ldap-hpn-glue.patch
+		fi
+	elif use ldap ; then
+		ewarn "Sorry, X509 and ldap don't get along, disabling ldap"
+	fi
+	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
+	epatch "${FILESDIR}"/${P}-GSSAPI-dns.patch #165444
+
+	sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
+
+	eautoreconf
+}
+
+src_compile() {
+	addwrite /dev/ptmx
+	addpredict /etc/skey/skeykeys #skey configure code triggers this
+
+	local myconf=""
+	if use static ; then
+		append-ldflags -static
+		use pam && ewarn "Disabling pam support becuse of static flag"
+		myconf="${myconf} --without-pam"
+	else
+		myconf="${myconf} $(use_with pam)"
+	fi
+
+	econf \
+		--with-ldflags="${LDFLAGS}" \
+		--disable-strip \
+		--sysconfdir=/etc/ssh \
+		--libexecdir=/usr/$(get_libdir)/misc \
+		--datadir=/usr/share/openssh \
+		--disable-suid-ssh \
+		--with-privsep-path=/var/empty \
+		--with-privsep-user=sshd \
+		--with-md5-passwords \
+		--with-ssl-engine \
+		$(use_with ldap) \
+		$(use_with libedit) \
+		$(use_with kerberos kerberos5 /usr) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_with selinux) \
+		$(use_with skey) \
+		$(use_with smartcard opensc) \
+		${myconf} \
+		|| die "bad configure"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}" || die
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+	keepdir /var/empty
+
+	newpamd "${FILESDIR}"/sshd.pam_include.1 sshd
+	use pam \
+		&& dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
+		&& dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
+
+	doman contrib/ssh-copy-id.1
+	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+}
+
+pkg_postinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+
+	# help fix broken perms caused by older ebuilds.
+	# can probably cut this after the next stage release.
+	chmod u+x "${ROOT}"/etc/skel/.ssh >& /dev/null
+
+	ewarn "Remember to merge your config files in /etc/ssh/ and then"
+	ewarn "restart sshd: '/etc/init.d/sshd restart'."
+	if use pam ; then
+		echo
+		ewarn "Please be aware users need a valid shell in /etc/passwd"
+		ewarn "in order to be allowed to login."
+	fi
+}