Version bump #121191 by Wolfram Schlich.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 196 insertions, 7 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index b1a18ec224ee..c2b9d7e7455a 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.153 2006/02/04 17:49:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.154 2006/02/08 05:24:01 vapier Exp $
+
+*openssh-4.3_p1 (08 Feb 2006)
+
+  08 Feb 2006; Mike Frysinger <vapier@gentoo.org> +openssh-4.3_p1.ebuild:
+  Version bump #121191 by Wolfram Schlich.
 
   04 Feb 2006; Mike Frysinger <vapier@gentoo.org> +files/sshd.confd,
   files/sshd.rc6, openssh-3.9_p1-r3.ebuild, openssh-4.0_p1-r2.ebuild,
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 6bfe2573058a..292eccefdb26 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b8166608123ed53764d83a45d82bc2cd ChangeLog 25169
-RMD160 450ad1aca3ca4d8cdb51002c08b533cddcfbf158 ChangeLog 25169
-SHA256 4425b4a20fb2c7837a76493684b4b7c2bd32b096d2c0d4812cb81f990edac42e ChangeLog 25169
+MD5 71c8d245d12aa3681d9dc06d45e85c88 ChangeLog 25318
+RMD160 e50a937048569936e66e78677431e2276c651df6 ChangeLog 25318
+SHA256 deda44610b4dcae7ab4f48873a5c5e0d1f6cbdb14e27275a0e64ecd73d939d97 ChangeLog 25318
 MD5 239a562c31f4486b3665948b60831839 files/digest-openssh-3.9_p1-r3 835
 RMD160 4caa67826d1847f62d6899f70be04ccb1234a260 files/digest-openssh-3.9_p1-r3 835
 SHA256 cff18a611c7cacebde002a7b0fea2f2e7e267566bcf456d4ed24da6693003848 files/digest-openssh-3.9_p1-r3 835
@@ -19,6 +19,9 @@ SHA256 0f2f32fc675c159248a12086122b8c04d4ca3925b1ea1c88442573b968a5a434 files/di
 MD5 2f60801f475d44c485299907b53cd5f7 files/digest-openssh-4.2_p1-r1 1310
 RMD160 ed4178e11f7496df1abcdd9ae90c1edfd3ef96c2 files/digest-openssh-4.2_p1-r1 1310
 SHA256 971c6e4bb571b3a0925a8fd90e41a092ac9ed9ff74cb87f764bb2bed744491a7 files/digest-openssh-4.2_p1-r1 1310
+MD5 d5790cd27e71adf24c06f1003712668a files/digest-openssh-4.3_p1 762
+RMD160 87f65cf548ff83baf53983c678327af07f8d58d7 files/digest-openssh-4.3_p1 762
+SHA256 6d29cb665247fb9bfd35bb4d6dd092433f5c38d7ad0adb5ab60ff2666246ea88 files/digest-openssh-4.3_p1 762
 MD5 87593c73e26e1a3825fcb51f2270b694 files/openssh-3.9_p1-chroot.patch 3027
 RMD160 bdbdcadc59c1eda5cb516f8a601d1c8912b36ebb files/openssh-3.9_p1-chroot.patch 3027
 SHA256 14653a7eb8d0458f5a74baa4bbc6ba026d141432af745c5d52f3728328badc04 files/openssh-3.9_p1-chroot.patch 3027
@@ -109,10 +112,13 @@ SHA256 400800234ab5e72f426f21a7f10045da99efbaf268ad3808f0aac45fac3b0057 openssh-
 MD5 0123e9e036a3a2a83d279f4edb18f2bd openssh-4.2_p1.ebuild 5349
 RMD160 845d8635b7065e51097b7b8ca2d3170ab33d3cf0 openssh-4.2_p1.ebuild 5349
 SHA256 27defefc8b7f32748b4cb44b346eeca9497f5c226d95401a2febba663eb0b9b2 openssh-4.2_p1.ebuild 5349
