projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e9d3f2)
Bug #169665, use slightly modified LPK patch to avoid conflict on configure with...
authorRobin H. Johnson <robbat2@gentoo.org>
Sun, 18 Mar 2007 18:15:38 +0000 (18:15 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Sun, 18 Mar 2007 18:15:38 +0000 (18:15 +0000)
Package-Manager: portage-2.1.2.2

net-misc/openssh/ChangeLog patch | blob | history
net-misc/openssh/Manifest patch | blob | history
net-misc/openssh/files/digest-openssh-4.5_p1-r2 patch | blob | history
net-misc/openssh/openssh-4.5_p1-r2.ebuild patch | blob | history

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 008d12de7ea33a8cbe65846fe6d0192f9ba90baa..3d360bd070919e7810cdbb99faf22c74d310fd96 100644 (file)
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,11 @@
 # 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.234 2007/03/13 02:31:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.235 2007/03/18 18:15:38 robbat2 Exp $
+
+  18 Mar 2007; Robin H. Johnson <robbat2@gentoo.org>
+  openssh-4.5_p1-r2.ebuild:
+  Bug #169665, use slightly modified LPK patch to avoid conflict on configure
+  with SecurID patch.
 
 *openssh-4.6_p1-r1 (13 Mar 2007)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 4729d7ffcadb1e7a3366ab64de76677b3f3e31c6..a006e99c7b97b98ecde158c923c415ebfcb3f1e8 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
@@ -200,7 +197,7 @@ DIST openssh-lpk-4.0p1-0.3.6.patch 60557 RMD160 da57dcc8078c127abea0dc4017399cd5
 DIST openssh-lpk-4.1p1-0.3.6.patch 60312 RMD160 489d8be3b66ad5dad4b23fa61b9423be43e891ad SHA1 0d12c98e31d7c979a965a97e3d9e5694f3eaedcf SHA256 318d8b70e423c014069157535eecb2c943f42fec4b14d3f6a65350c1edd66540
 DIST openssh-lpk-4.3p1-0.3.7.patch 60451 RMD160 fda93b8ee3ef9b633947784fe84a9eed2acbd325 SHA1 ba557b6a070e47990eb085c5a89cdfbe089ab6d3 SHA256 0bcfa28804caf685de2248ddc966666196f6df81d1d058066f2da17714518af4
 DIST openssh-lpk-4.4p1-0.3.7.patch 61187 RMD160 90b0bbe07a3617f6eecb9f77c1a38c5f4dd4dcaf SHA1 b1854a4391c5d11f1a5ab09059643bbaf2278009 SHA256 c74aa642b4b2eeceb0c3f554752d172f8d5a7cd30f2aae517e93ef3bf1bd24e7
-DIST openssh-lpk-4.5p1-0.3.8.patch 62340 RMD160 3f0f9b6f600947e073c7a2863fbbfe58c0c87845 SHA1 3febf170b5d869076c3d5e60f36cc005545a8ef1 SHA256 c96cb24ea0c21cd93f2a28c31c38902bed8ddf0cb7a2879337bb21a5edd7ce35
+DIST openssh-lpk-4.5p1-0.3.8-no-configure.patch 58327 RMD160 464eb3e29f77d2d1e9785ea7cbae5c6d6bb0aff5 SHA1 5020b325b845de131236a489f2bbf19da64aff6e SHA256 ffbd706fb543709d1be0d37af50de561ed9a4271508f0df3b951d6a1db5eb1eb
 EBUILD openssh-3.9_p1-r3.ebuild 4984 RMD160 fc6e960460f5ed80f38de0ad62844786906a40dc SHA1 bb12ded4a10fb951c5c37da969225b672ccc5f38 SHA256 243071563d56d49415ecdd850291e0ba005db6dd6c3a90f3b33b727de3990686
 MD5 4bf2ed1ba4e71ff7a799b27f958b8214 openssh-3.9_p1-r3.ebuild 4984
 RMD160 fc6e960460f5ed80f38de0ad62844786906a40dc openssh-3.9_p1-r3.ebuild 4984
@@ -229,10 +226,10 @@ EBUILD openssh-4.5_p1-r1.ebuild 5389 RMD160 4f7b8f6b59bdcfe5a9f939535ff5b1bda596
 MD5 757d26ec60443e5db6c1481cf3d480a5 openssh-4.5_p1-r1.ebuild 5389
 RMD160 4f7b8f6b59bdcfe5a9f939535ff5b1bda5967d8c openssh-4.5_p1-r1.ebuild 5389
 SHA256 7ea642cd5df5aa81d58e19d40980aa0f9817f28f2c3771bbdd6585574e90c94d openssh-4.5_p1-r1.ebuild 5389
-EBUILD openssh-4.5_p1-r2.ebuild 5402 RMD160 d1f3a2d7c0bfbeaddef8b6e3b83fb4d9b7bfbfa6 SHA1 0ee787f48144a33873ac13ce1e5d4915b3a3c22d SHA256 f8654b9a869f1fa6e882567e1f097703f5c48558dbe2ffccddb618921ed59698
-MD5 881464d905d6111aed5940ac7c97e06b openssh-4.5_p1-r2.ebuild 5402
-RMD160 d1f3a2d7c0bfbeaddef8b6e3b83fb4d9b7bfbfa6 openssh-4.5_p1-r2.ebuild 5402
-SHA256 f8654b9a869f1fa6e882567e1f097703f5c48558dbe2ffccddb618921ed59698 openssh-4.5_p1-r2.ebuild 5402
+EBUILD openssh-4.5_p1-r2.ebuild 5445 RMD160 ba84f3f5099e43bd9f552b8d9374473aa3832fb1 SHA1 ac4e17abe6ec29f7aa01cee48cda27d751c67e1d SHA256 aba4995381879da2c569bfc2fb03ec7b58b1d9b8e2e5d0a175f572d581b21648
+MD5 e2605923340c6c9aa1ac86de4cf14b24 openssh-4.5_p1-r2.ebuild 5445
+RMD160 ba84f3f5099e43bd9f552b8d9374473aa3832fb1 openssh-4.5_p1-r2.ebuild 5445
+SHA256 aba4995381879da2c569bfc2fb03ec7b58b1d9b8e2e5d0a175f572d581b21648 openssh-4.5_p1-r2.ebuild 5445
 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
@@ -241,10 +238,10 @@ EBUILD openssh-4.6_p1-r1.ebuild 5401 RMD160 534003b16a63b34b45404422e5c6601f64b2
 MD5 ce33ec70cc51cbab8e2c36b66f047449 openssh-4.6_p1-r1.ebuild 5401
 RMD160 534003b16a63b34b45404422e5c6601f64b2083a openssh-4.6_p1-r1.ebuild 5401
 SHA256 e9d60580607ae6d865b4d5c0def203d5b78ce163f9a6b5c56049cc3b8ce66a45 openssh-4.6_p1-r1.ebuild 5401
-MISC ChangeLog 37265 RMD160 ba1043dfa227af17c0e2c83ff38f71396df439b1 SHA1 6e596ddad3c765d442aefbdea65023d2ace43571 SHA256 0c3be4d2f1519acde424410f3644bcbd73baa1f89a78600a18363df9a12458e1
-MD5 aaaa53d6c10b0c3dcbb1d411a43ae447 ChangeLog 37265
-RMD160 ba1043dfa227af17c0e2c83ff38f71396df439b1 ChangeLog 37265
-SHA256 0c3be4d2f1519acde424410f3644bcbd73baa1f89a78600a18363df9a12458e1 ChangeLog 37265
+MISC ChangeLog 37448 RMD160 b4aef482d9bd3be8f21def31dec8ce78b582944a SHA1 55cd616aa9428bbbeb731de90e34988874ea0aee SHA256 a185549287711615bd41092a2f0db56730595dcb4afcd4bfdd179415e8f5840d
+MD5 d2517c28ca21dc3d9abae354c7c02d85 ChangeLog 37448
+RMD160 b4aef482d9bd3be8f21def31dec8ce78b582944a ChangeLog 37448
+SHA256 a185549287711615bd41092a2f0db56730595dcb4afcd4bfdd179415e8f5840d ChangeLog 37448
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -273,16 +270,9 @@ SHA256 86a17c74dd503363c30085c75f7cc17bda20da889e93d61d59446589992cc08b files/di
 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
-MD5 d103be4401a9c908f16efd211878c1c0 files/digest-openssh-4.5_p1-r2 1331
-RMD160 b4ec4a9c82f27a05165ef9557e25d6cd156de1cf files/digest-openssh-4.5_p1-r2 1331
-SHA256 467a56eb0bb8cb4bc586ddfbc5991687624238723fe6198c2341340016910f77 files/digest-openssh-4.5_p1-r2 1331
+MD5 15fe08918cde242210111d03a3ed1e7e files/digest-openssh-4.5_p1-r2 1370
+RMD160 8331cb78dc88205280d7972879fec185285d9f8d files/digest-openssh-4.5_p1-r2 1370
+SHA256 b7fdf1272101d669ed17d224ba44ccd6d59bda66ac82a08042a29898d2be4fe3 files/digest-openssh-4.5_p1-r2 1370
 MD5 262614ee697fea204407027184ed83fc files/digest-openssh-4.6_p1-r1 786
 RMD160 4dca2db674acc3f2ee39d304e1a5add2004fe871 files/digest-openssh-4.6_p1-r1 786
 SHA256 155a2bda9084c47e1e7df6b2ed84cd947b7f6511c6c6a09a1a4620eb7d587e9a files/digest-openssh-4.6_p1-r1 786
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF9gz58bi6rjpTunYRArqLAJwOx783P7fTyCh3U4Lnb3z/cC7b7gCglGTL
-tjOfl8V6FTX8OBrr2nTMUHA=
-=Gw22
------END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.5_p1-r2 b/net-misc/openssh/files/digest-openssh-4.5_p1-r2
index 8f9f5ed3912c4a41a3f03ed2ea6a00806a45ed6c..a3d678fda3fed00b3877f244646a230fefafb106 100644 (file)
--- a/net-misc/openssh/files/digest-openssh-4.5_p1-r2
+++ b/net-misc/openssh/files/digest-openssh-4.5_p1-r2
@@ -10,6 +10,6 @@ SHA256 098fd91fc62e9685bf05c97c535f35414e742f379b6e21f5fd13353a7549271e openssh-
 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 663ce0f968c4f7eacc5128dc91645245 openssh-lpk-4.5p1-0.3.8.patch 62340
-RMD160 3f0f9b6f600947e073c7a2863fbbfe58c0c87845 openssh-lpk-4.5p1-0.3.8.patch 62340
-SHA256 c96cb24ea0c21cd93f2a28c31c38902bed8ddf0cb7a2879337bb21a5edd7ce35 openssh-lpk-4.5p1-0.3.8.patch 62340
+MD5 76a143d9e6edea5dd0cc5ee65fed7bc7 openssh-lpk-4.5p1-0.3.8-no-configure.patch 58327
+RMD160 464eb3e29f77d2d1e9785ea7cbae5c6d6bb0aff5 openssh-lpk-4.5p1-0.3.8-no-configure.patch 58327
+SHA256 ffbd706fb543709d1be0d37af50de561ed9a4271508f0df3b951d6a1db5eb1eb openssh-lpk-4.5p1-0.3.8-no-configure.patch 58327
diff --git a/net-misc/openssh/openssh-4.5_p1-r2.ebuild b/net-misc/openssh/openssh-4.5_p1-r2.ebuild
index b611c9490248b66b0cbd3269c620f88ecd6a8df2..cc5dedda5c1fe8864859a3b8ce551354491cedc0 100644 (file)
--- a/net-misc/openssh/openssh-4.5_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-4.5_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2007/03/05 04:54:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.5_p1-r2.ebuild,v 1.2 2007/03/18 18:15:38 robbat2 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -13,14 +13,14 @@ 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.5p1}-0.3.8.patch"
+LDAP_PATCH="${PARCH/-4.5p1/-lpk-4.5p1}-0.3.8-no-configure.patch"
 HPN_PATCH="${PARCH}-hpn12v15.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} )
+       ldap? ( mirror://gentoo/${LDAP_PATCH} 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} )"
 
Unnamed repository; edit this file 'description' to name the repository.