Bump for a non bash init script.

Package-Manager: portage-2.1.2-r10

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 04f7ab0653eb8e380e92a7e941c4d7eb30ea9122..28e475c61bdc1e54d2992555dfda137cd3f4779f 100644 (file)
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.230 2007/01/08 19:36:38 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.231 2007/02/23 10:51:48 uberlord Exp $
+
+*openssh-4.5_p1-r1 (23 Feb 2007)
+
+  23 Feb 2007; Roy Marples <uberlord@gentoo.org> files/sshd.rc6,
+  +openssh-4.5_p1-r1.ebuild:
+  Bump for a non bash init script.
 
   08 Jan 2007; Michael Cummings <mcummings@gentoo.org>
   openssh-4.5_p1.ebuild:

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 9d27ed84a5c8dee81f6c44ebe826767112f94ebd..5adaa5f4ec33072e2e940f56fbd3ca6d972142d1 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openssh-3.9_p1-chroot.patch 3026 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 SHA1 78f85bc81c0034e03d06dd3c7ab91b9210fc18fb SHA256 014158a32c707b2a79ac606aeefb6bc09f24c3f07ce5df353ddad96095518597
 MD5 c4edd6a7aa1418ce5bf74aeb46627dbf files/openssh-3.9_p1-chroot.patch 3026
 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 files/openssh-3.9_p1-chroot.patch 3026
@@ -153,10 +150,10 @@ AUX sshd.pam_include 205 RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 SHA1 12
 MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205
 RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 files/sshd.pam_include 205
 SHA256 8d59135e96f4eff6b80c143b82cced7beb0bbca19ff91b479f1ba92916243d5e files/sshd.pam_include 205
-AUX sshd.rc6 2028 RMD160 a626fcde615a03deb4cc10a1b8c649b5f2a94b54 SHA1 24e2d25d4108d13343d2e6c95d89532ce091e4a2 SHA256 6db92d598df11c80cf831d145a22f096155b19d5b10b16e158a3498593a612df
-MD5 77fb0c5962401fe925059b91f16605cd files/sshd.rc6 2028
-RMD160 a626fcde615a03deb4cc10a1b8c649b5f2a94b54 files/sshd.rc6 2028
-SHA256 6db92d598df11c80cf831d145a22f096155b19d5b10b16e158a3498593a612df files/sshd.rc6 2028
+AUX sshd.rc6 2046 RMD160 68df8ff7933b7a232882b2a6140fe1a2637609b6 SHA1 c3f74dbd764d570f69e60f18a081f19e3cefb037 SHA256 6569cb934cb1d5b9016c2828ff8c79b5c8477dd27b7078c609445cfc16692e9e
+MD5 c3acc27dddafb1e8c6d437e668e08c25 files/sshd.rc6 2046
+RMD160 68df8ff7933b7a232882b2a6140fe1a2637609b6 files/sshd.rc6 2046
+SHA256 6569cb934cb1d5b9016c2828ff8c79b5c8477dd27b7078c609445cfc16692e9e files/sshd.rc6 2046
 DIST openssh-3.9p1+x509-5.3.diff.gz 126331 RMD160 7b33dc161664f7bc155a19a09c603b1938924b75 SHA1 9ba617a24da8ac9177e96863cbb05b591e37c457 SHA256 4d1a8cc0a40d45a3e8f5ffa3fa70ad8d5b4141adf0e04c1643acf30ff80899df
 DIST openssh-3.9p1-hpn11.diff 13237 RMD160 02e9a3c12e289ef7dea5b7d81ec5b2e06580b7d0 SHA1 a3140a0a206bdbcad91f6379ed3d0c596167b464 SHA256 ce83e3c38fe79c85f371e8e1a47d45085dd08b7e4604f7291264e36d9ebb35fe
 DIST openssh-3.9p1.tar.gz 854027 RMD160 e4abf280a18e3ae046d0dee19dab919bba8e5568 SHA1 80b19d83a9d4717f5c38b2d950501e1471f60afc SHA256 e119eb9b09c13ddd945a0105f19b05983e62de0bac167264f055f93115048090
@@ -212,14 +209,18 @@ EBUILD openssh-4.4_p1-r6.ebuild 5421 RMD160 ec6b6eb9c861f814a1b18805f3315ccab1b7
 MD5 51264a3c25579caa0bcfabbdbccc36a8 openssh-4.4_p1-r6.ebuild 5421
 RMD160 ec6b6eb9c861f814a1b18805f3315ccab1b7be33 openssh-4.4_p1-r6.ebuild 5421
 SHA256 b49ca4b6f13e9b917e673729d9cbbe511d7964cc546417a7aa427b8486a4b669 openssh-4.4_p1-r6.ebuild 5421
