Add updated hpn support.

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 201 insertions, 29 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index f0051dc2e5c5..81f786433b7a 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.207 2006/10/04 03:12:50 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.208 2006/10/13 22:41:25 vapier Exp $
+
+*openssh-4.4_p1-r4 (13 Oct 2006)
+
+  13 Oct 2006; Mike Frysinger <vapier@gentoo.org> +openssh-4.4_p1-r4.ebuild:
+  Add updated hpn support.
 
 *openssh-4.4_p1-r3 (04 Oct 2006)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 5f455ce6a4aa..5d27cc71d7bc 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -173,6 +173,7 @@ DIST openssh-4.3p2+x509-5.5.diff.gz 136017 RMD160 21069550bbb05ea22870da853f68ee
 DIST openssh-4.3p2-hpn12-gentoo.patch.bz2 13642 RMD160 34fd5390d602a9ab99edb25756318cc0dd842360 SHA1 9110158ea6be921a936271eab00b45ea115b3567 SHA256 14d8ec5601bf1977f583a45353213a2dc4e8a453e3fc9c7a65499d0645cc9063
 DIST openssh-4.3p2.tar.gz 941455 RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 SHA1 2b5b0751fd578283ba7b106025c0ba391fd72f1f SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f
 DIST openssh-4.4p1+x509-5.5.1.diff.gz 137417 RMD160 34cf39583e8c01bb055671a540c7463f45134960 SHA1 091e7499726fce527afeb66fffaf6ee48f4ac4bb SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded
+DIST openssh-4.4p1-hpn12v11.diff.gz 15786 RMD160 7f8c1def2bdd98f79cf26f1017a4ed19a627bf96 SHA1 d020aad90827bc4a61e5b5a77bd3e769ebb92387 SHA256 f42e6799de702281228691eadd5c983acadf81ceb31af82434607633c2cc4ada
 DIST openssh-4.4p1.tar.gz 1044334 RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc SHA1 6a52b1dee1c2c9862923c0008d201d98a7fd9d6c SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac
 DIST openssh-lpk-3.9p1-0.3.6.patch 60920 RMD160 0fdde5cf35e1fe59a428d330509f6964ff3402ed SHA1 cd0e8f4a9826e2883f5fc4cce41a761750657414 SHA256 f4732659ec8e222a8d80741a8e7975ffde089ab985fcad3c986d087732de7c33
 DIST openssh-lpk-4.0p1-0.3.6.patch 60557 RMD160 da57dcc8078c127abea0dc4017399cd5c3f8eee2 SHA1 f0fa0cfa6505b12da250a25115839210138defbc SHA256 61b244eb4c15db9c1a9b575be23afcbe6a30a248a2abbda0de18f0791842dbad
@@ -219,22 +220,14 @@ EBUILD openssh-4.3_p2-r5.ebuild 5957 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2
 MD5 8b4bf9176c47593391f6a25cf40ee932 openssh-4.3_p2-r5.ebuild 5957
 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2f65b openssh-4.3_p2-r5.ebuild 5957
 SHA256 beb5826bd7e1fc08ddfead5d5fa2114cf653fde315cc0264219373ea480e848c openssh-4.3_p2-r5.ebuild 5957
