version bump and warning fixes by Jeroen Roovers - bug #244388

Package-Manager: portage-2.1.4.5

5 files changed, 172 insertions, 2 deletions

diff --git a/net-analyzer/dhcpdump/ChangeLog b/net-analyzer/dhcpdump/ChangeLog
index dd9c355b057e..bf7ffe677151 100644
--- a/net-analyzer/dhcpdump/ChangeLog
+++ b/net-analyzer/dhcpdump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/dhcpdump
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcpdump/ChangeLog,v 1.2 2008/06/11 07:44:49 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcpdump/ChangeLog,v 1.3 2008/11/04 19:38:42 bangert Exp $
+
+*dhcpdump-1.8 (04 Nov 2008)
+
+  04 Nov 2008; Thilo Bangert <bangert@gentoo.org>
+  +files/dhcpdump-1.8-Makefile.patch, +files/dhcpdump-1.8-debian.patch,
+  +dhcpdump-1.8.ebuild:
+  version bump and warning fixes by Jeroen Roovers - bug #244388
 
   11 Jun 2008; Thilo Bangert <bangert@gentoo.org> dhcpdump-1.7.ebuild:
   add amd64 keyword - bug #225787
diff --git a/net-analyzer/dhcpdump/Manifest b/net-analyzer/dhcpdump/Manifest
index b78077f8cb8f..07386d8c91aa 100644
--- a/net-analyzer/dhcpdump/Manifest
+++ b/net-analyzer/dhcpdump/Manifest
@@ -1,4 +1,8 @@
+AUX dhcpdump-1.8-Makefile.patch 556 RMD160 ae2b96e60017f50ccb56370d0239170990a94994 SHA1 c967060911bcad11c6cd080658a3fd0285a248e0 SHA256 3d66108312d40ae64b149d92d08a641da412fbe474942df150603c8b7ad19b89
+AUX dhcpdump-1.8-debian.patch 2877 RMD160 70e317a32aa743cbbe64ce09b133899d21fa852d SHA1 370a8997854b73ae7b091317ea72fc899a3f8c24 SHA256 c7c9567dbf8f4f84c8d4037154d8a2ca533169ea37083e1ebf448a4ff00528fc
 DIST dhcpdump-1.7.tar.gz 95258 RMD160 f2235f5f3d50b155696da24142513bc5f55b31da SHA1 dd2f97145c5b648a7d6bd206bed8cdee27a8929a SHA256 12a8a72a62e538dea938ac77ff29200dd63f37fabab04e44311741679a626b19
+DIST dhcpdump-1.8.tar.gz 10740 RMD160 825d6bd37fe4e85df8146f0d63d3dc66c8fd3419 SHA1 96fae94d9bac4cf3b5a4c62be2b06a2d72a9fa48 SHA256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190
 EBUILD dhcpdump-1.7.ebuild 522 RMD160 43509fd7d2dae4583f9de6b421278df9b617d656 SHA1 42015d4b387e20d04cabd1053bcf24c7baa550d6 SHA256 bfafaec728cc34ed20456da7bbea10cf64748ec681d51eb14bd67e4c2a80d7d2
-MISC ChangeLog 495 RMD160 f38053222785f70662c09247d67a308dce4e9d1c SHA1 435eba291686a6894c10ef41e21bc949d40ca2a7 SHA256 01b93d6648f7e6cdfe673bc58874ad9395aade11f0516f9b7a61a4e4da1e6328
+EBUILD dhcpdump-1.8.ebuild 781 RMD160 ce884cf3cbe66f7f4c1d2c19ff5baa2227d835dc SHA1 a4684bb3a37dd7d50778d1389f89629d2c0863fd SHA256 0834f64be1dbbc61c0b6ca3f3c9e077237dcd7bd1da750ea63de51b29e457d7c
+MISC ChangeLog 736 RMD160 5508643e4f6ddf1779dd77d22c6a1a8f61ee2e82 SHA1 96b78a6811f4bbc43b9b1d4789caa6054b8e0151 SHA256 539844b462faa7d709d53ef89e0a39d3d34f053f9f953621b28b2633bae5023d
 MISC metadata.xml 365 RMD160 a2fae15bfaf8bae1a745a0c9f5f0807175e6516a SHA1 96f89d4771915e6d9b1d8d9e5fe99e5924b2560c SHA256 097044e0b80d19e1108b75abed5bb77ec0b77065bdf0dcb855dbc78326a6ddd2
diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
new file mode 100644
index 000000000000..72cd25b154e8
--- /dev/null
+++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild,v 1.1 2008/11/04 19:38:42 bangert Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DHCP Packet Analyzer/tcpdump postprocessor"
+HOMEPAGE="http://www.mavetju.org/unix/general.php"
+SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-debian.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install () {
+	dobin ${PN}
+	doman ${PN}.8
+	dodoc CHANGES CONTACT
+}
diff --git a/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch b/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch
new file mode 100644
index 000000000000..d089fe3da04b
--- /dev/null
+++ b/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch
@@ -0,0 +1,22 @@
+--- Makefile.orig	2008-06-24 05:26:52.000000000 +0200
++++ Makefile	2008-10-26 01:22:32.000000000 +0200
+@@ -1,6 +1,6 @@
+-CFLAGS=	 -Wall -g
+-LDFLAGS= -g
+-LIBS=	-lpcap
++#CFLAGS = -Wall -g
++#LDFLAGS = -g
++LIBS = -lpcap
+ 
+ all: dhcpdump dhcpdump.8
+ 
+@@ -15,7 +15,7 @@
+ 		dhcpdump.pod dhcpdump.8
+ 
+ dhcpdump: dhcpdump.o
+-	${CC} ${LDFLAGS} -o $@ dhcpdump.o ${LIBS}
++	$(CC) -DHAVE_STRSEP $(LDFLAGS) -o $@ dhcpdump.o $(LIBS)
+ 
+ dhcpdump.o: dhcpdump.c dhcp_options.h Makefile
+-	${CC} ${CFLAGS} -c -o $@ dhcpdump.c
++	$(CC) -DHAVE_STRSEP $(CFLAGS) -c -o $@ dhcpdump.c
diff --git a/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch b/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch
new file mode 100644
index 000000000000..a5882df76f7a
--- /dev/null
+++ b/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch
@@ -0,0 +1,103 @@
+--- dhcpdump-1.8.orig/dhcpdump.c
++++ dhcpdump-1.8/dhcpdump.c
+@@ -16,11 +16,13 @@
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>
++#include <netinet/ether.h>
+ #include <arpa/inet.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <time.h>
+ #include <pcap.h>
+ #include <err.h>
+ #include <regex.h>
+@@ -38,11 +40,11 @@
+ #define LARGESTRING 1024
+ 
+ // header variables
+-u_char	timestamp[40];			// timestamp on header
+-u_char	mac_origin[40];			// mac address of origin
+-u_char	mac_destination[40];		// mac address of destination
+-u_char	ip_origin[40];			// ip address of origin
+-u_char	ip_destination[40];		// ip address of destination
++char	timestamp[40];			// timestamp on header
++char	mac_origin[40];			// mac address of origin
++char	mac_destination[40];		// mac address of destination
++char	ip_origin[40];			// ip address of origin
++char	ip_destination[40];		// ip address of destination
+ int	max_data_len;			// maximum size of a packet
+ 
+ int	tcpdump_style = -1;
+@@ -160,13 +162,21 @@
+ 	strcpy(mac_destination,
+ 	    ether_ntoa((struct ether_addr *)eh->ether_dhost));
+ 
+-	strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src));
+-	strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst));
++	strcpy(ip_origin, (char *)inet_ntoa(ip->ip_src));
++	strcpy(ip_destination, (char *)inet_ntoa(ip->ip_dst));
+ 
++#ifdef __linux__
++	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len)))
++		return;
++
++	printdata((u_char *)(sp + offset), ntohs(udp->len));
++#else
+ 	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen)))
+ 		return;
+ 
+ 	printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen));
++#endif
++
+ }
+ 
+ // check for matching CHADDR (Peter Apian-Bennewitz <apian@ise.fhg.de>)
+@@ -301,7 +311,7 @@
+ // print the header and the options.
+ int printdata(u_char *data, int data_len) {
+ 	int	j, i;
+-	u_char	buf[LARGESTRING];
++	char	buf[LARGESTRING];
+ 
+ 	if (data_len == 0)
+ 		return 0;
+@@ -364,7 +374,7 @@
+ 	case 60:	// Domain name
+ 	case 86:	// NDS Tree name
+ 	case 87:	// NDS context
+-		strncpy(buf, &data[j + 2], data[j + 1]);
++		strncpy(buf, (char *)&data[j + 2], data[j + 1]);
+ 		buf[data[j + 1]] = 0;
+ 		printf("%s", buf);
+ 		break;
+@@ -510,7 +520,7 @@
+ 		printf("-");
+ 		print8bits(data + j + 4);
+ 		printf(" ");
+-		strncpy(buf, &data[j + 5], data[j + 1] - 3);
++		strncpy(buf, (char *)&data[j + 5], data[j + 1] - 3);
+ 		buf[data[j + 1] - 3]=0;
+ 		printf("%s", buf);
+ 		break;
+@@ -518,6 +528,9 @@
+ 	case 82:	// Relay Agent Information
+ 		printf("\n");
+ 		for (i = j + 2; i < j + data[j + 1]; ) {
++			if (i != j+2) {
++				printf("\n");
++			}
+ 			printf("%-17s %-13s ", " ",
+ 			    data[i] > sizeof(relayagent_suboptions) ?
+ 			    "*wrong value*" :
+@@ -527,7 +540,7 @@
+ 				break;
+ 			}
+ 			printHexColon(data + i + 2, data[i + 1]);
+-			i += data[i + 1];
++			i += data[i + 1] + 2;
+ 		}
+ 		break;
+