josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do not try to feed GPG keybox database version 1 files to apt (closes: #845963)

Browse source
This commit is contained in:
Johannes Schauer 2016-12-03 16:16:03 +01:00 committed by Johannes 'josch' Schauer
parent ea21dd0f87
commit 5c106953dc
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -8,6 +8,8 @@ multistrap (2.2.2) UNRELEASED; urgency=medium
* Switch debian/rules to dh and drop cdbs * Switch debian/rules to dh and drop cdbs
* Use dh_bash-completion to install bash completion script into the right * Use dh_bash-completion to install bash completion script into the right
location (fixes lintian warning about deprecated /etc/bash_completion.d/) location (fixes lintian warning about deprecated /etc/bash_completion.d/)
* Do not try to feed GPG keybox database version 1 files to apt (closes:
#845963)
-- Johannes Schauer <josch@debian.org> Fri, 02 Dec 2016 23:25:07 +0100 -- Johannes Schauer <josch@debian.org> Fri, 02 Dec 2016 23:25:07 +0100

14
multistrap
View file

@ -24,6 +24,7 @@ use File::Basename;
use Parse::Debian::Packages; use Parse::Debian::Packages;
use POSIX qw(locale_h); use POSIX qw(locale_h);
use Locale::gettext; use Locale::gettext;
use File::Copy;
use vars qw/ $progname $ourversion $dstrap $extra @aptsources use vars qw/ $progname $ourversion $dstrap $extra @aptsources
$deb $cachedir $config_str %packages $retval $str $retries $deb $cachedir $config_str %packages $retval $str $retries
@ -316,21 +317,10 @@ if ((defined $k) and (not defined $noauth)) {
} }
foreach my $gpg (@files) { foreach my $gpg (@files) {
next if ($gpg =~ /removed/); next if ($gpg =~ /removed/);
$retval = system ("gpg --no-default-keyring ". File::Copy::copy "${xdir}/usr/share/keyrings/${gpg}", "${dir}${etcdir}trusted.gpg.d/";
"--homedir=${dir}/etc/apt/trusted.gpg.d/ ".
"--keyring=multistrap.gpg ".
" --import ${xdir}/usr/share/keyrings/${gpg} 2>/dev/null");
$retval >>= 8;
die (_g("Secure Apt handling failed - try without authentication."))
if ($retval != 0);
} }
system ("rm -rf ${xdir}"); system ("rm -rf ${xdir}");
} }
if (-f "${dir}/etc/apt/trusted.gpg.d/multistrap.gpg") {
system_fatal ("cp ${dir}/etc/apt/trusted.gpg.d/multistrap.gpg ${dir}/etc/apt/trusted.gpg.d/trustdb.gpg");
} else {
die (_g("Secure Apt handling failed - try without authentication.")."\n");
}
} }
$pre_config_str = ''; $pre_config_str = '';