Add patch to fix hashing

Package-Manager: portage-2.1.2.9

5 files changed, 42 insertions, 13 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index b25f698de43f..4e7ff09232f6 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/olsrd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.7 2007/07/06 11:46:31 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.8 2007/07/14 10:49:29 cedk Exp $
+
+*olsrd-0.5.1-r1 (14 Jul 2007)
+
+  14 Jul 2007; Cédric Krier <cedk@gentoo.org>
+  +files/olsrd-0.5.1-fix-hashing.patch, -olsrd-0.5.1.ebuild,
+  +olsrd-0.5.1-r1.ebuild:
+  Add patch to fix hashing
 
 *olsrd-0.5.1 (06 Jul 2007)
 
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index aa80d7416763..63985566f32f 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -10,6 +10,10 @@ AUX olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246 RMD160 2f0414c
 MD5 2e80f148d7b40546d50cdecb4ea0ae4d files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
 RMD160 2f0414c22e559fe03ab5968fa21b8c2c4a437ff6 files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
 SHA256 a9a5e96a138c65b32b62a73556a62feb529e95de34bb1b450652d81825459124 files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
+AUX olsrd-0.5.1-fix-hashing.patch 529 RMD160 8ea03b1e4b59317039ef88226b6fd852c8e8b9d0 SHA1 37921a837c993fcce0195c7f789b7280452fb5ee SHA256 fcc814a21b815eaf98dc0c6067960682c8e935afcb8fb2898fa88cbfc24a9e3c
+MD5 91c245d44d2dedbc3fe2c9c964181f3b files/olsrd-0.5.1-fix-hashing.patch 529
+RMD160 8ea03b1e4b59317039ef88226b6fd852c8e8b9d0 files/olsrd-0.5.1-fix-hashing.patch 529
+SHA256 fcc814a21b815eaf98dc0c6067960682c8e935afcb8fb2898fa88cbfc24a9e3c files/olsrd-0.5.1-fix-hashing.patch 529
 DIST olsrd-0.4.10.tar.bz2 490519 RMD160 a0432cb885efdf93ce36e7367a1346b6744c9f90 SHA1 78325658657c6b1aeebe106d02cabcc6eed2571c SHA256 af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3
 DIST olsrd-0.5.0.tar.bz2 479433 RMD160 a54c43226fa5f6c7a65dcea7ab325d39ddc4d7b6 SHA1 c95df003a8bd3169315662d50f20830ddd7d563e SHA256 5ff2ffb325ccb5b592b08d30b3f9a843fa938a3af78c2c50946aa2229d1d9162
 DIST olsrd-0.5.1.tar.bz2 529916 RMD160 d83282a5ebecdb7599c84e3e4f1175eb78fed2a6 SHA1 77e8ecdcfc8e5a1316d1fd5601e76446ba9aa9bc SHA256 42fda56ebd5a876346fc6efb8fff751c9ac28b485da545299d0513a594cfebeb
@@ -21,14 +25,14 @@ EBUILD olsrd-0.5.0.ebuild 1402 RMD160 14e5ad6b8dd4fc3635f96adfeafad12e2edf6b88 S
 MD5 437269683203a3005fd8681a5ee502a1 olsrd-0.5.0.ebuild 1402
 RMD160 14e5ad6b8dd4fc3635f96adfeafad12e2edf6b88 olsrd-0.5.0.ebuild 1402
 SHA256 b73196e4f7ce30a2cf6693a157a4873c6c9bcbe04ffc6aba8b8e92a87d8f6897 olsrd-0.5.0.ebuild 1402
-EBUILD olsrd-0.5.1.ebuild 1509 RMD160 afd49982f9366c8cdc0d73c9793de31e42d1d1b9 SHA1 cbfd146db793fc0ab871ef0abf9d256aa759be99 SHA256 4d8707978f2d0746e87e359aba036c4d00ab4625a865a7d713f6fdbd42310798
-MD5 b02d26065c3ed1dcf015ec8517e785fd olsrd-0.5.1.ebuild 1509
-RMD160 afd49982f9366c8cdc0d73c9793de31e42d1d1b9 olsrd-0.5.1.ebuild 1509
-SHA256 4d8707978f2d0746e87e359aba036c4d00ab4625a865a7d713f6fdbd42310798 olsrd-0.5.1.ebuild 1509
-MISC ChangeLog 1112 RMD160 bb35a9091b79fc41f8b7611b6b0dda530d901e64 SHA1 c29d24bb3a251fb07909285e1a39ee1d4a4faea4 SHA256 a9cf45ed7995e93b5a0eab0d7152afff6789fe4d9faf262bbf156ac6d515732e
-MD5 922aaad2798e96028c8f7f2ec5ff280f ChangeLog 1112
-RMD160 bb35a9091b79fc41f8b7611b6b0dda530d901e64 ChangeLog 1112
-SHA256 a9cf45ed7995e93b5a0eab0d7152afff6789fe4d9faf262bbf156ac6d515732e ChangeLog 1112
+EBUILD olsrd-0.5.1-r1.ebuild 1599 RMD160 00ffe8f1933279b5807dee0098f65462c00c783e SHA1 e4820e23bafa83f587c1e3b13e05c18302126da2 SHA256 03a63380176291821ec9542160e87d324a3eff93f0a26eadf11b0000af73ccbc
+MD5 b32492e4229181a6a7cda8653f1e8aee olsrd-0.5.1-r1.ebuild 1599
+RMD160 00ffe8f1933279b5807dee0098f65462c00c783e olsrd-0.5.1-r1.ebuild 1599
+SHA256 03a63380176291821ec9542160e87d324a3eff93f0a26eadf11b0000af73ccbc olsrd-0.5.1-r1.ebuild 1599
+MISC ChangeLog 1305 RMD160 063052bdc7780f13899c477dee5245e03b126d9a SHA1 61fec8f9bcc6ed18562446ff984feb172c7f5164 SHA256 4ada8474d4a6c9160540d5703ab548183de3bb34210c966301c34c2ff122e6ab
+MD5 0989c8618c9c2f837cc58e824442e78b ChangeLog 1305
+RMD160 063052bdc7780f13899c477dee5245e03b126d9a ChangeLog 1305
+SHA256 4ada8474d4a6c9160540d5703ab548183de3bb34210c966301c34c2ff122e6ab ChangeLog 1305
 MISC metadata.xml 318 RMD160 50ee639035e7ddcdcf6c2a3e22e66443fcd30de5 SHA1 88b2535f03b3c5813cefde5695118f3deae79b1a SHA256 07b3287dfd5e9ca43a84158f0e93297e8ccad36fa7ea4c707c446ce6c62070b3
 MD5 b5ecb6bd430598cb6e660c05f895e6bc metadata.xml 318
 RMD160 50ee639035e7ddcdcf6c2a3e22e66443fcd30de5 metadata.xml 318
