Revision bump to fix the pam.d file.

Package-Manager: portage-2.1.3_rc6

5 files changed, 211 insertions, 9 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 2659447538a0..a14fed64d5db 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.236 2007/04/24 22:03:29 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.237 2007/07/02 10:04:26 flameeyes Exp $
+
+*openssh-4.6_p1-r2 (02 Jul 2007)
+
+  02 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/sshd.pam_include.1, +openssh-4.6_p1-r2.ebuild:
+  Revision bump to fix the pam.d file.
 
   24 Apr 2007; Alexander Færøy <eroyf@gentoo.org>
   openssh-4.5_p1-r1.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index fa4d50d12282..256e6dbce782 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -161,6 +161,10 @@ AUX sshd.pam_include 205 RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 SHA1 12
 MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205
 RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 files/sshd.pam_include 205
 SHA256 8d59135e96f4eff6b80c143b82cced7beb0bbca19ff91b479f1ba92916243d5e files/sshd.pam_include 205
+AUX sshd.pam_include.1 205 RMD160 3051b92836a496c7c431f41585de688f7c9f51a7 SHA1 b9eca146fcea016b7146f1ac11cf3d072d887b27 SHA256 3185075821bb1f76cdc584c28f690a7338f8db5489d5fce73fe4bcbbfd3dfbfa
+MD5 480ed3c58a7cfbb8d1f3bca057af1eb9 files/sshd.pam_include.1 205
+RMD160 3051b92836a496c7c431f41585de688f7c9f51a7 files/sshd.pam_include.1 205
+SHA256 3185075821bb1f76cdc584c28f690a7338f8db5489d5fce73fe4bcbbfd3dfbfa files/sshd.pam_include.1 205
 AUX sshd.rc6 2046 RMD160 68df8ff7933b7a232882b2a6140fe1a2637609b6 SHA1 c3f74dbd764d570f69e60f18a081f19e3cefb037 SHA256 6569cb934cb1d5b9016c2828ff8c79b5c8477dd27b7078c609445cfc16692e9e
 MD5 c3acc27dddafb1e8c6d437e668e08c25 files/sshd.rc6 2046
 RMD160 68df8ff7933b7a232882b2a6140fe1a2637609b6 files/sshd.rc6 2046
@@ -241,10 +245,14 @@ EBUILD openssh-4.6_p1-r1.ebuild 5401 RMD160 087c1690db51065044c39021584823a9c96d
 MD5 f4436c44ac993ac9954dfeb532f2b1b9 openssh-4.6_p1-r1.ebuild 5401
 RMD160 087c1690db51065044c39021584823a9c96d1a64 openssh-4.6_p1-r1.ebuild 5401
 SHA256 78e9eb40838b939795e0ebf639ca5941a2c31b5ec3498b880772d20341710fa9 openssh-4.6_p1-r1.ebuild 5401
-MISC ChangeLog 37545 RMD160 4f0c10fd498ed55e363fde9c70aa5190f65e0260 SHA1 d0259ff6c6c1b3a9b53f124f343796cb5f3a572c SHA256 3e408cc5caf617db09372d58f1b9327aae4c7192ba147d7e6199d1c08709b75d
-MD5 c5895c5378a57dbacbd7bdc9b23f982a ChangeLog 37545
-RMD160 4f0c10fd498ed55e363fde9c70aa5190f65e0260 ChangeLog 37545
-SHA256 3e408cc5caf617db09372d58f1b9327aae4c7192ba147d7e6199d1c08709b75d ChangeLog 37545
+EBUILD openssh-4.6_p1-r2.ebuild 5406 RMD160 2f6974d98dfcf9a4ed0e3d2f45c258c0e8f7d283 SHA1 3e32fd6d7c44b51ccaf4be726bd0cd9c3090491e SHA256 c98fc28c0eab91870c5f927d72804179984f3b9afe5c26afbcd6326954c7cc36
+MD5 1646af51d65b452cda02cd2fafa29621 openssh-4.6_p1-r2.ebuild 5406
+RMD160 2f6974d98dfcf9a4ed0e3d2f45c258c0e8f7d283 openssh-4.6_p1-r2.ebuild 5406
+SHA256 c98fc28c0eab91870c5f927d72804179984f3b9afe5c26afbcd6326954c7cc36 openssh-4.6_p1-r2.ebuild 5406
+MISC ChangeLog 37732 RMD160 2dafe16a81f9a8c5cceedb38c971c53e4b2058ec SHA1 811e61b199da8126e621020d2a78915986d7b2c3 SHA256 5657571e3f3b9a8b9586af72dfb8ae09deb71da6ad5ec25b3ca3e3b3730871af
+MD5 bda32f4942841a9d6629576f0749df61 ChangeLog 37732
+RMD160 2dafe16a81f9a8c5cceedb38c971c53e4b2058ec ChangeLog 37732
+SHA256 5657571e3f3b9a8b9586af72dfb8ae09deb71da6ad5ec25b3ca3e3b3730871af ChangeLog 37732
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -279,10 +287,13 @@ SHA256 b7fdf1272101d669ed17d224ba44ccd6d59bda66ac82a08042a29898d2be4fe3 files/di
 MD5 262614ee697fea204407027184ed83fc files/digest-openssh-4.6_p1-r1 786
 RMD160 4dca2db674acc3f2ee39d304e1a5add2004fe871 files/digest-openssh-4.6_p1-r1 786
 SHA256 155a2bda9084c47e1e7df6b2ed84cd947b7f6511c6c6a09a1a4620eb7d587e9a files/digest-openssh-4.6_p1-r1 786
