[systemd-commits] 2 commits - autogen.sh configure.ac Makefile.am po/POTFILES.in src/org.freedesktop.hostname1.policy src/org.freedesktop.hostname1.policy.in src/org.freedesktop.locale1.policy src/org.freedesktop.locale1.policy.in src/org.freedesktop.login1.policy src/org.freedesktop.login1.policy.in src/org.freedesktop.timedate1.policy src/org.freedesktop.timedate1.policy.in TODO
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Jul 11 12:15:29 PDT 2011
Makefile.am | 16 +++++++---
TODO | 3 +
autogen.sh | 1
configure.ac | 11 ++++++-
po/POTFILES.in | 4 ++
src/org.freedesktop.hostname1.policy | 49 -------------------------------
src/org.freedesktop.hostname1.policy.in | 49 +++++++++++++++++++++++++++++++
src/org.freedesktop.locale1.policy | 29 ------------------
src/org.freedesktop.locale1.policy.in | 29 ++++++++++++++++++
src/org.freedesktop.login1.policy | 49 -------------------------------
src/org.freedesktop.login1.policy.in | 49 +++++++++++++++++++++++++++++++
src/org.freedesktop.timedate1.policy | 50 --------------------------------
src/org.freedesktop.timedate1.policy.in | 50 ++++++++++++++++++++++++++++++++
13 files changed, 206 insertions(+), 183 deletions(-)
New commits:
commit 1258097cd3cdbc5dd3d264850119e553a29c5068
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jul 11 21:10:48 2011 +0200
update TODO
diff --git a/TODO b/TODO
index e74148b..afd83b8 100644
--- a/TODO
+++ b/TODO
@@ -20,6 +20,9 @@ F15 External:
Features:
+* implement Register= switch in .socket units to enable registration
+ in Avahi, RPC and other socket registration services.
+
* Remove kill_mode parameter to kill bus calls
* Fix nspawn to not read-only mount /selinux on the host system
commit 1c7dde3e475978c569a982d65fd86d4b4e3caad8
Author: Bastien Nocera <hadess at hadess.net>
Date: Mon Jul 11 17:01:28 2011 +0100
build-sys: Add i18n support through intltool
And put the PolicyKit policy files up for translation.
diff --git a/Makefile.am b/Makefile.am
index 5cb4d29..4acdb2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,8 @@
ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = po
+
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
@@ -470,11 +472,14 @@ pkgconfigdata_DATA = \
nodist_polkitpolicy_DATA = \
src/org.freedesktop.systemd1.policy
-dist_polkitpolicy_DATA = \
- src/org.freedesktop.hostname1.policy \
- src/org.freedesktop.locale1.policy \
- src/org.freedesktop.timedate1.policy \
- src/org.freedesktop.login1.policy
+dist_polkitpolicy_in_files = \
+ src/org.freedesktop.hostname1.policy.in \
+ src/org.freedesktop.locale1.policy.in \
+ src/org.freedesktop.timedate1.policy.in \
+ src/org.freedesktop.login1.policy.in
+
+ at INTLTOOL_POLICY_RULE@
+polkitpolicy_DATA = $(dist_polkitpolicy_in_files:.policy.in=.policy)
noinst_LTLIBRARIES = \
libsystemd-basic.la \
@@ -1356,6 +1361,7 @@ CLEANFILES = \
$(nodist_man_MANS) \
${XML_IN_FILES:.xml.in=.html} \
$(pkgconfigdata_DATA) \
+ $(polkitpolicy_DATA) \
src/org.freedesktop.systemd1.policy
if HAVE_VALAC
diff --git a/autogen.sh b/autogen.sh
index 826d9b0..55a115d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -60,6 +60,7 @@ else
rm -f config.cache
libtoolize -c --force
+ intltoolize -c -f
run_versioned aclocal "$AM_VERSION" -I m4
run_versioned autoconf "$AC_VERSION" -Wall
run_versioned autoheader "$AC_VERSION"
diff --git a/configure.ac b/configure.ac
index 58296b9..bc7ab42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,15 @@ AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
])
+# i18n stuff for the PolicyKit policy files
+IT_PROG_INTLTOOL([0.40.0])
+
+GETTEXT_PACKAGE=systemd
+AC_SUBST(GETTEXT_PACKAGE)
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18.1])
+
AC_PROG_MKDIR_P
AC_PROG_LN_S
AC_PROG_SED
@@ -523,7 +532,7 @@ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
AC_SUBST([pamlibdir], [$with_pamlibdir])
AC_SUBST([rootdir], [$with_rootdir])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile po/Makefile.in])
AC_OUTPUT
echo "
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..29be44e
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,4 @@
+src/org.freedesktop.hostname1.policy.in
+src/org.freedesktop.locale1.policy.in
+src/org.freedesktop.login1.policy.in
+src/org.freedesktop.timedate1.policy.in
diff --git a/src/org.freedesktop.hostname1.policy b/src/org.freedesktop.hostname1.policy
deleted file mode 100644
index 0ad64d9..0000000
--- a/src/org.freedesktop.hostname1.policy
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-
-<!--
- This file is part of systemd.
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
--->
-
-<policyconfig>
-
- <vendor>The systemd Project</vendor>
- <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
-
- <action id="org.freedesktop.hostname1.set-hostname">
- <description>Set host name</description>
- <message>Authentication is required to set the local host name.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
- <action id="org.freedesktop.hostname1.set-static-hostname">
- <description>Set static host name</description>
- <message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
- <action id="org.freedesktop.hostname1.set-machine-info">
- <description>Set machine information</description>
- <message>Authentication is required to set local machine information.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
-</policyconfig>
diff --git a/src/org.freedesktop.hostname1.policy.in b/src/org.freedesktop.hostname1.policy.in
new file mode 100644
index 0000000..7d56b22
--- /dev/null
+++ b/src/org.freedesktop.hostname1.policy.in
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+
+<!--
+ This file is part of systemd.
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+-->
+
+<policyconfig>
+
+ <vendor>The systemd Project</vendor>
+ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
+
+ <action id="org.freedesktop.hostname1.set-hostname">
+ <_description>Set host name</_description>
+ <_message>Authentication is required to set the local host name.</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+ <action id="org.freedesktop.hostname1.set-static-hostname">
+ <_description>Set static host name</_description>
+ <_message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+ <action id="org.freedesktop.hostname1.set-machine-info">
+ <_description>Set machine information</_description>
+ <_message>Authentication is required to set local machine information.</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+</policyconfig>
diff --git a/src/org.freedesktop.locale1.policy b/src/org.freedesktop.locale1.policy
deleted file mode 100644
index 6c755fd..0000000
--- a/src/org.freedesktop.locale1.policy
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-
-<!--
- This file is part of systemd.
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
--->
-
-<policyconfig>
-
- <vendor>The systemd Project</vendor>
- <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
-
- <action id="org.freedesktop.locale1.set-locale">
- <description>Set system locale</description>
- <message>Authentication is required to set the system locale.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
-</policyconfig>
diff --git a/src/org.freedesktop.locale1.policy.in b/src/org.freedesktop.locale1.policy.in
new file mode 100644
index 0000000..186d7d3
--- /dev/null
+++ b/src/org.freedesktop.locale1.policy.in
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+
+<!--
+ This file is part of systemd.
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+-->
+
+<policyconfig>
+
+ <vendor>The systemd Project</vendor>
+ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
+
+ <action id="org.freedesktop.locale1.set-locale">
+ <_description>Set system locale</_description>
+ <_message>Authentication is required to set the system locale.</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+</policyconfig>
diff --git a/src/org.freedesktop.login1.policy b/src/org.freedesktop.login1.policy
deleted file mode 100644
index 7ad8f6f..0000000
--- a/src/org.freedesktop.login1.policy
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-
-<!--
- This file is part of systemd.
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
--->
-
-<policyconfig>
-
- <vendor>The systemd Project</vendor>
- <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
-
- <action id="org.freedesktop.login1.set-user-linger">
- <description>Allow non-logged-in users to run programs</description>
- <message>Authentication is required to allow a non-logged-in user to run programs</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
- <action id="org.freedesktop.login1.attach-device">
- <description>Allow attaching devices to seats</description>
- <message>Authentication is required to allow attaching a device to a seat</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
- <action id="org.freedesktop.login1.flush-devices">
- <description>Flush device to seat attachments</description>
- <message>Authentication is required to allow reseting how devices are attached to seats</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
-</policyconfig>
diff --git a/src/org.freedesktop.login1.policy.in b/src/org.freedesktop.login1.policy.in
new file mode 100644
index 0000000..9482c87
--- /dev/null
+++ b/src/org.freedesktop.login1.policy.in
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+
+<!--
+ This file is part of systemd.
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+-->
+
+<policyconfig>
+
+ <vendor>The systemd Project</vendor>
+ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
+
+ <action id="org.freedesktop.login1.set-user-linger">
+ <_description>Allow non-logged-in users to run programs</_description>
+ <_message>Authentication is required to allow a non-logged-in user to run programs</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+ <action id="org.freedesktop.login1.attach-device">
+ <_description>Allow attaching devices to seats</_description>
+ <_message>Authentication is required to allow attaching a device to a seat</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+ <action id="org.freedesktop.login1.flush-devices">
+ <_description>Flush device to seat attachments</_description>
+ <_message>Authentication is required to allow reseting how devices are attached to seats</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+</policyconfig>
diff --git a/src/org.freedesktop.timedate1.policy b/src/org.freedesktop.timedate1.policy
deleted file mode 100644
index 5010efd..0000000
--- a/src/org.freedesktop.timedate1.policy
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-
-<!--
- This file is part of systemd.
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
--->
-
-<policyconfig>
-
- <vendor>The systemd Project</vendor>
- <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
-
- <action id="org.freedesktop.timedate1.set-time">
- <description>Set system time</description>
- <message>Authentication is required to set the system time.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
- <action id="org.freedesktop.timedate1.set-timezone">
- <description>Set system timezone</description>
- <message>Authentication is required to set the system timezone.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
- <action id="org.freedesktop.timedate1.set-local-rtc">
- <description>Set RTC to local timezone or UTC</description>
- <message>Authentication is required to control whether
- the RTC stores the local or UTC time.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
-</policyconfig>
diff --git a/src/org.freedesktop.timedate1.policy.in b/src/org.freedesktop.timedate1.policy.in
new file mode 100644
index 0000000..f73e1aa
--- /dev/null
+++ b/src/org.freedesktop.timedate1.policy.in
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+
+<!--
+ This file is part of systemd.
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+-->
+
+<policyconfig>
+
+ <vendor>The systemd Project</vendor>
+ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
+
+ <action id="org.freedesktop.timedate1.set-time">
+ <_description>Set system time</_description>
+ <_message>Authentication is required to set the system time.</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+ <action id="org.freedesktop.timedate1.set-timezone">
+ <_description>Set system timezone</_description>
+ <_message>Authentication is required to set the system timezone.</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+ <action id="org.freedesktop.timedate1.set-local-rtc">
+ <_description>Set RTC to local timezone or UTC</_description>
+ <_message>Authentication is required to control whether
+ the RTC stores the local or UTC time.</_message>
+ <defaults>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+</policyconfig>
More information about the systemd-commits
mailing list