Fix oinkmaster patch.

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index fdf81d63b89a8371bb486f446b3b6b0dbf058a72..1d1cd6073747188ac5e61424fe61146b349ebce1 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -43,6 +43,8 @@
 * arping-2.05
 * as86-0.16.17
 * asterisk-1.4.18
+* atl1c-kmod-2.6.27.39-ipfire
+* atl1c-kmod-2.6.27.39-ipfire-xen
 * atl2-2.0.5-kmod-2.6.27.39-ipfire
 * atl2-2.0.5-kmod-2.6.27.39-ipfire-xen
 * autoconf-2.59

diff --git a/lfs/oinkmaster b/lfs/oinkmaster
index 449a89f84b9be9f531f383cdac72695e407f7492..a13c924740c3faf7149386adfa5beeb9a1aff0f3 100644 (file)
--- a/lfs/oinkmaster
+++ b/lfs/oinkmaster
@@ -71,7 +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 /var/ipfire/snort && patch -Np1 < $(DIR_SRC)/src/patches/oinkmaster-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
index 59fb79d50dfffb97de60e989df6dd2403b1df4bb..8b2a1b89a960f6ff9cbe41d33f101bdfe4fa40b2 100644 (file)
--- a/src/patches/oinkmaster-tmp.patch
+++ b/src/patches/oinkmaster-tmp.patch
@@ -1,6 +1,6 @@
-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
+diff -Naur org/oinkmaster.conf new/oinkmaster.conf
+--- org/oinkmaster.conf        2008-10-25 18:53:30.000000000 +0200
++++ new/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.