dlt patch #27928

4 files changed, 177 insertions, 3 deletions

diff --git a/net-analyzer/iplog/ChangeLog b/net-analyzer/iplog/ChangeLog
index e57681fec2f8..e65382268144 100644
--- a/net-analyzer/iplog/ChangeLog
+++ b/net-analyzer/iplog/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-analyzer/iplog
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iplog/ChangeLog,v 1.5 2003/02/12 07:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iplog/ChangeLog,v 1.6 2003/10/19 03:04:06 vapier Exp $
+
+*iplog-2.2.3-r1 (18 Oct 2003)
+
+  18 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add dlt patch to support more interface types #27928.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *iplog-2.2.3 (1 Feb 2002)
 
   21 Jul 2002; Owen Stampflee <owen@gentoo.org> :
diff --git a/net-analyzer/iplog/files/2.2.3-DLT_LINUX_SSL.patch b/net-analyzer/iplog/files/2.2.3-DLT_LINUX_SSL.patch
new file mode 100644
index 000000000000..6b50d8705d73
--- /dev/null
+++ b/net-analyzer/iplog/files/2.2.3-DLT_LINUX_SSL.patch
@@ -0,0 +1,136 @@
+diff -ruN iplog-2.2.3.orig/src/iplog_options.c iplog-2.2.3/src/iplog_options.c
+--- iplog-2.2.3.orig/src/iplog_options.c	2001-01-01 17:02:14.000000000 +0100
++++ iplog-2.2.3/src/iplog_options.c	2003-09-04 16:03:41.000000000 +0200
+@@ -440,58 +440,58 @@
+ 
+ static void print_help(void) {
+ 	mysyslog(
+-"Usage: " PACKAGE " [options] (\"*\" Denotes enabled by default)
+---user      or -u <user|UID>     Run as specified the user or UID.
+---group     or -g <group|GID>    Run with specified the group or GID.
+---logfile   or -l <file>         Log to <file>.
+---pid-file  <file>               Use <file> as the pid file.
+---ignore    or -d                Ignore DNS traffic from nameservers listed in
+-                                 /etc/resolv.conf.
+---interface or -i <if0,...,ifN>  Listen on the specified interface(s).
+---promisc   or -a <network>      Log traffic to all hosts on <network>.
+---kill      or -k                Kill iplog, if it is running.
+---restart   or -R                Restart iplog, if it is running.
+---no-fork   or -o                Run in the foreground.
+---stdout    or -L                Log to stdout.
+---help      or -h                This help screen.
+---version   or -v                Print version information and exit.
+-
+---facility <facility>            Use the specified syslog facility.
+---priority <priority>            Use the specified syslog priority.
+-
+---tcp[=true|false|toggle]                      %cLog TCP traffic.
+---udp[=true|false|toggle]                      %cLog UDP traffic.
+---icmp[=true|false|toggle]                     %cLog ICMP traffic.
+-
+---log-ip[=true|false|toggle]            or -w  %cLog IP along with hostname.
+---log-dest[=true|false|toggle]          or -D  %cLog the destination of traffic.
+---dns-cache[=true|false|toggle]         or -c  %cUse the built-in DNS cache.
+---get-ident[=true|false|toggle]         or -e  %cGet ident info on connections
+-                                                to listening ports.
+-
+---tcp-resolve[=true|false|toggle]       or -T  %cResolve IPs of TCP traffic.
+---udp-resolve[=true|false|toggle]       or -U  %cResolve IPs of UDP traffic.
+---icmp-resolve[=true|false|toggle]      or -I  %cResolve IPs of ICMP traffic.
+---disable-resolver                      or -N  %cDo not resolve any IPs.
+-
+---verbose[=true|false|toggle]           or -V  %cBe verbose.
+---fool-nmap[=true|false|toggle]         or -z  %cFool nmap's OS detection.
+---scans-only[=true|false|toggle]        or -m  %cOnly log scans.
+---detect-syn-flood[=true|false|toggle]  or -s  %cStop resolving IPs if a
+-                                                SYN flood is detected.
+-
+---log-frag[=true|false|toggle]          or -y  %cLog fragment attacks.
+---log-traceroute[=true|false|toggle]    or -t  %cLog traceroutes.
+---log-ping-flood[=true|false|toggle]    or -P  %cLog ICMP ping floods.
+---log-smurf[=true|false|toggle]         or -S  %cLog smurf attacks.
+---log-bogus[=true|false|toggle]         or -b  %cLog bogus TCP flags.
+---log-portscan[=true|false|toggle]      or -p  %cLog port scans.
+---log-udp-scan[=true|false|toggle]      or -F  %cLog UDP scans/floods.
+---log-fin-scan[=true|false|toggle]      or -f  %cLog FIN scans.
+---log-syn-scan[=true|false|toggle]      or -q  %cLog SYN scans.
+---log-xmas-scan[=true|false|toggle]     or -x  %cLog Xmas scans.
+---log-null-scan[=true|false|toggle]     or -n  %cLog null scans.",
+-IS_DEFAULT(LOG_TCP),	IS_DEFAULT(LOG_UDP),	IS_DEFAULT(LOG_ICMP),
++"Usage: %s [options] (\"*\" Denotes enabled by default)\n"
++"--user      or -u <user|UID>     Run as specified the user or UID.\n"
++"--group     or -g <group|GID>    Run with specified the group or GID.\n"
++"--logfile   or -l <file>         Log to <file>.\n"
++"--pid-file  <file>               Use <file> as the pid file.\n"
++"--ignore    or -d                Ignore DNS traffic from nameservers listed in\n"
++"                                 /etc/resolv.conf.\n"
++"--interface or -i <if0,...,ifN>  Listen on the specified interface(s).\n"
++"--promisc   or -a <network>      Log traffic to all hosts on <network>.\n"
++"--kill      or -k                Kill iplog, if it is running.\n"
++"--restart   or -R                Restart iplog, if it is running.\n"
++"--no-fork   or -o                Run in the foreground.\n"
++"--stdout    or -L                Log to stdout.\n"
++"--help      or -h                This help screen.\n"
++"--version   or -v                Print version information and exit.\n"
++"\n"
++"--facility <facility>            Use the specified syslog facility.\n"
++"--priority <priority>            Use the specified syslog priority.\n"
++"\n"
++"--tcp[=true|false|toggle]                      %cLog TCP traffic.\n"
++"--udp[=true|false|toggle]                      %cLog UDP traffic.\n"
++"--icmp[=true|false|toggle]                     %cLog ICMP traffic.\n"
++"\n"
++"--log-ip[=true|false|toggle]            or -w  %cLog IP along with hostname.\n"
++"--log-dest[=true|false|toggle]          or -D  %cLog the destination of traffic.\n"
++"--dns-cache[=true|false|toggle]         or -c  %cUse the built-in DNS cache.\n"
++"--get-ident[=true|false|toggle]         or -e  %cGet ident info on connections\n"
++"                                                to listening ports.\n"
++"\n"
++"--tcp-resolve[=true|false|toggle]       or -T  %cResolve IPs of TCP traffic.\n"
++"--udp-resolve[=true|false|toggle]       or -U  %cResolve IPs of UDP traffic.\n"
++"--icmp-resolve[=true|false|toggle]      or -I  %cResolve IPs of ICMP traffic.\n"
++"--disable-resolver                      or -N  %cDo not resolve any IPs.\n"
++"\n"
++"--verbose[=true|false|toggle]           or -V  %cBe verbose.\n"
++"--fool-nmap[=true|false|toggle]         or -z  %cFool nmap's OS detection.\n"
++"--scans-only[=true|false|toggle]        or -m  %cOnly log scans.\n"
++"--detect-syn-flood[=true|false|toggle]  or -s  %cStop resolving IPs if a\n"
++"                                                SYN flood is detected.\n"
++"\n"
++"--log-frag[=true|false|toggle]          or -y  %cLog fragment attacks.\n"
++"--log-traceroute[=true|false|toggle]    or -t  %cLog traceroutes.\n"
++"--log-ping-flood[=true|false|toggle]    or -P  %cLog ICMP ping floods.\n"
++"--log-smurf[=true|false|toggle]         or -S  %cLog smurf attacks.\n"
++"--log-bogus[=true|false|toggle]         or -b  %cLog bogus TCP flags.\n"
++"--log-portscan[=true|false|toggle]      or -p  %cLog port scans.\n"
++"--log-udp-scan[=true|false|toggle]      or -F  %cLog UDP scans/floods.\n"
++"--log-fin-scan[=true|false|toggle]      or -f  %cLog FIN scans.\n"
++"--log-syn-scan[=true|false|toggle]      or -q  %cLog SYN scans.\n"
++"--log-xmas-scan[=true|false|toggle]     or -x  %cLog Xmas scans.\n"
++"--log-null-scan[=true|false|toggle]     or -n  %cLog null scans.",
++PACKAGE, IS_DEFAULT(LOG_TCP),	IS_DEFAULT(LOG_UDP),	IS_DEFAULT(LOG_ICMP),
+ IS_DEFAULT(LOG_IP),		IS_DEFAULT(LOG_DEST),	IS_DEFAULT(DNS_CACHE),
+ IS_DEFAULT(GET_IDENT),	IS_DEFAULT(TCP_RES),	IS_DEFAULT(UDP_RES),
+ IS_DEFAULT(ICMP_RES),	IS_DEFAULT(NO_RESOLV),	IS_DEFAULT(VERBOSE),
+diff -ruN iplog-2.2.3.orig/src/iplog_pcap.c iplog-2.2.3/src/iplog_pcap.c
+--- iplog-2.2.3.orig/src/iplog_pcap.c	2001-01-01 17:02:14.000000000 +0100
++++ iplog-2.2.3/src/iplog_pcap.c	2003-09-04 16:03:41.000000000 +0200
+@@ -189,8 +189,16 @@
+ 		case DLT_PPP_BSDOS:
+ 			dlt = 24;
+ 			break;
+-		case DLT_SLIP:
+-			dlt = 16;
++#ifdef DLT_FDDI
++	        case DLT_FDDI:
++	                dlt = 21;
++	                break;
++#endif
++	        case DLT_SLIP:
++#ifdef DLT_LINUX_SLL
++	        case DLT_LINUX_SLL:
++#endif
++	                dlt = 16;
+ 			break;
+ 		case DLT_PPP:
+ 		case DLT_NULL:
diff --git a/net-analyzer/iplog/files/digest-iplog-2.2.3-r1 b/net-analyzer/iplog/files/digest-iplog-2.2.3-r1
new file mode 100644
index 000000000000..15654566682b
--- /dev/null
+++ b/net-analyzer/iplog/files/digest-iplog-2.2.3-r1
@@ -0,0 +1 @@
+MD5 de98dd64018ab10ebe36e481cf00b7db iplog-2.2.3.tar.gz 133639
diff --git a/net-analyzer/iplog/iplog-2.2.3-r1.ebuild b/net-analyzer/iplog/iplog-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..da23c0d53f5a
--- /dev/null
+++ b/net-analyzer/iplog/iplog-2.2.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iplog/iplog-2.2.3-r1.ebuild,v 1.1 2003/10/19 03:04:06 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="iplog is a TCP/IP traffic logger"
+HOMEPAGE="http://ojnk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="GPL-2 | FDL-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="net-libs/libpcap"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-DLT_LINUX_SSL.patch
+}
+
+src_compile() {
+	econf || die
+	make CFLAGS="${CFLAGS} -D_REENTRANT" all || die
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		install || die
+	dodoc AUTHORS COPYING.* NEWS README TODO example-iplog.conf
+}