diff options
| -rw-r--r-- | net-misc/openssh/ChangeLog | 10 | ||||
| -rw-r--r-- | net-misc/openssh/Manifest | 12 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-5.4_p1-pkcs11.patch | 39 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-5.4_p1-relative-AuthorizedKeysFile.patch | 47 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.4_p1-r1.ebuild | 224 |
5 files changed, 327 insertions, 5 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index f9eee28f22f3..842b0c2cd62a 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.377 2010/03/20 00:17:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.378 2010/03/29 05:42:45 vapier Exp $ + +*openssh-5.4_p1-r1 (29 Mar 2010) + + 29 Mar 2010; Mike Frysinger <vapier@gentoo.org> +openssh-5.4_p1-r1.ebuild, + +files/openssh-5.4_p1-pkcs11.patch, + +files/openssh-5.4_p1-relative-AuthorizedKeysFile.patch: + Fixes from upstream for pkcs build problems #310929 by Alan Hourihane and + for relative AuthorizedKeysFile handling #308939 by Eric Vander Weele. 20 Mar 2010; Mike Frysinger <vapier@gentoo.org> openssh-5.3_p1-r1.ebuild, openssh-5.4_p1.ebuild: diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 78e871e742fe..aaef74e16580 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -16,6 +16,8 @@ AUX openssh-5.2_p1-x509-hpn-glue.patch 2851 RMD160 2c3fbb549976f9004e89bcfb58dad AUX openssh-5.2p1-ldap-stdargs.diff 252 RMD160 7bf89a0946446b43ce3026b7b01a9a4c637f388a SHA1 7b62038dc3060b1e77df213c85874ba80acd8f64 SHA256 97281375efa33e9ce70a55bfa95b6b426208175e7e3ff493012bc25d9b012f45 AUX openssh-5.3_p1-pkcs11-hpn-glue.patch 765 RMD160 9c865591eed26cadb34b0a4f35b574cda13a7da1 SHA1 4203cc42e801b5c598a4d7fd021bf965d64c1391 SHA256 0f85b457061fee06f053945ed1a37a962e41cd1c49c616fb9d5e4ad776fda6a4 AUX openssh-5.4_p1-openssl.patch 255 RMD160 6d495664c5d94058cb4aa8a0011a070cb27a8fb9 SHA1 9e78702afc936a478f64c73bada9e85f7dbd8081 SHA256 f83627039491e9969f1ed5d77fe816465ce75809e8c2f2bfb07012bc21384347 +AUX openssh-5.4_p1-pkcs11.patch 1099 RMD160 d94041f2448ecc6e9d6add0301979abeaf47fd4c SHA1 371b2cd92ff915a8efc4377de60c7626e0371453 SHA256 5603b9f4cb99990404f7953d2524190ef50e6b0f5434a2465c6dea21720be4b6 +AUX openssh-5.4_p1-relative-AuthorizedKeysFile.patch 1501 RMD160 5f73b12112e52278561923e72d706a575d68d9f1 SHA1 9be8ba4a6d0b748d69596e111eddaa70a69fd645 SHA256 9c06be753927eaecec8eaae401f6890c4ab7a8cf91dc7a35bb95228ed1c0d362 AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0967944b6125be26ed4628f49abf586b2 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 AUX sshd.pam 294 RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d SHA1 4cd17fb40793fa9ca77ac93698129f2c8cafd7b8 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f AUX sshd.pam_include.2 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c @@ -33,6 +35,7 @@ DIST openssh-5.3p1+x509-6.2.1.diff.gz 154130 RMD160 d16e9d4fd7f6e64091c7b421df7b DIST openssh-5.3p1-hpn13v6-gentoo.diff.gz 23262 RMD160 f4a99017f658d5b803b966cb3711f246be6344f9 SHA1 a30568339458976933e770900a933f013e8ce2c2 SHA256 3f3861ca5e58134dc3f3f7a042d53b9d652b7e4232fcadd45c7fba2d98f5bf63 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.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 @@ -40,13 +43,14 @@ DIST openssh-lpk-5.3p1-0.3.11.patch.gz 18137 RMD160 3e316722d521e163a82d661465ab 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.ebuild 6654 RMD160 fcdc656a6235e2cac6acec9de1a19411168cb136 SHA1 05337c3b3bf9f6f149960e950a2c8a9656923dc1 SHA256 3312d3f11221a69f517c33170a08d8133d47efb25ba0dc31f81a36548f083f3b -MISC ChangeLog 58881 RMD160 dff1d8dd63eaa113359f3b021948487d2e3b5ea1 SHA1 375b08cf0528db5f219eec9b03b723f2533c5000 SHA256 b70612e9ed56a7459b2d6105966d1676e512afb3ea87752e21328f399d05254d +MISC ChangeLog 59239 RMD160 c1729450771d34d004fae8e2ea0f06b93e07b1cc SHA1 7f33c1442913e5cb004d5c86b8b2fb6ec35bcc9c SHA256 d660acba094992d8a094aeb50271c7648a138b18e50915459e837ce8b372cdce MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iF4EAREIAAYFAkukFDYACgkQTwhj9JtAlp7V4gEAxR7MFxkUCeMXvKXkqMIi5QnT -Z3raPPev6w+wjvTr3UsBALGCfgZxM0wvLFB5d9pydP0f1H1yf5ibabYeRbhuILcz -=wYIJ +iF4EAREIAAYFAkuwPdQACgkQTwhj9JtAlp79xAEAkLUn8IKl7nEy/cfdg6WUPkXs +tH/67n7w/j25fU4Hs14A/AhCiANDXkxKV8R3+tKk74FOzNzMIW6TlMt6eX/ZyRvW +=W4o4 -----END PGP SIGNATURE----- diff --git a/net-misc/openssh/files/openssh-5.4_p1-pkcs11.patch b/net-misc/openssh/files/openssh-5.4_p1-pkcs11.patch new file mode 100644 index 000000000000..08fad078c436 --- /dev/null +++ b/net-misc/openssh/files/openssh-5.4_p1-pkcs11.patch @@ -0,0 +1,39 @@ +fixes from upstream + +https://bugzilla.mindrot.org/show_bug.cgi?id=1737 +https://bugzilla.mindrot.org/show_bug.cgi?id=1738 + +http://bugs.gentoo.org/310929 + +--- ssh-pkcs11-helper.c ++++ ssh-pkcs11-helper.c +@@ -17,8 +17,6 @@ + + #include "includes.h" + +-#ifdef ENABLE_PKCS11 +- + #include <sys/types.h> + #ifdef HAVE_SYS_TIME_H + # include <sys/time.h> +@@ -39,6 +37,8 @@ + #include "authfd.h" + #include "ssh-pkcs11.h" + ++#ifdef ENABLE_PKCS11 ++ + /* borrows code from sftp-server and ssh-agent */ + + struct pkcs11_keyinfo { +--- Makefile.in ++++ Makefile.in +@@ -160,7 +160,7 @@ + $(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + + ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o +- $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) + + ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o + $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) + diff --git a/net-misc/openssh/files/openssh-5.4_p1-relative-AuthorizedKeysFile.patch b/net-misc/openssh/files/openssh-5.4_p1-relative-AuthorizedKeysFile.patch new file mode 100644 index 000000000000..cc992ab751d6 --- /dev/null +++ b/net-misc/openssh/files/openssh-5.4_p1-relative-AuthorizedKeysFile.patch @@ -0,0 +1,47 @@ +grab fixes from upstream for relative AuthorizedKeysFile handling + +https://bugs.gentoo.org/308939 + +Author: djm <djm> +Date: Sun Mar 21 18:53:04 2010 +0000 + + - markus@cvs.openbsd.org 2010/03/12 11:37:40 + [servconf.c] + do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths + +Author: djm <djm> +Date: Sun Mar 21 18:52:26 2010 +0000 + + - djm@cvs.openbsd.org 2010/03/12 01:06:25 + [servconf.c] + unbreak AuthorizedKeys option with a $HOME-relative path; reported by + vinschen AT redhat.com, ok dtucker@ + + +Index: servconf.c +=================================================================== +RCS file: /cvs/src/usr.bin/ssh/servconf.c,v +retrieving revision 1.204 +retrieving revision 1.206 +diff -N -u -p -r1.204 -r1.206 +--- servconf.c 4 Mar 2010 10:36:03 -0000 1.204 ++++ servconf.c 12 Mar 2010 11:37:40 -0000 1.206 +@@ -1180,7 +1180,17 @@ process_server_config_line(ServerOptions *options, cha + charptr = (opcode == sAuthorizedKeysFile) ? + &options->authorized_keys_file : + &options->authorized_keys_file2; +- goto parse_filename; ++ arg = strdelim(&cp); ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing file name.", ++ filename, linenum); ++ if (*activep && *charptr == NULL) { ++ *charptr = tilde_expand_filename(arg, getuid()); ++ /* increase optional counter */ ++ if (intptr != NULL) ++ *intptr = *intptr + 1; ++ } ++ break; + + case sClientAliveInterval: + intptr = &options->client_alive_interval; diff --git a/net-misc/openssh/openssh-5.4_p1-r1.ebuild b/net-misc/openssh/openssh-5.4_p1-r1.ebuild new file mode 100644 index 000000000000..546bd22cf59d --- /dev/null +++ b/net-misc/openssh/openssh-5.4_p1-r1.ebuild @@ -0,0 +1,224 @@ +# 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-r1.ebuild,v 1.1 2010/03/29 05:42:45 vapier Exp $ + +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" +#LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.11.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} )} + ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )} + ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_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="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} ]] && use ${1} && echo ${1} ; } + local fail=" + $(maybe_fail ldap LDAP_PATCH) + $(maybe_fail X509 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_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 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 + # 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 + else + use ldap && ewarn "Sorry, X509 and ldap don't get along, 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 + [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH} + 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 + + 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_compile() { + 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 + 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 +} |