+EBUILD openssh-4.5_p1-r1.ebuild 5351 RMD160 4cc7d7d708e8852284c42380fa2b4ffc7585d690 SHA1 87ab3f8e36eb18bd9b78951c2266c389c4c2a79b SHA256 59d5b6b374a8fdc7ee8641396ff21f3a5a59e082c91b4ded7ba4a89dbdf88506
+MD5 fd286fb261a251ec24a1903983c6a92d openssh-4.5_p1-r1.ebuild 5351
+RMD160 4cc7d7d708e8852284c42380fa2b4ffc7585d690 openssh-4.5_p1-r1.ebuild 5351
+SHA256 59d5b6b374a8fdc7ee8641396ff21f3a5a59e082c91b4ded7ba4a89dbdf88506 openssh-4.5_p1-r1.ebuild 5351
 EBUILD openssh-4.5_p1.ebuild 5350 RMD160 6d40a35a0bee3b9f2c1463862577add3fec79015 SHA1 7de1fab3dcbbc441502bed42a60b1eb0f21aac3a SHA256 74de4db846c5251d5ff87853aac67bce589d62e49fb1ea4c082bd9c40c3ec4cf
 MD5 5765ff0b2c4d25a3d86a87605017d155 openssh-4.5_p1.ebuild 5350
 RMD160 6d40a35a0bee3b9f2c1463862577add3fec79015 openssh-4.5_p1.ebuild 5350
 SHA256 74de4db846c5251d5ff87853aac67bce589d62e49fb1ea4c082bd9c40c3ec4cf openssh-4.5_p1.ebuild 5350
-MISC ChangeLog 36354 RMD160 9570550a53ce23415c1f58a838f1a07cfe37a97a SHA1 393cfcf5a22d57bbbddf580620d4ab196041a9a3 SHA256 ee57686a6196ed4a4764fdeba6c4d2b19eda8ac4bc342659ac9d984d9236251e
-MD5 5bffc4f166411b9cbec67d38495ec8ea ChangeLog 36354
-RMD160 9570550a53ce23415c1f58a838f1a07cfe37a97a ChangeLog 36354
-SHA256 ee57686a6196ed4a4764fdeba6c4d2b19eda8ac4bc342659ac9d984d9236251e ChangeLog 36354
+MISC ChangeLog 36517 RMD160 f7a6bdb46cc4f7668b9bde915fe36928897f7218 SHA1 937a1529ed35e45bf13f4c8b31ff14eec7d994aa SHA256 2366a43831c8de05867830b13f0a06dc01cb8bdf58dbb22e671a385678a4c847
+MD5 8aee8e3627b8b09e2c103de2add32ec1 ChangeLog 36517
+RMD160 f7a6bdb46cc4f7668b9bde915fe36928897f7218 ChangeLog 36517
+SHA256 2366a43831c8de05867830b13f0a06dc01cb8bdf58dbb22e671a385678a4c847 ChangeLog 36517
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -245,10 +246,6 @@ SHA256 81ff3d47e3f63ad4d4c31f6208d7926654b98b6a7cf6d3b937847faae6117d0e files/di
 MD5 f1d7598b82baea77e138e61e56e6e905 files/digest-openssh-4.5_p1 1331
 RMD160 66afd243ecdb5e49859b5f12b27ee876c4186514 files/digest-openssh-4.5_p1 1331
 SHA256 86a17c74dd503363c30085c75f7cc17bda20da889e93d61d59446589992cc08b files/digest-openssh-4.5_p1 1331
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFop1MtG5z4I8BtQoRAnAYAJ90NHK9B14PCJd7hyZs59PfdpACBgCeITZ6
-0SwMZJ46dCFIil9LeiqpTyM=
-=9rwz
------END PGP SIGNATURE-----
+MD5 f1d7598b82baea77e138e61e56e6e905 files/digest-openssh-4.5_p1-r1 1331
+RMD160 66afd243ecdb5e49859b5f12b27ee876c4186514 files/digest-openssh-4.5_p1-r1 1331
+SHA256 86a17c74dd503363c30085c75f7cc17bda20da889e93d61d59446589992cc08b files/digest-openssh-4.5_p1-r1 1331

