--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: jessie-pu: package isenkram/0.18+deb8u1
- From: Petter Reinholdtsen <pere@hungry.com>
- Date: Sun, 16 Oct 2016 13:29:12 +0200
- Message-id: <2fl4m4c7cs7.fsf@diskless.uio.no>
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Hi. Today I discovered that isenkram in Jessie no longer provide the
full set of package proposals any more. The problem was introduced when
anonscm.debian.org switched from http to https. This change exposed a
problem with the downloading code, when used via a proxy (as is done in
Debian Edu). Because of this I would like to update isenkram in Jessie.
When doing an update anyway, I believe it is a good idea to add the
missing dependency on a command line URL downloader (originally used
libwww-perl without a dependency, switched to curl to reduce the disk
footprint from dependency), and replace the default Debian mirror used
to match the code in unstable.
The change is tested in Jessie.
OK to upload?
diff --git a/debian/changelog b/debian/changelog
index c5e5209..31a5bf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+isenkram (0.18+deb8u1) jessie; urgency=medium
+
+ * Backported fix in isenkram-autoinstall-firmware to download using
+ curl and add curl as dependency for this to work.
+ * Backported change from http.debian.net to httpredir.debian.org as
+ mirror used.
+ * Backported switch to use https when downloading modaliases from
+ git. Replace urllib with urllib2 to handle https via proxies
+ (Closes: #836323).
+
+ -- Petter Reinholdtsen <pere@hungry.com> Sun, 16 Oct 2016 13:13:19 +0200
+
isenkram (0.18) unstable; urgency=low
* Adjust debian/tests/test-command-line to accept no firmware to
diff --git a/debian/control b/debian/control
index d8cb828..9a6c590 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,7 @@ Architecture: all
Depends: ${misc:Depends}
, ${python:Depends}
, lsb-release
+ , curl
Replaces: isenkram (<< 0.9+exp.1)
Breaks: isenkram (<< 0.9+exp.1)
Description: Suggest packages to install when inserting new hardware (CLI tool)
diff --git a/isenkram-autoinstall-firmware b/isenkram-autoinstall-firmware
index ebffc10..19098f5 100755
--- a/isenkram-autoinstall-firmware
+++ b/isenkram-autoinstall-firmware
@@ -12,7 +12,7 @@ if [ "n/a" = "$dist" ] ; then
dist=testing
fi
arch=$(dpkg --print-architecture)
-mirror=http://http.debian.net/debian
+mirror=http://httpredir.debian.org/debian
aptsourcelist=/etc/apt/sources.list.d/isenkram-autoinstall-firmware.list
loginfo() {
@@ -68,7 +68,7 @@ for section in "main" "contrib" "non-free"; do
url="$mirror/dists/$dist/$section/Contents-$arch.gz"
fi
loginfo "fetching $url"
- GET $url | gunzip | grep ^lib/firmware > Fw-Contents-$arch-$dist-$section
+ curl --location $url | gunzip | grep ^lib/firmware > Fw-Contents-$arch-$dist-$section
done
datafiles=""
diff --git a/isenkram/lookup.py b/isenkram/lookup.py
index 5a7dcc0..556e5ea 100644
--- a/isenkram/lookup.py
+++ b/isenkram/lookup.py
@@ -24,7 +24,7 @@ import apt
import gc
import fnmatch
import os
-import urllib
+import urllib2
import errno
pkgdir = "/usr/share/isenkram"
@@ -103,9 +103,9 @@ def pkgs_handling_extra_modaliases(modaliaslist):
Look up package-hardware mappings from svn and local file
"""
thepkgs = {}
- url = "http://anonscm.debian.org/gitweb/?p=collab-maint/isenkram.git;a=blob_plain;f=modaliases;hb=HEAD";
+ url = "https://anonscm.debian.org/cgit/collab-maint/isenkram.git/plain/modaliases";
try:
- f = urllib.urlopen(url)
+ f = urllib2.urlopen(url)
check_packages_file(thepkgs, f, modaliaslist)
except IOError, e:
if errno.ENOENT == e.errno: # Most likely lack network connection
--
Happy hacking
Petter Reinholdtsen
--- End Message ---