Do not hide compiler warnings. Do not hardcode CFLAGS in Makefile. Do not strip (bug #251985).

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.25-gentoo-r7-JeR i686

4 files changed, 39 insertions, 11 deletions

diff --git a/net-analyzer/sniffit/ChangeLog b/net-analyzer/sniffit/ChangeLog
index 6f200546ea29..80c5836857fd 100644
--- a/net-analyzer/sniffit/ChangeLog
+++ b/net-analyzer/sniffit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/sniffit
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/ChangeLog,v 1.14 2007/09/06 18:11:08 jokey Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/ChangeLog,v 1.15 2009/01/15 06:37:32 jer Exp $
+
+  15 Jan 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/sniffit-0.3.7-gentoo.patch, sniffit-0.3.7-r1.ebuild:
+  Do not hide compiler warnings. Do not hardcode CFLAGS in Makefile. Do not
+  strip (bug #251985).
 
   06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -sniffit-0.3.7.ebuild:
   Cleanup
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index 747c034fd0be..c10d73827325 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -1,6 +1,7 @@
 AUX sniffit-0.3.7-gcc33.patch 496 RMD160 0c10a37d38980286e3b331ecf798eaf2d8f98d49 SHA1 c114c2d28eea5e43e39433b9a441124acd8ff38b SHA256 59262b2d7f5f78c2e97b1a52ff69a7574126fba6962e38f1c19694540dd467d7
+AUX sniffit-0.3.7-gentoo.patch 848 RMD160 a61e01e3b1813dd1b1b530876fb5435f40e67363 SHA1 9ab25b96e0063b8a8a470d956be82894aa33f2e4 SHA256 b5c984d3dc14fc02447dba9734981df8ca92009a35d60cf4c5cbeb2f550f4938
 DIST sniffit.0.3.7.beta.tar.gz 212419 RMD160 9ff6b3b2aca3c27222f3fb5ad0d85adb5e44c356 SHA1 fbb897d5e9ec51744a155d4ba090df144e9dfaf9 SHA256 78b5137be45bdff738525dee351908ae0b8a79e2d999e33b34278a4a7fc08ca0
 DIST sniffit_0.3.7.beta-10.diff 95457 RMD160 152ae90fa5d2f3245d8c55894fa099e0062a3e92 SHA1 e4866f229afd3a95a9223d330ef42f259edf8827 SHA256 0c748822f8b12f6de2231a301762aa291742f7119592e3c3022ce7ba9a78df9c
-EBUILD sniffit-0.3.7-r1.ebuild 1061 RMD160 5ad31513bca472327cc8173a719b5653617a4c88 SHA1 bf2c5a0008095682d7332247d4f16babbca01f6a SHA256 0e05e888ad9c8bc8b88b92f390526694c060b08947ae640a2bee0c3d4defaae1
-MISC ChangeLog 1864 RMD160 8732dd70197d788ca97e801b156e46c58bdcb251 SHA1 5bf88a449d2dd244ebf0148989e1065c3371657a SHA256 e0cbdb35f3171dddaf5ca8af24f19a491eecf085b4a36e425dd27354263cfb42
+EBUILD sniffit-0.3.7-r1.ebuild 1061 RMD160 78f53541d3407b4bf100dc2d42bd45e059c95193 SHA1 187d1fd5a191b8d671338c38d700f7ad7478b7e3 SHA256 b1e7b4b726a099cf0637d79222a529c4fccff3b85bd5268541fa6f1f101ec1bf
+MISC ChangeLog 2071 RMD160 4410bb3dc8fb75948abff8e7ae55a83059995860 SHA1 13df4af4f3d959c79e596854467a1679fa94a797 SHA256 47f68c537be7e8c8d21644935abf7f308f8dc2bcfb79a5187d8a74c3d2fe84bd
 MISC metadata.xml 221 RMD160 f9b66a2316654bbb3e05cea03957d9d665bcf41d SHA1 9fb37ed2ebf734cc7c4d9cab5243b78e6076ae5b SHA256 6f7db930e28fafe15a3849b6c7c71882147d47c07765a14290b36fab2b426a17
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
new file mode 100644
index 000000000000..680eb07a6833
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
@@ -0,0 +1,22 @@
+--- sniffit.0.3.7.beta/Makefile.in.orig	2009-01-15 07:28:39.000000000 +0100
++++ sniffit.0.3.7.beta/Makefile.in	2009-01-15 07:28:26.000000000 +0100
+@@ -10,9 +10,9 @@
+ LIBS       = @LIBS@
+ DEFS	   = @DEFS@
+ OS_OPT     = @OS_OPT@
+-OBJ_FLAG   = -w -O2 -c
++OBJ_FLAG   = $(CFLAGS) -c
+ OBJ_OPT    = -I./libpcap -L./libpcap
+-EXE_FLAG   = -w -O2 -o sniffit
++EXE_FLAG   = $(CFLAGS) -o sniffit
+ EXE_OPT    = -I./libpcap -L./libpcap -lpcap
+ EXE_OBJ    = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \
+              sn_logfile.o sn_resolv.o
+@@ -28,7 +28,6 @@
+ sniffit: $(SNIFFIT) $(DEP_FILES)
+ #	cd libpcap; make; cd ..
+ 	$(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) 
+-	strip sniffit
+ 
+ sn_cfgfile.o: sn_cfgfile.h sn_cfgfile.c sn_defines.h sn_structs.h sn_config.h
+ 	$(CC) $(OBJ_FLAG) sn_cfgfile.c $(OBJ_OPT) $(DEFS)
diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild
index 43f43f5d2460..a85e058406c3 100644
--- a/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild,v 1.9 2007/07/11 23:49:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild,v 1.10 2009/01/15 06:37:32 jer Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_P="${P/-/.}.beta"
 S="${WORKDIR}/${MY_P}"
@@ -27,18 +27,18 @@ src_unpack() {
 
 	# Fix issues with gcc-3.3 (bug #25328)
 	epatch ${FILESDIR}/${P}-gcc33.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {
+	tc-export CC
 	econf || die
-
-	emake OBJ_FLAG="-w -c ${CFLAGS}" \
-	      EXE_FLAG="-w ${CFLAGS} -o sniffit" || die
+	emake CFLAGS="${CFLAGS}" || die
 }
 
 src_install () {
 	dobin sniffit
 
 	doman sniffit.5 sniffit.8
-	dodoc README* PLUGIN-HOWTO BETA* HISTORY LICENSE changelog
+	dodoc README* PLUGIN-HOWTO BETA* HISTORY LICENSE
 }