Grab updated HPN patch to fix -C issues #153854.

Package-Manager: portage-2.1.2_rc1-r2

5 files changed, 269 insertions, 13 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index c12fdb68e1e7..248241d9eda5 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.217 2006/11/01 14:39:29 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.218 2006/11/03 03:49:47 vapier Exp $
+
+*openssh-4.4_p1-r6 (03 Nov 2006)
+
+  03 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-4.4_p1-ldap-hpn-glue.patch, +openssh-4.4_p1-r6.ebuild:
+  Grab updated HPN patch to fix -C issues #153854.
 
   01 Nov 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   openssh-4.4_p1-r5.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index f46587934e56..14e9c47eb9d3 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-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
@@ -122,6 +125,10 @@ AUX openssh-4.3_p2-x509-hpn-glue.patch 1137 RMD160 97e52373a1513cd0befb54dfe71fc
 MD5 321fae6531f66e344a2271b909e958ee files/openssh-4.3_p2-x509-hpn-glue.patch 1137
 RMD160 97e52373a1513cd0befb54dfe71fc2750015ca16 files/openssh-4.3_p2-x509-hpn-glue.patch 1137
 SHA256 0a240dd6a689f76bb3812294b47c201677747470200627dc15f88b020e493344 files/openssh-4.3_p2-x509-hpn-glue.patch 1137
+AUX openssh-4.4_p1-ldap-hpn-glue.patch 1538 RMD160 eba0400a328f23b9329429d2da65b80ead546d4d SHA1 7190e861e8be4f03ae42ad43ba1770fdca95d46a SHA256 63e9f729fbb40babdf5cd2b4d87f4d1cb5a9aaed60bf7a8c072c22f9a6fb36ab
+MD5 92fc9d4dc7c7dbc67eabe2e98bde325f files/openssh-4.4_p1-ldap-hpn-glue.patch 1538
+RMD160 eba0400a328f23b9329429d2da65b80ead546d4d files/openssh-4.4_p1-ldap-hpn-glue.patch 1538
+SHA256 63e9f729fbb40babdf5cd2b4d87f4d1cb5a9aaed60bf7a8c072c22f9a6fb36ab files/openssh-4.4_p1-ldap-hpn-glue.patch 1538
 AUX openssh-4.4_p1-x509-hpn-glue.patch 1150 RMD160 2611c11db0da936ec5a0e688f6d765cb4f332a80 SHA1 7adebc924a8ae72e14783f5ca7d77378cd227cb6 SHA256 3020a88840e17a269a6943f9bc5636110248a66c55dd8d7254cc9ed8596ba97f
 MD5 a40fa969555fb5713b9b2a14fe46d302 files/openssh-4.4_p1-x509-hpn-glue.patch 1150
 RMD160 2611c11db0da936ec5a0e688f6d765cb4f332a80 files/openssh-4.4_p1-x509-hpn-glue.patch 1150
@@ -175,7 +182,7 @@ DIST openssh-4.3p2-hpn12-gentoo.patch.bz2 13642 RMD160 34fd5390d602a9ab99edb2575
 DIST openssh-4.3p2.tar.gz 941455 RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 SHA1 2b5b0751fd578283ba7b106025c0ba391fd72f1f SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f
 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
-DIST openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675 RMD160 340aaed711bb58a39fe36ebbd47ba1f1e7e304c1 SHA1 f8fe308e338c186563cfce7aa7689a4c810ae6d5 SHA256 dfa55376bbd11f6688cc0f228f8dff1175ab985bf80267630bbe38f0c9be261d
+DIST openssh-4.4p1-hpn12v13.diff.gz 15392 RMD160 b057f9a1068ddce106a94465953bdac58d0ffac8 SHA1 00a677a7dd75c98db14a91814da49b8fd7b7d814 SHA256 2e3c6a108072eb9de3330cda8639b8c54845174e3a4691a895d06d5cbf221245
 DIST openssh-4.4p1.tar.gz 1044334 RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc SHA1 6a52b1dee1c2c9862923c0008d201d98a7fd9d6c SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac
 DIST openssh-lpk-3.9p1-0.3.6.patch 60920 RMD160 0fdde5cf35e1fe59a428d330509f6964ff3402ed SHA1 cd0e8f4a9826e2883f5fc4cce41a761750657414 SHA256 f4732659ec8e222a8d80741a8e7975ffde089ab985fcad3c986d087732de7c33
 DIST openssh-lpk-4.0p1-0.3.6.patch 60557 RMD160 da57dcc8078c127abea0dc4017399cd5c3f8eee2 SHA1 f0fa0cfa6505b12da250a25115839210138defbc SHA256 61b244eb4c15db9c1a9b575be23afcbe6a30a248a2abbda0de18f0791842dbad