@@ -39,6 +43,6 @@ SHA256 f8956f7ea714b788baaa10e8064ea8e101e988c9fd363623fce72122a42632c8 files/di
 MD5 ff06c6192cd8337d65e33a02500ce846 files/digest-olsrd-0.5.0 238
 RMD160 93ebb250785dce51803a6eea3db4121c5313972d files/digest-olsrd-0.5.0 238
 SHA256 3ab1dffd6060f4e41cf865bc6087f9088eab7d45d247b648c4a6f1eabdceb15e files/digest-olsrd-0.5.0 238
-MD5 19b1cf26ae1334ad3d2ab0530a5975dc files/digest-olsrd-0.5.1 238
-RMD160 d1fccaf72bd636b27a5ee1925285696bd432b37a files/digest-olsrd-0.5.1 238
-SHA256 6706678a76f835f58a21881416625eeccb7e8d3963f1ab974764591f46fa9bdd files/digest-olsrd-0.5.1 238
+MD5 19b1cf26ae1334ad3d2ab0530a5975dc files/digest-olsrd-0.5.1-r1 238
+RMD160 d1fccaf72bd636b27a5ee1925285696bd432b37a files/digest-olsrd-0.5.1-r1 238
+SHA256 6706678a76f835f58a21881416625eeccb7e8d3963f1ab974764591f46fa9bdd files/digest-olsrd-0.5.1-r1 238
diff --git a/net-misc/olsrd/files/digest-olsrd-0.5.1 b/net-misc/olsrd/files/digest-olsrd-0.5.1-r1
index 76deb451c028..76deb451c028 100644
--- a/net-misc/olsrd/files/digest-olsrd-0.5.1
+++ b/net-misc/olsrd/files/digest-olsrd-0.5.1-r1
diff --git a/net-misc/olsrd/files/olsrd-0.5.1-fix-hashing.patch b/net-misc/olsrd/files/olsrd-0.5.1-fix-hashing.patch
new file mode 100644
index 000000000000..40dd61db90fe
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.5.1-fix-hashing.patch
@@ -0,0 +1,12 @@
+diff -Nur olsrd-0.5.1.orig/src/hashing.c olsrd-0.5.1/src/hashing.c
+--- olsrd-0.5.1.orig/src/hashing.c	2007-07-03 17:31:40.000000000 +0200
++++ olsrd-0.5.1/src/hashing.c	2007-07-07 21:19:38.000000000 +0200
+@@ -54,7 +54,7 @@
+     olsr_u32_t hash;
+     if(olsr_cnf->ip_version == AF_INET) {
+         /* IPv4 */  
+-        const olsr_u8_t * const v4x = (const char *)&address;
++        const olsr_u8_t * const v4x = (const olsr_u8_t *)&address->v4;
+         hash = v4x[0] ^ v4x[1] ^ v4x[2] ^ v4x[3];
+     } else {
+         /* IPv6 */
diff --git a/net-misc/olsrd/olsrd-0.5.1.ebuild b/net-misc/olsrd/olsrd-0.5.1-r1.ebuild
index 41c7a8fc5c04..0e31c8a5d5a8 100644
--- a/net-misc/olsrd/olsrd-0.5.1.ebuild
+++ b/net-misc/olsrd/olsrd-0.5.1-r1.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/olsrd/olsrd-0.5.1.ebuild,v 1.1 2007/07/06 11:46:31 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.1-r1.ebuild,v 1.1 2007/07/14 10:49:29 cedk Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,6 +15,12 @@ IUSE="gtk"
 
 DEPEND="gtk? ( =x11-libs/gtk+-2* )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fix-hashing.patch"
+}
+
 src_compile() {
 	cd "${S}"
 	emake OS=linux CC=$(tc-getCC) build_all || die "emake failed"