Version bump #170385 by Wolfram Schlich.

Package-Manager: portage-2.1.2.2

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 21d42721a4dfeed47fb41fbd55df4b8c29b2c2a2..8a74e16d09d2f47ffa8fe40bd4606218d3bf232d 100644 (file)
--- 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.232 2007/03/05 04:54:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.233 2007/03/11 19:23:39 vapier Exp $
+
+*openssh-4.6_p1 (11 Mar 2007)
+
+  11 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-4.6_p1-include-string-header.patch, +openssh-4.6_p1.ebuild:
+  Version bump #170385 by Wolfram Schlich.
 
 *openssh-4.5_p1-r2 (05 Mar 2007)
 

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 02ee5e198b1985f1e26260c4fbec4ef0a1c613a6..e7f061808d2b40c75ac7c1d64396433c1f74931c 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
@@ -134,6 +137,10 @@ AUX openssh-4.4p1-selinux-ac.diff 525 RMD160 3cd79bd33f6b54afc943c641f83120f78c7
 MD5 acfb71370d090c620e71fcf7e4ede1c4 files/openssh-4.4p1-selinux-ac.diff 525
 RMD160 3cd79bd33f6b54afc943c641f83120f78c703f65 files/openssh-4.4p1-selinux-ac.diff 525
 SHA256 fc7d2f252fc19864c1b5b5cb6b506018580495605e36dad7e370fbc16b3f276e files/openssh-4.4p1-selinux-ac.diff 525
+AUX openssh-4.6_p1-include-string-header.patch 283 RMD160 6ca0ed9b00370904be03d1ab5b61a5893ca56768 SHA1 0f2cbdd460488741d8cf71db04f38df48215b335 SHA256 75c3850ece441da13f15c14a4836ff57bf67381590d5403be38c5b2aa097c57e
+MD5 31f7b865121071c12310d3e398e82bf8 files/openssh-4.6_p1-include-string-header.patch 283
+RMD160 6ca0ed9b00370904be03d1ab5b61a5893ca56768 files/openssh-4.6_p1-include-string-header.patch 283
+SHA256 75c3850ece441da13f15c14a4836ff57bf67381590d5403be38c5b2aa097c57e files/openssh-4.6_p1-include-string-header.patch 283
 AUX openssh-securid-1.3.1-updates.patch 445 RMD160 b1db3dfa75f7e03d0dff41e85e285f8b749f27f0 SHA1 757a8b0c1586fdcbff0762b39a52f1b315d4b110 SHA256 11c95cc508d20c8eb1e8faa0d2b5e68346cbb93db8fb560cfa8b4d2c0d1104b3
 MD5 eca7ba0b23754a710b42a79c1fb5e248 files/openssh-securid-1.3.1-updates.patch 445
 RMD160 b1db3dfa75f7e03d0dff41e85e285f8b749f27f0 files/openssh-securid-1.3.1-updates.patch 445
@@ -181,6 +188,8 @@ DIST openssh-4.5p1+x509-5.5.2.diff.gz 137561 RMD160 2e7597bc97d634ecc3d434cc714c
 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-4.6p1+x509-5.5.2.diff.gz 141892 RMD160 3aacab881f28b7e8087481a6fcf661f67502319b SHA1 5210b31d70b61278007b5a12543e9834fe90ac71 SHA256 b365d2819ba1f81411382106629b8fe74ae5aa4a1081aa8e3c44858c115c822e
+DIST openssh-4.6p1.tar.gz 967395 RMD160 2959ac56c9175275bf82847ec64b2b169aedcb82 SHA1 b2aefeb1861b4688b1777436035239ec32a47da8 SHA256 7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a
 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
@@ -223,10 +232,14 @@ EBUILD openssh-4.5_p1.ebuild 5350 RMD160 6d40a35a0bee3b9f2c1463862577add3fec7901
 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 36765 RMD160 1b164bbf0f52f302ff85946776256b5134ab6ea2 SHA1 7b52ee1522b2d8714f147706229509fed751e841 SHA256 5b36e4afed24524a0816ee908d574905a84c67fd8f6faa6dce2a4703c996a430
