Added a patch to change oinkmaster tmp to /var/tmp.

diff --git a/config/rootfiles/core/34/filelists/files b/config/rootfiles/core/34/filelists/files
index c59b8d88631ef25f487ac2d2be1207024c7dec60..5f0acf885a7dacafa9ec9dc1ee16eb58e2c75088 100644 (file)
--- a/config/rootfiles/core/34/filelists/files
+++ b/config/rootfiles/core/34/filelists/files
@@ -12,4 +12,5 @@ var/ipfire/langs/de.pl
 var/ipfire/langs/fr.pl
 var/ipfire/langs/list
 var/ipfire/outgoing/bin/outgoingfw.pl
-usr/local/sbin/setup
\ No newline at end of file
+var/ipfire/snort/oinkmaster.conf
+usr/local/sbin/setup

diff --git a/lfs/oinkmaster b/lfs/oinkmaster
index 768b6fdff00095a08090122d607843921364c1ae..449a89f84b9be9f531f383cdac72695e407f7492 100644 (file)
--- a/lfs/oinkmaster
+++ b/lfs/oinkmaster
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf  $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && chown nobody:nobody oinkmaster.pl
        cd $(DIR_APP) && cp -f oinkmaster.conf /var/ipfire/snort/
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-tmp.patch
        cd $(DIR_APP) && install -m 0755 oinkmaster.pl /usr/local/bin/
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/patches/oinkmaster-tmp.patch b/src/patches/oinkmaster-tmp.patch
new file mode 100644 (file)
index 0000000..59fb79d
--- /dev/null
+++ b/src/patches/oinkmaster-tmp.patch
@@ -0,0 +1,12 @@
+diff -Naur /var/ipfire/snort/oinkmaster.new /var/ipfire/snort/oinkmaster.conf
+--- /var/ipfire/snort/oinkmaster.new   2008-10-25 18:53:30.000000000 +0200
++++ /var/ipfire/snort/oinkmaster.conf  2009-12-07 20:21:15.000000000 +0100
+@@ -117,7 +117,7 @@
+ # TMPDIR or TEMPDIR, or otherwise use "/tmp" if none of them was set.
+ 
+ # Example for UNIX.
+-# tmpdir = /home/oinkmaster/tmp/
++tmpdir = /var/tmp/
+ 
+ # Example if running native Win32 or Cygwin.
+ # tmpdir = c:\tmp