Switch from gnuab.org to debian-ports.org

diff --git a/README b/README
index f55856e35caa2707c49a887a739267c456deb52f..5d7067b7753126728990b8f56fe5c68d51276d36 100644 (file)
--- a/README
+++ b/README
@@ -45,7 +45,8 @@ Cron
 100syncarchive             -- retrieve data from main Debian archive
 100syncarchive_amd64       -- retrieve data from sarge amd64 archive
 100syncarchive_backports   -- retrieve data from backports.org
 100syncarchive             -- retrieve data from main Debian archive
 100syncarchive_amd64       -- retrieve data from sarge amd64 archive
 100syncarchive_backports   -- retrieve data from backports.org

-100syncarchive_gnuab       -- retrieve data from gnuab (kfreebsd-*, armel)
+100syncarchive_debports    -- retrieve data from debian-ports.org
+                              (kfreebsd-*, armel)

 100syncarchive_installer   -- retrieve d-i data
 100syncarchive_m68k        -- retrieve data for etch-m68k
 100syncarchive_maintainers -- retrieve maintainer index
 100syncarchive_installer   -- retrieve d-i data
 100syncarchive_m68k        -- retrieve data for etch-m68k
 100syncarchive_maintainers -- retrieve maintainer index

diff --git a/bin/parse-packages b/bin/parse-packages
index 61d6b841676fc644b2ca1dbbe0be31be1130cc9e..2e713c6fbd93a596f19f853148ba1af21efcaeff 100755 (executable)
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -87,9 +87,9 @@ for my $suite (@SUITES) {
                }
                # Skip double package
                next if exists($packages_all_db{"$data{'package'} $data{'architecture'} $data{'version'}"});
                }
                # Skip double package
                next if exists($packages_all_db{"$data{'package'} $data{'architecture'} $data{'version'}"});

-               # Skip arch:all for amd64 & gnuab, any non-redundancy is
+               # Skip arch:all for amd64 & debports, any non-redundancy is

                # usually a bug anyway
                # usually a bug anyway

