Bug#1032264: unblock: colord/1.4.6-2.2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: colord@packages.debian.org
Control: affects -1 + src:colord
Please unblock package colord.
[ Reason ]
Stop pulling in the transitional policykit-1 package to the default
installations of 3 major desktop environments (GNOME, KDE Plasma, Xfce).
(This assumes the recent fixes in rtkit and policykit-1-gnome migrate
before we enter hard freeze, but that should happen "naturally" before
the deadline.)
[ Impact ]
If not accepted, new installations of our default desktop and two other
popular desktops will pull in polkitd-pkla (polkit-pkla-compat upstream)
by default, which means they'll use the old-style .pkla rules as a higher
precedence than their modern equivalent.
Upgrades from bullseye are unaffected and will continue to pull in the
transitional package policykit-1, but this change will also help to allow
sysadmins to remove that package post-upgrade.
polkit-pkla-compat has had one upstream release, ever, which was 10
years ago, so I would like to minimize its presence in new installations.
[ Tests ]
There's an autopkgtest (unfortunately marked as flaky) which was failing
but now passes. I have the proposed colord installed as a dependency of
GNOME, but I don't know how to test it beyond that.
[ Risks ]
There are no actual code changes, except for no longer cleaning up
conffiles that were removed before stretch.
The highest risk is that by no longer accidentally pulling in
polkitd-pkla, we'll cause a behaviour change for packages in this list
<https://udd.debian.org/cgi-bin/bts-usertags.cgi?user=pkg-utopia-maintainers%40lists.alioth.debian.org&tag=pkla-without-js>
or for local sysadmin policies.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other notes ]
I expect that LXDE and MATE will continue to pull in polkit-pkla in bookworm
due to having multiple entries in this list that haven't been worked on:
<https://udd.debian.org/cgi-bin/bts-usertags.cgi?user=pkg-utopia-maintainers%40lists.alioth.debian.org&tag=policykit-1>.
Cinnamon is probably fixable if someone wants to do the work (it might only
require fixing gdebi and lightdm).
unblock colord/1.4.6-2.2
diffstat for colord-1.4.6 colord-1.4.6
changelog | 26 +++++
colord.maintscript | 3
colord.preinst | 7 -
control | 5 -
copyright | 142 ++----------------------------
tests/installed-tests | 2
tests/overrides/99-allow-all-colord.pkla | 4
tests/overrides/99-allow-all-colord.rules | 9 +
8 files changed, 51 insertions(+), 147 deletions(-)
diff -Nru colord-1.4.6/debian/changelog colord-1.4.6/debian/changelog
--- colord-1.4.6/debian/changelog 2022-12-03 06:26:35.000000000 +0000
+++ colord-1.4.6/debian/changelog 2023-03-02 10:45:31.000000000 +0000
@@ -1,3 +1,29 @@
+colord (1.4.6-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+
+ [ Debian Janitor ]
+ * d/copyright: Refer to common license file for CC0-1.0
+ * d/control: Use secure URI in Homepage field
+ * d/colord.maintscript: Remove obsolete maintscript entries
+ * d/colord.preinst: Remove empty maintainer script
+
+ [ Simon McVittie ]
+ * d/control: Depend on polkitd | policykit-1, not just policykit-1.
+ This allows colord to be installed without pulling in the transitional
+ package policykit-1, which in turn is enough to avoid policykit-1 being
+ included in new bookworm installations of GNOME, KDE Plasma and Xfce.
+ (Closes: #1025554, #1025379)
+ * d/tests/installed-tests: Fix autopkgtest failure if polkitd-pkla is
+ not installed.
+ Installing policykit-1 is no longer guaranteed to provide support for
+ the legacy .pkla rules language.
+ * d/control: Build-depend on libjson-glib-dev.
+ This works around a missing dependency by libgusb-dev (see #1032183)
+ and can be reverted when that bug is fixed.
+
+ -- Simon McVittie <smcv@debian.org> Thu, 02 Mar 2023 10:45:31 +0000
+
colord (1.4.6-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru colord-1.4.6/debian/colord.maintscript colord-1.4.6/debian/colord.maintscript
--- colord-1.4.6/debian/colord.maintscript 2022-12-03 06:26:35.000000000 +0000
+++ colord-1.4.6/debian/colord.maintscript 2023-03-02 10:45:31.000000000 +0000
@@ -1,4 +1 @@
-rm_conffile /etc/bash_completion.d/colormgr-completion.bash 1.0.3-1~
-rm_conffile /etc/colord.conf 1.2.12-1~ colord
rm_conffile /etc/dbus-1/system.d/org.freedesktop.ColorManager.conf 1.4.3-4~
-rm_conffile /etc/dbus-1/system.d/org.freedesktop.colord-sane.conf 1.0.3-1~
diff -Nru colord-1.4.6/debian/colord.preinst colord-1.4.6/debian/colord.preinst
--- colord-1.4.6/debian/colord.preinst 2022-12-03 06:26:35.000000000 +0000
+++ colord-1.4.6/debian/colord.preinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
diff -Nru colord-1.4.6/debian/control colord-1.4.6/debian/control
--- colord-1.4.6/debian/control 2022-12-03 06:26:35.000000000 +0000
+++ colord-1.4.6/debian/control 2023-03-02 10:45:31.000000000 +0000
@@ -12,6 +12,7 @@
libglib2.0-dev (>= 2.58),
libgudev-1.0-dev,
libgusb-dev (>= 0.2.7),
+ libjson-glib-dev,
liblcms2-dev,
libpolkit-gobject-1-dev (>= 0.103),
libsane-dev [linux-any],
@@ -29,7 +30,7 @@
Rules-Requires-Root: no
Standards-Version: 4.6.1
Section: graphics
-Homepage: http://www.freedesktop.org/software/colord/
+Homepage: https://www.freedesktop.org/software/colord/
Vcs-Git: https://salsa.debian.org/debian/colord.git
Vcs-Browser: https://salsa.debian.org/debian/colord
@@ -77,7 +78,7 @@
acl,
adduser,
colord-data,
- policykit-1 (>= 0.103),
+ polkitd | policykit-1 (>= 0.103),
${misc:Depends},
${shlibs:Depends},
Suggests:
diff -Nru colord-1.4.6/debian/copyright colord-1.4.6/debian/copyright
--- colord-1.4.6/debian/copyright 2022-12-03 06:26:35.000000000 +0000
+++ colord-1.4.6/debian/copyright 2023-03-02 10:45:31.000000000 +0000
@@ -36,7 +36,7 @@
Files: data/profiles/*
Copyright: © 2012 Richard Hughes <richard@hughsie.com>
-License: CC0
+License: CC0-1.0
Files:
data/profiles/GRACoL_TR006_coated.iccprofile.xml
@@ -44,7 +44,7 @@
Copyright:
© 2012 Richard Hughes <richard@hughsie.com>
© 2007 NPES The Associaton for Suppliers of Printing, Publishing and Converting Technologies
-License: CC0 and NPES
+License: CC0-1.0 and NPES
License: NPES
Profiles, or other derivative work, based on these data may be distributed
@@ -428,131 +428,13 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-License: CC0
- Creative Commons CC0 1.0 Universal
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
- ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
- USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND
- DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT
- OR THE INFORMATION OR WORKS PROVIDED HEREUNDER.
- .
- Statement of Purpose
- .
- The laws of most jurisdictions throughout the world automatically confer
- exclusive Copyright and Related Rights (defined below) upon the creator
- and subsequent owner(s) (each and all, an "owner") of an original work
- of authorship and/or a database (each, a "Work").
- .
- Certain owners wish to permanently relinquish those rights to a Work for
- the purpose of contributing to a commons of creative, cultural and
- scientific works ("Commons") that the public can reliably and without
- fear of later claims of infringement build upon, modify, incorporate in
- other works, reuse and redistribute as freely as possible in any form
- whatsoever and for any purposes, including without limitation commercial
- purposes. These owners may contribute to the Commons to promote the
- ideal of a free culture and the further production of creative, cultural
- and scientific works, or to gain reputation or greater distribution for
- their Work in part through the use and efforts of others.
- .
- For these and/or other purposes and motivations, and without any
- expectation of additional consideration or compensation, the person
- associating CC0 with a Work (the "Affirmer"), to the extent that he or
- she is an owner of Copyright and Related Rights in the Work, voluntarily
- elects to apply CC0 to the Work and publicly distribute the Work under
- its terms, with knowledge of his or her Copyright and Related Rights in
- the Work and the meaning and intended legal effect of CC0 on those
- rights.
- .
- 1. Copyright and Related Rights. A Work made available under CC0 may be
- protected by copyright and related or neighboring rights ("Copyright and
- Related Rights"). Copyright and Related Rights include, but are not
- limited to, the following:
- .
- i. the right to reproduce, adapt, distribute, perform, display,
- communicate, and translate a Work;
- .
- ii. moral rights retained by the original author(s) and/or performer(s);
- .
- iii. publicity and privacy rights pertaining to a person's image or
- likeness depicted in a Work;
- .
- iv. rights protecting against unfair competition in regards to a Work,
- subject to the limitations in paragraph 4(a), below;
- .
- v. rights protecting the extraction, dissemination, use and reuse of
- data in a Work;
- .
- vi. database rights (such as those arising under Directive 96/9/EC of
- the European Parliament and of the Council of 11 March 1996 on the legal
- protection of databases, and under any national implementation thereof,
- including any amended or successor version of such directive); and
- .
- vii. other similar, equivalent or corresponding rights throughout the
- world based on applicable law or treaty, and any national
- implementations thereof.
- .
- 2. Waiver. To the greatest extent permitted by, but not in contravention
- of, applicable law, Affirmer hereby overtly, fully, permanently,
- irrevocably and unconditionally waives, abandons, and surrenders all of
- Affirmer's Copyright and Related Rights and associated claims and causes
- of action, whether now known or unknown (including existing as well as
- future claims and causes of action), in the Work (i) in all territories
- worldwide, (ii) for the maximum duration provided by applicable law or
- treaty (including future time extensions), (iii) in any current or
- future medium and for any number of copies, and (iv) for any purpose
- whatsoever, including without limitation commercial, advertising or
- promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
- benefit of each member of the public at large and to the detriment of
- Affirmer's heirs and successors, fully intending that such Waiver shall
- not be subject to revocation, rescission, cancellation, termination, or
- any other legal or equitable action to disrupt the quiet enjoyment of
- the Work by the public as contemplated by Affirmer's express Statement
- of Purpose.
- .
- 3. Public License Fallback. Should any part of the Waiver for any reason
- be judged legally invalid or ineffective under applicable law, then the
- Waiver shall be preserved to the maximum extent permitted taking into
- account Affirmer's express Statement of Purpose. In addition, to the
- extent the Waiver is so judged Affirmer hereby grants to each affected
- person a royalty-free, non transferable, non sublicensable, non
- exclusive, irrevocable and unconditional license to exercise Affirmer's
- Copyright and Related Rights in the Work (i) in all territories
- worldwide, (ii) for the maximum duration provided by applicable law or
- treaty (including future time extensions), (iii) in any current or
- future medium and for any number of copies, and (iv) for any purpose
- whatsoever, including without limitation commercial, advertising or
- promotional purposes (the "License"). The License shall be deemed
- effective as of the date CC0 was applied by Affirmer to the Work. Should
- any part of the License for any reason be judged legally invalid or
- ineffective under applicable law, such partial invalidity or
- ineffectiveness shall not invalidate the remainder of the License, and
- in such case Affirmer hereby affirms that he or she will not (i)
- exercise any of his or her remaining Copyright and Related Rights in the
- Work or (ii) assert any associated claims and causes of action with
- respect to the Work, in either case contrary to Affirmer's express
- Statement of Purpose.
- .
- 4. Limitations and Disclaimers.
- .
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
- surrendered, licensed or otherwise affected by this document.
- .
- b. Affirmer offers the Work as-is and makes no representations or
- warranties of any kind concerning the Work, express, implied, statutory
- or otherwise, including without limitation warranties of title,
- merchantability, fitness for a particular purpose, non infringement, or
- the absence of latent or other defects, accuracy, or the present or
- absence of errors, whether or not discoverable, all to the greatest
- extent permissible under applicable law.
- .
- c. Affirmer disclaims responsibility for clearing rights of other
- persons that may apply to the Work or any use thereof, including without
- limitation any person's Copyright and Related Rights in the Work.
- Further, Affirmer disclaims responsibility for obtaining any necessary
- consents, permissions or other rights required for any use of the Work.
- .
- d. Affirmer understands and acknowledges that Creative Commons is not a
- party to this document and has no duty or obligation with respect to
- this CC0 or use of the Work.
+License: CC0-1.0
+ To the extent possible under law, the author(s) have dedicated all copyright
+ and related and neighboring rights to this software to the public domain
+ worldwide. This software is distributed without any warranty.
+ .
+ You should have received a copy of the CC0 Public Domain Dedication along with
+ this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ .
+ On Debian systems, the full text of the CC0 1.0 Universal license can be found
+ in the file `/usr/share/common-licenses/CC0-1.0'.
diff -Nru colord-1.4.6/debian/tests/installed-tests colord-1.4.6/debian/tests/installed-tests
--- colord-1.4.6/debian/tests/installed-tests 2022-12-03 06:26:35.000000000 +0000
+++ colord-1.4.6/debian/tests/installed-tests 2023-03-02 10:45:31.000000000 +0000
@@ -3,7 +3,7 @@
# Override polkit checks for colord daemon. Normally this would allow
# locally-logged-in users to do things, but our autopkgtest user isn't locally-logged-in.
-cp debian/tests/overrides/99-allow-all-colord.pkla /etc/polkit-1/localauthority/90-mandatory.d
+cp debian/tests/overrides/99-allow-all-colord.rules /etc/polkit-1/rules.d/
mkdir -p /etc/systemd/system/colord.service.d/
cp debian/tests/overrides/colord.service /etc/systemd/system/colord.service.d/10-add-dummy-sensor.conf
diff -Nru colord-1.4.6/debian/tests/overrides/99-allow-all-colord.pkla colord-1.4.6/debian/tests/overrides/99-allow-all-colord.pkla
--- colord-1.4.6/debian/tests/overrides/99-allow-all-colord.pkla 2022-12-03 06:26:35.000000000 +0000
+++ colord-1.4.6/debian/tests/overrides/99-allow-all-colord.pkla 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-[Allow All for Tesnting]
-Identity=unix-user:*
-Action=org.freedesktop.color-manager.*
-ResultAny=yes
diff -Nru colord-1.4.6/debian/tests/overrides/99-allow-all-colord.rules colord-1.4.6/debian/tests/overrides/99-allow-all-colord.rules
--- colord-1.4.6/debian/tests/overrides/99-allow-all-colord.rules 1970-01-01 01:00:00.000000000 +0100
+++ colord-1.4.6/debian/tests/overrides/99-allow-all-colord.rules 2023-03-02 10:45:31.000000000 +0000
@@ -0,0 +1,9 @@
+polkit.addRule(function(action, subject) {
+ if (action.id.indexOf("org.freedesktop.color-manager.") === 0) {
+ return polkit.Result.YES;
+ }
+
+ return polkit.Result.NOT_HANDLED;
+});
+
+// vim:set ft=javascript:
Reply to: