Bug#994117: debian-cd: Links to alioth/~fjp/debmirror/ and d-i.alioth/manual/
Source: debian-cd
Version: 3.1.35
Severity: minor
Tags: patch
Debian Images Group,
README.easy-build has an alioth link to Frans Pop's example script:
http://alioth.debian.org/~fjp/debmirror/
data/$(CODENAME)/README.html.in have alioth links to the
Development version of the Debian Installation Guide:
https://d-i.alioth.debian.org/manual/
Attached is a patch which has the following changes:
1) alioth/~fjp/debmirror/ downloaded from Internet Archive
Wayback Machine to /examples/
2) README.easy-build updated accordingly
3) data/$(CODENAME)/README.html.in now link to:
https://d-i.debian.org/manual/
Thank you!
Daniel Lewart
Urbana, Illinois
diff -Nru a/README.easy-build b/README.easy-build
--- a/README.easy-build 2021-09-06 05:22:44.000000000 -0500
+++ b/README.easy-build 2021-09-12 00:00:00.000000000 -0500
@@ -92,9 +92,9 @@
- ./dists/<codename>/main/installer-<arch>/
contains Debian Installer images (official releases)
-One method is to use debmirror. An example script for creating a full or
-partial local mirror using debmirror suitable for use with debian-cd can be
-found at: http://alioth.debian.org/~fjp/debmirror/.
+One method is to use debmirror. An example script by Frans Pop (fjp)
+for creating a full or partial local mirror using debmirror suitable for
+use with debian-cd can be found at: /usr/share/doc/debian-cd/examples/ .
BASIC CONFIGURATION
===================
diff -Nru a/data/bookworm/README.html.in b/data/bookworm/README.html.in
--- a/data/bookworm/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/bookworm/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -257,7 +257,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/bookworm/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/data/bullseye/README.html.in b/data/bullseye/README.html.in
--- a/data/bullseye/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/bullseye/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -257,7 +257,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/bullseye/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/data/buster/README.html.in b/data/buster/README.html.in
--- a/data/buster/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/buster/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -257,7 +257,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/buster/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/data/jessie/README.html.in b/data/jessie/README.html.in
--- a/data/jessie/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/jessie/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -259,7 +259,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/jessie/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/data/kali-dev/README.html.in b/data/kali-dev/README.html.in
--- a/data/kali-dev/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/kali-dev/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -257,7 +257,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/bullseye/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/data/kali-last-snapshot/README.html.in b/data/kali-last-snapshot/README.html.in
--- a/data/kali-last-snapshot/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/kali-last-snapshot/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -257,7 +257,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/bullseye/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/data/kali-rolling/README.html.in b/data/kali-rolling/README.html.in
--- a/data/kali-rolling/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/kali-rolling/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -257,7 +257,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/bullseye/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/data/sid/README.html.in b/data/sid/README.html.in
--- a/data/sid/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/sid/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -257,7 +257,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/bullseye/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/data/stretch/README.html.in b/data/stretch/README.html.in
--- a/data/stretch/README.html.in 2021-09-06 05:22:44.000000000 -0500
+++ b/data/stretch/README.html.in 2021-09-12 00:00:00.000000000 -0500
@@ -257,7 +257,7 @@
installation guide many not be released yet. It will appear on <a
href="https://www.debian.org/releases/stretch/installmanual";>the
Debian web site</a> when ready, but before then you could try <a
- href="https://d-i.alioth.debian.org/manual/";>the development
+ href="https://d-i.debian.org/manual/";>the development
version of the manual</a>.
</p>
# endif
diff -Nru a/examples/README b/examples/README
--- a/examples/README 1969-12-31 18:00:00.000000000 -0600
+++ b/examples/README 2009-02-16 17:39:26.000000000 -0600
@@ -0,0 +1,22 @@
+mirror-sync is a wrapper script I use for debmirror to keep my
+local mirror up-to-date. I use the mirror for two purposes:
+- updating the systems on my local network
+- building Debian CD images using debian-cd (mostly for testing
+ purposes)
+
+The script includes some nice features, like:
+- a '-s' option that shows whether the local mirror is up-to-date
+ relative to its "upstream" mirrors
+- environment variables to control what should be included in the
+ mirror (which architectures and suites)
+- use rsync to only fetch files from special directories that are
+ needed for debian-cd
+- exclusion of some very large (debug) packages to save disk space
+ and bandwidth (note: can result in debian-cd errors when creating
+ CD images that include them; drop exclusions any you don't want)
+
+Only manual maintainance that is needed is to create the correct
+codename symlinks to suites in dists.
+
+Note: the script (especially the environment variables) should be
+adjusted to your needs before you run it!
diff -Nru a/examples/mirror-sync b/examples/mirror-sync
--- a/examples/mirror-sync 1969-12-31 18:00:00.000000000 -0600
+++ b/examples/mirror-sync 2009-08-18 13:55:01.000000000 -0500
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+VERBOSE=""
+if echo "$@" | grep -q -- "-v"; then
+ VERBOSE=1
+fi
+
+HOSTNAME="$(hostname -f)"
+
+## The mirror to use
+MIRROR=ftp.nl.debian.org
+MDIR=debian
+# If the host name of the mirror in the trace directory differs from the
+# cname you prefer to use for it, define it above this line
+MIRROR_HOSTNAME=${MIRROR_HOSTNAME:-$MIRROR}
+
+LOCAL=/srv/debmirror/debian
+TDIR="$LOCAL/project/trace"
+
+SUITES="stable,testing,unstable"
+DISTS="lenny,squeeze,sid"
+ARCHS="amd64,armel,hppa,i386,sparc,s390"
+SECTS="main,main/debian-installer"
+
+if ! rsync -aq rsync://$MIRROR/$MDIR/project/trace/ $TDIR/; then
+ echo "Failed to retrieve mirror stampfile"
+ exit 1
+fi
+
+# Only display status if -s option is passed
+if echo "$@" | grep -q -- "-s"; then
+ wget -q -t 2 -T 5 \
+ http://ftp.debian.org/debian/project/trace/ftp-master.debian.org \
+ -O $TDIR/##ftp-master## || rm -f $TDIR/##ftp-master##
+ for i in $TDIR/*; do
+ tdate=$(head -n1 $i)
+ echo -e "$(date -d "$tdate" +%s)\t$(date -d "$tdate") - $(basename $i)"
+ done | sort | cut -f2
+ if [ -e /srv/debmirror/debian/Archive-Update-in-Progress-$HOSTNAME ]; then
+ echo
+ echo "Mirror sync in progress"
+ fi
+ exit 0
+fi
+
+if [ ! -f $TDIR/$MIRROR_HOSTNAME ]; then
+ echo "No tracefile for $MIRROR_HOSTNAME found"
+ exit 1
+fi
+
+# Only update if older than 12 hours (43200 sec)
+if [ -s $TDIR/$HOSTNAME ]; then
+ mirror_date=$(head -n1 $TDIR/$MIRROR_HOSTNAME)
+ local_date=$(head -n1 $TDIR/$HOSTNAME)
+ if [ $(( $(date -d "$mirror_date" +%s) -
+ $(date -d "$local_date" +%s) )) -lt 43200 ]; then
+ [ -z "$VERBOSE" ] || echo "Mirror is already up-to-date"
+ [ -z "$VERBOSE" ] || echo "Last update of $MIRROR_HOSTNAME: $(cat $TDIR/$MIRROR_HOSTNAME)"
+ exit 0
+ fi
+fi
+
+
+echo "Mirror sync start - $(date)"
+
+RET=0
+debmirror -v \
+ --arch=$ARCHS \
+ --dist=$DISTS \
+ --section=$SECTS \
+ --pdiff=use \
+ --method="http" \
+ --ignore-small-errors \
+ --nosource \
+ --postcleanup \
+ --ignore=project/ --ignore=tools/ --ignore=doc/ --ignore=indices/ \
+ --ignore='.*README.*' --ignore='.*ls-lR.*' \
+ --exclude='(e/eclipse(|-.*)/.*)' \
+ --exclude='/(boson|ice.*|kde.*|koffice|python-.*|qt-x11-free|samba|wengophone)-dbg_' \
+ --exclude='/lib(boost|gl1-mesa-dri|nel|qt4|.*webkit.*|wine|wxgtk.*|xul.*|zeroc-ice.*)-dbg_' \
+ --exclude='/libqt4-debug_' \
+ -h $MIRROR $LOCAL || RET=$?
+
+if [ $RET -ne 0 ]; then
+ exit $RET
+fi
+
+## Removed from debmirror call. Instead ignore these dirs and use rsync below
+## to fetch the files we want.
+## --include='indices/*' --include='tools/*' --include='doc/*' \
+
+[ -z "$VERBOSE" ] || echo ""
+echo "Mirror sync rsync - $(date)"
+
+# For indices we only sync the files we actually want
+[ -z "$VERBOSE" ] || echo "Starting rsync for ./indices"
+IND_EXCL_OPTS="--delete-excluded"
+for dist in $(echo $DISTS | sed "s/,/ /g"); do
+ for sect in $(echo $SECTS | sed "s/,/ /g; s/\//./g"); do
+ IND_EXCL_OPTS="$IND_EXCL_OPTS --include=override.$dist.*$sect.gz"
+ done
+done
+IND_EXCL_OPTS="$IND_EXCL_OPTS --exclude=override.*"
+for suite in $(echo $SUITES | sed "s/,/ /g"); do
+ IND_EXCL_OPTS="$IND_EXCL_OPTS --include=suite-$suite.list*"
+done
+IND_EXCL_OPTS="$IND_EXCL_OPTS --exclude=suite-*"
+# Doubt we need these huge arch-* files even for the architectures we do mirror
+#for arch in $(echo $ARCHS | sed "s/,/ /g"); do
+# IND_EXCL_OPTS="$IND_EXCL_OPTS --include=arch-$arch.*"
+#done
+IND_EXCL_OPTS="$IND_EXCL_OPTS --exclude=arch-*"
+# Some huge files we probably also don't need
+IND_EXCL_OPTS="$IND_EXCL_OPTS --exclude=indices/Maintainers"
+IND_EXCL_OPTS="$IND_EXCL_OPTS --exclude=indices/md5sums.gz"
+IND_EXCL_OPTS="$IND_EXCL_OPTS --exclude=indices/files/typical.files"
+rsync -aq --delete $IND_EXCL_OPTS rsync://$MIRROR/$MDIR/indices $LOCAL
+
+[ -z "$VERBOSE" ] || echo "Starting rsync for various files"
+# rsyncing READMEs using wildcards may fail on some mirrors
+#rsync -aq rsync://$MIRROR/$MDIR/README* $LOCAL
+rsync -aq rsync://$MIRROR/$MDIR/README $LOCAL
+rsync -aq rsync://$MIRROR/$MDIR/README.html $LOCAL
+rsync -aq --delete rsync://$MIRROR/$MDIR/doc $LOCAL
+
+echo "Mirror sync completed - $(date)"
diff -Nru a/examples/mirror_size.txt b/examples/mirror_size.txt
--- a/examples/mirror_size.txt 1969-12-31 18:00:00.000000000 -0600
+++ b/examples/mirror_size.txt 2009-08-24 02:42:27.000000000 -0500
@@ -0,0 +1,62 @@
+ARCHIVE SIZE
+============
+
+The tables below give an indication of the space needed to mirror the
+archive. They are particularly useful if you wish to set up a partial
+mirror. Only the size of source and binary packages is included.
+You have to allow for around 1-4 GB of meta data (in dists/<dist>) per
+suite (depending in your settings). Plus whatever space is needed
+for extra directories (e.g. tools, doc) you wish to mirror.
+
+The tables also show how much additional space is required if you add
+a release on top of its predecessor. Note that the additional space
+needed for testing and (to a lesser extend) unstable varies during the
+development cycle of a release. The additional space needed for testing
+is zero immediately after a stable release and grows from that time
+onwards.
+
+Total archive size (binary + source) per section:
+
+ (in MiB)| etch | lenny | squeeze | sid | all
+---------+-------+------------------+------------------+-----------------+-------
+main | 79844 | 119617 (+114304) | 144855 (+109368) | 158548 (+52139) | 355343
+contrib | 448 | 1379 (+ 1264) | 1222 (+ 339) | 1284 (+ 129) | 2163
+non-free | 1752 | 5274 (+ 4749) | 5570 (+ 3256) | 6028 (+ 1471) | 11226
+main/d-i | 297 | 360 (+ 359) | 363 (+ 171) | 353 (+ 232) | 1061
+---------+-------+------------------+------------------+-----------------+-------
+total | 82342 | 126633 (+120678) | 152012 (+113136) | 166215 (+53973) | 369795
+
+Archive size per section for a single architecture (i386) without source:
+
+ (in MiB)| etch | lenny | squeeze | sid | all
+---------+-------+------------------+------------------+-----------------+-------
+main | 12985 | 18634 (+ 17833) | 22448 (+ 17507) | 24435 (+ 7340) | 55638
+contrib | 112 | 341 (+ 306) | 285 (+ 62) | 289 (+ 18) | 499
+non-free | 584 | 1869 (+ 1676) | 2161 (+ 1294) | 2327 (+ 416) | 3971
+main/d-i | 23 | 37 (+ 36) | 38 (+ 13) | 40 (+ 29) | 103
+---------+-------+------------------+------------------+-----------------+-------
+total | 13707 | 20882 (+ 19851) | 24934 (+ 18876) | 27093 (+ 7803) | 60213
+
+Archive size per architecture (source and arch=all packages are shown
+separately):
+
+ (in MiB)| etch | lenny | squeeze | sid | all
+---------+-------+------------------+------------------+-----------------+-------
+source | 13261 | 19291 (+ 15911) | 22466 (+ 13117) | 23935 (+ 3923) | 46122
+all | 7906 | 12496 (+ 11626) | 14799 (+ 11120) | 16046 (+ 2780) | 33429
+i386 | 5801 | 8385 (+ 8225) | 10135 (+ 7757) | 11047 (+ 5024) | 26784
+amd64 | 5656 | 8555 (+ 8419) | 10359 (+ 7879) | 11236 (+ 5124) | 27057
+alpha | 5853 | 7976 (+ 7814) | 9643 (+ 7309) | 10309 (+ 3900) | 24855
+arm | 5122 | 7087 (+ 6942) | | | 12064
+armel | | 7179 (+ 7179) | 8697 (+ 6707) | 9101 (+ 3348) | 17214
+hppa | 5545 | 7619 (+ 7463) | 9220 (+ 6872) | 9878 (+ 3312) | 23172
+ia64 | 6478 | 9257 (+ 9076) | 11020 (+ 8205) | 11681 (+ 4056) | 27790
+mips | 5356 | 7679 (+ 7517) | 9353 (+ 7092) | 9775 (+ 2433) | 22379
+mipsel | 5225 | 7541 (+ 7389) | 9166 (+ 6940) | 9506 (+ 2742) | 22276
+powerpc | 5788 | 8247 (+ 8094) | 10047 (+ 7586) | 10813 (+ 4267) | 25716
+s390 | 5100 | 7562 (+ 7410) | 8932 (+ 6694) | 9557 (+ 3563) | 22750
+sparc | 5245 | 7752 (+ 7606) | 9551 (+ 7235) | 10086 (+ 3307) | 23372
+kfreebsd-i386 | 4232 (+ 4232) | 6655 (+ 3200) | 7432
+kfreebsd-amd64 | 4386 (+ 4386) | 6582 (+ 2987) | 7374
+
+All numbers reflect the state of te archive per 19 Aug 2009.
Reply to: