Version bump #154389.

Package-Manager: portage-2.1.2_rc1-r4

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index af22bbf932574698d4a1daa1965b1845e627bd28..336ebf03e033b9303106a0f753047907c190416f 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.220 2006/11/05 03:50:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.221 2006/11/07 23:03:28 vapier Exp $
+
+*openssh-4.5_p1 (07 Nov 2006)
+
+  07 Nov 2006; Mike Frysinger <vapier@gentoo.org> +openssh-4.5_p1.ebuild:
+  Version bump #154389.
 
   05 Nov 2006; Brent Baude <ranger@gentoo.org> openssh-4.4_p1-r6.ebuild:
   Marking openssh-4.4_p1-r6 ppc64 stable for 149502

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 2d1f56606eae9d887c431de8db5a68c51332ff83..d414aba3ebeea379ef2d17757c2646ff21fcc723 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -182,6 +182,7 @@ DIST openssh-4.4p1+SecurID_v1.3.2.patch 48240 RMD160 45d5734f7e65709cce581f1f85c
 DIST openssh-4.4p1+x509-5.5.1.diff.gz 137417 RMD160 34cf39583e8c01bb055671a540c7463f45134960 SHA1 091e7499726fce527afeb66fffaf6ee48f4ac4bb SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded
 DIST openssh-4.4p1-hpn12v13.diff.gz 15392 RMD160 b057f9a1068ddce106a94465953bdac58d0ffac8 SHA1 00a677a7dd75c98db14a91814da49b8fd7b7d814 SHA256 2e3c6a108072eb9de3330cda8639b8c54845174e3a4691a895d06d5cbf221245
 DIST openssh-4.4p1.tar.gz 1044334 RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc SHA1 6a52b1dee1c2c9862923c0008d201d98a7fd9d6c SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac
+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
@@ -215,10 +216,14 @@ EBUILD openssh-4.4_p1-r6.ebuild 5450 RMD160 112c37c0f7a98fcdabf5d8e0a129effccfe6
 MD5 16ac1f14ec8c5c8f9c023df62a31a2e3 openssh-4.4_p1-r6.ebuild 5450
 RMD160 112c37c0f7a98fcdabf5d8e0a129effccfe65719 openssh-4.4_p1-r6.ebuild 5450
 SHA256 3311cb5da6632f027a03505387c9a1e5436a6afc06e4ca9b856d7d1185f66aa0 openssh-4.4_p1-r6.ebuild 5450
-MISC ChangeLog 35017 RMD160 0bdf0932e467262959f6aef73519ed93c4685e84 SHA1 99c86bc83dbd7f660d627d7ebc62a7b11dc65132 SHA256 2a129c59336282df0a092784ec165b521b1ad17b58b32dbe1f907251246f1078
-MD5 91f9157ebd8b59b14f1d18fc2c73285a ChangeLog 35017
-RMD160 0bdf0932e467262959f6aef73519ed93c4685e84 ChangeLog 35017
-SHA256 2a129c59336282df0a092784ec165b521b1ad17b58b32dbe1f907251246f1078 ChangeLog 35017
+EBUILD openssh-4.5_p1.ebuild 5389 RMD160 c7d8ac75a7c8158bdf31e749a3777b309527ad0a SHA1 61d19d42e66515fcadb3d14261f4e5b558c13c17 SHA256 2df968d2d1b79be4273d3e075dc80f2e81918ac90679b97361ef39f4017895b6
+MD5 f0a3f6e4f4c1c5508a1174d5dfd6e05e openssh-4.5_p1.ebuild 5389
+RMD160 c7d8ac75a7c8158bdf31e749a3777b309527ad0a openssh-4.5_p1.ebuild 5389
+SHA256 2df968d2d1b79be4273d3e075dc80f2e81918ac90679b97361ef39f4017895b6 openssh-4.5_p1.ebuild 5389
+MISC ChangeLog 35147 RMD160 2e0776f547cda8f790ae1fe35e65aca62ffe1893 SHA1 ab5615b1c06a3bac338ce24a6d141c048f136170 SHA256 5b2c7dcb86044d265152ef30af56ca37942e1f14d46311eefb71ddbbc7eeada1
+MD5 97935dbbaadea14ae2718fd686fb942b ChangeLog 35147
+RMD160 2e0776f547cda8f790ae1fe35e65aca62ffe1893 ChangeLog 35147
+SHA256 5b2c7dcb86044d265152ef30af56ca37942e1f14d46311eefb71ddbbc7eeada1 ChangeLog 35147
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -244,10 +249,13 @@ SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/di
 MD5 1640aac282df2ff3bbca8fd7e94bd891 files/digest-openssh-4.4_p1-r6 1334
 RMD160 31d7d0e9b09bd8837de83abe8ee24b7878df7d9a files/digest-openssh-4.4_p1-r6 1334
 SHA256 81ff3d47e3f63ad4d4c31f6208d7926654b98b6a7cf6d3b937847faae6117d0e files/digest-openssh-4.4_p1-r6 1334
+MD5 64cff69d58e4c2cdc9c581aa1e2cbba9 files/digest-openssh-4.5_p1 1331
+RMD160 c114423695ba7e5500538df8e05431c81f8c530e files/digest-openssh-4.5_p1 1331
+SHA256 27ce31a990deba38519671621972013ac2e768ebbdaf35fa6f9e577344540e91 files/digest-openssh-4.5_p1 1331
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFT0+kamhnQswr0vIRAiHmAKCHYv489byWqzAgUUOv0j3DxFf/GQCeL6e5
-/oI1ZPgE9qP/h3UFKRKPM5M=
-=shSQ
+iD8DBQFFURDsamhnQswr0vIRAjyQAKCi4WBVoWVrD5hyCmQ/aTJxEVRKuQCfeQit
+XpinPuR7L68LElAgHgs5A3s=
+=Z/k5
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/files/digest-openssh-4.5_p1 b/net-misc/openssh/files/digest-openssh-4.5_p1
new file mode 100644 (file)
index 0000000..a944791
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.5_p1
@@ -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 b08b232eb9830a84909bcc9a9abda38c openssh-4.4p1-hpn12v13.diff.gz 15392
+RMD160 b057f9a1068ddce106a94465953bdac58d0ffac8 openssh-4.4p1-hpn12v13.diff.gz 15392
+SHA256 2e3c6a108072eb9de3330cda8639b8c54845174e3a4691a895d06d5cbf221245 openssh-4.4p1-hpn12v13.diff.gz 15392
+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 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.5_p1.ebuild b/net-misc/openssh/openssh-4.5_p1.ebuild
new file mode 100644 (file)
index 0000000..4cd595c
--- /dev/null
+++ b/net-misc/openssh/openssh-4.5_p1.ebuild
@@ -0,0 +1,164 @@
+# 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.5_p1.ebuild,v 1.1 2006/11/07 23:03:28 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/4.5/4.4}+x509-5.5.1.diff.gz"
+SECURID_PATCH="${PARCH/4.5/4.4}+SecurID_v1.3.2.patch"
+LDAP_PATCH="${PARCH/-4.5p1/-lpk-4.4p1}-0.3.7.patch"
+HPN_PATCH="${PARCH/4.5/4.4}-hpn12v13.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.1/${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 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
+
+       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}"/${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}"/${P}-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
+}
+
+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
+}