Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change a load of http URLs to use https instead

This commit is contained in:
Steve McIntyre 2019-07-05 18:26:43 +01:00
parent 2d3038bff7
commit 389917c003
13 changed files with 118 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONF.sh
View File

@ -91,7 +91,7 @@ export DEBVERSION="10.0.0"
# Official or non-official set. # Official or non-official set.
# NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE # NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
# ON THE OFFICIAL DEBIAN CD WEBSITE http://cdimage.debian.org # ON THE OFFICIAL DEBIAN CD WEBSITE https://cdimage.debian.org
export OFFICIAL="Unofficial" export OFFICIAL="Unofficial"
#export OFFICIAL="Official" #export OFFICIAL="Official"
#export OFFICIAL="Official Beta" #export OFFICIAL="Official Beta"
@ -273,7 +273,7 @@ export IMAGESUMS=1
# sources) available somewhere, list it here so that README.source # sources) available somewhere, list it here so that README.source
# can point to it. Note that your mirror must have repositories of # can point to it. Note that your mirror must have repositories of
# source packages if you enable this option. # source packages if you enable this option.
# export ARCHIVE_EXTRACTED_SOURCES="http://cdimage.debian.org/cdimage/cd-sources/" # export ARCHIVE_EXTRACTED_SOURCES="https://cdimage.debian.org/cdimage/cd-sources/"
# Produce iso/jigdo files: specify how many iso/jigdo files should be # Produce iso/jigdo files: specify how many iso/jigdo files should be
# produced in your set. If not set or when the value is "ALL" they will # produced in your set. If not set or when the value is "ALL" they will
@ -308,7 +308,7 @@ export IMAGESUMS=1
# The included files are used to provide an up-to-date list of Debian # The included files are used to provide an up-to-date list of Debian
# mirrors to the jigdo _GUI_application_ (_jigdo-lite_ doesn't support # mirrors to the jigdo _GUI_application_ (_jigdo-lite_ doesn't support
# "[Include ...]"). # "[Include ...]").
export JIGDOINCLUDEURLS="http://cdimage.debian.org/debian-cd/debian-servers.jigdo" export JIGDOINCLUDEURLS="https://cdimage.debian.org/debian-cd/debian-servers.jigdo"
# #
# $JIGDOTEMPLATEURL and $JIGDOINCLUDEURLS are passed to # $JIGDOTEMPLATEURL and $JIGDOINCLUDEURLS are passed to
# "tools/jigdo_header", which is used by default to generate the # "tools/jigdo_header", which is used by default to generate the
@ -320,7 +320,7 @@ export JIGDOINCLUDEURLS="http://cdimage.debian.org/debian-cd/debian-servers.jigd
# A couple of things used only by publish_cds, so it can tweak the # A couple of things used only by publish_cds, so it can tweak the
# jigdo files, and knows where to put the results. # jigdo files, and knows where to put the results.
# You need to run publish_cds manually, it is not run by the Makefile. # You need to run publish_cds manually, it is not run by the Makefile.
export PUBLISH_URL="http://cdimage.debian.org/jigdo-area" export PUBLISH_URL="https://cdimage.debian.org/jigdo-area"
export PUBLISH_PATH="/home/jigdo-area/" export PUBLISH_PATH="/home/jigdo-area/"
# Specify files and directories to *exclude* from jigdo processing. These # Specify files and directories to *exclude* from jigdo processing. These
@ -349,7 +349,7 @@ done
# Base link for snapshot.debian.org or similar # Base link for snapshot.debian.org or similar
# "SNAPDATETIME" will be replaced at runtime with the correct data # "SNAPDATETIME" will be replaced at runtime with the correct data
# Leave this unset to not add this entry # Leave this unset to not add this entry
export SNAPURL=Debian=http://snapshot.debian.org/archive/debian/SNAPDATETIME/ export SNAPURL=Debian=https://snapshot.debian.org/archive/debian/SNAPDATETIME/
# File with list of packages to include when fetching modules for the # File with list of packages to include when fetching modules for the
# first stage installer (debian-installer). One package per line. # first stage installer (debian-installer). One package per line.
@ -402,7 +402,7 @@ export SNAPURL=Debian=http://snapshot.debian.org/archive/debian/SNAPDATETIME/
export OMIT_RELEASE_NOTES=1 export OMIT_RELEASE_NOTES=1
# Set this to override the default location # Set this to override the default location
#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME" #export RELEASE_NOTES_LOCATION="https://www.debian.org/releases/$CODENAME"
# Set to 1 to not include the doc/tools directories on CD1 # Set to 1 to not include the doc/tools directories on CD1
# Useful to save space and avoids failures if you have a mirror # Useful to save space and avoids failures if you have a mirror

2
Makefile
View File

