Fix building with USE='X509 hpn' #209479 by Jose daLuz.

Package-Manager: portage-2.1.4.1

4 files changed, 112 insertions, 5 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 0c285ac3647c..dc326b929119 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # 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.275 2008/02/10 09:17:41 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.276 2008/02/10 22:45:29 vapier Exp $
+
+  10 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-4.7_p1-x509-hpn-glue.patch, openssh-4.7_p1-r4.ebuild:
+  Fix building with USE='X509 hpn' #209479 by Jose daLuz.
 
   10 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   openssh-4.7_p1-r3.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 31633e2e705b..3d406a99fd1c 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
@@ -10,6 +13,7 @@ AUX openssh-4.6_p1-ChallengeResponseAuthentication.patch 1681 RMD160 f38aecbbb7b
 AUX openssh-4.6_p1-chan-read-failed.patch 1053 RMD160 3b1233c55521f31356b42d1699e95b1d8288c8a8 SHA1 a3891d86cd7b650f4eb2b5ad661217b3c104cd52 SHA256 e8a4df9829bc8ef34f16ee0544e6088d577cfdc574c90f5ea47c46a6cb472e09
 AUX openssh-4.6_p1-include-string-header.patch 283 RMD160 6ca0ed9b00370904be03d1ab5b61a5893ca56768 SHA1 0f2cbdd460488741d8cf71db04f38df48215b335 SHA256 75c3850ece441da13f15c14a4836ff57bf67381590d5403be38c5b2aa097c57e
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
+AUX openssh-4.7_p1-x509-hpn-glue.patch 2734 RMD160 ff6961d2b5b018121c6c40af91b485d47eec1d29 SHA1 a081eaac28e6f761dbe2345263f8eaf810f0fa59 SHA256 6e27def1aaf61da6d4c8bb64d1068d255ffad86453cbc8ff6c42dd9e823bff9b
 AUX openssh-securid-1.3.1-updates.patch 445 RMD160 b1db3dfa75f7e03d0dff41e85e285f8b749f27f0 SHA1 757a8b0c1586fdcbff0762b39a52f1b315d4b110 SHA256 11c95cc508d20c8eb1e8faa0d2b5e68346cbb93db8fb560cfa8b4d2c0d1104b3
 AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0967944b6125be26ed4628f49abf586b2 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41
 AUX sshd.pam 294 RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d SHA1 4cd17fb40793fa9ca77ac93698129f2c8cafd7b8 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f
@@ -41,6 +45,13 @@ EBUILD openssh-4.6_p1-r3.ebuild 5390 RMD160 f55f1ca226614f0ccf4c0dae04e3b9c1b1e6
 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-r3.ebuild 4918 RMD160 8d38386192ca3d110a86cd3c6e7f9afa52d725a2 SHA1 19ea31a99cbd75ce313858db03da64164c4ee8c3 SHA256 10905bbcc057472522198df7f06838c307228800120a5f6716e25a4b1df59632
-EBUILD openssh-4.7_p1-r4.ebuild 4924 RMD160 ee6f6c6e963ee916b712f40f5ae8442c1d5a6ae1 SHA1 e999e745640e2e335fdffe78e29135c6e2c79fbc SHA256 f02f7a73dca638a2d950fc42c43da4b1e499f32195525478d8f4e9c07594b60d
-MISC ChangeLog 43142 RMD160 f38d243e4a0ff4039c98df4e5448195978c5ed71 SHA1 6bbe3f73a7b2a904793f29d26f15658ca7dbb057 SHA256 31c1175d7a1366651737a7e1e8860cb9d0c38c784cdbb8c9e2db2d526c02ba3b
+EBUILD openssh-4.7_p1-r4.ebuild 4924 RMD160 7b8cf4cd131feecfd333871243233a714e68d91b SHA1 529fa15a45bebb268930ef901173579a3a801d2b SHA256 b566cc678a34530f17f0ef385c47e8867286f6647874e78c03fce995a571e551
+MISC ChangeLog 43318 RMD160 ff4791b3ace5cdbfc847e172b54fce434c94b302 SHA1 5375dba573611f9a0a9df929355af3f3f37303cf SHA256 fdb77d322da3f2d0762c37eb8a41c5917bed85d454864411efa2e21f78bd4b06
 MISC metadata.xml 1150 RMD160 4b6c978959df7998b2d7b22ea9dee0fbc9b37fc5 SHA1 2b319d9ed51a8a7a30d37bd4ad55484704355b31 SHA256 ad8ada6ce7414bd3ce222b80899c15998026c7184524b15cb0a8f18097a52d5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHr36Qj9hvisErhMIRAsUNAKDbO3Kq2YULucuExR5/1jYQLgZM+wCg3JXL
