Drop package snort from GRML_FULL

diff --git a/debian/changelog b/debian/changelog
index a4959b0..fe06e58 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,11 @@ grml-live (0.9.17) unstable; urgency=low
   * grml-live-remaster: Support $VISUAL and fall back to 'vi' if
     EDITOR is empty. [Closes: issue664]
 
- -- Michael Prokop <mika@grml.org>  Wed, 20 May 2009 23:25:43 +0200
+  [ Michael Prokop ]
+  * Drop package snort from GRML_FULL and all the workarounds for it.
+    It's once again uninstallable in Debian/unstable.
+
+ -- Michael Prokop <mika@grml.org>  Fri, 22 May 2009 09:31:19 +0200
 
 grml-live (0.9.16) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index bbabb90..477e646 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -124,10 +124,6 @@ fi
 $ROOTCMD apt-get update
 $ROOTCMD aptitude -f -y install file-rc
 
-# 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:
 [ -d $target/etc/apt/apt.conf.d ] || mkdir $target/etc/apt/apt.conf.d

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 7282bf6..99adf72 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1555,7 +1555,6 @@ snarf
 sniffit
 snmp
 snoopy
-snort
 snowdrop
 socat
 sox

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index 6b21674..4637818 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -330,12 +330,6 @@ else
   ewarn "clamav[-freshclam] not installed" ; eend 0
 fi
 
-if [ -f /etc/default/snort.dpkg-dist -a -f /etc/default/snort ] ; then
-   einfo "Fixxing /etc/default/snort"
-   mv /etc/default/snort.dpkg-dist /etc/default/snort
-   eend $?
-fi
-
 if ! [ -r /etc/ld.so.nohwcap ] ; then
    einfo "Creating /etc/ld.so.nohwcap"
    touch /etc/ld.so.nohwcap