iptraf-ng: Update to version 1.2.1

Update includes several fixes and enhancements.
The full overview of changes are located in here --> https://github.com/iptraf-ng/iptraf-ng/blob/master/CHANGES .

rvnamed has been merged into iptraf-ng. Fix division by zero patch has been merged into new version, patch is not needed anymore. logrotate configuration for iptraf-ng has been included.

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/iptraf-ng/iptraf-ng.logrotate b/config/iptraf-ng/iptraf-ng.logrotate
new file mode 100644 (file)
index 0000000..7a39856
--- /dev/null
+++ b/config/iptraf-ng/iptraf-ng.logrotate
@@ -0,0 +1,12 @@
+/var/log/iptraf-ng/*.log {
+    daily
+    rotate 5
+    compress
+    delaycompress
+    missingok
+    notifempty
+    create 0640 root root
+    sharedscripts
+    postrotate
+    endscript
+}

diff --git a/config/rootfiles/packages/iptraf-ng b/config/rootfiles/packages/iptraf-ng
index 4ad3c863d27b19553dc6f5a95eb08fd20bdc5aae..5e59e116cadb1350d0893748467f780894e0cefb 100644 (file)
--- a/config/rootfiles/packages/iptraf-ng
+++ b/config/rootfiles/packages/iptraf-ng
@@ -1,5 +1,4 @@
+etc/logrotate.d/iptraf-ng
 usr/sbin/iptraf-ng
-usr/sbin/rvnamed-ng
-var/lib/iptraf-ng
-var/lock/iptraf-ng
+#usr/share/man/man8/iptraf-ng.8
 var/log/iptraf-ng

diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng
index 3d1c4b61adcc7267731e19d81ff99edaabd00c31..3a5ace55214fd923b8793b94506f5898661e0e9a 100644 (file)
--- a/lfs/iptraf-ng
+++ b/lfs/iptraf-ng
@@ -1,6 +1,21 @@
 ###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -9,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.4
+VER        = 1.2.1
 
 THISAPP    = iptraf-ng-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -17,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iptraf-ng
-PAK_VER           = 3
+PAK_VER           = 4
 
 DEPS       =
 
@@ -29,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = de27cfeeede96e2acfb0edc8439b034a
+$(DL_FILE)_MD5 = 3e6b425e21c7dc5df35b40799cbfe7dd
 
 install : $(TARGET)
 
@@ -63,26 +78,19 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
-       cd $(DIR_APP) && ./configure \
-               --prefix=/usr
+       cd $(DIR_APP) &&  patch -Np1 -i $(DIR_SRC)/src/patches/iptraf-ng_set_path.patch
 
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-
-       # Binary install
-       cd $(DIR_APP) && install -v -m750 -D iptraf-ng /usr/sbin/iptraf-ng
-       cd $(DIR_APP) && install -v -m750 -D rvnamed-ng /usr/sbin/rvnamed-ng
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
 
        # Directory install
        -mkdir -vp /var/log/iptraf-ng
        chmod 750 /var/log/iptraf-ng
        chown root.root /var/log/iptraf-ng
-       -mkdir -vp /var/lib/iptraf-ng
-       chmod 750 /var/lib/iptraf-ng
-       chown root.root /var/lib/iptraf-ng
-       -mkdir -vp /var/lock/iptraf-ng
-       chmod 755 /var/lock/iptraf-ng
-       chown root.root /var/lock/iptraf-ng
+
+       # Install logrotate
+       install -v -m 644 $(DIR_SRC)/config/iptraf-ng/iptraf-ng.logrotate \
+               /etc/logrotate.d/iptraf-ng
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
deleted file mode 100644 (file)
index 24a6ce4..0000000
--- a/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur iptraf-ng-1.1.4-orig/src/tcptable.c iptraf-ng-1.1.4/src/tcptable.c
---- iptraf-ng-1.1.4-orig/src/tcptable.c        2013-07-23 15:06:11.000000000 +0200
-+++ iptraf-ng-1.1.4/src/tcptable.c     2013-08-28 19:10:33.000000000 +0200
-@@ -444,6 +444,8 @@
-                                size_t bufsize)
- {
-       time_t interval = time(NULL) - entry->conn_starttime;
-+      if (interval < 1)
-+              interval = 1;
- 
-       char rbuf[64];
-       rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));

diff --git a/src/patches/iptraf-ng_set_path.patch b/src/patches/iptraf-ng_set_path.patch
new file mode 100644 (file)
index 0000000..27f20e2
--- /dev/null
+++ b/src/patches/iptraf-ng_set_path.patch
@@ -0,0 +1,12 @@
+diff -Nur iptraf-ng-1.2.1.orig/Makefile iptraf-ng-1.2.1/Makefile
+--- iptraf-ng-1.2.1.orig/Makefile      2020-09-15 14:44:55.118508574 +0000
++++ iptraf-ng-1.2.1/Makefile   2020-09-15 14:45:22.828358457 +0000
+@@ -25,7 +25,7 @@
+ ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+ 
+-prefix = $(HOME)
++prefix = /usr
+ sbindir_relative = sbin
+ sbindir = $(prefix)/$(sbindir_relative)
+ mandir = $(prefix)/share/man