@@ -222,14 +229,14 @@ EBUILD openssh-4.3_p2-r5.ebuild 5957 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2
 MD5 8b4bf9176c47593391f6a25cf40ee932 openssh-4.3_p2-r5.ebuild 5957
 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2f65b openssh-4.3_p2-r5.ebuild 5957
 SHA256 beb5826bd7e1fc08ddfead5d5fa2114cf653fde315cc0264219373ea480e848c openssh-4.3_p2-r5.ebuild 5957
-EBUILD openssh-4.4_p1-r5.ebuild 5455 RMD160 26895166eb578b790fc3e9d388ee43ddb02b1a14 SHA1 499b622131e94a84d66103a6029702b8ae3623d3 SHA256 9ffd3c4276e87a4b502e3516f485caeabb68a6d127f5ed4e2e4315025731f6c9
-MD5 0e51ed7f658ae353bc0a4db1239789b8 openssh-4.4_p1-r5.ebuild 5455
-RMD160 26895166eb578b790fc3e9d388ee43ddb02b1a14 openssh-4.4_p1-r5.ebuild 5455
-SHA256 9ffd3c4276e87a4b502e3516f485caeabb68a6d127f5ed4e2e4315025731f6c9 openssh-4.4_p1-r5.ebuild 5455
-MISC ChangeLog 34568 RMD160 c006dfa9372531a95d54076cb698d723b1ed81c2 SHA1 3871e8c5f12311b090900d48760d449f449a208c SHA256 06d0b29982eb51cf7df1bd104e7b717596e7efd020f94d962122c6ffeabe5605
-MD5 7e2c43d1d24e6ab79443dc8486aaf8d0 ChangeLog 34568
-RMD160 c006dfa9372531a95d54076cb698d723b1ed81c2 ChangeLog 34568
-SHA256 06d0b29982eb51cf7df1bd104e7b717596e7efd020f94d962122c6ffeabe5605 ChangeLog 34568
+EBUILD openssh-4.4_p1-r6.ebuild 5452 RMD160 3e7f80bede089d294f7f7ef154c2697b71f81550 SHA1 2a1f723be07249c19e14cf08e6443829b5065ccb SHA256 7d5debc43bb26383133d8c8409a8a983dbbd66fab699a2966e82be93f37f78fa
+MD5 6cc7e04d7c8ccd3e6a686c710163701f openssh-4.4_p1-r6.ebuild 5452
+RMD160 3e7f80bede089d294f7f7ef154c2697b71f81550 openssh-4.4_p1-r6.ebuild 5452
+SHA256 7d5debc43bb26383133d8c8409a8a983dbbd66fab699a2966e82be93f37f78fa openssh-4.4_p1-r6.ebuild 5452
+MISC ChangeLog 34772 RMD160 15c4c75715e57e6f1cb41f15457c0314d512c66e SHA1 e9247cb34327d92dddefc22e636713ddca0726dc SHA256 aa4ad9461c15578ede78fde384b86da32d5ee938e31a95c505218b1223889be6
+MD5 fd61bd398b6d9855265e8c012640058f ChangeLog 34772
+RMD160 15c4c75715e57e6f1cb41f15457c0314d512c66e ChangeLog 34772
+SHA256 aa4ad9461c15578ede78fde384b86da32d5ee938e31a95c505218b1223889be6 ChangeLog 34772
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -264,6 +271,13 @@ SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/di
 MD5 0d0254ed9210821ca64914bd75a158a0 files/digest-openssh-4.3_p2-r5 1343
 RMD160 956c689e98e6be7279d8cffab44e6182f20f6621 files/digest-openssh-4.3_p2-r5 1343
 SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/digest-openssh-4.3_p2-r5 1343
