Fixed the Guardian Bug and started Core 25

diff --git a/config/guardian/guardian.conf b/config/guardian/guardian.conf
index 9181496ffb34720409c7d8b01c84d6b7ce73da40..b1aa2e8202879615d98eed0aeb608fe3e92fa89f 100644 (file)
--- a/config/guardian/guardian.conf
+++ b/config/guardian/guardian.conf
@@ -21,12 +21,12 @@ LogFile         /var/log/guardian/guardian.log
 AlertFile       /var/log/snort/alert
 
 # The list of ip addresses to ignore
-IgnoreFile      /var/ipfire/guardian.ignore
+IgnoreFile      /var/ipfire/guardian/guardian.ignore
 
 # This is a list of IP addresses on the current host, in case there is more
 # than one. If this file doesn't exist, then it will assume you want to run
 # with the default setup (machine's ip address, and broadcast/network). 
-TargetFile      /var/ipfire/guardian.target
+TargetFile      /var/ipfire/guardian/guardian.target
 
 # The time in seconds to keep a host blocked. If undefined, it defaults to 
 # 99999999, which basicly disables the feature. 

diff --git a/config/rootfiles/core/25/files b/config/rootfiles/core/25/files
new file mode 100644 (file)
index 0000000..076a4d0
--- /dev/null
+++ b/config/rootfiles/core/25/files
@@ -0,0 +1 @@
+srv/web/ipfire/cgi-bin/ids.cgi

diff --git a/config/rootfiles/core/25/meta b/config/rootfiles/core/25/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/25/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/25/update.sh b/config/rootfiles/core/25/update.sh
new file mode 100644 (file)
index 0000000..8a87d9c
--- /dev/null
+++ b/config/rootfiles/core/25/update.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+extract_files
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 12546dd1c5b70901774ee53cd4488bc14af21aea..8fb00ea252c05669a7471db2cdc9be8ab278fdb3 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -253,7 +253,7 @@
 * rssdler-0.4.0a
 * rsync-2.6.9
 * rtorrent-0.7.9
-* samba-3.2.5
+* samba-3.2.6
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 362e7b38c62dffd4b076bc799a08cd9e4a8d1829..111aea66796182b0b7b95d283e8c4ffacf92a162 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -528,7 +528,12 @@ print <<END
 <tr><td align='left' width='40%'>$Lang::tr{'guardian timelimit'}</td><td align='left'><input type='text' name='TIMELIMIT' value='$snortsettings{'GUARDIAN_TIMELIMIT'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'guardian logfile'}</td><td align='left'><input type='text' name='LOGFILE' value='$snortsettings{'GUARDIAN_LOGFILE'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'guardian alertfile'}</td><td align='left'><input type='text' name='ALERTFILE' value='$snortsettings{'GUARDIAN_ALERTFILE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'></textarea></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'>
+END
+;
+       print `cat /var/ipfire/guardian/guardian.ignore`;
+print <<END
+</textarea></td></tr>
 <tr><td align='center' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
 </table>
 </form>

diff --git a/lfs/guardian b/lfs/guardian
index c464ba7485dfbfaf4c3ac14175801223fea41f9d..f3118f63beb46265568cd3d9c7f81431a1a21d0f 100644 (file)
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -30,7 +30,7 @@ THISAPP    = guardian-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = guardian
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""