-MD5 8b6d51170edc992f49a24efe4065acdc ChangeLog 36765
-RMD160 1b164bbf0f52f302ff85946776256b5134ab6ea2 ChangeLog 36765
-SHA256 5b36e4afed24524a0816ee908d574905a84c67fd8f6faa6dce2a4703c996a430 ChangeLog 36765
+EBUILD openssh-4.6_p1.ebuild 5333 RMD160 85f8e8560014f0856d5173e1ddfc28d20d2cb794 SHA1 6d66e7b9109bc7cb66482a2bd67957f757ab8e4a SHA256 83fe7fda6d2724f4cd10bf2c0f2d9a453055e5c7861f8da6cae2ced0e62c4727
+MD5 2fba5d47af8723ca89434775260a3fda openssh-4.6_p1.ebuild 5333
+RMD160 85f8e8560014f0856d5173e1ddfc28d20d2cb794 openssh-4.6_p1.ebuild 5333
+SHA256 83fe7fda6d2724f4cd10bf2c0f2d9a453055e5c7861f8da6cae2ced0e62c4727 openssh-4.6_p1.ebuild 5333
+MISC ChangeLog 36966 RMD160 6d06f45a2afded1dd3f460b84483c916a9484852 SHA1 7d5d5eee2a867c90b0db0235d2fba6ac0d2b7c00 SHA256 51385809120cb1b61c1f891332ca9208171132fe0adbb08bf07268a41e4d37d4
+MD5 f3ee3548ecec02d67ea2aab20624d0ec ChangeLog 36966
+RMD160 6d06f45a2afded1dd3f460b84483c916a9484852 ChangeLog 36966
+SHA256 51385809120cb1b61c1f891332ca9208171132fe0adbb08bf07268a41e4d37d4 ChangeLog 36966
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -258,3 +271,13 @@ SHA256 86a17c74dd503363c30085c75f7cc17bda20da889e93d61d59446589992cc08b files/di
 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
+MD5 028552b80ff1297d99f185559938328d files/digest-openssh-4.6_p1 518
+RMD160 c4547b53bb2c361f3c4b65e3cacbce55a64ee6f1 files/digest-openssh-4.6_p1 518
+SHA256 25ba3ac9d41810adc59829a3c7d9be9d73a3cd365a6e6ef54202358068560147 files/digest-openssh-4.6_p1 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF9FdK8bi6rjpTunYRAtoFAJ0ZmaX0o3JPsVt2hU8xgYFdMoFcmACg4Ze1
+hFx1zMi8HUZ+Jg9VWDs8tfs=
+=DEn5
+-----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/files/digest-openssh-4.6_p1 b/net-misc/openssh/files/digest-openssh-4.6_p1
new file mode 100644 (file)
index 0000000..e2f9b9e
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.6_p1
@@ -0,0 +1,6 @@
+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 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/openssh-4.6_p1-include-string-header.patch b/net-misc/openssh/files/openssh-4.6_p1-include-string-header.patch
new file mode 100644 (file)
index 0000000..209a6d7
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.6_p1-include-string-header.patch
@@ -0,0 +1,14 @@
+http://bugzilla.mindrot.org/show_bug.cgi?id=1294
+
+--- includes.h
++++ includes.h
+@@ -52,6 +52,9 @@
+ #ifdef HAVE_PATHS
+ # include <paths.h>
+ #endif
++#ifdef HAVE_STRING_H
++# include <string.h>
++#endif
+ 
+ /*
+  *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively

diff --git a/net-misc/openssh/openssh-4.6_p1.ebuild b/net-misc/openssh/openssh-4.6_p1.ebuild
new file mode 100644 (file)
index 0000000..677e555
--- /dev/null
+++ b/net-misc/openssh/openssh-4.6_p1.ebuild
@@ -0,0 +1,165 @@
+# 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.ebuild,v 1.1 2007/03/11 19:23:39 vapier 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.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
+
+       epatch "${FILESDIR}"/${P}-include-string-header.patch
+       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
+}