Changes - j0ke.net Open Build Service

Changes of Revision 6

[-] [+]	Added	snortsam.changes
@@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Thu Feb 7 07:17:04 UTC 2013 - cs@linux-administrator.com + +- update config-patch +- added suse-iptables-path patch +
[-] [+]	Changed	snortsam.spec ^
@@ -7,7 +7,7 @@ Summary: Snort IPS plugin Source0: %{name}-src-%{version}.tar.bz2 Patch0: %{name}-config.patch - +Patch1: %{name}-suse-iptables-path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -33,6 +33,7 @@ %prep %setup -n %{name} %patch0 +%patch1 -p1 %build chmod +x makesnortsam.sh
[-] [+]	Changed	snortsam-config.patch ^
@@ -1,8 +1,11 @@ --- conf/snortsam.conf.sample.orig 2013-01-29 21:07:13.468122562 +0100 -+++ conf/snortsam.conf.sample 2013-01-29 21:08:24.836122694 +0100 -@@ -771,3 +771,5 @@ ++++ conf/snortsam.conf.sample 2013-02-07 08:16:31.104122573 +0100 +@@ -771,3 +771,8 @@ # # ----------------------------------------------------------------------------- # $Id: snortsam.conf.sample,v 1.20 2009/11/27 01:39:39 fknobbe Exp $ -+ ++daemon ++port 898 ++include /etc/snortsam.d/rootservers.conf ++include /etc/snortsam.d/snortsam-local.conf +statefile /var/run/snortsam/snortsam.state
[-] [+]	Added	snortsam-suse-iptables-path.patch ^
@@ -0,0 +1,159 @@ +--- snortsam/src/ssp_iptables.c.orig 2013-02-07 08:12:06.052122486 +0100 ++++ snortsam/src/ssp_iptables.c 2013-02-07 08:12:45.748116713 +0100 +@@ -109,7 +109,7 @@ + /Nuevo/ + char iptcmd1[255],iptcmd4[255]; + #ifdef SAVETABLES +- const char savecmd[]="/sbin/iptables-save -c > /etc/sysconfig/iptables"; ++ const char savecmd[]="/usr/sbin/iptables-save -c > /etc/sysconfig/iptables"; + #endif + + #ifdef FWSAMDEBUG +@@ -131,14 +131,14 @@ + { case FWSAM_HOW_IN: + /* Assemble command / + if (snprintf(iptcmd,sizeof(iptcmd)-1, +- "/sbin/iptables -I FORWARD -i %s -s %s -j DROP", ++ "/usr/sbin/iptables -I FORWARD -i %s -s %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd)) { + snprintf(msg,sizeof(msg)-1,"Error: Command %s is too long", iptcmd); + logmessage(1,msg,"iptables",0); + return; + } + if (snprintf(iptcmd2,sizeof(iptcmd2)-1, +- "/sbin/iptables -I INPUT -i %s -s %s -j DROP", ++ "/usr/sbin/iptables -I INPUT -i %s -s %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd2)) { + snprintf(msg,sizeof(msg)-1,"Error: Command2 %s is too long", iptcmd2); + logmessage(1,msg,"iptables",0); +@@ -148,14 +148,14 @@ + case FWSAM_HOW_OUT: + / Assemble command / + if (snprintf(iptcmd,sizeof(iptcmd)-1, +- "/sbin/iptables -I FORWARD -i %s -d %s -j DROP", ++ "/usr/sbin/iptables -I FORWARD -i %s -d %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd)) { + snprintf(msg,sizeof(msg)-1,"Error: Command %s is too long", iptcmd); + logmessage(1,msg,"iptables",0); + return; + } + if (snprintf(iptcmd2,sizeof(iptcmd2)-1, +- "/sbin/iptables -I INPUT -i %s -d %s -j DROP", ++ "/usr/sbin/iptables -I INPUT -i %s -d %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd2)) { + snprintf(msg,sizeof(msg)-1,"Error: Command2 %s is too long", iptcmd2); + logmessage(1,msg,"iptables",0); +@@ -165,18 +165,18 @@ + case FWSAM_HOW_INOUT: + / Assemble command - block src/ + if ((snprintf(iptcmd,sizeof(iptcmd)-1, +- "/sbin/iptables -I FORWARD -i %s -s %s -j DROP", ++ "/usr/sbin/iptables -I FORWARD -i %s -s %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd)) \|\| (snprintf(iptcmd1,sizeof(iptcmd1)-1, +- "/sbin/iptables -I FORWARD -i %s -d %s -j DROP", ++ "/usr/sbin/iptables -I FORWARD -i %s -d %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd1))) { + snprintf(msg,sizeof(msg)-1,"Error: Command %s is too long", iptcmd); + logmessage(1,msg,"iptables",0); + return; + } + if ((snprintf(iptcmd2,sizeof(iptcmd2)-1, +- "/sbin/iptables -I INPUT -i %s -s %s -j DROP", ++ "/usr/sbin/iptables -I INPUT -i %s -s %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd2)) \|\| (snprintf(iptcmd4,sizeof(iptcmd4)-1, +- "/sbin/iptables -I INPUT -i %s -d %s -j DROP", ++ "/usr/sbin/iptables -I INPUT -i %s -d %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd4))) { + snprintf(msg,sizeof(msg)-1,"Error: Command2 %s is too long", iptcmd2); + logmessage(1,msg,"iptables",0); +@@ -186,14 +186,14 @@ + case FWSAM_HOW_THIS: + / Assemble command / + if (snprintf(iptcmd,sizeof(iptcmd)-1, +- "/sbin/iptables -I FORWARD -i %s -s %s -d %s -p %d --dport %d -j DROP", ++ "/usr/sbin/iptables -I FORWARD -i %s -s %s -d %s -p %d --dport %d -j DROP", + iptp->iface, inettoa(bd->blockip), inettoa(bd->peerip), bd->proto, bd->port) >= sizeof(iptcmd)) { + snprintf(msg,sizeof(msg)-1,"Error: Command %s is too long", iptcmd); + logmessage(1,msg,"iptables",0); + return; + } + if (snprintf(iptcmd2,sizeof(iptcmd2)-1, +- "/sbin/iptables -I INPUT -i %s -s %s -d %s -p %d --dport %d -j DROP", ++ "/usr/sbin/iptables -I INPUT -i %s -s %s -d %s -p %d --dport %d -j DROP", + iptp->iface, inettoa(bd->blockip), inettoa(bd->peerip), bd->proto, bd->port) >= sizeof(iptcmd2)) { + snprintf(msg,sizeof(msg)-1,"Error: Command2 %s is too long", iptcmd2); + logmessage(1,msg,"iptables",0); +@@ -210,14 +210,14 @@ + { case FWSAM_HOW_IN: + / Assemble command / + if (snprintf(iptcmd,sizeof(iptcmd)-1, +- "/sbin/iptables -D FORWARD -i %s -s %s -j DROP", ++ "/usr/sbin/iptables -D FORWARD -i %s -s %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd)) { + snprintf(msg,sizeof(msg)-1,"Error: Command %s is too long", iptcmd); + logmessage(1,msg,"iptables",0); + return; + } + if (snprintf(iptcmd2,sizeof(iptcmd2)-1, +- "/sbin/iptables -D INPUT -i %s -s %s -j DROP", ++ "/usr/sbin/iptables -D INPUT -i %s -s %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd2)) { + snprintf(msg,sizeof(msg)-1,"Error: Command2 %s is too long", iptcmd2); + logmessage(1,msg,"iptables",0); +@@ -227,14 +227,14 @@ + case FWSAM_HOW_OUT: + / Assemble command / + if (snprintf(iptcmd,sizeof(iptcmd)-1, +- "/sbin/iptables -D FORWARD -i %s -d %s -j DROP", ++ "/usr/sbin/iptables -D FORWARD -i %s -d %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd)) { + snprintf(msg,sizeof(msg)-1,"Error: Command %s is too long", iptcmd); + logmessage(1,msg,"iptables",0); + return; + } + if (snprintf(iptcmd2,sizeof(iptcmd2)-1, +- "/sbin/iptables -D INPUT -i %s -d %s -j DROP", ++ "/usr/sbin/iptables -D INPUT -i %s -d %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd2)) { + snprintf(msg,sizeof(msg)-1,"Error: Command2 %s is too long", iptcmd2); + logmessage(1,msg,"iptables",0); +@@ -244,18 +244,18 @@ + case FWSAM_HOW_INOUT: + / Assemble command - block src/ + if ((snprintf(iptcmd,sizeof(iptcmd)-1, +- "/sbin/iptables -D FORWARD -i %s -s %s -j DROP", ++ "/usr/sbin/iptables -D FORWARD -i %s -s %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd)) \|\| (snprintf(iptcmd1,sizeof(iptcmd1)-1, +- "/sbin/iptables -D FORWARD -i %s -d %s -j DROP", ++ "/usr/sbin/iptables -D FORWARD -i %s -d %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd1))) { + snprintf(msg,sizeof(msg)-1,"Error: Command %s is too long", iptcmd); + logmessage(1,msg,"iptables",0); + return; + } + if ((snprintf(iptcmd2,sizeof(iptcmd2)-1, +- "/sbin/iptables -D INPUT -i %s -s %s -j DROP", ++ "/usr/sbin/iptables -D INPUT -i %s -s %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd2)) \|\| (snprintf(iptcmd4,sizeof(iptcmd4)-1, +- "/sbin/iptables -D INPUT -i %s -d %s -j DROP", ++ "/usr/sbin/iptables -D INPUT -i %s -d %s -j DROP", + iptp->iface, inettoa(bd->blockip)) >= sizeof(iptcmd4))) { + snprintf(msg,sizeof(msg)-1,"Error: Command2 %s is too long", iptcmd2); + logmessage(1,msg,"iptables",0); +@@ -265,14 +265,14 @@ + case FWSAM_HOW_THIS: + / Assemble command */ + if (snprintf(iptcmd,sizeof(iptcmd)-1, +- "/sbin/iptables -D FORWARD -i %s -s %s -d %s -p %d --dport %d -j DROP", ++ "/usr/sbin/iptables -D FORWARD -i %s -s %s -d %s -p %d --dport %d -j DROP", + iptp->iface, inettoa(bd->blockip), inettoa(bd->peerip), bd->proto, bd->port) >= sizeof(iptcmd)) { + snprintf(msg,sizeof(msg)-1,"Error: Command %s is too long", iptcmd); + logmessage(1,msg,"iptables",0); + return; + } + if (snprintf(iptcmd2,sizeof(iptcmd2)-1, +- "/sbin/iptables -D INPUT -i %s -s %s -d %s -p %d --dport %d -j DROP", ++ "/usr/sbin/iptables -D INPUT -i %s -s %s -d %s -p %d --dport %d -j DROP", + iptp->iface, inettoa(bd->blockip), inettoa(bd->peerip), bd->proto, bd->port) >= sizeof(iptcmd)) { + snprintf(msg,sizeof(msg)-1,"Error: Command2 %s is too long", iptcmd2); + logmessage(1,msg,"iptables",0);