X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=cron.d%2F100syncarchive;h=aa73217619dcbce6e32718272da3917e63734f73;hb=a0fb82cc65e2ef4d6004e61aae0f35a0bf37a010;hp=fd46a9934e3dceee22c70ae6d020ae74fb97a3f1;hpb=1f7a7225c79c1a6a1caa2f51d208e1dad14997d7;p=deb%2Fpackages.git

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index fd46a99..aa73217 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -21,7 +21,6 @@ then
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
@@ -29,8 +28,6 @@ then
 		(cd us/${dist}/${part}/binary-${arch} &&
 		    wget -q -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
 	    done
-	    #FIXME: no Contents files for p-u
-	    test ! "$dist" = "experimental" || continue
 	    echo retrieve Contents $dist/$arch
 	    (cd us/${dist} &&
 		wget -q -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
@@ -49,14 +46,12 @@ else
     do
         echo "retrieve Releases(.gpg) $dist"
 	test -d us/${dist} || mkdir -p us/${dist}
-	(cd us/${dist} &&
-	    rsync -t ${localdir}/dists/${dist}/Release &&
-	    rsync -t ${localdir}/dists/${dist}/Release.gpg )
+	rsync -t ${localdir}/dists/${dist}/Release us/${dist}/Release
+	rsync -t ${localdir}/dists/${dist}/Release.gpg us/${dist}/Release.gpg
 
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
@@ -64,8 +59,6 @@ else
 		rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
 		    us/${dist}/${part}/binary-${arch}/Packages.gz
 	    done
-	    #FIXME: no Contents files for p-u
-	    test ! "$dist" = "experimental" || continue
 	    echo retrieve Contents $dist/$arch
 	    rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \
 		us/${dist}/Contents-${arch}.gz
@@ -80,38 +73,16 @@ else
     done
 fi
 
-# Non-US archive
-#
-for dist in oldstable
-do
-    foo=\$arch_${dist//-/_}
-    for arch in `eval echo $foo`
-    do
-	for part in ${parts}
-	do
-	    echo retrieve Packages $dist/$part/non-US/$arch
-	    test -d non-US/${dist}/${part}/binary-${arch} || mkdir -p non-US/${dist}/${part}/binary-${arch}
-	    (cd non-US/${dist}/${part}/binary-${arch} &&
-		wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/${part}/binary-${arch}/Packages.gz)
-	done
-	#FIXME: no Contents files for p-u
-	echo retrieve Contents $dist/non-US/$arch
-	(cd non-US/${dist} &&
-	    wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/Contents-${arch}.gz)
-    done
-    for part in ${parts}
-    do
-        echo retrieve Sources $dist/$part/non-US
-    	test -d non-US/${dist}/${part}/source || mkdir -p non-US/${dist}/${part}/source
-	(cd non-US/${dist}/${part}/source &&
-	    wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/${part}/source/Sources.gz)
-    done
-done
-
 # security archive
 #
-for dist in oldstable stable testing
+for dist in $dists
 do
+    echo "retrieve Release(.gpg) $dist"
+    test -d security/${dist} || mkdir -p security/${dist}
+    (cd security/${dist} &&
+	wget -q -N ${security_ftpsite}/dists/${dist}/updates/Release &&
+	wget -q -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg )
+        
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
     do