-               next if ($archive eq 'amd64' or $archive eq 'gnuab')
+               next if ($archive eq 'amd64' or $archive eq 'debports')

                    and $data{architecture} eq 'all';
 
                if ($data{'provides'}) {
                    and $data{architecture} eq 'all';
 
                if ($data{'provides'}) {

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 748144620d8e0e5e2f96bbafbb8fe3654a975d97..9a95654f61fd1bd6bd13cd2dac53371dd3272574 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -29,7 +29,7 @@ security_ftpsite=http://security.debian.org/debian-security
 volatile_ftpsite=http://volatile.debian.org/debian-volatile
 backports_ftpsite=http://backports.org/debian
 amd64_ftpsite=http://amd64.debian.net/debian
 volatile_ftpsite=http://volatile.debian.org/debian-volatile
 backports_ftpsite=http://backports.org/debian
 amd64_ftpsite=http://amd64.debian.net/debian

-gnuab_ftpsite=http://kfreebsd-gnu.debian.net/debian
+debports_ftpsite=http://ftp.debian-ports.org/debian

 ddtp_ftpsite=http://ddtp.debian.net/debian
 
 root=""
 ddtp_ftpsite=http://ddtp.debian.net/debian
 
 root=""


@@ -38,7 +38,7 @@ root=""
 #
 polangs="de fi fr hu ja nl ru sv uk zh-cn"
 ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br ru sk sv uk zh-cn zh-tw"
 #
 polangs="de fi fr hu ja nl ru sv uk zh-cn"
 ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br ru sk sv uk zh-cn zh-tw"

-archives="us security amd64 gnuab backports volatile"
+archives="us security amd64 debports backports volatile"

 sections="main contrib non-free"
 parts="$sections"
 suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental"
 sections="main contrib non-free"
 parts="$sections"
 suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental"

diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
new file mode 100755 (executable)
index 0000000..897d1dd
--- /dev/null
+++ b/cron.d/100syncarchive_debports
@@ -0,0 +1,33 @@
+#! /bin/bash
+
+. `dirname $0`/../config.sh
+
+test -d ${archivedir} || mkdir -p ${archivedir}
+cd ${archivedir}
+
+# Main archive
+#
+architectures="armel kfreebsd-i386 kfreebsd-amd64"
+
+for dist in sid experimental
+  do
+  echo "retrieve Release(.gpg) $dist"
+  test -d debports/${dist} || mkdir -p debports/${dist}
+  (cd debports/${dist} &&
+           wget -q -N ${debports_ftpsite}/dists/${dist}/Release &&
+           wget -q -N ${debports_ftpsite}/dists/${dist}/Release.gpg )
+
+  for arch in $architectures
+    do
+    for part in ${parts} main/debian-installer
+      do
+      echo retrieve Packages $dist/$part/$arch
+      test -d debports/${dist}/${part}/binary-${arch} || mkdir -p debports/${dist}/${part}/binary-${arch}
+      (cd debports/${dist}/${part}/binary-${arch} &&
+         wget -q -N ${debports_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+    done
+    echo retrieve Contents $dist/$arch
+    (cd debports/${dist} &&
+       wget -q -N ${debports_ftpsite}/dists/${dist}/Contents-${arch}.gz)
+  done
+done

diff --git a/cron.d/100syncarchive_gnuab b/cron.d/100syncarchive_gnuab
deleted file mode 100755 (executable)
index b42d165..0000000
--- a/cron.d/100syncarchive_gnuab
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/bash
-
-. `dirname $0`/../config.sh
-
-test -d ${archivedir} || mkdir -p ${archivedir}
-cd ${archivedir}
-
-# Main archive
-#
-architectures="armel kfreebsd-i386 kfreebsd-amd64"
-
-for dist in sid experimental
-  do
-  echo "retrieve Release(.gpg) $dist"
-  test -d gnuab/${dist} || mkdir -p gnuab/${dist}
-  (cd gnuab/${dist} &&
-           wget -q -N ${gnuab_ftpsite}/dists/${dist}/Release &&
-           wget -q -N ${gnuab_ftpsite}/dists/${dist}/Release.gpg )
-
-  for arch in $architectures
-    do
-    for part in ${parts} main/debian-installer
-      do
-      echo retrieve Packages $dist/$part/$arch
-      test -d gnuab/${dist}/${part}/binary-${arch} || mkdir -p gnuab/${dist}/${part}/binary-${arch}
-      (cd gnuab/${dist}/${part}/binary-${arch} &&
-         wget -q -N ${gnuab_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
-    done
-    echo retrieve Contents $dist/$arch
-    (cd gnuab/${dist} &&
-       wget -q -N ${gnuab_ftpsite}/dists/${dist}/Contents-${arch}.gz)
-  done
-done

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 0d77561a0692ee23571b4d666848c9da302c0e95..75682137be31071dd86b6add65bde342600a0738 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -147,8 +147,8 @@ mirrors = {
                ],
        },
 
                ],
        },
 

-       gnuab => {
-               mirror_list => 'http://wiki.debian.org/Debian_GNU/kFreeBSD_Mirrors',
+       debports => {
+               mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',

                unofficial_port => {
                        'kfreebsd-amd64' => {
                                url_name => 'kfreebsd-gnu',
                unofficial_port => {
                        'kfreebsd-amd64' => {
                                url_name => 'kfreebsd-gnu',


@@ -159,19 +159,19 @@ mirrors = {
                                name => 'GNU/kFreeBSD',
                        },
                        armel => {
                                name => 'GNU/kFreeBSD',
                        },
                        armel => {

-                               url => 'http://www.debonaras.org/',
+                               url => 'http://wiki.debian.org/ArmEabiPort',

                                name => 'armel',
                        },
                },
                north_america => [
                        "www.gtlib.gatech.edu/pub/gnuab/debian",
                                name => 'armel',
                        },
                },
                north_america => [
                        "www.gtlib.gatech.edu/pub/gnuab/debian",

+                       "www.superunprivileged.org/debian",

                ],
                europa => [
                ],
                europa => [

-                       # master site, aka ftp.gnuab.org
-                       "kfreebsd-gnu.debian.net/debian",
+                       "ftp.debian-ports.org/debian",
+                       "ftp.de.debian.org/debian-ports",
+                       "ftp.ch.debian.org/debian-ports",

                        "ftp.easynet.be/ftp/gnuab/debian",
                        "ftp.easynet.be/ftp/gnuab/debian",

-                       "ftp.de.debian.org/debian-kfreebsd",
-                       "ftp.ch.debian.org/debian-kfreebsd",

                ],
        },
 }
                ],
        },
 }