-MD5 f10f062fb9265135cfd127f9e869c228 files/digest-openssh-4.4_p1-r5 1361
-RMD160 c63d1a532ded3ed4d253f89d95b0949302eea9ab files/digest-openssh-4.4_p1-r5 1361
-SHA256 e6f786470d7a5842db4c2858d88a2bc3ae6fe6d0ef1d42b96f7164719587cce1 files/digest-openssh-4.4_p1-r5 1361
+MD5 1640aac282df2ff3bbca8fd7e94bd891 files/digest-openssh-4.4_p1-r6 1334
+RMD160 31d7d0e9b09bd8837de83abe8ee24b7878df7d9a files/digest-openssh-4.4_p1-r6 1334
+SHA256 81ff3d47e3f63ad4d4c31f6208d7926654b98b6a7cf6d3b937847faae6117d0e files/digest-openssh-4.4_p1-r6 1334
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFSrxwamhnQswr0vIRAlBWAKCuiXtQypeFv0eZzPRhZYHipq5UbgCguSiF
+5eiziM+Ufxv4ucTmgUVSVaY=
+=SoMa
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.4_p1-r6 b/net-misc/openssh/files/digest-openssh-4.4_p1-r6
new file mode 100644
index 000000000000..f8678362dbf7
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.4_p1-r6
@@ -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 132f5ae282de4ff822a95591720da8fd openssh-4.4p1+x509-5.5.1.diff.gz 137417
+RMD160 34cf39583e8c01bb055671a540c7463f45134960 openssh-4.4p1+x509-5.5.1.diff.gz 137417
+SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded openssh-4.4p1+x509-5.5.1.diff.gz 137417
+MD5 b08b232eb9830a84909bcc9a9abda38c openssh-4.4p1-hpn12v13.diff.gz 15392
+RMD160 b057f9a1068ddce106a94465953bdac58d0ffac8 openssh-4.4p1-hpn12v13.diff.gz 15392
+SHA256 2e3c6a108072eb9de3330cda8639b8c54845174e3a4691a895d06d5cbf221245 openssh-4.4p1-hpn12v13.diff.gz 15392
+MD5 793a709a8de695c22f523024d7e9bf07 openssh-4.4p1.tar.gz 1044334
+RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc openssh-4.4p1.tar.gz 1044334
+SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac openssh-4.4p1.tar.gz 1044334
+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/openssh-4.4_p1-ldap-hpn-glue.patch b/net-misc/openssh/files/openssh-4.4_p1-ldap-hpn-glue.patch
new file mode 100644
index 000000000000..20e796b5f975
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.4_p1-ldap-hpn-glue.patch
@@ -0,0 +1,54 @@
+allow ldap and hpn patches to play nice
+
+--- servconf.c
++++ servconf.c
+@@ -116,24 +116,6 @@
+ 	options->num_allow_groups = 0;
+ 	options->num_deny_groups = 0;
+ 	options->ciphers = NULL;
+-	options->macs = NULL;
+-	options->protocol = SSH_PROTO_UNKNOWN;
+-	options->gateway_ports = -1;
+-	options->num_subsystems = 0;
+-	options->max_startups_begin = -1;
+-	options->max_startups_rate = -1;
+-	options->max_startups = -1;
+-	options->max_authtries = -1;
+-	options->banner = NULL;
+-	options->use_dns = -1;
+-	options->client_alive_interval = -1;
+-	options->client_alive_count_max = -1;
+-	options->authorized_keys_file = NULL;
+-	options->authorized_keys_file2 = NULL;
+-	options->num_accept_env = 0;
+-	options->permit_tun = -1;
+-	options->num_permitted_opens = -1;
+-	options->adm_forced_command = NULL;
+ #ifdef WITH_LDAP_PUBKEY
+ 	/* XXX dirty */
+ 	options->lpk.ld = NULL;
+@@ -152,6 +134,24 @@
+ 	options->lpk.flags = FLAG_EMPTY;
+ #endif
+ 
++	options->macs = NULL;
++	options->protocol = SSH_PROTO_UNKNOWN;
++	options->gateway_ports = -1;
++	options->num_subsystems = 0;
++	options->max_startups_begin = -1;
++	options->max_startups_rate = -1;
++	options->max_startups = -1;
++	options->max_authtries = -1;
++	options->banner = NULL;
++	options->use_dns = -1;
++	options->client_alive_interval = -1;
++	options->client_alive_count_max = -1;
++	options->authorized_keys_file = NULL;
++	options->authorized_keys_file2 = NULL;
++	options->num_accept_env = 0;
++	options->permit_tun = -1;
++	options->num_permitted_opens = -1;
++	options->adm_forced_command = NULL;
+ }
+ 
+ void
diff --git a/net-misc/openssh/openssh-4.4_p1-r6.ebuild b/net-misc/openssh/openssh-4.4_p1-r6.ebuild
new file mode 100644
index 000000000000..465b4cee838c
--- /dev/null
+++ b/net-misc/openssh/openssh-4.4_p1-r6.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.4_p1-r6.ebuild,v 1.1 2006/11/03 03:49:47 vapier 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.1.diff.gz"
+SECURID_PATCH="${PARCH}+SecurID_v1.3.2.patch"
+LDAP_PATCH="${PARCH/-4.4p1/-lpk-4.4p1}-0.3.7.patch"
+HPN_PATCH="${PARCH}-hpn12v13.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.1/${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 sys-freebsd/freebsd-lib ) )
+	>=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
+
+	# fix autoconf lib checking for SELinux
+	epatch "${FILESDIR}/openssh-4.4p1-selinux-ac.diff"
+
+	use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-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}"/${P}-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
+}