Changes - j0ke.net Open Build Service

Changes of Revision 24

[-] [+]	Changed	snort.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat May 19 09:50:44 UTC 2012 - cs@linux-administrator.com + +- replace own IPv6 preprocessor patch with official source + +------------------------------------------------------------------- Fri May 18 19:25:04 UTC 2012 - cs@linux-administrator.com - Update to release 2.9.2.3
[-] [+]	Changed	snort.spec ^
@@ -101,7 +101,7 @@ %define mysql 1 %define postgresql 1 %define ipv6spp 1 - %define debug 1 + %define debug 0 %define release 1 %endif @@ -120,15 +120,13 @@ Url: http://www.snort.org/ Source0: http://www.snort.org/dl/2.9.0/%{realname}-%{version}.tar.bz2 Source2: snortd.suse.init -#Source10: spp_ipv6_20120120.tar.bz2 -#Source10: spp_ipv6_20120512.tar.bz2 +Source10: spp_ipv6_20120120.tar.bz2 Source11: spp_ipv6-configs.tar.bz2 +Source12: spp_ipv6-snort.sample.conf Source20: snort-rpmlintrc Patch0: snortsam-2.9.2.2.diff Patch1: autojunk.patch Patch2: snort-razorback-pkgconfig.patch -Patch3: snort-2.9.2.2_ipv6_preproc.patch.bz2 -#Patch3: snort-razorback-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Packager: Official Snort.org %{for_distro} @@ -228,12 +226,12 @@ %prep -%setup -q -n %{realname}-%{version} -a 11 +%setup -q -n %{realname}-%{version} -a 10 -a 11 %patch0 -p1 %patch1 -p0 %patch2 %if %{ipv6spp} -%patch3 -p1 +cp %{S:12} . %endif cp /usr/share/aclocal/pkg.m4 m4/ ## start: needed for snortsam patch @@ -357,10 +355,10 @@ %endif ## build ipv6 preproc -## %if %{ipv6spp} -## cd spp_ipv6 -## %__make -## %endif +%if %{ipv6spp} +cd spp_ipv6 +%__make +%endif %install @@ -497,8 +495,8 @@ # install ipv6 preproc %if %{ipv6spp} -##%__install -m0755 spp_ipv6/build/spp_ipv6.so %{buildroot}%{_libdir}\/%{realname}-%{version}_dynamicpreprocessor -##%__install -m0644 preprocessor.rules %{buildroot}%{SnortPreProcRulesDir}/preprocessor.rules +%__install -m0755 spp_ipv6/build/spp_ipv6.so %{buildroot}%{_libdir}/%{realname}-%{version}_dynamicpreprocessor/ +#%__install -m0644 preprocessor.rules %{buildroot}%{SnortPreProcRulesDir}/preprocessor.rules cat preprocessor.rules >> %{buildroot}%{SnortPreProcRulesDir}/preprocessor.rules %__install -m0644 ipv6.rules %{buildroot}%{SnortRulesDir}/ipv6.rules cat gen-msg.map >> %{buildroot}%{_sysconfdir}/snort/gen-msg.map @@ -624,6 +622,7 @@ %if %{ipv6spp} %attr(0755,root,root) %dir %{SnortPreProcRulesDir} %attr(0644,root,root) %config(noreplace) %{SnortRulesDir}/ipv6.rules +%doc spp_ipv6-snort.sample.conf %endif %attr(0644,root,root) %config(noreplace) %{SnortPreProcRulesDir}/preprocessor.rules %attr(0644,root,root) %config(noreplace) %{SnortPreProcRulesDir}/decoder.rules @@ -664,7 +663,7 @@ %attr(0755,root,root) %{_libdir}/%{realname}-%{version}_dynamicpreprocessor/libsf_gtp_preproc.* %attr(0755,root,root) %{_libdir}/%{realname}-%{version}_dynamicpreprocessor/libsf_modbus_preproc.* %if %{ipv6spp} -%attr(0755,root,root) %{_libdir}/%{realname}-%{version}_dynamicpreprocessor/libsf_ipv6_preproc.* +%attr(0755,root,root) %{_libdir}/%{realname}-%{version}_dynamicpreprocessor/spp_ipv6.* %endif %attr(0755,root,root) %dir %{_libdir}/%{realname}-%{version}_dynamicrules %dir %{_docdir}/%{realname}-%{version}
[-] [+]	Added	spp_ipv6-snort.sample.conf ^
@@ -0,0 +1,8 @@ +preprocessor ipv6: \ + et_prefix 2001:0 db8 :1::/64 \ + outer_mac 00:16:76:07: bc :92 \ + ost_mac ... \ + ax_unconfirmed 32768 \ + ax_routers 8 \ + xpire_run 20 \ + eep_state 180