Bug #168681. Bump for new versions of HPN (compile fix for strict compilers) and...

Package-Manager: portage-2.1.2-r12

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 28e475c61bdc1e54d2992555dfda137cd3f4779f..21d42721a4dfeed47fb41fbd55df4b8c29b2c2a2 100644 (file)
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,13 @@
 # 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.231 2007/02/23 10:51:48 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.232 2007/03/05 04:54:03 robbat2 Exp $
+
+*openssh-4.5_p1-r2 (05 Mar 2007)
+
+  05 Mar 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +openssh-4.5_p1-r2.ebuild:
+  Bug #168681. Bump for new versions of HPN (compile fix for strict compilers)
+  and LPK (Addition of LpkFilter as an LDAP filter).
 
 *openssh-4.5_p1-r1 (23 Feb 2007)
 

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 53d3235762790332784a0d0cfacbe667e2be8493..02ee5e198b1985f1e26260c4fbec4ef0a1c613a6 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,6 +1,3 @@
------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
@@ -182,12 +179,14 @@ DIST openssh-4.4p1-hpn12v13.diff.gz 15392 RMD160 b057f9a1068ddce106a94465953bdac
 DIST openssh-4.4p1.tar.gz 1044334 RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc SHA1 6a52b1dee1c2c9862923c0008d201d98a7fd9d6c SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac
 DIST openssh-4.5p1+x509-5.5.2.diff.gz 137561 RMD160 2e7597bc97d634ecc3d434cc714cc5b1d4076fec SHA1 5f29fbf73a991d778f81f9029fd90ffc4be9b726 SHA256 580b9b2be2a5224852f9979180fa9570059c1aa398b908dc1907d2a5a5e1f4a2
 DIST openssh-4.5p1-hpn12v14.diff.gz 15791 RMD160 1f937174d5418d578da5d9dfab16b5cc8960efc5 SHA1 8bea17b13e7e91135785f4222252c28d08c9c887 SHA256 5cc6cd882cbb94498483b44722b3e81c8e6d7854dc2b2c57e1d56040bfdc23bd
+DIST openssh-4.5p1-hpn12v15.diff.gz 15834 RMD160 c98135bfd8b8387b281d63f9d9b00afc60d51ca1 SHA1 6a88bc9db5ad856620e53bccf6f1df88dab94278 SHA256 098fd91fc62e9685bf05c97c535f35414e742f379b6e21f5fd13353a7549271e
 DIST openssh-4.5p1.tar.gz 965925 RMD160 3f70b6f4228e84c7b9b8b3bee7fd3875f3e3bad3 SHA1 2eefcbbeb9e4fa16fa4500dec107d1a09d3d02d7 SHA256 7046b9d372f9e31ca654a66492310c188470480ddab300eb715dbf5e2177ae55
 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
 DIST openssh-lpk-4.3p1-0.3.7.patch 60451 RMD160 fda93b8ee3ef9b633947784fe84a9eed2acbd325 SHA1 ba557b6a070e47990eb085c5a89cdfbe089ab6d3 SHA256 0bcfa28804caf685de2248ddc966666196f6df81d1d058066f2da17714518af4
 DIST openssh-lpk-4.4p1-0.3.7.patch 61187 RMD160 90b0bbe07a3617f6eecb9f77c1a38c5f4dd4dcaf SHA1 b1854a4391c5d11f1a5ab09059643bbaf2278009 SHA256 c74aa642b4b2eeceb0c3f554752d172f8d5a7cd30f2aae517e93ef3bf1bd24e7
+DIST openssh-lpk-4.5p1-0.3.8.patch 62340 RMD160 3f0f9b6f600947e073c7a2863fbbfe58c0c87845 SHA1 3febf170b5d869076c3d5e60f36cc005545a8ef1 SHA256 c96cb24ea0c21cd93f2a28c31c38902bed8ddf0cb7a2879337bb21a5edd7ce35
 EBUILD openssh-3.9_p1-r3.ebuild 4984 RMD160 fc6e960460f5ed80f38de0ad62844786906a40dc SHA1 bb12ded4a10fb951c5c37da969225b672ccc5f38 SHA256 243071563d56d49415ecdd850291e0ba005db6dd6c3a90f3b33b727de3990686
 MD5 4bf2ed1ba4e71ff7a799b27f958b8214 openssh-3.9_p1-r3.ebuild 4984
 RMD160 fc6e960460f5ed80f38de0ad62844786906a40dc openssh-3.9_p1-r3.ebuild 4984
