Added my own unofficial port of the HPN patch, because performance sucks without it.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 219 insertions, 12 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index e00fbd0c8e1e..bcffbce86085 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.340 2009/02/25 18:13:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.341 2009/03/09 03:42:25 robbat2 Exp $
+
+*openssh-5.2_p1-r2 (09 Mar 2009)
+
+  09 Mar 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +openssh-5.2_p1-r2.ebuild:
+  Added my own unofficial port of the HPN patch, because performance sucks
+  without it.
 
   25 Feb 2009; Mike Frysinger <vapier@gentoo.org> openssh-5.2_p1-r1.ebuild:
   Update pkcs11 patch #152170.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index b489ff4a0862..b383ee3014ff 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 AUX openssh-4.3_p1-chroot.patch 1034 RMD160 5971fa1466fd9817a8ec811329a8129fcd651bec SHA1 f580aa1a180397b422193c3ebb4cc69eaa7007a0 SHA256 ccedff9ba82db6782ff80cfcafa6bd1dc754f564e61a4e789b792aaa6b3d4fc3
 AUX openssh-4.4_p1-ldap-hpn-glue.patch 1538 RMD160 eba0400a328f23b9329429d2da65b80ead546d4d SHA1 7190e861e8be4f03ae42ad43ba1770fdca95d46a SHA256 63e9f729fbb40babdf5cd2b4d87f4d1cb5a9aaed60bf7a8c072c22f9a6fb36ab
@@ -43,6 +40,7 @@ DIST openssh-5.1p1+x509-6.1.1.diff.gz 152642 RMD160 ec9885a90be95d8b260f8a40f4b7
 DIST openssh-5.1p1-hpn13v5.diff.gz 23017 RMD160 6466cd0825e80366adc1978069e3c61255e0bde7 SHA1 c2911f04f8d46a28afa9f9cbb7ec226cb2c893d1 SHA256 81bebd71fb0aa8a265c0576aa3c42c0fdf263712db771f12d35c8aff09523aab
 DIST openssh-5.1p1.tar.gz 1040041 RMD160 24293ad89633cfd4791f08eb3442becb7e5788ca SHA1 877ea5b283060fe0160e376ea645e8e168047ff5 SHA256 f05358164dae1021386ae57be53a5e9f5cba7a1f8c9beaa428299e28a5666d75
 DIST openssh-5.2p1+x509-6.2.diff.gz 153010 RMD160 a4d7675edc87ee34d4fbc912ca03830936abee5e SHA1 cb5508827185412295b997705711f9f7697ace4e SHA256 72cfb1e232b6ae0a9df6e8539a9f6b53db7c0a2141cf2e4dd65b407748fa9f34
+DIST openssh-5.2p1-hpn13v5-gentoo.diff.gz 23291 RMD160 0076d1e328ab87f51d7ab477618af057633b71de SHA1 bd09de039a547557b2115156f2a9e1d3df8426f1 SHA256 bcb15a855c1975a5ce7d51965eeda3ad70b4c70f8c45daf9655df86fcb89f085
 DIST openssh-5.2p1.tar.gz 1016612 RMD160 7c53f342034b16e9faa9f5a09ef46390420722eb SHA1 8273a0237db98179fbdc412207ff8eb14ff3d6de SHA256 4023710c37d0b3d79e6299cb79b6de2a31db7d581fe59e775a5351784034ecae
 DIST openssh-5.2pkcs11-0.26.tar.bz2 18642 RMD160 07093fb2ad47247b2f028fae4fe1b80edf4ddaf8 SHA1 755793398e1b04ee6c15458a69ce4ad68d2abee0 SHA256 9655f118c614f76cfdd3164b5c0e3e430f20a4ce16c65df0dc1b594648cf1c07
 DIST openssh-lpk-4.6p1-0.3.9.patch 61605 RMD160 1bf1830192c3eba43c66c3c6469740724cb1ecf2 SHA1 2d0d41f6913d6e899e58a4b569afa30aadf82092 SHA256 e12335e8bf020508ea3866db07b306f4c965e3f9de262c06f62fad494e93107e
@@ -56,12 +54,6 @@ EBUILD openssh-5.0_p1-r2.ebuild 5232 RMD160 3b0247e5b71cb12720f8746dfa9f7d50c0f5
 EBUILD openssh-5.1_p1-r2.ebuild 5465 RMD160 64e7b382e6a1c664b4e6ad6d93199dc8ed1985e6 SHA1 e42626794f7af0f265073d1b89a96852b5af8cbb SHA256 0cddb635f824087f3c6d39738a990b6cccc263d8ce33983f5f01b937250bbdcf
 EBUILD openssh-5.1_p1-r3.ebuild 5735 RMD160 4ce7ec18877d6bec6f5370a00ef82790ad87dbd9 SHA1 63e87f68db66e7b5dc39f08317d05284faeb9219 SHA256 acec83baf78e4ac4cb2fa3c2a5064ae00164581b0d8c1aba43e7dc5cec0cddde
 EBUILD openssh-5.2_p1-r1.ebuild 6166 RMD160 b1c57340fc6b4290678b542f29700bc8bc80fb81 SHA1 b6a353a575bbae3485ef18fbe9359f383edbc95e SHA256 619578b6dd20b7405cde2bf274114ce312ad88e1d958a4dd4a6b06edd9ab2e65
-MISC ChangeLog 53125 RMD160 fde7cc6d3bb15d2b4550f8d321ff1071f65c6246 SHA1 f6c44e3716c1c6791ea43a9baff9c5a65ab38e3d SHA256 34fd4a696aa70a5600d888481b3dad96dab8ad1820c617a8f48c4729aae370a4
+EBUILD openssh-5.2_p1-r2.ebuild 6751 RMD160 70969853319e0ca352d63f81a49d6f30048b8576 SHA1 b07020e7aea370fdd9d26bc491cebfcbe0f1a93a SHA256 acfeede0233bbcd59f75d459f869e0aeac70318ea5429493f69b41d55dda4a88
+MISC ChangeLog 53332 RMD160 d7e08e81da5c9cedf3d4277a424eb0eb1594f1eb SHA1 362c6f2f25db08696da70ad669fe39a776111c8a SHA256 5f3ff0373035ee2ae786905f6a37036ef3947010dd2a7c24dde214f20e4d997e
 MISC metadata.xml 1694 RMD160 1cf9a91557876877658f9aaab4d4b4b4ebbcc3fe SHA1 402aab3f56cd775a5443f467a73b637d03919f5c SHA256 9c65ad59ae9fb4d7f1fdbcb04d0535984dd107484eedb2e90d4331a21de680c2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmlikQACgkQn/5bYzqsSmGldQCfZt8WYqAohUVi1GdKgGPSPPX/
-v30AoKXS14aDPxS9/cLi07CTynwwvh3c
-=Mu9P
------END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-5.2_p1-r2.ebuild b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
new file mode 100644
index 000000000000..959006c5e3c4
--- /dev/null
+++ b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.1 2009/03/09 03:42:25 robbat2 Exp $
+
+inherit eutils flag-o-matic multilib autotools pam
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_/}
+
+#HPN_PATCH="${PARCH/2/1}-hpn13v5.diff.gz"
+HPN_PATCH="${PARCH}-hpn13v5-gentoo.diff.gz" # Unofficial Gentoo port of original patch
+LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.11.patch.gz"
+PKCS11_PATCH="${PARCH/p1}pkcs11-0.26.tar.bz2"
+X509_VER="6.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	http://www.sxw.org.uk/computing/patches/openssh-5.0p1-gsskex-20080404.patch
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${PKCS11_PATCH:+pkcs11? ( http://alon.barlev.googlepages.com/${PKCS11_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}"
+#	${HPN_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="hpn kerberos ldap libedit pam pkcs11 selinux skey smartcard static tcpd X X509"
+
+RDEPEND="pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	selinux? ( >=sys-libs/libselinux-1.28 )
+	skey? ( >=sys-auth/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 )
+	pkcs11? ( dev-libs/pkcs11-helper )
+	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"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )"
+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 ldap LDAP_PATCH)
+		$(maybe_fail pkcs11 PKCS11_PATCH)
+		$(maybe_fail X509 X509_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
+
+	if use pkcs11 ; then
+		cd "${WORKDIR}"
+		unpack "${PKCS11_PATCH}"
+		cd "${S}"
+		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/*pkcs11*/{1,2,4}*
+		use X509 && EPATCH_OPTS="-R" epatch "${WORKDIR}"/*pkcs11*/1000_all_log.patch
+	fi
+	use X509 && epatch "${DISTDIR}"/${X509_PATCH}
+	use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
+	if ! use X509 ; then
+		if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+			# The patch for bug 210110 64-bit stuff is now included.
+			epatch "${DISTDIR}"/${LDAP_PATCH}
+			# Not needed anymore of 0.3.11. Merged into the main patch.
+			#epatch "${FILESDIR}"/${PN}-5.1_p1-ldap-hpn-glue.patch
+		fi
+		#epatch "${DISTDIR}"/openssh-5.0p1-gsskex-20080404.patch #115553 #216932
+	else
+		use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap"
+	fi
+	epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
+	epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665
+
+	sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
+
+	# Disable PATH reset, trust what portage gives us. bug 254615
+	sed -i -e 's:^PATH=/:#PATH=/:' configure || 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 \
+		--with-privsep-path=/var/empty \
+		--with-privsep-user=sshd \
+		--with-md5-passwords \
+		--with-ssl-engine \
+		$(use_with kerberos kerberos5 /usr) \
+		${LDAP_PATCH:+$(use ldap && use_with ldap)} \
+		$(use_with libedit) \
+		${PKCS11_PATCH:+$(use pkcs11 && use_with pkcs11)} \
+		$(use_with selinux) \
+		$(use_with skey) \
+		$(use_with smartcard opensc) \
+		$(use_with tcpd tcp-wrappers) \
+		${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.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${D}"/etc/ssh/sshd_config || die "sed of configuration file failed"
+	fi
+	
+	# This instruction is from the HPN webpage,
+	# Used for the server logging functionality
+	if [[ -n ${HPN_PATCH} ]] && use hpn; then
+		keepdir /var/empty/dev
+	fi
+
+	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
+	if use pkcs11 ; then
+		echo
+		einfo "For PKCS#11 you should also emerge one of the askpass softwares"
+		einfo "Example: net-misc/x11-ssh-askpass"
+	fi
+	# This instruction is from the HPN webpage,
+	# Used for the server logging functionality
+	if [[ -n ${HPN_PATCH} ]] && use hpn; then
+		echo
+		einfo "For the HPN server logging patch, you must ensure that"
+		einfo "your syslog application also listens at /var/empty/dev/log."
+	fi
+}