jer 14/07/17 02:15:28 Modified: sniffit-0.3.7-misc.patch sniffit-0.3.7-gentoo.patch Added: sniffit-0.3.7-tinfo.patch Removed: sniffit-0.3.7-gcc33.patch sniffit-0.3.7-flags.patch Log: EAPI bump. Clean up patches. Fix building against sys-libs/ncurses[tinfo]. Remove short <longdescription>. Make sure nothing is done in libpcap/. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch?r1=1.1&r2=1.2 Index: sniffit-0.3.7-misc.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sniffit-0.3.7-misc.patch 16 Sep 2010 16:31:59 -0000 1.1 +++ sniffit-0.3.7-misc.patch 17 Jul 2014 02:15:27 -0000 1.2 @@ -1,12 +1,12 @@ ---- a/sn_cfgfile.h 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_cfgfile.h 2010-09-16 18:14:53.000000000 +0200 +--- a/sn_cfgfile.h ++++ b/sn_cfgfile.h @@ -10,3 +10,4 @@ void make_nr_dot (char *); void interprete_line (char *); void read_cfg_file (char *); +char *strlower (char *); ---- a/sn_structs.h 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_structs.h 2010-09-16 18:14:53.000000000 +0200 +--- a/sn_structs.h ++++ b/sn_structs.h @@ -67,7 +67,7 @@ struct snif_mask /* struct for mask */ { @@ -16,8 +16,8 @@ }; /* (packet generation) */ ---- a/sn_analyse.c 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_analyse.c 2010-09-16 18:14:53.000000000 +0200 +--- a/sn_analyse.c ++++ b/sn_analyse.c @@ -1,6 +1,9 @@ /* Analyse traffic for logging mode */ /* - by: Brecht Claerhout */ @@ -28,8 +28,8 @@ const unsigned char *data; memcpy(&tcphead,header,sizeof(struct TCP_header)); ---- a/sn_cfgfile.c 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_cfgfile.c 2010-09-16 18:14:53.000000000 +0200 +--- a/sn_cfgfile.c ++++ b/sn_cfgfile.c @@ -3,6 +3,11 @@ /* - improvements: Shudoh Kazuyuki */ @@ -42,8 +42,8 @@ #include <netdb.h> /* for getservbyname() */ #include "sn_config.h" ---- a/sn_conn_desc.c 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_conn_desc.c 2010-09-16 18:14:53.000000000 +0200 +--- a/sn_conn_desc.c ++++ b/sn_conn_desc.c @@ -1,6 +1,8 @@ /* Connection description detection file */ /* - by: Brecht Claerhout */ @@ -53,8 +53,8 @@ /* Simple PORT BASED detection */ ---- a/sn_generation.c 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_generation.c 2010-09-16 18:18:31.000000000 +0200 +--- a/sn_generation.c ++++ b/sn_generation.c @@ -6,12 +6,16 @@ #ifdef INCLUDE_INTERFACE #ifdef GENERATION @@ -72,8 +72,8 @@ extern volatile int screen_busy; ---- a/sniffit.0.3.7.c 1998-07-16 18:17:10.000000000 +0200 -+++ b/sniffit.0.3.7.c 2010-09-16 18:14:53.000000000 +0200 +--- a/sniffit.0.3.7.c ++++ b/sniffit.0.3.7.c @@ -4,6 +4,9 @@ #include "sn_config.h" /* Config header file */ @@ -84,8 +84,8 @@ #include <signal.h> #include <stdio.h> #include <fcntl.h> ---- a/sn_interface.c 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_interface.c 2010-09-16 18:15:59.000000000 +0200 +--- a/sn_interface.c ++++ b/sn_interface.c @@ -6,6 +6,9 @@ #ifdef INCLUDE_INTERFACE #include <signal.h> @@ -96,8 +96,8 @@ #include <sys/ipc.h> #include <sys/shm.h> #include "sn_curses.h" ---- a/sn_logfile.c 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_logfile.c 2010-09-16 18:16:44.000000000 +0200 +--- a/sn_logfile.c ++++ b/sn_logfile.c @@ -4,6 +4,9 @@ #include "sn_config.h" @@ -108,8 +108,8 @@ #include <sys/stat.h> #include <sys/time.h> #include "sn_defines.h" ---- a/sn_packets.c 1998-07-16 18:17:10.000000000 +0200 -+++ b/sn_packets.c 2010-09-16 18:14:53.000000000 +0200 +--- a/sn_packets.c ++++ b/sn_packets.c @@ -5,6 +5,7 @@ #include "sn_defines.h" #include "sn_structs.h" 1.3 net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch?r1=1.2&r2=1.3 Index: sniffit-0.3.7-gentoo.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sniffit-0.3.7-gentoo.patch 16 Sep 2010 16:31:59 -0000 1.2 +++ sniffit-0.3.7-gentoo.patch 17 Jul 2014 02:15:27 -0000 1.3 @@ -1,20 +1,29 @@ ---- a/sniffit.0.3.7.beta/Makefile.in 2009-01-15 07:28:39.000000000 +0100 -+++ b/sniffit.0.3.7.beta/Makefile.in 2009-01-15 07:28:26.000000000 +0100 -@@ -10,9 +10,9 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -10,13 +10,13 @@ LIBS = @LIBS@ DEFS = @DEFS@ OS_OPT = @OS_OPT@ -OBJ_FLAG = -w -O2 -c -+OBJ_FLAG = $(CFLAGS) -c - OBJ_OPT = -I./libpcap -L./libpcap +-OBJ_OPT = -I./libpcap -L./libpcap -EXE_FLAG = -w -O2 -o sniffit +-EXE_OPT = -I./libpcap -L./libpcap -lpcap ++OBJ_FLAG = $(CFLAGS) -c ++OBJ_OPT = -I/usr/include/pcap -L/usr/lib +EXE_FLAG = $(CFLAGS) $(LDFLAGS) -o sniffit - EXE_OPT = -I./libpcap -L./libpcap -lpcap ++EXE_OPT = -I/usr/include/pcap -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 @@ +-DEP_FILES = sn_config.h ./libpcap/pcap.h sn_data.h sn_defines.h sn_plugins.h \ ++DEP_FILES = sn_config.h sn_data.h sn_defines.h sn_plugins.h \ + sn_analyse.c sn_conn_desc.c \ + sn_packets.o \ + sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o \ +@@ -26,9 +26,7 @@ + @echo "Succesfull compilation..." + sniffit: $(SNIFFIT) $(DEP_FILES) - # cd libpcap; make; cd .. +- cd libpcap; make; cd .. $(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) - strip sniffit 1.1 net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch?rev=1.1&content-type=text/plain Index: sniffit-0.3.7-tinfo.patch =================================================================== --- a/configure.in +++ b/configure.in @@ -5,30 +5,15 @@ AC_INIT(sniffit.h) -dnl Config of libpcap -AC_CONFIG_SUBDIRS(libpcap) - dnl Check the C compiler AC_PROG_CC dnl Check NCURSES availability -NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses:./:./ncurses.h -ncurses_warn=0 -AC_CHECK_LIB(ncurses,main,,ncurses_warn=1) - -AC_PATH_PROGS(NCURSES_LOCATION,ncurses.h,no,$NCURSES_PATH) -if test "$NCURSES_LOCATION" != no; then - echo "#include \"$NCURSES_LOCATION\"" >sn_curses.h - AC_DEFINE(HAVE_NCURSES_H,1) -else - ncurses_warn=1 -fi - -dnl Print warning for interactive mode -if test $ncurses_warn -ne 0; then - AC_MSG_WARN(Interactive mode (-i/-I) will NOT be supported.!) - AC_MSG_WARN(Install ncurses!) -fi +PKG_CHECK_MODULES(ncurses,ncurses,main, + LIBS="$LIBS $ncurses_LIBS" + echo "#include <ncurses.h>" > sn_curses.h + AC_DEFINE(HAVE_NCURSES_H), + AC_MSG_ERROR([ncurses not found])) dnl Check Shared Memory support AC_CHECK_FUNCS(shmget)
