Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package apt-mirror
apt-mirror 0.5.4 is a very small bug-fix release for stretch. It fixes
the warning about the use of uninitialized value $config{"options"}
(which hits most users).
unblock apt-mirror/0.5.4-1
--
Benjamin Drung
System Developer
Debian & Ubuntu Developer
ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin
Email: benjamin.dr...@profitbricks.com
Web: https://www.profitbricks.com
Sitz der Gesellschaft: Berlin.
Registergericht: Amtsgericht Charlottenburg, HRB 125506B.
Geschäftsführer: Achim Weiss.
diff -Nru apt-mirror-0.5.3/apt-mirror apt-mirror-0.5.4/apt-mirror
--- apt-mirror-0.5.3/apt-mirror 2017-01-06 17:26:55.000000000 +0100
+++ apt-mirror-0.5.4/apt-mirror 2017-05-29 13:28:34.000000000 +0200
@@ -294,7 +294,7 @@
if ( $line =~ $pattern_deb_line ) {
$config{'type'} = $+{type};
$config{'arch'} = $+{arch};
- $config{'options'} = $+{options};
+ $config{'options'} = $+{options} ? $+{options} : "";
$config{'uri'} = $+{uri};
$config{'components'} = $+{components};
if ( $config{'options'} =~ /arch=((?<arch>[\w\-]+)[,]*)/g ) {
@@ -666,7 +666,7 @@
if ( @parts == 3 )
{
my ( $sha1, $size, $filename ) = @parts;
- if ( $filename =~
m{^$component/dep11/(Components-${arch}\.yml|icons-[^./]+\.tar)\.gz$} )
+ if ( $filename =~
m{^$component/dep11/(Components-${arch}\.yml|icons-[^./]+\.tar)\.(gz|bz2|xz)$} )
{
add_url_to_download( $dist_uri . $filename, $size );
}
@@ -729,6 +729,8 @@
open FILES_ALL, ">" . get_variable("var_path") . "/ALL" or die("apt-mirror:
can't write to intermediate file (ALL)");
open FILES_NEW, ">" . get_variable("var_path") . "/NEW" or die("apt-mirror:
can't write to intermediate file (NEW)");
open FILES_MD5, ">" . get_variable("var_path") . "/MD5" or die("apt-mirror:
can't write to intermediate file (MD5)");
+open FILES_SHA1, ">" . get_variable("var_path") . "/SHA1" or die("apt-mirror:
can't write to intermediate file (SHA1)");
+open FILES_SHA256, ">" . get_variable("var_path") . "/SHA256" or
die("apt-mirror: can't write to intermediate file (SHA256)");
my %stat_cache = ();
@@ -813,7 +815,9 @@
{ # Packages index
$skipclean{ remove_double_slashes( $path . "/" .
$lines{"Filename:"} ) } = 1;
print FILES_ALL remove_double_slashes( $path . "/" .
$lines{"Filename:"} ) . "\n";
- print FILES_MD5 $lines{"MD5sum:"} . " " . remove_double_slashes(
$path . "/" . $lines{"Filename:"} ) . "\n";
+ print FILES_MD5 $lines{"MD5sum:"} . " " . remove_double_slashes(
$path . "/" . $lines{"Filename:"} ) . "\n" if defined $lines{"MD5sum:"};
+ print FILES_SHA1 $lines{"SHA1:"} . " " . remove_double_slashes(
$path . "/" . $lines{"Filename:"} ) . "\n" if defined $lines{"SHA1:"};
+ print FILES_SHA256 $lines{"SHA256:"} . " " .
remove_double_slashes( $path . "/" . $lines{"Filename:"} ) . "\n" if defined
$lines{"SHA256:"};
if ( need_update( $mirror . "/" . $lines{"Filename:"},
$lines{"Size:"} ) )
{
print FILES_NEW remove_double_slashes( $uri . "/" .
$lines{"Filename:"} ) . "\n";
@@ -887,6 +891,8 @@
close FILES_ALL;
close FILES_NEW;
close FILES_MD5;
+close FILES_SHA1;
+close FILES_SHA256;
######################################################################################
## Main download
diff -Nru apt-mirror-0.5.3/CHANGELOG apt-mirror-0.5.4/CHANGELOG
--- apt-mirror-0.5.3/CHANGELOG 2017-01-06 17:36:37.000000000 +0100
+++ apt-mirror-0.5.4/CHANGELOG 2017-05-29 13:38:52.000000000 +0200
@@ -1,3 +1,11 @@
+0.5.4 (2017-05-29)
+ * Add limit_rate to example mirror.list (fixes #72)
+ * Fix use of uninitialized value $config{"options"} warning (fixes #68,
+ Debian bug #851979, #859601)
+ * Fix warning on repository without md5sum (fixes #66)
+ * Write SHA1 and SHA256 in addition to MD5
+ * Also download xz-compressed Components-$arch.yml.xz (fixes #69)
+
0.5.3 (2017-01-06)
* Add support for 'deb [arch=amd64] ...' format (fixes #32, #65)
* Create directories including their parents
diff -Nru apt-mirror-0.5.3/debian/changelog apt-mirror-0.5.4/debian/changelog
--- apt-mirror-0.5.3/debian/changelog 2017-01-06 17:46:06.000000000 +0100
+++ apt-mirror-0.5.4/debian/changelog 2017-05-29 14:02:33.000000000 +0200
@@ -1,3 +1,14 @@
+apt-mirror (0.5.4-1) unstable; urgency=medium
+
+ * New upstream bug-fix release.
+ - Fix use of uninitialized value $config{"options"} warning
+ (Closes: #851979, #859601)
+ - Fix warning on repository without md5sum
+ - Write SHA1 and SHA256 in addition to MD5
+ - Also download xz-compressed Components-$arch.yml.xz
+
+ -- Benjamin Drung <bdr...@debian.org> Mon, 29 May 2017 14:02:33 +0200
+
apt-mirror (0.5.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru apt-mirror-0.5.3/Makefile apt-mirror-0.5.4/Makefile
--- apt-mirror-0.5.3/Makefile 2017-01-06 17:35:25.000000000 +0100
+++ apt-mirror-0.5.4/Makefile 2017-05-29 12:17:41.000000000 +0200
@@ -1,4 +1,4 @@
-VERSION := 0.5.3
+VERSION := 0.5.4
DIST := apt-mirror CHANGELOG LICENSE Makefile mirror.list postmirror.sh
README.md .perltidyrc
BASE_PATH := /var/spool/apt-mirror
PREFIX ?= /usr/local
diff -Nru apt-mirror-0.5.3/mirror.list apt-mirror-0.5.4/mirror.list
--- apt-mirror-0.5.3/mirror.list 2014-06-24 10:28:42.000000000 +0200
+++ apt-mirror-0.5.4/mirror.list 2017-04-13 18:56:00.000000000 +0200
@@ -6,6 +6,7 @@
set defaultarch i386
set run_postmirror 0
set nthreads 20
+set limit_rate 100m
set _tilde 0
# Use --unlink with wget (for use with hardlinked directories)
set unlink 1
