fix compilation for bug #136942

Package-Manager: portage-2.1.1-r1

diff --git a/net-analyzer/zodiac/ChangeLog b/net-analyzer/zodiac/ChangeLog
index 24899c6efdb496302a5c58a6ce96a0a275d1ec02..1408d16a37708940e5f2626a8abecc41fb7999e6 100644 (file)
--- a/net-analyzer/zodiac/ChangeLog
+++ b/net-analyzer/zodiac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/zodiac
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zodiac/ChangeLog,v 1.7 2006/02/20 19:52:00 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zodiac/ChangeLog,v 1.8 2006/11/18 14:06:02 cedk Exp $
+
+*zodiac-0.4.9-r2 (18 Nov 2006)
+
+  18 Nov 2006; Cedric Krier <cedk@gentoo.org>
+  +files/zodiac-0.4.9-dns-spoof-int.patch, +files/zodiac-0.4.9-gcc-4.patch,
+  +zodiac-0.4.9-r2.ebuild:
+  fix compilation for bug #136942
 
   20 Feb 2006; Markus Ullmann <jokey@gentoo.org> zodiac-0.4.9.ebuild,
   zodiac-0.4.9-r1.ebuild:

diff --git a/net-analyzer/zodiac/Manifest b/net-analyzer/zodiac/Manifest
index 6bf7060ee6edd368b9c344bd9073cbf74c3e283e..4a6a898e01d21b995af0d774897a66211f4ca76c 100644 (file)
--- a/net-analyzer/zodiac/Manifest
+++ b/net-analyzer/zodiac/Manifest
@@ -1,21 +1,42 @@
-MD5 06574c583cef515afb759655ff4ca893 ChangeLog 1044
-RMD160 c9ef61f63e431eabb37ed056d1623204d2a1411e ChangeLog 1044
-SHA256 4b2e212a4772e777439f9ecb954b71f2edc357b40b521412c0667c7e14a67f4c ChangeLog 1044
+AUX 0.4.9-libnet-1.0.patch 1921 RMD160 0375430a4b09a5ed6b5a707201ab3644d0230531 SHA1 221ef8514361a4a3b025e7554b85d890f55285c6 SHA256 685b8102fc25bec543e3052a8876bd06c356ba521f34e3c88c8497cd75eb1677
 MD5 5975e291b98f9130cb34be64d7e8aeac files/0.4.9-libnet-1.0.patch 1921
 RMD160 0375430a4b09a5ed6b5a707201ab3644d0230531 files/0.4.9-libnet-1.0.patch 1921
 SHA256 685b8102fc25bec543e3052a8876bd06c356ba521f34e3c88c8497cd75eb1677 files/0.4.9-libnet-1.0.patch 1921