@ -387,7 +387,7 @@ $(BDIR)/rawlist:
# Dirty workaround for saving space, we add some hints to break ties. # Dirty workaround for saving space, we add some hints to break ties.
# This is just a temporal solution, sort_deps should be a little bit less # This is just a temporal solution, sort_deps should be a little bit less
# silly so that this is not needed. For more info have a look at # silly so that this is not needed. For more info have a look at
# http://lists.debian.org/debian-cd/2004/debian-cd-200404/msg00093.html # https://lists.debian.org/debian-cd/2004/debian-cd-200404/msg00093.html
$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \ $(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
if [ "$(INSTALLER_CD)"x = "1"x ] ; then \ if [ "$(INSTALLER_CD)"x = "1"x ] ; then \
: ; \ : ; \

6
README
View File

@ -2,7 +2,7 @@ debian-cd
========= =========
Copyright 1999-2001 Raphaël Hertzog <hertzog@debian.org> and others, Copyright 1999-2001 Raphaël Hertzog <hertzog@debian.org> and others,
2004-2010 Steve McIntyre <steve@einval.com> 2004-2019 Steve McIntyre <steve@einval.com>
This set of tools is licensed under the General Public License version This set of tools is licensed under the General Public License version
2 or any later version. You can find it in 2 or any later version. You can find it in
/usr/share/common-licenses/GPL on a Debian GNU system. /usr/share/common-licenses/GPL on a Debian GNU system.
@ -266,7 +266,7 @@ Jigdo
----- -----
You may also want to make the CD images available in jigdo format. You may also want to make the CD images available in jigdo format.
Jigsaw Download, the successor to the Pseudo-Image Kit. Jigsaw Download, the successor to the Pseudo-Image Kit.
See http://www.debian.org/CD/jigdo-cd/ for more information on jigdo. See https://www.debian.org/CD/jigdo-cd/ for more information on jigdo.
Set the DOJIGDO and related variables in CONF.sh. This is no separate target Set the DOJIGDO and related variables in CONF.sh. This is no separate target
for jigdo, merely a modification of the "images" targets. You can choose for jigdo, merely a modification of the "images" targets. You can choose
@ -332,4 +332,4 @@ images. Don't use it for ISO images that will used by many users.
Note that you will also need a patched mkhybrid that does support the Note that you will also need a patched mkhybrid that does support the
-F option. Have a look here about it : -F option. Have a look here about it :
http://www.chiark.greenend.org.uk/~stevem/DebianCD/ https://www.chiark.greenend.org.uk/~stevem/DebianCD/

64
data/buster/README.html.in
View File

@ -15,7 +15,7 @@
<body id="readme"> <body id="readme">
<!-- The HTML and TEXT file are NOT the actual source code. --> <!-- The HTML and TEXT file are NOT the actual source code. -->
<!-- For that, see http://svn.debian.org/wsvn/debian-cd --> <!-- For that, see https://salsa.debian.org/images-team/debian-cd -->
#if 0 #if 0
If you read THIS, you're viewing the actual source file ;-) If you read THIS, you're viewing the actual source file ;-)
#endif #endif
@ -44,7 +44,7 @@
#if OUTPUThtml #if OUTPUThtml
<div id="upperheader"> <div id="upperheader">
<div id="logo"> <div id="logo">
<a href="http://www.debian.org/" title="www.debian.org"><img <a href="https://www.debian.org/" title="www.debian.org"><img
src="pics/openlogo-nd-50.png" width="70" height="120" src="pics/openlogo-nd-50.png" width="70" height="120"
alt="www.debian.org" /></a> alt="www.debian.org" /></a>
</div><!-- end logo --> </div><!-- end logo -->
@ -78,11 +78,11 @@
#else #else
<p>This is one disc in a set containing the <p>This is one disc in a set containing the
#endif #endif
<a href="http://www.debian.org/">Debian DEBIAN_KERNEL</a> distribution. <a href="https://www.debian.org/">Debian DEBIAN_KERNEL</a> distribution.
Debian is a very extensive collection of software. But it Debian is a very extensive collection of software. But it
is more. It is a complete Operating System (OS) for your is more. It is a complete Operating System (OS) for your
computer. And it is <a href= computer. And it is <a href=
"http://www.debian.org/intro/free">free</a> (as in "https://www.debian.org/intro/free">free</a> (as in
&ldquo;freedom&rdquo;).</p> &ldquo;freedom&rdquo;).</p>
</div> </div>
</div> </div>
@ -122,23 +122,23 @@
the kernel. The kernel is the most fundamental program on the the kernel. The kernel is the most fundamental program on the
computer, which does all the basic housekeeping and lets you start computer, which does all the basic housekeeping and lets you start
other programs. Debian is kernel independent. It currently uses other programs. Debian is kernel independent. It currently uses
either the <a href= "http://www.linux.org/">Linux</a> either the <a href= "https://www.linux.org/">Linux</a>
or <a href="http://www.freebsd.org/">FreeBSD</a> kernel. Most of or <a href="https://www.freebsd.org/">FreeBSD</a> kernel. Most of
the basic operating system tools come from the <a href= the basic operating system tools come from the <a href=
"http://www.gnu.org/">GNU project</a>; hence the name "https://www.gnu.org/">GNU project</a>; hence the name
DEBIAN_KERNEL.</p> DEBIAN_KERNEL.</p>
<p>Debian is available for various kinds of computers <p>Debian is available for various kinds of computers
(&ldquo;architectures&rdquo;). Check the (&ldquo;architectures&rdquo;). Check the
<a href="http://www.debian.org/ports">ports</a> page for more <a href="https://www.debian.org/ports">ports</a> page for more
information.</p> information.</p>
#if OUTPUTtext #if OUTPUTtext
<p>Read more at:<br />&nbsp;</br /> <p>Read more at:<br />&nbsp;</br />
&nbsp; http://www.debian.org/intro/about</p> &nbsp; https://www.debian.org/intro/about</p>
#endif #endif
#if OUTPUThtml #if OUTPUThtml
<p><a href="http://www.debian.org/intro/about">Read more...</a></p> <p><a href="https://www.debian.org/intro/about">Read more...</a></p>
#endif #endif
<h2 id="thisdisc"> <h2 id="thisdisc">
@ -185,7 +185,7 @@
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
# if OMIT_RELEASE_NOTES # if OMIT_RELEASE_NOTES
<p>The Release Notes for "buster" are available on the <p>The Release Notes for "buster" are available on the
<a href="http://www.debian.org/releases/buster/releasenotes">Debian web <a href="https://www.debian.org/releases/buster/releasenotes">Debian web
site</a>.</p> site</a>.</p>
# else # else
# if DISKNUM == 1 # if DISKNUM == 1
@ -193,7 +193,7 @@
in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in
several languages. Additional translations and updated versions for several languages. Additional translations and updated versions for
the Release Notes may be available from the the Release Notes may be available from the
<a href="http://www.debian.org/releases/buster/releasenotes">Debian web <a href="https://www.debian.org/releases/buster/releasenotes">Debian web
site</a>.</p> site</a>.</p>
# else # else
<p>See the first disc in this set for the "buster" Release Notes.</p> <p>See the first disc in this set for the "buster" Release Notes.</p>
@ -210,7 +210,7 @@
<p>This disc includes non-free firmware to make installation <p>This disc includes non-free firmware to make installation
easier on some systems requiring proprietary but easier on some systems requiring proprietary but
redistributable firmware. See redistributable firmware. See
<a href="http://wiki.debian.org/Firmware">http://wiki.debian.org/Firmware</a> <a href="https://wiki.debian.org/Firmware">https://wiki.debian.org/Firmware</a>
for more details.</p> for more details.</p>
@ -236,7 +236,7 @@
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
# if OMIT_MANUAL # if OMIT_MANUAL
<p>An <b>Installation Guide</b> for this disc is available from <p>An <b>Installation Guide</b> for this disc is available from
<a href="http://www.debian.org/releases/buster/installmanual">the <a href="https://www.debian.org/releases/buster/installmanual">the
Debian web site</a>.</p> Debian web site</a>.</p>
# else # else
<p>An <b>Installation Guide</b> is included on this disc at <p>An <b>Installation Guide</b> is included on this disc at
@ -249,15 +249,15 @@
<p>Note: additional translations, other formats (like PDF and TXT) and <p>Note: additional translations, other formats (like PDF and TXT) and
updated versions for the Installation Guide are available from updated versions for the Installation Guide are available from
<a href="http://www.debian.org/releases/buster/installmanual">the Debian web site</a>. <a href="https://www.debian.org/releases/buster/installmanual">the Debian web site</a>.
</p> </p>
# endif # endif
# else # else
<p>As this is not an official buster release disc, then the <p>As this is not an official buster release disc, then the
installation guide many not be released yet. It will appear on <a installation guide many not be released yet. It will appear on <a
href="http://www.debian.org/releases/buster/installmanual">the href="https://www.debian.org/releases/buster/installmanual">the
Debian web site</a> when ready, but before then you could try <a Debian web site</a> when ready, but before then you could try <a
href="http://d-i.alioth.debian.org/manual/">the development href="https://d-i.alioth.debian.org/manual/">the development
version of the manual</a>. version of the manual</a>.
</p> </p>
# endif # endif
@ -299,12 +299,12 @@
development version of the Debian system. This means that all sorts of development version of the Debian system. This means that all sorts of
bugs may be present anywhere in the system. Please report any bugs you bugs may be present anywhere in the system. Please report any bugs you
find in the Debian Bug Tracking System; details at <a find in the Debian Bug Tracking System; details at <a
href="http://bugs.debian.org/">bugs.debian.org</a>.</li> href="https://bugs.debian.org/">bugs.debian.org</a>.</li>
#endif #endif
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
<li>This is an official release of the Debian system. Please report any <li>This is an official release of the Debian system. Please report any
bugs you find in the Debian Bug Tracking System; details at <A bugs you find in the Debian Bug Tracking System; details at <A
HREF="http://bugs.debian.org/">bugs.debian.org</A>. HREF="https://bugs.debian.org/">bugs.debian.org</A>.
#endif #endif
<li>If you're reporting bugs against this disc or the installation <li>If you're reporting bugs against this disc or the installation
system, please also mention the version of this disc; this can be found system, please also mention the version of this disc; this can be found
@ -366,7 +366,7 @@
#ifdef OUTPUTtext #ifdef OUTPUTtext
&nbsp; &nbsp;
#endif #endif
<a href="http://www.debian.org/CD/">http://www.debian.org/CD/</a> <a href="https://www.debian.org/CD/">https://www.debian.org/CD/</a>
</p> </p>
#endif #endif
@ -434,37 +434,37 @@
<ul> <ul>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/ https://www.debian.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.debian.org/">The Debian homepage</a> <a href="https://www.debian.org/">The Debian homepage</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/doc/ https://www.debian.org/doc/
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.debian.org/doc/">Debian Documentation</a> <a href="https://www.debian.org/doc/">Debian Documentation</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/support/&nbsp; https://www.debian.org/support/&nbsp;
#endif #endif
<a href="http://www.debian.org/support">Debian User Support</a> <a href="https://www.debian.org/support">Debian User Support</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.tldp.org/ https://www.tldp.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.tldp.org/">The Linux Documentation Project</a> <a href="https://www.tldp.org/">The Linux Documentation Project</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.linux.org/ https://www.linux.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.linux.org/">General Linux homepage</a> <a href="https://www.linux.org/">General Linux homepage</a>
</li> </li>
</ul> </ul>
@ -480,9 +480,9 @@
<p> <p>
#endif #endif
See the Debian <a href= See the Debian <a href=
"http://www.debian.org/contact">contact page</a> "https://www.debian.org/contact">contact page</a>
#if OUTPUTtext #if OUTPUTtext
(http://www.debian.org/contact) (https://www.debian.org/contact)
#endif #endif
for information on contacting us.</p> for information on contacting us.</p>
</div> </div>

62
data/jessie/README.html.in
View File

@ -44,7 +44,7 @@
#if OUTPUThtml #if OUTPUThtml
<div id="upperheader"> <div id="upperheader">
<div id="logo"> <div id="logo">
<a href="http://www.debian.org/" title="www.debian.org"><img <a href="https://www.debian.org/" title="www.debian.org"><img
src="pics/openlogo-nd-50.png" width="70" height="120" src="pics/openlogo-nd-50.png" width="70" height="120"
alt="www.debian.org" /></a> alt="www.debian.org" /></a>
</div><!-- end logo --> </div><!-- end logo -->
@ -78,11 +78,11 @@
#else #else
<p>This is one disc in a set containing the <p>This is one disc in a set containing the
#endif #endif
<a href="http://www.debian.org/">Debian DEBIAN_KERNEL</a> distribution. <a href="https://www.debian.org/">Debian DEBIAN_KERNEL</a> distribution.
Debian is a very extensive collection of software. But it Debian is a very extensive collection of software. But it
is more. It is a complete Operating System (OS) for your is more. It is a complete Operating System (OS) for your
computer. And it is <a href= computer. And it is <a href=
"http://www.debian.org/intro/free">free</a> (as in "https://www.debian.org/intro/free">free</a> (as in
&ldquo;freedom&rdquo;).</p> &ldquo;freedom&rdquo;).</p>
</div> </div>
</div> </div>
@ -122,25 +122,25 @@
the kernel. The kernel is the most fundamental program on the the kernel. The kernel is the most fundamental program on the
computer, which does all the basic housekeeping and lets you start computer, which does all the basic housekeeping and lets you start
other programs. Debian is kernel independent. It currently uses other programs. Debian is kernel independent. It currently uses
either the <a href= "http://www.linux.org/">Linux</a> either the <a href= "https://www.linux.org/">Linux</a>
or <a href="http://www.freebsd.org/">FreeBSD</a> kernel. Most of or <a href="https://www.freebsd.org/">FreeBSD</a> kernel. Most of
the basic operating system tools come from the <a href= the basic operating system tools come from the <a href=
"http://www.gnu.org/">GNU project</a>; hence the name "https://www.gnu.org/">GNU project</a>; hence the name
DEBIAN_KERNEL.</p> DEBIAN_KERNEL.</p>
<p>Debian is available for various kinds of computers <p>Debian is available for various kinds of computers
(&ldquo;architectures&rdquo;), like &ldquo;IBM-compatible&rdquo; PCs (<em>i386</em>), (&ldquo;architectures&rdquo;), like &ldquo;IBM-compatible&rdquo; PCs (<em>i386</em>),
Compaq's <em>Alpha</em>, Sun's <em>Sparc</em>, Motorola/IBM's Compaq's <em>Alpha</em>, Sun's <em>Sparc</em>, Motorola/IBM's
<em>PowerPC</em>, and <em>(Strong)ARM</em> processors. Check the <em>PowerPC</em>, and <em>(Strong)ARM</em> processors. Check the
<a href="http://www.debian.org/ports">ports</a> page for more <a href="https://www.debian.org/ports">ports</a> page for more
information.</p> information.</p>
#if OUTPUTtext #if OUTPUTtext
<p>Read more at:<br />&nbsp;</br /> <p>Read more at:<br />&nbsp;</br />
&nbsp; http://www.debian.org/intro/about</p> &nbsp; https://www.debian.org/intro/about</p>
#endif #endif
#if OUTPUThtml #if OUTPUThtml
<p><a href="http://www.debian.org/intro/about">Read more...</a></p> <p><a href="https://www.debian.org/intro/about">Read more...</a></p>
#endif #endif
<h2 id="thisdisc"> <h2 id="thisdisc">
@ -187,7 +187,7 @@
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
# if OMIT_RELEASE_NOTES # if OMIT_RELEASE_NOTES
<p>The Release Notes for "jessie" are available on the <p>The Release Notes for "jessie" are available on the
<a href="http://www.debian.org/releases/jessie/releasenotes">Debian web <a href="https://www.debian.org/releases/jessie/releasenotes">Debian web
site</a>.</p> site</a>.</p>
# else # else
# if DISKNUM == 1 # if DISKNUM == 1
@ -195,7 +195,7 @@
in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in
several languages. Additional translations and updated versions for several languages. Additional translations and updated versions for
the Release Notes may be available from the the Release Notes may be available from the
<a href="http://www.debian.org/releases/jessie/releasenotes">Debian web <a href="https://www.debian.org/releases/jessie/releasenotes">Debian web
site</a>.</p> site</a>.</p>
# else # else
<p>See the first disc in this set for the "jessie" Release Notes.</p> <p>See the first disc in this set for the "jessie" Release Notes.</p>
@ -212,7 +212,7 @@
<p>This disc includes non-free firmware to make installation <p>This disc includes non-free firmware to make installation
easier on some systems requiring proprietary but easier on some systems requiring proprietary but
redistributable firmware. See redistributable firmware. See
<a href="http://wiki.debian.org/Firmware">http://wiki.debian.org/Firmware</a> <a href="https://wiki.debian.org/Firmware">https://wiki.debian.org/Firmware</a>
for more details.</p> for more details.</p>
@ -238,7 +238,7 @@
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
# if OMIT_MANUAL # if OMIT_MANUAL
<p>An <b>Installation Guide</b> for this disc is available from <p>An <b>Installation Guide</b> for this disc is available from
<a href="http://www.debian.org/releases/jessie/installmanual">the <a href="https://www.debian.org/releases/jessie/installmanual">the
Debian web site</a>.</p> Debian web site</a>.</p>
# else # else
<p>An <b>Installation Guide</b> is included on this disc at <p>An <b>Installation Guide</b> is included on this disc at
@ -251,15 +251,15 @@
<p>Note: additional translations, other formats (like PDF and TXT) and <p>Note: additional translations, other formats (like PDF and TXT) and
updated versions for the Installation Guide are available from updated versions for the Installation Guide are available from
<a href="http://www.debian.org/releases/jessie/installmanual">the Debian web site</a>. <a href="https://www.debian.org/releases/jessie/installmanual">the Debian web site</a>.
</p> </p>
# endif # endif
# else # else
<p>As this is not an official jessie release disc, then the <p>As this is not an official jessie release disc, then the
installation guide many not be released yet. It will appear on <a installation guide many not be released yet. It will appear on <a
href="http://www.debian.org/releases/jessie/installmanual">the href="https://www.debian.org/releases/jessie/installmanual">the
Debian web site</a> when ready, but before then you could try <a Debian web site</a> when ready, but before then you could try <a
href="http://d-i.alioth.debian.org/manual/">the development href="https://d-i.alioth.debian.org/manual/">the development
version of the manual</a>. version of the manual</a>.
</p> </p>
# endif # endif
@ -301,12 +301,12 @@
development version of the Debian system. This means that all sorts of development version of the Debian system. This means that all sorts of
bugs may be present anywhere in the system. Please report any bugs you bugs may be present anywhere in the system. Please report any bugs you
find in the Debian Bug Tracking System; details at <a find in the Debian Bug Tracking System; details at <a
href="http://bugs.debian.org/">bugs.debian.org</a>.</li> href="https://bugs.debian.org/">bugs.debian.org</a>.</li>
#endif #endif
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
<li>This is an official release of the Debian system. Please report any <li>This is an official release of the Debian system. Please report any
bugs you find in the Debian Bug Tracking System; details at <A bugs you find in the Debian Bug Tracking System; details at <A
HREF="http://bugs.debian.org/">bugs.debian.org</A>. HREF="https://bugs.debian.org/">bugs.debian.org</A>.
#endif #endif
<li>If you're reporting bugs against this disc or the installation <li>If you're reporting bugs against this disc or the installation
system, please also mention the version of this disc; this can be found system, please also mention the version of this disc; this can be found
@ -368,7 +368,7 @@
#ifdef OUTPUTtext #ifdef OUTPUTtext
&nbsp; &nbsp;
#endif #endif
<a href="http://www.debian.org/CD/">http://www.debian.org/CD/</a> <a href="https://www.debian.org/CD/">https://www.debian.org/CD/</a>
</p> </p>
#endif #endif
@ -436,37 +436,37 @@
<ul> <ul>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/ https://www.debian.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.debian.org/">The Debian homepage</a> <a href="https://www.debian.org/">The Debian homepage</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/doc/ https://www.debian.org/doc/
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.debian.org/doc/">Debian Documentation</a> <a href="https://www.debian.org/doc/">Debian Documentation</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/support/&nbsp; https://www.debian.org/support/&nbsp;
#endif #endif
<a href="http://www.debian.org/support">Debian User Support</a> <a href="https://www.debian.org/support">Debian User Support</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.tldp.org/ https://www.tldp.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.tldp.org/">The Linux Documentation Project</a> <a href="https://www.tldp.org/">The Linux Documentation Project</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.linux.org/ https://www.linux.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.linux.org/">General Linux homepage</a> <a href="https://www.linux.org/">General Linux homepage</a>
</li> </li>
</ul> </ul>
@ -482,9 +482,9 @@
<p> <p>
#endif #endif
See the Debian <a href= See the Debian <a href=
"http://www.debian.org/contact">contact page</a> "https://www.debian.org/contact">contact page</a>
#if OUTPUTtext #if OUTPUTtext
(http://www.debian.org/contact) (https://www.debian.org/contact)
#endif #endif
for information on contacting us.</p> for information on contacting us.</p>
</div> </div>

62
data/stretch/README.html.in
View File

@ -44,7 +44,7 @@
#if OUTPUThtml #if OUTPUThtml
<div id="upperheader"> <div id="upperheader">
<div id="logo"> <div id="logo">
<a href="http://www.debian.org/" title="www.debian.org"><img <a href="https://www.debian.org/" title="www.debian.org"><img
src="pics/openlogo-nd-50.png" width="70" height="120" src="pics/openlogo-nd-50.png" width="70" height="120"
alt="www.debian.org" /></a> alt="www.debian.org" /></a>
</div><!-- end logo --> </div><!-- end logo -->
@ -78,11 +78,11 @@
#else #else
<p>This is one disc in a set containing the <p>This is one disc in a set containing the
#endif #endif
<a href="http://www.debian.org/">Debian DEBIAN_KERNEL</a> distribution. <a href="https://www.debian.org/">Debian DEBIAN_KERNEL</a> distribution.
Debian is a very extensive collection of software. But it Debian is a very extensive collection of software. But it
is more. It is a complete Operating System (OS) for your is more. It is a complete Operating System (OS) for your
computer. And it is <a href= computer. And it is <a href=
"http://www.debian.org/intro/free">free</a> (as in "https://www.debian.org/intro/free">free</a> (as in
&ldquo;freedom&rdquo;).</p> &ldquo;freedom&rdquo;).</p>
</div> </div>
</div> </div>
@ -122,23 +122,23 @@
the kernel. The kernel is the most fundamental program on the the kernel. The kernel is the most fundamental program on the
computer, which does all the basic housekeeping and lets you start computer, which does all the basic housekeeping and lets you start
other programs. Debian is kernel independent. It currently uses other programs. Debian is kernel independent. It currently uses
either the <a href= "http://www.linux.org/">Linux</a> either the <a href= "https://www.linux.org/">Linux</a>
or <a href="http://www.freebsd.org/">FreeBSD</a> kernel. Most of or <a href="https://www.freebsd.org/">FreeBSD</a> kernel. Most of
the basic operating system tools come from the <a href= the basic operating system tools come from the <a href=
"http://www.gnu.org/">GNU project</a>; hence the name "https://www.gnu.org/">GNU project</a>; hence the name
DEBIAN_KERNEL.</p> DEBIAN_KERNEL.</p>
<p>Debian is available for various kinds of computers <p>Debian is available for various kinds of computers
(&ldquo;architectures&rdquo;). Check the (&ldquo;architectures&rdquo;). Check the
<a href="http://www.debian.org/ports">ports</a> page for more <a href="https://www.debian.org/ports">ports</a> page for more
information.</p> information.</p>
#if OUTPUTtext #if OUTPUTtext
<p>Read more at:<br />&nbsp;</br /> <p>Read more at:<br />&nbsp;</br />
&nbsp; http://www.debian.org/intro/about</p> &nbsp; https://www.debian.org/intro/about</p>
#endif #endif
#if OUTPUThtml #if OUTPUThtml
<p><a href="http://www.debian.org/intro/about">Read more...</a></p> <p><a href="https://www.debian.org/intro/about">Read more...</a></p>
#endif #endif
<h2 id="thisdisc"> <h2 id="thisdisc">
@ -185,7 +185,7 @@
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
# if OMIT_RELEASE_NOTES # if OMIT_RELEASE_NOTES
<p>The Release Notes for "stretch" are available on the <p>The Release Notes for "stretch" are available on the
<a href="http://www.debian.org/releases/stretch/releasenotes">Debian web <a href="https://www.debian.org/releases/stretch/releasenotes">Debian web
site</a>.</p> site</a>.</p>
# else # else
# if DISKNUM == 1 # if DISKNUM == 1
@ -193,7 +193,7 @@
in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in
several languages. Additional translations and updated versions for several languages. Additional translations and updated versions for
the Release Notes may be available from the the Release Notes may be available from the
<a href="http://www.debian.org/releases/stretch/releasenotes">Debian web <a href="https://www.debian.org/releases/stretch/releasenotes">Debian web
site</a>.</p> site</a>.</p>
# else # else
<p>See the first disc in this set for the "stretch" Release Notes.</p> <p>See the first disc in this set for the "stretch" Release Notes.</p>
@ -210,7 +210,7 @@
<p>This disc includes non-free firmware to make installation <p>This disc includes non-free firmware to make installation
easier on some systems requiring proprietary but easier on some systems requiring proprietary but
redistributable firmware. See redistributable firmware. See
<a href="http://wiki.debian.org/Firmware">http://wiki.debian.org/Firmware</a> <a href="https://wiki.debian.org/Firmware">https://wiki.debian.org/Firmware</a>
for more details.</p> for more details.</p>
@ -236,7 +236,7 @@
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
# if OMIT_MANUAL # if OMIT_MANUAL
<p>An <b>Installation Guide</b> for this disc is available from <p>An <b>Installation Guide</b> for this disc is available from
<a href="http://www.debian.org/releases/stretch/installmanual">the <a href="https://www.debian.org/releases/stretch/installmanual">the
Debian web site</a>.</p> Debian web site</a>.</p>
# else # else
<p>An <b>Installation Guide</b> is included on this disc at <p>An <b>Installation Guide</b> is included on this disc at
@ -249,15 +249,15 @@
<p>Note: additional translations, other formats (like PDF and TXT) and <p>Note: additional translations, other formats (like PDF and TXT) and
updated versions for the Installation Guide are available from updated versions for the Installation Guide are available from
<a href="http://www.debian.org/releases/stretch/installmanual">the Debian web site</a>. <a href="https://www.debian.org/releases/stretch/installmanual">the Debian web site</a>.
</p> </p>
# endif # endif
# else # else
<p>As this is not an official stretch release disc, then the <p>As this is not an official stretch release disc, then the
installation guide many not be released yet. It will appear on <a installation guide many not be released yet. It will appear on <a
href="http://www.debian.org/releases/stretch/installmanual">the href="https://www.debian.org/releases/stretch/installmanual">the
Debian web site</a> when ready, but before then you could try <a Debian web site</a> when ready, but before then you could try <a
href="http://d-i.alioth.debian.org/manual/">the development href="https://d-i.alioth.debian.org/manual/">the development
version of the manual</a>. version of the manual</a>.
</p> </p>
# endif # endif
@ -299,12 +299,12 @@
development version of the Debian system. This means that all sorts of development version of the Debian system. This means that all sorts of
bugs may be present anywhere in the system. Please report any bugs you bugs may be present anywhere in the system. Please report any bugs you
find in the Debian Bug Tracking System; details at <a find in the Debian Bug Tracking System; details at <a
href="http://bugs.debian.org/">bugs.debian.org</a>.</li> href="https://bugs.debian.org/">bugs.debian.org</a>.</li>
#endif #endif
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
<li>This is an official release of the Debian system. Please report any <li>This is an official release of the Debian system. Please report any
bugs you find in the Debian Bug Tracking System; details at <A bugs you find in the Debian Bug Tracking System; details at <A
HREF="http://bugs.debian.org/">bugs.debian.org</A>. HREF="https://bugs.debian.org/">bugs.debian.org</A>.
#endif #endif
<li>If you're reporting bugs against this disc or the installation <li>If you're reporting bugs against this disc or the installation
system, please also mention the version of this disc; this can be found system, please also mention the version of this disc; this can be found
@ -366,7 +366,7 @@
#ifdef OUTPUTtext #ifdef OUTPUTtext
&nbsp; &nbsp;
#endif #endif
<a href="http://www.debian.org/CD/">http://www.debian.org/CD/</a> <a href="https://www.debian.org/CD/">https://www.debian.org/CD/</a>
</p> </p>
#endif #endif
@ -434,37 +434,37 @@
<ul> <ul>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/ https://www.debian.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.debian.org/">The Debian homepage</a> <a href="https://www.debian.org/">The Debian homepage</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/doc/ https://www.debian.org/doc/
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.debian.org/doc/">Debian Documentation</a> <a href="https://www.debian.org/doc/">Debian Documentation</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.debian.org/support/&nbsp; https://www.debian.org/support/&nbsp;
#endif #endif
<a href="http://www.debian.org/support">Debian User Support</a> <a href="https://www.debian.org/support">Debian User Support</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.tldp.org/ https://www.tldp.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.tldp.org/">The Linux Documentation Project</a> <a href="https://www.tldp.org/">The Linux Documentation Project</a>
</li> </li>
<li> <li>
#if OUTPUTtext #if OUTPUTtext
http://www.linux.org/ https://www.linux.org/
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#endif #endif
<a href="http://www.linux.org/">General Linux homepage</a> <a href="https://www.linux.org/">General Linux homepage</a>
</li> </li>
</ul> </ul>
@ -480,9 +480,9 @@
<p> <p>
#endif #endif
See the Debian <a href= See the Debian <a href=
"http://www.debian.org/contact">contact page</a> "https://www.debian.org/contact">contact page</a>
#if OUTPUTtext #if OUTPUTtext
(http://www.debian.org/contact) (https://www.debian.org/contact)
#endif #endif
for information on contacting us.</p> for information on contacting us.</p>
</div> </div>

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
debian-cd (3.1.25) UNRELEASED; urgency=medium
[ Steve McIntyre ]
* Change a load of http URLs to use https instead,
-- Steve McIntyre <93sam@debian.org> Wed, 26 Jun 2019 18:26:02 +0100
debian-cd (3.1.25) unstable; urgency=medium debian-cd (3.1.25) unstable; urgency=medium
[ Steve McIntyre ] [ Steve McIntyre ]

2
tools/buster/installtools.sh
View File

@ -4,7 +4,7 @@
set -e set -e
if [ "$RELEASE_NOTES_LOCATION"x = ""x ] ; then if [ "$RELEASE_NOTES_LOCATION"x = ""x ] ; then
export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME" export RELEASE_NOTES_LOCATION="https://www.debian.org/releases/$CODENAME"
fi fi
# The location of the tree for CD#1, passed in # The location of the tree for CD#1, passed in

2
tools/jessie/installtools.sh
View File

@ -4,7 +4,7 @@
set -e set -e
if [ "$RELEASE_NOTES_LOCATION"x = ""x ] ; then if [ "$RELEASE_NOTES_LOCATION"x = ""x ] ; then
export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME" export RELEASE_NOTES_LOCATION="https://www.debian.org/releases/$CODENAME"
fi fi
# The location of the tree for CD#1, passed in # The location of the tree for CD#1, passed in

4
tools/jigdo_cleanup
View File

@ -15,7 +15,7 @@ iso="$2" # The name to give to the .iso
dirpath="$3" # The disc build tree dirpath="$3" # The disc build tree
template="$4" # URL for .template file, can be relative URL template="$4" # URL for .template file, can be relative URL
discinfo="$5" # e.g. "Debian GNU/Linux 3.0 r1 "Woody" - Unofficial i386 Binary-1" discinfo="$5" # e.g. "Debian GNU/Linux 3.0 r1 "Woody" - Unofficial i386 Binary-1"
snapurl="$6" # URL for snapshot.d.o. e.g. http://snapshot.debian.org/archive/debian/20110630T000000Z/ snapurl="$6" # URL for snapshot.d.o. e.g. https://snapshot.debian.org/archive/debian/20110630T000000Z/
# any further parameters are fallback URLs # any further parameters are fallback URLs
info="Generated on "`date -R` info="Generated on "`date -R`
@ -42,7 +42,7 @@ mv -f $jigdo.1 $jigdo
# If some fallbacks were specified, output a servers section with the # If some fallbacks were specified, output a servers section with the
# URLs. The entries of the variable are expected to be already of the # URLs. The entries of the variable are expected to be already of the
# form "Label=http://some.url/" # form "Label=https://some.url/"
if test -n "$JIGDOFALLBACKURLS"; then if test -n "$JIGDOFALLBACKURLS"; then
for url in "$JIGDOFALLBACKURLS" for url in "$JIGDOFALLBACKURLS"
do do

2
tools/stretch/installtools.sh
View File

@ -4,7 +4,7 @@
set -e set -e
if [ "$RELEASE_NOTES_LOCATION"x = ""x ] ; then if [ "$RELEASE_NOTES_LOCATION"x = ""x ] ; then
export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME" export RELEASE_NOTES_LOCATION="https://www.debian.org/releases/$CODENAME"
fi fi
# The location of the tree for CD#1, passed in # The location of the tree for CD#1, passed in

2
tools/update_popcon
View File

@ -36,7 +36,7 @@ dl_file () {
# We've had problems in the past with download failures causing issues, # We've had problems in the past with download failures causing issues,
# so let's make sure that we get the complete file in each case # so let's make sure that we get the complete file in each case
DIST=$1 DIST=$1
SITE="http://popcon.debian.org/" SITE="https://popcon.debian.org/"
curl -L $capath -s --head $SITE/$DIST/by_inst > $TDIR/$DIST.head curl -L $capath -s --head $SITE/$DIST/by_inst > $TDIR/$DIST.head
error=$? error=$?

2
update-cd
View File

@ -43,7 +43,7 @@ CODENAME=stretch
OUT=/srv/cdbuilder.debian.org/src/deb-cd/tmp/stretch-update/cd-out OUT=/srv/cdbuilder.debian.org/src/deb-cd/tmp/stretch-update/cd-out
# Location(s) for the snapshot(s) # Location(s) for the snapshot(s)
SNAPSHOT='Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/ --try-last' SNAPSHOT='Debian=https://us.cdimage.debian.org/cdimage/snapshot/Debian/ --try-last'
# Type of disc image, cd or dvd (lower case) # Type of disc image, cd or dvd (lower case)
if [ "$1"x = ""x ] ; then if [ "$1"x = ""x ] ; then