diff --git a/net-misc/openssh/files/digest-openssh-4.5_p1-r1 b/net-misc/openssh/files/digest-openssh-4.5_p1-r1
new file mode 100644 (file)
index 0000000..a7ab52f
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.5_p1-r1
@@ -0,0 +1,15 @@
+MD5 4a374fe5f6c353bc051b00781de8067c openssh-4.4p1+SecurID_v1.3.2.patch 48240
+RMD160 45d5734f7e65709cce581f1f85c06f60a73b825b openssh-4.4p1+SecurID_v1.3.2.patch 48240
+SHA256 189ad59139d86e5c808650add131af20ade00439713c3abcfac9a4e53580a196 openssh-4.4p1+SecurID_v1.3.2.patch 48240
+MD5 9a7987815f6901150f843dd21d8a339e openssh-4.5p1+x509-5.5.2.diff.gz 137561
+RMD160 2e7597bc97d634ecc3d434cc714cc5b1d4076fec openssh-4.5p1+x509-5.5.2.diff.gz 137561
+SHA256 580b9b2be2a5224852f9979180fa9570059c1aa398b908dc1907d2a5a5e1f4a2 openssh-4.5p1+x509-5.5.2.diff.gz 137561
+MD5 86d3751f777c9c99663aebbb36281a0e openssh-4.5p1-hpn12v14.diff.gz 15791
+RMD160 1f937174d5418d578da5d9dfab16b5cc8960efc5 openssh-4.5p1-hpn12v14.diff.gz 15791
+SHA256 5cc6cd882cbb94498483b44722b3e81c8e6d7854dc2b2c57e1d56040bfdc23bd openssh-4.5p1-hpn12v14.diff.gz 15791
+MD5 6468c339886f78e8a149b88f695839dd openssh-4.5p1.tar.gz 965925
+RMD160 3f70b6f4228e84c7b9b8b3bee7fd3875f3e3bad3 openssh-4.5p1.tar.gz 965925
+SHA256 7046b9d372f9e31ca654a66492310c188470480ddab300eb715dbf5e2177ae55 openssh-4.5p1.tar.gz 965925
+MD5 4db76f98b1ecbcff2bda11ff8050ad71 openssh-lpk-4.4p1-0.3.7.patch 61187
+RMD160 90b0bbe07a3617f6eecb9f77c1a38c5f4dd4dcaf openssh-lpk-4.4p1-0.3.7.patch 61187
+SHA256 c74aa642b4b2eeceb0c3f554752d172f8d5a7cd30f2aae517e93ef3bf1bd24e7 openssh-lpk-4.4p1-0.3.7.patch 61187

diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6
index 3adb9cf076c0818113facb90f4552db37a39d1bb..258c3a3f1baff61bfb6e212ca02a4ec5651dc31c 100644 (file)
--- a/net-misc/openssh/files/sshd.rc6
+++ b/net-misc/openssh/files/sshd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.21 2006/10/14 11:04:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.22 2007/02/23 10:51:48 uberlord Exp $
 
 opts="reload"
 
