Bug#934356: stretch-pu: package mitmproxy/0.18.2-6
On 2019-08-28 12:14, Sébastien Delafond wrote: I've tried a bunch of things, essentially reusing my older pbuilder-based build setup (as opposed to the newer sbuild-based one), to no avail: I keep getting those extra upper-bound versioned dependencies in the resulting package. At this point I see two options: - build a +deb9u2 that uses debian/pydist-overrides to prevent the insertion of those extra versioned dependencies (see attached patch); with that one, the resulting dsc debdiff is minimal: I'd be OK with that; thanks for investigating. Regards, Adam
Bug#934356: stretch-pu: package mitmproxy/0.18.2-6
I've tried a bunch of things, essentially reusing my older
pbuilder-based build setup (as opposed to the newer sbuild-based one),
to no avail: I keep getting those extra upper-bound versioned
dependencies in the resulting package.
At this point I see two options:
- build a +deb9u2 that uses debian/pydist-overrides to prevent the
insertion of those extra versioned dependencies (see attached
patch); with that one, the resulting dsc debdiff is minimal:
$ debdiff mitmproxy_0.18.2-6_all.deb mitmproxy_0.18.2-6+deb9u2_all.deb
[seb hulk]
File lists identical (after any substitutions)
Control files: lines which differ (wdiff format)
Version: [-0.18.2-6-] {+0.18.2-6+deb9u2+}
- give up on fixing #934356 in the upcoming point release
What do you think ?
Cheers,
--
Seb
diff --git a/debian/changelog b/debian/changelog
index 4fcb7218..a714bb37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mitmproxy (0.18.2-6+deb9u2) stretch; urgency=medium
+
+ * Prevent insertion of unwanted upper-bound versioned dependencies
+
+ -- Sebastien Delafond Wed, 28 Aug 2019 13:04:01 +0200
+
mitmproxy (0.18.2-6+deb9u1) stretch; urgency=medium
* Blacklist tests that require internet access (Closes: #934033)
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
index 144dfb3a..49405aa3 100644
--- a/debian/pydist-overrides
+++ b/debian/pydist-overrides
@@ -1 +1,5 @@
brotlipy python-brotli
+cryptography python-cryptography (>= 1.3)
+flask python-flask (>= 0.10.1)
+pyasn1 python-pyasn1 (>= 0.1.9)
+six python-six (>= 1.10)
Bug#934356: stretch-pu: package mitmproxy/0.18.2-6
On 26/08 17:42, Adam D. Barratt wrote:
> Our tooling has highlighted a dependency issue. I've not had chance to
> check if it already existed in the earlier package, but:
>
> unsat-dependency: python-cryptography (< 1.6)
>
> stretch has python-cryptography 1.7.1
This is a regression somewhere in the build process; 0.18.2-6 in stretch
currently has (sorted alphabetically for easier reading):
Depends:
python-backports.ssl-match-hostname,
python-blinker (<< 1.5),
python-brotli (>= 0.5.1),
python-certifi,
python-click,
python-configargparse (>= 0.10),
python-construct (>= 2.5.2),
python-cryptography (>= 1.3),
python-cssutils (<< 1.1),
python-flask (>= 0.10.1),
python-h2 (>= 2.4.1),
python-hpack,
python-html2text (>= 2016.1.8),
python-hyperframe (<< 5),
python-jsbeautifier (>= 1.6.3),
python-lxml (>= 3.5.0),
python-openssl (>= 16.0),
python-passlib (>= 1.6.5),
python-pil (>= 3.2),
python-pyasn1 (>= 0.1.9),
python-pyparsing (>= 2.1.3),
python-pyperclip,
python-requests (>= 2.9.1),
python-six (>= 1.10),
python-tornado (>= 4.3),
python-typing
python-urwid (>= 1.3.1),
python-watchdog (>= 0.8.3),
python:any (<< 2.8),
python:any (>= 2.7.5-5~),
0.18.2-6+deb9u1 has:
Depends:
python-backports.ssl-match-hostname,
python-blinker (<< 1.5),
python-brotli (>= 0.5.1),
python-certifi,
python-click,
python-configargparse (>= 0.10),
python-construct (>= 2.5.2),
python-cryptography (<< 1.6),
python-cryptography (>= 1.3),
python-cssutils (<< 1.1),
python-flask (<< 0.12),
python-flask (>= 0.10.1),
python-h2 (>= 2.4.1),
python-hpack,
python-html2text (>= 2016.1.8),
python-hyperframe (<< 5),
python-jsbeautifier (>= 1.6.3),
python-lxml (>= 3.5.0),
python-openssl (>= 16.0),
python-passlib (>= 1.6.5),
python-pil (>= 3.2),
python-pyasn1 (<< 0.2),
python-pyasn1 (>= 0.1.9),
python-pyparsing (>= 2.1.3),
python-pyperclip,
python-requests (>= 2.9.1),
python-six (<< 1.11),
python-six (>= 1.10),
python-tornado (>= 4.3),
python-typing
python-urwid (>= 1.3.1),
python-watchdog (>= 0.8.3),
python:any (<< 2.8),
python:any (>= 2.7.5-5~),
At this point I'm not sure what part of the build chain is adding back
all the "python foo (<< .n.m)" (obviously during the expansion of
${python:Depends}, and by looking at setup.py), even though python-foo
is already explicitly listed in debian/control's Depends field.
Even more confusing to me right now is that the whole point of 0.18.2-6
was indeed to *remove* all those upper-bound dependencies:
- https://bugs.debian.org/848562
-
https://salsa.debian.org/debian/mitmproxy/commit/4c238cb3549b9bf5e7b01a9c287eb2428a7134d2
And obviously at the time it worked, because 0.18.6-2 is indeed
"correct".
Cheers,
--
Seb
Bug#934356: stretch-pu: package mitmproxy/0.18.2-6
On Tue, 2019-08-20 at 23:03 +0100, Adam D. Barratt wrote: > Control: tags -1 + confirmed > > On Sat, 2019-08-10 at 09:27 +0200, Sebastien Delafond wrote: > > Could 0.18.2-6+deb9u1 be included in stretch's next point release ? > > It > > closes #934033, which is an FTBFS on stretch, by blacklisting a > > couple > > #more things from the test suite. > > > > Please go ahead. Our tooling has highlighted a dependency issue. I've not had chance to check if it already existed in the earlier package, but: unsat-dependency: python-cryptography (< 1.6) stretch has python-cryptography 1.7.1 Regards, Adam
Processed: Re: Bug#934356: stretch-pu: package mitmproxy/0.18.2-6
Processing control commands: > tags -1 + confirmed Bug #934356 [release.debian.org] stretch-pu: package mitmproxy/0.18.2-6 Added tag(s) confirmed. -- 934356: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=934356 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#934356: stretch-pu: package mitmproxy/0.18.2-6
Control: tags -1 + confirmed On Sat, 2019-08-10 at 09:27 +0200, Sebastien Delafond wrote: > Could 0.18.2-6+deb9u1 be included in stretch's next point release ? > It > closes #934033, which is an FTBFS on stretch, by blacklisting a > couple > #more things from the test suite. > Please go ahead. Regards, Adam
Bug#934356: stretch-pu: package mitmproxy/0.18.2-6
Package: release.debian.org Severity: normal Tags: stretch User: release.debian@packages.debian.org Usertags: pu Could 0.18.2-6+deb9u1 be included in stretch's next point release ? It closes #934033, which is an FTBFS on stretch, by blacklisting a couple #more things from the test suite. Here's the corresponding debdiff: diff --git a/debian/changelog b/debian/changelog index 53e5f5e0..4fcb7218 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mitmproxy (0.18.2-6+deb9u1) stretch; urgency=medium + + * Blacklist tests that require internet access (Closes: #934033) + * Add d/gbp.conf + + -- Sebastien Delafond Thu, 08 Aug 2019 10:59:45 +0200 + mitmproxy (0.18.2-6) unstable; urgency=medium * Remove upper-bounds on all versioned dependencies (Closes: #848562) diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index ..cf311b7f --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +debian-branch = debian/stretch +upstream-branch = upstream/latest diff --git a/debian/rules b/debian/rules index 52e363b9..ef374ed1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f export PYBUILD_NAME=mitmproxy -export PYBUILD_TEST_ARGS="-k-TestServerIPv6 -k-TestServerCurrentCipher -k-TestServerCipherList" +export PYBUILD_TEST_ARGS="-k-TestServerIPv6 -k-TestServerCurrentCipher -k-TestServerCipherList -k-TestSSLUpstreamCertVerificationWValidCertChain -k-TestHTTPSUpstreamServerVerificationWTrustedCert" MAN_PAGES := $(shell cat debian/mitmproxy.manpages) Cheers, -- Seb -- System Information: Debian Release: buster/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'oldstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.19.0-3-amd64 (SMP w/36 CPU cores) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_DIE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