+MD5 34c4335af14c19c189b3dd858879ab00 openssh-4.3_p1.ebuild 5524
+RMD160 e8a302e6724cb50a6d829f296ecdf4b49192896c openssh-4.3_p1.ebuild 5524
+SHA256 e5dd76149140706caf9cb809d6df4d4b37d4856517318a80094377786a266bca openssh-4.3_p1.ebuild 5524
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD5Ok32+ySkm8kpY0RAn6YAKCNifYFNx8RVz2yMxdGiykPmJs04gCdHeG5
-qi4yX2h1qltTeTzxQm/Nn2k=
-=t4BP
+iD8DBQFD6YCQ2+ySkm8kpY0RAoP7AJ9ACkNWmWgLQpi0DTpLYw45W1UtQgCfX3fQ
+5TJFkD0a5+wtecIL7H2rWvs=
+=CG5n
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p1 b/net-misc/openssh/files/digest-openssh-4.3_p1
new file mode 100644
index 000000000000..2336a2e0c00d
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.3_p1
@@ -0,0 +1,9 @@
+MD5 097e7e8db2970e69e074454173f2215b openssh-4.3p1+x509-5.3.diff.gz 131152
+RMD160 48caf99a07cf6b1be1915d6dbec9d1ef015ba24c openssh-4.3p1+x509-5.3.diff.gz 131152
+SHA256 501b3b704081ee26295964d69d120f9825e93d9b33ab5abb1b417c40815e5642 openssh-4.3p1+x509-5.3.diff.gz 131152
+MD5 7dd2a6716b81da33af4ca960185fdd1b openssh-4.3p1-hpn11.diff 11024
+RMD160 c3b807437fd9f40f2ab73c52586de194b84cce6e openssh-4.3p1-hpn11.diff 11024
+SHA256 0a0b0e07bd845fdbf2112769c426a3b47b795076c8459f6dbc3e7c9060abb740 openssh-4.3p1-hpn11.diff 11024
+MD5 eaeb880b1b6c63b9a4d7c5b1e74727c4 openssh-4.3p1.tar.gz 940777
+RMD160 c1d69873ecc453b40d825a2f1b3a0909da815f5e openssh-4.3p1.tar.gz 940777
+SHA256 7a4e356742190901e458b7526f91dfa24c66babbcd24d55cf7eac282266f5254 openssh-4.3p1.tar.gz 940777
diff --git a/net-misc/openssh/openssh-4.3_p1.ebuild b/net-misc/openssh/openssh-4.3_p1.ebuild
new file mode 100644
index 000000000000..d91a274aa2ee
--- /dev/null
+++ b/net-misc/openssh/openssh-4.3_p1.ebuild
@@ -0,0 +1,169 @@
+# 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.3_p1.ebuild,v 1.1 2006/02/08 05:24:02 vapier Exp $
+
+inherit eutils flag-o-matic ccc pam
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_/}
+
+X509_PATCH="${PARCH}+x509-5.3.diff.gz"
+SECURID_PATCH="" #${PARCH}+SecurID_v1.3.2.patch"
+LDAP_PATCH="" #${PARCH/-4.3/-lpk-4.1}-0.3.6.patch"
+HPN_PATCH="${PARCH}-hpn11.diff"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
+	X509? ( http://roumenpetrov.info/openssh/x509-5.3/${X509_PATCH} )"
+#	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
+#	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard sftplogging hpn libedit"
+
+RDEPEND="pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	selinux? ( sys-libs/libselinux )
+	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 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	sys-devel/autoconf"
+PROVIDE="virtual/ssh"
+
+S=${WORKDIR}/${PARCH}
+
+src_unpack() {
+	unpack ${PARCH}.tar.gz
+	cd "${S}"
+
+	if use ldap || use smartcard ; then
+		eerror "Sorry, but this version does not yet support"
+		eerror "X509/ldap/smartcard.  Please mask 4.3_p1 for"
+		eerror "now and check back later:"
+		eerror " # echo '=net-misc/openssh-4.3_p1' >> /etc/portage/package.mask"
+		die "boooooooooooooo"
+	fi
+
+	sed -i \
+		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
+		pathnames.h || die
+
+	use X509 && epatch "${DISTDIR}"/${X509_PATCH}
+	use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
+	use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch
+	epatch "${FILESDIR}"/openssh-4.2_p1-selinux.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}
+			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
+		fi
+		if use ldap ; then
+			use sftplogging \
+				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
+				|| epatch "${DISTDIR}"/${LDAP_PATCH}
+		fi
+	elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
+		ewarn "Sorry, x509 and smartcard/ldap don't get along"
+	fi
+	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
+
+	sed -i '/LD.*ssh-keysign/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid"
+
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	addwrite /dev/ptmx
+	addpredict /etc/skey/skeykeys #skey configure code triggers this
+
+	local myconf
+	# make sure .sbss is large enough
+	use skey && use alpha && append-ldflags -mlarge-data
+	if use ldap ; then
+		filter-flags -funroll-loops
+		myconf="${myconf} --with-ldap"
+	fi
+	use selinux && append-flags -DWITH_SELINUX && append-ldflags -lselinux
+
+	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
+
+	use ipv6 || myconf="${myconf} --with-ipv4-default"
+
+	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 libedit) \
+		$(use_with kerberos kerberos5 /usr) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_with skey) \
+		$(use_with smartcard opensc) \
+		${myconf} \
+		|| die "bad configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make 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'."
+	ewarn
+	einfo "As of version 3.4 the default is to enable the UsePrivelegeSeparation"
+	einfo "functionality, but please ensure that you do not explicitly disable"
+	einfo "this in your configuration as disabling it opens security holes"
+	einfo
+	einfo "This revision has removed your sshd user id and replaced it with a"
+	einfo "new one with UID 22.  If you have any scripts or programs that"
+	einfo "that referenced the old UID directly, you will need to update them."
+	einfo
+	if use pam ; then
+		einfo "Please be aware users need a valid shell in /etc/passwd"
+		einfo "in order to be allowed to login."
+		einfo
+	fi
+}