[arch-commits] Commit in systemd/trunk (6 files)
Date: Tuesday, June 12, 2018 @ 20:19:19
Author: eworm
Revision: 326862
upgpkg: systemd 238.133-4
Change hooks to run systemd helpers without file argument. This ensures same
behaviour seen on boot. (FS#58899)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/systemd-binfmt.hook
systemd/trunk/systemd-hook
systemd/trunk/systemd-sysctl.hook
systemd/trunk/systemd-sysusers.hook
systemd/trunk/systemd-tmpfiles.hook
---+
PKGBUILD | 12 ++--
systemd-binfmt.hook |1 -
systemd-hook | 14 --
systemd-sysctl.hook |1 -
systemd-sysusers.hook |1 -
systemd-tmpfiles.hook |1 -
6 files changed, 10 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-06-12 20:04:11 UTC (rev 326861)
+++ PKGBUILD2018-06-12 20:19:19 UTC (rev 326862)
@@ -8,7 +8,7 @@
# Can be from either systemd or systemd-stable
_commit='f58e62cbbc1c2842881a2a6ab9beda7bcb044a30'
pkgver=238.133
-pkgrel=3
+pkgrel=4
arch=('x86_64')
url="https://www.github.com/systemd/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -50,14 +50,14 @@
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-
'462ed39bd5c90168079956a402abafe8f0910882e6876b165a2c27af73833d0cad1be9cdbcb3549b34652ea86e5d0dba044946a38797bd533fdd1f5a0083f63b'
-
'46f93725bc94381300535737fd0186a3c096fa83661179eab0c450c7b164a87d9a5dd9abcf6ae98bdeb4bf50a4ba4f1944769948c236e4814f166ff03b0ee177'
+
'6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7'
+
'5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
'4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
'872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
'471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d'
-
'3b11e8956169e6d80eca6e6de1b3e42641454d9d7be48961d400754f2242077d69fb7bfbeb0904f35ce569511036a7c9614a4a1cc3096fba993f46ae65e02895'
-
'bf3225011760695040e9f7be2560348e68e86eac0295f5a17a6f7e3dda7ad7c008812a15904e2071b53d5f8048891602c8a9a18608ac64930f2d8cc4fac2a319'
-
'ff1429a7c88e21d578c25d07e8cd9568577feb5a940fe39a7a815cf8431c57ca951ac6b394c53d2cdeb4efc645572c0b1b670a48cafcc405db41a6602b548e35'
+
'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
+
'08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
+
'577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2'
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
Modified: systemd-binfmt.hook
===
--- systemd-binfmt.hook 2018-06-12 20:04:11 UTC (rev 326861)
+++ systemd-binfmt.hook 2018-06-12 20:19:19 UTC (rev 326862)
@@ -8,4 +8,3 @@
Description = Registering binary formats...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/systemd-hook binfmt
-NeedsTargets
Modified: systemd-hook
===
--- systemd-hook2018-06-12 20:04:11 UTC (rev 326861)
+++ systemd-hook2018-06-12 20:19:19 UTC (rev 326862)
@@ -14,23 +14,17 @@
fi
}
-each_conf() {
- while read -r f; do
-"$@" "$(basename "$f")"
- done
-}
-
case $1 in
catalog) /usr/bin/journalctl --update-catalog ;;
hwdb) /usr/bin/systemd-hwdb --usr update ;;
update) touch -c /usr ;;
- sysusers) each_conf /usr/bin/systemd-sysusers ;;
- tmpfiles) each_conf /usr/bin/systemd-tmpfiles --create ;;
+ sysusers) /usr/bin/systemd-sysusers ;;
+ tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
udev-reload) udevd_live;
[arch-commits] Commit in systemd/trunk (6 files)
Date: Saturday, March 14, 2015 @ 16:31:02
Author: dreisner
Revision: 233796
upgpkg: systemd 219-3
- backport various fixes (at least FS#44155)
- add journal-{upload,remote}.conf to backup= (FS#43948)
Added:
systemd/trunk/0001-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch
systemd/trunk/0001-core-shared-in-deserializing-match-same-files-reache.patch
systemd/trunk/0001-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch
systemd/trunk/0001-tmpfiles-Fix-handling-of-duplicate-lines.patch
systemd/trunk/0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch
Modified:
systemd/trunk/PKGBUILD
-+
0001-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch | 376
++
0001-core-shared-in-deserializing-match-same-files-reache.patch | 135 +++
0001-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch | 293 +++
0001-tmpfiles-Fix-handling-of-duplicate-lines.patch | 34
0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch| 129 +++
PKGBUILD| 28
6 files changed, 992 insertions(+), 3 deletions(-)
The diff is longer than the limit of 200KB.
Use svn diff -r 233795:233796 to see the changes.
[arch-commits] Commit in systemd/trunk (6 files)
Date: Friday, September 13, 2013 @ 04:34:52
Author: dreisner
Revision: 194279
upgpkg: systemd 207-1
Modified:
systemd/trunk/PKGBUILD
Deleted:
systemd/trunk/0001-journal-fix-parsing-of-facility-in-syslog-messages.patch
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
-+
0001-journal-fix-parsing-of-facility-in-syslog-messages.patch | 89 --
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| 30 --
6 files changed, 5 insertions(+), 393 deletions(-)
Deleted: 0001-journal-fix-parsing-of-facility-in-syslog-messages.patch
===
--- 0001-journal-fix-parsing-of-facility-in-syslog-messages.patch
2013-09-12 20:45:23 UTC (rev 194278)
+++ 0001-journal-fix-parsing-of-facility-in-syslog-messages.patch
2013-09-13 02:34:52 UTC (rev 194279)
@@ -1,89 +0,0 @@
-From ac50788b0f5aeee09e7d45db28ae8ab7f39cd52e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= zbys...@in.waw.pl
-Date: Fri, 26 Jul 2013 12:57:33 -0400
-Subject: [PATCH] journal: fix parsing of facility in syslog messages
-
-In 49998b383 (journald: do not overwrite syslog facility when
-parsing priority) journald started ignoring facility part when
-reading service stderr to convert to syslog messages. In this
-case it is fine, because only the priority is allowed.
-
-But the same codepath is used for syslog messages, where the
-facility should be used. Split the two codepaths by explicitly
-specyfing whether the facility should be ignored or not.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=988814
- src/journal/journald-stream.c | 2 +-
- src/journal/journald-syslog.c | 12
- src/journal/journald-syslog.h | 2 +-
- 3 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index e98fe94..9c4efec 100644
a/src/journal/journald-stream.c
-+++ b/src/journal/journald-stream.c
-@@ -90,7 +90,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p)
{
- priority = s-priority;
-
- if (s-level_prefix)
--syslog_parse_priority((char**) p, priority);
-+syslog_parse_priority((char**) p, priority, false);
-
- if (s-forward_to_syslog || s-server-forward_to_syslog)
- server_forward_syslog(s-server,
syslog_fixup_facility(priority), s-identifier, p, s-ucred, NULL);
-diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index 7cbb346..c2770a5 100644
a/src/journal/journald-syslog.c
-+++ b/src/journal/journald-syslog.c
-@@ -236,7 +236,7 @@ size_t syslog_parse_identifier(const char **buf, char
**identifier, char **pid)
- return e;
- }
-
--void syslog_parse_priority(char **p, int *priority) {
-+void syslog_parse_priority(char **p, int *priority, bool with_facility) {
- int a = 0, b = 0, c = 0;
- int k;
-
-@@ -265,10 +265,14 @@ void syslog_parse_priority(char **p, int *priority) {
- } else
- return;
-
--if (a 0 || b 0 || c 0)
-+if (a 0 || b 0 || c 0 ||
-+(!with_facility (a || b || c 7)))
- return;
-
--*priority = (*priority LOG_FACMASK) | (a*100 + b*10 + c);
-+if (with_facility)
-+*priority = a*100 + b*10 + c;
-+else
-+*priority = (*priority LOG_FACMASK) | c;
- *p += k;
- }
-
-@@ -361,7 +365,7 @@ void server_process_syslog_message(
- assert(buf);
-
- orig = buf;
--syslog_parse_priority((char**) buf, priority);
-+syslog_parse_priority((char**) buf, priority, true);
-
- if (s-forward_to_syslog)
- forward_syslog_raw(s, priority, orig, ucred, tv);
-diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
-index 324b70e..8ccdb77 100644
a/src/journal/journald-syslog.h
-+++ b/src/journal/journald-syslog.h
-@@ -25,7 +25,7 @@
-
- int syslog_fixup_facility(int priority) _const_;
-
--void syslog_parse_priority(char **p, int *priority);
-+void syslog_parse_priority(char **p, int *priority, bool with_facility);
- size_t syslog_parse_identifier(const char **buf, char **identifier, char
**pid);
-
- void server_forward_syslog(Server *s, int priority, const char *identifier,
const char *message, struct ucred
[arch-commits] Commit in systemd/trunk (6 files)
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 @@
+ termoption--prefix=PATH/option/term
+ listitemparaOnly 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
