Back hpn patch back down to v11 as v12 does not want to work for us #414401 by Sean McGovern.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 317 insertions, 15 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index e3777137e565..d442121a7691 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.449 2012/06/02 18:07:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.450 2012/06/08 05:43:01 vapier Exp $
+
+*openssh-6.0_p1-r1 (08 Jun 2012)
+
+  08 Jun 2012; Mike Frysinger <vapier@gentoo.org> +openssh-6.0_p1-r1.ebuild:
+  Back hpn patch back down to v11 as v12 does not want to work for us #414401 by
+  Sean McGovern.
 
   02 Jun 2012; Mike Frysinger <vapier@gentoo.org> openssh-5.9_p1-r4.ebuild:
   Mark alpha/ia64/s390/sh/sparc stable #396075.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index a76054e329c0..85c7d4472f44 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -49,6 +49,7 @@ DIST openssh-5.9p1+x509-7.0.diff.gz 181263 RMD160 edc39eacc815909358a9abfee738ba
 DIST openssh-5.9p1-hpn13v11.diff.gz 21971 RMD160 d22bbdcc48efb4ce0e0cc37bb7d8ff4705806f34 SHA1 3dbacf253bcbc631db7ca5eaf35cbbc8a1f3f2c3 SHA256 6a47a9e57f87385cac9a380b0b1649b73532afaf40c15f62e9236427c84e7aae
 DIST openssh-5.9p1.tar.gz 1110014 RMD160 12d92321a2b9f404641a9cdada738784eb30e1cd SHA1 ac4e0055421e9543f0af5da607a72cf5922dcc56 SHA256 8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5
 DIST openssh-6.0p1+x509-7.1.diff.gz 200986 RMD160 7aa0550460ccd17a008b5e6b74077873328b4cad SHA1 59aaceac1ca83e1c070d641aa95a51873f9b65e5 SHA256 c11e3837704a24393353fe264d61ffea8c1f23c0cb5b8261866c25677930768b
+DIST openssh-6.0p1-hpn13v11.diff.bz2 19979 RMD160 7ea83ce2982c9a9c0b81d97105c6c526dd164432 SHA1 217493239b3d846ac98a87634ed7b2c6a2afc88d SHA256 a096f6ee6dfddb3996b5e7b806ece2a7709c8cce6560eb026c28d3fb56f71ee9
 DIST openssh-6.0p1-hpn13v12.diff.gz 20223 RMD160 722ba7c8572fab1d18e7547e65da0b0e1fd2035a SHA1 19d9ee9836b7611bc03e0f7c70f71cea30a53d49 SHA256 b6158c10fac153dd2a9f5d9b29df1e4db17a91f84f100b99526655317d9bf4c0
 DIST openssh-6.0p1.tar.gz 1126034 RMD160 afad16fac6500da5cdfad94e5b3cac8c68223374 SHA1 f691e53ef83417031a2854b8b1b661c9c08e4422 SHA256 589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de
 DIST openssh-lpk-5.4p1-0.3.13.patch.gz 18105 RMD160 734b2c3ea740b6de610e3bfa91c93a2540b79acc SHA1 4c73f21b16db41c16e096db834380ec53f15c723 SHA256 4e5dbe769e487c914ecc5b104866f6d4412cbe35c3f2bed897d06f7d824878be
@@ -65,23 +66,24 @@ EBUILD openssh-5.8_p2-r1.ebuild 8467 RMD160 c58c2b643fc6a5c759ea5e47c74b671b4351
 EBUILD openssh-5.8_p2.ebuild 8464 RMD160 edc023c757a5627d6eb5263283cee60e7beb780e SHA1 488d3f6cadaf3c1c5f163cce4995bd9b955599e8 SHA256 005a6dfb61c7fe46c08535f0c30b62a5547591cce2685e80af1a8cec74f93fdf
 EBUILD openssh-5.9_p1-r3.ebuild 9137 RMD160 09cf09924a625ad79706670bff07551743fd86e5 SHA1 286cce3c1170a3c0a35e746db9a8f70697aa5666 SHA256 d4e2eb9e518f104c5cc7913c0d7dfea959807eea3bb8063bc8efd7aefe5fcd85
 EBUILD openssh-5.9_p1-r4.ebuild 9185 RMD160 8b16b1af570a88aa70ecb62b8e128f4079e4abb4 SHA1 e5d42a49ba38cc4d0f1da55a19f6b03338ea84b8 SHA256 d3c4541fd8edd84d2988b4705581ae6fa9f958978b85812bd3d1d996bdcd5cb2
+EBUILD openssh-6.0_p1-r1.ebuild 9463 RMD160 ce5ebd3ac139836f3ecafa6e7b8dc554cfdbbdaf SHA1 7025cf7f678521b5cf021d40b0db06f8fe2ac424 SHA256 b1658b58445e9a5b2ae1881d8a8077a6da87414846f5b7aae10f56a763545bea
 EBUILD openssh-6.0_p1.ebuild 9461 RMD160 9c4521dcab13976635e295990d2191c27e618a2d SHA1 d211730a4be709c6b2d5ea92ad2f802982fdcf23 SHA256 1b34a9871749300d97de8fc920f1376c50118cea1f2d80a87a1011bb093d1d96
