diff --git a/netsniff-ng-0.5.9.tar.xz b/netsniff-ng-0.5.9.tar.xz deleted file mode 100644 index 811785c..0000000 --- a/netsniff-ng-0.5.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0156074bdd146dd71edcd63fa3944b658a3bce5279e0a4128578636a9700b6c -size 541304 diff --git a/netsniff-ng-0.6.0.tar.xz b/netsniff-ng-0.6.0.tar.xz new file mode 100644 index 0000000..3b080e8 --- /dev/null +++ b/netsniff-ng-0.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2e77d49e2f3aed78838827695bb2efade79e8d7126c7d81656425fd1bd56159 +size 554612 diff --git a/netsniff-ng-fix-manpage-perms.diff b/netsniff-ng-fix-manpage-perms.diff deleted file mode 100644 index 3676a85..0000000 --- a/netsniff-ng-fix-manpage-perms.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Template b/Template -index 3410769..7144981 100644 ---- a/Template -+++ b/Template -@@ -10,7 +10,7 @@ define TOOL_templ - $(1)_do_install: - $(Q)$$(call INSTX,$(1)/$(1),$$(DESTDIR)$$(SBINDIR)) - $(Q)$(GZIP) $(1).8 > $(1)/$(1).8.gz -- $(Q)$$(call INSTX,$(1)/$(1).8.gz,$$(DESTDIR)$$(MAN8DIR)) -+ $(Q)$$(call INST,$(1)/$(1).8.gz,$$(DESTDIR)$$(MAN8DIR)) - $(Q)$$(foreach file,$$($(1)-confs),$$(call INST,$$(file),$$(DESTDIR)$$(ETCDIRE));) - $(1)_install: $(1)_do_install $(1)_post_install - $(1)_uninstall: $(1)_uninstall_custom diff --git a/netsniff-ng-pkgconfig.diff b/netsniff-ng-pkgconfig.diff deleted file mode 100644 index 63b3671..0000000 --- a/netsniff-ng-pkgconfig.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure b/configure -index b02eb18..cb79136 100755 ---- a/configure -+++ b/configure -@@ -354,7 +354,7 @@ int main(void) - } - EOF - -- $CC -o $TMPDIR/nfcttest $TMPDIR/nfcttest.c -lnetfilter_conntrack >> config.log 2>&1 -+ $CC -o $TMPDIR/nfcttest $TMPDIR/nfcttest.c $(pkg-config libnetfilter_conntrack --cflags) -lnetfilter_conntrack >> config.log 2>&1 - if [ ! -x $TMPDIR/nfcttest ] ; then - echo "[NO]" - MISSING_DEFS=1 -diff --git a/flowtop/Makefile b/flowtop/Makefile -index 1bd5a0f..31d600a 100644 ---- a/flowtop/Makefile -+++ b/flowtop/Makefile -@@ -29,7 +29,8 @@ flowtop-objs += geoip.o \ - ioops.o - endif - --flowtop-eflags = $(shell $(PKG_CONFIG) --cflags ncurses) -+flowtop-eflags = $(shell $(PKG_CONFIG) --cflags ncurses) \ -+ $(shell $(PKG_CONFIG) --cflags libnetfilter_conntrack) - - flowtop-confs = tcp.conf \ - udp.conf \ diff --git a/netsniff-ng.changes b/netsniff-ng.changes index 28c3f0b..6a7c422 100644 --- a/netsniff-ng.changes +++ b/netsniff-ng.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Nov 7 11:35:51 UTC 2015 - mardnh@gmx.de + +- update to 0.6.0 +- removed patches (fixed upstream) + - netsniff-ng-pkgconfig.diff + - netsniff-ng-fix-manpage-perms.diff + ------------------------------------------------------------------- Wed Nov 4 21:36:20 UTC 2015 - mardnh@gmx.de diff --git a/netsniff-ng.spec b/netsniff-ng.spec index ac1aee4..83a6c5a 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -18,15 +18,13 @@ Name: netsniff-ng -Version: 0.5.9 +Version: 0.6.0 Release: 0 Summary: High Performance Network Sniffer for Packet Inspection License: GPL-2.0+ Group: Productivity/Networking/Diagnostic Url: http://netsniff-ng.org/ Source: http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-%{version}.tar.xz -Patch0: netsniff-ng-pkgconfig.diff -Patch1: netsniff-ng-fix-manpage-perms.diff BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -72,8 +70,6 @@ The netsniff-ng toolkit consists of the following utilities: %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build export NACL_LIB=sodium