From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MfASM-0000TG-Kl for garchives@archives.gentoo.org; Sun, 23 Aug 2009 10:37:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 956B3E02C6; Sun, 23 Aug 2009 10:37:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 42D85E02C6 for ; Sun, 23 Aug 2009 10:37:49 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id C966264D2B for ; Sun, 23 Aug 2009 10:37:48 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MfASK-0007Ug-6y for gentoo-commits@lists.gentoo.org; Sun, 23 Aug 2009 10:37:48 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openssh: ChangeLog openssh-5.2_p1-r3.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog openssh-5.2_p1-r3.ebuild X-VCS-Directories: net-misc/openssh X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Sun, 23 Aug 2009 10:37:48 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 01a7209f-0192-4a92-9d00-c8415eb4ced7 X-Archives-Hash: 0e6b848654fd64cfbc20c3ae9980801c vapier 09/08/23 10:37:48 Modified: ChangeLog Added: openssh-5.2_p1-r3.ebuild Log: Update x509 patch, update gsskex patch #279488 by Harald Barth, and upd= ate x509/hpn glue #270508 by BedOS_Gui. (Portage version: 2.2_rc38/cvs/Linux x86_64) Revision Changes Path 1.358 net-misc/openssh/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/C= hangeLog?rev=3D1.358&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/C= hangeLog?rev=3D1.358&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/C= hangeLog?r1=3D1.357&r2=3D1.358 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v retrieving revision 1.357 retrieving revision 1.358 diff -u -r1.357 -r1.358 --- ChangeLog 13 Aug 2009 06:30:33 -0000 1.357 +++ ChangeLog 23 Aug 2009 10:37:47 -0000 1.358 @@ -1,6 +1,14 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.357 20= 09/08/13 06:30:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.358 20= 09/08/23 10:37:47 vapier Exp $ + +*openssh-5.2_p1-r3 (23 Aug 2009) + + 23 Aug 2009; Mike Frysinger +openssh-5.2_p1-r3.ebu= ild, + +files/openssh-5.2_p1-gsskex-fix.patch, + +files/openssh-5.2_p1-x509-hpn-glue.patch: + Update x509 patch, update gsskex patch #279488 by Harald Barth, and up= date + x509/hpn glue #270508 by BedOS_Gui. =20 13 Aug 2009; Mike Frysinger openssh-5.0_p1-r2.ebui= ld, openssh-5.1_p1-r2.ebuild, openssh-5.1_p1-r3.ebuild, 1.1 net-misc/openssh/openssh-5.2_p1-r3.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/o= penssh-5.2_p1-r3.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/o= penssh-5.2_p1-r3.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: openssh-5.2_p1-r3.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r3.ebu= ild,v 1.1 2009/08/23 10:37:47 vapier Exp $ inherit eutils flag-o-matic multilib autotools pam # Make it more portable between straight releases # and _p? releases. PARCH=3D${P/_/} HPN_PATCH=3D"${PARCH}-hpn13v6.diff.gz" LDAP_PATCH=3D"${PARCH/openssh/openssh-lpk}-0.3.11.patch.gz" PKCS11_PATCH=3D"${PARCH/p1}pkcs11-0.26.tar.bz2" X509_VER=3D"6.2.1" X509_PATCH=3D"${PARCH}+x509-${X509_VER}.diff.gz" DESCRIPTION=3D"Port of OpenBSD's free SSH release" HOMEPAGE=3D"http://www.openssh.org/" # HPN appears twice as sometimes Gentoo has a custom version of it. SRC_URI=3D"mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-2009072= 6.patch ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN= _PATCH} )} ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )} ${PKCS11_PATCH:+pkcs11? ( http://alon.barlev.googlepages.com/${PKCS11_PA= TCH} )} ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/= ${X509_PATCH} )}" LICENSE=3D"as-is" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 = ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE=3D"hpn kerberos ldap libedit pam pkcs11 selinux skey smartcard stati= c tcpd X X509" RDEPEND=3D"pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=3Dsys-libs/libselinux-1.28 ) skey? ( >=3Dsys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=3Ddev-libs/openssl-0.9.6d >=3Dsys-libs/zlib-1.2.3 smartcard? ( dev-libs/opensc ) pkcs11? ( dev-libs/pkcs11-helper ) tcpd? ( >=3Dsys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( sys-apps/shadow )" DEPEND=3D"${RDEPEND} dev-util/pkgconfig virtual/os-headers sys-devel/autoconf" RDEPEND=3D"${RDEPEND} pam? ( >=3Dsys-auth/pambase-20081028 )" PROVIDE=3D"virtual/ssh" S=3D${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} ]] && use ${1} && echo ${1} ; } local fail=3D" $(maybe_fail ldap LDAP_PATCH) $(maybe_fail pkcs11 PKCS11_PATCH) $(maybe_fail X509 X509_PATCH) " fail=3D$(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 '=3D${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 if use pkcs11 ; then cd "${WORKDIR}" unpack "${PKCS11_PATCH}" cd "${S}" EPATCH_OPTS=3D"-p1" epatch "${WORKDIR}"/*pkcs11*/{1,2,4}* use X509 && EPATCH_OPTS=3D"-R" epatch "${WORKDIR}"/*pkcs11*/1000_all_lo= g.patch fi use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-x509-hp= n-glue.patch use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch if ! use X509 ; then if [[ -n ${LDAP_PATCH} ]] && use ldap ; then # The patch for bug 210110 64-bit stuff is now included. epatch "${DISTDIR}"/${LDAP_PATCH} epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654 fi epatch "${DISTDIR}"/openssh-5.2p1-gsskex-all-20090726.patch #115553 #21= 6932 #279488 epatch "${FILESDIR}"/${P}-gsskex-fix.patch else use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap= " fi #epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated i= nto gsskex [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH} epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665 epatch "${FILESDIR}"/${P}-autoconf.patch # in 5.2p1, 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 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=3D/:#PATH=3D/:' configure || die eautoreconf } static_use_with() { local flag=3D$1 if use static && use ${flag} ; then ewarn "Disabling '${flag}' support because of USE=3D'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 [[ -z $1 ]] && flag=3D"${flag} ${flag}" shift set -- !${flag} "$@" fi use_with "$@" } src_compile() { addwrite /dev/ptmx addpredict /etc/skey/skeykeys #skey configure code triggers this local myconf=3D"" use static && append-ldflags -static econf \ --with-ldflags=3D"${LDFLAGS}" \ --disable-strip \ --sysconfdir=3D/etc/ssh \ --libexecdir=3D/usr/$(get_libdir)/misc \ --datadir=3D/usr/share/openssh \ --with-privsep-path=3D/var/empty \ --with-privsep-user=3Dsshd \ --with-md5-passwords \ --with-ssl-engine \ $(static_use_with pam) \ $(static_use_with kerberos kerberos5 /usr) \ ${LDAP_PATCH:+$(use ldap && use_with ldap)} \ $(use_with libedit) \ ${PKCS11_PATCH:+$(use pkcs11 && static_use_with pkcs11)} \ $(use_with selinux) \ $(use_with skey) \ $(use_with smartcard opensc) \ $(use_with tcpd tcp-wrappers) \ ${myconf} \ || die "bad configure" emake || die "compile problem" } src_install() { emake install-nokeys DESTDIR=3D"${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=3D"interop-tests compat-tests" skipped=3D"" shell=3D$(getent passwd ${UID} | cut -d: -f7) if [[ ${shell} =3D=3D */nologin ]] || [[ ${shell} =3D=3D */false ]] ; th= en elog "Running the full OpenSSH testsuite" elog "requires a usable shell for the 'portage'" elog "user, so we will run a subset only." skipped=3D"${skipped} tests" else tests=3D"${tests} tests" fi for t in ${tests} ; do # Some tests read from stdin ... emake -k -j1 ${t} & /dev/null 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 if use pkcs11 ; then echo einfo "For PKCS#11 you should also emerge one of the askpass softwares" einfo "Example: net-misc/x11-ssh-askpass" 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 }