From: Robin H. Johnson Date: Mon, 29 Mar 2010 06:39:37 +0000 (+0000) Subject: Revbump with HPN and LPK patches available again now. Ported and submitted to upstrea... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88bad1a915d4ce241e638b6988ca7f7c8654e037;p=gentoo.git Revbump with HPN and LPK patches available again now. Ported and submitted to upstream authors. X509 now has more conflicts with HPN, future revisions may require selection of: x509 XOR (hpn OR lpk). Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 842b0c2cd62a..5530a4d44fef 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,14 @@ # 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.378 2010/03/29 05:42:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.379 2010/03/29 06:39:37 robbat2 Exp $ + +*openssh-5.4_p1-r2 (29 Mar 2010) + + 29 Mar 2010; Robin H. Johnson + +openssh-5.4_p1-r2.ebuild: + Revbump with HPN and LPK patches available again now. Ported and submitted + to upstream authors. X509 now has more conflicts with HPN, future + revisions may require selection of: x509 XOR (hpn OR lpk). *openssh-5.4_p1-r1 (29 Mar 2010) diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index aaef74e16580..868de3665e1e 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -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 @@ -36,21 +33,18 @@ DIST openssh-5.3p1-hpn13v6-gentoo.diff.gz 23262 RMD160 f4a99017f658d5b803b966cb3 DIST openssh-5.3p1.tar.gz 1027130 RMD160 f8c98b4b91b7e0e02b33837ef6978e8b7570cf9e SHA1 d411fde2584ef6022187f565360b2c63a05602b5 SHA256 d0c917462896974480b14454a8e1cb8b809291f67e5b9779c9b4dc4156c5ef12 DIST openssh-5.4p1+x509-6.2.2.diff.gz 156585 RMD160 3b21a9b44d846518e8da038c19e4429a6a4740c2 SHA1 fc733648fd3dc3bc2ff6a9fc73b74f3910ba8a2f SHA256 3a1634e4c90262e13ce1b30800a60345737a84b1f348702716af7123f4e0a01e DIST openssh-5.4p1+x509-6.2.3.diff.gz 156621 RMD160 20be6252837563c299dfc8d32ac8823f21efbba4 SHA1 fe77afbe1a2884ee9545b027c311b9e7d4b84115 SHA256 90a21d282b846c28d8c8123dbc6f9bf9e1ec21d818ffe4260027875667164b0b +DIST openssh-5.4p1-hpn13v7-x509variant.diff.gz 22941 RMD160 383b3883984ee0e6068363fdd645d2dd24c7964c SHA1 d3f04c938ab6e5e10587d0ffb717af37360a8dd6 SHA256 c2b1a81c6952ae73cc4dfd1528d560588c45cf1242ea8b0e6eadb0cc83b50377 +DIST openssh-5.4p1-hpn13v7.diff.gz 22848 RMD160 c3e151d7804ec2fa60769e1c73d369bffab6d4b1 SHA1 bbf7778dd57a25c0d742ca66f29b46bbbf607435 SHA256 fdfd7205ec8aa2b3dd7a69c9c2050b91d0623ee1eff07f27a58bf9190e605cf6 DIST openssh-5.4p1.tar.gz 1094604 RMD160 2382307f19edc727a108da262e531ecf3671cf09 SHA1 2a3042372f08afb1415ceaec8178213276a36302 SHA256 ae96e70d04104824ab10f0d7aaef4584ac96b2a870adfcd8b457d836c8c5404e DIST openssh-lpk-5.1p1-0.3.10.patch.gz 17922 RMD160 b569ea5ab867294796f8db698016e656fcc31cd3 SHA1 510a1bad95d7b3c0d52a3bd6202b0495e6388369 SHA256 90cce711526c9caed6af32539c00cb51c922df14c2f1d0106c4eb593cf62321e DIST openssh-lpk-5.2p1-0.3.11.patch.gz 18116 RMD160 2ff9bdff19e0854a96063be1e0589fa3f85da0d7 SHA1 33b36cf94f68a80fca497da110529ce69d62fbb0 SHA256 450b56a989767aa65a974213e8f7e9d0ee9d08522247db7b787730e53685bebd DIST openssh-lpk-5.3p1-0.3.11.patch.gz 18137 RMD160 3e316722d521e163a82d661465abef7f128d736b SHA1 870a703e2cafa744681733766e48faf3229e3b7e SHA256 34d8dbccde3b1fedb6b75d7a725ade8b37389c46f5b13a2e5a80d8cd8e6ffaaa +DIST openssh-lpk-5.4p1-0.3.13.patch.gz 18105 RMD160 734b2c3ea740b6de610e3bfa91c93a2540b79acc SHA1 4c73f21b16db41c16e096db834380ec53f15c723 SHA256 4e5dbe769e487c914ecc5b104866f6d4412cbe35c3f2bed897d06f7d824878be EBUILD openssh-5.1_p1-r2.ebuild 5462 RMD160 f36841058b21ed27a1852a5b1570939c2ad709c9 SHA1 fd8625bcc5c76842aea3c3ed5b7f93846be7567c SHA256 2a50479c1d0c4f60a67a2ca74ae658228d3297b528772b43951bac2ea3291c02 EBUILD openssh-5.2_p1-r3.ebuild 8150 RMD160 b9049bb12151086a4261cfc70aad4ba0def0d4a7 SHA1 a9f0ec39435444e2ca4ca2e0ca99d3a10ded6bd8 SHA256 ba524fd8817de5ece224ba2fca841964020069bd580ae644c99ad9ff3587af1d EBUILD openssh-5.3_p1-r1.ebuild 8321 RMD160 c632f38bae4c60e4836c96ca7e35dd103b598159 SHA1 1a7f59e8144586def7d83b6c6721d6da5c9e8d40 SHA256 1fa0285b909c4bd834bf495d3140aa8c7e6586ca1f85ec0c46aa0e0b4ee8df5d EBUILD openssh-5.4_p1-r1.ebuild 6774 RMD160 2450daf74d50d75ea54f3dfb0de663168b5a60f1 SHA1 761711f292d54d2f584fd5b82146a448ccf0c184 SHA256 aee22e034c991f9d425f864c1713e851f16a7715a1075d56a693b7148bca81c7 +EBUILD openssh-5.4_p1-r2.ebuild 8273 RMD160 61fbc7b30caf01f2ae9ebfe6d754d630d0f027ad SHA1 7cabfbd13caa2a291741da28df6a73d44bad27a3 SHA256 d91f7718e18275fb2d8faa95d542559afa15624b37e2fa89b8bd40ac3370ab5a EBUILD openssh-5.4_p1.ebuild 6654 RMD160 fcdc656a6235e2cac6acec9de1a19411168cb136 SHA1 05337c3b3bf9f6f149960e950a2c8a9656923dc1 SHA256 3312d3f11221a69f517c33170a08d8133d47efb25ba0dc31f81a36548f083f3b -MISC ChangeLog 59239 RMD160 c1729450771d34d004fae8e2ea0f06b93e07b1cc SHA1 7f33c1442913e5cb004d5c86b8b2fb6ec35bcc9c SHA256 d660acba094992d8a094aeb50271c7648a138b18e50915459e837ce8b372cdce +MISC ChangeLog 59563 RMD160 3c1c32fa85ccd6a7bc16d22cba9cc61c504f8a21 SHA1 3b4fc155cd67439c1aa20ad49578b54aa66505b4 SHA256 f67027230d2a5f7dc9757b936a4e5925c4bd021bd441ec266403c310a25c07a1 MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iF4EAREIAAYFAkuwPdQACgkQTwhj9JtAlp79xAEAkLUn8IKl7nEy/cfdg6WUPkXs -tH/67n7w/j25fU4Hs14A/AhCiANDXkxKV8R3+tKk74FOzNzMIW6TlMt6eX/ZyRvW -=W4o4 ------END PGP SIGNATURE----- diff --git a/net-misc/openssh/openssh-5.4_p1-r2.ebuild b/net-misc/openssh/openssh-5.4_p1-r2.ebuild new file mode 100644 index 000000000000..ecee93ab1696 --- /dev/null +++ b/net-misc/openssh/openssh-5.4_p1-r2.ebuild @@ -0,0 +1,270 @@ +# 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.4_p1-r2.ebuild,v 1.1 2010/03/29 06:39:37 robbat2 Exp $ + +EAPI=2 +inherit eutils flag-o-matic multilib autotools pam + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_/} + +HPN_PATCH="${PARCH}-hpn13v7.diff.gz" +HPN_X509_PATCH="${HPN_PATCH%.diff.gz}-x509variant.diff.gz" +LDAP_PATCH="${PARCH/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}"/${P}-openssl.patch + epatch "${FILESDIR}"/${P}-pkcs11.patch #310929 + epatch "${FILESDIR}"/${P}-relative-AuthorizedKeysFile.patch #308939 + 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}