From fc7c6e6dc606a3dc2bf641a1d83ad2b9851a27fa Mon Sep 17 00:00:00 2001
From: Michael Prokop <devnull@localhost>
Date: Mon, 15 Oct 2007 19:30:36 +0200
Subject: [PATCH] Drop class SID and try to workaround #443481 via
 /etc/snort/snort.common.parameters

---
 debian/changelog                             | 6 +++---
 etc/grml/fai/config/hooks/instsoft.GRMLBASE  | 9 ++++-----
 etc/grml/fai/config/package_config/GRML_FULL | 1 +
 etc/grml/fai/config/package_config/SID       | 3 ---
 4 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 etc/grml/fai/config/package_config/SID

diff --git a/debian/changelog b/debian/changelog
index 77b3f88..c63fe8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,9 +19,9 @@ grml-live (0.0.5) unstable; urgency=low
     only it uxterm is not available.
   * Support /etc/locale.gen.grml - it's used by default in
     class GRML_FULL and a new class named LOCALES.
-  * New class SID - /etc/grml/fai/config/package_config/SID:
-    - this class is used for packages that are known to cause
-      problems with Debian/etch but work with Debian/sid
+  * Work around #443481 (bug inside snort) for Debian etch
+    via using /etc/snort/snort.common.parameters (thanks for
+    the idea, Thomas Lange!)
   * Do not exit with an error code if /usr/include/linux is NOT
     a symlink to /usr/src/linux/include/linux but keep it as
     a warning instead.
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 2fe8bd8..441c632 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Oct 15 19:12:33 CEST 2007 [mika]
+# Latest change: Mon Oct 15 19:29:19 CEST 2007 [mika]
 ################################################################################
 
 set -u
@@ -24,10 +24,9 @@ $ROOTCMD apt-key add /etc/apt/grml.key
 $ROOTCMD apt-get update
 $ROOTCMD aptitude -f -y install file-rc
 
-#$ROOTCMD aptitude -f -y install apt-listbugs
-#if [ -r $target/etc/apt/apt.conf.d/10apt-listbugs ] ; then
-#   mv $target/etc/apt/apt.conf.d/10apt-listbugs $target/etc/apt/apt.conf.d/10apt-listbugs.disabled
-#fi
+# Workaround #443481 of snort for Debian/etch:
+mkdir -p $target/etc/snort
+echo 'LOGDIR=/var/log/snort' >> $target/etc/snort/snort.common.parameters
 
 # we definitely don't want to fail running fai dirinstall just
 # because of some well known bugs:
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 9e89329..1b62314 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1609,6 +1609,7 @@ snarf
 sniffit
 snmp
 snoopy
+snort
 snowdrop
 snownews
 socat
diff --git a/etc/grml/fai/config/package_config/SID b/etc/grml/fai/config/package_config/SID
deleted file mode 100644
index f3416b9..0000000
--- a/etc/grml/fai/config/package_config/SID
+++ /dev/null
@@ -1,3 +0,0 @@
-PACKAGES aptitude
-
-snort
-- 
2.1.4