Add patch to fix hashing

(Portage version: 2.1.2.9)

4 files changed, 27 insertions, 2 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/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"