X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.daily;h=e482a192b4b2e44a23b4a52690aa89e1b1acce75;hb=290343bd9e607cb870f315d68a19796c5e9989c0;hp=f99c014939eeab00dd354db900e7ea6489666493;hpb=29ed8495b66abca9cfadac35f5b92cfe1e5c853d;p=dak.git

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index f99c0149..e482a192 100755
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -10,18 +10,19 @@ export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
 
 # Fix overrides
 
-# disabled by ajt 2008-01-01: requires auth
-rsync --password-file /srv/non-us.debian.org/s3kr1t/rsync-password -ql security-master@ftp-master::indices/override\* $overridedir
+rsync --delete -r --include=override\* --exclude=\* --password-file /srv/non-us.debian.org/s3kr1t/rsync-password -ql security-master@ftp-master::indices/ $overridedir
 
 cd $overridedir
-find . -name override\*.gz -type f -maxdepth 1 -mindepth 1 | xargs gunzip -f
-find . -type l -maxdepth 1 -mindepth 1 | xargs --no-run-if-empty rm
+for file in override*.gz; do
+	zcat $file > $(basename $file .gz)
+done
+find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
 for suite in $suites; do
     case $suite in
-		oldstable) override_suite=sarge;;
-		stable) override_suite=etch;;
-		testing) override_suite=lenny;;
+		oldstable) override_suite=etch;;
+		stable) override_suite=lenny;;
+		testing) override_suite=squeeze;;
 		*) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -37,44 +38,28 @@ for suite in $suites; do
 					continue
 				fi
 			fi
-			case $suite in
-				oldstable)
-					dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
-					;;
-				stable)
-					dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
-					;;
-				testing)
-					dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
-					;;
-				*) echo "Unknown suite type ($suite)"; exit 1;;
-			esac
+			zcat override.$override_suite.$component$type.gz | dak control-overrides -q -a -t $override_type -s $suite -c updates/$component
 		done
     done
 done
 
 # Generate .all3 overides for the buildd support
-for dist in etch lenny; do
+for dist in etch lenny squeeze; do
     rm -f override.$dist.all3
     components="main contrib non-free";
-    if [ -f override.$dist.main.debian-installer ]; then
+    if [ -f override.$dist.main.debian-installer.gz ]; then
 		components="$components main.debian-installer"
     fi
     for component in $components; do
-		cat override.$dist.$component >> override.$dist.all3
-        if [ -e "override.$dist.$component.src" ]; then
-			cat override.$dist.$component.src >> override.$dist.all3.src
+		zcat override.$dist.$component.gz >> override.$dist.all3
+        if [ -e "override.$dist.$component.src.gz" ]; then
+			zcat override.$dist.$component.src.gz >> override.$dist.all3.src
 		fi
     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
 dak clean-queues
 dak clean-suites