diff options
| author | Mike Swanson | 2018-01-17 03:52:05 -0800 |
|---|---|---|
| committer | Mike Swanson | 2018-01-17 03:52:05 -0800 |
| commit | 71337f5ae983d2e20a58a7e9794a2335d20e5149 (patch) | |
| tree | d4f9cb0fdbc9fb838e8de96566d8b8c59cfbf528 | |
| parent | 3f022d5faddc72c6c4d523a4ace7b150e822ea3a (diff) | |
| download | aur-71337f5ae983d2e20a58a7e9794a2335d20e5149.tar.gz | |
Initial commit -- use Debian’s patches
| -rw-r--r-- | .SRCINFO | 31 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | 00.richard_fixes.patch | 1003 | ||||
| -rw-r--r-- | 01.hardening.patch | 29 | ||||
| -rw-r--r-- | 02.address_change.patch | 2522 | ||||
| -rw-r--r-- | 03.jigdo-lite-https.patch | 19 | ||||
| -rw-r--r-- | 04.jigdo-lite-tmpdir.patch | 11 | ||||
| -rw-r--r-- | 05.jigdo-lite-grep-options.patch | 11 | ||||
| -rw-r--r-- | 06.jigdo-lite-store-filesPerFetch.patch | 11 | ||||
| -rw-r--r-- | PKGBUILD | 60 | ||||
| -rw-r--r-- | jigdo-0.7.3-gcc43.patch | 80 |
11 files changed, 3674 insertions, 108 deletions
@@ -1,20 +1,33 @@ # Generated by mksrcinfo v8 -# Wed Jun 15 07:43:01 UTC 2016 +# Wed Jan 17 11:47:48 UTC 2018 pkgbase = jigdo - pkgdesc = Jigsaw Download, or short jigdo, is a tool designed to ease the distribution of very large files over the internet, for example CD or DVD images + pkgdesc = Distribute large images by sending and receiving the files that make them up pkgver = 0.7.3 - pkgrel = 5 + pkgrel = 1 url = http://atterer.org/jigdo/ arch = i686 arch = x86_64 license = GPL2 - depends = gtk2>=2.4.0 - depends = bzip2 - depends = curl + makedepends = docbook-utils + makedepends = docbook-sgml + depends = db + depends = wget source = http://atterer.org/sites/atterer/files/2009-08/jigdo/jigdo-0.7.3.tar.bz2 - source = https://raw2.github.com/sputnick-dev/aur/master/jigdo/jigdo-0.7.3-gcc43.patch - md5sums = bbc1d9ac750bb34e0748f0b57157cc72 - md5sums = 0133ce4fd63c872a26e1c19b627eb2db + source = 00.richard_fixes.patch + source = 01.hardening.patch + source = 02.address_change.patch + source = 03.jigdo-lite-https.patch + source = 04.jigdo-lite-tmpdir.patch + source = 05.jigdo-lite-grep-options.patch + source = 06.jigdo-lite-store-filesPerFetch.patch + sha512sums = e183a2d93126935057244b9eb6bf6dadc1900cb17c36194f69e63a15d70ddfea81ce1167de5abfcdfd7507ac9fe6250a05be9d9d29392c961d44fde796158f7c + sha512sums = a6d576aecdbba65d655e449b12dc9bf795db7db0d6aa2aa069265948c33509e633ed1936e74119539829b33e463bd2b90219cf69cd2ccaa2debd96d120a675ad + sha512sums = cec50d1edd3f3e8d81b22069a61824b5d139e7e21dac919798630200e0610b6af43ebf17680918bd64ebb00f231ede9c5d5467d45136f4181210743c87345422 + sha512sums = 23bc3b1037d655c707b6fb06ad167623db11bbae66741bc9a0d1b06fcd73b8c8272b4a15808354ee38d7cc27ce37328f98b277bf12de0ab47280a975268ecc2a + sha512sums = e7642a3369959cb77f64431608b7a4f93565fe34cd186a6a808d82fb2ed6b5e17b1a1dc71ebaf455692df2d7f09d9b0a99b03e1df417120a4d30082baba6f1af + sha512sums = 6a01da354dd504e2670089d1646dcf548d2f3e840a2d7bda6e33bf7d5bda9ade70c6001c2da50805550c654a4752821ba4380b6ff43094e8336132cde94423e5 + sha512sums = 465dc1518dd0d966e9e245bd79900c33e37a889228921b617fd78f1a15060f3bb6d0c39a0bbdb78752d435dd74ebfefefced0847556e3388f075caf54fb41fba + sha512sums = e7b69d0aa1be31afb5960d51d090b0bff778e678cd09b50dd2725151211288148a91eead85fba72dd0d503bb9eb054d40465050719367d2cb0e0440d70ef23e2 pkgname = jigdo diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..810b2a562251 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.pkg.tar* +*.src.tar* +*.bz2 +src +pkg diff --git a/00.richard_fixes.patch b/00.richard_fixes.patch new file mode 100644 index 000000000000..e14f0665cf55 --- /dev/null +++ b/00.richard_fixes.patch @@ -0,0 +1,1003 @@ +--- jigdo-0.7.3.orig/Makefile.in ++++ jigdo-0.7.3/Makefile.in +@@ -15,7 +15,7 @@ + + PACKAGE = jigdo + INSTALL = @INSTALL@ +-INSTALL_EXE = @INSTALL@ -s ++INSTALL_EXE = @INSTALL@ #-s + INSTALL_DATA = @INSTALL@ -m 644 + INSTALL_SCRIPT = @INSTALL@ -m 755 + AWK = @AWK@ +--- jigdo-0.7.3.orig/src/compat.hh ++++ jigdo-0.7.3/src/compat.hh +@@ -20,6 +20,7 @@ + + #include <string> + #include <stdio.h> ++#include <stdlib.h> + #include <unistd-jigdo.h> + #include <sys/stat.h> + #include <sys/types.h> +--- jigdo-0.7.3.orig/src/jigdo-file.cc ++++ jigdo-0.7.3/src/jigdo-file.cc +@@ -770,6 +770,7 @@ + case JigdoFileCmd::LIST_TEMPLATE: + returnValue = JigdoFileCmd::listTemplate(); break; + case JigdoFileCmd::MD5SUM: ++ JigdoFileCmd::optCheckFiles = true; // Quick fix, possibly not 100% correct + returnValue = JigdoFileCmd::md5sumFiles(); break; + } + } +--- jigdo-0.7.3.orig/src/Makefile.in ++++ jigdo-0.7.3/src/Makefile.in +@@ -50,11 +50,12 @@ + windows-res = @IF_WINDOWS@ jigdo.res + test-programs = job/jigdo-io-test@exe@ \ + job/makeimagedl-info-test@exe@ job/url-mapping-test@exe@ \ +- net/proxyguess-test@exe@ net/uri-test@exe@ \ ++ net/proxyguess-test@exe@ \ + util/autonullptr-test@exe@ util/rsyncsum-test@exe@ \ + util/gunzip-test@exe@ util/log-test@exe@ \ + util/md5sum-test@exe@ util/mimestream-test@exe@ \ + util/string-utf-test@exe@ ++# net/uri-test@exe@ needs curl + + # fmt -s -w1|sed 's%[^a-zA-Z0-9./-]\+%%g'|sort|fmt -w60|sed 's%$% \\%' + objects-jigdo = compat.o glibcurl/glibcurl.o gtk/gtk-makeimage.o \ +--- jigdo-0.7.3.orig/src/recursedir.cc ++++ jigdo-0.7.3/src/recursedir.cc +@@ -33,6 +33,7 @@ + + #include <iostream> + #include <errno.h> ++#include <string.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd-jigdo.h> +--- jigdo-0.7.3.orig/src/util/configfile.cc ++++ jigdo-0.7.3/src/util/configfile.cc +@@ -18,7 +18,7 @@ + + #include <iostream> + #include <fstream> +- ++#include <cstring> + #include <configfile.hh> + #include <string.hh> + //______________________________________________________________________ +--- jigdo-0.7.3.orig/src/util/md5sum.hh ++++ jigdo-0.7.3/src/util/md5sum.hh +@@ -29,6 +29,7 @@ + #include <config.h> + + #include <cstdlib> ++#include <cstring> + #include <iosfwd> + #include <string> + +--- jigdo-0.7.3.orig/src/util/string-utf.cc ++++ jigdo-0.7.3/src/util/string-utf.cc +@@ -15,7 +15,7 @@ + #include <glib.h> + #include <stdarg.h> + #include <stdio.h> +- ++#include <string.h> + #include <debug.hh> + #include <string-utf.hh> + //______________________________________________________________________ +--- jigdo-0.7.3.orig/src/net/proxyguess-test.cc ++++ jigdo-0.7.3/src/net/proxyguess-test.cc +@@ -18,6 +18,7 @@ + #include <algorithm> + #include <map> + #include <sstream> ++#include <memory> + #include <glib.h> + + #include <debug.hh> +--- jigdo-0.7.3.orig/src/gtk/jigdo.cc ++++ jigdo-0.7.3/src/gtk/jigdo.cc +@@ -12,10 +12,10 @@ + #include <config.h> + + #if DEBUG +-# include <string.h> + # include <unistd-jigdo.h> + #endif + ++#include <string.h> + #include <iostream> + #include <string> + #include <vector> +--- jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc ++++ jigdo-0.7.3/src/gtk/gtk-single-url.cc +@@ -15,7 +15,7 @@ + + #include <time.h> + #include <errno.h> +- ++#include <string.h> + #include <autoptr.hh> + #include <gtk-single-url.hh> + #include <joblist.hh> +--- jigdo-0.7.3.orig/scripts/debian-mirrors.jigdo ++++ jigdo-0.7.3/scripts/debian-mirrors.jigdo +@@ -1,263 +1,137 @@ + Debian=http://ftp.us.debian.org/debian/ # US United States +-Debian=http://ftp.debian.org/debian/ # US United States +-Non-US=http://non-us.debian.org/debian-non-US/ # NL Netherlands (Amsterdam) +-Debian=http://debian.hands.com/debian/ # GB Great Britain +-Non-US=http://debian.hands.com/debian-non-US/ # GB Great Britain +-Debian=http://debian.crosslink.net/debian/ # US United States (Virginia) ++Non-US=http://archive.debian.org/debian-non-US/ # NL Netherlands (Amsterdam) ++Debian=http://ftp.uk.debian.org/debian/ # GB Great Britain (London) + Debian=http://mirror.aarnet.edu.au/debian/ # AU Australia (Canberra) +-Non-US=http://mirror.aarnet.edu.au/debian-non-US/ # AU Australia (Canberra) +-Debian=http://ftp.wa.au.debian.org/debian/ # AU Australia (Perth, Western) +-Non-US=http://ftp.wa.au.debian.org/debian-non-US/ # AU Australia (Perth, Western) + Debian=http://ftp.monash.edu.au/pub/linux/debian/ # AU Australia (Melbourne) +-Non-US=http://ftp.monash.edu.au/pub/linux/debian-non-US/ # AU Australia (Melbourne) +-Non-US=http://ftp.progsoc.uts.edu.au/pub/Linux/debian-non-US/ # AU Australia (Sydney) +-Debian=ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/ # NL Netherlands +-Debian=ftp://ftp.demon.co.uk/pub/mirrors/linux/debian/ # GB Great Britain +-Debian=ftp://ftp.uwa.edu.au/mirrors/linux/debian/ # AU Australia (Perth, Western) ++Debian=http://ftp.nluug.nl/pub/os/Linux/distr/debian/ # NL Netherlands ++Debian=http://ftp.uwa.edu.au/debian/ # AU Australia (Perth, Western) + Non-US=ftp://ftp.uwa.edu.au/mirrors/linux/debian-non-US/ # AU Australia (Perth, Western) +-Debian=http://mirror.eftel.com/debian/ # AU Australia (Perth, Western) +-Non-US=http://mirror.eftel.com/debian-non-US/ # AU Australia (Perth, Western) +-Debian=ftp://sunsite.ust.hk/pub/debian/ # HK Hong Kong +-Debian=http://ftp.tiscali.be/debian/ # BE Belgium +-Non-US=http://ftp.tiscali.be/debian-non-US/ # BE Belgium ++Debian=http://mirror.eftel.com/debian/ # AU Australia ++Non-US=http://mirror.eftel.com/debian-non-US/ # AU Australia + Debian=http://ftp.kulnet.kuleuven.ac.be/debian/ # BE Belgium (Leuven) +-Non-US=http://ftp.kulnet.kuleuven.ac.be/debian-non-US/ # BE Belgium (Leuven) +-Debian=http://mirrors.sunsite.dk/debian/ # DK Denmark (Aalborg) +-Non-US=http://mirrors.sunsite.dk/debian-non-US/ # DK Denmark (Aalborg) +-Debian=http://debian.efis.ucr.ac.cr/debian/ # CR Costa Rica (San Jose) +-Non-US=http://debian.efis.ucr.ac.cr/debian-non-US/ # CR Costa Rica (San Jose) ++Debian=http://ftp.dk.debian.org/debian/ # DK Denmark (Aalborg) ++Non-US=http://ftp.dk.debian.org/debian-non-US/ # DK Denmark (Aalborg) + Debian=http://ftp.it.debian.org/debian/ # IT Italy (Milan) +-Non-US=http://ftp.it.debian.org/debian-non-US/ # IT Italy (Milan) +-Debian=http://ftp2.it.debian.org/debian/ # IT Italy (Bologna) +-Non-US=http://ftp2.it.debian.org/debian-non-US/ # IT Italy (Bologna) +-Debian=ftp://ftp-linux.cc.gatech.edu/debian/ # US United States (Atlanta, Georgia) ++Debian=http://giano.com.dist.unige.it/debian/ # IT Italy (Genoa) ++Non-US=http://giano.com.dist.unige.it/debian-non-US/ # IT Italy (Genoa) ++Debian=http://ftp.gtlib.gatech.edu/debian/ # US United States (Atlanta, Georgia) + Debian=http://ftp.egr.msu.edu/debian/ # US United States (Lansing, Michigan) +-Debian=http://distro.ibiblio.org/pub/Linux/distributions/debian/ # US United States (Chapel Hill, North Carolina) +-Debian=ftp://ftp.mcc.ac.uk/pub/linux/distributions/Debian/ # GB Great Britain ++Debian=http://distro.ibiblio.org/debian/ # US United States (Chapel Hill, North Carolina) ++Debian=http://debian.man.ac.uk/debian/ # GB Great Britain + Debian=http://ftp.cz.debian.org/debian/ # CZ Czech Republic + Non-US=http://ftp.cz.debian.org/debian-non-US/ # CZ Czech Republic + Debian=http://ftp.tu-clausthal.de/pub/linux/debian/ # DE Germany (Clausthal-Zellerfeld, Niedersachsen) +-Non-US=http://ftp.tu-clausthal.de/pub/linux/debian-non-US/ # DE Germany (Clausthal-Zellerfeld, Niedersachsen) +-Debian=http://ftp.sk.debian.org/debian/ # SK Slovakia (Kosice) +-Non-US=http://ftp.sk.debian.org/debian-non-US/ # SK Slovakia (Kosice) +-Debian=http://toxo.com.uvigo.es/debian/ # ES Spain (Vigo, Pontevedra) +-Non-US=http://toxo.com.uvigo.es/debian-non-US/ # ES Spain (Vigo, Pontevedra) + Debian=http://ftp.at.debian.org/debian/ # AT Austria (Vienna) +-Non-US=http://ftp.at.debian.org/debian-non-US/ # AT Austria (Vienna) + Debian=http://ftp.de.debian.org/debian/ # DE Germany (Dresden) +-Non-US=http://ftp.de.debian.org/debian-non-US/ # DE Germany (Dresden) + Debian=http://mirror.switch.ch/ftp/mirror/debian/ # CH Switzerland (Zurich) +-Non-US=http://mirror.switch.ch/ftp/mirror/debian-non-US/ # CH Switzerland (Zurich) ++Debian=http://ftp.nara.wide.ad.jp/debian/ # JP Japan (Nara) ++Non-US=http://ftp.nara.wide.ad.jp/debian-non-US/ # JP Japan (Nara) + Debian=http://ftp2.jp.debian.org/debian/ # JP Japan (Kashiwa NOC, Chiba) + Non-US=http://ftp2.jp.debian.org/debian-non-US/ # JP Japan (Kashiwa NOC, Chiba) + Debian=http://ftp.bg.debian.org/debian/ # BG Bulgaria (Sofia) +-Non-US=http://ftp.bg.debian.org/debian-non-US/ # BG Bulgaria (Sofia) + Debian=http://ftp-mirror.internap.com/pub/debian/ # US United States (Seattle) +-Debian=http://ftp.cerias.purdue.edu/pub/os/debian/ # US United States (West Lafayette, Indiana) + Debian=http://ftp.ru.debian.org/debian/ # RU Russia (Chernogolovka, Moscow) +-Non-US=http://ftp.ru.debian.org/debian-non-US/ # RU Russia (Chernogolovka, Moscow) +-Debian=http://ftp.bononia.it/debian/ # IT Italy (Rome) +-Non-US=http://ftp.bononia.it/debian-non-US/ # IT Italy (Rome) +-Debian=http://ftp.students.cs.unibo.it/debian/ # IT Italy (Bologna) +-Non-US=http://ftp.students.cs.unibo.it/debian-non-US/ # IT Italy (Bologna) +-Debian=http://ftp.sunet.se/pub/os/Linux/distributions/debian/ # SE Sweden (Uppsala) +-Non-US=http://ftp.sunet.se/pub/os/Linux/distributions/debian-non-US/ # SE Sweden (Uppsala) +-Debian=ftp://ftp.dkuug.dk/pub/debian/ # DK Denmark (Copenhagen) ++Debian=http://ftp.sunet.se/pub/Linux/distributions/debian/ # SE Sweden (Uppsala) ++Non-US=http://ftp.sunet.se/pub/Linux/distributions/debian-non-US/ # SE Sweden (Uppsala) + Debian=http://freedom.dicea.unifi.it/ftp/pub/linux/debian/ # IT Italy (Firenze) +-Non-US=http://freedom.dicea.unifi.it/ftp/pub/linux/debian-non-US/ # IT Italy (Firenze) + Debian=http://ftp.pl.debian.org/debian/ # PL Poland (Gdańsk) + Non-US=http://ftp.pl.debian.org/debian-non-US/ # PL Poland (Gdańsk) + Debian=http://ftp2.de.debian.org/debian/ # DE Germany (Guetersloh) + Non-US=http://ftp2.de.debian.org/debian-non-US/ # DE Germany (Guetersloh) + Debian=http://ftp.iut-bm.univ-fcomte.fr/debian/ # FR France (Belfort) +-Non-US=http://ftp.iut-bm.univ-fcomte.fr/debian-non-US/ # FR France (Belfort) +-Debian=http://ring.asahi-net.or.jp/archives/linux/debian/debian/ # JP Japan (Tokyo) +-Non-US=http://ring.asahi-net.or.jp/archives/linux/debian/debian-non-US/ # JP Japan (Tokyo) + Debian=http://ftp.eudil.fr/debian/ # FR France (Lille) + Non-US=http://ftp.eudil.fr/debian-non-US/ # FR France (Lille) +-Debian=ftp://ftp.cs.unm.edu/mirrors/debian/ # US United States (Santa Fe, New Mexico) +-Debian=http://ftp.uevora.pt/debian/ # PT Portugal (Évora) +-Non-US=http://ftp.uevora.pt/debian-non-US/ # PT Portugal (Évora) +-Debian=ftp://ftp.arnes.si/packages/debian/ # SI Slovenia +-Non-US=ftp://ftp.arnes.si/packages/debian-non-US/ # SI Slovenia ++Debian=http://ftp.pt.debian.org/debian/ # PT Portugal (Évora) ++Debian=http://ftp.arnes.si/pub/packages/debian/ # SI Slovenia + Debian=http://ftp.fr.debian.org/debian/ # FR France + Non-US=http://ftp.fr.debian.org/debian-non-US/ # FR France ++Debian=http://ftp.tw.debian.org/debian/ # TW Taiwan (Taipei) + Debian=ftp://ftp.proxad.net/mirrors/ftp.debian.org/ # FR France + Non-US=ftp://ftp.proxad.net/mirrors/nonus.debian.org/ # FR France +-Debian=http://debian.uni-essen.de/debian/ # DE Germany (Essen, Nordrhein-Westfalen) +-Debian=http://www.mirror.ac.uk/sites/ftp.debian.org/debian/ # GB Great Britain (Canterbury and Lancaster) +-Non-US=http://www.mirror.ac.uk/sites/non-us.debian.org/debian-non-US/ # GB Great Britain (Canterbury and Lancaster) +-Debian=ftp://ftp.minet.net/debian/ # FR France (Evry) +-Non-US=ftp://ftp.minet.net/debian-non-US/ # FR France (Evry) +-Debian=http://ftp.is.co.za/debian/ # ZA South Africa (Johannesburg) +-Non-US=http://ftp.is.co.za/debian-non-US/ # ZA South Africa (Johannesburg) +-Debian=ftp://ftp.index.hu/debian/ # HU Hungary (Budapest) +-Non-US=ftp://ftp.index.hu/debian-non-US/ # HU Hungary (Budapest) +-Debian=ftp://ftp.dti.ad.jp/pub/Linux/debian/ # JP Japan (Tokyo) ++Debian=http://debian.uni-duisburg-essen.de/debian/ # DE Germany (Essen, Nordrhein-Westfalen) ++Debian=http://www.mirrorservice.org/sites/ftp.debian.org/debian/ # GB Great Britain (Canterbury) ++Non-US=http://www.mirrorservice.org/sites/non-us.debian.org/debian-non-US/ # GB Great Britain (Canterbury) ++Debian=ftp://ftp.mirrorservice.org/sites/ftp.debian.org/debian/ # GB Great Britain (Canterbury) ++Non-US=ftp://ftp.mirrorservice.org/sites/non-us.debian.org/debian-non-US/ # GB Great Britain (Canterbury) ++Debian=http://ftp.dti.ad.jp/pub/Linux/debian/ # JP Japan (Tokyo) + Non-US=ftp://ftp.dti.ad.jp/pub/Linux/debian-non-US/ # JP Japan (Tokyo) + Debian=http://ftp.esat.net/pub/linux/debian/ # IE Ireland (Dublin) + Non-US=http://ftp.esat.net/pub/linux/debian-non-US/ # IE Ireland (Dublin) +-Debian=http://ftp.du.se/debian/ # SE Sweden +-Non-US=http://ftp.du.se/debian-non-US/ # SE Sweden +-Debian=http://mirror.direct.ca/linux/debian/ # CA Canada (Vancouver) +-Non-US=http://mirror.direct.ca/linux/debian-non-US/ # CA Canada (Vancouver) +-Debian=http://ftp.si.debian.org/debian/ # SI Slovenia (Maribor) +-Non-US=http://ftp.si.debian.org/debian-non-US/ # SI Slovenia (Maribor) +-Debian=http://mirror.cs.wisc.edu/pub/mirrors/linux/debian/ # US United States (Madison, Wisconsin) +-Debian=ftp://ftp.linux.co.za/pub/distributions/debian/ # ZA South Africa (Johannesburg) +-Debian=http://ftp.kfki.hu/debian/ # HU Hungary (Budapest) +-Non-US=http://ftp.kfki.hu/debian-non-US/ # HU Hungary (Budapest) ++Debian=http://debian.camtp.uni-mb.si/debian/ # SI Slovenia (Maribor) ++Debian=http://mirror.cs.wisc.edu/debian/ # US United States (Madison, Wisconsin) ++Debian=http://ftp.kfki.hu/linux/debian/ # HU Hungary (Budapest) ++Non-US=http://ftp.kfki.hu/linux/debian-non-US/ # HU Hungary (Budapest) + Debian=http://ftp.hk.debian.org/debian/ # HK Hong Kong +-Non-US=http://ftp.hk.debian.org/debian-non-US/ # HK Hong Kong +-Debian=http://ftp.kornet.net/pub/Linux/debian/ # KR Korea (Seoul) +-Debian=ftp://ftp.nuri.net/pub/debian/ # KR Korea (Seoul) +-Debian=http://ftp.eu.uu.net/debian/ # NL Netherlands (Amsterdam) +-Non-US=http://ftp.eu.uu.net/debian-non-US/ # NL Netherlands (Amsterdam) ++Non-US=ftp://ftp.hk.debian.org/debian-non-US/ # HK Hong Kong + Debian=http://gd.tuwien.ac.at/opsys/linux/debian/ # AT Austria (Vienna) +-Non-US=http://gd.tuwien.ac.at/opsys/linux/debian-non-US/ # AT Austria (Vienna) +-Debian=http://ftp.info.iut-tlse3.fr/debian/ # FR France +-Non-US=http://ftp.info.iut-tlse3.fr/debian-non-US/ # FR France +-Debian=http://ftp.latnet.lv/linux/debian/ # LV Latvia (Riga) +-Non-US=http://ftp.latnet.lv/linux/debian-non-US/ # LV Latvia (Riga) + Debian=http://ftp.no.debian.org/debian/ # NO Norway (Oslo) +-Non-US=http://ftp.no.debian.org/debian-non-US/ # NO Norway (Oslo) + Debian=http://ftp.icm.edu.pl/pub/Linux/debian/ # PL Poland (Warsaw) + Non-US=http://ftp.icm.edu.pl/pub/Linux/distributions/debian-non-US/ # PL Poland (Warsaw) +-Debian=http://ftp.ee.debian.org/debian/ # EE Estonia +-Non-US=http://ftp.ee.debian.org/debian-non-US/ # EE Estonia + Debian=http://ftp.freenet.de/debian/ # DE Germany (Düsseldorf) +-Non-US=http://ftp.freenet.de/debian-non-US/ # DE Germany (Düsseldorf) +-Debian=ftp://ftp.uwsg.indiana.edu/linux/debian/ # US United States (Bloomington, Indiana) +-Debian=http://debian.tod.net/debian/ # US United States (Cleveland, Ohio) ++Debian=http://ftp.uwsg.indiana.edu/linux/debian/ # US United States (Bloomington, Indiana) + Debian=http://ftp.hu.debian.org/debian/ # HU Hungary (Budapest) +-Non-US=http://ftp.hu.debian.org/debian-non-US/ # HU Hungary (Budapest) +-Debian=http://debian.inf.elte.hu/debian/ # HU Hungary (Budapest) +-Non-US=http://debian.inf.elte.hu/debian-non-US/ # HU Hungary (Budapest) + Debian=http://ftp.nz.debian.org/debian/ # NZ New Zealand (Wellington) +-Non-US=http://ftp.nz.debian.org/debian-non-US/ # NZ New Zealand (Wellington) + Debian=http://ftp.eq.uc.pt/software/Linux/debian/ # PT Portugal (Coimbra) +-Non-US=http://ftp.eq.uc.pt/software/Linux/debian-non-US/ # PT Portugal (Coimbra) + Debian=http://debian.mur.at/debian/ # AT Austria (Graz) +-Non-US=http://debian.mur.at/debian-non-US/ # AT Austria (Graz) +-Debian=http://ftp.uni-erlangen.de/pub/Linux/debian/ # DE Germany (Erlangen) +-Non-US=http://ftp.uni-erlangen.de/pub/Linux/debian/debian-non-US/ # DE Germany (Erlangen) + Debian=http://debian.otenet.gr/debian/ # GR Greece (Athens) + Non-US=http://debian.otenet.gr/debian-non-US/ # GR Greece (Athens) +-Debian=http://dennou-t.ms.u-tokyo.ac.jp/library/Linux/debian/ # JP Japan (Tokyo) +-Non-US=http://dennou-t.ms.u-tokyo.ac.jp/library/Linux/debian-non-US/ # JP Japan (Tokyo) +-Debian=http://dennou-k.gaia.h.kyoto-u.ac.jp/library/Linux/debian/ # JP Japan (Kyoto) +-Non-US=http://dennou-k.gaia.h.kyoto-u.ac.jp/library/Linux/debian-non-US/ # JP Japan (Kyoto) +-Debian=http://dennou-q.geo.kyushu-u.ac.jp/library/Linux/debian/ # JP Japan (Fukuoka) +-Non-US=http://dennou-q.geo.kyushu-u.ac.jp/library/Linux/debian-non-US/ # JP Japan (Fukuoka) +-Debian=http://natasha.stmarytx.edu/debian/ # US United States (San Antonio, Texas) ++Debian=http://dennou-k.gfd-dennou.org/debian/ # JP Japan (Kyoto) ++Non-US=http://dennou-k.gfd-dennou.org/library/Linux/debian-non-US/ # JP Japan (Kyoto) ++Debian=http://dennou-q.gfd-dennou.org/debian/ # JP Japan (Fukuoka) ++Non-US=http://dennou-q.gfd-dennou.org/library/Linux/debian-non-US/ # JP Japan (Fukuoka) + Debian=http://ftp2.fr.debian.org/debian/ # FR France +-Non-US=http://ftp2.fr.debian.org/debian-non-US/ # FR France +-Debian=http://ftp.gul.uc3m.es/debian/ # ES Spain (Leganes, Madrid) +-Non-US=http://ftp.gul.uc3m.es/debian-non-US/ # ES Spain (Leganes, Madrid) + Debian=http://ftp.ndlug.nd.edu/mirrors/debian/ # US United States (Notre Dame, Indiana) + Debian=ftp://debian.das.ufsc.br/pub/debian/ # BR Brazil (Florianópolis) +-Non-US=ftp://debian.das.ufsc.br/pub/debian-non-US/ # BR Brazil (Florianópolis) + Debian=http://debian.ua.pt/debian/ # PT Portugal (Aveiro) + Debian=http://debian.uchicago.edu/debian/ # US United States (Chicago, Illinois) + Debian=http://ftp.irb.hr/debian/ # HR Croatia (Zagreb) + Non-US=http://ftp.irb.hr/debian-non-US/ # HR Croatia (Zagreb) +-Debian=http://ftp.es.debian.org/debian/ # ES Spain (Madrid) +-Non-US=http://ftp.es.debian.org/debian-non-US/ # ES Spain (Madrid) + Debian=http://ftp.se.debian.org/debian/ # SE Sweden (Umeå) + Non-US=http://ftp.se.debian.org/debian-non-US/ # SE Sweden (Umeå) + Debian=http://carroll.aset.psu.edu/pub/linux/distributions/debian/ # US United States (Pennsylvania) +-Debian=http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/debian/ # DE Germany (Aachen) +-Non-US=http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/debian-non-US/ # DE Germany (Aachen) +-Debian=ftp://ftp.lip6.fr/pub/linux/distributions/debian/ # FR France (Jussieu) +-Debian=http://debian.fifi.org/debian/ # US United States (California) ++Debian=http://ftp.informatik.rwth-aachen.de/ftp/pub/Linux/debian/ # DE Germany (Aachen) ++Non-US=http://ftp.informatik.rwth-aachen.de/ftp/pub/Linux/debian-non-US/ # DE Germany (Aachen) ++Debian=http://ftp.lip6.fr/pub/linux/distributions/debian/ # FR France (Jussieu) + Debian=http://ftp.fi.debian.org/debian/ # FI Finland (Tampere) +-Non-US=http://ftp.fi.debian.org/debian-non-US/ # FI Finland (Tampere) + Debian=http://ftp-stud.fht-esslingen.de/debian/ # DE Germany (Esslingen) + Non-US=http://ftp-stud.fht-esslingen.de/debian-non-US/ # DE Germany (Esslingen) + Debian=http://debian.sh.cvut.cz/debian/ # CZ Czech Republic (Prague) +-Non-US=http://debian.sh.cvut.cz/debian-non-US/ # CZ Czech Republic (Prague) +-Debian=http://ftp.tku.edu.tw/OS/Linux/distributions/debian/ # TW Taiwan (TamSui) +-Non-US=http://ftp.tku.edu.tw/OS/Linux/distributions/debian/non-US/ # TW Taiwan (TamSui) + Debian=ftp://gladiator.real-time.com/linux/debian/ # US United States (Minneapolis, Minnesota) + Debian=http://mirrors.kernel.org/debian/ # US United States (Santa Clara, California) ++Debian=http://mirrors.nl.kernel.org/debian/ # NL Netherlands (Amsterdam) ++Debian=http://mirrors.se.kernel.org/debian/ # SE Sweden (Umea) + Debian=http://mirrors.xmission.com/debian/ # US United States (Salt Lake City, Utah) +-Debian=http://mirrors.rcn.net/debian/ # US United States (Fairfax, Virginia) +-Debian=http://ftp.keystealth.org/debian/ # US United States (Redwood City, California) ++Debian=http://ftp.keystealth.orgdebian/ # US United States (Redwood City, California) + Debian=http://debian.yorku.ca/debian/ # CA Canada (Toronto, Ontario) +-Non-US=http://debian.yorku.ca/debian/non-US/ # CA Canada (Toronto, Ontario) +-Debian=ftp://ftp.stw-bonn.de/pub/mirror/debian/ # DE Germany (Bonn) +-Debian=ftp://ftp.edisontel.com/pub/Debian_Mirror/ # IT Italy ++Debian=http://ftp.stw-bonn.de/debian/ # DE Germany (Bonn) + Debian=http://debian.ens-cachan.fr/ftp/debian/ # FR France ++Non-US=http://debian.ens-cachan.fr/ftp/debian-non-US/ # FR France + Debian=http://ftp.easynet.be/ftp/debian/ # BE Belgium (Brussels) +-Non-US=http://ftp.easynet.be/ftp/debian-non-US/ # BE Belgium (Brussels) +-Debian=http://ameba.sc-uni.ktu.lt/debian/ # LT Lithuania (Kaunas) +-Non-US=http://ameba.sc-uni.ktu.lt/debian-non-US/ # LT Lithuania (Kaunas) ++Debian=http://ftp.litnet.lt/debian/ # LT Lithuania (http://ftp.litnet.lt) + Debian=http://ftp.ticklers.org/debian/ # GB Great Britain (London) +-Non-US=http://ftp.ticklers.org/debian/non-US/ # GB Great Britain (London) +-Debian=ftp://ftp.stealth.net/pub/mirrors/ftp.debian.org/ # US United States (New York) +-Debian=http://ftp.lug.udel.edu/debian/ # US United States (Newark, Delaware) +-Non-US=http://ftp.lug.udel.edu/debian-non-US/ # US United States (Newark, Delaware) +-Debian=ftp://debian.marked.no/debian/ # NO Norway (Oslo) +-Non-US=ftp://debian.marked.no/debian-non-US/ # NO Norway (Oslo) +-Debian=ftp://ftp.linux.co.uk/pub/debian/ # GB Great Britain +-Non-US=ftp://ftp.linux.co.uk/pub/debian/non-US/ # GB Great Britain +-Debian=ftp://ftp.gui.uva.es/debian/ # ES Spain (Valladolid) ++Debian=http://ftp.lug.udel.edu/pub/debian/ # US United States (Newark, Delaware) + Debian=http://ftp.rediris.es/debian/ # ES Spain (Madrid) +-Non-US=http://ftp.rediris.es/debian-non-US/ # ES Spain (Madrid) + Debian=http://download.unesp.br/linux/debian/ # BR Brazil (São Paulo) + Non-US=http://download.unesp.br/linux/debian-non-US/ # BR Brazil (São Paulo) + Debian=http://mirror.pacific.net.au/debian/ # AU Australia (Sydney) +-Non-US=http://mirror.pacific.net.au/debian-non-US/ # AU Australia (Sydney) + Debian=http://debian.lcs.mit.edu/debian/ # US United States (Cambridge, Massachusetts) + Debian=http://ftp.u-picardie.fr/mirror/debian/ # FR France (Amiens) +-Non-US=http://ftp.u-picardie.fr/mirror/debian-non-US/ # FR France (Amiens) + Debian=http://ftp.belnet.be/debian/ # BE Belgium (Brussels) +-Non-US=http://ftp.belnet.be/debian-non-US/ # BE Belgium (Brussels) +-Debian=http://ftp.au.debian.org/debian/ # AU Australia +-Non-US=http://ftp.au.debian.org/debian-non-US/ # AU Australia +-Debian=http://linux.sarang.net/ftp/mirror/os/linux/distribution/debian/ # KR Korea (Seoul) +-Non-US=http://linux.sarang.net/ftp/mirror/os/linux/distribution/debian-non-US/ # KR Korea (Seoul) +-Debian=http://ftp.rutgers.edu/pub/debian/ # US United States (Piscataway, New Jersey) +-Debian=http://debian.rutgers.edu/ # US United States (Piscataway, New Jersey) +-Non-US=ftp://debian.hanyang.ac.kr/debian-non-US/ # KR Korea (Ansan) + Debian=http://ftp.surfnet.nl/os/Linux/distr/debian/ # NL Netherlands +-Debian=ftp://download.xs4all.nl/pub/mirror/debian/ # NL Netherlands (AMS-IX, Amsterdam) + Debian=http://debian.mirrors.easynet.fr/ # FR France (Paris) +-Non-US=ftp://debian.mirrors.easynet.fr/debian-non-US/ # FR France (Paris) +-Debian=http://ftp.debian.nl/debian/ # NL Netherlands (Alphen aan den Rijn) +-Non-US=http://ftp.debian.nl/debian-non-US/ # NL Netherlands (Alphen aan den Rijn) +-Debian=http://www.zentek-international.com/mirrors/debian/debian/ # HK Hong Kong ++Debian=http://ftp.debian.nl/debian/ # NL Netherlands (Amsterdam) + Debian=http://ftp.u-strasbg.fr/debian/ # FR France + Non-US=http://ftp.u-strasbg.fr/debian-non-US/ # FR France +-Debian=http://archive.progeny.com/debian/ # US United States (Indianapolis, Indiana) +-Debian=http://mirror.csit.fsu.edu/debian/ # US United States (Tallahassee, Florida) +-Non-US=http://mirror.csit.fsu.edu/debian-non-US/ # US United States (Tallahassee, Florida) + Debian=http://kebo.vlsm.org/debian/ # ID Indonesia (Surabaya) +-Non-US=http://kebo.vlsm.org/debian-non-US/ # ID Indonesia (Surabaya) +-Debian=http://ftp.br.debian.org/debian/ # BR Brazil (Curitiba) +-Non-US=http://ftp.br.debian.org/debian-non-US/ # BR Brazil (Curitiba) +-Debian=http://ftp.linuxforum.net/ftp/debian/ # CN China +-Non-US=http://ftp.linuxforum.net/ftp/debian-non-US/ # CN China +-Debian=http://debian.nettuno.it/debian/ # IT Italy +-Non-US=http://debian.nettuno.it/debian-non-US/ # IT Italy +-Debian=http://ftp.carnet.hr/pub/debian/ # HR Croatia (Zagreb) +-Non-US=http://ftp.carnet.hr/pub/debian/debian-non-US/ # HR Croatia (Zagreb) ++Debian=http://ftp.br.debian.org/debian/ # BR Brazil (Curitiba, Paraná) ++Debian=http://ftp.carnet.hr/debian/ # HR Croatia (Zagreb) + Debian=http://ftp.nl.debian.org/debian/ # NL Netherlands (Enschede) + Non-US=http://ftp.nl.debian.org/debian-non-US/ # NL Netherlands (Enschede) + Debian=http://ftp.iinet.net.au/debian/debian/ # AU Australia (Perth) + Non-US=http://ftp.iinet.net.au/debian/debian-non-US/ # AU Australia (Perth) +-Debian=http://ftp.xgate.co.kr/debian/ # KR Korea (Seoul) +-Non-US=http://ftp.xgate.co.kr/debian-non-US/ # KR Korea (Seoul) + Debian=http://debian.balt.net/debian/ # LT Lithuania (Vilnius) +-Non-US=http://debian.balt.net/debian-non-US/ # LT Lithuania (Vilnius) +-Debian=http://debian.3wsi.net/debian/ # ID Indonesia (World Trade Center, Jakarta) +-Non-US=http://debian.3wsi.net/debian-non-US/ # ID Indonesia (World Trade Center, Jakarta) + Debian=http://linux.csua.berkeley.edu/debian/ # US United States (Berkeley, California) +-Non-US=http://linux.csua.berkeley.edu/debian-non-US/ # US United States (Berkeley, California) +-Debian=http://mirror.devolus.org/debian/ # KR Korea +-Non-US=http://mirror.devolus.org/debian-non-US/ # KR Korea + Debian=http://ftp.silug.org/pub/debian/ # US United States (Illinois) +-Debian=http://ftp.externet.hu/debian/ # HU Hungary + Debian=ftp://ftp.fu-berlin.de/pub/unix/linux/mirrors/debian/ # DE Germany (Berlin) + Non-US=ftp://ftp.fu-berlin.de/pub/unix/linux/mirrors/debian-non-US/ # DE Germany (Berlin) + Debian=http://ftp.funet.fi/pub/linux/mirrors/debian/ # FI Finland +@@ -265,336 +139,278 @@ + Debian=http://debian.iskon.hr/debian/ # HR Croatia (Zagreb) + Non-US=http://debian.iskon.hr/debian-non-US/ # HR Croatia (Zagreb) + Debian=http://debian.tu-bs.de/debian/ # DE Germany (Braunschweig) +-Non-US=http://debian.tu-bs.de/debian-non-US/ # DE Germany (Braunschweig) + Debian=http://ftp.uni-koeln.de/debian/ # DE Germany (Köln) +-Non-US=http://ftp.uni-koeln.de/debian-non-US/ # DE Germany (Köln) +-Debian=ftp://ftp.nectec.or.th/pub/linux-distributions/Debian/ # TH Thailand +-Non-US=ftp://ftp.nectec.or.th/pub/linux-distributions/Debian-non-US/ # TH Thailand + Debian=http://debian.nsu.ru/debian/ # RU Russia (Novosibirsk) +-Non-US=http://debian.nsu.ru/debian-non-US/ # RU Russia (Novosibirsk) +-Debian=http://ftp.iitm.ac.in/debian/ # IN India (Madras) +-Non-US=http://ftp.iitm.ac.in/debian-non-US/ # IN India (Madras) +-Debian=http://debian.pffa.de/mirrors/debian/ # DE Germany (Berlin) +-Non-US=http://debian.pffa.de/mirrors/debian-non-US/ # DE Germany (Berlin) +-Debian=ftp://linux.csie.nctu.edu.tw/debian/ # TW Taiwan +-Non-US=ftp://linux.csie.nctu.edu.tw/distributions/debian/debian-non-US/ # TW Taiwan + Debian=http://ftp.is.debian.org/debian/ # IS Iceland (Reykjavik) +-Non-US=http://ftp.is.debian.org/debian-non-US/ # IS Iceland (Reykjavik) +-Debian=ftp://debian.pipcom.com/debian/debian/ # CA Canada (Peterborough, Ontario) +-Non-US=ftp://debian.pipcom.com/debian/debian-non-US/ # CA Canada (Peterborough, Ontario) +-Debian=http://debian.experimentos.cl/debian/ # CL Chile (Valparaiso) +-Non-US=http://debian.experimentos.cl/debian-non-US/ # CL Chile (Valparaiso) + Debian=http://ftp.debian.skynet.be/ftp/debian/ # BE Belgium (Brussels) + Non-US=http://ftp.debian.skynet.be/ftp/debian-non-US/ # BE Belgium (Brussels) + Debian=http://debian.secsup.org/ # US United States +-Debian=http://debian.psu.ru/debian/ # RU Russia (Perm) +-Non-US=http://debian.psu.ru/debian-non-US/ # RU Russia (Perm) + Debian=http://ftp.tu-graz.ac.at/mirror/debian/ # AT Austria (Graz) +-Non-US=http://ftp.tu-graz.ac.at/mirror/debian-non-US/ # AT Austria (Graz) +-Debian=http://ftp.dk.debian.org/debian/ # DK Denmark +-Non-US=http://ftp.dk.debian.org/debian-non-US/ # DK Denmark +-Debian=http://ftp.lugs.org.sg/debian/ # SG Singapore + Debian=http://linux.org.by/debian/ # BY Belarus (Minsk) + Non-US=http://linux.org.by/debian-non-US/ # BY Belarus (Minsk) +-Debian=ftp://ftp.mpi-sb.mpg.de/pub/linux/distributions/debian/debian/ # DE Germany (Saarbrücken) +-Non-US=ftp://ftp.mpi-sb.mpg.de/pub/linux/distributions/debian/non-us/debian-non-US/ # DE Germany (Saarbrücken) +-Debian=http://ftp.cl.debian.org/debian/ # CL Chile (Santiago) +-Non-US=http://ftp.cl.debian.org/debian-non-US/ # CL Chile (Santiago) +-Debian=http://obelix.umh.es/pub/debian/debian/ # ES Spain (Elche) +-Non-US=http://obelix.umh.es/pub/debian/debian-non-US/ # ES Spain (Elche) ++Debian=ftp://ftp.mpi-sb.mpg.de/pub/linux/debian/ # DE Germany (Saarbrücken) + Debian=http://ftp.tiscali.nl/debian/ # NL Netherlands (Amsterdam) + Non-US=http://ftp.tiscali.nl/debian-non-US/ # NL Netherlands (Amsterdam) +-Debian=http://debian.teleglobe.net/ # US United States (Newark, New Jersey and London, Great Britain) +-Non-US=http://debian.teleglobe.net/non-US/ # US United States (Newark, New Jersey and London, Great Britain) +-Debian=http://ftp.zcu.cz/ftp/pub/linux/debian/ # CZ Czech Republic (Plzen) +-Non-US=http://ftp.zcu.cz/ftp/pub/linux/debian-non-US/ # CZ Czech Republic (Plzen) ++Debian=http://ftp.zcu.cz/mirrors/debian/ # CZ Czech Republic (Plzen) + Debian=http://ftp.jyu.fi/debian/ # FI Finland (Jyväskylä) + Non-US=http://ftp.jyu.fi/debian-non-US/ # FI Finland (Jyväskylä) +-Debian=http://ftp.unina.it/pub/linux/distributions/debian/debian/ # IT Italy (Napoli) +-Non-US=http://ftp.unina.it/pub/linux/distributions/debian/debian-non-US/ # IT Italy (Napoli) +-Debian=http://kalle.csb.ki.se/pub/linux/debian/ # SE Sweden (Huddinge) +-Non-US=http://kalle.csb.ki.se/pub/linux/debian-non-US/ # SE Sweden (Huddinge) +-Debian=http://ftp.ntua.gr/pub/linux/debian/ # GR Greece (Athens) +-Non-US=http://ftp.ntua.gr/pub/linux/debian-non-US/ # GR Greece (Athens) +-Debian=http://ftp.ipv6.opentransit.net/debian/ # FR France (Paris) +-Non-US=http://ftp.ipv6.opentransit.net/debian-non-US/ # FR France (Paris) +-Debian=http://ftp.leo.org/debian/ # DE Germany (Munich) +-Non-US=http://ftp.leo.org/debian-non-US/ # DE Germany (Munich) +-Debian=http://ftp.matrix.net.br/pub/debian/ # BR Brazil (Sao Paulo) +-Debian=http://techweb.rfa.org/debian/ # US United States (Washington, D.C.) +-Debian=http://mirror.pudas.net/debian/ # SE Sweden +-Non-US=http://mirror.pudas.net/debian-non-US/ # SE Sweden +-Debian=http://debian.oregonstate.edu/debian/ # US United States (Corvallis, Oregon) ++Debian=http://ftp.gr.debian.org/debian/ # GR Greece (Athens) ++Debian=http://debian.osuosl.org/debian/ # US United States (Corvallis, Oregon) + Debian=http://debian.csie.ntu.edu.tw/debian/ # TW Taiwan +-Non-US=http://debian.csie.ntu.edu.tw/debian-non-US/ # TW Taiwan +-Debian=http://ftp.tiscali.de/pub/debian/debian/ # DE Germany (Frankfurt am Main) +-Non-US=http://ftp.tiscali.de/pub/debian/debian-non-US/ # DE Germany (Frankfurt am Main) +-Debian=http://lyre.mit.edu/debian/ # US United States (Cambridge, Massachusetts) +-Debian=http://debian.udsu.ru/debian/ # RU Russia +-Non-US=http://debian.udsu.ru/debian-non-US/ # RU Russia +-Debian=http://debian.linux.org.tw/debian/ # TW Taiwan (Taipei) +-Non-US=http://debian.linux.org.tw/debian-non-US/ # TW Taiwan (Taipei) +-Debian=http://debian.lami.univ-evry.fr/debian/ # FR France (Evry) +-Non-US=http://debian.lami.univ-evry.fr/debian-non-US/ # FR France (Evry) + Debian=http://sft.if.usp.br/debian/ # BR Brazil (Sao Paulo) +-Non-US=http://sft.if.usp.br/debian-non-US/ # BR Brazil (Sao Paulo) +-Debian=http://mirror.cict.fr/debian/ # FR France (Toulouse) +-Non-US=http://mirror.cict.fr/debian-non-US/ # FR France (Toulouse) +-Debian=http://ftp.cprm.net/debian/ # PT Portugal (Lisboa) +-Non-US=http://ftp.cprm.net/debian/non-US/ # PT Portugal (Lisboa) +-Debian=http://wuarchive.wustl.edu/mirrors/debian/ # US United States (St. Louis, Missouri) +-Debian=ftp://mir1.ovh.net/debian/ # FR France ++Debian=http://debian.cict.fr/debian/ # FR France (Toulouse) ++Debian=http://mir1.ovh.net/debian/ # FR France + Non-US=ftp://mir1.ovh.net/debian-non-US/ # FR France + Debian=http://mir2.ovh.net/debian/ # FR France + Non-US=http://mir2.ovh.net/debian-non-US/ # FR France +-Debian=http://linux.cdpa.nsysu.edu.tw/debian/ # TW Taiwan +-Non-US=http://linux.cdpa.nsysu.edu.tw/debian-non-US/ # TW Taiwan +-Debian=ftp://mirror.ipartners.pl/pub/debian/ # PL Poland +-Non-US=ftp://mirror.ipartners.pl/pub/debian-non-US/ # PL Poland +-Debian=http://mirror.mcs.anl.gov/debian/ # US United States (Chicago, Illinois) ++Debian=http://ftp.twaren.net/debian/ # TW Taiwan (Tainan) ++Debian=http://mirror.anl.gov/debian/ # US United States (Chicago, Illinois) + Debian=http://linorg.usp.br/debian/ # BR Brazil (Sao Paulo) +-Non-US=http://linorg.usp.br/debian-non-US/ # BR Brazil (Sao Paulo) +-Debian=http://koyanet.lv/ftp/debian/ # LV Latvia (Riga) +-Non-US=http://koyanet.lv/ftp/debian-non-US/ # LV Latvia (Riga) +-Debian=http://softcity.libero.it/debian/ # IT Italy (Milano) +-Non-US=http://softcity.libero.it/debian-non-US/ # IT Italy (Milano) +-Debian=http://debian.serveftp.net/debian/ # DE Germany (Nürnberg) +-Non-US=http://debian.serveftp.net/debian-non-US/ # DE Germany (Nürnberg) +-Debian=http://mirror.averse.net/debian/ # SG Singapore +-Non-US=http://mirror.averse.net/debian-non-US/ # SG Singapore +-Debian=ftp://ftp.nerim.net/debian/ # FR France (Paris) ++Debian=http://koyanet.lv/debian/ # LV Latvia (Riga) ++Debian=http://ftp.nerim.net/debian/ # FR France (Paris) + Non-US=ftp://ftp.nerim.net/debian-non-US/ # FR France (Paris) +-Debian=http://ftp.pop-ce.rnp.br/debian/ # BR Brazil (Fortaleza, Ceará) + Debian=http://debian.osdn.org.ua/debian/ # UA Ukraine (Kiev) + Non-US=http://debian.osdn.org.ua/debian-non-US/ # UA Ukraine (Kiev) +-Debian=http://ftp.kreonet.re.kr/pub/Linux/debian/ # KR Korea (Daejeon) +-Non-US=http://ftp.kreonet.re.kr/pub/Linux/debian-non-US/ # KR Korea (Daejeon) +-Debian=http://debian.goldweb.com.au/debian/ # AU Australia (Canberra) +-Debian=ftp://ftp.tu-chemnitz.de/pub/linux/debian/debian/ # DE Germany (Chemnitz) ++Debian=http://ftp.tu-chemnitz.de/pub/linux/debian/debian/ # DE Germany (Chemnitz) + Non-US=ftp://ftp.tu-chemnitz.de/pub/linux/debian/debian-non-US/ # DE Germany (Chemnitz) + Debian=http://ftp.tr.debian.org/debian/ # TR Turkey (Ankara) +-Non-US=http://ftp.tr.debian.org/debian-non-US/ # TR Turkey (Ankara) +-Debian=ftp://www.buraphalinux.org/pub/debian/ # TH Thailand (Chonburi) + Debian=http://ftp.sun.ac.za/ftp/debian/ # ZA South Africa (Stellenbosch) +-Non-US=http://ftp.sun.ac.za/ftp/debian/non-US/ # ZA South Africa (Stellenbosch) +-Debian=http://debian.essentkabel.com/debian/ # NL Netherlands (Zwolle) +-Non-US=http://debian.essentkabel.com/debian-non-US/ # NL Netherlands (Zwolle) +-Debian=http://ftp.uni-stuttgart.de/debian/ # DE Germany (Stuttgart) +-Non-US=http://ftp.uni-stuttgart.de/debian-non-US/ # DE Germany (Stuttgart) +-Debian=http://debian.2z.net/debian/ # US United States (Hibbing, Minnesota) + Debian=http://ftp.psn.ru/debian/ # RU Russia (Pushchino, Moscow Region) +-Non-US=http://ftp.psn.ru/debian-non-US/ # RU Russia (Pushchino, Moscow Region) + Debian=http://debian.ludost.net/debian/ # BG Bulgaria (Sofia) + Non-US=http://debian.ludost.net/debian-non-US/ # BG Bulgaria (Sofia) +-Debian=http://debian.blueyonder.co.uk/ # GB Great Britain (London, Heathrow) +-Non-US=http://debian.blueyonder.co.uk/non-US/ # GB Great Britain (London, Heathrow) +-Debian=http://mirror.datafast.net.au/linux/debian/ # AU Australia (Geelong, Victoria) +-Debian=ftp://ftp.europeonline.net/debian/ # LU Luxembourg +-Non-US=ftp://ftp.europeonline.net/debian/non-US/ # LU Luxembourg + Debian=http://sluglug.ucsc.edu/debian/ # US United States (Santa Cruz, California) +-Debian=ftp://ftp.cs.stevens-tech.edu/pub/Linux/distributions/debian/ # US United States (Hoboken, New Jersey) + Debian=http://mi.mirror.garr.it/mirrors/debian/ # IT Italy (Milano) +-Non-US=http://mi.mirror.garr.it/mirrors/debian/non-US/ # IT Italy (Milano) +-Debian=http://ftp.uni-kl.de/pub/linux/debian/ # DE Germany (Kaiserslautern) ++Debian=http://ftp.uni-kl.de/debian/ # DE Germany (Kaiserslautern) + Debian=http://ftp.hr.debian.org/debian/ # HR Croatia (Zagreb) +-Non-US=http://ftp.hr.debian.org/debian-non-US/ # HR Croatia (Zagreb) + Debian=http://ftp.univie.ac.at/systems/linux/debian/debian/ # AT Austria (Wien) + Non-US=http://ftp.univie.ac.at/systems/linux/debian/debian-non-US/ # AT Austria (Wien) +-Debian=http://nisamox.fciencias.unam.mx/debian/ # MX Mexico +-Non-US=http://nisamox.fciencias.unam.mx/debian-non-US/ # MX Mexico ++Debian=http://ftp.mx.debian.org/debian/ # MX Mexico + Debian=http://mirror.positive-internet.com/debian/ # GB Great Britain (London) +-Debian=http://ftp.bme.hu/OS/Linux/dist/debian/ # HU Hungary (Budapest) +-Debian=http://ftp.duth.gr/debian/ # GR Greece (Xanthi) +-Non-US=http://ftp.duth.gr/debian-non-US/ # GR Greece (Xanthi) +-Debian=http://ftp.linux.pt/pub/mirrors/debian/ # PT Portugal (Lisboa) +-Non-US=http://ftp.linux.pt/pub/mirrors/debian/non-US/ # PT Portugal (Lisboa) ++Debian=http://ftp.bme.hu/debian/ # HU Hungary (Budapest) ++Debian=http://ftp.duth.gr/debian/ # GR Greece (Thrace) + Debian=http://debian.fastweb.it/debian/ # IT Italy (Milano) +-Non-US=http://debian.fastweb.it/debian-non-US/ # IT Italy (Milano) +-Debian=http://debian.kida.net/debian.mirror/debian/ # CA Canada (Kelowna, British Columbia) + Debian=http://ftp3.nrc.ca/debian/ # CA Canada (Ottawa) + Non-US=http://ftp3.nrc.ca/debian-non-US/ # CA Canada (Ottawa) +-Debian=http://debian.ihug.com.au/debian/ # AU Australia (Surry Hills, Sydney) +-Non-US=http://debian.ihug.com.au/debian-non-US/ # AU Australia (Surry Hills, Sydney) + Debian=http://ftp.ie.debian.org/debian/ # IE Ireland (Dublin) + Non-US=http://ftp.ie.debian.org/debian-non-US/ # IE Ireland (Dublin) + Debian=http://debian.ubiobio.cl/debian/ # CL Chile (Concepcion) +-Non-US=http://debian.ubiobio.cl/debian-non-US/ # CL Chile (Concepcion) + Debian=http://linux.iq.usp.br/debian/ # BR Brazil (São Paulo) + Non-US=http://linux.iq.usp.br/debian-non-US/ # BR Brazil (São Paulo) +-Debian=ftp://mirror.nus.edu.sg/pub/Debian/ # SG Singapore +-Non-US=ftp://mirror.nus.edu.sg/pub/Debian-non-US/ # SG Singapore ++Debian=http://mirror.nus.edu.sg/Debian/ # SG Singapore ++Non-US=http://mirror.nus.edu.sg/Debian-non-US/ # SG Singapore + Debian=http://the.earth.li/debian/ # GB Great Britain (London) +-Non-US=http://the.earth.li/debian-non-US/ # GB Great Britain (London) +-Debian=http://slugsite.louisville.edu/debian/ # US United States (Louisville, Kentucky) +-Debian=http://cudlug.cudenver.edu/debian/ # US United States (Denver, Colorado) +-Debian=http://ftp.softnet.tuc.gr/ftp/linux/debian/ # GR Greece (Chania) +-Non-US=http://ftp.softnet.tuc.gr/ftp/linux/debian-non-US/ # GR Greece (Chania) +-Debian=ftp://ftp.uos.ac.kr/mirror/Linux/debian/debian/ # KR Korea +-Non-US=ftp://ftp.uos.ac.kr/mirror/Linux/debian/debian-non-US/ # KR Korea +-Debian=ftp://ftp.linux.org.tr/pub/mirrors/debian/ # TR Turkey (Ankara) +-Debian=http://ftp.uk.debian.org/debian/ # GB Great Britain (London) +-Non-US=http://ftp.uk.debian.org/debian-non-US/ # GB Great Britain (London) ++Debian=http://ftp.linux.org.tr/debian/ # TR Turkey (Ankara) ++Debian=http://ukdebian.mirror.anlx.net/debian/ # GB Great Britain (London) + Debian=http://mirror.ox.ac.uk/debian/ # GB Great Britain (Oxford) +-Non-US=http://mirror.ox.ac.uk/debian-non-US/ # GB Great Britain (Oxford) +-Debian=ftp://mirrors.geeks.org/debian/ # US United States (Minneapolis, Minnesota) +-Debian=http://mirrors.engr.arizona.edu/debian/ # US United States (Tucson, Arizona) +-Debian=http://debian.ambra.ro/debian/ # RO Romania (Piatra Neamt) +-Non-US=http://debian.ambra.ro/debian-non-US/ # RO Romania (Piatra Neamt) +-Debian=http://mirrors.terrabox.com/debian/ # US United States (Dallas, Texas) ++Debian=http://mirrors.geeks.org/debian/ # US United States (Minneapolis, Minnesota) + Debian=http://ftp.crihan.fr/debian/ # FR France (Rouen) + Non-US=http://ftp.crihan.fr/debian-non-US/ # FR France (Rouen) + Debian=http://ftp.ro.debian.org/debian/ # RO Romania (Iasi) + Non-US=http://ftp.ro.debian.org/debian-non-US/ # RO Romania (Iasi) + Debian=http://opensource.nchc.org.tw/debian/ # TW Taiwan +-Non-US=http://opensource.nchc.org.tw/debian-non-US/ # TW Taiwan + Debian=http://mirrors.geekbone.org/debian/ # CN China (Shanghai) + Non-US=http://mirrors.geekbone.org/debian-non-US/ # CN China (Shanghai) +-Debian=http://debian.midco.net/debian/ # US United States + Debian=http://debian.uni.edu.ni/debian/ # NI Nicaragua (Managua) +-Non-US=http://debian.uni.edu.ni/debian/ # NI Nicaragua (Managua) +-Debian=http://ftp.ps.pl/pub/Linux/debian/ # PL Poland (Szczecin) +-Non-US=http://ftp.ps.pl/pub/Linux/debian-non-us/ # PL Poland (Szczecin) ++Non-US=http://debian.uni.edu.ni/debian-non-US/ # NI Nicaragua (Managua) + Debian=http://ftp.port80.se/debian/ # SE Sweden (Stockholm) + Non-US=http://ftp.port80.se/debian-non-US/ # SE Sweden (Stockholm) + Debian=http://debian.inode.at/debian/ # AT Austria (Vienna) +-Non-US=http://debian.inode.at/debian-non-US/ # AT Austria (Vienna) + Debian=http://mirrors.usc.edu/pub/linux/distributions/debian/ # US United States (Los Angeles, California) +-Debian=http://mirror.here.dk/debian/ # DK Denmark (Copenhagen) +-Non-US=http://mirror.here.dk/debian-non-US/ # DK Denmark (Copenhagen) +-Debian=http://jane.uab.es/debian/ # ES Spain (Barcelona, Catalunya) +-Non-US=http://jane.uab.es/debian-non-US/ # ES Spain (Barcelona, Catalunya) +-Debian=http://mirrors.sec.informatik.tu-darmstadt.de/debian/debian/ # DE Germany (Darmstadt) +-Non-US=http://mirrors.sec.informatik.tu-darmstadt.de/debian/debian-non-US/ # DE Germany (Darmstadt) + Debian=http://debian.uni-c.dk/debian/ # DK Denmark (Copenhagen) +-Non-US=http://debian.uni-c.dk/debian-non-US/ # DK Denmark (Copenhagen) +-Debian=http://ftp.caliu.info/debian/ # ES Spain (Barcelona) +-Non-US=http://ftp.caliu.info/debian-non-US/ # ES Spain (Barcelona) +-Debian=http://mirror.hamakor.org.il/pub/mirrors/debian/ # IL Israel (Haifa, Actcom) +-Non-US=http://mirror.hamakor.org.il/pub/mirrors/debian-non-US/ # IL Israel (Haifa, Actcom) +-Debian=http://ftp.isu.edu.tw/pub/Linux/Debian/debian/ # TW Taiwan (Kaohsiung) +-Debian=http://debian.mirrors.pair.com/ # US United States (Pittsburgh, PA) +-Debian=ftp://debian.ihug.co.nz/debian/ # NZ New Zealand (Auckland) +-Non-US=ftp://debian.ihug.co.nz/debian-non-US/ # NZ New Zealand (Auckland) +-Debian=ftp://ftp.tuxfamily.org/debian/ # FR France (Paris) +-Non-US=ftp://ftp.tuxfamily.org/debian-non-US/ # FR France (Paris) +-Debian=http://debian.spark.net.gr/debian/ # GR Greece (Thessaloniki) +-Non-US=http://debian.spark.net.gr/debian-non-US/ # GR Greece (Thessaloniki) +-Debian=http://debian.fapeal.br/debian/ # BR Brazil (Maceió, Alagoas) +-Non-US=http://debian.fapeal.br/debian-non-US/ # BR Brazil (Maceió, Alagoas) +-Debian=http://debian.luxadmin.org/debian/ # LU Luxembourg (Hamm) +-Non-US=http://debian.luxadmin.org/debian-non-US/ # LU Luxembourg (Hamm) ++Debian=http://ftp.cica.es/debian/ # ES Spain (Sevilla) ++Debian=http://ftp.caliu.cat/debian/ # ES Spain (Barcelona) ++Debian=http://ftp.isu.edu.tw/debian/ # TW Taiwan (Kaohsiung) + Debian=http://lug.mtu.edu/debian/ # US United States (Houghton, Michigan) +-Debian=http://ftp.jp.debian.org/debian/ # JP Japan (Nara) +-Non-US=http://ftp.jp.debian.org/debian-non-US/ # JP Japan (Nara) + Debian=http://ftp.yz.yamagata-u.ac.jp/debian/ # JP Japan (Yonezawa, Yamagata) + Non-US=http://ftp.yz.yamagata-u.ac.jp/debian-non-US/ # JP Japan (Yonezawa, Yamagata) +-Debian=http://debian.vicnet.net.au/debian/ # AU Australia (Melbourne) +-Non-US=http://debian.vicnet.net.au/debian-non-US/ # AU Australia (Melbourne) +-Debian=http://debian.mirror.solnet.ch/debian/ # CH Switzerland (Solothurn) +-Non-US=http://debian.mirror.solnet.ch/debian-non-US/ # CH Switzerland (Solothurn) +-Debian=ftp://ftp.solnet.ch/mirror/Debian/debian/ # CH Switzerland (Solothurn) +-Non-US=ftp://ftp.solnet.ch/mirror/Debian/debian-non-US/ # CH Switzerland (Solothurn) +-Debian=ftp://less.cogeco.net/pub/debian/ # CA Canada (Burlington, Ontario) +-Debian=http://debian.org.ua/debian/ # UA Ukraine (Kiev) +-Non-US=http://debian.org.ua/debian-non-US/ # UA Ukraine (Kiev) ++Debian=http://ftp.ua.debian.org/debian/ # UA Ukraine (Kiev, UA) + Debian=http://ftp.kr.debian.org/debian/ # KR Korea (Daejeon) +-Non-US=http://ftp.kr.debian.org/debian-non-US/ # KR Korea (Daejeon) +-Debian=http://gulus.usherbrooke.ca/debian/ # CA Canada (Université de Sherbrooke, Québec) +-Non-US=http://gulus.usherbrooke.ca/debian-non-US/ # CA Canada (Université de Sherbrooke, Québec) + Debian=http://ftp.lug.ro/debian/ # RO Romania (Bucharest) +-Non-US=http://ftp.lug.ro/debian-non-US/ # RO Romania (Bucharest) +-Debian=ftp://ftp.corbina.ru/pub/Linux/debian/ # RU Russia (Moscow) +-Debian=http://ftp.sayclub.com/pub/debian/ # KR Korea (KIDC) +-Non-US=http://ftp.sayclub.com/pub/debian-non-us/ # KR Korea (KIDC) +-Debian=http://debian.indika.net.id/debian/ # ID Indonesia ( Data Center, Cyber Building, Jakarta) +-Debian=http://debian.samara.ru/debian/ # RU Russia (Samara) ++Debian=ftp://ftp.corbina.net/debian/ # RU Russia (Moscow) + Debian=ftp://ftp.pucpr.br/debian/ # BR Brazil (Curitiba) + Non-US=ftp://ftp.pucpr.br/debian-non-US/ # BR Brazil (Curitiba) + Debian=http://debian.mines.inpl-nancy.fr/debian/ # FR France (Nancy) +-Non-US=http://debian.mines.inpl-nancy.fr/debian-non-US/ # FR France (Nancy) +-Debian=http://ftp.uni-bayreuth.de/linux/Debian/debian/ # DE Germany (Bayreuth) +-Non-US=http://ftp.uni-bayreuth.de/linux/Debian/debian-non-US/ # DE Germany (Bayreuth) +-Debian=http://ftp.ds.hj.se/pub/Linux/distributions/debian/ # SE Sweden (Jönköping) +-Debian=http://debian.logiclinux.com/debian/ # AR Argentina (CF) +-Non-US=http://debian.logiclinux.com/debian-non-US/ # AR Argentina (CF) +-Debian=ftp://ftp.cica.es/debian/ # ES Spain (Sevilla) +-Non-US=ftp://ftp.cica.es/debian-non-US/ # ES Spain (Sevilla) +-Debian=ftp://ftp.uni-sofia.bg/debian/ # BG Bulgaria (Sofia) +-Non-US=ftp://ftp.uni-sofia.bg/debian-non-US/ # BG Bulgaria (Sofia) +-Debian=http://debian.nctu.edu.tw/debian/ # TW Taiwan (HsinChu) +-Non-US=http://debian.nctu.edu.tw/debian-non-US/ # TW Taiwan (HsinChu) +-Debian=ftp://ftp.3logic.net/debian/ # UA Ukraine (Kherson) +-Non-US=ftp://ftp.3logic.net/debian-non-US/ # UA Ukraine (Kherson) +-Debian=http://debian.im.nuk.edu.tw/pub/debian/debian/ # TW Taiwan (Nan-Tzu, Kaohsiung) +-Non-US=http://debian.im.nuk.edu.tw/pub/debian/debian-non-US/ # TW Taiwan (Nan-Tzu, Kaohsiung) +-Debian=http://debian.cn99.com/debian/ # CN China (Changzhou) +-Non-US=http://debian.cn99.com/debian-non-US/ # CN China (Changzhou) ++Debian=http://ftp.uni-bayreuth.de/debian/ # DE Germany (Bayreuth) ++Debian=http://ftp.ds.karen.hj.se/debian/ # SE Sweden (Jönköping) ++Debian=http://debian.logiclinux.com/debian/ # AR Argentina ++Debian=http://ftp.uni-sofia.bg/debian/ # BG Bulgaria (Sofia, 42.6740/23.3305) ++Debian=http://debian.nctu.edu.tw/debian/ # TW Taiwan (Hsinchu) ++Debian=ftp://ftp.3logic.net/debian/ # UA Ukraine (Kherson, UA) + Debian=http://ftp.coe.psu.ac.th/debian/ # TH Thailand (Computer Engineering Dept.) +-Non-US=http://ftp.coe.psu.ac.th/debian-non-US/ # TH Thailand (Computer Engineering Dept.) +-Debian=http://mirror.cpsc.ucalgary.ca/debian/ # CA Canada (Calgary, Alberta) +-Non-US=http://mirror.cpsc.ucalgary.ca/debian-non-US/ # CA Canada (Calgary, Alberta) +-Debian=ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.de.debian.org/debian/ # DE Germany (Berlin) +-Non-US=ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.de.debian.org/debian-non-US/ # DE Germany (Berlin) +-Debian=ftp://sb.itc.u-tokyo.ac.jp/DEBIAN/debian/ # JP Japan (Tokyo) +-Non-US=ftp://sb.itc.u-tokyo.ac.jp/DEBIAN/debian-non-US/ # JP Japan (Tokyo) +-Debian=http://ftp.riken.go.jp/pub/Linux/debian/debian/ # JP Japan (Saitama) +-Debian=http://debian.vinita.lt/debian/ # LT Lithuania (Vilnius) +-Non-US=http://debian.vinita.lt/debian-non-US/ # LT Lithuania (Vilnius) +-Debian=http://debian.wow-vision.com.sg/debian/ # SG Singapore +-Non-US=http://debian.wow-vision.com.sg/debian-non-US/ # SG Singapore ++Debian=http://ftp.v6.coe.psu.ac.th/debian/ # TH Thailand (Computer Engineering Dept.) ++Debian=http://mirror.cpsc.ucalgary.ca/mirror/debian.org/debian/ # CA Canada (Calgary, Alberta) ++Debian=ftp://ftp.informatik.hu-berlin.de/pub/Linux/debian/ # DE Germany (Berlin) ++Debian=http://ftp.riken.jp/Linux/debian/debian/ # JP Japan (N35.779633, E139.615734) + Debian=http://debian.shimpinomori.net/debian/ # JP Japan (Tokyo) + Non-US=http://debian.shimpinomori.net/debian-non-US/ # JP Japan (Tokyo) + Debian=http://mirror.peer1.net/debian/ # CA Canada +-Non-US=http://mirror.peer1.net/debian-non-US/ # CA Canada +-Debian=ftp://ftp.debian.ikoula.com/debian/ # FR France (Ikoula http://www.ikoula.com/) +-Non-US=ftp://ftp.debian.ikoula.com/debian-non-US/ # FR France (Ikoula http://www.ikoula.com/) +-Debian=http://ring.hosei.ac.jp/archives/linux/debian/debian/ # JP Japan (Tokyo) +-Non-US=http://ring.hosei.ac.jp/archives/linux/debian/debian-non-US/ # JP Japan (Tokyo) +-Debian=http://debian.internet.gr/debian/ # GR Greece (Agios Stefanos, Athens) +-Non-US=http://debian.internet.gr/debian-non-US/ # GR Greece (Agios Stefanos, Athens) +-Debian=http://fatboy.umng.edu.co/debian/ # CO Colombia (Bogota DC) +-Non-US=http://fatboy.umng.edu.co/debian/ # CO Colombia (Bogota DC) +-Debian=ftp://ftp.scarlet.be/pub/debian/ # BE Belgium (Vilvoorde) +-Non-US=ftp://ftp.scarlet.be/pub/debian-non-US/ # BE Belgium (Vilvoorde) +-Debian=http://mirrors.chipset.or.id/debian/ # ID Indonesia +-Debian=http://debian.savoirfairelinux.net/debian/ # CA Canada (Montreal) +-Non-US=http://debian.savoirfairelinux.net/debian-non-US/ # CA Canada (Montreal) + Debian=ftp://ftp.man.szczecin.pl/pub/Linux/debian/ # PL Poland (Szczecin) +-Non-US=ftp://ftp.man.szczecin.pl/pub/Linux/debian-non-US/ # PL Poland (Szczecin) +-Debian=http://www.las.ic.unicamp.br/pub/debian/ # BR Brazil (Campinas - SP) +-Debian=http://ftp.gwdg.de/pub/linux/debian/debian/ # DE Germany (Göttingen) +-Non-US=http://ftp.gwdg.de/pub/linux/debian/debian-non-US/ # DE Germany (Göttingen) +-Debian=http://casa.callbright.com/debian/ # MA Morocco (Casablanca) +-Non-US=http://casa.callbright.com/debian-non-US/ # MA Morocco (Casablanca) +-Debian=http://ftp.vthd-net.com/debian/ # FR France (Rocquencourt) +-Non-US=http://ftp.vthd-net.com/pub/linux/debian-non-US/ # FR France (Rocquencourt) +-Debian=ftp://ftp.tomstroubleshooting.com/debian/ # US United States (Orlando, Florida) +-Debian=http://www.ring.gr.jp/archives/linux/debian/debian/ # JP Japan +-Non-US=http://www.ring.gr.jp/archives/linux/debian/debian-non-US/ # JP Japan +-Debian=http://debian.mirror.cygnal.ca/debian/ # CA Canada (Burlington, Ontario) +-Non-US=http://debian.mirror.cygnal.ca/debian-non-US/ # CA Canada (Burlington, Ontario) +-Debian=http://komo.vlsm.org/debian/ # ID Indonesia (Gedung Cyber, Jakarta) +-Non-US=http://komo.vlsm.org/debian-non-US/ # ID Indonesia (Gedung Cyber, Jakarta) ++Debian=http://debian.las.ic.unicamp.br/debian/ # BR Brazil (Campinas - SP) ++Debian=http://ftp5.gwdg.de/pub/linux/debian/debian/ # DE Germany (Göttingen) ++Non-US=http://ftp5.gwdg.de/pub/linux/debian/debian-non-US/ # DE Germany (Göttingen) ++Debian=http://debian.mirror.rafal.ca/debian/ # CA Canada (Ontario) ++Non-US=http://debian.mirror.rafal.ca/debian-non-US/ # CA Canada (Ontario) + Debian=http://debian.mirrors.tds.net/debian/ # US United States (Wisconsin) +-Debian=http://debian.ethz.ch/debian/ # CH Switzerland (Zurich) +-Non-US=http://debian.ethz.ch/debian-non-US/ # CH Switzerland (Zurich) +-Debian=http://ftp.de.debian.org/debian-amd64/debian/ # DE Germany (Dresden) +-Debian=http://bytekeeper.as28747.net/debian-amd64/debian/ # BE Belgium +-Debian=http://bach.hpc2n.umu.se/debian-amd64/debian/ # SE Sweden +-Debian=http://hanzubon.jp/debian-amd64/debian/ # JP Japan +-Debian=ftp://mirror.switch.ch/mirror/debian-amd64/debian/ # CH Switzerland +-Debian=http://mirror.espri.arizona.edu/debian-amd64/debian/ # US USA, Arizona +-Debian=http://ftp.nl.debian.org/debian-amd64/debian/ # NL Netherlands (Enschede) +-Debian=ftp://ftp2.caliu.info/debian-amd64/debian/ # ES Spain (Barcelona) +-Debian=http://debian.csail.mit.edu/debian-amd64/debian/ # US USA, Massachusetts +-Debian=http://planetmirror.com/pub/debian-amd64/debian/ # AU Australia +-Debian=http://ftp.ru.debian.org/debian-amd64/ # RU Russia (Chernogolovka, Moscow) +-Debian=http://ftp.it.debian.org/debian-amd64/ # IT Italy (Milan) +-Debian=http://ftp2.it.debian.org/debian-amd64/ # IT Italy (Bologna) +-Debian=http://ftp.lug.ro/debian-amd64/ # RO Romania (Bucharest) +-Debian=http://ftp.es.debian.org/debian-amd64/debian/ # ES Spain (Madrid) +-Debian=http://ftp.jp.debian.org/debian-amd64/debian/ # JP Japan (Nara) +-Debian=http://ftp.cl.debian.org/debian-amd64/debian/ # CL Chile (Santiago) +-Debian=http://mirror.hamakor.org.il/pub/mirrors/debian-amd64/ # IL Israel (Haifa, Actcom) +-Debian=http://ftp.belnet.be/debian-amd64/debian/ # BE Belgium (Brussels) +-Debian=ftp://debian.gala.net/debian-amd64/ # UA Ukraine ++Debian=http://ftp.ch.debian.org/debian/ # CH Switzerland (Zurich, Hoenggerberg) ++Non-US=http://ftp.ch.debian.org/debian-non-US/ # CH Switzerland (Zurich, Hoenggerberg) ++Debian=http://debian.cites.uiuc.edu/pub/debian/ # US United States ++Debian=http://mirrors.telianet.dk/debian/ # DK Denmark (Glostrup, Copenhagen) ++Non-US=http://mirrors.telianet.dk/debian-non-us/ # DK Denmark (Glostrup, Copenhagen) ++Debian=http://webb.ens-cachan.fr/debian/ # FR France (Ecole Normale Superieure de Cachan) ++Non-US=http://webb.ens-cachan.fr/debian-non-US/ # FR France (Ecole Normale Superieure de Cachan) ++Debian=http://ftp.jaist.ac.jp/pub/Linux/Debian/ # JP Japan (Ishikawa) ++Debian=http://ftp.mgts.by/debian/ # BY Belarus (, Minsk) ++Debian=http://mirrors.ircam.fr/pub/debian/ # FR France ++Non-US=http://mirrors.ircam.fr/pub/debian-non-US/ # FR France ++Debian=http://ftp.unina.it/pub/linux/distributions/debian/ # IT Italy (Naples) ++Debian=http://ftp.hosteurope.de/pub/linux/debian/ # DE Germany (Cologne) ++Debian=http://mirror.optus.net/debian/ # AU Australia ++Debian=http://ftp.informatik.uni-frankfurt.de/debian/ # DE Germany (Frankfurt) ++Debian=http://debian.unesr.edu.ve/debian/ # VE Venezuela (Caracas) ++Debian=http://ftp.ccc.uba.ar/pub/linux/debian/debian/ # AR Argentina ++Debian=http://ftp.gva.es/mirror/debian/ # ES Spain (Valencia) ++Non-US=http://ftp.gva.es/mirror/debian-non-US/ # ES Spain (Valencia) ++Debian=http://debian.telecoms.bg/debian/ # BG Bulgaria (Varna) ++Debian=http://debian.fastbull.org/debian/ # IT Italy (Torino -) ++Debian=http://mirrors.tummy.com/debian/ # US United States (Colorado, USA) ++Debian=http://debian.mirror.frontiernet.net/debian/ # US United States (Rochester, NY) ++Debian=http://debian.netcologne.de/debian/ # DE Germany (Koeln) ++Debian=http://artfiles.org/debian/ # DE Germany (Hamburg) ++Debian=http://debian.intergenia.de/debian/ # DE Germany (2x D?sseldorf/DE, 2x Frankfurt am Main/DE (loadbalanced)) ++Non-US=http://debian.intergenia.de/debian-non-US/ # DE Germany (2x D?sseldorf/DE, 2x Frankfurt am Main/DE (loadbalanced)) ++Debian=http://debian.pop-sc.rnp.br/debian/ # BR Brazil (Florianópolis) ++Debian=http://ftp.es.debian.org/debian/ # ES Spain ++Debian=ftp://ftp.mipt.ru/debian/ # RU Russia ++Debian=http://debian.savoirfairelinux.net/debian/ # CA Canada (Montreal) ++Debian=http://debian.mirror.iweb.ca/debian/ # CA Canada (Montreal) ++Debian=http://mirror.nttu.edu.tw/debian/ # TW Taiwan (Tai-Tung) ++Debian=http://debian.cruisix.net/debian/ # DE Germany (Nuernberg) ++Debian=http://debian.ciencias.uchile.cl/debian/ # CL Chile (Santiago) ++Debian=http://godel.cs.bilgi.edu.tr/debian/ # TR Turkey (Istanbul) ++Debian=http://mmc.geofisica.unam.mx/debian/ # MX Mexico ( D.F.) ++Debian=http://debian.mirror.web4u.cz/ # CZ Czech Republic (Prague) ++Debian=http://debian.mirror.inra.fr/debian/ # FR France (Versailles) ++Debian=ftp://ftp.rrzn.uni-hannover.de/debian/debian/ # DE Germany (Hannover) ++Debian=http://mirror.cc.columbia.edu/pub/linux/debian/debian/ # US United States (New York, NY) ++Debian=http://ftp.vectranet.pl/debian/ # PL Poland (Slupsk) ++Debian=http://debian.co.il/debian/ # IL Israel (Rishon Leziyon) ++Debian=http://debian.thaios.net/debian/ # TH Thailand (Bangkok) ++Debian=http://debian.bsnet.se/debian/ # SE Sweden (Ronneby) ++Debian=http://debian.charite.de/debian/ # DE Germany (Berlin) ++Debian=http://debian.mirror.ac.za/debian/ # ZA South Africa (Cape Town) ++Debian=http://debian.csie.nctu.edu.tw/debian/ # TW Taiwan ++Debian=http://ftp.mikesnet.ro/debian/ # RO Romania (Cluj-Napoca, Cluj) ++Debian=http://ftp.iitm.ac.in/debian/ # IN India (Madras) ++Debian=http://ftp.jp.debian.org/debian/ # JP Japan (Tokyo) ++Debian=http://debian.mirrors.crysys.hu/debian/ # HU Hungary (Budapest) ++Debian=http://debian.ynet.sk/debian/ # SK Slovakia (Bratislava) ++Debian=http://mirrors.nfsi.pt/debian/ # PT Portugal (Lisbon) ++Debian=http://ftp.grokthis.net/debian/ # US United States (Philadelphia, PA) ++Debian=http://debian.eso-es.net/debian/ # TR Turkey (Eskişehir) ++Debian=http://ftp.udc.es/debian/ # ES Spain (A Coruña) ++Debian=http://debian.csg.uzh.ch/debian/ # CH Switzerland (Zurich) ++Debian=http://ftp.sk.debian.org/debian/ # SK Slovakia (Bratislava) ++Debian=http://ftp.cc.uoc.gr/mirrors/linux/debian/ # GR Greece (Crete / Heraklion) ++Debian=http://mirror.isoc.org.il/pub/debian/ # IL Israel ++Debian=http://debian.torredehanoi.org/debian/ # AR Argentina (Buenos Aires) ++Debian=http://mirror.yandex.ru/debian/ # RU Russia (Moscow) ++Debian=http://mirrors.xenir.com/debian/ # US United States (Charlottesville, Va.) ++Debian=http://neacm.fe.up.pt/debian/ # PT Portugal (Porto) ++Debian=http://ftp.pwr.wroc.pl/debian/ # PL Poland (Wroclaw) ++Debian=http://cesium.di.uminho.pt/pub/debian/ # PT Portugal (Braga) ++Debian=http://debian.utalca.cl/debian/ # CL Chile (Talca) ++Debian=http://ftp.debianclub.org/debian/ # TH Thailand (Bangkok) ++Debian=http://debian.med.univ-tours.fr/debian/ # FR France (Tours) ++Debian=http://ftp.plusline.de/debian/ # DE Germany (Frankfurt am Main) ++Non-US=http://ftp.plusline.de/debian-non-US/ # DE Germany (Frankfurt am Main) ++Debian=http://ftp.man.poznan.pl/pub/linux/debian/debian/ # PL Poland (Poznan) ++Non-US=http://ftp.man.poznan.pl/pub/linux/debian/debian-non-US/ # PL Poland (Poznan) ++Debian=http://ftp.univ-pau.fr/linux/mirrors/debian/ # FR France (Pau) ++Debian=http://debian.dynamica.it/debian/ # IT Italy (Milan) ++Non-US=http://debian.dynamica.it/debian-non-US/ # IT Italy (Milan) ++Debian=http://debian.mnet.bg/debian/ # BG Bulgaria (Varna) ++Debian=http://debian.mirrors.easynews.com/linux/debian/ # US United States (Phoenix, AZ) ++Debian=http://debian.sth.sze.hu/debian/ # HU Hungary ++Debian=http://ftp.ncnu.edu.tw/debian/ # TW Taiwan (Puli, Nantou) ++Debian=http://debian.netvisao.pt/ # PT Portugal (Palmela) ++Debian=http://mirror.units.it/debian/ # IT Italy (Trieste) ++Debian=http://ftp.uga.edu/debian/ # US United States (Athens, GA) ++Debian=http://debian.dcc.fc.up.pt/debian/ # PT Portugal (Porto, Campo Alegre) ++Debian=http://mirror.cse.unsw.edu.au/debian/ # AU Australia (Sydney) ++Debian=http://ftp.au.debian.org/debian/ # AU Australia (Canberra) ++Debian=http://ftp.ee.debian.org/debian/ # EE Estonia ++Non-US=http://ftp.ee.debian.org/debian-non-US/ # EE Estonia ++Debian=http://mirror.csclub.uwaterloo.ca/debian/ # CA Canada (Waterloo, Ontario) ++Debian=http://debian.grn.cat/debian/ # ES Spain ++Debian=http://ftp.be.debian.org/debian/ # BE Belgium ++Debian=http://mirror.steadfast.net/debian/ # US United States (Chicago, IL) ++Debian=ftp://ftp.univ-nantes.fr/debian/ # FR France ++Debian=http://debian.com.es/debian/ # ES Spain (Madrid) ++Debian=http://debian.ues.edu.sv/debian/ # SV El Salvador ++Debian=http://debian.lth.se/debian/ # SE Sweden ++Debian=ftp://ftp.df.lth.se/debian/ # SE Sweden (Lund) ++Debian=http://www.cohsoft.com/debian/ # JP Japan (Kanagawa) ++Debian=http://dennou-h.gfd-dennou.org/debian/ # JP Japan (Kyoto) ++Non-US=http://dennou-h.gfd-dennou.org/library/Linux/debian-non-US/ # JP Japan (Kyoto) ++Debian=http://piotrkosoft.net/pub/mirrors/debian/ # PL Poland ++Debian=http://ftp.netspace.net.au/pub/debian/ # AU Australia (Melbourne) ++Debian=http://mirrors.compuscene.org/debian/ # FR France ++Debian=http://mirror.ayous.org/debian/ # DE Germany (Darmstadt) ++Debian=http://ftp.cse.yzu.edu.tw/pub/Linux/debian/debian/ # TW Taiwan (Taoyuan) ++Debian=http://ftp.ca.debian.org/debian/ # CA Canada ++Debian=http://ftp.antik.sk/debian/ # SK Slovakia (Kosice) ++Debian=http://debian.revolsys.fr/debian/ # FR France (Strasbourg) ++Debian=ftp://ftp.is.co.za/debian/ # ZA South Africa ++Debian=http://debian.res.um.edu.mt/debian/ # MT Malta (University of) ++Debian=http://ftp.utexas.edu/debian/ # US United States ++Debian=http://mirror.fdcservers.net/debian/ # US United States (Chicago Illinois) ++Debian=http://debian.univ-reims.fr/debian/ # FR France (Reims) ++Debian=http://debian.networx-bg.com/debian/ # BG Bulgaria (Rousse) ++Debian=http://ftp.si.debian.org/debian/ # SI Slovenia (Ljubljana) ++Debian=http://mirror.mirohost.net/debian/ # UA Ukraine (, Kyiv) ++Debian=http://www.anheng.com.cn/debian/ # CN China (www.anheng.com) ++Debian=http://ftp.daum.net/debian/ # KR Korea (Seoul) ++Debian=http://mirror.rit.edu/debian/ # US United States (Rochester, NY) ++Debian=http://debian.corenetworks.net/debian/ # US United States ++Debian=http://debian.comu.edu.tr/debian/ # TR Turkey (Canakkale) ++Debian=http://ftp2.debian.org.ua/debian/ # UA Ukraine (Kiev, UA) ++Debian=http://mirror.its.uidaho.edu/pub/debian/ # US United States (Moscow, ID) ++Debian=http://ftp.cvut.cz/debian/ # CZ Czech Republic (Prague) ++Debian=http://debian.stream.uz/debian/ # UZ Uzbekistan (39-41, Zarqaynar str., Tashkent) ++Debian=http://ftp.debian.chuvsu.ru/debian/ # RU Russia (Chuvash State University. Cheboksary.) ++Debian=http://mirror.sim.ul.pt/debian/ # PT Portugal (Lisboa) ++Debian=http://ftp.seclan.com/debian/ # FI Finland ++Debian=http://debian.ignum.cz/debian/ # CZ Czech Republic (Prague) ++Debian=http://ftp.metu.edu.tr/debian/ # TR Turkey (Ankara - TURKEY) ++Debian=http://repository.linux.pf/debian/ # PF French Polynesia (Polynésie française) ++Debian=http://debian.cs.binghamton.edu/debian/ # US United States (Binghamton, New York, USA) ++Debian=http://ftp.nc.debian.org/debian/ # NC New Caledonia (Noumea) ++Debian=http://debian.lagis.at/debian/ # AT Austria (Linz) ++Debian=http://ftp.ba.debian.org/debian/ # BA Bosnia & Herzegovina (Sarajevo) ++Debian=http://mirror.sov.uk.goscomb.net/debian/ # GB Great Britain (London, E14) ++Debian=http://mirror.unej.ac.id/debian/ # ID Indonesia (Jember, East Java) ++Debian=http://ftp.cl.debian.org/debian/ # CL Chile (Santiago de) ++Debian=http://mirror.hmc.edu/debian/ # US United States (Claremont, CA, US) ++Debian=http://debian.morphium.info/debian/ # DE Germany (manitu data center (manitu.de)) ++Debian=http://debian.mirror.dkm.cz/debian/ # CZ Czech Republic (Prague) ++Debian=http://mirrors.hosef.org/debian/ # US United States (University of Hawaii) ++Debian=http://mirror.neolabs.kz/debian/ # KZ Kazakhstan (Almaty) ++Debian=http://ftp.tcc.edu.tw/debian/ # TW Taiwan (TaiChung County) ++Debian=http://debian.mirror.cambrium.nl/debian/ # NL Netherlands (Amsterdam) ++Debian=http://debian.superhosting.cz/debian/ # CZ Czech Republic ++Debian=http://debian.md/debian/ # MD Moldova (Chișinău) ++Debian=http://mirror.debian.mn/debian/ # MN Mongolia (STIT, Ulaanbaatar) ++Debian=http://mirror.waia.asn.au/debian/ # AU Australia (Perth, Western) ++Debian=http://mirror.svk.su/debian/ # RU Russia (, Moscow) ++Debian=http://mirror2.corbina.ru/debian/ # RU Russia (MSK Corbina Telecom) ++Debian=http://mirror.cse.iitk.ac.in/debian/ # IN India (IIT Kanpur, Kanpur -208016) ++Debian=http://mirrors.ucr.ac.cr/debian/ # CR Costa Rica (Centro de Inform\341tica) ++Debian=http://debian.ipacct.com/debian/ # BG Bulgaria (Sofia) ++Debian=http://ftp.tku.edu.tw/debian/ # TW Taiwan ++Debian=http://mirror.transact.net.au/debian/ # AU Australia (Canberra, ACT) ++Debian=http://mirrors.modwest.com/debian/ # US United States (Missoula, Montana) ++Debian=http://mirror.giantix-server.de/debian/ # DE Germany (Karlsruhe) ++Debian=http://debian.mirror.root.lu/debian/ # LU Luxembourg (Steinsel) ++Debian=http://debian.advalem.net/debian/ # FR France (Paris, Ile de) ++Debian=http://mirrors.bloomu.edu/debian/ # US United States (Bloomsburg, PA) ++Debian=http://debian.usu.edu/debian/ # US United States (Logan, UT) +--- jigdo-0.7.3.orig/scripts/jigdo-mirror ++++ jigdo-0.7.3/scripts/jigdo-mirror +@@ -71,7 +71,7 @@ + maxMissing=100 + + filesPerFetch=10 +-wgetOpts="--passive-ftp --no-directories --non-verbose" ++wgetOpts="--passive-ftp --no-directories --no-verbose" + + # To find the template file, first the leafname of the template's URL + # is extracted from the .jigdo file. Next, for a .jigdo file named +--- jigdo-0.7.3.orig/doc/jigdo-file.1 ++++ jigdo-0.7.3/doc/jigdo-file.1 +@@ -412,8 +412,7 @@ + \fB--merge\fR an `[Image]\&' + section with arbitrary content and then have the MD5 + checksum automatically added by +-\fBjigdo-file\fR\&. The section `FORMAT OF +-.JIGDO FILES' below explains the ++\fBjigdo-file\fR\&. The section `FORMAT OF .JIGDO FILES' below explains the + `[Image]\&' section contents in greater + detail. + .TP diff --git a/01.hardening.patch b/01.hardening.patch new file mode 100644 index 000000000000..b7d499e17a51 --- /dev/null +++ b/01.hardening.patch @@ -0,0 +1,29 @@ +--- jigdo-0.7.3.orig/Makefile.in ++++ jigdo-0.7.3/Makefile.in +@@ -32,7 +32,7 @@ catalogs = @CATALOGS@ + # "gfx" symlink is needed for the pixmaps to be found by jigdo + all doc mostlyclean dep depend: Makefile + -test -h gfx -o -d gfx || ln -s "$(srcdir)/gfx" gfx +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CXXFLAGS="$(EXTRA_CXXFLAGS)" EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)" + cd doc && $(MAKE) $@ + cd po && $(MAKE) $@ + check test: Makefile +--- jigdo-0.7.3.orig/src/Makefile.in ++++ jigdo-0.7.3/src/Makefile.in +@@ -24,12 +24,12 @@ CPPFLAGS = @CPPFLAGS@ -I. -I"$(srcdir)" + -DPACKAGE_LOCALE_DIR="\"$(datadir)/locale\"" \ + $(GTKCFLAGS) $(CURLCFLAGS) # $(LIBWWWCFLAGS) + CC = @CC@ +-CFLAGS = @CFLAGS@ $(X) ++CFLAGS = @CFLAGS@ $(X) $(EXTRA_CFLAGS) + CXX = @CXX@ +-CXXFLAGS = @CXXFLAGS@ $(X) ++CXXFLAGS = @CXXFLAGS@ $(X) $(EXTRA_CXXFLAGS) + LD = @CXX@ + LD_C = @CC@ +-LDFLAGS = @LIBS@ @LDFLAGS@ $(Y) ++LDFLAGS = @LIBS@ @LDFLAGS@ $(Y) $(EXTRA_LDFLAGS) + LIBS = @LIBS@ + AWK = @AWK@ + GLADECODE = glade-2 -w # Create code from .glade file diff --git a/02.address_change.patch b/02.address_change.patch new file mode 100644 index 000000000000..3b519ad407a2 --- /dev/null +++ b/02.address_change.patch @@ -0,0 +1,2522 @@ +diff -u jigdo-0.7.3/Makefile.in jigdo-0.7.3/Makefile.in +--- jigdo-0.7.3/Makefile.in ++++ jigdo-0.7.3/Makefile.in +@@ -1,7 +1,7 @@ + # Project: Jigdo (Jigsaw download) + # __ _ + # |_) /| Copyright (C) 2001-2006 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + # this Makefile mostly forwards make commands to the other directories + srcdir = @srcdir@ +diff -u jigdo-0.7.3/doc/jigdo-file.1 jigdo-0.7.3/doc/jigdo-file.1 +--- jigdo-0.7.3/doc/jigdo-file.1 ++++ jigdo-0.7.3/doc/jigdo-file.1 +@@ -1172,4 +1172,4 @@ + Jigsaw +-Download <URL:http://atterer.net/jigdo/> was written by Richard Atterer +-<jigdo atterer.net>, to make downloading of CD ROM ++Download <URL:http://atterer.org/jigdo/> was written by Richard Atterer ++<jigdo atterer.org>, to make downloading of CD ROM + images for the Debian Linux distribution more convenient. +diff -u jigdo-0.7.3/scripts/jigdo-mirror jigdo-0.7.3/scripts/jigdo-mirror +--- jigdo-0.7.3/scripts/jigdo-mirror ++++ jigdo-0.7.3/scripts/jigdo-mirror +@@ -1,7 +1,7 @@ + #! /bin/sh + # __ _ + # |_) /| Copyright (C) 2002 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License, version 2. See +diff -u jigdo-0.7.3/src/Makefile.in jigdo-0.7.3/src/Makefile.in +--- jigdo-0.7.3/src/Makefile.in ++++ jigdo-0.7.3/src/Makefile.in +@@ -1,7 +1,7 @@ + # Project: Jigdo (Jigsaw download) + # __ _ + # |_) /| Copyright (C) 2001-2004 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + srcdir = @srcdir@ + VPATH = @srcdir@ +diff -u jigdo-0.7.3/src/compat.hh jigdo-0.7.3/src/compat.hh +--- jigdo-0.7.3/src/compat.hh ++++ jigdo-0.7.3/src/compat.hh +@@ -1,7 +1,7 @@ + /* $Id: compat.hh,v 1.6 2005/07/02 17:21:35 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +diff -u jigdo-0.7.3/src/gtk/gtk-single-url.cc jigdo-0.7.3/src/gtk/gtk-single-url.cc +--- jigdo-0.7.3/src/gtk/gtk-single-url.cc ++++ jigdo-0.7.3/src/gtk/gtk-single-url.cc +@@ -1,7 +1,7 @@ + /* $Id: gtk-single-url.cc,v 1.20 2005/10/15 21:27:39 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +diff -u jigdo-0.7.3/src/gtk/jigdo.cc jigdo-0.7.3/src/gtk/jigdo.cc +--- jigdo-0.7.3/src/gtk/jigdo.cc ++++ jigdo-0.7.3/src/gtk/jigdo.cc +@@ -1,7 +1,7 @@ + /* $Id: jigdo.cc,v 1.14 2005/07/09 22:21:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +diff -u jigdo-0.7.3/src/jigdo-file.cc jigdo-0.7.3/src/jigdo-file.cc +--- jigdo-0.7.3/src/jigdo-file.cc ++++ jigdo-0.7.3/src/jigdo-file.cc +@@ -1,7 +1,7 @@ + /* $Id: jigdo-file.cc,v 1.20 2006/05/14 18:23:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +@@ -286,7 +286,7 @@ + if (detailed) { + cout << subst(_( + "\n" +- "Copyright (C) 2001-%1 Richard Atterer <http://atterer.net>\n" ++ "Copyright (C) 2001-%1 Richard Atterer <http://atterer.org>\n" + "This program is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License, version 2. See\n" + "the file COPYING or <http://www.gnu.org/copyleft/gpl.html> for details.\n" +diff -u jigdo-0.7.3/src/net/proxyguess-test.cc jigdo-0.7.3/src/net/proxyguess-test.cc +--- jigdo-0.7.3/src/net/proxyguess-test.cc ++++ jigdo-0.7.3/src/net/proxyguess-test.cc +@@ -1,7 +1,7 @@ + /* $Id: proxyguess-test.cc,v 1.5 2004/09/11 23:26:30 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +diff -u jigdo-0.7.3/src/recursedir.cc jigdo-0.7.3/src/recursedir.cc +--- jigdo-0.7.3/src/recursedir.cc ++++ jigdo-0.7.3/src/recursedir.cc +@@ -1,7 +1,7 @@ + /* $Id: recursedir.cc,v 1.10 2006/05/14 18:23:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +diff -u jigdo-0.7.3/src/util/configfile.cc jigdo-0.7.3/src/util/configfile.cc +--- jigdo-0.7.3/src/util/configfile.cc ++++ jigdo-0.7.3/src/util/configfile.cc +@@ -1,7 +1,7 @@ + /* $Id: configfile.cc,v 1.2 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +diff -u jigdo-0.7.3/src/util/md5sum.hh jigdo-0.7.3/src/util/md5sum.hh +--- jigdo-0.7.3/src/util/md5sum.hh ++++ jigdo-0.7.3/src/util/md5sum.hh +@@ -1,7 +1,7 @@ + /* $Id: md5sum.hh,v 1.5 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + "Ported" to C++ by RA. Actual MD5 code taken from glibc + +diff -u jigdo-0.7.3/src/util/string-utf.cc jigdo-0.7.3/src/util/string-utf.cc +--- jigdo-0.7.3/src/util/string-utf.cc ++++ jigdo-0.7.3/src/util/string-utf.cc +@@ -1,7 +1,7 @@ + /* $Id: string-utf.cc,v 1.6 2004/09/11 23:26:30 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/README ++++ jigdo-0.7.3/README +@@ -5,10 +5,10 @@ + See the doc/ directory for documentation - start with the HOWTO + for an introduction to jigdo. + +-Jigsaw Download homepage: <http://atterer.net/jigdo/> ++Jigsaw Download homepage: <http://atterer.org/jigdo/> + Debian CD images via jigdo: <http://www.debian.org/CD/jigdo-cd/> + <richard@ +-Written by Richard Atterer: atterer.net> ++Written by Richard Atterer: atterer.org> + + ---------------------------------------------------------------------- + +@@ -71,7 +71,7 @@ + ---------------------------------------------------------------------- + + Copyright (C) 2001-2006 | richard@ +-Richard Atterer | atterer.net ++Richard Atterer | atterer.org + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2, as +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/deb/control ++++ jigdo-0.7.3/deb/control +@@ -1,7 +1,7 @@ + Source: jigdo + Section: utils + Priority: extra +-Maintainer: Richard Atterer <jigdo.atterer.net> ++Maintainer: Richard Atterer <jigdo.atterer.org> + Build-Depends: debhelper (>= 4), zlib1g-dev, libbz2-dev, libdb4.3-dev | libdb4.2-dev | libdb4-dev, libgtk2.0-dev, libcurl3-dev | libcurl2-dev + Standards-Version: 3.5.6 + +@@ -26,7 +26,7 @@ + This package contains "jigdo", the GTK+ download tool. + . + This package was built directly from the author's source package at +- <http://atterer.net/jigdo/>. IT IS NOT AN OFFICIAL DEBIAN PACKAGE. ++ <http://atterer.org/jigdo/>. IT IS NOT AN OFFICIAL DEBIAN PACKAGE. + + Package: jigdo-file + Architecture: any +@@ -53,4 +53,4 @@ + images. + . + This package was built directly from the author's source package at +- <http://atterer.net/jigdo/>. IT IS NOT AN OFFICIAL DEBIAN PACKAGE. ++ <http://atterer.org/jigdo/>. IT IS NOT AN OFFICIAL DEBIAN PACKAGE. +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/deb/copyright ++++ jigdo-0.7.3/deb/copyright +@@ -1,5 +1,5 @@ + Copyright (C) 2001-2005 | richard@ +-Richard Atterer | atterer.net ++Richard Atterer | atterer.org + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2, as +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/deb/rules ++++ jigdo-0.7.3/deb/rules +@@ -11,7 +11,7 @@ + dpkg-buildpackage -rfakeroot -us -uc -b + rm -f debian deb/changelog + debian/changelog: +- printf "jigdo (%s) unstable; urgency=low\n\n * This version was built directly from upstream sources. It is not\n an official Debian package.\n\n -- Richard Atterer <jigdo%satterer.net> %s\n" "`read a b v <jigdo.spec && echo $$v`" "@" "`date -R`" >deb/changelog ++ printf "jigdo (%s) unstable; urgency=low\n\n * This version was built directly from upstream sources. It is not\n an official Debian package.\n\n -- Richard Atterer <jigdo%satterer.org> %s\n" "`read a b v <jigdo.spec && echo $$v`" "@" "`date -R`" >deb/changelog + src/Makedeps: + $(MAKE) depend + +@@ -52,7 +52,7 @@ + "debian/jigdo/usr/share/jigdo/COPYING" + for package in jigdo jigdo-file; do \ + mkdir -p debian/$$package/usr/share/bug/$$package; \ +- at="@"; echo "Send-To: jigdo\${at}atterer.net" \ ++ at="@"; echo "Send-To: jigdo\${at}atterer.org" \ + >debian/$$package/usr/share/bug/$$package/control; \ + done + +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/Hacking.txt ++++ jigdo-0.7.3/doc/Hacking.txt +@@ -81,7 +81,7 @@ + + It'd also be nice if someone ensured that it builds on + Redhat/SuSE/Mandrake, and maintained the jigdo.spec file. Paul Bolle +- <jigdo-rpm atterer.net> has been doing this, get in touch with him ++ <jigdo-rpm atterer.org> has been doing this, get in touch with him + if you want to improve the .spec file. + + Andrew Mathieson has started maintaining a Mac OS X port - the Fink +@@ -431,5 +431,5 @@ + -- + __ _ + |_) /| Richard Atterer +- | \/¯| http://atterer.net ++ | \/¯| http://atterer.org + ¯ '` ¯ +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/Makefile.in ++++ jigdo-0.7.3/doc/Makefile.in +@@ -1,7 +1,7 @@ + # Project: Jigdo (Jigsaw download) + # __ _ + # |_) /| Copyright (C) 2001-2003 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + srcdir = @srcdir@ + VPATH = @srcdir@ +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/README-bindist.txt ++++ jigdo-0.7.3/doc/README-bindist.txt +@@ -4,10 +4,10 @@ + + Jigsaw Download (jigdo) + ~~~~~~~~~~~~~~~~~~~~~~~ +-Jigsaw Download homepage: <http://atterer.net/jigdo/> ++Jigsaw Download homepage: <http://atterer.org/jigdo/> + Debian CD images via jigdo: <http://www.debian.org/CD/jigdo-cd/> + <richard@ +-Written by Richard Atterer: atterer.net> ++Written by Richard Atterer: atterer.org> + + jigdo-lite + ~~~~~~~~~~ +@@ -65,7 +65,7 @@ + ---------------------------------------------------------------------- + + Copyright (C) 2001-2005 | richard@ +-Richard Atterer | atterer.net ++Richard Atterer | atterer.org + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2, as +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/README-windist.txt ++++ jigdo-0.7.3/doc/README-windist.txt +@@ -1,10 +1,10 @@ + + Jigsaw Download (jigdo) for Windows + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-Jigsaw Download homepage: <http://atterer.net/jigdo/> ++Jigsaw Download homepage: <http://atterer.org/jigdo/> + Debian CD images via jigdo: <http://www.debian.org/CD/jigdo-cd/> + <richard@ +-Written by Richard Atterer: atterer.net> ++Written by Richard Atterer: atterer.org> + + jigdo-lite + ~~~~~~~~~~ +@@ -47,7 +47,7 @@ + ---------------------------------------------------------------------- + + Copyright (C) 2001-2005 | richard@ +-Richard Atterer | atterer.net ++Richard Atterer | atterer.org + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2, as +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/debian-jigdo-mini-howto.html ++++ jigdo-0.7.3/doc/debian-jigdo-mini-howto.html +@@ -460,7 +460,7 @@ + lucifer$ jigdo-lite sarge-i386-1.jigdo + + Jigsaw Download "lite" +- Copyright 2001-2003 by Richard Atterer <jigdo@atterer.net> ++ Copyright 2001-2003 by Richard Atterer <jigdo@atterer.org> + Getting mirror information from /etc/apt/sources.list + + ----------------------------------------------------------------- +@@ -623,7 +623,7 @@ + + ----------------------------------------------------------------- + Jigsaw Download "lite" +- Copyright 2001-2002 by Richard Atterer <jigdo@atterer.net> ++ Copyright 2001-2002 by Richard Atterer <jigdo@atterer.org> + Loading settings from `/home/p/.jigdo-lite' + + ----------------------------------------------------------------- +@@ -690,7 +690,7 @@ + + ----------------------------------------------------------------- + Jigsaw Download "lite" +- Copyright 2001-2002 by Richard Atterer <jigdo@atterer.net> ++ Copyright 2001-2002 by Richard Atterer <jigdo@atterer.org> + Loading settings from `/home/p/.jigdo-lite' + + ----------------------------------------------------------------- +@@ -1106,8 +1106,8 @@ + <P></P> + <DIV> + <DL> +- <DT><A HREF="http://atterer.net/jigdo" TARGET="_top" +- >http://atterer.net/jigdo</A></DT> ++ <DT><A HREF="http://atterer.org/jigdo" TARGET="_top" ++ >http://atterer.org/jigdo</A></DT> + <DD> + <P>This is the jigdo home site. You should definitely browse this + site; lots of information about ports, GUI clients and everything +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/debian-jigdo-mini-howto.sgml ++++ jigdo-0.7.3/doc/debian-jigdo-mini-howto.sgml +@@ -514,7 +514,7 @@ + lucifer$ jigdo-lite sarge-i386-1.jigdo + + Jigsaw Download "lite" +- Copyright 2001-2003 by Richard Atterer <jigdo@atterer.net> ++ Copyright 2001-2003 by Richard Atterer <jigdo@atterer.org> + Getting mirror information from /etc/apt/sources.list + + ----------------------------------------------------------------- +@@ -756,7 +756,7 @@ + + ----------------------------------------------------------------- + Jigsaw Download "lite" +- Copyright 2001-2002 by Richard Atterer <jigdo@atterer.net> ++ Copyright 2001-2002 by Richard Atterer <jigdo@atterer.org> + Loading settings from `/home/p/.jigdo-lite' + + ----------------------------------------------------------------- +@@ -830,7 +830,7 @@ + + ----------------------------------------------------------------- + Jigsaw Download "lite" +- Copyright 2001-2002 by Richard Atterer <jigdo@atterer.net> ++ Copyright 2001-2002 by Richard Atterer <jigdo@atterer.org> + Loading settings from `/home/p/.jigdo-lite' + + ----------------------------------------------------------------- +@@ -1366,7 +1366,7 @@ + <variablelist> + <varlistentry> + <term> +- <ulink url="http://atterer.net/jigdo">http://atterer.net/jigdo</ulink> ++ <ulink url="http://atterer.org/jigdo">http://atterer.org/jigdo</ulink> + </term> + <listitem> + <para>This is the jigdo home site. You should definitely browse this site; lots of +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo-file.html ++++ jigdo-0.7.3/doc/jigdo-file.html +@@ -949,9 +949,9 @@ + </P></DIV> + <DIV><A NAME="AUTHOR"></A> + <H2>AUTHOR</H2> +- <P><A HREF="http://atterer.net/jigdo/" TARGET="_top">Jigsaw Download</A ++ <P><A HREF="http://atterer.org/jigdo/" TARGET="_top">Jigsaw Download</A + > was written by Richard Atterer <CODE><<A HREF="mailto:jigdo +- atterer.net">jigdo atterer.net</A>></CODE>, to make downloading of ++ atterer.org">jigdo atterer.org</A>></CODE>, to make downloading of + CD ROM images for the Debian Linux distribution more convenient.</P + ></DIV> + </BODY> +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo-file.sgml ++++ jigdo-0.7.3/doc/jigdo-file.sgml +@@ -2,7 +2,7 @@ + + <refentry lang="en"> + <refentryinfo> +- <address>jigdo atterer.net</address> ++ <address>jigdo atterer.org</address> + <author> + <firstname>Richard</firstname><surname>Atterer</surname> + </author> +@@ -1513,9 +1513,9 @@ + <refsect1 id="author"> + <title>AUTHOR</title> + +- <para><ulink url="http://atterer.net/jigdo/">Jigsaw ++ <para><ulink url="http://atterer.org/jigdo/">Jigsaw + Download</ulink> was written by Richard Atterer +- <email>jigdo atterer.net</email>, to make downloading of CD ROM ++ <email>jigdo atterer.org</email>, to make downloading of CD ROM + images for the Debian Linux distribution more convenient.</para> + + </refsect1> +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo-lite.1 ++++ jigdo-0.7.3/doc/jigdo-lite.1 +@@ -3,7 +3,7 @@ + .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> + .\" Please send any bug reports, improvements, comments, patches, + .\" etc. to Steve Cheng <steve@ggi-project.org>. +-.TH "JIGDO-LITE" "1" "19 May 2006" "" "" ++.TH "JIGDO-LITE" "1" "May 04, 2002" "" "" + + .SH NAME + jigdo-lite \- Download jigdo files using wget +@@ -62,6 +62,6 @@ + .SH "AUTHOR" + .PP + Jigsaw +-Download <URL:http://atterer.net/jigdo/> was written by Richard Atterer +-<jigdo atterer.net>, to make downloading of CD ROM ++Download <URL:http://atterer.org/jigdo/> was written by Richard Atterer ++<jigdo atterer.org>, to make downloading of CD ROM + images for the Debian Linux distribution more convenient. +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo-lite.html ++++ jigdo-0.7.3/doc/jigdo-lite.html +@@ -59,9 +59,9 @@ + jigdo</A>.</P></DIV> + <DIV><A NAME="AUTHOR"></A> + <H2>AUTHOR</H2> +- <P><A HREF="http://atterer.net/jigdo/" TARGET="_top">Jigsaw Download</A ++ <P><A HREF="http://atterer.org/jigdo/" TARGET="_top">Jigsaw Download</A + > was written by Richard Atterer <CODE><<A HREF="mailto:jigdo +- atterer.net">jigdo atterer.net</A>></CODE>, to make downloading of ++ atterer.org">jigdo atterer.org</A>></CODE>, to make downloading of + CD ROM images for the Debian Linux distribution more convenient.</P + ></DIV> + </BODY> +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo-lite.sgml ++++ jigdo-0.7.3/doc/jigdo-lite.sgml +@@ -2,7 +2,7 @@ + + <refentry lang="en"> + <refentryinfo> +- <address>jigdo atterer.net</address> ++ <address>jigdo atterer.org</address> + <author> + <firstname>Richard</firstname><surname>Atterer</surname> + </author> +@@ -117,9 +117,9 @@ + <refsect1 id="author"> + <title>AUTHOR</title> + +- <para><ulink url="http://atterer.net/jigdo/">Jigsaw ++ <para><ulink url="http://atterer.org/jigdo/">Jigsaw + Download</ulink> was written by Richard Atterer +- <email>jigdo atterer.net</email>, to make downloading of CD ROM ++ <email>jigdo atterer.org</email>, to make downloading of CD ROM + images for the Debian Linux distribution more convenient.</para> + + </refsect1> +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo-mirror.1 ++++ jigdo-0.7.3/doc/jigdo-mirror.1 +@@ -57,6 +57,6 @@ + .SH "AUTHOR" + .PP + Jigsaw +-Download <URL:http://atterer.net/jigdo/> was written by Richard Atterer +-<jigdo atterer.net>, to make downloading of CD ROM ++Download <URL:http://atterer.org/jigdo/> was written by Richard Atterer ++<jigdo atterer.org>, to make downloading of CD ROM + images for the Debian Linux distribution more convenient. +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo-mirror.html ++++ jigdo-0.7.3/doc/jigdo-mirror.html +@@ -49,9 +49,9 @@ + jigdo</A>.</P></DIV> + <DIV><A NAME="AUTHOR"></A> + <H2>AUTHOR</H2> +- <P><A HREF="http://atterer.net/jigdo/" TARGET="_top">Jigsaw Download</A ++ <P><A HREF="http://atterer.org/jigdo/" TARGET="_top">Jigsaw Download</A + > was written by Richard Atterer <CODE><<A HREF="mailto:jigdo +- atterer.net">jigdo atterer.net</A>></CODE>, to make downloading of ++ atterer.org">jigdo atterer.org</A>></CODE>, to make downloading of + CD ROM images for the Debian Linux distribution more convenient.</P + ></DIV> + </BODY> +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo-mirror.sgml ++++ jigdo-0.7.3/doc/jigdo-mirror.sgml +@@ -2,7 +2,7 @@ + + <refentry lang="en"> + <refentryinfo> +- <address>jigdo atterer.net</address> ++ <address>jigdo atterer.org</address> + <author> + <firstname>Richard</firstname><surname>Atterer</surname> + </author> +@@ -88,9 +88,9 @@ + <refsect1 id="author"> + <title>AUTHOR</title> + +- <para><ulink url="http://atterer.net/jigdo/">Jigsaw ++ <para><ulink url="http://atterer.org/jigdo/">Jigsaw + Download</ulink> was written by Richard Atterer +- <email>jigdo atterer.net</email>, to make downloading of CD ROM ++ <email>jigdo atterer.org</email>, to make downloading of CD ROM + images for the Debian Linux distribution more convenient.</para> + + </refsect1> +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo.1 ++++ jigdo-0.7.3/doc/jigdo.1 +@@ -3,7 +3,7 @@ + .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> + .\" Please send any bug reports, improvements, comments, patches, + .\" etc. to Steve Cheng <steve@ggi-project.org>. +-.TH "JIGDO" "1" "19 May 2006" "" "" ++.TH "JIGDO" "1" "May 05, 2003" "" "" + + .SH NAME + jigdo \- GTK+ download manager. +@@ -30,6 +30,6 @@ + .SH "AUTHOR" + .PP + Jigsaw +-Download <URL:http://atterer.net/jigdo/> was written by Richard Atterer +-<jigdo atterer.net>, to make downloading of CD ROM ++Download <URL:http://atterer.org/jigdo/> was written by Richard Atterer ++<jigdo atterer.org>, to make downloading of CD ROM + images for the Debian Linux distribution more convenient. +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo.html ++++ jigdo-0.7.3/doc/jigdo.html +@@ -27,9 +27,9 @@ + > </P></DIV> + <DIV><A NAME="AUTHOR"></A> + <H2>AUTHOR</H2> +- <P><A HREF="http://atterer.net/jigdo/" TARGET="_top">Jigsaw Download</A ++ <P><A HREF="http://atterer.org/jigdo/" TARGET="_top">Jigsaw Download</A + > was written by Richard Atterer <CODE><<A HREF="mailto:jigdo +- atterer.net">jigdo atterer.net</A>></CODE>, to make downloading of ++ atterer.org">jigdo atterer.org</A>></CODE>, to make downloading of + CD ROM images for the Debian Linux distribution more convenient.</P + ></DIV> + </BODY> +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/doc/jigdo.sgml ++++ jigdo-0.7.3/doc/jigdo.sgml +@@ -2,7 +2,7 @@ + + <refentry lang="en"> + <refentryinfo> +- <address>jigdo atterer.net</address> ++ <address>jigdo atterer.org</address> + <author> + <firstname>Richard</firstname><surname>Atterer</surname> + </author> +@@ -64,9 +64,9 @@ + <refsect1 id="author"> + <title>AUTHOR</title> + +- <para><ulink url="http://atterer.net/jigdo/">Jigsaw ++ <para><ulink url="http://atterer.org/jigdo/">Jigsaw + Download</ulink> was written by Richard Atterer +- <email>jigdo atterer.net</email>, to make downloading of CD ROM ++ <email>jigdo atterer.org</email>, to make downloading of CD ROM + images for the Debian Linux distribution more convenient.</para> + + </refsect1> +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/jigdo.spec ++++ jigdo-0.7.3/jigdo.spec +@@ -104,8 +104,8 @@ + Version: %{version} + Release: %{release} + Group: %{group} +-URL: http://atterer.net/jigdo/ +-Source: http://atterer.net/jigdo/%{name}-%{version}.tar.bz2 ++URL: http://atterer.org/jigdo/ ++Source: http://atterer.org/jigdo/%{name}-%{version}.tar.bz2 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + License: GPL + +@@ -201,28 +201,28 @@ + + + %changelog +-* Sun Jun 1 2003 Paul Bolle <jigdo-rpm@atterer.net> 0.7.0-5 ++* Sun Jun 1 2003 Paul Bolle <jigdo-rpm@atterer.org> 0.7.0-5 + - Some optimizations (too lazy to specifiy) + - Small typo in %%description + - Added dependency: ImageMagick (Red Hat Linux) + - added --prefix =/usr to configure (Red Hat Linux) + - preliminary work for SuSE (mostly fake!) + +-* Fri May 16 2003 Paul Bolle <jigdo-rpm@atterer.net> 0.7.0-4 ++* Fri May 16 2003 Paul Bolle <jigdo-rpm@atterer.org> 0.7.0-4 + - Minimization of use of buildforredhat and buildformandrake + - Minor optimizations + +-* Tue May 13 2003 Paul Bolle <jigdo-rpm@atterer.net> 0.7.0-3 ++* Tue May 13 2003 Paul Bolle <jigdo-rpm@atterer.org> 0.7.0-3 + - Use jigdo-icon.png instead of 3 png.bz2 of mandrake.src.rpm + - Deleted double listing of pixmaps in %%files + +-* Sun May 11 2003 Paul Bolle <jigdo-rpm@atterer.net> 0.7.0-2 ++* Sun May 11 2003 Paul Bolle <jigdo-rpm@atterer.org> 0.7.0-2 + - Richard Atterer reminded me that I had suggested to use %%{_vendor} + - Deleted VERSION from %%doc and added all html's + - Added build-dependencies: zlib-devel, gtk2-devel (Red Hat Linux) + - Added dependencie: wget (Red Hat Linux) + +-* Sat May 10 2003 Paul Bolle <jigdo-rpm@atterer.net> 0.7.0-1 ++* Sat May 10 2003 Paul Bolle <jigdo-rpm@atterer.org> 0.7.0-1 + - First Red Hat Linux 9 enabled rewrite + + * Sat Dec 28 2002 Alexander Skwar <ASkwar@DigitalProjects.com> 0.6.8-3mdk +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/po/Makefile.in ++++ jigdo-0.7.3/po/Makefile.in +@@ -1,7 +1,7 @@ + # Project: Jigdo (Jigsaw download) + # __ _ + # |_) /| Copyright (C) 2001-2002 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + srcdir = @srcdir@ + VPATH = @srcdir@ +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/po/de.po ++++ jigdo-0.7.3/po/de.po +@@ -20,26 +20,26 @@ + #: gtk/gui.cc:201 + msgid "" + "\n" +-"\tCopyright © 2001-%1 Richard Atterer <richard%2atterer.net>\n" +-"\tJigsaw Download homepage: http://atterer.net/jigdo\n" ++"\tCopyright © 2001-%1 Richard Atterer <richard%2atterer.org>\n" ++"\tJigsaw Download homepage: http://atterer.org/jigdo\n" + "\n" + msgstr "" + "\n" +-"\tCopyright © 2001-%1 Richard Atterer <richard%2atterer.net>\n" +-"\tHomepage von Jigsaw Download: http://atterer.net/jigdo\n" ++"\tCopyright © 2001-%1 Richard Atterer <richard%2atterer.org>\n" ++"\tHomepage von Jigsaw Download: http://atterer.org/jigdo\n" + "\n" + + #: jigdo-file.cc:288 + msgid "" + "\n" +-"Copyright (C) 2001-%1 Richard Atterer <http://atterer.net>\n" ++"Copyright (C) 2001-%1 Richard Atterer <http://atterer.org>\n" + "This program is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License, version 2. See\n" + "the file COPYING or <http://www.gnu.org/copyleft/gpl.html> for details.\n" + "\n" + msgstr "" + "\n" +-"Copyright © 2001-%1 Richard Atterer <http://atterer.net>\n" ++"Copyright © 2001-%1 Richard Atterer <http://atterer.org>\n" + "Dieses Programm ist Freie Software; Weitergabe und/oder Änderungen sind\n" + "erlaubt unter den Bedingungen der GNU General Public License, Version 2.\n" + "Details siehe Datei COPYING oder <http://www.gnu.org/copyleft/gpl.html>.\n" +@@ -730,12 +730,12 @@ + "<span weight=\"bold\" foreground=\"black\"><span size=\"x-large\">Jigsaw " + "Download %F1</span>\n" + "Copyright 2001-%2 Richard Atterer\n" +-"http://atterer.net/jigdo</span>" ++"http://atterer.org/jigdo</span>" + msgstr "" + "<span weight=\"bold\" foreground=\"black\"><span size=\"x-large\">Jigsaw " + "Download %F1</span>\n" + "Copyright 2001-%2 Richard Atterer\n" +-"http://atterer.net/jigdo</span>" ++"http://atterer.org/jigdo</span>" + + #: job/jigdo-io.cc:534 + msgid "A new section must be started after [Include]" +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/po/jigdo.pot ++++ jigdo-0.7.3/po/jigdo.pot +@@ -22,15 +22,15 @@ + #: gtk/gui.cc:201 + msgid "" + "\n" +-"\tCopyright © 2001-%1 Richard Atterer <richard%2atterer.net>\n" +-"\tJigsaw Download homepage: http://atterer.net/jigdo\n" ++"\tCopyright © 2001-%1 Richard Atterer <richard%2atterer.org>\n" ++"\tJigsaw Download homepage: http://atterer.org/jigdo\n" + "\n" + msgstr "" + + #: jigdo-file.cc:288 + msgid "" + "\n" +-"Copyright (C) 2001-%1 Richard Atterer <http://atterer.net>\n" ++"Copyright (C) 2001-%1 Richard Atterer <http://atterer.org>\n" + "This program is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License, version 2. See\n" + "the file COPYING or <http://www.gnu.org/copyleft/gpl.html> for details.\n" +@@ -577,7 +577,7 @@ + "<span weight=\"bold\" foreground=\"black\"><span size=\"x-large\">Jigsaw " + "Download %F1</span>\n" + "Copyright 2001-%2 Richard Atterer\n" +-"http://atterer.net/jigdo</span>" ++"http://atterer.org/jigdo</span>" + msgstr "" + + #: job/jigdo-io.cc:534 +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/scripts/convert-cvsmirrors.awk ++++ jigdo-0.7.3/scripts/convert-cvsmirrors.awk +@@ -1,7 +1,7 @@ + #! /usr/bin/gawk -f + # __ _ + # |_) /| Copyright (C) 2001 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/scripts/depend.awk ++++ jigdo-0.7.3/scripts/depend.awk +@@ -1,7 +1,7 @@ + #! /usr/bin/env awk -f + # __ _ + # |_) /| Copyright (C) 2000 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/scripts/glade-filter.awk ++++ jigdo-0.7.3/scripts/glade-filter.awk +@@ -1,7 +1,7 @@ + #! /usr/bin/env awk -f + # __ _ + # |_) /| Copyright (C) 2001-2003 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/scripts/html-beautify.awk ++++ jigdo-0.7.3/scripts/html-beautify.awk +@@ -1,7 +1,7 @@ + #! /usr/bin/env awk -f + # __ _ + # |_) /| Copyright (C) 2000 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/scripts/jigdo-lite ++++ jigdo-0.7.3/scripts/jigdo-lite +@@ -653,7 +657,7 @@ + echo + echo 'Jigsaw Download "lite"' + echo "Copyright (C) 2001-2005 | jigdo@" +-echo "Richard Atterer | atterer.net" ++echo "Richard Atterer | atterer.org" + + jigdoFile="jigdo-file" + jigdo-file --version >/dev/null 2>/dev/null +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/scripts/make-templates ++++ jigdo-0.7.3/scripts/make-templates +@@ -1,7 +1,7 @@ + #! /bin/sh -e + # __ _ + # |_) /| Copyright (C) 2001 | richard@ +-# | \/¯| Richard Atterer | atterer.net ++# | \/¯| Richard Atterer | atterer.org + # ¯ '` ¯ + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/cachefile.cc ++++ jigdo-0.7.3/src/cachefile.cc +@@ -1,7 +1,7 @@ + /* $Id: cachefile.cc,v 1.8 2005/07/21 11:31:43 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/cachefile.hh ++++ jigdo-0.7.3/src/cachefile.hh +@@ -1,7 +1,7 @@ + /* $Id: cachefile.hh,v 1.4 2005/07/21 11:31:43 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/compat.cc ++++ jigdo-0.7.3/src/compat.cc +@@ -1,7 +1,7 @@ + /* $Id: compat.cc,v 1.6 2006/05/19 16:05:40 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/config.h.in ++++ jigdo-0.7.3/src/config.h.in +@@ -232,7 +232,7 @@ + const char TEMPLATE_HDR[] = "JigsawDownload template "; + + /** Info URL written in .template/.jigdo file header */ +- const char* const URL = "http://atterer.net/jigdo/"; ++ const char* const URL = "http://atterer.org/jigdo/"; + + /** Approximate size of chunks into which unmatched data is chopped up when + included in template file. Measured in bytes of *uncompressed* +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/dirent.hh ++++ jigdo-0.7.3/src/dirent.hh +@@ -1,7 +1,7 @@ + /* $Id: dirent.hh,v 1.2 2004/09/12 21:08:28 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/glibcurl/glibcurl-example.c ++++ jigdo-0.7.3/src/glibcurl/glibcurl-example.c +@@ -1,7 +1,7 @@ + /* $Id: glibcurl-example.c,v 1.5 2004/12/04 13:57:06 atterer Exp $ -*- C -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + All rights reserved. + +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/glibcurl/glibcurl.c ++++ jigdo-0.7.3/src/glibcurl/glibcurl.c +@@ -1,7 +1,7 @@ + /* $Id: glibcurl.c,v 1.14 2004/12/05 16:15:12 atterer Exp $ -*- C -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + All rights reserved. + +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/glibcurl/glibcurl.h ++++ jigdo-0.7.3/src/glibcurl/glibcurl.h +@@ -1,7 +1,7 @@ + /* $Id: glibcurl.h,v 1.7 2004/12/04 13:58:29 atterer Exp $ -*- C -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + All rights reserved. + +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/gtk-makeimage.cc ++++ jigdo-0.7.3/src/gtk/gtk-makeimage.cc +@@ -1,7 +1,7 @@ + /* $Id: gtk-makeimage.cc,v 1.19 2005/04/10 16:36:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/gtk-makeimage.hh ++++ jigdo-0.7.3/src/gtk/gtk-makeimage.hh +@@ -1,7 +1,7 @@ + /* $Id: gtk-makeimage.hh,v 1.11 2005/04/10 16:36:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/gtk-single-url.hh ++++ jigdo-0.7.3/src/gtk/gtk-single-url.hh +@@ -1,7 +1,7 @@ + /* $Id: gtk-single-url.hh,v 1.17 2005/07/02 17:21:35 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/gui.cc ++++ jigdo-0.7.3/src/gtk/gui.cc +@@ -1,7 +1,7 @@ + /* $Id: gui.cc,v 1.16 2005/07/10 20:24:17 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +@@ -99,7 +99,7 @@ + "<span weight=\"bold\" foreground=\"black\">" + "<span size=\"x-large\">Jigsaw Download %F1</span>\n" + "Copyright 2001-%2 Richard Atterer\n" +- "http://atterer.net/jigdo</span>"), JIGDO_VERSION, CURRENT_YEAR); ++ "http://atterer.org/jigdo</span>"), JIGDO_VERSION, CURRENT_YEAR); + gtk_label_set_markup(aboutJigdoLabel, banner.c_str()); + gtk_label_set_justify(aboutJigdoLabel, GTK_JUSTIFY_CENTER); + //gtk_label_set_justify(GTK_LABEL(GUI::window.aboutJigdoButtonLabel), +@@ -199,8 +199,8 @@ + gtk_text_buffer_insert_with_tags(textBuf, &iter, + _("\nJigsaw Download License\n"), -1, large, center, NULL); + string copy = subst(_("\n" +- "\tCopyright © 2001-%1 Richard Atterer <richard%2atterer.net>\n" +- "\tJigsaw Download homepage: http://atterer.net/jigdo\n" ++ "\tCopyright © 2001-%1 Richard Atterer <richard%2atterer.org>\n" ++ "\tJigsaw Download homepage: http://atterer.org/jigdo\n" + "\n"), CURRENT_YEAR, '@'); + gtk_text_buffer_insert_with_tags(textBuf, &iter, copy.c_str(), -1, + center, NULL); +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/gui.hh ++++ jigdo-0.7.3/src/gtk/gui.hh +@@ -1,7 +1,7 @@ + #/* $Id: gui.hh,v 1.2 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/jobline.cc ++++ jigdo-0.7.3/src/gtk/jobline.cc +@@ -1,7 +1,7 @@ + /* $Id: jobline.cc,v 1.7 2004/06/26 11:28:46 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/jobline.fh ++++ jigdo-0.7.3/src/gtk/jobline.fh +@@ -1,7 +1,7 @@ + /* $Id: jobline.fh,v 1.1.1.1 2003/07/04 22:29:48 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/jobline.hh ++++ jigdo-0.7.3/src/gtk/jobline.hh +@@ -1,7 +1,7 @@ + /* $Id: jobline.hh,v 1.5 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/joblist.cc ++++ jigdo-0.7.3/src/gtk/joblist.cc +@@ -1,7 +1,7 @@ + /* $Id: joblist.cc,v 1.15 2005/07/02 17:21:35 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/joblist.hh ++++ jigdo-0.7.3/src/gtk/joblist.hh +@@ -1,7 +1,7 @@ + /* $Id: joblist.hh,v 1.10 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/messagebox.cc ++++ jigdo-0.7.3/src/gtk/messagebox.cc +@@ -1,7 +1,7 @@ + /* $Id: messagebox.cc,v 1.6 2003/09/12 23:08:01 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/messagebox.hh ++++ jigdo-0.7.3/src/gtk/messagebox.hh +@@ -1,7 +1,7 @@ + /* $Id: messagebox.hh,v 1.4 2005/10/15 21:27:39 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/treeiter.cc ++++ jigdo-0.7.3/src/gtk/treeiter.cc +@@ -1,7 +1,7 @@ + /* $Id: treeiter.cc,v 1.1.1.1 2003/07/04 22:29:41 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/gtk/treeiter.hh ++++ jigdo-0.7.3/src/gtk/treeiter.hh +@@ -1,7 +1,7 @@ + /* $Id: treeiter.hh,v 1.2 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/jigdo-file-cmd.cc ++++ jigdo-0.7.3/src/jigdo-file-cmd.cc +@@ -1,7 +1,7 @@ + /* $Id: jigdo-file-cmd.cc,v 1.16 2005/07/10 11:12:18 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/jigdo-file-cmd.hh ++++ jigdo-0.7.3/src/jigdo-file-cmd.hh +@@ -1,7 +1,7 @@ + /* $Id: jigdo-file-cmd.hh,v 1.13 2005/07/05 12:26:20 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/jigdoconfig-test.cc ++++ jigdo-0.7.3/src/jigdoconfig-test.cc +@@ -1,7 +1,7 @@ + /* $Id: jigdoconfig-test.cc,v 1.5 2004/09/12 21:08:28 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/jigdoconfig.cc ++++ jigdo-0.7.3/src/jigdoconfig.cc +@@ -1,7 +1,7 @@ + /* $Id: jigdoconfig.cc,v 1.6 2005/04/09 14:44:50 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/jigdoconfig.fh ++++ jigdo-0.7.3/src/jigdoconfig.fh +@@ -1,7 +1,7 @@ + /* $Id: jigdoconfig.fh,v 1.1.1.1 2003/07/04 22:29:16 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/jigdoconfig.hh ++++ jigdo-0.7.3/src/jigdoconfig.hh +@@ -1,7 +1,7 @@ + /* $Id: jigdoconfig.hh,v 1.5 2005/04/09 14:44:50 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/cached-url.cc ++++ jigdo-0.7.3/src/job/cached-url.cc +@@ -1,7 +1,7 @@ + /* $Id: cached-url.cc,v 1.7 2005/07/02 17:21:35 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/cached-url.hh ++++ jigdo-0.7.3/src/job/cached-url.hh +@@ -1,7 +1,7 @@ + /* $Id: cached-url.hh,v 1.3 2004/09/09 23:50:21 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/datasource.cc ++++ jigdo-0.7.3/src/job/datasource.cc +@@ -1,7 +1,7 @@ + /* $Id: datasource.cc,v 1.2 2004/08/29 01:01:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/datasource.hh ++++ jigdo-0.7.3/src/job/datasource.hh +@@ -1,7 +1,7 @@ + /* $Id: datasource.hh,v 1.7 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/jigdo-io-test.cc ++++ jigdo-0.7.3/src/job/jigdo-io-test.cc +@@ -1,7 +1,7 @@ + /* $Id: jigdo-io-test.cc,v 1.13 2005/04/09 22:31:29 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/jigdo-io.cc ++++ jigdo-0.7.3/src/job/jigdo-io.cc +@@ -1,7 +1,7 @@ + /* $Id: jigdo-io.cc,v 1.26 2005/04/10 16:36:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/jigdo-io.fh ++++ jigdo-0.7.3/src/job/jigdo-io.fh +@@ -1,7 +1,7 @@ + /* $Id: jigdo-io.fh,v 1.3 2003/09/03 19:28:13 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/jigdo-io.hh ++++ jigdo-0.7.3/src/job/jigdo-io.hh +@@ -1,7 +1,7 @@ + /* $Id: jigdo-io.hh,v 1.16 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/jigdodownload.cc ++++ jigdo-0.7.3/src/job/jigdodownload.cc +@@ -1,7 +1,7 @@ + /* $Id: jigdodownload.cc,v 1.9 2004/09/11 23:26:30 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/jigdodownload.hh ++++ jigdo-0.7.3/src/job/jigdodownload.hh +@@ -1,7 +1,7 @@ + /* $Id: jigdodownload.hh,v 1.11 2005/07/04 10:25:10 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/job.hh ++++ jigdo-0.7.3/src/job/job.hh +@@ -1,7 +1,7 @@ + /* $Id: job.hh,v 1.9 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/makeimage.cc ++++ jigdo-0.7.3/src/job/makeimage.cc +@@ -1,7 +1,7 @@ + /* $Id: makeimage.cc,v 1.1.1.1 2003/07/04 22:29:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/makeimage.hh ++++ jigdo-0.7.3/src/job/makeimage.hh +@@ -1,7 +1,7 @@ + /* $Id: makeimage.hh,v 1.10 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/makeimagedl-info-test.cc ++++ jigdo-0.7.3/src/job/makeimagedl-info-test.cc +@@ -1,7 +1,7 @@ + /* $Id: makeimagedl-info-test.cc,v 1.7 2004/09/11 23:26:30 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/makeimagedl-info.cc ++++ jigdo-0.7.3/src/job/makeimagedl-info.cc +@@ -1,7 +1,7 @@ + /* $Id: makeimagedl-info.cc,v 1.4 2004/02/04 15:34:40 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/makeimagedl.cc ++++ jigdo-0.7.3/src/job/makeimagedl.cc +@@ -1,7 +1,7 @@ + /* $Id: makeimagedl.cc,v 1.30 2005/07/06 22:06:34 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/makeimagedl.fh ++++ jigdo-0.7.3/src/job/makeimagedl.fh +@@ -1,7 +1,7 @@ + /* $Id: makeimagedl.fh,v 1.1 2003/08/17 15:51:19 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/makeimagedl.hh ++++ jigdo-0.7.3/src/job/makeimagedl.hh +@@ -1,7 +1,7 @@ + /* $Id: makeimagedl.hh,v 1.27 2005/10/15 21:34:28 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/single-url.cc ++++ jigdo-0.7.3/src/job/single-url.cc +@@ -1,7 +1,7 @@ + /* $Id: single-url.cc,v 1.17 2005/04/09 22:31:29 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2002-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/single-url.hh ++++ jigdo-0.7.3/src/job/single-url.hh +@@ -1,7 +1,7 @@ + /* $Id: single-url.hh,v 1.15 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2002-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/url-mapping-test.cc ++++ jigdo-0.7.3/src/job/url-mapping-test.cc +@@ -1,7 +1,7 @@ + /* $Id: url-mapping-test.cc,v 1.5 2005/04/10 17:04:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/url-mapping.cc ++++ jigdo-0.7.3/src/job/url-mapping.cc +@@ -1,7 +1,7 @@ + /* $Id: url-mapping.cc,v 1.8 2005/07/06 14:55:41 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/url-mapping.fh ++++ jigdo-0.7.3/src/job/url-mapping.fh +@@ -1,7 +1,7 @@ + /* $Id: url-mapping.fh,v 1.2 2004/08/09 08:35:05 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/job/url-mapping.hh ++++ jigdo-0.7.3/src/job/url-mapping.hh +@@ -1,7 +1,7 @@ + /* $Id: url-mapping.hh,v 1.9 2005/04/10 17:04:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/mkimage.cc ++++ jigdo-0.7.3/src/mkimage.cc +@@ -1,7 +1,7 @@ + /* $Id: mkimage.cc,v 1.15 2005/07/09 19:14:46 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +@@ -285,27 +285,27 @@ + //______________________________________________________________________ + + namespace { +- const int SIZE_WIDTH = 12; ++ const int J_SIZE_WIDTH = 12; + } + + ostream& JigdoDesc::ImageInfo::put(ostream& s) const { +- s << "image-info " << setw(SIZE_WIDTH) << size() << " " ++ s << "image-info " << setw(J_SIZE_WIDTH) << size() << " " + << md5() << ' ' << blockLength() << '\n'; + return s; + } + ostream& JigdoDesc::UnmatchedData::put(ostream& s) const { +- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' ' +- << setw(SIZE_WIDTH) << size() << '\n'; ++ s << "in-template " << setw(J_SIZE_WIDTH) << offset() << ' ' ++ << setw(J_SIZE_WIDTH) << size() << '\n'; + return s; + } + ostream& JigdoDesc::MatchedFile::put(ostream& s) const { +- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' ' +- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; ++ s << "need-file " << setw(J_SIZE_WIDTH) << offset() << ' ' ++ << setw(J_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; + return s; + } + ostream& JigdoDesc::WrittenFile::put(ostream& s) const { +- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' ' +- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; ++ s << "have-file " << setw(J_SIZE_WIDTH) << offset() << ' ' ++ << setw(J_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; + return s; + } + +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/mkimage.hh ++++ jigdo-0.7.3/src/mkimage.hh +@@ -1,7 +1,7 @@ + /* $Id: mkimage.hh,v 1.3 2004/09/12 21:08:28 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/mkjigdo.cc ++++ jigdo-0.7.3/src/mkjigdo.cc +@@ -1,7 +1,7 @@ + /* $Id: mkjigdo.cc,v 1.2 2004/09/09 23:50:21 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/mktemplate.cc ++++ jigdo-0.7.3/src/mktemplate.cc +@@ -1,7 +1,7 @@ + /* $Id: mktemplate.cc,v 1.16 2005/07/06 15:29:59 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +@@ -345,7 +345,7 @@ + "very likely broken! To help me find the bug, please rerun the\n" + "command as follows:\n" + " [previous-command] --report=noprogress --debug=make-template >log 2>&1\n" +- "and send the _compressed_ `log' file to <jigdo" << "@atterer.net>." ++ "and send the _compressed_ `log' file to <jigdo" << "@atterer.org>." + << endl; + printed = true; + } +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/mktemplate.hh ++++ jigdo-0.7.3/src/mktemplate.hh +@@ -1,7 +1,7 @@ + /* $Id: mktemplate.hh,v 1.10 2006/05/14 18:23:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/net/download.cc ++++ jigdo-0.7.3/src/net/download.cc +@@ -1,7 +1,7 @@ + /* $Id: download.cc,v 1.22 2004/12/05 16:15:12 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +@@ -90,7 +90,7 @@ + userAgent += ')'; + } + # endif +- userAgent += " (+http://atterer.net/jigdo/) "; ++ userAgent += " (+http://atterer.org/jigdo/) "; + //userAgent += curl_version(); + const char* p = curl_version(); + while (*p != ' ' && *p != '\0') userAgent += *p++; +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/net/download.hh ++++ jigdo-0.7.3/src/net/download.hh +@@ -1,7 +1,7 @@ + /* $Id: download.hh,v 1.17 2006/05/14 18:23:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/net/libwww.hh ++++ jigdo-0.7.3/src/net/libwww.hh +@@ -1,7 +1,7 @@ + /* $Id: libwww.hh,v 1.8 2003/09/12 23:08:01 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/net/proxyguess.cc ++++ jigdo-0.7.3/src/net/proxyguess.cc +@@ -1,7 +1,7 @@ + /* $Id: proxyguess.cc,v 1.14 2005/07/02 17:21:35 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/net/proxyguess.hh ++++ jigdo-0.7.3/src/net/proxyguess.hh +@@ -1,7 +1,7 @@ + /* $Id: proxyguess.hh,v 1.2 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/net/uri-test.cc ++++ jigdo-0.7.3/src/net/uri-test.cc +@@ -1,7 +1,7 @@ + /* $Id: uri-test.cc,v 1.4 2005/07/02 17:21:35 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/net/uri.cc ++++ jigdo-0.7.3/src/net/uri.cc +@@ -1,7 +1,7 @@ + /* $Id: uri.cc,v 1.6 2004/09/08 16:47:25 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/net/uri.hh ++++ jigdo-0.7.3/src/net/uri.hh +@@ -1,7 +1,7 @@ + /* $Id: uri.hh,v 1.5 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/partialmatch.cc ++++ jigdo-0.7.3/src/partialmatch.cc +@@ -1,7 +1,7 @@ + /* $Id: partialmatch.cc,v 1.1.1.1 2003/07/04 22:29:14 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/partialmatch.hh ++++ jigdo-0.7.3/src/partialmatch.hh +@@ -1,7 +1,7 @@ + /* $Id: partialmatch.hh,v 1.5 2004/09/12 21:08:28 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/partialmatch.ih ++++ jigdo-0.7.3/src/partialmatch.ih +@@ -1,7 +1,7 @@ + /* $Id: partialmatch.ih,v 1.5 2003/08/15 11:38:30 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/recursedir-test.cc ++++ jigdo-0.7.3/src/recursedir-test.cc +@@ -1,7 +1,7 @@ + /* $Id: recursedir-test.cc,v 1.1.1.1 2003/07/04 22:29:18 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/recursedir.fh ++++ jigdo-0.7.3/src/recursedir.fh +@@ -1,7 +1,7 @@ + /* $Id: recursedir.fh,v 1.1.1.1 2003/07/04 22:29:24 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/recursedir.hh ++++ jigdo-0.7.3/src/recursedir.hh +@@ -1,7 +1,7 @@ + /* $Id: recursedir.hh,v 1.7 2006/05/14 18:23:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/scan.cc ++++ jigdo-0.7.3/src/scan.cc +@@ -1,7 +1,7 @@ + /* $Id: scan.cc,v 1.11 2005/07/02 22:05:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/scan.fh ++++ jigdo-0.7.3/src/scan.fh +@@ -1,7 +1,7 @@ + /* $Id: scan.fh,v 1.1.1.1 2003/07/04 22:29:08 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/scan.hh ++++ jigdo-0.7.3/src/scan.hh +@@ -1,7 +1,7 @@ + /* $Id: scan.hh,v 1.6 2006/05/19 14:46:25 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/serialize.hh ++++ jigdo-0.7.3/src/serialize.hh +@@ -1,7 +1,7 @@ + /* $Id: serialize.hh,v 1.5 2005/07/04 10:25:10 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/torture.cc ++++ jigdo-0.7.3/src/torture.cc +@@ -1,7 +1,7 @@ + /* $Id: torture.cc,v 1.9 2005/07/02 17:21:35 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/autonullptr-test.cc ++++ jigdo-0.7.3/src/util/autonullptr-test.cc +@@ -1,7 +1,7 @@ + /* $Id: autonullptr-test.cc,v 1.2 2004/09/09 23:50:22 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/autonullptr.hh ++++ jigdo-0.7.3/src/util/autonullptr.hh +@@ -1,7 +1,7 @@ + /* $Id: autonullptr.hh,v 1.5 2005/07/04 10:25:10 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/autoptr.hh ++++ jigdo-0.7.3/src/util/autoptr.hh +@@ -1,7 +1,7 @@ + /* $Id: autoptr.hh,v 1.2 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/bstream-counted.hh ++++ jigdo-0.7.3/src/util/bstream-counted.hh +@@ -1,7 +1,7 @@ + /* $Id: bstream-counted.hh,v 1.5 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/bstream.cc ++++ jigdo-0.7.3/src/util/bstream.cc +@@ -1,7 +1,7 @@ + /* $Id: bstream.cc,v 1.2 2004/12/28 00:23:14 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/bstream.hh ++++ jigdo-0.7.3/src/util/bstream.hh +@@ -1,7 +1,7 @@ + /* $Id: bstream.hh,v 1.19 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/configfile-test.cc ++++ jigdo-0.7.3/src/util/configfile-test.cc +@@ -1,7 +1,7 @@ + /* $Id: configfile-test.cc,v 1.2 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/configfile.hh ++++ jigdo-0.7.3/src/util/configfile.hh +@@ -1,7 +1,7 @@ + /* $Id: configfile.hh,v 1.5 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/debug.cc ++++ jigdo-0.7.3/src/util/debug.cc +@@ -1,7 +1,7 @@ + /* $Id: debug.cc,v 1.9 2005/07/02 17:21:35 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 1999-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/debug.hh ++++ jigdo-0.7.3/src/util/debug.hh +@@ -1,7 +1,7 @@ + /* $Id: debug.hh,v 1.9 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 1999-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/gunzip-test.cc ++++ jigdo-0.7.3/src/util/gunzip-test.cc +@@ -1,7 +1,7 @@ + /* $Id: gunzip-test.cc,v 1.5 2004/09/12 21:08:28 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/gunzip.cc ++++ jigdo-0.7.3/src/util/gunzip.cc +@@ -1,7 +1,7 @@ + /* $Id: gunzip.cc,v 1.6 2006/05/14 18:23:31 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/gunzip.hh ++++ jigdo-0.7.3/src/util/gunzip.hh +@@ -1,7 +1,7 @@ + /* $Id: gunzip.hh,v 1.3 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/ilist.hh ++++ jigdo-0.7.3/src/util/ilist.hh +@@ -1,7 +1,7 @@ + /* $Id: ilist.hh,v 1.10 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/log-test.cc ++++ jigdo-0.7.3/src/util/log-test.cc +@@ -1,7 +1,7 @@ + /* $Id: log-test.cc,v 1.3 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/log.cc ++++ jigdo-0.7.3/src/util/log.cc +@@ -1,7 +1,7 @@ + /* $Id: log.cc,v 1.8 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/log.hh ++++ jigdo-0.7.3/src/util/log.hh +@@ -1,7 +1,7 @@ + /* $Id: log.hh,v 1.10 2005/07/02 14:53:59 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/md5sum-test.cc ++++ jigdo-0.7.3/src/util/md5sum-test.cc +@@ -1,7 +1,7 @@ + /* $Id: md5sum-test.cc,v 1.2 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/md5sum.cc ++++ jigdo-0.7.3/src/util/md5sum.cc +@@ -1,7 +1,7 @@ + /* $Id: md5sum.cc,v 1.4 2004/06/20 20:35:15 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + "Ported" to C++ by RA. Uses glibc code for the actual algorithm. + +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/md5sum.fh ++++ jigdo-0.7.3/src/util/md5sum.fh +@@ -1,7 +1,7 @@ + /* $Id: md5sum.fh,v 1.2 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + "Ported" to C++ by RA. Actual MD5 code taken from glibc + +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/md5sum.ih ++++ jigdo-0.7.3/src/util/md5sum.ih +@@ -1,7 +1,7 @@ + /* $Id: md5sum.ih,v 1.3 2004/06/20 20:35:15 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/mimestream-test.cc ++++ jigdo-0.7.3/src/util/mimestream-test.cc +@@ -1,7 +1,7 @@ + /* $Id: mimestream-test.cc,v 1.2 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/mimestream.hh ++++ jigdo-0.7.3/src/util/mimestream.hh +@@ -1,7 +1,7 @@ + /* $Id: mimestream.hh,v 1.7 2005/07/02 14:53:59 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/nocopy.hh ++++ jigdo-0.7.3/src/util/nocopy.hh +@@ -1,7 +1,7 @@ + /* $Id: nocopy.hh,v 1.2 2004/09/09 23:50:22 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/progress.cc ++++ jigdo-0.7.3/src/util/progress.cc +@@ -1,7 +1,7 @@ + /* $Id: progress.cc,v 1.7 2003/08/15 11:38:30 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/progress.fh ++++ jigdo-0.7.3/src/util/progress.fh +@@ -1,7 +1,7 @@ + /* $Id: progress.fh,v 1.2 2003/08/28 23:21:00 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/progress.hh ++++ jigdo-0.7.3/src/util/progress.hh +@@ -1,7 +1,7 @@ + /* $Id: progress.hh,v 1.9 2004/09/09 23:50:22 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/random.cc ++++ jigdo-0.7.3/src/util/random.cc +@@ -1,7 +1,7 @@ + /* $Id: random.cc,v 1.1 2005/07/04 15:00:37 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2005 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/rsyncsum-test.cc ++++ jigdo-0.7.3/src/util/rsyncsum-test.cc +@@ -1,7 +1,7 @@ + /* $Id: rsyncsum-test.cc,v 1.3 2004/11/24 10:38:44 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/rsyncsum.cc ++++ jigdo-0.7.3/src/util/rsyncsum.cc +@@ -1,7 +1,7 @@ + /* $Id: rsyncsum.cc,v 1.2 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/rsyncsum.hh ++++ jigdo-0.7.3/src/util/rsyncsum.hh +@@ -1,7 +1,7 @@ + /* $Id: rsyncsum.hh,v 1.4 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/rsyncsum.ih ++++ jigdo-0.7.3/src/util/rsyncsum.ih +@@ -1,7 +1,7 @@ + /* $Id: rsyncsum.ih,v 1.2 2003/09/27 21:31:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/smartptr.hh ++++ jigdo-0.7.3/src/util/smartptr.hh +@@ -1,7 +1,7 @@ + /* $Id: smartptr.hh,v 1.7 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2000-2004 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2 or +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/status.hh ++++ jigdo-0.7.3/src/util/status.hh +@@ -1,7 +1,7 @@ + /* $Id: status.hh,v 1.4 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/string-utf-test.cc ++++ jigdo-0.7.3/src/util/string-utf-test.cc +@@ -1,7 +1,7 @@ + /* $Id: string-utf-test.cc,v 1.1 2003/09/16 23:32:10 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/string-utf.hh ++++ jigdo-0.7.3/src/util/string-utf.hh +@@ -1,7 +1,7 @@ + /* $Id: string-utf.hh,v 1.2 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2003 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/string.cc ++++ jigdo-0.7.3/src/util/string.cc +@@ -1,7 +1,7 @@ + /* $Id: string.cc,v 1.6 2005/04/09 10:38:21 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/string.hh ++++ jigdo-0.7.3/src/util/string.hh +@@ -1,7 +1,7 @@ + /* $Id: string.hh,v 1.8 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/util/unistd-jigdo.h ++++ jigdo-0.7.3/src/util/unistd-jigdo.h +@@ -1,7 +1,7 @@ + /* $Id: unistd-jigdo.h,v 1.1 2005/07/04 14:55:05 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2005 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2. See the file +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/zstream-bz.cc ++++ jigdo-0.7.3/src/zstream-bz.cc +@@ -1,7 +1,7 @@ + /* $Id: zstream-bz.cc,v 1.2 2005/04/04 21:58:17 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004-2005 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/zstream-bz.hh ++++ jigdo-0.7.3/src/zstream-bz.hh +@@ -1,7 +1,7 @@ + /* $Id: zstream-bz.hh,v 1.3 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004-2005 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/zstream-gz.cc ++++ jigdo-0.7.3/src/zstream-gz.cc +@@ -1,7 +1,7 @@ + /* $Id: zstream-gz.cc,v 1.3 2005/04/04 21:58:17 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004-2005 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/zstream-gz.hh ++++ jigdo-0.7.3/src/zstream-gz.hh +@@ -1,7 +1,7 @@ + /* $Id: zstream-gz.hh,v 1.5 2005/04/09 23:09:52 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2004-2005 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/zstream.cc ++++ jigdo-0.7.3/src/zstream.cc +@@ -1,7 +1,7 @@ + /* $Id: zstream.cc,v 1.11 2005/04/04 21:58:17 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2005 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/zstream.fh ++++ jigdo-0.7.3/src/zstream.fh +@@ -1,7 +1,7 @@ + /* $Id: zstream.fh,v 1.1.1.1 2003/07/04 22:29:41 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2002 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See +only in patch2: +unchanged: +--- jigdo-0.7.3.orig/src/zstream.hh ++++ jigdo-0.7.3/src/zstream.hh +@@ -1,7 +1,7 @@ + /* $Id: zstream.hh,v 1.10 2005/07/02 22:05:04 atterer Exp $ -*- C++ -*- + __ _ + |_) /| Copyright (C) 2001-2005 | richard@ +- | \/¯| Richard Atterer | atterer.net ++ | \/¯| Richard Atterer | atterer.org + ¯ '` ¯ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2. See diff --git a/03.jigdo-lite-https.patch b/03.jigdo-lite-https.patch new file mode 100644 index 000000000000..e7ad006593ca --- /dev/null +++ b/03.jigdo-lite-https.patch @@ -0,0 +1,19 @@ +--- jigdo-0.7.3.orig/scripts/jigdo-lite ++++ jigdo-0.7.3/scripts/jigdo-lite +@@ -46,10 +46,14 @@ + #______________________________________________________________________ + + # isURI <string> +-# Returns 0 (true) if the supplied string is a HTTP/FTP URL, otherwise 1 ++# Returns 0 (true) if the supplied string is a HTTP/HTTPS/FTP/FILE ++# URL, otherwise 1 + isURI() { + case "$1" in +- http:*|ftp:*|HTTP:*|FTP:*|file:*|FILE:*) return 0;; ++ [hH][tT][tT][pP]:*) return 0;; ++ [hH][tT][tT][pP][sS]:*) return 0;; ++ [fF][tT][pP]:*) return 0;; ++ [fF][iI][lL][eE]:*) return 0;; + *) return 1; + esac + } diff --git a/04.jigdo-lite-tmpdir.patch b/04.jigdo-lite-tmpdir.patch new file mode 100644 index 000000000000..5a69d41c9d3d --- /dev/null +++ b/04.jigdo-lite-tmpdir.patch @@ -0,0 +1,11 @@ +--- jigdo-0.7.3.orig/scripts/jigdo-lite ++++ jigdo-0.7.3/scripts/jigdo-lite +@@ -510,7 +514,7 @@ + list="$image.list" + + # Create name of temporary dir, by stripping extension from $image +- imageTmp="`echo $image | sed 's%\.\(tmp|iso|raw\)%%'`" ++ imageTmp="$tmpDir/`echo $image | sed 's%\.\(tmp|iso|raw\)%%'`.tmpdir" + if test -f "$imageTmp" -o "x$imageTmp" = "x$image"; then + imageTmp="$imageTmp.tmpdir" + fi diff --git a/05.jigdo-lite-grep-options.patch b/05.jigdo-lite-grep-options.patch new file mode 100644 index 000000000000..8db4adf4836a --- /dev/null +++ b/05.jigdo-lite-grep-options.patch @@ -0,0 +1,11 @@ +--- jigdo-0.7.3.orig/scripts/jigdo-lite 2017-12-07 16:35:00.806877547 +0000 ++++ jigdo-0.7.3/scripts/jigdo-lite 2017-12-07 16:35:03.514902976 +0000 +@@ -14,6 +14,8 @@ + maxMissing=30 # Don't try fallback servers if x% or more of files missing + rcFile="$HOME/.jigdo-lite" + ++unset GREP_OPTIONS ++ + if test "x$OSTYPE" = "xmsys"; then + windows=true + OSTYPE=Windows diff --git a/06.jigdo-lite-store-filesPerFetch.patch b/06.jigdo-lite-store-filesPerFetch.patch new file mode 100644 index 000000000000..d6abd29922e4 --- /dev/null +++ b/06.jigdo-lite-store-filesPerFetch.patch @@ -0,0 +1,11 @@ +--- jigdo-0.7.3.orig/scripts/jigdo-lite 2017-12-07 16:58:48.404806438 +0000 ++++ jigdo-0.7.3/scripts/jigdo-lite 2017-12-07 17:00:09.493596969 +0000 +@@ -251,6 +251,8 @@ + "$tmpDir" "$jigdoOpts" >>"$rcFile" + printf "wgetOpts='%s'${nl}scanMenu='%s'${nl}" \ + "$wgetOpts" "$scanMenu" >>"$rcFile" ++ printf "filesPerFetch='%s'${nl}" \ ++ "$filesPerFetch" >>"$rcFile" + } + #______________________________________________________________________ + @@ -1,30 +1,52 @@ -# Maintener : sputnick <gilles DOT quenot AT gmail DOT com> -# Contributor: Carlos Ruiz <cailovirtual@gmail.com> +# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com> pkgname=jigdo pkgver=0.7.3 -pkgrel=5 -pkgdesc="Jigsaw Download, or short jigdo, is a tool designed to ease the distribution of very large files over the internet, for example CD or DVD images" -url="http://atterer.org/jigdo/" -license=("GPL2") +pkgrel=1 +pkgdesc="Distribute large images by sending and receiving the files that make them up" arch=('i686' 'x86_64') -depends=('gtk2>=2.4.0' 'bzip2' 'curl') -source=( - "http://atterer.org/sites/atterer/files/2009-08/$pkgname/$pkgname-$pkgver.tar.bz2" - "https://raw2.github.com/sputnick-dev/aur/master/$pkgname/$pkgname-$pkgver-gcc43.patch" -) +url="http://atterer.org/jigdo/" +license=('GPL2') +depends=('db' 'wget') +makedepends=('docbook-utils' 'docbook-sgml') +source=("http://atterer.org/sites/atterer/files/2009-08/$pkgname/$pkgname-$pkgver.tar.bz2" + "00.richard_fixes.patch" + "01.hardening.patch" + "02.address_change.patch" + "03.jigdo-lite-https.patch" + "04.jigdo-lite-tmpdir.patch" + "05.jigdo-lite-grep-options.patch" + "06.jigdo-lite-store-filesPerFetch.patch") +sha512sums=('e183a2d93126935057244b9eb6bf6dadc1900cb17c36194f69e63a15d70ddfea81ce1167de5abfcdfd7507ac9fe6250a05be9d9d29392c961d44fde796158f7c' + 'a6d576aecdbba65d655e449b12dc9bf795db7db0d6aa2aa069265948c33509e633ed1936e74119539829b33e463bd2b90219cf69cd2ccaa2debd96d120a675ad' + 'cec50d1edd3f3e8d81b22069a61824b5d139e7e21dac919798630200e0610b6af43ebf17680918bd64ebb00f231ede9c5d5467d45136f4181210743c87345422' + '23bc3b1037d655c707b6fb06ad167623db11bbae66741bc9a0d1b06fcd73b8c8272b4a15808354ee38d7cc27ce37328f98b277bf12de0ab47280a975268ecc2a' + 'e7642a3369959cb77f64431608b7a4f93565fe34cd186a6a808d82fb2ed6b5e17b1a1dc71ebaf455692df2d7f09d9b0a99b03e1df417120a4d30082baba6f1af' + '6a01da354dd504e2670089d1646dcf548d2f3e840a2d7bda6e33bf7d5bda9ade70c6001c2da50805550c654a4752821ba4380b6ff43094e8336132cde94423e5' + '465dc1518dd0d966e9e245bd79900c33e37a889228921b617fd78f1a15060f3bb6d0c39a0bbdb78752d435dd74ebfefefced0847556e3388f075caf54fb41fba' + 'e7b69d0aa1be31afb5960d51d090b0bff778e678cd09b50dd2725151211288148a91eead85fba72dd0d503bb9eb054d40465050719367d2cb0e0440d70ef23e2') + +prepare() { + cd "$pkgname-$pkgver" -md5sums=('bbc1d9ac750bb34e0748f0b57157cc72' - '0133ce4fd63c872a26e1c19b627eb2db') + for patch in ../*.patch; do + if [ ! -f "$patch" ]; then + break; + else + patch -p1 -i "$patch" + fi + done +} build() { - cd $startdir/src/$pkgname-$pkgver - patch -Np1 -i ../jigdo-0.7.3-gcc43.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info - make || return 1 + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --without-gui --enable-nls --mandir=/usr/share/man + make -j1 } package() { - cd $startdir/src/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/jigdo-0.7.3-gcc43.patch b/jigdo-0.7.3-gcc43.patch deleted file mode 100644 index 07356f0233ee..000000000000 --- a/jigdo-0.7.3-gcc43.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ur jigdo-0.7.3.orig/src/compat.hh jigdo-0.7.3/src/compat.hh ---- jigdo-0.7.3.orig/src/compat.hh 2005-07-02 10:21:35.000000000 -0700 -+++ jigdo-0.7.3/src/compat.hh 2008-03-11 23:01:45.000000000 -0700 -@@ -20,6 +20,7 @@ - - #include <string> - #include <stdio.h> -+#include <stdlib.h> - #include <unistd-jigdo.h> - #include <sys/stat.h> - #include <sys/types.h> -diff -ur jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc jigdo-0.7.3/src/gtk/gtk-single-url.cc ---- jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc 2005-10-15 14:27:39.000000000 -0700 -+++ jigdo-0.7.3/src/gtk/gtk-single-url.cc 2008-03-11 23:05:48.000000000 -0700 -@@ -15,6 +15,7 @@ - - #include <time.h> - #include <errno.h> -+#include <string.h> - - #include <autoptr.hh> - #include <gtk-single-url.hh> -diff -ur jigdo-0.7.3.orig/src/gtk/jigdo.cc jigdo-0.7.3/src/gtk/jigdo.cc ---- jigdo-0.7.3.orig/src/gtk/jigdo.cc 2005-07-09 15:21:04.000000000 -0700 -+++ jigdo-0.7.3/src/gtk/jigdo.cc 2008-03-11 23:06:26.000000000 -0700 -@@ -16,6 +16,8 @@ - # include <unistd-jigdo.h> - #endif - -+#include <string.h> -+ - #include <iostream> - #include <string> - #include <vector> -diff -ur jigdo-0.7.3.orig/src/recursedir.cc jigdo-0.7.3/src/recursedir.cc ---- jigdo-0.7.3.orig/src/recursedir.cc 2006-05-14 11:23:31.000000000 -0700 -+++ jigdo-0.7.3/src/recursedir.cc 2008-03-11 23:04:21.000000000 -0700 -@@ -32,6 +32,7 @@ - #include <recursedir.hh> - - #include <iostream> -+#include <string.h> - #include <errno.h> - #include <sys/stat.h> - #include <sys/types.h> -diff -ur jigdo-0.7.3.orig/src/util/configfile.cc jigdo-0.7.3/src/util/configfile.cc ---- jigdo-0.7.3.orig/src/util/configfile.cc 2003-09-27 14:31:04.000000000 -0700 -+++ jigdo-0.7.3/src/util/configfile.cc 2008-03-11 23:05:00.000000000 -0700 -@@ -19,6 +19,8 @@ - #include <iostream> - #include <fstream> - -+#include <string.h> -+ - #include <configfile.hh> - #include <string.hh> - //______________________________________________________________________ -diff -ur jigdo-0.7.3.orig/src/util/md5sum.hh jigdo-0.7.3/src/util/md5sum.hh ---- jigdo-0.7.3.orig/src/util/md5sum.hh 2005-04-09 16:09:52.000000000 -0700 -+++ jigdo-0.7.3/src/util/md5sum.hh 2008-03-11 23:07:04.000000000 -0700 -@@ -28,6 +28,8 @@ - - #include <config.h> - -+#include <string.h> -+ - #include <cstdlib> - #include <iosfwd> - #include <string> -diff -ur jigdo-0.7.3.orig/src/util/string-utf.cc jigdo-0.7.3/src/util/string-utf.cc ---- jigdo-0.7.3.orig/src/util/string-utf.cc 2004-09-11 16:26:30.000000000 -0700 -+++ jigdo-0.7.3/src/util/string-utf.cc 2008-03-11 23:07:43.000000000 -0700 -@@ -15,6 +15,7 @@ - #include <glib.h> - #include <stdarg.h> - #include <stdio.h> -+#include <string.h> - - #include <debug.hh> - #include <string-utf.hh> |