Adding kernel-quotes patch, closes bug#148989

Package-Manager: portage-2.1.1

5 files changed, 38 insertions, 15 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index c9013728358c..8b55e995cc71 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.47 2006/10/11 21:55:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.48 2006/10/15 19:07:34 alonbl Exp $
+
+  15 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/bestcrypt-1.6_p5-kernel-quotes.patch, bestcrypt-1.6_p5.ebuild,
+  bestcrypt-1.6_p7.ebuild:
+  Adding kernel-quotes patch, closes bug#148989
 
 *bestcrypt-1.6_p7 (11 Oct 2006)
 
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index 420bb880a3e2..c213f8e20bcf 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -10,6 +10,10 @@ AUX bestcrypt-1.6_p5-gcc41.patch 759 RMD160 d146ec09598562527d92d6dbeae152bc4f35
 MD5 d89e87d4c74173ae7b795c47f4e6c330 files/bestcrypt-1.6_p5-gcc41.patch 759
 RMD160 d146ec09598562527d92d6dbeae152bc4f35e96d files/bestcrypt-1.6_p5-gcc41.patch 759
 SHA256 da0b1383004dad8ab2ad1cd93d2d474625284c6eab9bc0aa6dc4a685cea86c8a files/bestcrypt-1.6_p5-gcc41.patch 759
+AUX bestcrypt-1.6_p5-kernel-quotes.patch 518 RMD160 5e7a04d54d5b45df313a84d67b3d3920294335fc SHA1 f198ea9af3e0851aad999bb050b10adcdd55975b SHA256 3a5e0520bdcc21e7bd3102f1e76d2255aef3f3d755440c14544f4fc94ef93b4f
+MD5 8e465ffaa53ab25024b974f1fe0765b7 files/bestcrypt-1.6_p5-kernel-quotes.patch 518
+RMD160 5e7a04d54d5b45df313a84d67b3d3920294335fc files/bestcrypt-1.6_p5-kernel-quotes.patch 518
+SHA256 3a5e0520bdcc21e7bd3102f1e76d2255aef3f3d755440c14544f4fc94ef93b4f files/bestcrypt-1.6_p5-kernel-quotes.patch 518
 AUX bestcrypt-1.6_p5-makefile_fix.patch 2229 RMD160 f6bbdc9dc392fc2ca784ce3b6fafa05fe94b31d1 SHA1 5076660cd5d587989ab8940530f0ea3a6792d94d SHA256 f73b2e78dea62960aec05c5cd6bfaaf830aaf36f4a21d257fed48d26c7995b7b
 MD5 7363de908c43373f6ccfc37fcc32989a files/bestcrypt-1.6_p5-makefile_fix.patch 2229
 RMD160 f6bbdc9dc392fc2ca784ce3b6fafa05fe94b31d1 files/bestcrypt-1.6_p5-makefile_fix.patch 2229
@@ -18,18 +22,18 @@ DIST BestCrypt-1.6-5.tar.gz 194939 RMD160 969f67ac374282ef32d6a37ba1079bef220cc5
 DIST BestCrypt-1.6-7.tar.gz 195093 RMD160 b1e3e2e243481966cc74a0da03e725cf61797e53 SHA1 3a585e5c533356fbdb0a41714568346ff4e6dae2 SHA256 a031dc9c5783a18ecb6dcb4e1557b2f4c9893961cd07b040b4db070d88bf6777
 DIST bcrypt-rc6-serpent-c.diff.gz 6034 RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 SHA1 ed23242a81d7681b887951be67019a24780c978a SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5
 DIST bcrypt-rc6-serpent.diff.gz 5718 RMD160 f388894ea0f3d1055dffaf118083baefa5822000 SHA1 f82278c22678e7dedb74bf6bbc202702fbe3f988 SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8
