jer 14/07/12 18:04:05
Modified: ippl-1.4.14-includes.patch
ippl-1.4.14-privilege-drop.patch
ippl-1.4.14-manpage.patch
ippl-1.4.14-noportresolve.patch ippl.rc
Log:
Clean up sed scripts. Use /run not /var/run in init script. Clean up patches.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2 net-analyzer/ippl/files/ippl-1.4.14-includes.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-includes.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-includes.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-includes.patch?r1=1.1&r2=1.2
Index: ippl-1.4.14-includes.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ippl-1.4.14-includes.patch 15 Sep 2010 00:29:43 -0000 1.1
+++ ippl-1.4.14-includes.patch 12 Jul 2014 18:04:05 -0000 1.2
@@ -1,5 +1,5 @@
---- a/Source/filter.c 2010-09-15 02:17:55.000000000 +0200
-+++ b/Source/filter.c 2010-09-15 02:23:46.000000000 +0200
+--- a/Source/filter.c
++++ b/Source/filter.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
@@ -8,8 +8,8 @@
#include <fnmatch.h>
---- a/Source/main.c 2010-09-15 02:17:56.000000000 +0200
-+++ b/Source/main.c 2010-09-15 02:24:00.000000000 +0200
+--- a/Source/main.c
++++ b/Source/main.c
@@ -37,6 +37,7 @@
#include <pwd.h>
#include <stdlib.h>
1.2 net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch?r1=1.1&r2=1.2
Index: ippl-1.4.14-privilege-drop.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ippl-1.4.14-privilege-drop.patch 5 Jun 2008 13:12:14 -0000 1.1
+++ ippl-1.4.14-privilege-drop.patch 12 Jul 2014 18:04:05 -0000 1.2
@@ -1,7 +1,7 @@
privilege-drop by Marc Haber <[email protected]>
---- trunk~/Source/icmp.c 2001-09-28 20:47:58.000000000 +0200
-+++ trunk/Source/icmp.c 2007-05-20 12:05:24.000000000 +0200
+--- a/Source/icmp.c
++++ b/Source/icmp.c
@@ -39,6 +39,8 @@
#include "log.h"
#include "filter.h"
@@ -31,8 +31,8 @@
for(;;) {
if (read(icmp_socket, (__u8 *) &pkt, ICMP_CAPTURE_LENGTH) == -1) {
---- trunk~/Source/main.c 2000-04-21 21:37:49.000000000 +0200
-+++ trunk/Source/main.c 2007-05-20 12:05:24.000000000 +0200
+--- a/Source/main.c
++++ b/Source/main.c
@@ -153,6 +153,17 @@
run_thread(&udp_t, log_udp, (void *)account);
}
@@ -76,8 +76,8 @@
signal(SIGHUP, sighup);
}
---- trunk~/Source/tcp.c 2001-09-29 15:27:01.000000000 +0200
-+++ trunk/Source/tcp.c 2007-05-20 12:05:24.000000000 +0200
+--- a/Source/tcp.c
++++ b/Source/tcp.c
@@ -44,6 +44,8 @@
#include "filter.h"
#include "configuration.h"
@@ -107,8 +107,8 @@
for(;;) {
if (read(tcp_socket, (__u8 *) &pkt, TCP_CAPTURE_LENGTH) == -1) {
---- trunk~/Source/udp.c 2001-09-28 20:47:35.000000000 +0200
-+++ trunk/Source/udp.c 2007-05-20 12:05:24.000000000 +0200
+--- a/Source/udp.c
++++ b/Source/udp.c
@@ -39,6 +39,8 @@
#include "filter.h"
#include "configuration.h"
1.3 net-analyzer/ippl/files/ippl-1.4.14-manpage.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch?r1=1.2&r2=1.3
Index: ippl-1.4.14-manpage.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ippl-1.4.14-manpage.patch 17 Nov 2008 21:50:21 -0000 1.2
+++ ippl-1.4.14-manpage.patch 12 Jul 2014 18:04:05 -0000 1.3
@@ -1,7 +1,7 @@
patch by Marc Haber <[email protected]>
---- a/Docs/ippl.conf.man 2000-11-05 22:03:47.000000000 +0000
-+++ b/Docs/ippl.conf.man 2005-03-19 20:53:38.340875122 +0000
+--- a/Docs/ippl.conf.man
++++ b/Docs/ippl.conf.man
@@ -222,9 +222,7 @@
.SS Protocol
.PP
1.2 net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch?r1=1.1&r2=1.2
Index: ippl-1.4.14-noportresolve.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ippl-1.4.14-noportresolve.patch 5 Jun 2008 13:12:14 -0000 1.1
+++ ippl-1.4.14-noportresolve.patch 12 Jul 2014 18:04:05 -0000 1.2
@@ -1,7 +1,7 @@
patch by Marc Haber <[email protected]>
---- Docs/ippl.conf.man 2008-06-05 12:39:24 +0000
-+++ Docs/ippl.conf.man 2008-06-05 12:46:02 +0000
+--- a/Docs/ippl.conf.man
++++ b/Docs/ippl.conf.man
@@ -92,6 +92,13 @@
.PP
By default, IP address resolution is disabled for all the protocols.
@@ -30,8 +30,8 @@
use ident logging (only for TCP).
.PP
---- Source/configuration.c 2008-06-05 12:39:24 +0000
-+++ Source/configuration.c 2008-06-05 12:46:02 +0000
+--- a/Source/configuration.c
++++ b/Source/configuration.c
@@ -60,6 +60,7 @@
extern unsigned int dns_expire;
extern unsigned short log_protocols;
@@ -49,8 +49,8 @@
tcp_format = LOGFORMAT_NORMAL;
udp_format = LOGFORMAT_NORMAL;
---- Source/filter.c 2008-06-05 12:39:24 +0000
-+++ Source/filter.c 2008-06-05 12:46:02 +0000
+--- a/Source/filter.c
++++ b/Source/filter.c
@@ -46,6 +46,7 @@
extern unsigned short use_ident;
@@ -114,8 +114,8 @@
#ifdef FILTER_DEBUG
---- Source/filter.h 2008-06-05 12:39:24 +0000
-+++ Source/filter.h 2008-06-05 12:46:02 +0000
+--- a/Source/filter.h
++++ b/Source/filter.h
@@ -53,6 +53,7 @@
struct filter_entry {
short log; /* TRUE for "log", FALSE for "ignore" */
@@ -133,8 +133,8 @@
short logformat;
};
---- Source/ippl.l 2008-06-05 12:39:24 +0000
-+++ Source/ippl.l 2008-06-05 12:46:02 +0000
+--- a/Source/ippl.l
++++ b/Source/ippl.l
@@ -75,6 +75,9 @@
[lL][oO][gG][cC][lL][oO][sS][iI][nN][gG] return LOGCLOSING;
[nN][oO][lL][oO][gG][cC][lL][oO][sS][iI][nN][gG] return NOLOGCLOSING;
@@ -146,8 +146,8 @@
[rR][eE][sS][oO][lL][vV][eE] return RESOLVE;
---- Source/ippl.y 2008-06-05 12:39:24 +0000
-+++ Source/ippl.y 2008-06-05 12:46:02 +0000
+--- a/Source/ippl.y
++++ b/Source/ippl.y
@@ -61,6 +61,7 @@
/* Should name resolving be done? */
@@ -203,8 +203,8 @@
| NORMAL { switches.logformat = LOGFORMAT_NORMAL; }
| DETAILED { switches.logformat = LOGFORMAT_DETAILED; }
---- Source/main.c 2008-06-05 12:39:24 +0000
-+++ Source/main.c 2008-06-05 12:46:02 +0000
+--- a/Source/main.c
++++ b/Source/main.c
@@ -48,6 +48,10 @@
#include "filter.h"
#include "pidfile.h"
@@ -217,8 +217,8 @@
struct loginfo log;
---- Source/netutils.c 2008-06-05 12:39:24 +0000
-+++ Source/netutils.c 2008-06-05 12:46:02 +0000
+--- a/Source/netutils.c
++++ b/Source/netutils.c
@@ -237,15 +237,21 @@
* Get a service name for a specified protocol
*/
@@ -247,8 +247,8 @@
pthread_mutex_unlock(&service_mutex);
}
---- Source/netutils.h 2008-06-05 12:39:24 +0000
-+++ Source/netutils.h 2008-06-05 12:46:02 +0000
+--- a/Source/netutils.h
++++ b/Source/netutils.h
@@ -53,6 +53,6 @@
const __u32 src_addr, const __u16 src_port,
const __u32 dst_addr, const __u16 dst_port);
@@ -258,8 +258,8 @@
#endif
---- Source/tcp.c 2008-06-05 12:39:24 +0000
-+++ Source/tcp.c 2008-06-05 12:46:02 +0000
+--- a/Source/tcp.c
++++ b/Source/tcp.c
@@ -51,6 +51,7 @@
struct loginfo tcp_log;
extern struct loginfo log;
@@ -287,8 +287,8 @@
get_details(details,
IPHDR.saddr,
---- Source/udp.c 2008-06-05 12:39:24 +0000
-+++ Source/udp.c 2008-06-05 12:46:02 +0000
+--- a/Source/udp.c
++++ b/Source/udp.c
@@ -81,7 +81,7 @@
*details ='\0';
host_print(remote_host, IPHDR.saddr,
@@ -299,8 +299,8 @@
get_details(details,
IPHDR.saddr,
---- ippl.conf 2008-06-05 12:39:24 +0000
-+++ ippl.conf 2008-06-05 12:48:36 +0000
+--- a/ippl.conf
++++ b/ippl.conf
@@ -4,13 +4,15 @@
# User used
# ---------
1.6 net-analyzer/ippl/files/ippl.rc
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl.rc?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl.rc?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ippl/files/ippl.rc?r1=1.5&r2=1.6
Index: ippl.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl.rc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ippl.rc 2 Apr 2005 13:17:01 -0000 1.5
+++ ippl.rc 12 Jul 2014 18:04:05 -0000 1.6
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl.rc,v 1.5
2005/04/02 13:17:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl.rc,v 1.6
2014/07/12 18:04:05 jer Exp $
depend() {
need net
@@ -19,19 +19,13 @@
start() {
checkconfig || return $?
ebegin "Starting ippl"
- start-stop-daemon --start --quiet --pidfile /var/run/ippl.pid \
- --startas /usr/sbin/ippl
+ start-stop-daemon --start --quiet --pidfile /run/ippl.pid \
+ --exec /usr/sbin/ippl
eend $? "Failed to start ippl"
}
stop() {
ebegin "Stopping ippl"
- start-stop-daemon --stop --quiet --pidfile /var/run/ippl.pid
+ start-stop-daemon --stop --quiet --pidfile /run/ippl.pid
eend $? "Failed to stop ippl"
-
- # clean stale pidfile
- if [ -f /var/run/ippl.pid ]
- then
- rm -f /var/run/ippl.pid
- fi
}