@@ -15,11 +15,11 @@ SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid}
 SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd}
 
 checkconfig() {
-       if [[ ! -d /var/empty ]] ; then
+       if [ ! -d /var/empty ] ; then
                mkdir -p /var/empty || return 1
        fi
 
-       if [[ ! -e ${SSHD_CONFDIR}/sshd_config ]] ; then
+       if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then
                eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd"
                eerror "There is a sample file in /usr/share/doc/openssh"
                return 1
@@ -27,50 +27,50 @@ checkconfig() {
 
        gen_keys || return 1
 
-       ${SSHD_BINARY} -t ${myopts} || return 1
+       "${SSHD_BINARY}" -t ${myopts} || return 1
 }
 
 gen_keys() {
-       if [[ ! -e ${SSHD_CONFDIR}/ssh_host_key ]] ; then
+       if [ ! -e "${SSHD_CONFDIR}"/ssh_host_key ] ; then
                einfo "Generating Hostkey..."
-               /usr/bin/ssh-keygen -t rsa1 -b 1024 -f ${SSHD_CONFDIR}/ssh_host_key -N '' || return 1
+               /usr/bin/ssh-keygen -t rsa1 -b 1024 -f "${SSHD_CONFDIR}"/ssh_host_key -N '' || return 1
        fi
-       if [[ ! -e ${SSHD_CONFDIR}/ssh_host_dsa_key ]] ; then
+       if [ ! -e "${SSHD_CONFDIR}"/ssh_host_dsa_key ] ; then
                einfo "Generating DSA-Hostkey..."
-               /usr/bin/ssh-keygen -d -f ${SSHD_CONFDIR}/ssh_host_dsa_key -N '' || return 1
+               /usr/bin/ssh-keygen -d -f "${SSHD_CONFDIR}"/ssh_host_dsa_key -N '' || return 1
        fi
-       if [[ ! -e ${SSHD_CONFDIR}/ssh_host_rsa_key ]] ; then
+       if [ ! -e "${SSHD_CONFDIR}"/ssh_host_rsa_key ] ; then
                einfo "Generating RSA-Hostkey..."
-               /usr/bin/ssh-keygen -t rsa -f ${SSHD_CONFDIR}/ssh_host_rsa_key -N '' || return 1
+               /usr/bin/ssh-keygen -t rsa -f "${SSHD_CONFDIR}"/ssh_host_rsa_key -N '' || return 1
        fi
        return 0
 }
 
 start() {
        local myopts=""
-       [[ ${SSHD_PIDFILE} != "/var/run/sshd.pid" ]] \
+       [ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
                && myopts="${myopts} -o PidFile=${SSHD_PIDFILE}"
-       [[ ${SSHD_CONFDIR} != "/etc/ssh" ]] \
+       [ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
                && myopts="${myopts} -f ${SSHD_CONFDIR}/sshd_config"
 
        checkconfig || return 1
        ebegin "Starting ${SVCNAME}"
-       start-stop-daemon --start --exec ${SSHD_BINARY} \
-           --pidfile ${SSHD_PIDFILE} \
+       start-stop-daemon --start --exec "${SSHD_BINARY}" \
+           --pidfile "${SSHD_PIDFILE}" \
            -- ${myopts} ${SSHD_OPTS}
        eend $?
 }
 
 stop() {
        ebegin "Stopping ${SVCNAME}"
-       start-stop-daemon --stop --quiet \
-           --exec ${SSHD_BINARY} --pidfile ${SSHD_PIDFILE}
+       start-stop-daemon --stop --exec "${SSHD_BINARY}" \
+           --pidfile "${SSHD_PIDFILE}" --quiet
        eend $?
 }
 
 reload() {
        ebegin "Reloading ${SVCNAME}"
        start-stop-daemon --stop --signal HUP --oknodo \
-           --exec ${SSHD_BINARY} --pidfile ${SSHD_PIDFILE}
+           --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
        eend $?
 }

diff --git a/net-misc/openssh/openssh-4.5_p1-r1.ebuild b/net-misc/openssh/openssh-4.5_p1-r1.ebuild
new file mode 100644 (file)
index 0000000..4370aa2
--- /dev/null
+++ b/net-misc/openssh/openssh-4.5_p1-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.5_p1-r1.ebuild,v 1.1 2007/02/23 10:51:48 uberlord Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+# Please leave pam at end, so that dopamd and newpamd from eutils eclass are not used
+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-5.5.2.diff.gz"
+SECURID_PATCH="${PARCH/4.5/4.4}+SecurID_v1.3.2.patch"
+LDAP_PATCH="${PARCH/-4.5p1/-lpk-4.4p1}-0.3.7.patch"
+HPN_PATCH="${PARCH}-hpn12v14.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+       X509? ( http://roumenpetrov.info/openssh/x509-5.5.2/${X509_PATCH} )
+       ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )
+       hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
+       smartcard? ( http://omniti.com/~jesus/projects/${SECURID_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="static pam tcpd kerberos skey selinux chroot X509 ldap smartcard hpn libedit X"
+
+RDEPEND="pam? ( virtual/pam )
+       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
+       local fail=""
+       [[ -z ${X509_PATCH}        ]] && use X509          && fail="${fail} X509"
+       [[ -z ${SECURID_PATCH} ]] && use smartcard && fail="${fail} smartcard"
+       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.4_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 ${SECURID_PATCH} ]] && use smartcard ; then
+                       epatch "${DISTDIR}"/${SECURID_PATCH} \
+                               "${FILESDIR}"/${PN}-4.3_p2-securid-updates.patch \
+                               "${FILESDIR}"/${PN}-4.3_p2-securid-hpn-glue.patch
+                       use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
+               fi
+               if use ldap ; then
+                       epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${PN}-4.4_p1-ldap-hpn-glue.patch
+               fi
+       elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
+               ewarn "Sorry, X509 and smartcard/ldap don't get along, disabling smartcard/ldap"
+       fi
+       [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
+
+       sed -i '/LD.*ssh-keysign/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid"
+
+       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 \
+               $(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 sshd
+       dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
+       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
+}
+
+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 "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
+}