Add updated securid support.

Package-Manager: portage-2.1.2_pre3-r7

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 11fc4cbee6c17dcbf7434d32c1bd6bcba1deb8ad..4fcb855af81f3105e242920914f1d2920642331c 100644 (file)
--- 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.210 2006/10/17 14:37:18 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.211 2006/10/25 02:59:02 vapier Exp $
+
+*openssh-4.4_p1-r5 (25 Oct 2006)
+
+  25 Oct 2006; Mike Frysinger <vapier@gentoo.org> +openssh-4.4_p1-r5.ebuild:
+  Add updated securid support.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> openssh-4.4_p1-r4.ebuild:
   Added ~sparc-fbsd keyword.

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 6b0e094cfd3bd388a8630e547956ecabee840fa9..408dfdb1d15afe34b139be62eaf2d3c192babd5c 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openssh-3.9_p1-chroot.patch 3026 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 SHA1 78f85bc81c0034e03d06dd3c7ab91b9210fc18fb SHA256 014158a32c707b2a79ac606aeefb6bc09f24c3f07ce5df353ddad96095518597
 MD5 c4edd6a7aa1418ce5bf74aeb46627dbf files/openssh-3.9_p1-chroot.patch 3026
 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 files/openssh-3.9_p1-chroot.patch 3026
@@ -169,6 +172,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+SecurID_v1.3.2.patch 48240 RMD160 45d5734f7e65709cce581f1f85c06f60a73b825b SHA1 10bece428f6f36a0bb59b8fe9b9fb4321b544fa5 SHA256 189ad59139d86e5c808650add131af20ade00439713c3abcfac9a4e53580a196
 DIST openssh-4.4p1+x509-5.5.1.diff.gz 137417 RMD160 34cf39583e8c01bb055671a540c7463f45134960 SHA1 091e7499726fce527afeb66fffaf6ee48f4ac4bb SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded
 DIST openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675 RMD160 340aaed711bb58a39fe36ebbd47ba1f1e7e304c1 SHA1 f8fe308e338c186563cfce7aa7689a4c810ae6d5 SHA256 dfa55376bbd11f6688cc0f228f8dff1175ab985bf80267630bbe38f0c9be261d
 DIST openssh-4.4p1.tar.gz 1044334 RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc SHA1 6a52b1dee1c2c9862923c0008d201d98a7fd9d6c SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac
@@ -217,14 +221,14 @@ EBUILD openssh-4.3_p2-r5.ebuild 5957 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2
 MD5 8b4bf9176c47593391f6a25cf40ee932 openssh-4.3_p2-r5.ebuild 5957
 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2f65b openssh-4.3_p2-r5.ebuild 5957
 SHA256 beb5826bd7e1fc08ddfead5d5fa2114cf653fde315cc0264219373ea480e848c openssh-4.3_p2-r5.ebuild 5957
-EBUILD openssh-4.4_p1-r4.ebuild 5422 RMD160 e7d13f073d89df36e99705fdc2946756cc4e7259 SHA1 a826f3dc09ebcf7d01192f212c2ff56d363ad239 SHA256 7a9cd083c6826694513c8b87828d59908f046fa84c17a00448de08656c82bbfc
-MD5 739803eec8c6394f35348527d301a2b8 openssh-4.4_p1-r4.ebuild 5422
-RMD160 e7d13f073d89df36e99705fdc2946756cc4e7259 openssh-4.4_p1-r4.ebuild 5422
-SHA256 7a9cd083c6826694513c8b87828d59908f046fa84c17a00448de08656c82bbfc openssh-4.4_p1-r4.ebuild 5422
-MISC ChangeLog 33661 RMD160 503da27fcf47e23bd6df5f2f4adfdde79a26128c SHA1 9c5aef9ebdfe5891dee36962bc5b4b7ef135138d SHA256 fb82a558b2088caaf61a27e53fd1f6b78d7cbaa16bc9844176e31545bc20771d
-MD5 b35bb23f2d94a603e4f569ed39f3b6c0 ChangeLog 33661
-RMD160 503da27fcf47e23bd6df5f2f4adfdde79a26128c ChangeLog 33661
-SHA256 fb82a558b2088caaf61a27e53fd1f6b78d7cbaa16bc9844176e31545bc20771d ChangeLog 33661
+EBUILD openssh-4.4_p1-r5.ebuild 5422 RMD160 19122ee3e77e45f5ea893f92ccd8b3a8ba0db2f5 SHA1 a4e9704b5db1d2f6b0119b01a7722eb2aec75184 SHA256 a4d5f61698eedd4f9dfd92f92f3abc5eeb01884d567e343f47692c9cbefa50f4
+MD5 17abcffd20fe6f2a6bff490a8fab552a openssh-4.4_p1-r5.ebuild 5422
+RMD160 19122ee3e77e45f5ea893f92ccd8b3a8ba0db2f5 openssh-4.4_p1-r5.ebuild 5422
+SHA256 a4d5f61698eedd4f9dfd92f92f3abc5eeb01884d567e343f47692c9cbefa50f4 openssh-4.4_p1-r5.ebuild 5422
+MISC ChangeLog 33802 RMD160 42f0884ea5be3ffab3c93379399e29d83fd7df8b SHA1 daade5dc97190f75540c654df26a6218b1dd1774 SHA256 c54404789bf166938acc222fb1a8290cb0888f8ef1302ac78842ae2f232ecd69
+MD5 70e304310bb4713be2bc53065f388d4f ChangeLog 33802
+RMD160 42f0884ea5be3ffab3c93379399e29d83fd7df8b ChangeLog 33802
+SHA256 c54404789bf166938acc222fb1a8290cb0888f8ef1302ac78842ae2f232ecd69 ChangeLog 33802
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -259,6 +263,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 dfcb472e537d3fcb4a790e6b647de3a4 files/digest-openssh-4.4_p1-r4 1081
-RMD160 e8edb2a706a805fde3a17f52f85dd69243dbe65e files/digest-openssh-4.4_p1-r4 1081
-SHA256 278eef636448a10365ebbf07769be6801b8569738fe03748fb13731c0dc28f22 files/digest-openssh-4.4_p1-r4 1081
+MD5 f10f062fb9265135cfd127f9e869c228 files/digest-openssh-4.4_p1-r5 1361
+RMD160 c63d1a532ded3ed4d253f89d95b0949302eea9ab files/digest-openssh-4.4_p1-r5 1361
+SHA256 e6f786470d7a5842db4c2858d88a2bc3ae6fe6d0ef1d42b96f7164719587cce1 files/digest-openssh-4.4_p1-r5 1361
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFPtMsamhnQswr0vIRAqeUAJ4y/JI+HEVmGxYChiOyQ2ttYGXnNwCfYs7A
+CPJyzwCXdz5cB5wU9i4US+0=
+=Ou54
+-----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/files/digest-openssh-4.4_p1-r5 b/net-misc/openssh/files/digest-openssh-4.4_p1-r5
new file mode 100644 (file)
index 0000000..5bd5dad
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.4_p1-r5
@@ -0,0 +1,15 @@
+MD5 4a374fe5f6c353bc051b00781de8067c openssh-4.4p1+SecurID_v1.3.2.patch 48240
+RMD160 45d5734f7e65709cce581f1f85c06f60a73b825b openssh-4.4p1+SecurID_v1.3.2.patch 48240
+SHA256 189ad59139d86e5c808650add131af20ade00439713c3abcfac9a4e53580a196 openssh-4.4p1+SecurID_v1.3.2.patch 48240
+MD5 132f5ae282de4ff822a95591720da8fd openssh-4.4p1+x509-5.5.1.diff.gz 137417
+RMD160 34cf39583e8c01bb055671a540c7463f45134960 openssh-4.4p1+x509-5.5.1.diff.gz 137417
+SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded openssh-4.4p1+x509-5.5.1.diff.gz 137417
+MD5 3a5545354e5c55eb1250b5be434032dd openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675
+RMD160 340aaed711bb58a39fe36ebbd47ba1f1e7e304c1 openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675
+SHA256 dfa55376bbd11f6688cc0f228f8dff1175ab985bf80267630bbe38f0c9be261d openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675
+MD5 793a709a8de695c22f523024d7e9bf07 openssh-4.4p1.tar.gz 1044334
+RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc openssh-4.4p1.tar.gz 1044334
+SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac openssh-4.4p1.tar.gz 1044334
+MD5 4db76f98b1ecbcff2bda11ff8050ad71 openssh-lpk-4.4p1-0.3.7.patch 61187
+RMD160 90b0bbe07a3617f6eecb9f77c1a38c5f4dd4dcaf openssh-lpk-4.4p1-0.3.7.patch 61187
+SHA256 c74aa642b4b2eeceb0c3f554752d172f8d5a7cd30f2aae517e93ef3bf1bd24e7 openssh-lpk-4.4p1-0.3.7.patch 61187

diff --git a/net-misc/openssh/openssh-4.4_p1-r5.ebuild b/net-misc/openssh/openssh-4.4_p1-r5.ebuild
new file mode 100644 (file)
index 0000000..c910382
--- /dev/null
+++ b/net-misc/openssh/openssh-4.4_p1-r5.ebuild
@@ -0,0 +1,167 @@
+# 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-r5.ebuild,v 1.1 2006/10/25 02:59:02 vapier Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+# Please leave pam at end, so that dopamd and newpamd from eutils eclass are not used
+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.1.diff.gz"
+SECURID_PATCH="${PARCH}+SecurID_v1.3.2.patch"
+LDAP_PATCH="${PARCH/-4.4p1/-lpk-4.4p1}-0.3.7.patch"
+HPN_PATCH="${PARCH}-hpn12v11-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
+       X509? ( http://roumenpetrov.info/openssh/x509-5.5.1/${X509_PATCH} )
+       ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )
+       hpn? ( mirror://gentoo/${HPN_PATCH} http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
+       smartcard? ( http://omniti.com/~jesus/projects/${SECURID_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 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"
+       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
+
+       # fix autoconf lib checking for SELinux
+       epatch "${FILESDIR}/openssh-4.4p1-selinux-ac.diff"
+
+       use X509 && epatch "${DISTDIR}"/${X509_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 use ldap ; then
+                       epatch "${DISTDIR}"/${LDAP_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
+}