Date: Tuesday, August 13, 2013 @ 18:43:37
Author: dreisner
Revision: 192535
upgpkg: systemd 206-2
- backport fixes for broken perms on static nodes (FS#36259)
Added:
systemd/trunk/0001-udev-static_node-don-t-touch-permissions-uneccessari.patch
systemd/trunk/0002-tmpfiles-support-passing-prefix-multiple-times.patch
systemd/trunk/0003-tmpfiles-introduce-exclude-prefix.patch
systemd/trunk/0004-tmpfiles-setup-exclude-dev-prefixes-files.patch
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
-----------------------------------------------------------------+
0001-udev-static_node-don-t-touch-permissions-uneccessari.patch | 28 ++
0002-tmpfiles-support-passing-prefix-multiple-times.patch | 90 ++++++
0003-tmpfiles-introduce-exclude-prefix.patch | 138
++++++++++
0004-tmpfiles-setup-exclude-dev-prefixes-files.patch | 23 +
PKGBUILD | 32 +-
initcpio-install-systemd | 10
6 files changed, 311 insertions(+), 10 deletions(-)
Added: 0001-udev-static_node-don-t-touch-permissions-uneccessari.patch
===================================================================
--- 0001-udev-static_node-don-t-touch-permissions-uneccessari.patch
(rev 0)
+++ 0001-udev-static_node-don-t-touch-permissions-uneccessari.patch
2013-08-13 16:43:37 UTC (rev 192535)
@@ -0,0 +1,28 @@
+From 15a722007dc1d8a9a11934b2ab528cf4d25b6c62 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <t...@jklm.no>
+Date: Wed, 24 Jul 2013 15:05:48 +0200
+Subject: [PATCH] udev: static_node - don't touch permissions uneccessarily
+
+Don't set default permissions if only TAGS were specified in a rule.
+---
+ src/udev/udev-rules.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
+index fe4965f..769b670 100644
+--- a/src/udev/udev-rules.c
++++ b/src/udev/udev-rules.c
+@@ -2586,6 +2586,10 @@ int udev_rules_apply_static_dev_perms(struct udev_rules
*rules)
+ }
+ }
+
++ /* don't touch the permissions if only the tags were
set */
++ if (mode == 0 && uid == 0 && gid == 0)
++ goto next;
++
+ if (mode == 0) {
+ if (gid > 0)
+ mode = 0660;
+--
+1.8.3.4
+
Added: 0002-tmpfiles-support-passing-prefix-multiple-times.patch
===================================================================
--- 0002-tmpfiles-support-passing-prefix-multiple-times.patch
(rev 0)
+++ 0002-tmpfiles-support-passing-prefix-multiple-times.patch 2013-08-13
16:43:37 UTC (rev 192535)
@@ -0,0 +1,90 @@
+From a2aced4add1964f82cfd250f1fee8de9d974b507 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreis...@archlinux.org>
+Date: Wed, 24 Jul 2013 11:10:05 -0400
+Subject: [PATCH] tmpfiles: support passing --prefix multiple times
+
+---
+ man/systemd-tmpfiles.xml | 3 ++-
+ src/tmpfiles/tmpfiles.c | 24 +++++++++++++++++++++---
+ 2 files changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
+index 405a9f1..b0f2d9c 100644
+--- a/man/systemd-tmpfiles.xml
++++ b/man/systemd-tmpfiles.xml
+@@ -121,7 +121,8 @@
+ <term><option>--prefix=PATH</option></term>
+ <listitem><para>Only apply rules that
+ apply to paths with the specified
+- prefix.</para></listitem>
++ prefix. This option can be specified
++ multiple times.</para></listitem>
+ </varlistentry>
+
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index eae993e..cb15133 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -105,7 +105,7 @@ static bool arg_create = false;
+ static bool arg_clean = false;
+ static bool arg_remove = false;
+
+-static const char *arg_prefix = NULL;
++static char **include_prefixes = NULL;
+
+ static const char conf_file_dirs[] =
+ "/etc/tmpfiles.d\0"
+@@ -1018,6 +1018,21 @@ static bool item_equal(Item *a, Item *b) {
+ return true;
+ }
+
++static bool should_include_path(const char *path) {
++ char **prefix;
++
++ /* no explicit paths specified for inclusion, so everything is valid
*/
++ if (strv_length(include_prefixes) == 0)
++ return true;
++
++ STRV_FOREACH(prefix, include_prefixes) {
++ if (path_startswith(path, *prefix))
++ return true;
++ }
++
++ return false;
++}
++
+ static int parse_line(const char *fname, unsigned line, const char *buffer) {
+ _cleanup_item_free_ Item *i = NULL;
+ Item *existing;
+@@ -1119,7 +1134,7 @@ static int parse_line(const char *fname, unsigned line,
const char *buffer) {
+
+ path_kill_slashes(i->path);
+
+- if (arg_prefix && !path_startswith(i->path, arg_prefix))
++ if (!should_include_path(i->path))
+ return 0;
+
+ if (user && !streq(user, "-")) {
+@@ -1258,7 +1273,8 @@ static int parse_argv(int argc, char *argv[]) {
+ break;
+
+ case ARG_PREFIX:
+- arg_prefix = optarg;
++ if (strv_extend(&include_prefixes, optarg) < 0)
++ return log_oom();
+ break;
+
+ case '?':
+@@ -1423,6 +1439,8 @@ finish:
+ hashmap_free(items);
+ hashmap_free(globs);
+
++ strv_free(include_prefixes);
++
+ set_free_free(unix_sockets);
+
+ label_finish();
+--
+1.8.3.4
+
Added: 0003-tmpfiles-introduce-exclude-prefix.patch
===================================================================
--- 0003-tmpfiles-introduce-exclude-prefix.patch
(rev 0)
+++ 0003-tmpfiles-introduce-exclude-prefix.patch 2013-08-13 16:43:37 UTC
(rev 192535)
@@ -0,0 +1,138 @@
+From 5c7951141fa9f33e1b97de97586cc16bce2776e0 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreis...@archlinux.org>
+Date: Wed, 24 Jul 2013 11:19:24 -0400
+Subject: [PATCH] tmpfiles: introduce --exclude-prefix
+
+The opposite of --prefix, allows specifying path prefixes which should
+be skipped when processing rules.
+---
+ man/systemd-tmpfiles.xml | 7 +++++
+ shell-completion/systemd-zsh-completion.zsh | 1 +
+ src/tmpfiles/tmpfiles.c | 44 ++++++++++++++++++-----------
+ 3 files changed, 36 insertions(+), 16 deletions(-)
+
+diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
+index b0f2d9c..403592d 100644
+--- a/man/systemd-tmpfiles.xml
++++ b/man/systemd-tmpfiles.xml
+@@ -124,6 +124,13 @@
+ prefix. This option can be specified
+ multiple times.</para></listitem>
+ </varlistentry>
++ <varlistentry>
++
<term><option>--exclude-prefix=PATH</option></term>
++ <listitem><para>Ignore rules that
++ apply to paths with the specified
++ prefix. This option can be specified
++ multiple times.</para></listitem>
++ </varlistentry>
+
+
+ <varlistentry>
+diff --git a/shell-completion/systemd-zsh-completion.zsh
b/shell-completion/systemd-zsh-completion.zsh
+index b62b6df..1ab1311 100644
+--- a/shell-completion/systemd-zsh-completion.zsh
++++ b/shell-completion/systemd-zsh-completion.zsh
+@@ -249,6 +249,7 @@ _ctls()
+ '--clean[Clean up all files and directories with an age
parameter configured.]' \
+ '--remove[All files and directories marked with r, R in the
configuration files are removed.]' \
+ '--prefix=[Only apply rules that apply to paths with the
specified prefix.]' \
++ '--exclude-prefix=[Ignore rules that apply to paths with the
specified prefix.]' \
+ '--help[Prints a short help text and exits.]' \
+ '*::files:_files'
+ ;;
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index cb15133..5eca82a 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -106,6 +106,7 @@ static bool arg_clean = false;
+ static bool arg_remove = false;
+
+ static char **include_prefixes = NULL;
++static char **exclude_prefixes = NULL;
+
+ static const char conf_file_dirs[] =
+ "/etc/tmpfiles.d\0"
+@@ -1021,16 +1022,19 @@ static bool item_equal(Item *a, Item *b) {
+ static bool should_include_path(const char *path) {
+ char **prefix;
+
+- /* no explicit paths specified for inclusion, so everything is valid
*/
+- if (strv_length(include_prefixes) == 0)
+- return true;
++ STRV_FOREACH(prefix, exclude_prefixes) {
++ if (path_startswith(path, *prefix))
++ return false;
++ }
+
+ STRV_FOREACH(prefix, include_prefixes) {
+ if (path_startswith(path, *prefix))
+ return true;
+ }
+
+- return false;
++ /* no matches, so we should include this path only if we
++ * have no whitelist at all */
++ return strv_length(include_prefixes) == 0;
+ }
+
+ static int parse_line(const char *fname, unsigned line, const char *buffer) {
+@@ -1219,11 +1223,12 @@ static int help(void) {
+
+ printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n"
+ "Creates, deletes and cleans up volatile and temporary files
and directories.\n\n"
+- " -h --help Show this help\n"
+- " --create Create marked files/directories\n"
+- " --clean Clean up marked directories\n"
+- " --remove Remove marked files/directories\n"
+- " --prefix=PATH Only apply rules that apply to paths
with the specified prefix\n",
++ " -h --help Show this help\n"
++ " --create Create marked files/directories\n"
++ " --clean Clean up marked directories\n"
++ " --remove Remove marked files/directories\n"
++ " --prefix=PATH Only apply rules that apply to
paths with the specified prefix\n"
++ " --exclude-prefix=PATH Ignore rules that apply to paths
with the specified prefix\n",
+ program_invocation_short_name);
+
+ return 0;
+@@ -1235,16 +1240,18 @@ static int parse_argv(int argc, char *argv[]) {
+ ARG_CREATE,
+ ARG_CLEAN,
+ ARG_REMOVE,
+- ARG_PREFIX
++ ARG_PREFIX,
++ ARG_EXCLUDE_PREFIX,
+ };
+
+ static const struct option options[] = {
+- { "help", no_argument, NULL, 'h' },
+- { "create", no_argument, NULL, ARG_CREATE },
+- { "clean", no_argument, NULL, ARG_CLEAN },
+- { "remove", no_argument, NULL, ARG_REMOVE },
+- { "prefix", required_argument, NULL, ARG_PREFIX },
+- { NULL, 0, NULL, 0 }
++ { "help", no_argument, NULL, 'h'
},
++ { "create", no_argument, NULL, ARG_CREATE
},
++ { "clean", no_argument, NULL, ARG_CLEAN
},
++ { "remove", no_argument, NULL, ARG_REMOVE
},
++ { "prefix", required_argument, NULL, ARG_PREFIX
},
++ { "exclude-prefix", required_argument, NULL,
ARG_EXCLUDE_PREFIX },
++ { NULL, 0, NULL, 0
}
+ };
+
+ int c;
+@@ -1277,6 +1284,11 @@ static int parse_argv(int argc, char *argv[]) {
+ return log_oom();
+ break;
+
++ case ARG_EXCLUDE_PREFIX:
++ if (strv_extend(&exclude_prefixes, optarg) < 0)
++ return log_oom();
++ break;
++
+ case '?':
+ return -EINVAL;
+
+--
+1.8.3.4
+
Added: 0004-tmpfiles-setup-exclude-dev-prefixes-files.patch
===================================================================
--- 0004-tmpfiles-setup-exclude-dev-prefixes-files.patch
(rev 0)
+++ 0004-tmpfiles-setup-exclude-dev-prefixes-files.patch 2013-08-13
16:43:37 UTC (rev 192535)
@@ -0,0 +1,23 @@
+From ec99834cb0e76a9e7096bd42249053712db9c32d Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreis...@archlinux.org>
+Date: Wed, 24 Jul 2013 11:58:35 -0400
+Subject: [PATCH] tmpfiles-setup: exclude /dev prefixes files
+
+Fixes Arch Linux bug: https://bugs.archlinux.org/task/36259
+---
+ units/systemd-tmpfiles-setup.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/units/systemd-tmpfiles-setup.service.in
b/units/systemd-tmpfiles-setup.service.in
+index 67c7d4a..6f98063 100644
+--- a/units/systemd-tmpfiles-setup.service.in
++++ b/units/systemd-tmpfiles-setup.service.in
+@@ -21,4 +21,4 @@ ConditionDirectoryNotEmpty=|/run/tmpfiles.d
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=@rootbindir@/systemd-tmpfiles --create --remove
++ExecStart=@rootbindir@/systemd-tmpfiles --create --remove
--exclude-prefix=/dev
+--
+1.8.3.4
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-13 16:27:33 UTC (rev 192534)
+++ PKGBUILD 2013-08-13 16:43:37 UTC (rev 192535)
@@ -4,10 +4,9 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=206
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd";
-license=('GPL2' 'LGPL2.1' 'MIT')
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl'
'gobject-introspection' 'gperf'
'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd'
'libxslt'
'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
@@ -15,12 +14,29 @@
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
'initcpio-hook-udev'
'initcpio-install-systemd'
- 'initcpio-install-udev')
+ 'initcpio-install-udev'
+ 0001-udev-static_node-don-t-touch-permissions-uneccessari.patch
+ 0002-tmpfiles-support-passing-prefix-multiple-times.patch
+ 0003-tmpfiles-introduce-exclude-prefix.patch
+ 0004-tmpfiles-setup-exclude-dev-prefixes-files.patch)
md5sums=('89e36f2d3ba963020b72738549954cbc'
'2de72238ed5c0df62a7c3b6bdaf8cb7c'
- 'ee6565a05be172de8f12e0a139ba8df4'
- 'd83d45e67cd75cdbafb81c96a7485319')
+ '9027b31a875e74a45623954b3b23d09f'
+ 'd83d45e67cd75cdbafb81c96a7485319'
+ '133232cf621ca6333beefa20173e520e'
+ '948dd905195caafa7e528c3afa4a679a'
+ '121ea2d14d19548f5e317c925e2e7482'
+ '81a65872b15d14d7ac8250e029ae0cbe')
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1
<"$srcdir"/0001-udev-static_node-don-t-touch-permissions-uneccessari.patch
+ patch -Np1
<"$srcdir"/0002-tmpfiles-support-passing-prefix-multiple-times.patch
+ patch -Np1 <"$srcdir"/0003-tmpfiles-introduce-exclude-prefix.patch
+ patch -Np1 <"$srcdir"/0004-tmpfiles-setup-exclude-dev-prefixes-files.patch
+}
+
build() {
cd "$pkgname-$pkgver"
@@ -46,6 +62,7 @@
package_systemd() {
pkgdesc="system and service manager"
+ license=('GPL2' 'LGPL2.1' 'MIT')
depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap'
'libgcrypt'
'pam' 'util-linux' 'xz')
provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver"
"udev=$pkgver"
@@ -106,10 +123,15 @@
install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
mv
"$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
\
"$srcdir"/_sysvcompat/usr/share/man/man8
+
+ # include MIT license, since it's technically custom
+ install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
+ "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
}
package_systemd-sysvcompat() {
pkgdesc="sysvinit compat for systemd"
+ license=('GPL2')
groups=('base')
conflicts=('sysvinit')
depends=('sysvinit-tools' 'systemd')
Modified: initcpio-install-systemd
===================================================================
--- initcpio-install-systemd 2013-08-13 16:27:33 UTC (rev 192534)
+++ initcpio-install-systemd 2013-08-13 16:43:37 UTC (rev 192535)
@@ -137,7 +137,7 @@
# TODO: make sure this is no longer necessary when systemctl moves to
sd-bus
add_file "/etc/nsswitch.conf"
add_file "/etc/passwd"
- add_binary "/lib/libnss_files-2.17.so"
+ add_binary "$(readlink -f /usr/lib/libnss_files.so)"
# udev wants /etc/group since it doesn't launch with --resolve-names=never
add_file "/etc/group"
@@ -146,10 +146,10 @@
help() {
cat <<HELPEOF
This will install a basic systemd setup in your initramfs, and is meant to
-replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks would need
-to be ported, and may not work as intended. You also may wish to still include
-the 'base' hook (before this hook) to ensure that a rescue shell exists on your
-initramfs.
+replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks with
runtime
+components will need to be ported, and will not work as intended. You also may
+wish to still include the 'base' hook (before this hook) to ensure that a
+rescue shell exists on your initramfs.
HELPEOF
}
