Update HPN and gsskex patch #216932 by Kamil Kisiel.

Package-Manager: portage-2.2_pre5

3 files changed, 178 insertions, 7 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 930de55a2950..7327a63ea0fb 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.307 2008/04/06 22:44:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.308 2008/04/10 03:51:32 vapier Exp $
+
+*openssh-5.0_p1-r1 (10 Apr 2008)
+
+  10 Apr 2008; Mike Frysinger <vapier@gentoo.org> +openssh-5.0_p1-r1.ebuild:
+  Update HPN and gsskex patch #216932 by Kamil Kisiel.
 
   06 Apr 2008; Mike Frysinger <vapier@gentoo.org> openssh-5.0_p1.ebuild:
   Remove accidental pkcs11-helper inclusion from DEPEND.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 2afdca7ca89c..efb3bba70a70 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -44,8 +44,9 @@ DIST openssh-4.7p1-hpn12v18.diff.gz 16094 RMD160 fec2096269a16e05667f931a073fd13
 DIST openssh-4.7p1-hpn12v19.diff.gz 15122 RMD160 bf176a84578fac33cc249b49b1014625bb8e78ca SHA1 be45c4363a1d583cc8012138a0dd0c98246653da SHA256 60ba4bfd986f5ee21394387bc8ffd87bd1f2e16c5e8853b7896327faf1595bf3
 DIST openssh-4.7p1-hpn13v1.diff.gz 23384 RMD160 8975e2af1043cf4f35e73d353faba292f8ff12a6 SHA1 5a1b7c29450084deef116cd718e67142c238d34e SHA256 5c2dfcfe3c8d3713af14dd401f9a34d239bcbfcf2c8261f91c0543f817fe8dbe
 DIST openssh-4.7p1.tar.gz 991119 RMD160 b828e79d3d1a931cb77651ec7d7276cf3ba22d90 SHA1 58357db9e64ba6382bef3d73d1d386fcdc0508f4 SHA256 d47133f0c6737d2889bf8da7bdf389fc2268d1c7fa3cd11a52451501eab548bc
-DIST openssh-4.9p1-hpn13v2.diff.gz 24142 RMD160 4e640b102ee3c6b1a16bcc90ecf7aab1cde4cd33 SHA1 de60de946ead09e228e5e337a0fef26d0487f7ee SHA256 2684080efaf98bfca79749182ac346a91063b2c4f69106723ff8a7635f7aa7c4
 DIST openssh-5.0p1+x509-6.1.1.diff.gz 150640 RMD160 d9b2ebb4bb36ce13e99ad1985fc26e91a391d0ff SHA1 0389393a63fbb09459f782b4997783a82ed081ea SHA256 a0f7d5fcaa3576943c4459c76a9c47ca07420122b2097f3c9b5f3f0a04c36e21
+DIST openssh-5.0p1-gsskex-20080404.patch 68272 RMD160 7adfadf11f0fbc8fb5f71848d6fb8c4231e4ebc4 SHA1 41dfe293b3a3c08163cd43926fefabd321f0c37f SHA256 8f8b9910af767ce8e2a5d4854e95c8eb8b089bb250b290d22add38e9ddb1791e
+DIST openssh-5.0p1-hpn13v3.diff.gz 24060 RMD160 d4baca41f6212036b513173835de6e1081d49ac8 SHA1 688265249dfaa449283ddfae2f81a9b6e3507f86 SHA256 e9000f969705dbdf72f7ea069e5f8a2475eb89e88e014c678ecb102ddf4bcde2
 DIST openssh-5.0p1.tar.gz 1011556 RMD160 b813234014e339fe2d9d10a5adad9f8e065918fc SHA1 121cea3a730c0b0353334b6f46f438de30ab4928 SHA256 73a58620cd475155be8524f46997ba1942bc9e54204eeb15f0465e54ca279f4f
 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
