Tweak X509 a little so HPN can apply at the sametime #151527 by Bob Reveley.

Package-Manager: portage-2.1.2_rc1-r1

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 6200b93eaa9c3e15c141dff7a8c3bc6bf67de9bd..203c7fb9e369f30aea46738fea6f2f8e1f2d178a 100644 (file)
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # 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.214 2006/10/31 19:45:29 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.215 2006/11/01 01:43:23 vapier Exp $
+
+  01 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-4.4_p1-x509-hpn-glue.patch, openssh-4.4_p1-r5.ebuild:
+  Tweak X509 a little so HPN can apply at the sametime #151527 by Bob Reveley.
 
   31 Oct 2006; Danny van Dyk <kugelfang@gentoo.org>
   openssh-4.4_p1-r5.ebuild:

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 4137732fcb9bc0e79d49de8e287c82d7bc56fbf5..d3bb8b24f6c506d069c130ea24e11aac349ac36a 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -125,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-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
+SHA256 3020a88840e17a269a6943f9bc5636110248a66c55dd8d7254cc9ed8596ba97f files/openssh-4.4_p1-x509-hpn-glue.patch 1150
 AUX openssh-4.4p1-selinux-ac.diff 525 RMD160 3cd79bd33f6b54afc943c641f83120f78c703f65 SHA1 00798d6db943d92d1839853b53fa25a034945f57 SHA256 fc7d2f252fc19864c1b5b5cb6b506018580495605e36dad7e370fbc16b3f276e
 MD5 acfb71370d090c620e71fcf7e4ede1c4 files/openssh-4.4p1-selinux-ac.diff 525
 RMD160 3cd79bd33f6b54afc943c641f83120f78c703f65 files/openssh-4.4p1-selinux-ac.diff 525
@@ -221,14 +225,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 5422 RMD160 13c825e04113cf1ba16f3e8d2f1fe4a75e91bd64 SHA1 a7b3ffe2a20bbd185a395501f1687ab42e72eb15 SHA256 3652aeb83b1c872823478ec4a101469ab7cdc229028dc51877f879f9f33ba1cd
-MD5 2c91e303d9ec0fde1b25ca879884e935 openssh-4.4_p1-r5.ebuild 5422
-RMD160 13c825e04113cf1ba16f3e8d2f1fe4a75e91bd64 openssh-4.4_p1-r5.ebuild 5422
-SHA256 3652aeb83b1c872823478ec4a101469ab7cdc229028dc51877f879f9f33ba1cd openssh-4.4_p1-r5.ebuild 5422
-MISC ChangeLog 34133 RMD160 2a3ac80ae0180e83938db74c75ee68318ffdfb6a SHA1 5d9baed3d5f4c92f8d8db8f61289b2213240de4a SHA256 8cc4a0c91c0d37da40bbe0274657523a84e171c9f73463362613c470047c26be
-MD5 ed3c6f464ccd0017633854e388ac2b02 ChangeLog 34133
-RMD160 2a3ac80ae0180e83938db74c75ee68318ffdfb6a ChangeLog 34133
-SHA256 8cc4a0c91c0d37da40bbe0274657523a84e171c9f73463362613c470047c26be ChangeLog 34133
+EBUILD openssh-4.4_p1-r5.ebuild 5458 RMD160 d52b1163e25aa506721fb96cbdf87332d63adfcb SHA1 04ce1ca123f6318535cbaada3a33ac3b0906b25d SHA256 95c4bcebcec9aa9d32e953c07ddf37e3241f61049eb86b199defed700f655330
+MD5 8c840e3f1a78ca3251048079a165e84a openssh-4.4_p1-r5.ebuild 5458
+RMD160 d52b1163e25aa506721fb96cbdf87332d63adfcb openssh-4.4_p1-r5.ebuild 5458
+SHA256 95c4bcebcec9aa9d32e953c07ddf37e3241f61049eb86b199defed700f655330 openssh-4.4_p1-r5.ebuild 5458
+MISC ChangeLog 34331 RMD160 7c3c3ec120a9cf424e2bfd5615f2bdcc81e3ba99 SHA1 878d0db6fe3e1745a2cda717d5343728dbc6c428 SHA256 1978d052b2b12a24bb9485115c63b2ffa975c7a1b13dfbbd6dbde2d459581d42
+MD5 42fb382a026800b0865ec43b1012e2d3 ChangeLog 34331
+RMD160 7c3c3ec120a9cf424e2bfd5615f2bdcc81e3ba99 ChangeLog 34331
+SHA256 1978d052b2b12a24bb9485115c63b2ffa975c7a1b13dfbbd6dbde2d459581d42 ChangeLog 34331
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -267,9 +271,9 @@ 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFR6gD5mJXAu5GbtIRAlMmAJ979ps6owP25/7EJ2uYcVm3rhhdRwCeLqKZ
-fDsFQpy9C/OqDnZPb9D9DOU=
-=whO6
+iD8DBQFFR/vGamhnQswr0vIRAl+RAKCLepTg164vRQlSY9j0D4iqiwlZUwCdGGwJ
+cqGriIiZU721oqwtu4lIM9s=
+=MiXY
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch
new file mode 100644 (file)
index 0000000..e10365e
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch
@@ -0,0 +1,38 @@
+move things around so hpn applies cleanly when using X509
+
+--- servconf.c
++++ servconf.c
+@@ -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;
+ 

diff --git a/net-misc/openssh/openssh-4.4_p1-r5.ebuild b/net-misc/openssh/openssh-4.4_p1-r5.ebuild
index 2e28891ca6a5b03c70a64645a227fe883830d3fb..d7f9031a05a25b10436abb86e404a9826272ff0b 100644 (file)
--- a/net-misc/openssh/openssh-4.4_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-4.4_p1-r5.ebuild
@@ -1,6 +1,6 @@
 # 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-r5.ebuild,v 1.4 2006/10/31 19:45:29 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.4_p1-r5.ebuild,v 1.5 2006/11/01 01:43:23 vapier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -75,7 +75,7 @@ src_unpack() {
        # fix autoconf lib checking for SELinux
        epatch "${FILESDIR}/openssh-4.4p1-selinux-ac.diff"
 
-       use X509 && epatch "${DISTDIR}"/${X509_PATCH}
+       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