The 5.4 patchsets for HPN and LPK apply and work perfectly with 5.5.
authorRobin H. Johnson <robbat2@gentoo.org>
Tue, 20 Apr 2010 04:50:38 +0000 (04:50 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Tue, 20 Apr 2010 04:50:38 +0000 (04:50 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-misc/openssh/ChangeLog
net-misc/openssh/Manifest
net-misc/openssh/openssh-5.5_p1-r1.ebuild [new file with mode: 0644]

index 993963f5ff430aa8d9c4a0217eb35be614e8c0ce..61cd33df8ad6cc88733bac8e2abaa8a4be989cb3 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.380 2010/04/16 21:20:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.381 2010/04/20 04:50:38 robbat2 Exp $
+
+*openssh-5.5_p1-r1 (20 Apr 2010)
+
+  20 Apr 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +openssh-5.5_p1-r1.ebuild:
+  The 5.4 patchsets for HPN and LPK apply and work perfectly with 5.5.
 
 *openssh-5.5_p1 (16 Apr 2010)
 
index ba7fa53a0f68dffb8bf54095a9a284b80c916d96..58b86d96c730a7a8937113a3ef08da27befe61a6 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
 AUX openssh-4.7p1-selinux.diff 541 RMD160 bcb8f1fef2ae8378e7000732223c6116e06e0d6f SHA1 395b4dcff3eb7b92582a4364e612fff87278e7bc SHA256 ef8d71c46059bdcc8487cad06914639a8237197561cc030d8eed3baf418cc810
@@ -51,13 +48,7 @@ EBUILD openssh-5.3_p1-r1.ebuild 8321 RMD160 c632f38bae4c60e4836c96ca7e35dd103b59
 EBUILD openssh-5.4_p1-r1.ebuild 6774 RMD160 2450daf74d50d75ea54f3dfb0de663168b5a60f1 SHA1 761711f292d54d2f584fd5b82146a448ccf0c184 SHA256 aee22e034c991f9d425f864c1713e851f16a7715a1075d56a693b7148bca81c7
 EBUILD openssh-5.4_p1-r2.ebuild 8272 RMD160 0ceae73fbee90c61e62d0a38009c21d54333951a SHA1 3e314540758e06cd84ed897bc7fb12ca330a145c SHA256 020cf22f04921cb841449b4d86deb9ea6cc4135fbec5884fb24987d638cc7246
 EBUILD openssh-5.4_p1.ebuild 6654 RMD160 fcdc656a6235e2cac6acec9de1a19411168cb136 SHA1 05337c3b3bf9f6f149960e950a2c8a9656923dc1 SHA256 3312d3f11221a69f517c33170a08d8133d47efb25ba0dc31f81a36548f083f3b
+EBUILD openssh-5.5_p1-r1.ebuild 8195 RMD160 14b3fb4ee1ca2a7fde0d30081ff816b5517c1c9e SHA1 ad49e8ff2cfafd9b2f43bd60e6e16788ce6d3050 SHA256 ac37347ba4a8cde38ce73832daae32bd96918d096e9f92ee5afaa37e89976a2f
 EBUILD openssh-5.5_p1.ebuild 8162 RMD160 be5bcd28f1ff2fb9e8eab17a4eafb38d6d6b6a2a SHA1 925f0fac49b1e648d057991e79df2d1dffd24b85 SHA256 8d33b3ff7c391792bcd4039378720c0859ce894651b31564bea0d466a4b253de
-MISC ChangeLog 59684 RMD160 ca6e1166c05ad5fbc713cae118e23a3071e284e6 SHA1 34c568cca5406ddb065a39d551b475b1ed7f2087 SHA256 5801292a1589be719ffc830b9a33344428e91d53217d823297a48ed2dbcbc3e8
+MISC ChangeLog 59873 RMD160 089e269cc59f79173d092ea6a1c119a4efbb04e7 SHA1 fe44bf8e80d39ab6f1b06cdd7bd0dc0dfcccc841 SHA256 84242f592f249f2b61f4c68102d91fc280c1dee30b8bccd7968602120e7c2d43
 MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAkvI1GAACgkQTwhj9JtAlp7EswEAuAzS+ULQu97cw0cl4S4SQUld
-ns+hR2C5bnZ7iHabYo4A/3HQO93XBlWzHpcgOIfvHCiUAbkGk2L4+b4x6nF8kbx1
-=RvRg
------END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-5.5_p1-r1.ebuild b/net-misc/openssh/openssh-5.5_p1-r1.ebuild
new file mode 100644 (file)
index 0000000..7ccfa08
--- /dev/null
@@ -0,0 +1,269 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.5_p1-r1.ebuild,v 1.1 2010/04/20 04:50:38 robbat2 Exp $
+
+EAPI=2
+inherit eutils flag-o-matic multilib autotools pam
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_/}
+PARCH_54=${PARCH/5.5/5.4}
+
+HPN_PATCH="${PARCH_54}-hpn13v7.diff.gz"
+HPN_X509_PATCH="${HPN_PATCH%.diff.gz}-x509variant.diff.gz"
+LDAP_PATCH="${PARCH_54/openssh/openssh-lpk}-0.3.13.patch.gz"
+X509_VER="6.2.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+       ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} mirror://gentoo/${HPN_PATCH} )}
+       ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+       ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+       ${HPN_X509_PATCH:+hpn? ( X509? ( mirror://gentoo/${HPN_X509_PATCH} ) )}
+       "
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+
+RDEPEND="pam? ( virtual/pam )
+       kerberos? ( virtual/krb5 )
+       selinux? ( >=sys-libs/libselinux-1.28 )
+       skey? ( >=sys-auth/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
+       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"
+RDEPEND="${RDEPEND}
+       pam? ( >=sys-auth/pambase-20081028 )"
+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} ]] && echo ${1} ; }
+       local fail="
+               $(use X509 && maybe_fail X509 X509_PATCH)
+               $(use ldap && maybe_fail ldap LDAP_PATCH)
+               $(use hpn && maybe_fail hpn HPN_PATCH)
+               $(use X509 && use hpn && maybe_fail x509+hpn HPN_X509_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_prepare() {
+       sed -i \
+               -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
+               pathnames.h || die
+       # keep this as we need it to avoid the conflict between LPK and HPN changing
+       # this file.
+       cp version.h version.h.pristine
+
+       if use X509 ; then
+               # Apply X509 patch
+               epatch "${DISTDIR}"/${X509_PATCH}
+               # Apply glue so that HPN will still work after X509
+               #epatch "${FILESDIR}"/${PN}-5.2_p1-x509-hpn-glue.patch
+       fi
+       if ! use X509 ; then
+               if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+                       epatch "${DISTDIR}"/${LDAP_PATCH}
+                       epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654
+                       # version.h patch conflict avoidence
+                       mv version.h version.h.lpk
+                       cp -f version.h.pristine version.h
+               fi
+       else
+               use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP"
+       fi
+       epatch "${FILESDIR}"/${PN}-5.4_p1-openssl.patch
+       epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+       if [[ -n ${HPN_PATCH} ]] && use hpn; then
+               if use X509 ; then
+                       epatch "${DISTDIR}"/${HPN_X509_PATCH}
+               else
+                       epatch "${DISTDIR}"/${HPN_PATCH}
+               fi
+               # version.h patch conflict avoidence
+               mv version.h version.h.hpn
+               cp -f version.h.pristine version.h
+               # The AES-CTR multithreaded variant is temporarily broken, and
+               # causes random hangs when combined with the -f switch of ssh.
+               # To avoid this, we change the internal table to use the non-multithread
+               # version for the meantime.
+               sed -i \
+                       -e '/aes...-ctr.*SSH_CIPHER_SSH2/s,evp_aes_ctr_mt,evp_aes_128_ctr,' \
+                       cipher.c || die
+       fi
+       epatch "${FILESDIR}"/${PN}-5.2_p1-autoconf.patch
+
+       sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
+
+       # Disable PATH reset, trust what portage gives us. bug 254615
+       sed -i -e 's:^PATH=/:#PATH=/:' configure || die
+
+       # Now we can build a sane merged version.h
+       t="${T}"/version.h
+       m="${t}.merge" f="${t}.final"
+       cat version.h.{hpn,pristine,lpk} 2>/dev/null \
+               | sed '/^#define SSH_RELEASE/d' \
+               | sort | uniq >"${m}"
+       sed -n -r \
+               -e '/^\//p' \
+               <"${m}" >"${f}"
+       sed -n -r \
+               -e '/SSH_LPK/s,"lpk","-lpk",g' \
+               -e '/^#define/p' \
+               <"${m}" >>"${f}"
+       v="SSH_VERSION SSH_PORTABLE"
+       [[ -f version.h.hpn ]] && v="${v} SSH_HPN"
+       [[ -f version.h.lpk ]] && v="${v} SSH_LPK"
+       echo "#define SSH_RELEASE ${v}" >>"${f}"
+       cp "${f}" version.h
+
+       eautoreconf
+}
+
+static_use_with() {
+       local flag=$1
+       if use static && use ${flag} ; then
+               ewarn "Disabling '${flag}' support because of USE='static'"
+               # rebuild args so that we invert the first one (USE flag)
+               # but otherwise leave everything else working so we can
+               # just leverage use_with
+               shift
+               [[ -z $1 ]] && flag="${flag} ${flag}"
+               set -- !${flag} "$@"
+       fi
+       use_with "$@"
+}
+
+src_configure() {
+       addwrite /dev/ptmx
+       addpredict /etc/skey/skeykeys #skey configure code triggers this
+
+       use static && append-ldflags -static
+
+       econf \
+               --with-ldflags="${LDFLAGS}" \
+               --disable-strip \
+               --sysconfdir=/etc/ssh \
+               --libexecdir=/usr/$(get_libdir)/misc \
+               --datadir=/usr/share/openssh \
+               --with-privsep-path=/var/empty \
+               --with-privsep-user=sshd \
+               --with-md5-passwords \
+               --with-ssl-engine \
+               $(static_use_with pam) \
+               $(static_use_with kerberos kerberos5 /usr) \
+               ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
+               $(use_with libedit) \
+               $(use_with selinux) \
+               $(use_with skey) \
+               $(use_with tcpd tcp-wrappers) \
+               || die
+}
+
+src_compile() {
+       emake || die
+}
+
+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.2 sshd
+       if use pam ; then
+               sed -i \
+                       -e "/^#UsePAM /s:.*:UsePAM yes:" \
+                       -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+                       -e "/^#PrintMotd /s:.*:PrintMotd no:" \
+                       -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+                       "${D}"/etc/ssh/sshd_config || die "sed of configuration file failed"
+       fi
+
+       # This instruction is from the HPN webpage,
+       # Used for the server logging functionality
+       if [[ -n ${HPN_PATCH} ]] && use hpn; then
+               keepdir /var/empty/dev
+       fi
+
+       doman contrib/ssh-copy-id.1
+       dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+       diropts -m 0700
+       dodir /etc/skel/.ssh
+}
+
+src_test() {
+       local t tests skipped failed passed shell
+       tests="interop-tests compat-tests"
+       skipped=""
+       shell=$(getent passwd ${UID} | cut -d: -f7)
+       if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+               elog "Running the full OpenSSH testsuite"
+               elog "requires a usable shell for the 'portage'"
+               elog "user, so we will run a subset only."
+               skipped="${skipped} tests"
+       else
+               tests="${tests} tests"
+       fi
+       for t in ${tests} ; do
+               # Some tests read from stdin ...
+               emake -k -j1 ${t} </dev/null \
+                       && passed="${passed}${t} " \
+                       || failed="${failed}${t} "
+       done
+       einfo "Passed tests: ${passed}"
+       ewarn "Skipped tests: ${skipped}"
+       if [[ -n ${failed} ]] ; then
+               ewarn "Failed tests: ${failed}"
+               die "Some tests failed: ${failed}"
+       else
+               einfo "Failed tests: ${failed}"
+               return 0
+       fi
+}
+
+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 "reload sshd: '/etc/init.d/sshd reload'."
+       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
+       # This instruction is from the HPN webpage,
+       # Used for the server logging functionality
+       if [[ -n ${HPN_PATCH} ]] && use hpn; then
+               echo
+               einfo "For the HPN server logging patch, you must ensure that"
+               einfo "your syslog application also listens at /var/empty/dev/log."
+       fi
+}