From: Michael Prokop <devnull@localhost>
Date: Sat, 13 Oct 2007 22:18:46 +0000 (+0200)
Subject: Improve apt-listbugs; re-add packages
X-Git-Tag: 0.0.5~12
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=a467b0ac5b82855ef5b41a708cf8ad9a25fa9d17

Improve apt-listbugs; re-add packages
---

diff --git a/debian/changelog b/debian/changelog
index 1098037..c5932dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ grml-live (0.0.5) unstable; urgency=low
   * Re-enable 'Acquire::http::Pipeline-Depth' workaround'
   * Add new scripts for retreiving bugs via apt-listbugs
     and storing package selection inside log directory.
+  * Re-enable problematic packages that have been fixed:
+    - apt-listbugs (fixed via manual interaction in scripts)
+    - gsm-utils (#353967)
+    - snort (#443481)
+    - wvdial (fixed via debconf)
+  * Integrate support for apt-listbugs.
   * Add new packages to GRML_FULL:
     - ack-grep
     - mailplate
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index fe8ad47..404f1eb 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: Sat Oct 06 00:55:29 CEST 2007 [mika]
+# Latest change: Sat Oct 13 23:18:56 CEST 2007 [mika]
 ################################################################################
 
 set -u
@@ -24,6 +24,22 @@ $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
+
+# 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
+cat > $target/etc/apt/apt.conf.d/10apt-listbugs << EOF
+// Check all packages whether they has critical bugs before they are installed.
+// If you don't like it, comment it out.
+//DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt || exit 10"};
+//DPkg::Tools::Options::/usr/sbin/apt-listbugs "";
+//DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
+EOF
+
 # make sure /dev/MAKEDEV is available:
 if [ -x "$target"/sbin/MAKEDEV ] && ! [ -r "$target"/dev/MAKEDEV ] ; then
    ln -s /sbin/MAKEDEV "$target"/dev/MAKEDEV
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 8a62305..7f871ca 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -254,6 +254,7 @@ apmd
 apt
 apt-dpkg-ref
 apt-file
+apt-listbugs
 apt-listchanges
 apt-show-source
 apt-show-versions
@@ -831,6 +832,7 @@ gs-esp
 gscanbus
 gsfonts
 gsfonts-x11
+gsm-utils
 gtkam
 guessnet
 gv
@@ -1614,6 +1616,7 @@ snarf
 sniffit
 snmp
 snoopy
+snort
 snowdrop
 snownews
 socat
@@ -1889,6 +1892,7 @@ wpasupplicant
 wprint
 wput
 wwwconfig-common
+wvdial
 wyrd
 x-ttcidfont-conf
 x11-common
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index 19c6844..ee7f6a1 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -4,18 +4,20 @@
 # 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: Sat Oct 13 18:03:15 CEST 2007 [mika]
+# Latest change: Sun Oct 14 00:14:02 CEST 2007 [mika]
 ################################################################################
 
+set -e
+set -u
+
 HOSTNAME=''
 [ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
-if [ -x $target/usr/sbin/apt-listbugs ] ; then
+if [ -x $target/usr/sbin/apt-listbugs -a -x $target/usr/bin/apt-show-source ] && \
+   [ -x $target/etc/apt/listbugs ] ; then
    for severity in critical grave serious ; do
-       apt-listbugs -s $severity list $(apt-show-source | \
-       grep -v -e 'not installed' -e '--------------' -e 'Version' | \
-       awk '{print $4;}' | grep -v '^[() ]*$'| sort | uniq) \
+       SEVERITY=$severity $ROOTCMD /etc/apt/listbugs > \
        /var/log/fai/dirinstall/$HOSTNAME/bugs.${severity}
    done
 fi