X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=cron.d%2F100syncarchive;h=3f2008a24cfde58564f4ad8bb42e4b1c50a2ca84;hb=a94292426fc9c73044803622d2b88b5902982e9c;hp=02750b05b99162690c582a7905d1a13cfd484276;hpb=56af0d0d5ab185d52da218f7405632ef5ade9f12;p=deb%2Fpackages.git

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 02750b0..3f2008a 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -21,8 +21,6 @@ then
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || continue
-	    test ! "$arch" = "kfreebsd-amd64" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
@@ -30,7 +28,6 @@ then
 		(cd us/${dist}/${part}/binary-${arch} &&
 		    $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
 	    done
-	    #FIXME: no Contents files for p-u
 	    echo retrieve Contents $dist/$arch
 	    (cd us/${dist} &&
 		$wget_cmd -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
@@ -57,8 +54,6 @@ else
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || continue
-	    test ! "$arch" = "kfreebsd-amd64" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
@@ -66,7 +61,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
 	    echo retrieve Contents $dist/$arch
 	    rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \
 		us/${dist}/Contents-${arch}.gz
@@ -85,23 +79,23 @@ fi
 
 # security archive
 #
-for dist in etch lenny
+for dist in $dists
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}
     (cd security/${dist} &&
-	$wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release &&
-	$wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg )
+	$wget_cmd -N ${security_ftpsite}/dists/${dist}-security/Release &&
+	$wget_cmd -N ${security_ftpsite}/dists/${dist}-security/Release.gpg )
         
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
     do
       for part in ${parts}
       do
-	echo retrieve Packages $dist/$part/security/$arch
+	echo retrieve Packages $dist-security/$part/$arch
 	test -d security/${dist}/${part}/binary-${arch} || mkdir -p security/${dist}/${part}/binary-${arch}
 	(cd  security/${dist}/${part}/binary-${arch} &&
-	    $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz)
+	    $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/binary-${arch}/Packages.gz)
       done
     done
     for part in ${parts}
@@ -109,7 +103,7 @@ do
         echo retrieve Sources $dist/$part/security
         test -d security/${dist}/${part}/source || mkdir -p security/${dist}/${part}/source
         (cd security/${dist}/${part}/source &&
-            $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz)
+            $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/source/Sources.gz)
     done
 
     $check_release_cmd $archivedir/security/${dist}/Release