From 1043cb0ae90a7f190cd0645acf995d509b57bafc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 15 Jul 2013 17:03:53 +0200 Subject: [PATCH] oinkmaster: add vrt community-rules support. --- config/rootfiles/core/71/filelists/oinkmaster | 1 + lfs/oinkmaster | 1 + .../oinkmaster-2.0-add_community_rules.patch | 14 ++++++++++++++ 3 files changed, 16 insertions(+) create mode 120000 config/rootfiles/core/71/filelists/oinkmaster create mode 100644 src/patches/oinkmaster-2.0-add_community_rules.patch diff --git a/config/rootfiles/core/71/filelists/oinkmaster b/config/rootfiles/core/71/filelists/oinkmaster new file mode 120000 index 000000000..75029e679 --- /dev/null +++ b/config/rootfiles/core/71/filelists/oinkmaster @@ -0,0 +1 @@ +../../../common/oinkmaster \ No newline at end of file diff --git a/lfs/oinkmaster b/lfs/oinkmaster index a13c92474..6cc075fa4 100644 --- a/lfs/oinkmaster +++ b/lfs/oinkmaster @@ -69,6 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/oinkmaster-2.0-add_community_rules.patch cd $(DIR_APP) && chown nobody:nobody oinkmaster.pl cd $(DIR_APP) && cp -f oinkmaster.conf /var/ipfire/snort/ cd /var/ipfire/snort && patch -Np1 < $(DIR_SRC)/src/patches/oinkmaster-tmp.patch diff --git a/src/patches/oinkmaster-2.0-add_community_rules.patch b/src/patches/oinkmaster-2.0-add_community_rules.patch new file mode 100644 index 000000000..720efd67c --- /dev/null +++ b/src/patches/oinkmaster-2.0-add_community_rules.patch @@ -0,0 +1,14 @@ +diff -Naur oinkmaster-2.0.org/oinkmaster.pl oinkmaster-2.0/oinkmaster.pl +--- oinkmaster-2.0.org/oinkmaster.pl 2007-04-20 05:20:32.000000000 +0200 ++++ oinkmaster-2.0/oinkmaster.pl 2013-07-15 16:46:40.000000000 +0200 +@@ -1159,6 +1159,10 @@ + } + } + ++ # hack for community-ruleset. ++ if (-d "$dir/community-rules") { ++ move("$dir/community-rules","$dir/$rules_dir"); ++ } + # Make sure that non-empty rules directory existed in archive. + # We permit empty rules directory if min_files is set to 0 though. + clean_exit("$url: no \"$rules_dir\" directory found in tar file.") -- 2.39.2