-EBUILD bestcrypt-1.6_p5.ebuild 3275 RMD160 c887c127c1feca45983a75b97666b3b0b97097f6 SHA1 5955b9a724387aa50c8522595f0dcc568fae0083 SHA256 c2161b20f5cc1d5d1607d9a306bbfef5596ffc70ada91331a6546ad96eb9e03b
-MD5 26c6f2ca0c0e74dc8d1eead65c78559c bestcrypt-1.6_p5.ebuild 3275
-RMD160 c887c127c1feca45983a75b97666b3b0b97097f6 bestcrypt-1.6_p5.ebuild 3275
-SHA256 c2161b20f5cc1d5d1607d9a306bbfef5596ffc70ada91331a6546ad96eb9e03b bestcrypt-1.6_p5.ebuild 3275
-EBUILD bestcrypt-1.6_p7.ebuild 3293 RMD160 d9734e6ea61d2a8ded691901b10e3bd8198ad57b SHA1 8b89fd882c2bd19a88034d219df571998f1da43d SHA256 9c4f7b0a5992e00d7048e452af2a2afcdb8fbcac7c398720e51c78517273f3df
-MD5 eccef6035dfc9b92566a63d37e6192e2 bestcrypt-1.6_p7.ebuild 3293
-RMD160 d9734e6ea61d2a8ded691901b10e3bd8198ad57b bestcrypt-1.6_p7.ebuild 3293
-SHA256 9c4f7b0a5992e00d7048e452af2a2afcdb8fbcac7c398720e51c78517273f3df bestcrypt-1.6_p7.ebuild 3293
-MISC ChangeLog 9527 RMD160 138e8f6b579c18e29833196ebe2c43b2721ff31f SHA1 771a68048f79bda8a423bbb73eb8cda90e4ec5ef SHA256 bcc20b8b4a30b1098167a6b635f002b7733e1d73e0565dbba252ac2ab0c7411c
-MD5 925733d12e88cf1c3e1a58f787fa222f ChangeLog 9527
-RMD160 138e8f6b579c18e29833196ebe2c43b2721ff31f ChangeLog 9527
-SHA256 bcc20b8b4a30b1098167a6b635f002b7733e1d73e0565dbba252ac2ab0c7411c ChangeLog 9527
+EBUILD bestcrypt-1.6_p5.ebuild 3323 RMD160 9b0b8280b296fe1953eba7448337f4336de5576e SHA1 a63ab0cf44a1ca287c44f2c3ee5c2459f9e6122e SHA256 63dbd61a14436d826b35b42ec204e0dba44ffe84c73eb48754bce9202dbc7211
+MD5 1d01dbbfa1e4ffcca9273fd760afcc14 bestcrypt-1.6_p5.ebuild 3323
+RMD160 9b0b8280b296fe1953eba7448337f4336de5576e bestcrypt-1.6_p5.ebuild 3323
+SHA256 63dbd61a14436d826b35b42ec204e0dba44ffe84c73eb48754bce9202dbc7211 bestcrypt-1.6_p5.ebuild 3323
+EBUILD bestcrypt-1.6_p7.ebuild 3348 RMD160 54c835262156d10b9fd3aab3372649c86cdb95f0 SHA1 3e5b17f5b870175748390bb085754f79d8e425d4 SHA256 6643560f6a11250ff4b365d4e84ae0fbdfbc5b0e0d4c268adc8b56a6304e7502
+MD5 846471915722799376d55c555385653b bestcrypt-1.6_p7.ebuild 3348
+RMD160 54c835262156d10b9fd3aab3372649c86cdb95f0 bestcrypt-1.6_p7.ebuild 3348
+SHA256 6643560f6a11250ff4b365d4e84ae0fbdfbc5b0e0d4c268adc8b56a6304e7502 bestcrypt-1.6_p7.ebuild 3348
+MISC ChangeLog 9723 RMD160 658adffc9faedea06e08d4e32fea238438a444a8 SHA1 a7227c4e4984c9e9c0c54ffa9bbf3194986e992a SHA256 b2f4205ba8b5979505bd61cd5925d3d17d9c7976e079a1a4ee41d334a3075185
+MD5 2a368a5c185989cf24828cf07b1951f8 ChangeLog 9723
+RMD160 658adffc9faedea06e08d4e32fea238438a444a8 ChangeLog 9723
+SHA256 b2f4205ba8b5979505bd61cd5925d3d17d9c7976e079a1a4ee41d334a3075185 ChangeLog 9723
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
index e05f26104af1..52f676a5cca7 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p5.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/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.5 2006/10/06 16:00:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.6 2006/10/15 19:07:34 alonbl Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
 
@@ -37,6 +37,7 @@ MODULE_NAMES="bc(block:"${S}"/mod)
 
 src_unpack() {
 	unpack ${A}
+	epatch "${FILESDIR}"/${P}-kernel-quotes.patch
 	epatch "${FILESDIR}"/${P}-makefile_fix.patch
 	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${PN}-1.6_p2-path.patch
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild
index 66b3180a04f6..72a9d6809577 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p7.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/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild,v 1.1 2006/10/11 21:55:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild,v 1.2 2006/10/15 19:07:34 alonbl Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
 
@@ -37,6 +37,7 @@ MODULE_NAMES="bc(block:"${S}"/mod)
 
 src_unpack() {
 	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-1.6_p5-kernel-quotes.patch
 	epatch "${FILESDIR}"/${PN}-1.6_p5-makefile_fix.patch
 	epatch "${FILESDIR}"/${PN}-1.6_p5-gcc41.patch
 	epatch "${FILESDIR}"/${PN}-1.6_p2-path.patch
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-kernel-quotes.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-kernel-quotes.patch
new file mode 100644
index 000000000000..1dbf7509468f
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-kernel-quotes.patch
@@ -0,0 +1,12 @@
+diff -urNp bcrypt.org/mod/Makefile.alg bcrypt/mod/Makefile.alg
+--- bcrypt.org/mod/Makefile.alg	2006-04-12 08:32:39.000000000 +0300
++++ bcrypt/mod/Makefile.alg	2006-10-09 09:12:34.000000000 +0200
+@@ -24,7 +24,7 @@ LD = ld
+ LN_S = ln -s
+ LDFLAGS = -d -r
+ ifeq ($(K2616), yes)
+-KBDEF += -DKBUILD_MODNAME=\"$(MODNAME)\" -DKBUILD_BASENAME=\"BestCrypt\"
++KBDEF += -DKBUILD_MODNAME=\"$(MODNAME)\" -DKBUILD_BASENAME=\"BestCrypt\" -D_KBUILD_QUOTES
+ else
+ KBDEF += -DKBUILD_MODNAME=$(MODNAME) -DKBUILD_BASENAME=BestCrypt
+ endif