-MD5 512754e3be6eb5e2866a9bd5817ee7b0 files/digest-zodiac-0.4.9 63
-RMD160 e704c220be66c9fe65b545803817a88c273f45b4 files/digest-zodiac-0.4.9 63
-SHA256 9343a62d3d74f6910863673b0b74654a8acf96c6c4bed1393fab8d1bdef0ddd2 files/digest-zodiac-0.4.9 63
-MD5 512754e3be6eb5e2866a9bd5817ee7b0 files/digest-zodiac-0.4.9-r1 63
-RMD160 e704c220be66c9fe65b545803817a88c273f45b4 files/digest-zodiac-0.4.9-r1 63
-SHA256 9343a62d3d74f6910863673b0b74654a8acf96c6c4bed1393fab8d1bdef0ddd2 files/digest-zodiac-0.4.9-r1 63
-MD5 f91d9123c97f69351203d3930bd4c2a8 metadata.xml 216
-RMD160 b08707215b2f745a0eeb4672f6aeef953597c04f metadata.xml 216
-SHA256 83d874f4c9f7bd5ebd0b58a2c8e7a9473026c5de1b21d9a363fbfe6bc1714081 metadata.xml 216
+AUX zodiac-0.4.9-dns-spoof-int.patch 603 RMD160 401c9af65717c474ed6008d4f43220f2bd1fee0d SHA1 e759ec3e73928522173d93a5846147046dd04905 SHA256 f06bf5e0b70b3f60e85da8bb2a71d675bd8e9524f8dcce9092888c0cc330de97
+MD5 900848151eef822687485e1f604127a6 files/zodiac-0.4.9-dns-spoof-int.patch 603
+RMD160 401c9af65717c474ed6008d4f43220f2bd1fee0d files/zodiac-0.4.9-dns-spoof-int.patch 603
+SHA256 f06bf5e0b70b3f60e85da8bb2a71d675bd8e9524f8dcce9092888c0cc330de97 files/zodiac-0.4.9-dns-spoof-int.patch 603
+AUX zodiac-0.4.9-gcc-4.patch 377 RMD160 aff033e15f42e6f1c3eb8c2dd98de38b3ef1dc6b SHA1 42fa73df9ae633d4c82e4cb632fbde1d4b40de88 SHA256 29d0ca42648617b99e7f52aeede4f813914f8ce0c9081f891821c4085cf00292
+MD5 aba79fd90bbb4d872e4f42c127f6e787 files/zodiac-0.4.9-gcc-4.patch 377
+RMD160 aff033e15f42e6f1c3eb8c2dd98de38b3ef1dc6b files/zodiac-0.4.9-gcc-4.patch 377
+SHA256 29d0ca42648617b99e7f52aeede4f813914f8ce0c9081f891821c4085cf00292 files/zodiac-0.4.9-gcc-4.patch 377
+DIST zodiac-0.4.9.tar.gz 67620 RMD160 ea229dfe62342fb10116b9dbb3472c1946c759ce SHA1 c95ded968e97b10631971eb5ca8cf4c8fc9dee4d SHA256 87f79104df9555ecf18355d034a721bd7327ecf82037e1e480a0752bb07e3a14
+EBUILD zodiac-0.4.9-r1.ebuild 932 RMD160 3b140e1563409f5ff3df83fb2cad15dce4c87af7 SHA1 5c2d3516dc04e49980fede206d8390fefd410ea8 SHA256 b2d7158bc583bd9e6381d7824ae7eaf419ed0f2583510b81cfcd99ef4b680ff8
 MD5 08e52e82cf753a48d17f1e00d6ac9fcd zodiac-0.4.9-r1.ebuild 932
 RMD160 3b140e1563409f5ff3df83fb2cad15dce4c87af7 zodiac-0.4.9-r1.ebuild 932
 SHA256 b2d7158bc583bd9e6381d7824ae7eaf419ed0f2583510b81cfcd99ef4b680ff8 zodiac-0.4.9-r1.ebuild 932
+EBUILD zodiac-0.4.9-r2.ebuild 964 RMD160 ba2a5a803c664777ff60211cfbf84020d5b7a30f SHA1 5f5fa6a57e3d8fd6e5ef676c95a045e8e32af3d9 SHA256 bbbb29305cf120229cf02f6d0664dcc3b1a755b5565414d1df76f1b98839ffad
+MD5 6cd76a44374a756a306a8b01ced344ad zodiac-0.4.9-r2.ebuild 964
+RMD160 ba2a5a803c664777ff60211cfbf84020d5b7a30f zodiac-0.4.9-r2.ebuild 964
+SHA256 bbbb29305cf120229cf02f6d0664dcc3b1a755b5565414d1df76f1b98839ffad zodiac-0.4.9-r2.ebuild 964
+EBUILD zodiac-0.4.9.ebuild 784 RMD160 974f26bc32d4db28ef202d88efeac3e3fad683d6 SHA1 6949212b474b5c123eef225399079e78baa86938 SHA256 f52b7b8ed3d26fb22fe09fa04a2f9156dcc0821051ef6967a4a438620394292d
 MD5 6ab1732ba15c4d475b997436113ec832 zodiac-0.4.9.ebuild 784
 RMD160 974f26bc32d4db28ef202d88efeac3e3fad683d6 zodiac-0.4.9.ebuild 784
 SHA256 f52b7b8ed3d26fb22fe09fa04a2f9156dcc0821051ef6967a4a438620394292d zodiac-0.4.9.ebuild 784