-MISC ChangeLog 71646 RMD160 95b169dd6081b8664e78321543da86e7ad603f1d SHA1 ff165aef5ccf36c3f12caed13414f2d2a3ed4d1e SHA256 c0f6791aded8ea2fbfd9772919d905fad94e09a925ad4bb86dbbe1143da6a63c
+MISC ChangeLog 71856 RMD160 1602efc481791b48814c2d015b503d08baec7249 SHA1 df2cffe1f4b0aef682ce997cb11076ca4023ee29 SHA256 6e193efb28bd70f72697e1f96b2e5dc267002e949b6db25ad4fdffe8823f3f70
 MISC metadata.xml 1599 RMD160 31fdd1531a4111aa437882680029451b29ddf4aa SHA1 af53a6887ebf563150184ab40b4cc018ab4e4d3f SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPylZNAAoJELEHsLL7fEFWFroQAIHbYcqvikRAFMXoaNei2n1V
-a0fgVOCqFBiQ41/ER8WrtFyvd5X9E+6R9XzOA7h7vHkYnZh8yvhOj1JvRB3bmpi+
-Qx4WR3IPNc8rsW718dmtigQkt7PvPiEjWaR89bk0hJPBd1D35iESR87FjIu7jsZ3
-EAQKhqjMDwEjdA9PqibSlieKhkv3+RCgA17CLvBSeC0qUpgEqRWeX/FYk1fy9+hA
-XSbEYlW98ooezYZbOjRDY4jxqgDJu40WRAps5bxZsPkbuAQa7yfwKnhm50+TBKgo
-CNy88vXax5+MSEaTfdzZX9briacNvveOTdUPYDNLlTwh4mNv2vn1jOKF9oZAUFLB
-DmeXPilouV9AOYOpnJgpFE6S7vrQBLY+zBBPnXfWjfdPt/ubjcIfSxROP/EbydBd
-mIXXIMqEgEiw93t+8TM2yHFbUkt6SDFygKBZSWbLzHbqTh5CdY+32zN0V+RuIKjT
-Abg+oI30pnyzi6S9GJvFRlLRLI50WwiqKtCUlQt0KuWNQUlDci8IKEzxofQzL055
-FtopIdnhqGQ/0BZ2GrnfFpSniyXdnaiZhuoErFCXYYb//Sjz/yywCycOk7ZPMDpw
-GEiTTW4RyrQNfhqOsleh/iA7HHcMIOGpdtX6tPWsN/JDpLneIntLs8j/xPm0DlRm
-lVDXPkhitt3UrT50Qijb
-=oPzb
+iQIcBAEBAgAGBQJP0ZDwAAoJELEHsLL7fEFWYGUQAKprwEBfjSUd9kX4ngQO5kc0
+hXixU/6K8XW60OX8u+6Vh1JaqdZif7frdfMibO1OC3pcoZdgPuUTZUSxqWthNG3x
+tTQQFOCoG2bjq7MxDY0elBJgo/DbxW7kEJ/BZkMcwH774qb/uGwSTii0SAaZ8IMA
+DoPtVrdK1EhqCkEPwL1vFYS+A7I7axA6/wQKUP/5L31jii6x9BgM0H5mfp1G5V3Z
+I8BATd2wB6PqHnf+9BZ8VQZionI2Q7iBYAekFU9wIp4wR0mNIs7jXGERiaOBHBnJ
+tRLVf0zORKFCjJzOcYpm0u/XgVTD3JIPl9+YUsrTXBj3FrOYgm8Z2tj+0lc/IoYs
+FB74DVGIfCNZewD14ouhMHvZ9Ylum5anfJ1yDrz3I/4EGhc9I36ao25YwKqHfud9
+csCUdlRHw/IAwd0Vov17b2pRMZnEuRVCTirwfMRT9hehzLWAdzfGPUfrtmxmBEG8
+Y8YYwk4W8rkfyBnogc0OUju+ludAevc7c5o9R2U9w7sAHjlFYEmLK3u4wjpXeTBi
+6tVmmm3LRyTYgZiNpvbVkr5i4SAgSGi1PSV2kEHuyM62LPAswgcA9uH2dYVwrU1a
+wEldsglvQW8bH+NNTHeul0fZaBnPnZNYchdy5PcwWYeFIBr4VgWMGRwTMyPnNAPi
+mg1I5FhoWodNkQXxgrxG
+=IAoW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-6.0_p1-r1.ebuild b/net-misc/openssh/openssh-6.0_p1-r1.ebuild
new file mode 100644
index 000000000000..66f79c8b7151
--- /dev/null
+++ b/net-misc/openssh/openssh-6.0_p1-r1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1-r1.ebuild,v 1.1 2012/06/08 05:43:01 vapier Exp $
+
+EAPI="2"
+inherit eutils user flag-o-matic multilib autotools pam systemd
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpn13v11.diff.bz2"
+LDAP_PATCH="${PARCH/-/-lpk-}-0.3.14.patch.gz"
+X509_VER="7.1" 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
+	${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey 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
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	X? ( x11-apps/xauth )
+	userland_GNU? ( virtual/shadow )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )"
+
+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} ]] && echo ${1} ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_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
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	epatch "${FILESDIR}"/${PN}-5.9_p1-sshd-gssapi-multihomed.patch #378361
+	if use X509 ; then
+		pushd .. >/dev/null
+		epatch "${FILESDIR}"/${PN}-6.0_p1-x509-glue.patch
+		popd >/dev/null
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		epatch "${FILESDIR}"/${PN}-6.0_p1-x509-hpn-glue.patch
+		save_version X509
+	fi
+	if ! use X509 ; then
+		if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+			epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+			save_version LPK
+		fi
+	else
+		use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP"
+	fi
+	epatch "${FILESDIR}"/${PN}-6.0_p1-test.patch #391011
+	epatch "${FILESDIR}"/${PN}-6.0_p1-fix-freebsd-compilation.patch #391011
+	epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	if [[ -n ${HPN_PATCH} ]] && use hpn; then
+		epatch "${WORKDIR}"/${HPN_PATCH%.*}
+		epatch "${FILESDIR}"/${PN}-5.6_p1-hpn-progressmeter.patch
+		save_version HPN
+		# The AES-CTR multithreaded variant is broken, and causes random hangs
+		# when combined background threading and control sockets. To avoid
+		# this, we change the internal table to use the non-multithread version
+		# for the meantime. Do NOT remove this in new versions. See bug #354113
+		# comment #6 for testcase.
+		# Upstream reference: http://www.psc.edu/networking/projects/hpn-ssh/
+		## Additionally, the MT-AES-CTR mode cipher replaces the default ST-AES-CTR mode
+		## cipher. Be aware that if the client process is forked using the -f command line
+		## option the process will hang as the parent thread gets 'divorced' from the key
+		## generation threads. This issue will be resolved as soon as possible
+		sed -i \
+			-e '/aes...-ctr.*SSH_CIPHER_SSH2/s,evp_aes_ctr_mt,evp_aes_128_ctr,' \
+			cipher.c || die
+	fi
+
+	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
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+static_use_with() {
+	local flag=$1
+	if use static && use ${flag} ; then
+		ewarn "Disabling '${flag}' support because of USE='static'"
+		# rebuild args so that we invert the first one (USE flag)
+		# but otherwise leave everything else working so we can
+		# just leverage use_with
+		shift
+		[[ -z $1 ]] && flag="${flag} ${flag}"
+		set -- !${flag} "$@"
+	fi
+	use_with "$@"
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+	addpredict /etc/skey/skeykeys #skey configure code triggers this
+
+	use static && append-ldflags -static
+
+	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 \
+		$(static_use_with pam) \
+		$(static_use_with kerberos kerberos5 /usr) \
+		${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
+		$(use_with libedit) \
+		$(use_with selinux) \
+		$(use_with skey) \
+		$(use_with tcpd tcp-wrappers)
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}" || die
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id || die
+	newinitd "${FILESDIR}"/sshd.rc6.3 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+	keepdir /var/empty
+
+	# not all openssl installs support ecc, or are functional #352645
+	if ! grep -q '#define OPENSSL_HAS_ECC 1' config.h ; then
+		elog "dev-libs/openssl was built with 'bindist' - disabling ecdsa support"
+		dosed 's:&& gen_key ecdsa::' /etc/init.d/sshd || die
+	fi
+
+	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
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${D}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${D}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	# 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
+
+	if use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket} || die
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' || die
+}
+
+src_test() {
+	local t tests skipped failed passed shell
+	tests="interop-tests compat-tests"
+	skipped=""
+	shell=$(egetshell ${UID})
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite"
+		elog "requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped="${skipped} tests"
+	else
+		tests="${tests} tests"
+	fi
+	# It will also attempt to write to the homedir .ssh
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in ${tests} ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed="${passed}${t} " \
+			|| failed="${failed}${t} "
+	done
+	einfo "Passed tests: ${passed}"
+	ewarn "Skipped tests: ${skipped}"
+	if [[ -n ${failed} ]] ; then
+		ewarn "Failed tests: ${failed}"
+		die "Some tests failed: ${failed}"
+	else
+		einfo "Failed tests: ${failed}"
+		return 0
+	fi
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	elog "Starting with openssh-5.8p1, the server will default to a newer key"
+	elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+	elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	echo
+	ewarn "Remember to merge your config files in /etc/ssh/ and then"
+	ewarn "reload sshd: '/etc/init.d/sshd reload'."
+	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
+	# 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
+}