+MD5 262614ee697fea204407027184ed83fc files/digest-openssh-4.6_p1-r2 786
+RMD160 4dca2db674acc3f2ee39d304e1a5add2004fe871 files/digest-openssh-4.6_p1-r2 786
+SHA256 155a2bda9084c47e1e7df6b2ed84cd947b7f6511c6c6a09a1a4620eb7d587e9a files/digest-openssh-4.6_p1-r2 786
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGLn5V6Xxn2nLwtdQRAkwCAKCYw6LoGuwJ+h7eDxpnsmqDhIowOQCcCN36
-wxS4Z+ZwOzX7MZ6DZvTxNmM=
-=z8OM
+iD8DBQFGiM3fAiZjviIA2XgRAjDPAJ0e97Zc4mo6LazJEo/AYoq+F06ZCwCgiHGk
+G/M6TfZEVIZwxWYrtb9uNs8=
+=X4Hw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.6_p1-r2 b/net-misc/openssh/files/digest-openssh-4.6_p1-r2
new file mode 100644
index 000000000000..4b340726c8df
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.6_p1-r2
@@ -0,0 +1,9 @@
+MD5 dd32128b216cc097b3018f255620394b openssh-4.6p1+x509-5.5.2.diff.gz 141892
+RMD160 3aacab881f28b7e8087481a6fcf661f67502319b openssh-4.6p1+x509-5.5.2.diff.gz 141892
+SHA256 b365d2819ba1f81411382106629b8fe74ae5aa4a1081aa8e3c44858c115c822e openssh-4.6p1+x509-5.5.2.diff.gz 141892
+MD5 0bc643a4e1588f7abdcdbb31304bac56 openssh-4.6p1-hpn12v16.diff.gz 15944
+RMD160 421e2c189c2e9b378f6ee3944183355f9f18d5e8 openssh-4.6p1-hpn12v16.diff.gz 15944
+SHA256 f304e3b04e2772c27c09e9aa5a3fd02747187a8775de39879c3d871fad1e156f openssh-4.6p1-hpn12v16.diff.gz 15944
+MD5 6a7fa99f44d9e1b5b04d15256e1405bb openssh-4.6p1.tar.gz 967395
+RMD160 2959ac56c9175275bf82847ec64b2b169aedcb82 openssh-4.6p1.tar.gz 967395
+SHA256 7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a openssh-4.6p1.tar.gz 967395
diff --git a/net-misc/openssh/files/sshd.pam_include.1 b/net-misc/openssh/files/sshd.pam_include.1
new file mode 100644
index 000000000000..567ba4ac4d2e
--- /dev/null
+++ b/net-misc/openssh/files/sshd.pam_include.1
@@ -0,0 +1,8 @@
+#%PAM-1.0
+
+auth       required     pam_shells.so
+auth	   required	pam_nologin.so
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session	   include	system-auth
diff --git a/net-misc/openssh/openssh-4.6_p1-r2.ebuild b/net-misc/openssh/openssh-4.6_p1-r2.ebuild
new file mode 100644
index 000000000000..31fd7185cf1a
--- /dev/null
+++ b/net-misc/openssh/openssh-4.6_p1-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.6_p1-r2.ebuild,v 1.1 2007/07/02 10:04:26 flameeyes 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-5.5.2.diff.gz"
+SECURID_PATCH="" #${PARCH/4.6/4.5}+SecurID_v1.3.2.patch"
+LDAP_PATCH="" #${PARCH/-4.5p1/-lpk-4.5p1}-0.3.8.patch"
+HPN_PATCH="${PARCH}-hpn12v16.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	X509? ( http://roumenpetrov.info/openssh/x509-5.5.2/${X509_PATCH} )
+	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )"
+#	smartcard? ( http://omniti.com/~jesus/projects/${SECURID_PATCH} )
+#	ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_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 smartcard SECURID_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
+
+	epatch "${FILESDIR}"/${P}-include-string-header.patch
+	epatch "${FILESDIR}"/${P}-ChallengeResponseAuthentication.patch #170670
+	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 ${SECURID_PATCH} ]] && use smartcard ; then
+			epatch "${DISTDIR}"/${SECURID_PATCH} \
+				"${FILESDIR}"/${PN}-4.3_p2-securid-updates.patch \
+				"${FILESDIR}"/${PN}-4.3_p2-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}"/${PN}-4.4_p1-ldap-hpn-glue.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 "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.1 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
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+}
+
+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
+}