diff options
| -rw-r--r-- | net-misc/openssh/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/openssh/Manifest | 26 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-5.9_p1-x509-glue.patch | 15 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.9_p1-r3.ebuild (renamed from net-misc/openssh/openssh-5.9_p1-r2.ebuild) | 11 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.9_p1.ebuild | 260 |
5 files changed, 38 insertions, 283 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index f6ebeda76f70..e7ad0f345830 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.425 2011/09/14 21:46:19 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.426 2011/09/26 17:04:20 vapier Exp $ + +*openssh-5.9_p1-r3 (26 Sep 2011) + + 26 Sep 2011; Mike Frysinger <vapier@gentoo.org> -openssh-5.9_p1.ebuild, + -openssh-5.9_p1-r2.ebuild, +openssh-5.9_p1-r3.ebuild, + +files/openssh-5.9_p1-x509-glue.patch: + Add x509 patch and release. *openssh-5.9_p1-r2 (14 Sep 2011) *openssh-5.8_p2-r1 (14 Sep 2011) diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 04c8240c8374..73a54e136519 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7 AUX openssh-5.2_p1-autoconf.patch 386 RMD160 8e57ae97df0b2483f826a7aba00bc0622b9a28f8 SHA1 22c4e40f54f97f866b460fe8987eb16363410caf SHA256 42bb5f23f02241186abd6158ac15cd1fba0fadb4bd79e6b051fbd05605419ebb @@ -13,6 +13,7 @@ AUX openssh-5.7_p1-x509-hpn-glue.patch 1888 RMD160 d0af977ecc3b89fc6efbd554f8bb3 AUX openssh-5.8_p1-selinux.patch 433 RMD160 ec21b74785b475264d8dece2f10102d730684f21 SHA1 db97948d0e54194ad5a00b7d08982b05c2b502b2 SHA256 0de250c75f4dae78406e5151f563bd104b8e7792a825515510e095fb47462cfd AUX openssh-5.8_p1-x509-hpn-glue.patch 1907 RMD160 954bfc141bf780e0c36712ee2f0f211bb7147e59 SHA1 a332690d47c18b2ae88a7381a177cc28a098d984 SHA256 7ab452c02b141645b764d404aa3de0754ab240a64601a6bb587919673f957682 AUX openssh-5.9_p1-sshd-gssapi-multihomed.patch 6622 RMD160 abde3019aab3c94995ffe5574dc27d250b22af82 SHA1 0c825c0ea5f37836bd6206f59953dab751f3371b SHA256 f5ae8419023d9e5f64c4273e43d60664d0079b5888ed999496038f295852e0ae +AUX openssh-5.9_p1-x509-glue.patch 569 RMD160 d23083a8e9c83587adbf22f82bedfc2714232039 SHA1 9b80ade665db278459b063097593999f518606e0 SHA256 579ef6409878cea36828057a82a37232ba230af0acb58438f020c284f06a6510 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 @@ -35,7 +36,7 @@ DIST openssh-5.8p1-hpn13v10.diff.bz2 20120 RMD160 6f7bb5bb06bfd019795679d741c007 DIST openssh-5.8p1-hpn13v11.diff.gz 22993 RMD160 45fbb8e2db2f829f2749cd745ed6a0542adb1c45 SHA1 ea61ab71605ee867eebc1a92875a3ea5369e2d28 SHA256 62b500d29d8889ce76c8b596eb65731d8ac3469d89d9c6eb29fec2a845159df7 DIST openssh-5.8p1.tar.gz 1113798 RMD160 c3903b1cf99553a8fc8d762d52c0f28db830edd0 SHA1 adebb2faa9aba2a3a3c8b401b2b19677ab53f0de SHA256 e1c77a8f3562a5e779c59d64ab14a336c160a56db924eaf82b124ac0b6b1323b DIST openssh-5.8p2.tar.gz 1115475 RMD160 f70cdb10983c389b1d6e52da522b9ff8256f1aff SHA1 64798328d310e4f06c9f01228107520adbc8b3e5 SHA256 5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314 -DIST openssh-5.9p1-hpn13v11.diff.bz2 20666 RMD160 f597b0a99297648d94f0f8723564b465af435459 SHA1 989a1f97bfae83bc850a42a3b45e0f8870a48e9d SHA256 7577dba8e44bfe8e672aabe1019646ef06717080fb2c0aca76390393e5d15574 +DIST openssh-5.9p1+x509-7.0.diff.gz 181263 RMD160 edc39eacc815909358a9abfee738ba0367225b4d SHA1 c78ed1f80412aef7b657cae490b0ac0099914105 SHA256 a28e2535ecbf95deeef682682e7551459cc494bbc1c4ccb89be93cfe826d76ca DIST openssh-5.9p1-hpn13v11.diff.gz 21971 RMD160 d22bbdcc48efb4ce0e0cc37bb7d8ff4705806f34 SHA1 3dbacf253bcbc631db7ca5eaf35cbbc8a1f3f2c3 SHA256 6a47a9e57f87385cac9a380b0b1649b73532afaf40c15f62e9236427c84e7aae DIST openssh-5.9p1.tar.gz 1110014 RMD160 12d92321a2b9f404641a9cdada738784eb30e1cd SHA1 ac4e0055421e9543f0af5da607a72cf5922dcc56 SHA256 8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5 DIST openssh-lpk-5.4p1-0.3.13.patch.gz 18105 RMD160 734b2c3ea740b6de610e3bfa91c93a2540b79acc SHA1 4c73f21b16db41c16e096db834380ec53f15c723 SHA256 4e5dbe769e487c914ecc5b104866f6d4412cbe35c3f2bed897d06f7d824878be @@ -49,24 +50,13 @@ EBUILD openssh-5.7_p1-r1.ebuild 8231 RMD160 62b3bb8b59ad675f8e15ee6f3045806eda35 EBUILD openssh-5.8_p1-r1.ebuild 8446 RMD160 e674ea00d8be3d9297c2aa5f98f0d4d8e37a360c SHA1 3bafcd521dfc16fc9d6c39e74b4bccf1bef7088d SHA256 4b385808bcf59c3be6ab92c9cea1638c61db7b4c9089f7804f606b08c0fa3aa3 EBUILD openssh-5.8_p2-r1.ebuild 8488 RMD160 669d83912882ece14fdd86617f36623d6da5e35d SHA1 09ef1958e3c8a10ee00b74f6d400f1772ae2bbaf SHA256 32ab24404531c42b8f3116c7a8094374203755b44d151ffa3c75825df57aa42d EBUILD openssh-5.8_p2.ebuild 8480 RMD160 8d931edee1e597fdeb2f3dedc2e13fd81c96b3a2 SHA1 c50d89503ea7b2b6e8c07150f67895950ce39d43 SHA256 244927dfba721ef5f0cf036619e62744a7895879e607834bb601bc5488c2c12e -EBUILD openssh-5.9_p1-r2.ebuild 8721 RMD160 a0fdca33544ee3a500734775a4e4c98c52326985 SHA1 02332554fc6c8a11bdb8053880d5da7523700cd2 SHA256 d85b9421319faa7946e58fb3753efa4eb24a68dca6427020cf0f61afaa4749b7 -EBUILD openssh-5.9_p1.ebuild 8580 RMD160 f6f6a438f23865f9c1250cc6a1ca15de4820e998 SHA1 4b6a8fd4b51ae9c9750625e44bc8031b43a6ec4b SHA256 20e17ea538144a1908299a55a1cfeb32c7c08b5c575fed9ac82aeacd772d158d -MISC ChangeLog 67254 RMD160 15039f21d212a66dfc23a1f2bd3ccf84c0c6c943 SHA1 d229da665b4373b365faef4dc069f432ecf7b203 SHA256 da041658e4fe1f2e3b0e599d1a8a1df84acf5a7eff916c7fb77bf637054bb10f +EBUILD openssh-5.9_p1-r3.ebuild 8805 RMD160 ea6fc6a3c45e2212aaf9b30a16221e3dec0ac0a2 SHA1 712be74fa34d5a339e55c477ab093935cb9bd5fc SHA256 a33b470b98739c65295ab432bf4789ffa0442b1c7411453043f88bc231a7f66e +MISC ChangeLog 67484 RMD160 507a4acdef1b1c0d43dcdef1acb29f422ff22623 SHA1 644f724c195b515c97cca7d0ecbaa855533dfdc1 SHA256 9c74f84a9b9eed3e2c29a7a9d7236f365cc701fd79f97aba34a81eba81e3fa53 MISC metadata.xml 1599 RMD160 31fdd1531a4111aa437882680029451b29ddf4aa SHA1 af53a6887ebf563150184ab40b4cc018ab4e4d3f SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOcSCwAAoJEPiazRVxLXTFXYYP/jLP7wQnAxbAC2kwY9F3z4RX -66cMXwLfLbn5IOCpC4g+/Qn+pe3Ctqm938zzyxzda5VqGK9rWIVjGW7be+c2wYED -ZGe7iPwT4drAYLEcAEQWcEMAnL3q6RB7FQ3D+1u+DKNkZmjum8MIGA62I68bBS5T -Ks5C99prOHXNAoi4Q1k4aFHNotucUWzG0rypd5dMdR/bCl5d2x9hCuVNmJMV+wQ2 -BahSgLhFp+xtuGcbuQdIEjfeStNxbZMjJE79FN7Bfr6pRAhsxt8LD0/46Z6+YT61 -I3HQmNks1qNG2CBBI25GwwfChyVG4YloXvhkeXeurqLlwYZoGd9cGBdTWgG+Mub7 -Q+uwY1G+d2bC/C+U7Qhr4UXj5L9D863vOASCq5IbPULMQ9R5QjWO/kL0NE3tvoAF -hEpSqPPZa9ulZ0XwUMFWtuJS9R19S2/iJjPIcE/JW0l27jyzyQgjT+ES+OrONGvm -LW9YXXs7+iJPcc3DlsZYE6cGGDFl2XdVAQlIGIXT8AGCto2PjH7XA4gSuwvK5wsu -xS1neAMZVFD6nk5nU3AX8iBqaLVd0vrKtzOhIu+4mAUGfzkDDE/wxYxzcr9gzGM2 -nW3CbMMQKvolnuDiYy4hugjNYbgZQdTFHqPy3vuhwRA9hy4tfafzJUsOh0+U3Qcx -qmCa4T7AcmOpW8ImkKbO -=fqHl +iF4EAREIAAYFAk6AsJoACgkQaC/OocHi7JZp5QD/XMaJEbIyvXLAHBGdMlgjSYq1 +TYTUr09MzW4XMdJ/YpEA/jvWot8jpBFUpdlYqTlndx5ADBx5zJp1AnPEQyvhfiYU +=cyNJ -----END PGP SIGNATURE----- diff --git a/net-misc/openssh/files/openssh-5.9_p1-x509-glue.patch b/net-misc/openssh/files/openssh-5.9_p1-x509-glue.patch new file mode 100644 index 000000000000..6fbb88b6716c --- /dev/null +++ b/net-misc/openssh/files/openssh-5.9_p1-x509-glue.patch @@ -0,0 +1,15 @@ +make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch + +--- openssh-5.9p1+x509-7.0.diff ++++ openssh-5.9p1+x509-7.0.diff +@@ -11995,9 +11995,9 @@ + Specifies whether challenge-response authentication is allowed (e.g. via + PAM or though authentication styles supported in + @@ -430,6 +507,16 @@ ++ This facility is provided to assist with operation on multi homed machines. + The default is + .Dq yes . +- Note that this option applies to protocol version 2 only. + +.It Cm HostbasedAlgorithms + +Specifies the protocol version 2 algorithms used in + +.Dq hostbased diff --git a/net-misc/openssh/openssh-5.9_p1-r2.ebuild b/net-misc/openssh/openssh-5.9_p1-r3.ebuild index d38240b36455..dee52c41251f 100644 --- a/net-misc/openssh/openssh-5.9_p1-r2.ebuild +++ b/net-misc/openssh/openssh-5.9_p1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r2.ebuild,v 1.1 2011/09/14 21:46:19 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.1 2011/09/26 17:04:20 vapier Exp $ EAPI="2" inherit eutils flag-o-matic multilib autotools pam @@ -11,7 +11,7 @@ PARCH=${P/_} HPN_PATCH="${PARCH}-hpn13v11.diff.gz" LDAP_PATCH="${PARCH/-/-lpk-}-0.3.14.patch.gz" -#X509_VER="7.0" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" +X509_VER="7.0" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.org/" @@ -23,7 +23,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz LICENSE="as-is" SLOT="0" -#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509" RDEPEND="pam? ( virtual/pam ) @@ -76,7 +76,11 @@ src_prepare() { # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + epatch "${FILESDIR}"/${PN}-5.9_p1-sshd-gssapi-multihomed.patch #378361 if use X509 ; then + pushd .. >/dev/null + epatch "${FILESDIR}"/${PN}-5.9_p1-x509-glue.patch + popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} epatch "${FILESDIR}"/${PN}-5.8_p1-x509-hpn-glue.patch fi @@ -91,7 +95,6 @@ src_prepare() { else use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP" fi - epatch "${FILESDIR}"/${PN}-5.9_p1-sshd-gssapi-multihomed.patch #378361 epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex if [[ -n ${HPN_PATCH} ]] && use hpn; then epatch "${WORKDIR}"/${HPN_PATCH%.*} diff --git a/net-misc/openssh/openssh-5.9_p1.ebuild b/net-misc/openssh/openssh-5.9_p1.ebuild deleted file mode 100644 index a409f873c17c..000000000000 --- a/net-misc/openssh/openssh-5.9_p1.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1.ebuild,v 1.2 2011/09/07 03:33:26 vapier 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}-hpn13v11.diff.bz2" -#LDAP_PATCH="${PARCH/-/-lpk-}-0.3.14.patch.gz" -#X509_VER="7.0" 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} )} - " - -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_PATCH:++}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 )" - -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) - " - 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 - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - if use X509 ; then - epatch "${WORKDIR}"/${X509_PATCH%.*} - epatch "${FILESDIR}"/${PN}-5.8_p1-x509-hpn-glue.patch - fi - if ! use X509 ; then - if [[ -n ${LDAP_PATCH} ]] && use ldap ; then - epatch "${WORKDIR}"/${LDAP_PATCH%.*} - #epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654 - merged - # 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.9_p1-sshd-gssapi-multihomed.patch #378361 - epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex - if [[ -n ${HPN_PATCH} ]] && use hpn; then - epatch "${WORKDIR}"/${HPN_PATCH%.*} - epatch "${FILESDIR}"/${PN}-5.6_p1-hpn-progressmeter.patch - # version.h patch conflict avoidence - mv version.h version.h.hpn - cp -f version.h.pristine version.h - # The AES-CTR multithreaded variant is broken, and causes random hangs - # when combined background threading and control sockets. To avoid - # this, we change the internal table to use the non-multithread version - # for the meantime. Do NOT remove this in new versions. See bug #354113 - # comment #6 for testcase. - # Upstream reference: http://www.psc.edu/networking/projects/hpn-ssh/ - ## Additionally, the MT-AES-CTR mode cipher replaces the default ST-AES-CTR mode - ## cipher. Be aware that if the client process is forked using the -f command line - ## option the process will hang as the parent thread gets 'divorced' from the key - ## generation threads. This issue will be resolved as soon as possible - sed -i \ - -e '/aes...-ctr.*SSH_CIPHER_SSH2/s,evp_aes_ctr_mt,evp_aes_128_ctr,' \ - cipher.c || die - fi - - 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 - ( - sed '/^#define SSH_RELEASE/d' version.h.* | sort -u - printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s %s\n' \ - "$([ -e version.h.hpn ] && echo SSH_HPN)" \ - "$([ -e version.h.lpk ] && echo SSH_LPK)" - ) > 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) -} - -src_install() { - emake install-nokeys DESTDIR="${D}" || die - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id || die - newinitd "${FILESDIR}"/sshd.rc6.3 sshd - newconfd "${FILESDIR}"/sshd.confd sshd - keepdir /var/empty - - # not all openssl installs support ecc, or are functional #352645 - if ! grep -q '#define OPENSSL_HAS_ECC 1' config.h ; then - dosed 's:&& gen_key ecdsa::' /etc/init.d/sshd || die - fi - - 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 - - elog "Starting with openssh-5.8p1, the server will default to a newer key" - elog "algorithm (ECDSA). You are encouraged to manually update your stored" - elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." - echo - 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 -} |