X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.daily-security;h=32a459567c411906c92a6136ddb8a5dbbb7b94db;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=25bba1da88885279af584d1825b2023f526a68c2;hpb=4327553dae433bd68edb179592c486a25d549653;p=dak.git

diff --git a/cron.daily-security b/cron.daily-security
index 25bba1da..32a45956 100644
--- a/cron.daily-security
+++ b/cron.daily-security
@@ -32,26 +32,50 @@ rm -fr non-US
 
 for suite in $suites; do
     case $suite in
-	stable) override_suite=potato;;
-	testing) override_suite=woody;;
-	*) echo "Unknown suite type"; exit 1;;
+	oldstable) override_suite=woody;;
+	stable) override_suite=sarge;;
+	testing) override_suite=etch;;
+	*) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
 	for override_type in $override_types; do
 	    case $override_type in
 	       deb) type="" ;;
 	       dsc) type=".src" ;;
-	       udeb) type="skip" ;;
+	       udeb) type=".debian-installer" ;;
 	    esac
-	    if [ ! "$type" = "skip" ]; then
-		$masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
+	    # XXX RUN AFUCKINGAWAY
+	    if [ "$override_type" = "udeb" ]; then
+               if [ ! "$component" = "main" ]; then
+	         continue;
+	       fi
+	       if [ "$suite" = "unstable" ]; then
+	         $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
+	       fi
+	    else
+	       $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
 	    fi
+	    case $suite in
+	      oldstable)
+	        if [ ! "$override_type" = "udeb" ]; then
+		   $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type
+                fi
+		$masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+		;;
+	      stable)
+		$masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+		;;
+	      testing)
+		$masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+		;;
+	      *) echo "Unknown suite type ($suite)"; exit 1;;
+	    esac
 	done
     done
 done
 
 # Generate .all3 overides for the buildd support
-for dist in potato woody; do
+for dist in woody sarge etch; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer ]; then
@@ -74,6 +98,9 @@ cd $masterdir
 shania
 rhona
 apt-ftparchive -q clean apt.conf-security
+apt-ftparchive -q clean apt.conf.buildd-security
+
+symlinks -d -r $ftpdir
 
 pg_dump obscurity > /org/security.debian.org/katie-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)