-EBUILD openssh-4.4_p1-r1.ebuild 5366 RMD160 e4d24e0a827c03aab81ee01398614c34de382d67 SHA1 743da9955d0ece55ad859d7f93be24396cdda216 SHA256 b7c7e138b1b87bca67b034bc12a0d75c53575066596a6b83e436014c7ddf3981
-MD5 b13920e3909ace0afaf1033aff5699c9 openssh-4.4_p1-r1.ebuild 5366
-RMD160 e4d24e0a827c03aab81ee01398614c34de382d67 openssh-4.4_p1-r1.ebuild 5366
-SHA256 b7c7e138b1b87bca67b034bc12a0d75c53575066596a6b83e436014c7ddf3981 openssh-4.4_p1-r1.ebuild 5366
-EBUILD openssh-4.4_p1-r2.ebuild 5327 RMD160 a93ec4818c04e706593fd8c8a109e7dcb5186cc6 SHA1 e1d73840f4449f09f3a17ce1b7bb523fe57f59a7 SHA256 7ebbedc721a561d3ba8de84742bdb8cb7442be25ec04a985e2a1e734571b9f1e
-MD5 0f55e50e8eddef91a89d164b29f85bf4 openssh-4.4_p1-r2.ebuild 5327
-RMD160 a93ec4818c04e706593fd8c8a109e7dcb5186cc6 openssh-4.4_p1-r2.ebuild 5327
-SHA256 7ebbedc721a561d3ba8de84742bdb8cb7442be25ec04a985e2a1e734571b9f1e openssh-4.4_p1-r2.ebuild 5327
-EBUILD openssh-4.4_p1-r3.ebuild 5423 RMD160 192f07f01ba45113abddff6ddd763fe54c68ab55 SHA1 d00d935de83bcb365773d5a3717dd91722b3591e SHA256 715f4904017c25f7b416798b725b2e557717d680d014c2c8e1781a3dc26bc9cf
-MD5 09a95608bcaed9d563dd64a94928a1a4 openssh-4.4_p1-r3.ebuild 5423
-RMD160 192f07f01ba45113abddff6ddd763fe54c68ab55 openssh-4.4_p1-r3.ebuild 5423
-SHA256 715f4904017c25f7b416798b725b2e557717d680d014c2c8e1781a3dc26bc9cf openssh-4.4_p1-r3.ebuild 5423
-MISC ChangeLog 33293 RMD160 26c7b3ddf351c86214eb4015a5ea8ff2386a3f59 SHA1 945bd31dab5832670a044867416170dd1796b7fa SHA256 f85bdfc6a720166814b9016c2ddca15bf88f11ad5509ebc9cc74649fb916df5f
-MD5 404b27545acaabaeeea203b0b367441f ChangeLog 33293
-RMD160 26c7b3ddf351c86214eb4015a5ea8ff2386a3f59 ChangeLog 33293
-SHA256 f85bdfc6a720166814b9016c2ddca15bf88f11ad5509ebc9cc74649fb916df5f ChangeLog 33293
+EBUILD openssh-4.4_p1-r4.ebuild 5370 RMD160 38084f3c99eed96890bde772aa90bc2901e08265 SHA1 1e09a1e46e78d10297419c1a65c203b2eab1c036 SHA256 99b05731e432ee2fd1a7476afd9b7af21a670e7780aa56f51abd6d28dde9ddda
+MD5 f505b49dc0f3b35133698cf42367ece4 openssh-4.4_p1-r4.ebuild 5370
+RMD160 38084f3c99eed96890bde772aa90bc2901e08265 openssh-4.4_p1-r4.ebuild 5370
+SHA256 99b05731e432ee2fd1a7476afd9b7af21a670e7780aa56f51abd6d28dde9ddda openssh-4.4_p1-r4.ebuild 5370
+MISC ChangeLog 33430 RMD160 2b1b4d4b35e9c4d3a2fc8b3aea23b16c4eb74602 SHA1 911ce668e9a54ec089abe964fe30ccfd063e7400 SHA256 eb6413d3181a3169c7aa262eca51a1f242e83e2008945157bf7775dd8b3648ff
+MD5 d5e9aab38f471f5569457721d5e2a411 ChangeLog 33430
+RMD160 2b1b4d4b35e9c4d3a2fc8b3aea23b16c4eb74602 ChangeLog 33430
+SHA256 eb6413d3181a3169c7aa262eca51a1f242e83e2008945157bf7775dd8b3648ff ChangeLog 33430
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -269,19 +262,13 @@ SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/di
 MD5 0d0254ed9210821ca64914bd75a158a0 files/digest-openssh-4.3_p2-r5 1343
 RMD160 956c689e98e6be7279d8cffab44e6182f20f6621 files/digest-openssh-4.3_p2-r5 1343
 SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/digest-openssh-4.3_p2-r5 1343
