From 0fbeb45059220e8a3af915b1c9c2f62eaed93532 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 19 Feb 2008 22:52:44 +0000 Subject: [PATCH] Add a new revision with pambase's system-remote-login as base stack. Now also prints motd when using PAM. Package-Manager: portage-2.1.4.4 --- net-misc/openssh/ChangeLog | 9 +- net-misc/openssh/Manifest | 14 +- net-misc/openssh/files/sshd.pam_include.2 | 4 + net-misc/openssh/openssh-4.7_p1-r20.ebuild | 162 +++++++++++++++++++++ 4 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 net-misc/openssh/files/sshd.pam_include.2 create mode 100644 net-misc/openssh/openssh-4.7_p1-r20.ebuild diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index a247660193bc..52097f0b853d 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.277 2008/02/12 11:32:31 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.278 2008/02/19 22:52:43 flameeyes Exp $ + +*openssh-4.7_p1-r20 (19 Feb 2008) + + 19 Feb 2008; Diego Pettenò + +files/sshd.pam_include.2, +openssh-4.7_p1-r20.ebuild: + Add a new revision with pambase's system-remote-login as base stack. Now + also prints motd when using PAM. 12 Feb 2008; Santiago M. Mola openssh-4.7_p1-r3.ebuild: diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 4810146463e3..bdbada0ba5e8 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b AUX openssh-4.0_p1-smartcard-ldap-happy.patch 545 RMD160 2287950de3385bdffaf6af8eec8b355358891ef1 SHA1 8f24acbab71b677b81d5108a85eaf88a208b3b86 SHA256 c6a6f82dd9d5fe34310e2a2bd82558809d28b29cad6e8f0b4a1c3f232ded67be AUX openssh-4.3_p1-chroot.patch 1034 RMD160 5971fa1466fd9817a8ec811329a8129fcd651bec SHA1 f580aa1a180397b422193c3ebb4cc69eaa7007a0 SHA256 ccedff9ba82db6782ff80cfcafa6bd1dc754f564e61a4e789b792aaa6b3d4fc3 @@ -16,6 +19,7 @@ AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0 AUX sshd.pam 294 RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d SHA1 4cd17fb40793fa9ca77ac93698129f2c8cafd7b8 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f AUX sshd.pam_include 205 RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 SHA1 122472d859c24f7c776bb10fbfcb0221146ed056 SHA256 8d59135e96f4eff6b80c143b82cced7beb0bbca19ff91b479f1ba92916243d5e AUX sshd.pam_include.1 205 RMD160 3051b92836a496c7c431f41585de688f7c9f51a7 SHA1 b9eca146fcea016b7146f1ac11cf3d072d887b27 SHA256 3185075821bb1f76cdc584c28f690a7338f8db5489d5fce73fe4bcbbfd3dfbfa +AUX sshd.pam_include.2 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c AUX sshd.rc6 2114 RMD160 e7e863b74a6020cacb66dffa11bbbd65a16a981d SHA1 2f119b21235c11317929bbaf10c00086a8f1995e SHA256 5322ab65851fb206baa6f45dc182c6d79f4a58c60cbceeb9c5a1562ff4fa5d76 DIST openssh-4.4p1+SecurID_v1.3.2.patch 48240 RMD160 45d5734f7e65709cce581f1f85c06f60a73b825b SHA1 10bece428f6f36a0bb59b8fe9b9fb4321b544fa5 SHA256 189ad59139d86e5c808650add131af20ade00439713c3abcfac9a4e53580a196 DIST openssh-4.4p1+x509-5.5.1.diff.gz 137417 RMD160 34cf39583e8c01bb055671a540c7463f45134960 SHA1 091e7499726fce527afeb66fffaf6ee48f4ac4bb SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded @@ -41,7 +45,15 @@ EBUILD openssh-4.5_p1-r2.ebuild 5351 RMD160 2d9ab01d5edb40948ef2e6944605a039b25d EBUILD openssh-4.6_p1-r3.ebuild 5390 RMD160 f55f1ca226614f0ccf4c0dae04e3b9c1b1e6de0d SHA1 4cc45457fcfd102e85f7f7bc788258d41a0973c5 SHA256 22882343c576b93e21f2dbe241896dd95837ff464e487c1f000269fdbb077db7 EBUILD openssh-4.6_p1-r4.ebuild 4941 RMD160 3b7c3b3d47c2e67d931535ac15eb5ac8f7595d8e SHA1 671163ec26a3ba32fc28d259a8847d41ab55e380 SHA256 c7b6bbe53c6cc52d2c06fc13019849f3d7ef7f31a92b0665bd6a990d705e5a21 EBUILD openssh-4.7_p1-r1.ebuild 4842 RMD160 1a0c28d9ab7cebeb41794f8c2eb660d2d6807cdd SHA1 e90fccca1016d956fa662f53c72feffa7e3012a3 SHA256 d3644f302db1f719effa2efb7fb23a7aecb0d143c978c854461469c291832f72 +EBUILD openssh-4.7_p1-r20.ebuild 4848 RMD160 4a5c509a1c3bb09224bc67507d204aa0dd771498 SHA1 20e78d1b9b2a96faa1b43547c151ab8d708ae6c5 SHA256 e1726af0e7c89b3e566a97fdc679d725a3caf79e23d3cc5ad45181245bd00eb9 EBUILD openssh-4.7_p1-r3.ebuild 4915 RMD160 476b83968de74e338684b195fd802a51e5ed41c4 SHA1 ab3ad38c5982893ecca9f8fbd2e2406b01c9406b SHA256 d3bf81a534bd09c6f64050f86cdc16d2322536c8532399b750dbe28ab43b9db3 EBUILD openssh-4.7_p1-r4.ebuild 4924 RMD160 7b8cf4cd131feecfd333871243233a714e68d91b SHA1 529fa15a45bebb268930ef901173579a3a801d2b SHA256 b566cc678a34530f17f0ef385c47e8867286f6647874e78c03fce995a571e551 -MISC ChangeLog 43434 RMD160 dfd19d815cfc3c91daad9b7f6d5da58e0f8951b8 SHA1 9ea69399bb49aaa5b9a0f33feb86e1f2ff211237 SHA256 62615ca4f7fde8f7af58ea5cf05c7908ba421bac5fb24299bf61a4e36cfbd948 +MISC ChangeLog 43691 RMD160 651d604ff87511748a55028aade7ffdc329cde51 SHA1 fbf1b9194d7b0732c5fa559c1bc7d3d69f03403d SHA256 766f59458576ed775642a9dee11b1b007246461418e6ffe2a0c9487a94524a30 MISC metadata.xml 1150 RMD160 4b6c978959df7998b2d7b22ea9dee0fbc9b37fc5 SHA1 2b319d9ed51a8a7a30d37bd4ad55484704355b31 SHA256 ad8ada6ce7414bd3ce222b80899c15998026c7184524b15cb0a8f18097a52d5c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHu13BAiZjviIA2XgRAsG6AKCgcIy54vypReh9HtlJaAzHz671PACgg1pI +tgHwo3xDfTdzFVBFUr5JpAU= +=tEWb +-----END PGP SIGNATURE----- diff --git a/net-misc/openssh/files/sshd.pam_include.2 b/net-misc/openssh/files/sshd.pam_include.2 new file mode 100644 index 000000000000..b801aaafa0f9 --- /dev/null +++ b/net-misc/openssh/files/sshd.pam_include.2 @@ -0,0 +1,4 @@ +auth include system-remote-login +account include system-remote-login +password include system-remote-login +session include system-remote-login diff --git a/net-misc/openssh/openssh-4.7_p1-r20.ebuild b/net-misc/openssh/openssh-4.7_p1-r20.ebuild new file mode 100644 index 000000000000..2327d9cc3435 --- /dev/null +++ b/net-misc/openssh/openssh-4.7_p1-r20.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r20.ebuild,v 1.1 2008/02/19 22:52:43 flameeyes Exp $ + +inherit eutils flag-o-matic ccc multilib autotools pam + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_/} + +X509_PATCH="${PARCH}+x509-6.1.diff.gz" +LDAP_PATCH="${PARCH/openssh-4.7/openssh-lpk-4.6}-0.3.9.patch" +HPN_PATCH="${PARCH}-hpn13v1.diff.gz" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="http://www.openssh.org/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} ) + X509? ( http://roumenpetrov.info/openssh/x509-6.1/${X509_PATCH} ) + hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="" +IUSE="static pam tcpd kerberos skey selinux chroot X509 ldap smartcard hpn libedit X" + +RDEPEND="pam? ( >=sys-auth/pambase-20080219.1 ) + kerberos? ( virtual/krb5 ) + selinux? ( >=sys-libs/libselinux-1.28 ) + skey? ( >=app-admin/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 + smartcard? ( dev-libs/opensc ) + 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" +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 X509 X509_PATCH) + $(maybe_fail ldap LDAP_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 + + use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-4.7_p1-x509-hpn-glue.patch + use chroot && epatch "${FILESDIR}"/openssh-4.3_p1-chroot.patch + use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch + if ! use X509 ; then + if [[ -n ${LDAP_PATCH} ]] && use ldap ; then + epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${PN}-4.4_p1-ldap-hpn-glue.patch + fi + elif use ldap ; then + ewarn "Sorry, X509 and ldap don't get along, disabling ldap" + fi + [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH} + epatch "${FILESDIR}"/${P}-GSSAPI-dns.patch #165444 + + sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die + + eautoreconf +} + +src_compile() { + addwrite /dev/ptmx + addpredict /etc/skey/skeykeys #skey configure code triggers this + + local myconf="" + if use static ; then + append-ldflags -static + use pam && ewarn "Disabling pam support becuse of static flag" + myconf="${myconf} --without-pam" + else + myconf="${myconf} $(use_with pam)" + fi + + econf \ + --with-ldflags="${LDFLAGS}" \ + --disable-strip \ + --sysconfdir=/etc/ssh \ + --libexecdir=/usr/$(get_libdir)/misc \ + --datadir=/usr/share/openssh \ + --disable-suid-ssh \ + --with-privsep-path=/var/empty \ + --with-privsep-user=sshd \ + --with-md5-passwords \ + --with-ssl-engine \ + $(use_with ldap) \ + $(use_with libedit) \ + $(use_with kerberos kerberos5 /usr) \ + $(use_with tcpd tcp-wrappers) \ + $(use_with selinux) \ + $(use_with skey) \ + $(use_with smartcard opensc) \ + ${myconf} \ + || die "bad configure" + emake || die "compile problem" +} + +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 + use pam \ + && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \ + && dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + diropts -m 0700 + dodir /etc/skel/.ssh +} + +pkg_postinst() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd + + # help fix broken perms caused by older ebuilds. + # can probably cut this after the next stage release. + chmod u+x "${ROOT}"/etc/skel/.ssh >& /dev/null + + ewarn "Remember to merge your config files in /etc/ssh/ and then" + ewarn "restart sshd: '/etc/init.d/sshd restart'." + 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 +} -- 2.26.2