@@ -60,13 +61,13 @@ EBUILD openssh-4.7_p1-r3.ebuild 4915 RMD160 476b83968de74e338684b195fd802a51e5ed
 EBUILD openssh-4.7_p1-r4.ebuild 4924 RMD160 7b8cf4cd131feecfd333871243233a714e68d91b SHA1 529fa15a45bebb268930ef901173579a3a801d2b SHA256 b566cc678a34530f17f0ef385c47e8867286f6647874e78c03fce995a571e551
 EBUILD openssh-4.7_p1-r5.ebuild 5301 RMD160 26591c08b24876e45296ca95ddfe932b1691e6c2 SHA1 d88ee8eb8223829c98ab37b8831881231e173d96 SHA256 e8732ae40bd8b4d6f52be58f2150312246403c71043a3b9feb9b8f83cae334c8
 EBUILD openssh-4.7_p1-r6.ebuild 5359 RMD160 40232c3a1bef2addffd8362a5ee5aa1183de9c26 SHA1 17fe8e906a5ed1cd55ed14d7dc12aea174f5bd17 SHA256 48d927d31ca62ff61b661a97c92c5fc2554fad30c2129ed9200d6dd654d4e60a
-EBUILD openssh-5.0_p1.ebuild 5186 RMD160 29e42ae955a40d3def04fac03f9732326dcee38f SHA1 82172a3c73a4fd2434239abaf0ed4cff446cd7ff SHA256 bdccb1c63af3101b34b83685cda3a0cfd832a9ad70fb23c6b0369e85e8414ad3
-MISC ChangeLog 48007 RMD160 b6ae3b5985f60404fdadbe13171be1c2b06cf6fc SHA1 54c9f71d7d62eb31ae5b5f9ddddcbe0eb9329d08 SHA256 8f447f68d9a38a44a92174339f15bd9b126356f4138968ce39dec61bf6dcfed4
+EBUILD openssh-5.0_p1-r1.ebuild 5189 RMD160 01689f9e97647eccbac67c7f4273ecc4458ae313 SHA1 770092cdc26e5ff19cba3b7ec8585d85d1e72c82 SHA256 fc683d65e55077107dc6ea2812145ea9edb999c5b9b272b74e1ce6a8c58610bf
+MISC ChangeLog 48174 RMD160 9636bf3901cd7da3ca2aba2b4d06235376b8e78e SHA1 d13fac49c84dff8dc97656e33acaa92cb2f8ce8b SHA256 f8cc0c7f2fd874a231396a1f91f4fc77c7bc59d643e4602fa287accdc5e8b862
 MISC metadata.xml 1332 RMD160 9f96034724f474db823db616b97f7d00e9e32113 SHA1 e30379335b893109d9e299bd3aa066eb088c59cd SHA256 9fe068bf6625a11848277690f110289f37915a1a2237c3cfb69014fea5226c88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH+VJVj9hvisErhMIRAkfrAJ9TldDZiWkVx0JDuJ6sXErDMKs40wCgr5Zx
-wEloMINIYPp1vkBGkrFRkKI=
-=Xxrh
+iD8DBQFH/Y7Kj9hvisErhMIRAlhBAJ92ZuEUmMn34sqhV+kVJ5LT7sRTXgCgmDLB
+gqCdafnnz1a8agyqoTw7fAM=
+=GOFX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-5.0_p1-r1.ebuild b/net-misc/openssh/openssh-5.0_p1-r1.ebuild
new file mode 100644
index 000000000000..e5e45f008634
--- /dev/null
+++ b/net-misc/openssh/openssh-5.0_p1-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.0_p1-r1.ebuild,v 1.1 2008/04/10 03:51:32 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.1.diff.gz"
+#LDAP_PATCH="${PARCH/openssh-4.9/openssh-lpk-4.6}-0.3.9.patch"
+HPN_PATCH="${PARCH}-hpn13v3.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
+	${LDAP_PATCH:+ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-6.1.1/${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="static pam tcpd kerberos skey selinux 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.9_p1-x509-hpn-glue.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
+			epatch "${FILESDIR}"/${P}-lpk-64bit.patch #210110
+		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"
+		epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	fi
+	[[ -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
+
+	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
+}