X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.daily-security;h=405b292411a7748fe70489307c39fae71e83d64c;hb=21c929acd4a42145fc353c2e2507816022039e2a;hp=2aa60903ff9de5b9fc77bec37d86fa56cc647576;hpb=442295ddb0e10297e672e4bcc36a7bd50970d6ef;p=dak.git

diff --git a/cron.daily-security b/cron.daily-security
index 2aa60903..405b2924 100644
--- a/cron.daily-security
+++ b/cron.daily-security
@@ -31,6 +31,11 @@ cd ..
 rm -fr non-US
 
 for suite in $suites; do
+    case $suite in
+	stable) override_suite=woody;;
+	testing) override_suite=sarge;;
+	*) echo "Unknown suite type ($suite)"; exit 1;;
+    esac
     for component in $components; do
 	for override_type in $override_types; do
 	    case $override_type in
@@ -39,15 +44,25 @@ for suite in $suites; do
 	       udeb) type="skip" ;;
 	    esac
 	    if [ ! "$type" = "skip" ]; then
-		$masterdir/natalie -q -S -t $override_type -s $suite -c $component < override.$suite.$component$type
+		$masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
+		case $suite in
+		    stable)
+			$masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type
+			$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
 	    fi
 	done
     done
 done
 
 # Generate .all3 overides for the buildd support
-for dist in potato woody; do
-    rm -f override.sid.all3
+for dist in potato woody sarge; do
+    rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer ]; then
 	components="$components main.debian-installer";
@@ -69,6 +84,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)