Version bump.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 189 insertions, 8 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 91a0f4b8234e..45fa21f52f7a 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.200 2006/09/28 09:44:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.201 2006/09/28 11:36:59 vapier Exp $
+
+*openssh-4.4_p1 (28 Sep 2006)
+
+  28 Sep 2006; Mike Frysinger <vapier@gentoo.org> +openssh-4.4_p1.ebuild:
+  Version bump.
 
   27 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org>
   openssh-4.3_p2-r5.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3acaca14261a..697117dad7cf 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -168,6 +168,7 @@ DIST openssh-4.3p2+x509-5.3.diff.gz 131147 RMD160 d42a7e14b72bf850b9898e3707582b
 DIST openssh-4.3p2+x509-5.5.diff.gz 136017 RMD160 21069550bbb05ea22870da853f68ee9910b2b71e SHA1 a529280d38b9161c862f6a2f40886ab457477872 SHA256 b62ee8afd927d9c97367ac738be55464327deacabf803a610159a98c569e72ad
 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.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
 DIST openssh-lpk-4.1p1-0.3.6.patch 60312 RMD160 489d8be3b66ad5dad4b23fa61b9423be43e891ad SHA1 0d12c98e31d7c979a965a97e3d9e5694f3eaedcf SHA256 318d8b70e423c014069157535eecb2c943f42fec4b14d3f6a65350c1edd66540
@@ -212,10 +213,14 @@ EBUILD openssh-4.3_p2-r5.ebuild 5957 RMD160 7b8e4a1657930c319cfb129b1c1ff579424c
 MD5 776c7c2516b4455471ae6e3e32e38882 openssh-4.3_p2-r5.ebuild 5957
 RMD160 7b8e4a1657930c319cfb129b1c1ff579424cc42c openssh-4.3_p2-r5.ebuild 5957
 SHA256 2ea367b625359eda56c33b5f39a4a1b4b27efc8e10457fff5294129ac4b7568e openssh-4.3_p2-r5.ebuild 5957
-MISC ChangeLog 32325 RMD160 67ddae35342f891109689324e4b8649897f3ec90 SHA1 4511780ddf67cd51c798b859459ec4afb7a8fa13 SHA256 e8f8fe4aef6cd09f2bc13a1cc27ec35f4ac8f18d331e539106a535ae8acc249f
-MD5 dc27d4d94cd8375963cf4ba8a82fa0c1 ChangeLog 32325
-RMD160 67ddae35342f891109689324e4b8649897f3ec90 ChangeLog 32325
-SHA256 e8f8fe4aef6cd09f2bc13a1cc27ec35f4ac8f18d331e539106a535ae8acc249f ChangeLog 32325
+EBUILD openssh-4.4_p1.ebuild 5427 RMD160 27d30213d776086322dbe4315783fa7367e44c67 SHA1 3dc171dd9bc5765c4a7ffdf6cbc725e8bd79c867 SHA256 e6c6eb785db1b3b42c1968440aff45b91388e250bde617cf659b8c3cfe521e39
+MD5 3b471ffaddcad600e26f6ede723f103c openssh-4.4_p1.ebuild 5427
+RMD160 27d30213d776086322dbe4315783fa7367e44c67 openssh-4.4_p1.ebuild 5427
+SHA256 e6c6eb785db1b3b42c1968440aff45b91388e250bde617cf659b8c3cfe521e39 openssh-4.4_p1.ebuild 5427
+MISC ChangeLog 32447 RMD160 6f5cb737d5e986287cc2eb735bfebe7280abe890 SHA1 d685aea8ef8ddd4d96402e8a124a21db9ac0189c SHA256 3389f91a24336fb91685746e2eb877a569e90e9c8d11be2926f04e1b3b28ce7a
+MD5 21c88f9ce53ebfe996471d074dc0c30e ChangeLog 32447
+RMD160 6f5cb737d5e986287cc2eb735bfebe7280abe890 ChangeLog 32447
+SHA256 3389f91a24336fb91685746e2eb877a569e90e9c8d11be2926f04e1b3b28ce7a ChangeLog 32447
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -250,10 +255,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 9be56b7de14dbe6baebb8881c19f7607 files/digest-openssh-4.4_p1 244
+RMD160 a221e7ca88063c2590828e5f1295c86ac25223a5 files/digest-openssh-4.4_p1 244
+SHA256 b6bc4ccd9cd264e0ced57a79cb92f287fb63de674367536225c96f312a1d95e7 files/digest-openssh-4.4_p1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFG5nNamhnQswr0vIRAm9FAJ43HWiJJ27gqX6c4KXOtSlMnZcQRwCgs73m
-ph0nRhYO3n0OXooZNnfxKl4=
-=U5E+
+iD8DBQFFG7P1amhnQswr0vIRAoQvAJ94VcVjzmT3jnjCf10l3S8542dywwCdG+jV
+FHP2Pu/Bms0Uj0WK3cfD11c=
+=Iowj
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.4_p1 b/net-misc/openssh/files/digest-openssh-4.4_p1
new file mode 100644
index 000000000000..8c5c675214b6
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.4_p1
@@ -0,0 +1,3 @@
+MD5 793a709a8de695c22f523024d7e9bf07 openssh-4.4p1.tar.gz 1044334
+RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc openssh-4.4p1.tar.gz 1044334
+SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac openssh-4.4p1.tar.gz 1044334
diff --git a/net-misc/openssh/openssh-4.4_p1.ebuild b/net-misc/openssh/openssh-4.4_p1.ebuild
new file mode 100644
index 000000000000..ac3fa6e9eb8b
--- /dev/null
+++ b/net-misc/openssh/openssh-4.4_p1.ebuild
@@ -0,0 +1,165 @@
+# 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.ebuild,v 1.1 2006/09/28 11:36:59 vapier Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils flag-o-matic ccc pam multilib autotools
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_/}
+
+X509_PATCH="" #${PARCH}+x509-5.5.diff.gz"
+SECURID_PATCH="" #${PARCH}+SecurID_v1.3.2.patch"
+LDAP_PATCH="" #${PARCH/-4.3p2/-lpk-4.3p1}-0.3.7.patch"
+HPN_PATCH="" #${PARCH/4.4p1/4.3p2}-hpn12-gentoo.patch.bz2"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz"
+#	hpn? ( mirror://gentoo/${HPN_PATCH} http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
+#	X509? ( http://roumenpetrov.info/openssh/x509-5.5/${X509_PATCH} )
+#	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
+#	ldap? ( http://www.opendarwin.org/projects/openssh-lpk/files/${LDAP_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"
+	[[ -z ${LDAP_PATCH}    ]] && use ldap      && fail="${fail} ldap"
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:  ${fail}"
+		eerror "Please mask ${P} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${P}' >> /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}"/${P}-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 ${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 [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+			epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${P}-ldap-updates.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
+}