manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The support for FTP proxies has ended

This commit is contained in:
Roland Clobus 2021-09-08 13:29:47 +02:00
parent df79eeafaf
commit 7264a752bb
No known key found for this signature in database
GPG Key ID: 62C57C6AA61495BD
6 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/NEWS vendored
View File

@ -1,3 +1,11 @@
live-build (UNRELEASED) unstable; urgency=medium
The support for FTP proxies has ended. You are advised to use http or https
while configuring the debian package mirror, instead of ftp.
See https://salsa.debian.org/live-team/live-build/-/merge_requests/252#note_243114
-- Roland Clobus <rclobus@rclobus.nl> Wed, 8 Sep 2021 11:55:00 +0200
live-build (1:20210329) unstable; urgency=medium
The 'filesystem.size' file is no longer created and included in the image,

1
functions/configuration.sh
View File

@ -110,7 +110,6 @@ Prepare_config ()
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION_CHROOT}}"
LB_APT="${LB_APT:-apt}"
LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY}"
LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY}"
LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-true}"
LB_APT_SECURE="${LB_APT_SECURE:-true}"

6
manpages/en/lb_config.1
View File

@ -9,8 +9,6 @@
\fBlb config\fR
.br
[\fB\-\-apt\fR apt|apt-get|aptitude]
.br
[\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR]
.br
[\fB\-\-apt\-http\-proxy\fR \fIURL\fR]
.br
@ -244,8 +242,6 @@ In addition to its specific options \fBlb config\fR understands all generic live
.PP
.IP "\fB\-\-apt\fR apt|apt-get|aptitude" 4
defines if apt\-get or aptitude is used to install packages when building the image. The default is apt.
.IP "\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR" 4
sets the FTP proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by initial debootstrap, and by apt internally within the chroot. It is not used for anything else.
.IP "\fB\-\-apt\-http\-proxy\fR \fIURL\fR" 4
sets the HTTP proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by initial debootstrap, and by apt internally within the chroot. It is not used for anything else.
.IP "\fB\-\-apt\-indices\fR true|false" 4
@ -468,7 +464,7 @@ defines if win32\-loader should be included in the binary image or not.
defines whether a file for distributing the image in \fIzsync\fR(1) format will be generated. Defaults to true.
.SH ENVIRONMENT
Currently, command line switches can also be specified through the corresponding environment variable. However, this generally should not be relied upon, as it is an implementation detail that is subject to change in future releases. For options applying directly to live\-build, environment variables are named LB_FOO, meaning, e.g. \fB\-\-apt\-ftp\-proxy\fR becomes \fBLB_APT_FTP_PROXY\fR (the exception being internal options such as \fB\-\-debug\fR). For options passed to another program, as in APT_OPTIONS or GZIP_OPTIONS, no LB_ prefix is used.
Currently, command line switches can also be specified through the corresponding environment variable. However, this generally should not be relied upon, as it is an implementation detail that is subject to change in future releases. For options applying directly to live\-build, environment variables are named LB_FOO, meaning, e.g. \fB\-\-apt\-http\-proxy\fR becomes \fBLB_APT_HTTP_PROXY\fR (the exception being internal options such as \fB\-\-debug\fR). For options passed to another program, as in APT_OPTIONS or GZIP_OPTIONS, no LB_ prefix is used.
.SH FILES
.IP "\fBauto/config\fR" 4

2
scripts/build/bootstrap_debootstrap
View File

@ -86,7 +86,7 @@ then
Print_breakage
Echo_message "Running debootstrap (download-only)..."
/usr/bin/env http_proxy="${LB_APT_HTTP_PROXY}" ftp_proxy="${LB_APT_FTP_PROXY}" debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
/usr/bin/env http_proxy="${LB_APT_HTTP_PROXY}" debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
# Removing old cache
rm -f cache/packages.bootstrap/*.deb

9
scripts/build/chroot_apt
View File

@ -41,12 +41,6 @@ case "${_ACTION}" in
mkdir -p ${CONFD}
# Configuring apt ftp proxy
if [ -n "${LB_APT_FTP_PROXY}" ]
then
echo "Acquire::ftp::Proxy \"${LB_APT_FTP_PROXY}\";" > ${CONFD}/00ftp-proxy
fi
# Configuring apt http proxy
if [ -n "${LB_APT_HTTP_PROXY}" ]
then
@ -156,9 +150,6 @@ case "${_ACTION}" in
# Acquire lock file
Acquire_lockfile
# Deconfiguring aptitude ftp proxy
rm -f ${CONFD}/00ftp-proxy
# Deconfiguring aptitude http proxy
rm -f ${CONFD}/00http-proxy

11
scripts/build/config
View File

@ -17,7 +17,6 @@ set -e
# Setting static variables
DESCRIPTION="Create configuration for live-build(7)"
USAGE="${PROGRAM} [--apt apt|apt-get|aptitude]\n\
\t [--apt-ftp-proxy URL]\n\
\t [--apt-http-proxy URL]\n\
\t [--apt-indices true|false]\n\
\t [--apt-options OPTION|\"OPTIONS\"]\n\
@ -135,7 +134,7 @@ Local_arguments ()
{
local LONG_OPTIONS
LONG_OPTIONS="
apt:,apt-ftp-proxy:,apt-http-proxy:,apt-indices:,aptitude-options:,
apt:,apt-http-proxy:,apt-indices:,aptitude-options:,
apt-options:,apt-pipeline:,apt-recommends:,apt-secure:,
apt-source-archives:,architecture:,architectures:,archive-areas:,
backports:,binary-filesystem:,binary-image:,binary-images:,
@ -285,11 +284,6 @@ Local_arguments ()
shift 2
;;
--apt-ftp-proxy)
LB_APT_FTP_PROXY="${2}"
shift 2
;;
--apt-http-proxy)
LB_APT_HTTP_PROXY="${2}"
shift 2
@ -982,9 +976,6 @@ LB_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION}"
# Set package manager
LB_APT="${LB_APT}"
# Set apt/aptitude/debootstrap ftp proxy
LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY}"
# Set apt/aptitude/debootstrap http proxy
LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY}"