From 0ebcffe2edb19e64080ddedb0ee83b41db004de8a01bc1d25b3fe78acda427ce Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 28 Dec 2018 14:25:06 +0000 Subject: [PATCH] Accepting request 660744 from home:mnhauke:security - Update to version 2.6 See /usr/share/doc/packages/libndpi2/CHANGELOG.md for the full changelog OBS-URL: https://build.opensuse.org/request/show/660744 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/ndpi?expand=0&rev=2 --- nDPI-2.0.tar.gz | 3 --- nDPI-2.6.tar.gz | 3 +++ nDPI.changes | 7 ++++++ nDPI.spec | 55 +++++++++++++++++++++++++++++++------------- ndpi-fix-build.patch | 40 ++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 19 deletions(-) delete mode 100644 nDPI-2.0.tar.gz create mode 100644 nDPI-2.6.tar.gz create mode 100644 ndpi-fix-build.patch diff --git a/nDPI-2.0.tar.gz b/nDPI-2.0.tar.gz deleted file mode 100644 index 29921c7..0000000 --- a/nDPI-2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a42a60ebd64bc8606f780204222893027f6dce0e3b460d7be655e5e065f5f3fa -size 19280901 diff --git a/nDPI-2.6.tar.gz b/nDPI-2.6.tar.gz new file mode 100644 index 0000000..eeb8e5f --- /dev/null +++ b/nDPI-2.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efdfb68940385b18079920330528978765dc2a90c8163d10f63301bddadbf91e +size 19754504 diff --git a/nDPI.changes b/nDPI.changes index 12f253b..401524b 100644 --- a/nDPI.changes +++ b/nDPI.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 22 20:38:16 UTC 2018 - mardnh@gmx.de + +- Update to version 2.6 + See /usr/share/doc/packages/libndpi2/CHANGELOG.md for the full + changelog + ------------------------------------------------------------------- Sun Oct 22 18:25:46 UTC 2017 - mardnh@gmx.de diff --git a/nDPI.spec b/nDPI.spec index e883bc8..c6e49b1 100644 --- a/nDPI.spec +++ b/nDPI.spec @@ -15,21 +15,33 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define soname 1 +%ifarch %{ix86} x86_64 +%bcond_without hyperscan +%endif + +%define sover 2 Name: nDPI -Version: 2.0 +Version: 2.6 Release: 0 Summary: Extensible deep packet inspection library -License: LGPL-3.0 +License: LGPL-3.0-only Group: Development/Libraries/C and C++ URL: https://github.com/ntop/nDPI Source: https://github.com/ntop/nDPI/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# FIXME: Upstream makefile is broken +Patch0: ndpi-fix-build.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libnuma-devel BuildRequires: libpcap-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(json-c) +BuildRequires: libnuma-devel +%if 0%{with hyperscan} +BuildRequires: pkgconfig(libhs) +%endif %description nDPI is a ntop-maintained superset of the popular OpenDPI library. Released @@ -41,11 +53,11 @@ more suitable for traffic monitoring applications, by disabling specific features that slow down the DPI engine while being them un-necessary for network traffic monitoring. -%package -n libndpi%{soname} +%package -n libndpi%{sover} Summary: Extensible deep packet inspection library Group: Development/Libraries/C and C++ -%description -n libndpi%{soname} +%description -n libndpi%{sover} nDPI is a ntop-maintained superset of the popular OpenDPI library. Released under the LGPL license, its goal is to extend the original library by adding new protocols that are otherwise available only on the paid version of OpenDPI. @@ -58,7 +70,7 @@ network traffic monitoring. %package -n libndpi-devel Summary: Development headers for nNDPI Group: Development/Libraries/C and C++ -Requires: libndpi%{soname} = %{version} +Requires: libndpi%{sover} = %{version} %description -n libndpi-devel nDPI is a ntop-maintained superset of the popular OpenDPI library. Released @@ -90,25 +102,36 @@ This package contains the ndpiReader binary. %prep %setup -q -autoreconf -fiv +%patch0 -p1 +sh autogen.sh +# FIXME: Upstream makefile is broken +%ifarch %{ix86} +sed -i 's/lib64/lib/g' src/lib/Makefile.in +%endif %build -%configure +%configure \ +%if 0%{with hyperscan} + --with-hyperscan \ +%endif + --prefix=/usr make %{?_smp_mflags} %install -%make_install -rm -f %{buildroot}/%{_libdir}/libndpi.{a,la} +%make_install PREFIX=%{_prefix} +rm -f %{buildroot}/%{_libdir}/libndpi.a -%post -n libndpi%{soname} -p /sbin/ldconfig -%postun -n libndpi%{soname} -p /sbin/ldconfig +%post -n libndpi%{sover} -p /sbin/ldconfig +%postun -n libndpi%{sover} -p /sbin/ldconfig -%files -n libndpi%{soname} -%doc CHANGELOG.md COPYING README.md README.nDPI README.protocols -%{_libdir}/libndpi.so.%{soname}* +%files -n libndpi%{sover} +%license COPYING +%doc CHANGELOG.md README.md README.nDPI README.protocols +%doc doc/nDPI_QuickStartGuide.pdf +%{_libdir}/libndpi.so.%{sover}* %files -n libndpi-devel -%{_includedir}/libndpi-2.0.0/ +%{_includedir}/ndpi %{_libdir}/libndpi.so %{_libdir}/pkgconfig/libndpi.pc diff --git a/ndpi-fix-build.patch b/ndpi-fix-build.patch new file mode 100644 index 0000000..e719191 --- /dev/null +++ b/ndpi-fix-build.patch @@ -0,0 +1,40 @@ +diff --git a/Makefile.am b/Makefile.am +index 37f0849..4090817 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = src/lib example tests + +-pkgconfigdir = $(prefix)/libdata/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libndpi.pc + + EXTRA_DIST = autogen.sh +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 0ffeb9d..2c0296a 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -10,8 +10,8 @@ + # + # Installation directories + # +-prefix = /usr/local +-libdir = ${prefix}/lib ++prefix = /usr ++libdir = ${prefix}/lib64 + includedir = ${prefix}/include/ndpi + CC = @CC@ + CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g +@@ -60,8 +60,8 @@ distclean: clean + + install: $(NDPI_LIBS) + mkdir -p $(DESTDIR)$(libdir) +- cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/ +- ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE) +- ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) ++ ln -sf $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE) ++ ln -sf $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) ++ cp -v libndpi.so* $(DESTDIR)$(libdir)/ + mkdir -p $(DESTDIR)$(includedir) + cp ../include/*.h $(DESTDIR)$(includedir)