+MISC ChangeLog 1259 RMD160 1041241f01fe8f7d625f9d411bd30f76f4f64c0f SHA1 a5e1486a4f75ecc27462726db78280c5588a316b SHA256 8d9c22423cc03cd99ed14c794dc3b2d278e0ffab3df21c2afa86f5972e56b9db
+MD5 a93b18a80b0f3e55034a2bd2bf08fc0c ChangeLog 1259
+RMD160 1041241f01fe8f7d625f9d411bd30f76f4f64c0f ChangeLog 1259
+SHA256 8d9c22423cc03cd99ed14c794dc3b2d278e0ffab3df21c2afa86f5972e56b9db ChangeLog 1259
+MISC metadata.xml 216 RMD160 b08707215b2f745a0eeb4672f6aeef953597c04f SHA1 44f35d3afd7090415138a3caf69dafa6ec0e5937 SHA256 83d874f4c9f7bd5ebd0b58a2c8e7a9473026c5de1b21d9a363fbfe6bc1714081
+MD5 f91d9123c97f69351203d3930bd4c2a8 metadata.xml 216
+RMD160 b08707215b2f745a0eeb4672f6aeef953597c04f metadata.xml 216
+SHA256 83d874f4c9f7bd5ebd0b58a2c8e7a9473026c5de1b21d9a363fbfe6bc1714081 metadata.xml 216
+MD5 df546c60c9402b3e1955bcaa18e053fc files/digest-zodiac-0.4.9 235
+RMD160 b46625218dc60905d65f468511a86f8f75195c09 files/digest-zodiac-0.4.9 235
+SHA256 d0ee952e9298692e95cab69cb46b77e77ad6b3c4031345a861d40e4f921fd713 files/digest-zodiac-0.4.9 235
+MD5 df546c60c9402b3e1955bcaa18e053fc files/digest-zodiac-0.4.9-r1 235
+RMD160 b46625218dc60905d65f468511a86f8f75195c09 files/digest-zodiac-0.4.9-r1 235
+SHA256 d0ee952e9298692e95cab69cb46b77e77ad6b3c4031345a861d40e4f921fd713 files/digest-zodiac-0.4.9-r1 235
+MD5 df546c60c9402b3e1955bcaa18e053fc files/digest-zodiac-0.4.9-r2 235
+RMD160 b46625218dc60905d65f468511a86f8f75195c09 files/digest-zodiac-0.4.9-r2 235
+SHA256 d0ee952e9298692e95cab69cb46b77e77ad6b3c4031345a861d40e4f921fd713 files/digest-zodiac-0.4.9-r2 235

diff --git a/net-analyzer/zodiac/files/digest-zodiac-0.4.9 b/net-analyzer/zodiac/files/digest-zodiac-0.4.9
index 83e115242019ace1c641108158f2cdb66873e39e..7c687f2978db23960b4c2e003b1cd674684210cb 100644 (file)
--- a/net-analyzer/zodiac/files/digest-zodiac-0.4.9
+++ b/net-analyzer/zodiac/files/digest-zodiac-0.4.9
@@ -1 +1,3 @@
 MD5 9cca1d25152f969e0e28db1d1cc9a4e7 zodiac-0.4.9.tar.gz 67620
+RMD160 ea229dfe62342fb10116b9dbb3472c1946c759ce zodiac-0.4.9.tar.gz 67620
+SHA256 87f79104df9555ecf18355d034a721bd7327ecf82037e1e480a0752bb07e3a14 zodiac-0.4.9.tar.gz 67620

diff --git a/net-analyzer/zodiac/files/digest-zodiac-0.4.9-r1 b/net-analyzer/zodiac/files/digest-zodiac-0.4.9-r1
index 83e115242019ace1c641108158f2cdb66873e39e..7c687f2978db23960b4c2e003b1cd674684210cb 100644 (file)
--- a/net-analyzer/zodiac/files/digest-zodiac-0.4.9-r1
+++ b/net-analyzer/zodiac/files/digest-zodiac-0.4.9-r1
@@ -1 +1,3 @@
 MD5 9cca1d25152f969e0e28db1d1cc9a4e7 zodiac-0.4.9.tar.gz 67620
+RMD160 ea229dfe62342fb10116b9dbb3472c1946c759ce zodiac-0.4.9.tar.gz 67620
+SHA256 87f79104df9555ecf18355d034a721bd7327ecf82037e1e480a0752bb07e3a14 zodiac-0.4.9.tar.gz 67620

