Update HPN patch.

Package-Manager: portage-2.1.4.1

3 files changed, 174 insertions, 6 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 6dba2d364a8b..1a56ec8377b0 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.272 2008/01/28 05:53:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.273 2008/02/09 20:21:49 vapier Exp $
+
+*openssh-4.7_p1-r4 (09 Feb 2008)
+
+  09 Feb 2008; Mike Frysinger <vapier@gentoo.org> +openssh-4.7_p1-r4.ebuild:
+  Update HPN patch.
 
   28 Jan 2008; Jeroen Roovers <jer@gentoo.org> openssh-4.7_p1-r3.ebuild:
   Stable for HPPA too.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 75daa2232293..c757512189dd 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -33,6 +33,7 @@ DIST openssh-4.7p1+x509-6.0.1.diff.gz 147459 RMD160 4ac66d2422f7137dd0af3aae6973
 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 fec2096269a16e05667f931a073fd13f096742b5 SHA1 6083da9c1d537a2a3bc7f1fa00a99142407a063e SHA256 b94e406d5269cbc51546ce6b61199450270ca01b4f10d3149e2a6403649ea0de
 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-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
@@ -42,14 +43,14 @@ EBUILD openssh-4.5_p1-r2.ebuild 5351 RMD160 2d9ab01d5edb40948ef2e6944605a039b25d
 EBUILD openssh-4.6_p1-r3.ebuild 5390 RMD160 f55f1ca226614f0ccf4c0dae04e3b9c1b1e6de0d SHA1 4cc45457fcfd102e85f7f7bc788258d41a0973c5 SHA256 22882343c576b93e21f2dbe241896dd95837ff464e487c1f000269fdbb077db7
 EBUILD openssh-4.6_p1-r4.ebuild 4941 RMD160 3b7c3b3d47c2e67d931535ac15eb5ac8f7595d8e SHA1 671163ec26a3ba32fc28d259a8847d41ab55e380 SHA256 c7b6bbe53c6cc52d2c06fc13019849f3d7ef7f31a92b0665bd6a990d705e5a21
 EBUILD openssh-4.7_p1-r1.ebuild 4842 RMD160 1a0c28d9ab7cebeb41794f8c2eb660d2d6807cdd SHA1 e90fccca1016d956fa662f53c72feffa7e3012a3 SHA256 d3644f302db1f719effa2efb7fb23a7aecb0d143c978c854461469c291832f72
-EBUILD openssh-4.7_p1-r2.ebuild 4929 RMD160 f591978e03991f2026e69bc9c117451cb2ee7229 SHA1 f5c18d3650a1ce9a6218da9a26a1d279874fdad5 SHA256 234b17c951f6d52829cdc5b98a04a0b2245f63a2136026a1b547029430b5ff52
 EBUILD openssh-4.7_p1-r3.ebuild 4916 RMD160 c33e94b5b04b85fd82588d24fa50c10c5df97669 SHA1 3ee632f97647ce6fee62d965ecce57dc7b586040 SHA256 288dac7f23fdb3da272a73bdc49b0414850c4be6ca2e28c6477c3c4866bf9fd3
-MISC ChangeLog 42791 RMD160 785921816257b3ada84e2408db3fdfbe85e0b3a4 SHA1 8c387db979450c0d7139cad05c2df324768b5c75 SHA256 941a8a12603556be6aa76aa6c11280530909c99a26073b9001e7e75f9b9b2fe2
+EBUILD openssh-4.7_p1-r4.ebuild 4924 RMD160 ee6f6c6e963ee916b712f40f5ae8442c1d5a6ae1 SHA1 e999e745640e2e335fdffe78e29135c6e2c79fbc SHA256 f02f7a73dca638a2d950fc42c43da4b1e499f32195525478d8f4e9c07594b60d
+MISC ChangeLog 42926 RMD160 122b40448fb8999285e4a59fcf48d15e42de4182 SHA1 ad3d22f1ef525ff43190f7e9812ae9959e14b98f SHA256 8f838b5f83bfe04e060a614360d589a5fff56bbc8aec8d3aacb8e40f68dc7d69
 MISC metadata.xml 1150 RMD160 4b6c978959df7998b2d7b22ea9dee0fbc9b37fc5 SHA1 2b319d9ed51a8a7a30d37bd4ad55484704355b31 SHA256 ad8ada6ce7414bd3ce222b80899c15998026c7184524b15cb0a8f18097a52d5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHrglaj9hvisErhMIRAqqCAKDj2wOSx6p0SepHsktIRsU5X4ueXwCgpJ4L
-V8BVIa/26UgLWujdfGlVGfA=
-=+rhB
+iD8DBQFHrgtfj9hvisErhMIRAomEAKCoeTdlCm0dJBCT0g5cILdljsdXPgCfbSaH
+5o35RI/urTBU+blKBN16ohY=
+=CQC2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-4.7_p1-r4.ebuild b/net-misc/openssh/openssh-4.7_p1-r4.ebuild
new file mode 100644
index 000000000000..c9b65189f6bd
--- /dev/null
+++ b/net-misc/openssh/openssh-4.7_p1-r4.ebuild
@@ -0,0 +1,162 @@
+# 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-4.7_p1-r4.ebuild,v 1.1 2008/02/09 20:21:49 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}-hpn13v1.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
+}