jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

systemd: add 2 patches from git master to fix regressions.

Browse source
This commit is contained in:
Juan RP 2013-05-07 20:07:44 +02:00
parent 4fb22fde61
commit b2fe083e33
5 changed files with 64 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/libudev/patches Symbolic link
View file

@ -0,0 +1 @@
../systemd/patches

2
srcpkgs/libudev/template
View file

@ -1,7 +1,7 @@
# Template file for 'libudev'
pkgname=libudev
version=203
revision=1
revision=2
wrksrc="systemd-${version}"
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --disable-selinux

40
srcpkgs/systemd/patches/0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829.patch Normal file
View file

@ -0,0 +1,40 @@
From 0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 07 May 2013 15:35:23 +0000
Subject: systemd-sleep: it is not an error if the config file is missing
---
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 73a3acb..cd3238b 100644
--- src/shared/sleep-config.c
+++ src/shared/sleep-config.c
@@ -47,19 +47,16 @@ int parse_sleep_config(const char *verb, char ***modes, char ***states) {
FILE _cleanup_fclose_ *f;
f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
- if (!f) {
- if (errno == ENOENT)
- return 0;
-
- log_warning("Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
- return 0;
+ if (!f)
+ log_full(errno == ENOENT ? LOG_DEBUG: LOG_WARNING,
+ "Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
+ else {
+ r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
+ config_item_table_lookup, (void*) items, false, false, NULL);
+ if (r < 0)
+ log_warning("Failed to parse configuration file: %s", strerror(-r));
}
- r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
- config_item_table_lookup, (void*) items, false, false, NULL);
- if (r < 0)
- log_warning("Failed to parse configuration file: %s", strerror(-r));
-
if (streq(verb, "suspend")) {
/* empty by default */
*modes = suspend_mode;
--
cgit v0.9.0.2-2-gbebe

21
srcpkgs/systemd/patches/4d5fb96252d289e7899bc0bb87262127d19de949.patch Normal file
View file

@ -0,0 +1,21 @@
From 4d5fb96252d289e7899bc0bb87262127d19de949 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 07 May 2013 10:47:30 +0000
Subject: login: add missing _public_ to sd_get_machine_names()
---
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index 66c4487..d0dc42f 100644
--- src/login/sd-login.c
+++ src/login/sd-login.c
@@ -591,7 +591,7 @@ _public_ int sd_get_uids(uid_t **users) {
return r;
}
-int sd_get_machine_names(char ***machines) {
+_public_ int sd_get_machine_names(char ***machines) {
_cleanup_closedir_ DIR *d = NULL;
_cleanup_strv_free_ char **l = NULL;
_cleanup_free_ char *md = NULL;
--
cgit v0.9.0.2-2-gbebe

2
srcpkgs/systemd/template
View file

@ -1,7 +1,7 @@
# Template file for 'systemd'
pkgname=systemd
version=203
revision=1
revision=2
short_desc="A system and service manager for Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/systemd"