-MD5 45cc7f42e6e47ee8b783224457606e08 files/digest-openssh-4.4_p1-r1 509
-RMD160 eb5e4f22b5987fab29590f179cf23504f02bbcaa files/digest-openssh-4.4_p1-r1 509
-SHA256 b20c299ea3e4f089febf33d46cda8bfdd68154e2bf7753d06f13248528b71ce2 files/digest-openssh-4.4_p1-r1 509
-MD5 c78afce20badb68af99229c6f07ad3c4 files/digest-openssh-4.4_p1-r2 786
-RMD160 31bb12f98ecaa1bf1776f18a9d717d3c734facaf files/digest-openssh-4.4_p1-r2 786
-SHA256 105c7992377303ee3756b8f427d2a4a3569ffe06df654476365d9da65472307a files/digest-openssh-4.4_p1-r2 786
-MD5 c78afce20badb68af99229c6f07ad3c4 files/digest-openssh-4.4_p1-r3 786
-RMD160 31bb12f98ecaa1bf1776f18a9d717d3c734facaf files/digest-openssh-4.4_p1-r3 786
-SHA256 105c7992377303ee3756b8f427d2a4a3569ffe06df654476365d9da65472307a files/digest-openssh-4.4_p1-r3 786
+MD5 056f45fb06ba68f12a5c3d17c358d11a files/digest-openssh-4.4_p1-r4 1054
+RMD160 b9c38e783576498b0a52efdd1d2a2fa1f7f1c5d8 files/digest-openssh-4.4_p1-r4 1054
+SHA256 9473c1a72dfbb64f75d675572c08d199d65c9a89af583d97217947cb09cb4135 files/digest-openssh-4.4_p1-r4 1054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFIyaB3gmyzsILbxIRAlx2AJoCE8t5EzOzQX3Tf4llrjqRKrZ/6ACeImZ7
-dgfheaDrOa6hS+e2XzbsJ5U=
-=Yhj6
+iD8DBQFFMBYtamhnQswr0vIRAkqNAJ4pgJ4aMHnUc+0uqojc0VgDExe/gQCfSxtE
+mpXau66X5VJiHKzD3DzJOWw=
+=Ye+b
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.4_p1-r4 b/net-misc/openssh/files/digest-openssh-4.4_p1-r4
new file mode 100644
index 000000000000..951fce389440
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.4_p1-r4
@@ -0,0 +1,12 @@
+MD5 132f5ae282de4ff822a95591720da8fd openssh-4.4p1+x509-5.5.1.diff.gz 137417
+RMD160 34cf39583e8c01bb055671a540c7463f45134960 openssh-4.4p1+x509-5.5.1.diff.gz 137417
+SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded openssh-4.4p1+x509-5.5.1.diff.gz 137417
+MD5 ae271cb7f4e4ba8f6d34b9e289bd1123 openssh-4.4p1-hpn12v11.diff.gz 15786
+RMD160 7f8c1def2bdd98f79cf26f1017a4ed19a627bf96 openssh-4.4p1-hpn12v11.diff.gz 15786
+SHA256 f42e6799de702281228691eadd5c983acadf81ceb31af82434607633c2cc4ada openssh-4.4p1-hpn12v11.diff.gz 15786
+MD5 793a709a8de695c22f523024d7e9bf07 openssh-4.4p1.tar.gz 1044334
+RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc openssh-4.4p1.tar.gz 1044334
+SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac openssh-4.4p1.tar.gz 1044334
+MD5 4db76f98b1ecbcff2bda11ff8050ad71 openssh-lpk-4.4p1-0.3.7.patch 61187
+RMD160 90b0bbe07a3617f6eecb9f77c1a38c5f4dd4dcaf openssh-lpk-4.4p1-0.3.7.patch 61187
+SHA256 c74aa642b4b2eeceb0c3f554752d172f8d5a7cd30f2aae517e93ef3bf1bd24e7 openssh-lpk-4.4p1-0.3.7.patch 61187
diff --git a/net-misc/openssh/openssh-4.4_p1-r4.ebuild b/net-misc/openssh/openssh-4.4_p1-r4.ebuild
new file mode 100644
index 000000000000..fb58d71c9cb5
--- /dev/null
+++ b/net-misc/openssh/openssh-4.4_p1-r4.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.4_p1-r4.ebuild,v 1.1 2006/10/13 22:41:25 vapier Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+# Please leave pam at end, so that dopamd and newpamd from eutils eclass are not used
+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-5.5.1.diff.gz"
+SECURID_PATCH="" #${PARCH}+SecurID_v1.3.2.patch"
+LDAP_PATCH="${PARCH/-4.4p1/-lpk-4.4p1}-0.3.7.patch"
+HPN_PATCH="${PARCH}-hpn12v11.diff.gz"
+
+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/x509-5.5.1/${X509_PATCH} )
+	ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )
+	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )"
+#	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~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 sys-freebsd/freebsd-lib ) )
+	>=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
+	local fail=""
+	[[ -z ${X509_PATCH}	   ]] && use X509	   && fail="${fail} X509"
+	[[ -z ${SECURID_PATCH} ]] && use smartcard && fail="${fail} smartcard"
+	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
+
+	# fix autoconf lib checking for SELinux
+	epatch "${FILESDIR}/openssh-4.4p1-selinux-ac.diff"
+
+	use X509 && epatch "${DISTDIR}"/${X509_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 ${SECURID_PATCH} ]] && use smartcard ; then
+			epatch \
+				"${DISTDIR}"/${SECURID_PATCH} \
+				"${FILESDIR}"/${P}-securid-updates.patch \
+				"${FILESDIR}"/${P}-securid-hpn-glue.patch
+			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
+		fi
+		if use ldap ; then
+			epatch "${DISTDIR}"/${LDAP_PATCH}
+		fi
+	elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
+		ewarn "Sorry, X509 and smartcard/ldap don't get along, disabling smartcard/ldap"
+	fi
+	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
+
+	sed -i '/LD.*ssh-keysign/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid"
+
+	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 \
+		$(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 sshd
+	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
+
+	doman contrib/ssh-copy-id.1
+	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+}
+
+pkg_postinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+
+	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
+}