Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	snort.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jul 4 20:30:26 UTC 2013 - cs@linux-administrator.com + +- disable snortsam patch + +------------------------------------------------------------------- Wed Jul 3 20:15:04 UTC 2013 - cs@linux-administrator.com - Update to release 2.9.5
[-] [+]	Changed	snort.spec ^
@@ -32,6 +32,9 @@ %define ipv6spp 0 %{?_with_ipv6spp:%define ipv6spp 1} +%define snortsam 0 +%{?_with_snortsam:%define snortsam 1} + %define debug 0 %{?_with_debug:%define debug 1} # If not inline then we'll conflict with it @@ -68,6 +71,7 @@ %define vendor Linux-Adminstrator Networks %define for_distro RPMs for (open)SuSE(Enterprise)/CentOS/RHEL/Fedora Linux %define ipv6spp 0 + %define snortsam 0 %define debug 0 %define release 1 %endif @@ -91,10 +95,10 @@ Source11: spp_ipv6-configs.tar.bz2 Source12: spp_ipv6-snort.sample.conf Source20: snort-rpmlintrc -Patch0: snortsam-2.9.3.diff +#Patch0: snortsam-2.9.3.diff Patch1: autojunk.patch Patch2: snort-razorback-pkgconfig.patch -Patch3: snortsam-2.9.3_2.9.4.diff +#Patch3: snortsam-2.9.3_2.9.4.diff Patch4: spp_ipv6-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -147,7 +151,9 @@ %prep %setup -q -n %{realname}-%{version} -a 10 -a 11 +%if %{snortsam} %patch0 -p1 +%endif %patch1 -p0 %patch2 %if %{ipv6spp} @@ -155,14 +161,18 @@ %patch4 cd .. %endif +%if %{snortsam} %patch3 +%endif cp /usr/share/aclocal/pkg.m4 m4/ ## start: needed for snortsam patch +%if %{snortsam} chmod +x autojunk.sh if [ -s configure ] ; then mv configure configure.bak fi +%endif ## end: needed for snortsam patch # When building from a Snort.org CVS snapshot tarball, you have to run