diff --git a/net-analyzer/zodiac/files/digest-zodiac-0.4.9-r2 b/net-analyzer/zodiac/files/digest-zodiac-0.4.9-r2
new file mode 100644 (file)
index 0000000..7c687f2
--- /dev/null
+++ b/net-analyzer/zodiac/files/digest-zodiac-0.4.9-r2
@@ -0,0 +1,3 @@
+MD5 9cca1d25152f969e0e28db1d1cc9a4e7 zodiac-0.4.9.tar.gz 67620
+RMD160 ea229dfe62342fb10116b9dbb3472c1946c759ce zodiac-0.4.9.tar.gz 67620
+SHA256 87f79104df9555ecf18355d034a721bd7327ecf82037e1e480a0752bb07e3a14 zodiac-0.4.9.tar.gz 67620

diff --git a/net-analyzer/zodiac/files/zodiac-0.4.9-dns-spoof-int.patch b/net-analyzer/zodiac/files/zodiac-0.4.9-dns-spoof-int.patch
new file mode 100644 (file)
index 0000000..c710c31
--- /dev/null
+++ b/net-analyzer/zodiac/files/zodiac-0.4.9-dns-spoof-int.patch
@@ -0,0 +1,20 @@
+diff -ru zodiac~/src/dns-spoof-int.c zodiac/src/dns-spoof-int.c
+--- zodiac~/src/dns-spoof-int.c        2006-11-18 14:34:59.000000000 +0100
++++ zodiac/src/dns-spoof-int.c 2006-11-18 14:42:26.000000000 +0100
+@@ -15,6 +15,7 @@
+ #include "dns-spoof.h"
+ #include "dns-build.h"
+ #include "common.h"
++#include <string.h>
+ 
+ static void   spoof_id_destroy (spoof_style_id *spoof_id);
+ static void   spoof_local_destroy (spoof_style_local *spoof_local);
+@@ -261,8 +262,6 @@
+       case SPOOF_STYLE_JIZZ:
+               spoof_jizz_destroy(&spoof_base->spoof.jizz_spoof);
+               break;
+-      default:
+-              /* hmm */       
+       }
+       free (spoof_base);
+       return;

diff --git a/net-analyzer/zodiac/files/zodiac-0.4.9-gcc-4.patch b/net-analyzer/zodiac/files/zodiac-0.4.9-gcc-4.patch
new file mode 100644 (file)
index 0000000..9943abe
--- /dev/null
+++ b/net-analyzer/zodiac/files/zodiac-0.4.9-gcc-4.patch
@@ -0,0 +1,12 @@
+diff -ru zodiac~/src/dns-build.c zodiac/src/dns-build.c
+--- zodiac~/src/dns-build.c    2006-11-18 14:45:10.000000000 +0100
++++ zodiac/src/dns-build.c     2006-11-18 14:47:03.000000000 +0100
+@@ -42,7 +42,7 @@
+       for (; dlen > 0; --dlen) {
+               char    p;
+ 
+-              (int) p = m_random ((int) 'a', (int) 'z');
++              p = (char) m_random ((int) 'a', (int) 'z');
+               pr[dlen - 1] = p;
+       }
+       pr[cc] = '.';

diff --git a/net-analyzer/zodiac/zodiac-0.4.9-r2.ebuild b/net-analyzer/zodiac/zodiac-0.4.9-r2.ebuild
new file mode 100644 (file)
index 0000000..876f532
--- /dev/null
+++ b/net-analyzer/zodiac/zodiac-0.4.9-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zodiac/zodiac-0.4.9-r2.ebuild,v 1.1 2006/11/18 14:06:02 cedk Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DNS protocol analyzer"
+HOMEPAGE="http://www.packetfactory.net/projects/zodiac/"
+SRC_URI="http://www.packetfactory.net/projects/zodiac/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="sys-libs/ncurses
+       <net-libs/libnet-1.1
+       >=net-libs/libnet-1.0.2a-r3
+       net-libs/libpcap"
+
+S=${WORKDIR}/${PN}
+IUSE=""
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}/src
+       epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+       sed -i \
+               -e "s:-g -ggdb -DDEBUG:${CFLAGS}:" \
+               -e 's:-static::' \
+               Makefile
+       epatch "${FILESDIR}/${P}-dns-spoof-int.patch"
+       epatch "${FILESDIR}/${P}-gcc-4.patch"
+}
+
+src_compile() {
+       cd src
+       emake CC=$(tc-getCC) || die
+}
+
+src_install() {
+       dobin zodiac
+       mv README{,.dev}
+       dodoc README.dev doc/*
+}