Hello community, here is the log from the commit of package iptraf-ng for openSUSE:Factory checked in at 2020-06-11 10:09:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iptraf-ng (Old) and /work/SRC/openSUSE:Factory/.iptraf-ng.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iptraf-ng" Thu Jun 11 10:09:53 2020 rev:2 rq:813275 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/iptraf-ng/iptraf-ng.changes 2020-01-18 12:18:09.815139953 +0100 +++ /work/SRC/openSUSE:Factory/.iptraf-ng.new.3606/iptraf-ng.changes 2020-06-11 10:11:56.448555610 +0200 @@ -1,0 +2,12 @@ +Wed Jun 10 14:44:22 UTC 2020 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 1.2.0 + * A set of minor bugfixes. + * Fix CPU hogging if the interface gets removed [rhbz#1572750] +- Drop iptraf-ng-1.1.4-fix-Floating-point-exception-in-tcplog_flowra.patch, + build-use-wide-version-of-lpanel-when-needed.patch, + 0001-ifstats-make-sort-by-ifname-the-only-mode-of-operati.patch + (merged) +- Add 0001-Revert-TPACKET_V3-mlock-mmap-ed-address-space-into-R.patch + +------------------------------------------------------------------- Old: ---- 0001-ifstats-make-sort-by-ifname-the-only-mode-of-operati.patch build-use-wide-version-of-lpanel-when-needed.patch iptraf-ng-1.1.4-fix-Floating-point-exception-in-tcplog_flowra.patch v1.1.4.tar.gz New: ---- 0001-Revert-TPACKET_V3-mlock-mmap-ed-address-space-into-R.patch v1.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptraf-ng.spec ++++++ --- /var/tmp/diff_new_pack.dr3iMi/_old 2020-06-11 10:11:58.312561574 +0200 +++ /var/tmp/diff_new_pack.dr3iMi/_new 2020-06-11 10:11:58.316561587 +0200 @@ -17,7 +17,7 @@ Name: iptraf-ng -Version: 1.1.4 +Version: 1.2.0 Release: 0 Summary: TCP/IP Network Monitor License: GPL-2.0-or-later @@ -25,9 +25,7 @@ URL: https://github.com/iptraf-ng/iptraf-ng/ Source: https://github.com/iptraf-ng/iptraf-ng/archive/v%version.tar.gz -Patch1: iptraf-ng-1.1.4-fix-Floating-point-exception-in-tcplog_flowra.patch -Patch2: build-use-wide-version-of-lpanel-when-needed.patch -Patch3: 0001-ifstats-make-sort-by-ifname-the-only-mode-of-operati.patch +Patch1: 0001-Revert-TPACKET_V3-mlock-mmap-ed-address-space-into-R.patch Obsoletes: iptraf < 4 # Just pick a number that is >3 Provides: iptraf = 4 @@ -45,12 +43,10 @@ %autosetup -n %name-%version -p1 %build -if [ ! -e configure ]; then autoreconf -fi; fi -%configure -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="%optflags -D_GNU_SOURCE" V=1 %install -%make_install +%make_install prefix="%_prefix" V=1 b="%buildroot" install -dm 0755 "$b/%_localstatedir/lib/iptraf-ng" ln -s iptraf-ng "$b/%_sbindir/iptraf" @@ -58,9 +54,7 @@ %files %_sbindir/iptraf* -%_sbindir/rvnamed* %_mandir/man8/iptraf* -%_mandir/man8/rvnamed* %_localstatedir/lib/iptraf-ng %changelog ++++++ 0001-Revert-TPACKET_V3-mlock-mmap-ed-address-space-into-R.patch ++++++ >From 3eca8d3c345f6fff90111cac7ef707da7cb7cb80 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jeng...@inai.de> Date: Wed, 10 Jun 2020 17:04:00 +0200 Subject: [PATCH] Revert "TPACKET_V3: mlock() mmap()ed address space into RAM" References: https://github.com/iptraf-ng/iptraf-ng/issues/26 This reverts commit 043b0387fbd11670b8b09fc5bde168345648d32d. --- src/capt-mmap-v3.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/capt-mmap-v3.c b/src/capt-mmap-v3.c index 1b2b652..fd0bf50 100644 --- a/src/capt-mmap-v3.c +++ b/src/capt-mmap-v3.c @@ -101,8 +101,6 @@ static void capt_cleanup_mmap_v3(struct capt *capt) struct capt_data_mmap_v3 *data = capt->priv; free(data->pbds); - - munlock(data->mmap, data->mmap_size); munmap(data->mmap, data->mmap_size); memset(data, 0, sizeof(*data)); @@ -140,11 +138,7 @@ int capt_setup_mmap_v3(struct capt *capt) void *map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, capt->fd, 0); if (map == MAP_FAILED) return -1; - - if (mlock(map, size) != 0) { - munmap(map, size); - return -1; - } + /* mlock() ??? */ struct capt_data_mmap_v3 *data = xmallocz(sizeof(struct capt_data_mmap_v3)); -- 2.26.2 ++++++ v1.1.4.tar.gz -> v1.2.0.tar.gz ++++++ ++++ 42366 lines of diff (skipped)
