From fd6c668a58cd533a7c0d0fb71a6b6e650ff0541f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 9 Dec 2009 20:58:19 +0100 Subject: [PATCH] Fix oinkmaster patch. --- doc/packages-list.txt | 2 ++ lfs/oinkmaster | 2 +- src/patches/oinkmaster-tmp.patch | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index fdf81d63b8..1d1cd60737 100644 --- 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 449a89f84b..a13c924740 100644 --- 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 59fb79d50d..8b2a1b89a9 100644 --- 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. -- 2.39.2