diff --git a/srcpkgs/libudev/template b/srcpkgs/libudev/template index d8cc56ec445..7ddb5d994ec 100644 --- a/srcpkgs/libudev/template +++ b/srcpkgs/libudev/template @@ -1,7 +1,7 @@ # Template file for 'libudev' pkgname=libudev -version=203 -revision=2 +version=204 +revision=1 wrksrc="systemd-${version}" build_style=gnu-configure configure_args="--libexecdir=/usr/lib --disable-selinux @@ -20,7 +20,7 @@ maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/systemd" license="LGPL-2.1, GPL-2, MIT" distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz" -checksum=61b13e4dbce2156452bf85f126f5d540ee259cbcd6846f03d4284e7df3b0fb1d +checksum=072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b hostmakedepends="pkg-config intltool gperf libxslt docbook-xsl" makedepends="attr-devel dbus-devel libcap-devel liblzma-devel libgcrypt-devel" diff --git a/srcpkgs/systemd/patches/0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829.patch b/srcpkgs/systemd/patches/0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829.patch deleted file mode 100644 index 0fca63eb7cc..00000000000 --- a/srcpkgs/systemd/patches/0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829 Mon Sep 17 00:00:00 2001 -From: Zbigniew Jędrzejewski-Szmek -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 diff --git a/srcpkgs/systemd/patches/4d5fb96252d289e7899bc0bb87262127d19de949.patch b/srcpkgs/systemd/patches/4d5fb96252d289e7899bc0bb87262127d19de949.patch deleted file mode 100644 index c25542e3f45..00000000000 --- a/srcpkgs/systemd/patches/4d5fb96252d289e7899bc0bb87262127d19de949.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 4d5fb96252d289e7899bc0bb87262127d19de949 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -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 diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index 9303e5ab682..50fce39946c 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,13 +1,13 @@ # Template file for 'systemd' pkgname=systemd -version=203 -revision=2 +version=204 +revision=1 short_desc="A system and service manager for Linux" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/systemd" license="LGPL-2.1, GPL-2, MIT" distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" -checksum=61b13e4dbce2156452bf85f126f5d540ee259cbcd6846f03d4284e7df3b0fb1d +checksum=072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b build_style=gnu-configure configure_args="--libexecdir=/usr/lib