@@ -216,14 +215,18 @@ EBUILD openssh-4.5_p1-r1.ebuild 5389 RMD160 4f7b8f6b59bdcfe5a9f939535ff5b1bda596
 MD5 757d26ec60443e5db6c1481cf3d480a5 openssh-4.5_p1-r1.ebuild 5389
 RMD160 4f7b8f6b59bdcfe5a9f939535ff5b1bda5967d8c openssh-4.5_p1-r1.ebuild 5389
 SHA256 7ea642cd5df5aa81d58e19d40980aa0f9817f28f2c3771bbdd6585574e90c94d openssh-4.5_p1-r1.ebuild 5389
+EBUILD openssh-4.5_p1-r2.ebuild 5402 RMD160 d1f3a2d7c0bfbeaddef8b6e3b83fb4d9b7bfbfa6 SHA1 0ee787f48144a33873ac13ce1e5d4915b3a3c22d SHA256 f8654b9a869f1fa6e882567e1f097703f5c48558dbe2ffccddb618921ed59698
+MD5 881464d905d6111aed5940ac7c97e06b openssh-4.5_p1-r2.ebuild 5402
+RMD160 d1f3a2d7c0bfbeaddef8b6e3b83fb4d9b7bfbfa6 openssh-4.5_p1-r2.ebuild 5402
+SHA256 f8654b9a869f1fa6e882567e1f097703f5c48558dbe2ffccddb618921ed59698 openssh-4.5_p1-r2.ebuild 5402
 EBUILD openssh-4.5_p1.ebuild 5350 RMD160 6d40a35a0bee3b9f2c1463862577add3fec79015 SHA1 7de1fab3dcbbc441502bed42a60b1eb0f21aac3a SHA256 74de4db846c5251d5ff87853aac67bce589d62e49fb1ea4c082bd9c40c3ec4cf
 MD5 5765ff0b2c4d25a3d86a87605017d155 openssh-4.5_p1.ebuild 5350
 RMD160 6d40a35a0bee3b9f2c1463862577add3fec79015 openssh-4.5_p1.ebuild 5350
 SHA256 74de4db846c5251d5ff87853aac67bce589d62e49fb1ea4c082bd9c40c3ec4cf openssh-4.5_p1.ebuild 5350
-MISC ChangeLog 36517 RMD160 f7a6bdb46cc4f7668b9bde915fe36928897f7218 SHA1 937a1529ed35e45bf13f4c8b31ff14eec7d994aa SHA256 2366a43831c8de05867830b13f0a06dc01cb8bdf58dbb22e671a385678a4c847
-MD5 8aee8e3627b8b09e2c103de2add32ec1 ChangeLog 36517
-RMD160 f7a6bdb46cc4f7668b9bde915fe36928897f7218 ChangeLog 36517
-SHA256 2366a43831c8de05867830b13f0a06dc01cb8bdf58dbb22e671a385678a4c847 ChangeLog 36517
+MISC ChangeLog 36765 RMD160 1b164bbf0f52f302ff85946776256b5134ab6ea2 SHA1 7b52ee1522b2d8714f147706229509fed751e841 SHA256 5b36e4afed24524a0816ee908d574905a84c67fd8f6faa6dce2a4703c996a430
+MD5 8b6d51170edc992f49a24efe4065acdc ChangeLog 36765
+RMD160 1b164bbf0f52f302ff85946776256b5134ab6ea2 ChangeLog 36765
+SHA256 5b36e4afed24524a0816ee908d574905a84c67fd8f6faa6dce2a4703c996a430 ChangeLog 36765
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -252,10 +255,6 @@ SHA256 86a17c74dd503363c30085c75f7cc17bda20da889e93d61d59446589992cc08b files/di
 MD5 f1d7598b82baea77e138e61e56e6e905 files/digest-openssh-4.5_p1-r1 1331
 RMD160 66afd243ecdb5e49859b5f12b27ee876c4186514 files/digest-openssh-4.5_p1-r1 1331
 SHA256 86a17c74dd503363c30085c75f7cc17bda20da889e93d61d59446589992cc08b files/digest-openssh-4.5_p1-r1 1331
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF4kvN8bi6rjpTunYRAntaAKCX/t3M6ecVI9P0NCwrwHQn0iSUeQCgzSMi
-q2g9e52Fv46JNRxlBgCsT64=
-=SzAh
------END PGP SIGNATURE-----
+MD5 d103be4401a9c908f16efd211878c1c0 files/digest-openssh-4.5_p1-r2 1331
+RMD160 b4ec4a9c82f27a05165ef9557e25d6cd156de1cf files/digest-openssh-4.5_p1-r2 1331
+SHA256 467a56eb0bb8cb4bc586ddfbc5991687624238723fe6198c2341340016910f77 files/digest-openssh-4.5_p1-r2 1331

