Changes - j0ke.net Open Build Service

Changes of Revision 117

[-] [+]	Changed	nprobe.changes
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 4 07:34:06 UTC 2014 - cs@linux-administrator.com + +- update to relese 7.0.141102_svn4504 +- revert nDPI update + +------------------------------------------------------------------- Tue Nov 4 06:19:25 UTC 2014 - cs@linux-administrator.com - update to release 7.0.140924_svn4395
[-] [+]	Changed	nprobe.spec ^
@@ -1,6 +1,7 @@ #!BuildIgnore: post-build-checks +%define _inc_plugins 0 %define _default_patch_fuzz 3 -%define reldate 140924_svn4395 +%define reldate 141102_svn4504 %define sodate %(date +%%y%%m%%d) %define pfringver 6.0.2 Name: nprobe @@ -10,7 +11,11 @@ Summary: Netflow Probe Url: http://www.nmon.net/ License: GPL +%if 0%{?_inc_plugins} == 1 Source0: %{name}_%{version}.%{reldate}_proplugins.tgz +%else +Source0: %{name}_%{version}.%{reldate}.tgz +%endif Source1: GeoLiteCity.dat.gz Source2: GeoIPASNum.dat.gz Source3: GeoIPASNumv6.dat.gz @@ -82,7 +87,12 @@ NProbe development files. %prep +%if 0%{?_inc_plugins} == 1 %setup -n %{name}_%{version}.%{reldate}_proplugins -a 8 -b 9 +%else +%setup -n %{name}_%{version}.%{reldate} -a 8 -b 9 +%endif + %patch1 # since 7.0 not needed ##%patch2 @@ -95,6 +105,9 @@ mv PF_RING-%{pfringver} PF_RING %build +# for better debugging +%define optflags -g + # pre build libpfring & libpcap of PF_RING pre=`pwd` cd ../PF_RING/userland/lib @@ -127,11 +140,15 @@ gunzip GeoIPASNumv6.dat.gz %__make DESTDIR=%{buildroot} install %__install -d %{buildroot}%{_prefix}/lib/nprobe +%if 0%{?_inc_plugins} == 1 %__install -d %{buildroot}%{_prefix}/lib/nprobe/plugins +%endif cp GeoLiteCity.dat %{buildroot}%{_prefix}/lib/nprobe/ cp GeoIPASNum.dat %{buildroot}%{_prefix}/lib/nprobe/ cp GeoIPASNumv6.dat %{buildroot}%{_prefix}/lib/nprobe/ +%if 0%{?_inc_plugins} == 1 find %{buildroot}%{_prefix}/lib/nprobe/plugins -type l -exec rm {} \; +%endif %__install -D -m755 %{S:6} %{buildroot}%{_sysconfdir}/init.d/%{name} %if 0%{?suse_version} %__install -D -m644 %{S:7} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} @@ -188,14 +205,18 @@ %{_sbindir}/rcnprobe %{_bindir}/nprobe %dir %{_prefix}/lib/nprobe +%if 0%{?_inc_plugins} == 1 %dir %{_prefix}/lib/nprobe/plugins +%endif %{_prefix}/lib/nprobe/GeoIPASNum.dat %{_prefix}/lib/nprobe/GeoIPASNumv6.dat %{_prefix}/lib/nprobe/GeoLiteCity.dat +%if 0%{?_inc_plugins} == 1 %{_prefix}/lib/nprobe/plugins/libdbPlugin-%{version}.%{sodate}.so #%{_prefix}/lib/nprobe/plugins/libdbPlugin.la %{_prefix}/lib/nprobe/plugins/libbgpPlugin-%{version}.%{sodate}.so #%{_prefix}/lib/nprobe/plugins/libbgpPlugin.la +%endif %{_libdir}/libnprobe-%{version}.%{sodate}.so #%{_libdir}/libnprobe.la %{_libdir}/libnprobe.so
	Added	nprobe_7.0.141102_svn4504.tgz ^