Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Adam D. Barratt]

Control: tags -1 + pending

On Tue, 2016-11-22 at 12:58 +, Adam D. Barratt wrote:
> On 2016-11-22 12:45, Petter Reinholdtsen wrote:
> > [Adam D. Barratt]
> >> Yes, please. I've flagged the current upload for rejection. Once you
> >> receive the confirmation from dak that the rejection has been
> >> actioned, please upload the new build.
> > 
> > When I build in a fresh jessie chroot, I get this debdiff:
> 
> That looks more like what I was expecting; thanks.

Flagged for acceptance.

Regards,

Adam

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Adam D. Barratt]

On 2016-11-22 12:45, Petter Reinholdtsen wrote:

[Adam D. Barratt]

Yes, please. I've flagged the current upload for rejection. Once you
receive the confirmation from dak that the rejection has been
actioned, please upload the new build.


When I build in a fresh jessie chroot, I get this debdiff:


That looks more like what I was expecting; thanks.

Regards,

Adam

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Petter Reinholdtsen]

[Adam D. Barratt]
> Yes, please. I've flagged the current upload for rejection. Once you
> receive the confirmation from dak that the rejection has been
> actioned, please upload the new build.

When I build in a fresh jessie chroot, I get this debdiff:

% debdiff /var/cache/apt/archives/isenkram_0.18_all.deb 
isenkram_0.18+deb8u1_all.deb 
File lists identical (after any substitutions)

Control files: lines which differ (wdiff format)

Depends: [-python,-] {+python:any,+} isenkram-cli, python-gudev, 
python-gobject, python-notify, python-aptdaemon-gtk, libgnome2-perl
Installed-Size: [-64-] {+65+}
Version: [-0.18-] {+0.18+deb8u1+}
% debdiff /var/cache/apt/archives/isenkram-cli_0.18_all.deb 
isenkram-cli_0.18+deb8u1_all.deb
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-
-rw-r--r--  root/root   /usr/lib/python2.7/dist-packages/Isenkram-0.8.egg-info
-rw-r--r--  root/root   /usr/lib/python2.7/dist-packages/isenkram/__init__.py
-rw-r--r--  root/root   /usr/lib/python2.7/dist-packages/isenkram/lookup.py

Files in first .deb but not in second
-
-rw-r--r--  root/root   /usr/share/pyshared/Isenkram-0.8.egg-info
-rw-r--r--  root/root   /usr/share/pyshared/isenkram/__init__.py
-rw-r--r--  root/root   /usr/share/pyshared/isenkram/lookup.py
lrwxrwxrwx  root/root   /usr/lib/python2.6/dist-packages/Isenkram-0.8.egg-info 
-> ../../../share/pyshared/Isenkram-0.8.egg-info
lrwxrwxrwx  root/root   /usr/lib/python2.6/dist-packages/isenkram/__init__.py 
-> ../../../../share/pyshared/isenkram/__init__.py
lrwxrwxrwx  root/root   /usr/lib/python2.6/dist-packages/isenkram/lookup.py -> 
../../../../share/pyshared/isenkram/lookup.py
lrwxrwxrwx  root/root   /usr/lib/python2.7/dist-packages/Isenkram-0.8.egg-info 
-> ../../../share/pyshared/Isenkram-0.8.egg-info
lrwxrwxrwx  root/root   /usr/lib/python2.7/dist-packages/isenkram/__init__.py 
-> ../../../../share/pyshared/isenkram/__init__.py
lrwxrwxrwx  root/root   /usr/lib/python2.7/dist-packages/isenkram/lookup.py -> 
../../../../share/pyshared/isenkram/lookup.py

Control files: lines which differ (wdiff format)

Depends: debconf (>= 0.5) | debconf-2.0, python {+(>= 2.7), python+} (<< 2.8), 
[-python (>= 2.6.6-3), lsb-release-] {+lsb-release, curl+}
Installed-Size: [-1811-] {+1791+}
Version: [-0.18-] {+0.18+deb8u1+}
%

The result is uploaded.

-- 
Happy hacking
Petter Reinholdtsen

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Adam D. Barratt]

On Mon, 2016-11-21 at 20:49 +0100, Petter Reinholdtsen wrote:
> [Adam D. Barratt]
> > I'm a little confused as to how that package was built, based on the 
> > result of some of our automated checks.
> 
> I build it using debuild on my jessie laptop.

Okay.

> > Specifically, debfdiffs of the binary package show that isenkram-cli
> > has lost its prerm and postinst scripts, and there are some odd
> > changes to the package dependencies:
> 
> I have no idea what could cause these.  The isenkram-cli package have no
> postinst and postrm in the source, so those must be generated during the
> build.

Indeed. They contain calls added by dh_python, which correlates with the
other issues I mentioned.

> > I wasn't able to reproduce either set of issues when building the
> > uploaded source package in a fresh jessie chroot.
> 
> No idea what is special about my laptop. Should I rebuild in a clean
> chroot and reupload?

Yes, please. I've flagged the current upload for rejection. Once you
receive the confirmation from dak that the rejection has been actioned,
please upload the new build.

Regards,

Adam

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Petter Reinholdtsen]

[Adam D. Barratt]
> I'm a little confused as to how that package was built, based on the 
> result of some of our automated checks.

I build it using debuild on my jessie laptop.

> Specifically, debfdiffs of the binary package show that isenkram-cli
> has lost its prerm and postinst scripts, and there are some odd
> changes to the package dependencies:

I have no idea what could cause these.  The isenkram-cli package have no
postinst and postrm in the source, so those must be generated during the
build.

> I wasn't able to reproduce either set of issues when building the
> uploaded source package in a fresh jessie chroot.

No idea what is special about my laptop.  Should I rebuild in a clean
chroot and reupload?

-- 
Happy hacking
Petter Reinholdtsen

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Adam D. Barratt]

On 2016-11-20 20:03, Petter Reinholdtsen wrote:

[Jonathan Wiltshire]

Please go ahead.


Thank you.  I uploaded the new package a few minutes ago.


I'm a little confused as to how that package was built, based on the 
result of some of our automated checks.


Specifically, debfdiffs of the binary package show that isenkram-cli has 
lost its prerm and postinst scripts, and there are some odd changes to 
the package dependencies:



Control files of package isenkram: lines which differ (wdiff format)

Depends: [-python,-] isenkram-cli, python-gudev, python-gobject, 
python-notify, python-aptdaemon-gtk, libgnome2-perl

...
Control files of package isenkram-cli: lines which differ (wdiff format)

Depends: debconf (>= 0.5) | debconf-2.0, [-python (<< 2.8), python (>= 
2.6.6-3), lsb-release-] {+lsb-release, curl+}



I wasn't able to reproduce either set of issues when building the 
uploaded source package in a fresh jessie chroot.


Regards,

Adam

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Petter Reinholdtsen]

[Jonathan Wiltshire]
> Please go ahead.

Thank you.  I uploaded the new package a few minutes ago.

--
Happy hacking
Petter Reinholdtsen

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Jonathan Wiltshire]

Control: tag -1 confirmed

Hi,

On Sun, Oct 16, 2016 at 01:29:12PM +0200, Petter Reinholdtsen wrote:
> 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.

Please go ahead.

Thanks,

-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Petter Reinholdtsen]

Hi.  Did anyone have time to look at the isenkram patch for Jessie?

-- 
Happy hacking
Petter Reinholdtsen

Bug#840942: jessie-pu: package isenkram/0.18+deb8u1

[Petter Reinholdtsen]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@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   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