diff --git a/net-misc/openssh/files/digest-openssh-4.5_p1-r2 b/net-misc/openssh/files/digest-openssh-4.5_p1-r2
new file mode 100644 (file)
index 0000000..8f9f5ed
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.5_p1-r2
@@ -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 9a7987815f6901150f843dd21d8a339e openssh-4.5p1+x509-5.5.2.diff.gz 137561
+RMD160 2e7597bc97d634ecc3d434cc714cc5b1d4076fec openssh-4.5p1+x509-5.5.2.diff.gz 137561
+SHA256 580b9b2be2a5224852f9979180fa9570059c1aa398b908dc1907d2a5a5e1f4a2 openssh-4.5p1+x509-5.5.2.diff.gz 137561
+MD5 a409821211e222323f42669c61ae4b49 openssh-4.5p1-hpn12v15.diff.gz 15834
+RMD160 c98135bfd8b8387b281d63f9d9b00afc60d51ca1 openssh-4.5p1-hpn12v15.diff.gz 15834
+SHA256 098fd91fc62e9685bf05c97c535f35414e742f379b6e21f5fd13353a7549271e openssh-4.5p1-hpn12v15.diff.gz 15834
+MD5 6468c339886f78e8a149b88f695839dd openssh-4.5p1.tar.gz 965925
+RMD160 3f70b6f4228e84c7b9b8b3bee7fd3875f3e3bad3 openssh-4.5p1.tar.gz 965925
+SHA256 7046b9d372f9e31ca654a66492310c188470480ddab300eb715dbf5e2177ae55 openssh-4.5p1.tar.gz 965925
+MD5 663ce0f968c4f7eacc5128dc91645245 openssh-lpk-4.5p1-0.3.8.patch 62340
+RMD160 3f0f9b6f600947e073c7a2863fbbfe58c0c87845 openssh-lpk-4.5p1-0.3.8.patch 62340
+SHA256 c96cb24ea0c21cd93f2a28c31c38902bed8ddf0cb7a2879337bb21a5edd7ce35 openssh-lpk-4.5p1-0.3.8.patch 62340

diff --git a/net-misc/openssh/openssh-4.5_p1-r2.ebuild b/net-misc/openssh/openssh-4.5_p1-r2.ebuild
new file mode 100644 (file)
index 0000000..b611c94
--- /dev/null
+++ b/net-misc/openssh/openssh-4.5_p1-r2.ebuild
@@ -0,0 +1,167 @@
+# 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.5_p1-r2.ebuild,v 1.1 2007/03/05 04:54:03 robbat2 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.2.diff.gz"
+SECURID_PATCH="${PARCH/4.5/4.4}+SecurID_v1.3.2.patch"
+LDAP_PATCH="${PARCH/-4.5p1/-lpk-4.5p1}-0.3.8.patch"
+HPN_PATCH="${PARCH}-hpn12v15.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} )
+       ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )
+       hpn? ( 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 )
+       >=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
+
+       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 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 '/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
+
+       diropts -m 0600
+       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
+}