[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#962982: marked as done (buster-pu: package jigdo/0.7.3-5)

Your message dated Sat, 01 Aug 2020 12:51:28 +0100
with message-id <43535efb498a168cf81452ca0c326f004f46adc6.camel@adam-barratt.org.uk>
and subject line Closing bugs for fixes included in 10.5 point release
has caused the Debian Bug report #962982,
regarding buster-pu: package jigdo/0.7.3-5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
962982: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=962982
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

Hi!

I'd like to push a tiny update into buster for jigdo please. The
existing version in buster doesn't support https, and this is causing
issues for users (e.g. #962776). The changes are tiny, backported from
upstream changes already shipping in sid/bullseye.

Here's a debdiff...

diff -Nru jigdo-0.7.3/debian/changelog jigdo-0.7.3/debian/changelog
--- jigdo-0.7.3/debian/changelog	2017-12-07 16:38:20.000000000 +0000
+++ jigdo-0.7.3/debian/changelog	2020-06-16 21:54:52.000000000 +0100
@@ -1,3 +1,10 @@
+jigdo (0.7.3-5+deb10u1) buster; urgency=medium
+
+  * Backport more upstream changes to make jigdo-lite and jigdo-mirror
+    support https. Closes: #962776
+
+ -- Steve McIntyre <93sam@debian.org>  Tue, 16 Jun 2020 21:54:52 +0100
+
 jigdo (0.7.3-5) unstable; urgency=medium
 
   * Switch addresses from atterer.org to atterer.org in various places
diff -Nru jigdo-0.7.3/debian/patches/03.jigdo-lite-https.patch jigdo-0.7.3/debian/patches/03.jigdo-lite-https.patch
--- jigdo-0.7.3/debian/patches/03.jigdo-lite-https.patch	2017-12-07 15:40:56.000000000 +0000
+++ jigdo-0.7.3/debian/patches/03.jigdo-lite-https.patch	2020-06-16 21:54:52.000000000 +0100
@@ -17,3 +17,12 @@
      *) return 1;
    esac
  }
+@@ -596,7 +596,7 @@ imageDownload() {
+     for pass in x xx xxx xxxx xxxxx xxxxxx xxxxxxx xxxxxxxx; do
+       $jigdoFile print-missing-all --image="$image" --jigdo="$jigdoF" \
+         --template="$template" $jigdoOpts $uriOpts \
+-      | egrep -i '^(http:|ftp:|$)' >"$list"
++      | egrep -i '^(http:|https:|ftp:|$)' >"$list"
+       missingCount=`egrep '^$' <"$list" | wc -l | sed -e 's/ *//g'`
+       # Accumulate URLs in $@, pass them to fetchAndMerge in batches
+       shift "$#" # Solaris /bin/sh doesn't understand "set --"
diff -Nru jigdo-0.7.3/debian/patches/07.more_https_support.patch jigdo-0.7.3/debian/patches/07.more_https_support.patch
--- jigdo-0.7.3/debian/patches/07.more_https_support.patch	1970-01-01 01:00:00.000000000 +0100
+++ jigdo-0.7.3/debian/patches/07.more_https_support.patch	2020-06-16 21:54:52.000000000 +0100
@@ -0,0 +1,46 @@
+commit 53abb98c46c9ee2d298b29359f1376aea1891f88
+Author: Steve McIntyre <steve@einval.com>
+Date:   Thu Nov 7 18:16:20 2019 +0000
+
+    Make jigdo-mirror believe in https too
+
+diff --git a/scripts/jigdo-mirror b/scripts/jigdo-mirror
+index 1324f11..fb0aa3b 100644
+--- a/scripts/jigdo-mirror
++++ b/scripts/jigdo-mirror
+@@ -105,12 +105,16 @@ userAgent="jigdo-mirror/1.0 (`wget --version 2>/dev/null | (read ver; echo $ver)
+ #______________________________________________________________________
+ 
+ # isURI <string>
+-# Returns 0 (true) if the supplied string is a HTTP/FTP URL, otherwise 1
++# Returns 0 (true) if the supplied string is a HTTP/HTTPS/FTP/FILE
++# URL, otherwise 1
+ isURI() {
+-    case "$1" in
+-        http:*|ftp:*|HTTP:*|FTP:*|file:*|FILE:*) return 0;;
+-        *) return 1;
+-    esac
++  case "$1" in
++    [hH][tT][tT][pP]:*) return 0;;
++    [hH][tT][tT][pP][sS]:*) return 0;;
++    [fF][tT][pP]:*) return 0;;
++    [fF][iI][lL][eE]:*) return 0;;
++    *) return 1;
++  esac
+ }
+ #______________________________________________________________________
+ 
+@@ -193,11 +197,11 @@ makeImage() {
+     for pass in x xx xxx xxxx xxxxx xxxxxx xxxxxxx xxxxxxxx; do
+         if $havePMA; then
+             $jigdoFile print-missing-all $ijtOpts $jigdoOpts $uriOpts \
+-            | egrep -i '^(http:|ftp:|$)' >"list"
++            | egrep -i '^(https:|http:|ftp:|$)' >"list"
+         else
+             # Quick hack until jigdo-port supports print-missing-all
+             $jigdoFile print-missing $ijtOpts $jigdoOpts $uriOpts \
+-            | egrep -i '^(http:|ftp:|$)' \
++            | egrep -i '^(https:|http:|ftp:|$)' \
+             | sed -n '/./{p;s/^.*$//;p;}' >"list"
+         fi
+         missingCount=`egrep '^$' <"list" | wc -l | sed -e 's/ *//g'`
diff -Nru jigdo-0.7.3/debian/patches/series jigdo-0.7.3/debian/patches/series
--- jigdo-0.7.3/debian/patches/series	2017-12-07 16:38:20.000000000 +0000
+++ jigdo-0.7.3/debian/patches/series	2020-06-16 21:54:52.000000000 +0100
@@ -5,3 +5,4 @@
 04.jigdo-lite-tmpdir.patch
 05.jigdo-lite-grep-options.patch
 06.jigdo-lite-store-filesPerFetch.patch
+07.more_https_support.patch

-- System Information:
Debian Release: 10.4
  APT prefers stable-debug
  APT policy: (500, 'stable-debug'), (500, 'stable'), (500, 'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-9-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 10.5

Hi,

Each of these bugs relates to an update that was included in today's
stable point release.

Regards,

Adam

--- End Message ---
Reply to: