Merge tag 'debian/0.5.4-2' into pureos/crimson

apt-mirror Debian release 0.5.4-2

.gitignore

+.pc

debian/changelog

+apt-mirror (0.5.4-2) unstable; urgency=medium
+
+  [ Jelmer Vernooij ]
+  * Migrate repository from alioth to salsa.
+
+  [ Benjamin Drung ]
+  * Update Homepage URL to github.io
+  * Switch to debhelper 13
+  * Support for xz translations (Closes: #932112, #932379)
+  * Download 'cnf' Files (LP: #1825755)
+  * Bump Standards-Version to 4.6.1
+  * Set Rules-Requires-Root: no
+
+ -- Benjamin Drung <bdrung@debian.org>  Fri, 07 Oct 2022 13:04:08 +0200
+
 apt-mirror (0.5.4-1pureos2) byzantium; urgency=medium
 
   [ Chris Lamb ]
@@ -257,8 +272,8 @@ apt-mirror (0.4.4+debian-1) unstable; urgency=low
 
 apt-mirror (0.4.4-5) unstable; urgency=low
 
-  * Fixed typos in the Man page (Closes: #413795) and (Closes: #413796) 
-  * apt-mirror no longer cleans out all files with tilde in file name when 
+  * Fixed typos in the Man page (Closes: #413795) and (Closes: #413796)
+  * apt-mirror no longer cleans out all files with tilde in file name when
     clean.sh is run (Closes: #414866)
 
  -- Brandon Holtsclaw <brandon@imbrandon.com>  Mon, 23 Apr 2007 03:09:14 -0500
@@ -266,15 +281,15 @@ apt-mirror (0.4.4-5) unstable; urgency=low
 apt-mirror (0.4.4-4) unstable; urgency=low
 
   * Fixed typos in the Package Description and Man page (Closes: #385645)
-  * Added "set _tilde 0" to default config to allow proper download of 
+  * Added "set _tilde 0" to default config to allow proper download of
     mirrors with a tilde in the url or package name (Closes: #386162)
 
  -- Brandon Holtsclaw <brandon@imbrandon.com>  Thu,  7 Sep 2006 21:06:27 -0500
 
 apt-mirror (0.4.4-3) unstable; urgency=low
 
-  * Added the GPL preamble to debian/copyright 
-  * Raised debhelper compat to 5 from 3 
+  * Added the GPL preamble to debian/copyright
+  * Raised debhelper compat to 5 from 3
   * Changed download and clean.sh size calculations to return human readable output ( KiB,MiB,GiB vs bytes )
   * added clean.sh to postinstall to make it +x on install
   * Added debian/watch

debian/compat

-9

debian/control

@@ -4,9 +4,10 @@ Priority: optional
 Maintainer: PureOS Maintainers <pureos-project@lists.puri.sm>
 Uploaders: Jonas Smedegaard <jonas.smedegaard@puri.sm>
 XSBC-Original-Maintainer: Brandon Holtsclaw <me@brandonholtsclaw.com>
-Homepage: http://apt-mirror.github.com/
-Build-Depends: debhelper (>= 9), lsb-release
-Standards-Version: 3.9.8
+Homepage: https://apt-mirror.github.com/
+Build-Depends: debhelper-compat (= 13), lsb-release
+Standards-Version: 4.6.1
+Rules-Requires-Root: no
 Vcs-Browser: https://source.puri.sm/pureos/core/apt-mirror
 Vcs-Git: https://source.puri.sm/pureos/core/apt-mirror.git
 

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: apt-mirror
 Upstream-Contact: Brandon Holtsclaw <me@brandonholtsclaw.com>
 Source: https://github.com/apt-mirror/apt-mirror
@@ -11,7 +11,7 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2002-2005, Dmitry N. Hramtsov <hdn@nsu.ru>
            2006-2010, Brandon Holtsclaw <me@brandonholtsclaw.com>
-           2008-2013, Benjamin Drung <bdrung@debian.org>
+           2008-2022, Benjamin Drung <bdrung@debian.org>
 License: GPL-2+
 
 License: GPL-2+

debian/gbp.conf

+[DEFAULT]
+debian-branch = debian/unstable
+# use pristine-tar:
+pristine-tar = True
+
+[buildpackage]
+# sign release tags
+sign-tags = True
+
+[dch]
+# parse meta tags for Closes: and Thanks:
+meta = True
+# use git user.email and user.name
+git-author = True

debian/patches/Download-cnf-Files.patch

+From: Josh Braden <josbraden@gmail.com>
+Date: Mon, 29 Apr 2019 16:25:20 -0500
+Subject: Download 'cnf' Files
+
+- Mostly (completely) copied/edited from DEP-11 code
+- Downloads Commands-${arch} and Commands-${arch}.(gz|bz2|xz)
+- Fixes issue with upgrading Ubuntu 18.10 -> 19.04 via do-release-upgrade
+
+Origin: https://github.com/apt-mirror/apt-mirror/pull/120
+LP: #1825755
+---
+ apt-mirror | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 91 insertions(+)
+
+diff --git a/apt-mirror b/apt-mirror
+index 9fadc26..e3fe70b 100755
+--- a/apt-mirror
++++ b/apt-mirror
+@@ -721,6 +721,97 @@ foreach ( keys %urls_to_download )
+     $skipclean{$_} = 1;
+ }
+ 
++######################################################################################
++## cnf directory download
++
++%urls_to_download = ();
++
++sub find_cnf_files_in_release
++{
++    # Look in the dists/$DIST/Release file for the cnf files that belong
++    # to the given component and architecture.
++
++    my $dist_uri  = shift;
++    my $component = shift;
++    my $arch      = shift;
++    my ( $release_uri, $release_path, $line ) = '';
++
++    $release_uri  = $dist_uri . "Release";
++    $release_path = get_variable("skel_path") . "/" . sanitise_uri($release_uri);
++
++    unless ( open STREAM, "<$release_path" )
++    {
++        warn( "Failed to open Release file from " . $release_uri );
++        return;
++    }
++
++    my $checksums = 0;
++    while ( $line = <STREAM> )
++    {
++        chomp $line;
++        if ($checksums)
++        {
++            if ( $line =~ /^ +(.*)$/ )
++            {
++                my @parts = split( / +/, $1 );
++                if ( @parts == 3 )
++                {
++                    my ( $sha1, $size, $filename ) = @parts;
++                    if ( $filename =~ m{^$component/cnf/(Commands-${arch}(\.(gz|bz2|xz))?)$} )
++                    {
++                        add_url_to_download( $dist_uri . $filename, $size );
++                    }
++                }
++                else
++                {
++                    warn("Malformed checksum line \"$1\" in $release_uri");
++                }
++            }
++            else
++            {
++                $checksums = 0;
++            }
++        }
++        if ( not $checksums )
++        {
++            if ( $line eq "SHA256:" )
++            {
++                $checksums = 1;
++            }
++        }
++    }
++}
++
++print "Processing cnf indexes: [";
++
++foreach (@config_binaries)
++{
++    my ( $arch, $uri, $distribution, @components ) = @{$_};
++    print "C";
++    if (@components)
++    {
++        $url = $uri . "/dists/" . $distribution . "/";
++
++        my $component;
++        foreach $component (@components)
++        {
++            find_cnf_files_in_release( $url, $component, $arch );
++        }
++    }
++}
++
++print "]\n\n";
++
++push( @index_urls, sort keys %urls_to_download );
++download_urls( "cnf", sort keys %urls_to_download );
++
++foreach ( keys %urls_to_download )
++{
++    s[^(\w+)://][];
++    s[~][%7E]g if get_variable("_tilde");
++    $skipclean{$_} = 1;
++}
++
+ ######################################################################################
+ ## Main download preparations
+ 

debian/patches/Support-for-xz-translations.patch

+From: Jaejeon Lim <jaejeon_lim@tmax.co.kr>
+Date: Wed, 22 Jun 2022 13:32:12 +0900
+Subject: Support for xz translations
+
+- In the case of bullseye-security distributed by the debian security camp,
+  the extension of Translation-en file of bullseye-security is xz format.
+  (http://security.debian.org/debian-security/dists/bullseye-security/main/i18n/Translation-en.xz)
+- Accordingly, the apt-mirror script was modified to support the xz extension.
+
+Origin: upstream, https://github.com/apt-mirror/apt-mirror/pull/158
+Closes: #932112, #932379
+---
+ apt-mirror | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apt-mirror b/apt-mirror
+index effac7e..9fadc26 100755
+--- a/apt-mirror
++++ b/apt-mirror
+@@ -520,7 +520,7 @@ sub find_translation_files_in_release
+                 if ( @parts == 3 )
+                 {
+                     my ( $sha1, $size, $filename ) = @parts;
+-                    if ( $filename =~ m{^$component/i18n/Translation-[^./]*\.bz2$} )
++                    if ( $filename =~ m{^$component/i18n/Translation-[^./]*\.(bz2|xz)$} )
+                     {
+                         add_url_to_download( $dist_uri . $filename, $size );
+                     }

debian/patches/series

+Support-for-xz-translations.patch
+Download-cnf-Files.patch

debian/source/local-options

+unapply-patches