Package: release.debian.org Severity: normal Tags: stretch User: [email protected] Usertags: pu
Dear stable release team, Someone discovered that cloud-init, by default, manages the apt/sources.list and adds contrib and non-free by default. We consider it as a grave bug which needs to be fixed in Stretch, especially that cloud-init is typically installed in VMs that wouldn't need the firmware files from non-free. Version 0.7.9-2+deb9u1 fixes the debian sources.list template removing contrib and non-free. Attached is a debdiff of the proposed changes. The files are uploaded here if you want to inspect them: http://sid.gplhost.com/stretch-proposed-updates/cloud-init/ Please allow this upload of 0.7.9-2+deb9u1 in Stretch. Cheers, Thomas Goirand (zigo)
diff -Nru cloud-init-0.7.9/debian/changelog cloud-init-0.7.9/debian/changelog --- cloud-init-0.7.9/debian/changelog 2017-02-02 14:23:41.000000000 +0100 +++ cloud-init-0.7.9/debian/changelog 2017-08-02 20:28:11.000000000 +0200 @@ -1,3 +1,9 @@ +cloud-init (0.7.9-2+deb9u1) stretch; urgency=medium + + * Remove non-free and contrib from sources.list debian template. + + -- Thomas Goirand <[email protected]> Wed, 02 Aug 2017 20:28:11 +0200 + cloud-init (0.7.9-2) unstable; urgency=medium * Add net-tools as runtime depends (Closes: #853926). diff -Nru cloud-init-0.7.9/debian/cloud-init.NEWS cloud-init-0.7.9/debian/cloud-init.NEWS --- cloud-init-0.7.9/debian/cloud-init.NEWS 1970-01-01 01:00:00.000000000 +0100 +++ cloud-init-0.7.9/debian/cloud-init.NEWS 2017-08-02 20:28:11.000000000 +0200 @@ -0,0 +1,8 @@ +cloud-init default behavior from upstream is to manage sources.list for Debian, +adding contrib and non-free by default. This is clearly a bug which we have +fixed. If you need contrib and non-free on your computer running cloud-init, +then please use /etc/apt/sources.list.d facility, instead of the general file +in /etc/apt/sources.list, as we changed the behavior. Our appologies for this +change. + + -- Thomas Goirand <[email protected]> Wed, 02 Aug 2017 20:28:11 +0200 diff -Nru cloud-init-0.7.9/debian/patches/0004-debian-sources.list.patch cloud-init-0.7.9/debian/patches/0004-debian-sources.list.patch --- cloud-init-0.7.9/debian/patches/0004-debian-sources.list.patch 2017-02-02 14:23:41.000000000 +0100 +++ cloud-init-0.7.9/debian/patches/0004-debian-sources.list.patch 2017-08-02 20:28:10.000000000 +0200 @@ -1,17 +1,39 @@ -From 32dd02b4cce53db2e39a1ba62806f7db5d152095 Mon Sep 17 00:00:00 2001 +From 1351a2fba9e74492e790f184a36a2fff978a8984 Mon Sep 17 00:00:00 2001 From: Charles Plessy <[email protected]> Date: Mon, 21 Nov 2016 19:10:47 +0100 Subject: debian-sources.list Forwarded: https://bugs.launchpad.net/cloud-init/+bug/1627293 --- - templates/sources.list.debian.tmpl | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) + templates/sources.list.debian.tmpl | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/templates/sources.list.debian.tmpl b/templates/sources.list.debian.tmpl -index c8043f76..f4188c73 100644 +index c8043f76..8b119ad4 100644 --- a/templates/sources.list.debian.tmpl +++ b/templates/sources.list.debian.tmpl +@@ -10,15 +10,15 @@ + + # See http://www.debian.org/releases/stable/i386/release-notes/ch-upgrading.html + # for how to upgrade to newer versions of the distribution. +-deb {{mirror}} {{codename}} main contrib non-free +-deb-src {{mirror}} {{codename}} main contrib non-free ++deb {{mirror}} {{codename}} main ++deb-src {{mirror}} {{codename}} main + + ## Major bug fix updates produced after the final release of the + ## distribution. +-deb {{security}} {{codename}}/updates main contrib non-free +-deb-src {{security}} {{codename}}/updates main contrib non-free +-deb {{mirror}} {{codename}}-updates main contrib non-free +-deb-src {{mirror}} {{codename}}-updates main contrib non-free ++deb {{security}} {{codename}}/updates main ++deb-src {{security}} {{codename}}/updates main ++deb {{mirror}} {{codename}}-updates main ++deb-src {{mirror}} {{codename}}-updates main + + ## Uncomment the following two lines to add software from the 'backports' + ## repository. @@ -26,7 +26,5 @@ deb-src {{mirror}} {{codename}}-updates main contrib non-free ## N.B. software from this repository may not have been tested as ## extensively as that contained in the main release, although it includes
