X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.daily-security;h=73b308756000b6df681376dbc318453cf598fbee;hb=6cc79b7b093af0c68c9d80c61d5aa7cfe72c9188;hp=131f22b43d620db07e6959241509aeabea804c00;hpb=5b1244957793ec103b80d2c5516e1744324806ea;p=dak.git

diff --git a/cron.daily-security b/cron.daily-security
index 131f22b4..73b30875 100644
--- a/cron.daily-security
+++ b/cron.daily-security
@@ -8,6 +8,8 @@ export SCRIPTVARS=/org/security.debian.org/katie/vars-security
 
 ################################################################################
 
+# Fix overrides
+
 rsync -ql ftp-master::indices/override\* $overridedir
 
 cd $overridedir
@@ -29,6 +31,12 @@ cd ..
 rm -fr non-US
 
 for suite in $suites; do
+    case $suite in
+	oldstable) override_suite=potato;;
+	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
@@ -37,18 +45,54 @@ 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
+		    oldstable)
+			$masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.woody.$component$type
+			$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
+			;;
+		    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 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";
+    fi
+    for component in $components; do
+	cat override.$dist.$component >> override.$dist.all3;
+    done;
+done
+
+################################################################################
+
+# Freshen Packages-Arch-Specific
+
+wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/buildd/Packages-arch-specific
+
 ################################################################################
 
 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)