diff --git a/0001-Revert-TPACKET_V3-mlock-mmap-ed-address-space-into-R.patch b/0001-Revert-TPACKET_V3-mlock-mmap-ed-address-space-into-R.patch deleted file mode 100644 index e96909a..0000000 --- a/0001-Revert-TPACKET_V3-mlock-mmap-ed-address-space-into-R.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3eca8d3c345f6fff90111cac7ef707da7cb7cb80 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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 - diff --git a/iptraf-ng.changes b/iptraf-ng.changes index 089cf0d..e2c8547 100644 --- a/iptraf-ng.changes +++ b/iptraf-ng.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Aug 16 14:11:17 UTC 2020 - Dirk Mueller + +- update to 1.2.1: + * Makefile: protect mandatory compile flags + * packet capture: don't reuse socket for multiple receive functions + * TPACKET_V[23]: continue even if mlock() fails +- remove 0001-Revert-TPACKET_V3-mlock-mmap-ed-address-space-into-R.patch: + fixed differently upstream + ------------------------------------------------------------------- Wed Jun 10 14:44:22 UTC 2020 - Jan Engelhardt diff --git a/iptraf-ng.spec b/iptraf-ng.spec index 713a9da..8a4b553 100644 --- a/iptraf-ng.spec +++ b/iptraf-ng.spec @@ -17,21 +17,19 @@ Name: iptraf-ng -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: TCP/IP Network Monitor License: GPL-2.0-or-later Group: Productivity/Networking/Diagnostic URL: https://github.com/iptraf-ng/iptraf-ng/ - -Source: https://github.com/iptraf-ng/iptraf-ng/archive/v%version.tar.gz -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 +Source: https://github.com/iptraf-ng/iptraf-ng/archive/v%{version}.tar.gz BuildRequires: automake BuildRequires: ncurses-devel BuildRequires: xz +Obsoletes: iptraf < 4 +# Just pick a number that is >3 +Provides: iptraf = 4 %description IPTraf-ng is a console-based network statistics utility. It gathers a @@ -40,21 +38,21 @@ interface statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN station packet and byte counts. %prep -%autosetup -n %name-%version -p1 +%autosetup -n %{name}-%{version} -p1 %build -make %{?_smp_mflags} CFLAGS="%optflags -D_GNU_SOURCE" V=1 +%make_build CFLAGS="%{optflags} -D_GNU_SOURCE" %install -%make_install prefix="%_prefix" V=1 -b="%buildroot" -install -dm 0755 "$b/%_localstatedir/lib/iptraf-ng" -ln -s iptraf-ng "$b/%_sbindir/iptraf" -ln -s iptraf-ng.8 "$b/%_mandir/man8/iptraf.8" +%make_install prefix="%{_prefix}" V=1 +b=%{buildroot} +install -dm 0755 "$b/%{_localstatedir}/lib/iptraf-ng" +ln -s iptraf-ng "$b/%{_sbindir}/iptraf" +ln -s iptraf-ng.8 "$b/%{_mandir}/man8/iptraf.8" %files -%_sbindir/iptraf* -%_mandir/man8/iptraf* -%_localstatedir/lib/iptraf-ng +%{_sbindir}/iptraf* +%{_mandir}/man8/iptraf* +%{_localstatedir}/lib/iptraf-ng %changelog diff --git a/v1.2.0.tar.gz b/v1.2.0.tar.gz deleted file mode 100644 index 9e4695c..0000000 --- a/v1.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9725115e501d083674d50a7686029d3a08f920abd35c9a2d4a28b5ddb782417f -size 324969 diff --git a/v1.2.1.tar.gz b/v1.2.1.tar.gz new file mode 100644 index 0000000..6af2e1d --- /dev/null +++ b/v1.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870 +size 325177