jer 14/07/14 16:15:53
Modified: ndsad.init
Added: ndsad-1.33-gentoo.patch ndsad-1.33-getpid.patch
ndsad-1.33-log-path.patch
ndsad-1.33-conf_path.patch
ndsad-1.33-strncpy-overflow.patch
Log:
EAPI bump. Fix a buffer overflow, missing getpid include. Move sed script
output to patch. Respect C/XXFLAGS.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.3 net-analyzer/ndsad/files/ndsad.init
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad.init?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad.init?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad.init?r1=1.2&r2=1.3
Index: ndsad.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ndsad/files/ndsad.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ndsad.init 15 Jan 2006 18:31:41 -0000 1.2
+++ ndsad.init 14 Jul 2014 16:15:52 -0000 1.3
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2006 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/ndsad/files/ndsad.init,v 1.2
2006/01/15 18:31:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndsad/files/ndsad.init,v 1.3
2014/07/14 16:15:52 jer Exp $
depend() {
need net
@@ -28,6 +28,6 @@
stop () {
ebegin "Stopping ndsad"
- start-stop-daemon --stop --quiet --pidfile=/var/run/ndsad.pid --retry
20 >/dev/null
+ start-stop-daemon --stop --quiet --pidfile=/run/ndsad.pid --retry 20
>/dev/null
eend $?
}
1.1 net-analyzer/ndsad/files/ndsad-1.33-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-gentoo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-gentoo.patch?rev=1.1&content-type=text/plain
Index: ndsad-1.33-gentoo.patch
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -24,9 +24,6 @@
AC_DEFINE(OS_BSD, 2,[BSD OS code])
AC_DEFINE(OS_SOLARIS, 3,[SOLARIS on SPARC code])
-CFLAGS=-g
-CXXFLAGS=-g
-
AC_CHECK_LIB(pcap, pcap_loop, [LIBS="$LIBS -lpcap"; __ac_have_libpcap=1;], [
break ])
case "$host_os" in
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-bin_PROGRAMS = ndsad
+sbin_PROGRAMS = ndsad
ndsad_SOURCES = linux_ulog.cc linux_ulog.h debug.h eth-hndl.h handlers.h
iflist.h iptonf.h ldefs.h logger.h mempool.h nethdr.h nfc.h nf.h ppp-hndl.h
thr.h config.cc debug.cc eth-hndl.cc handlers.cc iflist.cc iptonf.cc logger.cc
mempool.cc ndsad.cc nf.cc nfc.cc ppp-hndl.cc thr.cc bsd_divert.cc bsd_divert.h
-ndsad_CXXFLAGS = $(AM_CXXFLAGS) -O0 -fno-inline -g -ftemplate-depth-32
+ndsad_CXXFLAGS = $(AM_CXXFLAGS) -fno-inline -ftemplate-depth-32
ndsad_LDFLAGS = $(AM_LDFLAGS)
1.1 net-analyzer/ndsad/files/ndsad-1.33-getpid.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-getpid.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-getpid.patch?rev=1.1&content-type=text/plain
Index: ndsad-1.33-getpid.patch
===================================================================
--- a/linux_ulog.h
+++ b/linux_ulog.h
@@ -8,6 +8,7 @@
#include <pthread.h>
#include <iostream>
#include <sys/types.h>
+#include <unistd.h> /* getpid() */
#include <sys/socket.h>
/// linux specific headers!
1.1 net-analyzer/ndsad/files/ndsad-1.33-log-path.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-log-path.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-log-path.patch?rev=1.1&content-type=text/plain
Index: ndsad-1.33-log-path.patch
===================================================================
--- a/ndsad.conf
+++ b/ndsad.conf
@@ -75,7 +75,7 @@
# Default:
#log (null)
# Example:
-log /tmp/ndsad.log
+log /var/log/ndsad.log
# Jump to another configuration file
# Current file is closed after this line! Beware of loops!
1.1 net-analyzer/ndsad/files/ndsad-1.33-conf_path.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-conf_path.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-conf_path.patch?rev=1.1&content-type=text/plain
Index: ndsad-1.33-conf_path.patch
===================================================================
--- a/ndsad.cc
+++ b/ndsad.cc
@@ -12,7 +12,7 @@
*/
-#define conf_path "/netup/utm5/ndsad.cfg"
+#define conf_path "/etc/ndsad.conf"
#include "pcap.local.h"
1.1 net-analyzer/ndsad/files/ndsad-1.33-strncpy-overflow.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-strncpy-overflow.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndsad/files/ndsad-1.33-strncpy-overflow.patch?rev=1.1&content-type=text/plain
Index: ndsad-1.33-strncpy-overflow.patch
===================================================================
--- a/handlers.h
+++ b/handlers.h
@@ -30,7 +30,8 @@
#ifdef WIN32
#define IFN_SIZE 512 // on windows iface names are VEERY long
#else
-#define IFN_SIZE 32 // iface name size. As in linux/sockios.h
+#include <net/if.h>
+#define IFN_SIZE IFNAMSIZ // iface name size. As in linux/sockios.h
#endif
#define MPH_IFLIST 0x2 // iface type - for mempool
