Your message dated Wed, 24 May 2017 16:49:29 +0000
with message-id <[email protected]>
and subject line Bug#863207: fixed in policykit-1 0.113-6
has caused the Debian Bug report #863207,
regarding Please backport gettext .its and .loc files from upstream/master
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
863207: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863207
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: src:policykit-1
Version: 0.105.17
Severity: wishlist
Tags: upstream patch
Hiya,
I'm attaching a patch to add a patch to debian/patches/master that
cherry-picks two upstream commits. These commits backport gettext .its
and .loc files from upstream's master branch. With those files we can
translate policykit XML files using gettext.
I wanted to upgrade fwupd to 0.9.2 to test the Logitech update[0]. This
version also converts the build system to meson, and that uses gettext
to translate the PK XML files. It fails like so-
msgfmt: cannot locate ITS rules for ../policy/org.freedesktop.fwupd.policy.in
I've put the files in the main PK package because none of the others
seem to fit properly.
Review appreciated. I'm not in the team so I can't upload. I'd like to
shove it into unstable so that I can build fwupd against it, but if
you'd rather not due to the freeze then I can prepare something for exp
too.
And yes, it's unfortunate that fwupd depends on rules from a
non-released polkit. Looks like fedora backported the patches too[1].
--
Iain Lane [ [email protected] ]
Debian Developer [ [email protected] ]
Ubuntu Developer [ [email protected] ]
[0]
https://blogs.gnome.org/hughsie/2017/05/22/updating-logitech-hardware-on-linux/
[1]
http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/commit/?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760
>From 3dc67aa003ccc5972a097720aaed2bad8415d039 Mon Sep 17 00:00:00 2001
From: Iain Lane <[email protected]>
Date: Tue, 23 May 2017 12:17:09 +0100
Subject: [PATCH] Backport .its and .loc files from master for gettext support
master/Add-gettext-support-for-.policy-files.patch: Backport from
master: Add .loc and .its files so that gettext can be used to translate
policy files. Some upstreams, particularly those that are switching to
meson, expect these files to be present so that their PK policy files
can be translated.
---
debian/changelog | 10 +++
.../Add-gettext-support-for-.policy-files.patch | 87 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/policykit-1.install | 1 +
4 files changed, 99 insertions(+)
create mode 100644
debian/patches/master/Add-gettext-support-for-.policy-files.patch
diff --git a/debian/changelog b/debian/changelog
index 12b471f..b3f2e91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+policykit-1 (0.105-18) UNRELEASED; urgency=medium
+
+ * master/Add-gettext-support-for-.policy-files.patch: Backport from master:
+ Add .loc and .its files so that gettext can be used to translate policy
+ files. Some upstreams, particularly those that are switching to meson,
+ expect these files to be present so that their PK policy files can be
+ translated.
+
+ -- Iain Lane <[email protected]> Tue, 23 May 2017 12:17:09 +0100
+
policykit-1 (0.105-17) unstable; urgency=medium
[ Michael Biebl ]
diff --git a/debian/patches/master/Add-gettext-support-for-.policy-files.patch
b/debian/patches/master/Add-gettext-support-for-.policy-files.patch
new file mode 100644
index 0000000..057d3d9
--- /dev/null
+++ b/debian/patches/master/Add-gettext-support-for-.policy-files.patch
@@ -0,0 +1,87 @@
+From 7eef6482fd3831bfae73a3576230af5341aaf53f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <[email protected]>
+Date: Fri, 15 Jul 2016 11:12:35 -0400
+Subject: [PATCH] Add gettext support for .policy files
+
+gettext can extract strings from and merge them back into xml
+file formats, with the help of .its files.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=96940
+
+---
+
+Author: Peter Hutterer <[email protected]>
+Date: Thu Oct 20 10:50:58 2016 +1000
+gettext: switch to default-translate "no"
+
+The default appears to be to translate all entries. This rule never takes
+effect, the path to /action/message and /action/description is wrong (/action
+is not a root node). Since we wanted them to be translated, it doesn't matter.
+
+But it also translates all other tags (vendor, allow_any, etc.) and that
+causes polkit to be unhappy, it can't handle the various language versions of
+"no"
+
+** (polkitd:27434): WARNING **: Unknown PolkitImplicitAuthorization string
+'tidak'
+
+Switch to a default of "no" and explicitly include the message and description
+strings to be translated.
+
+The patch was modified for PolicyKit by Ondrej Holy <[email protected]>.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=98366
+
+Origin: upstream, commit:c78819245ff8a270f97c9f800773e727918be838
commit:32e9a69c335324a53a2c0ba4e0b513fb044be0fd
+
+---
+ data/Makefile.am | 3 +++
+ data/polkit.its | 8 ++++++++
+ data/polkit.loc | 6 ++++++
+ 3 files changed, 17 insertions(+)
+ create mode 100644 data/polkit.its
+ create mode 100644 data/polkit.loc
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index f0beeba..7ea361d 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -20,6 +20,9 @@ endif
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = polkit-gobject-1.pc polkit-backend-1.pc polkit-agent-1.pc
+
++itsdir = $(datadir)/gettext/its
++its_DATA = polkit.loc polkit.its
++
+ CLEANFILES = $(BUILT_SOURCES)
+
+ EXTRA_DIST = \
+diff --git a/data/polkit.its b/data/polkit.its
+new file mode 100644
+index 0000000..1c37e6b
+--- /dev/null
++++ b/data/polkit.its
+@@ -0,0 +1,8 @@
++<?xml version="1.0"?>
++<its:rules xmlns:its="http://www.w3.org/2005/11/its";
++ version="2.0">
++ <its:translateRule selector="//*" translate="no"/>
++ <its:translateRule selector="//action/description |
++ //action/message"
++ translate="yes"/>
++</its:rules>
+diff --git a/data/polkit.loc b/data/polkit.loc
+new file mode 100644
+index 0000000..c7427ec
+--- /dev/null
++++ b/data/polkit.loc
+@@ -0,0 +1,6 @@
++<?xml version="1.0"?>
++<locatingRules>
++ <locatingRule name="polkit policy" pattern="*.policy">
++ <documentRule localName="policyconfig" target="polkit.its"/>
++ </locatingRule>
++</locatingRules>
+--
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 76011d0..f86d649 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,6 +29,7 @@
0.113/Fix-use-after-free-in-polkitagentsession.c.patch
0.113/README-Note-to-send-security-reports-via-DBus-s-mech.patch
master/Fix-multi-line-pam-text-info.patch
+master/Add-gettext-support-for-.policy-files.patch
01_pam_polkit.patch
02_gettext.patch
03_polkitunixsession_sessionid_from_display.patch
diff --git a/debian/policykit-1.install b/debian/policykit-1.install
index a3de089..ed9a935 100644
--- a/debian/policykit-1.install
+++ b/debian/policykit-1.install
@@ -6,6 +6,7 @@ usr/bin/
usr/lib/*/polkit-1/extensions/*.so
usr/lib/policykit-1/
usr/share/dbus-1/
+usr/share/gettext/
usr/share/locale/
usr/share/man/
usr/share/polkit-1/
--
2.11.0
--- End Message ---
--- Begin Message ---
Source: policykit-1
Source-Version: 0.113-6
We believe that the bug you reported is fixed in the latest version of
policykit-1, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Iain Lane <[email protected]> (supplier of updated policykit-1 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 24 May 2017 16:11:01 +0100
Source: policykit-1
Binary: policykit-1 policykit-1-doc libpolkit-gobject-1-0
libpolkit-gobject-1-dev libpolkit-agent-1-0 libpolkit-agent-1-dev
gir1.2-polkit-1.0
Architecture: source
Version: 0.113-6
Distribution: experimental
Urgency: medium
Maintainer: Utopia Maintenance Team
<[email protected]>
Changed-By: Iain Lane <[email protected]>
Description:
gir1.2-polkit-1.0 - GObject introspection data for PolicyKit
libpolkit-agent-1-0 - PolicyKit Authentication Agent API
libpolkit-agent-1-dev - PolicyKit Authentication Agent API - development files
libpolkit-gobject-1-0 - PolicyKit Authorization API
libpolkit-gobject-1-dev - PolicyKit Authorization API - development files
policykit-1 - framework for managing administrative policies and privileges
policykit-1-doc - documentation for PolicyKit-1
Closes: 863207
Changes:
policykit-1 (0.113-6) experimental; urgency=medium
.
* master/Add-gettext-support-for-.policy-files.patch: Backport from master:
Add .loc and .its files so that gettext can be used to translate policy
files. Some upstreams, particularly those that are switching to meson,
expect these files to be present so that their PK policy files can be
translated. (Closes: #863207)
Checksums-Sha1:
88088c77572233cb9f215d8fa192e1e57d4e1a6a 2722 policykit-1_0.113-6.dsc
7c20318ee6b917fe4c1de4c2e5c55bf4e40fbc54 17536
policykit-1_0.113-6.debian.tar.xz
39ef375c3d87f117ea8a20ecdf4bd294892c5665 10017
policykit-1_0.113-6_source.buildinfo
Checksums-Sha256:
1722c309223e37d9331f9920a840c49cac174f27a86200cf18bec6489ef5c68e 2722
policykit-1_0.113-6.dsc
9af6d66993daeff800dfbce4778266f32da2adb5f0de55f8889aaa8a1e7d3bea 17536
policykit-1_0.113-6.debian.tar.xz
0230e2bf51a38d7db4b816fdc601142834cc09b7bd39bbb3fe6d58bcbc9841ea 10017
policykit-1_0.113-6_source.buildinfo
Files:
a0116bf193fb2312e33930a08bdce4f2 2722 admin optional policykit-1_0.113-6.dsc
1103e54bb90b08974cf5b32d845ce79c 17536 admin optional
policykit-1_0.113-6.debian.tar.xz
58e0b34744eb8847a32f21edad89fac2 10017 admin optional
policykit-1_0.113-6_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIcBAEBCgAGBQJZJbblAAoJEONS1cUcUEHUHSUQAIM3ezUwfZgJ5lB/l/VNO7t/
xFtSY/Xi1TREcRKUvgEcGpZOvrXobSnMbKnP3XgkOqzn9bwmx+Osr2dTYJeWSpwd
5c4e6C5by6rUp9hFjXzzSlvLcBYFuuU7VKGhVPq7SDdXP9PFkqM+u1bOaH2fQ1cV
Xl/PLMiZydfXkrZlfOaSxaLshk/QM6cAlcX49AH6YsGnnUeBCPrThGEzsMkFVVUJ
q1eWWvCj/rkdXM5ROvb0/eAArG+NsD88daYVn1lnf+0sIuDW788pcv/Ig15BG0Aq
tO0DH3wzlp3IvbgFMOFuLGKQiA2zph5vrUOf0DHyp+2bDjTcRNWCbuccPnsOj2T4
bWLrILbHMVtpfIMnv1H4TIfLZGhup7vdNIjBaJdRkZ8ToWEbDWqSDHAbtjlddrZP
fjQm5irSmzTPCH8yjDfM2c1lqjPs1NjckPkheFnHQLFTnDDGwFb43b0+f96164fh
XpbuKf127QwWV69pZM11QmRkiyGg8c/q7ZbqWSVDDaKjhAqbt3vkJ2162OnfFIXR
cBYFsqirowJBF5Jj/0+yIKn+tBsb3YhuzwjKTMn1Ws8/heLHKbCW8Y2L6AuAD9Hx
dVZR6UwMzbaisBaZmOgX1ymBZDK2xXEEm5BHWGxoyK2pBGTBrDy7ogmx4q2X6AX7
/zWUZB4thuSx0Bma9XQZ
=QGP3
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Pkg-utopia-maintainers mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-utopia-maintainers