+bQnyMH3j9OtNMMVJw9Ac5cE=
+=yRF5
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-4.7_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-4.7_p1-x509-hpn-glue.patch
new file mode 100644
index 000000000000..974d6e1bd1f9
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.7_p1-x509-hpn-glue.patch
@@ -0,0 +1,92 @@
+move things around so hpn applies cleanly when using X509
+
+--- servconf.c
++++ servconf.c
+@@ -106,6 +106,18 @@
+ 	options->log_level = SYSLOG_LEVEL_NOT_SET;
+ 	options->rhosts_rsa_authentication = -1;
+ 	options->hostbased_authentication = -1;
++
++	options->hostbased_algorithms = NULL;
++	options->pubkey_algorithms = NULL;
++	ssh_x509flags_initialize(&options->x509flags, 1);
++#ifndef SSH_X509STORE_DISABLED
++	ssh_x509store_initialize(&options->ca);
++#endif /*ndef SSH_X509STORE_DISABLED*/
++#ifdef SSH_OCSP_ENABLED
++	options->va.type = -1;
++	options->va.certificate_file = NULL;
++	options->va.responder_url = NULL;
++#endif /*def SSH_OCSP_ENABLED*/
+ 	options->hostbased_uses_name_from_packet_only = -1;
+ 	options->rsa_authentication = -1;
+ 	options->pubkey_authentication = -1;
+@@ -146,18 +158,6 @@
+ 	options->permit_tun = -1;
+ 	options->num_permitted_opens = -1;
+ 	options->adm_forced_command = NULL;
+-
+-	options->hostbased_algorithms = NULL;
+-	options->pubkey_algorithms = NULL;
+-	ssh_x509flags_initialize(&options->x509flags, 1);
+-#ifndef SSH_X509STORE_DISABLED
+-	ssh_x509store_initialize(&options->ca);
+-#endif /*ndef SSH_X509STORE_DISABLED*/
+-#ifdef SSH_OCSP_ENABLED
+-	options->va.type = -1;
+-	options->va.certificate_file = NULL;
+-	options->va.responder_url = NULL;
+-#endif /*def SSH_OCSP_ENABLED*/
+ }
+ 
+ void
+@@ -329,6 +329,16 @@
+ 	/* Portable-specific options */
+ 	sUsePAM,
+ 	/* Standard Options */
++	sHostbasedAlgorithms,
++	sPubkeyAlgorithms,
++	sX509KeyAlgorithm,
++	sAllowedClientCertPurpose,
++	sKeyAllowSelfIssued, sMandatoryCRL,
++	sCACertificateFile, sCACertificatePath,
++	sCARevocationFile, sCARevocationPath,
++	sCAldapVersion, sCAldapURL,
++	sVAType, sVACertificateFile,
++	sVAOCSPResponderURL,
+ 	sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime,
+ 	sPermitRootLogin, sLogFacility, sLogLevel,
+ 	sRhostsRSAAuthentication, sRSAAuthentication,
+@@ -351,16 +361,6 @@
+ 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
+ 	sMatch, sPermitOpen, sForceCommand,
+ 	sUsePrivilegeSeparation,
+-	sHostbasedAlgorithms,
+-	sPubkeyAlgorithms,
+-	sX509KeyAlgorithm,
+-	sAllowedClientCertPurpose,
+-	sKeyAllowSelfIssued, sMandatoryCRL,
+-	sCACertificateFile, sCACertificatePath,
+-	sCARevocationFile, sCARevocationPath,
+-	sCAldapVersion, sCAldapURL,
+-	sVAType, sVACertificateFile,
+-	sVAOCSPResponderURL,
+ 	sDeprecated, sUnsupported
+ } ServerOpCodes;
+ 
+--- Makefile.in
+++ Makefile.in
+@@ -44,11 +44,12 @@
+ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
++CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+ LIBS=@LIBS@
+ SSHDLIBS=@SSHDLIBS@
+ LIBEDIT=@LIBEDIT@
+ LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
++CPPFLAGS += @LDAP_CPPFLAGS@
+ AR=@AR@
+ AWK=@AWK@
+ RANLIB=@RANLIB@
diff --git a/net-misc/openssh/openssh-4.7_p1-r4.ebuild b/net-misc/openssh/openssh-4.7_p1-r4.ebuild
index c9b65189f6bd..ef03cb999a2f 100644
--- a/net-misc/openssh/openssh-4.7_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-4.7_p1-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.1 2008/02/09 20:21:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r4.ebuild,v 1.2 2008/02/10 22:45:29 vapier Exp $
 
 inherit eutils flag-o-matic ccc multilib autotools pam
 
@@ -70,7 +70,7 @@ src_unpack() {
 		-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 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