Mon May 13 01:16:27 PDT 2013

4 files changed, 8 insertions, 83 deletions

diff --git a/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch b/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
deleted file mode 100644
index dee8e549e..000000000
--- a/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d5fb96252d289e7899bc0bb87262127d19de949 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 7 May 2013 12:47:30 +0200
-Subject: [PATCH] login: add missing _public_ to sd_get_machine_names()
-
----
- src/login/sd-login.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/sd-login.c b/src/login/sd-login.c
-index 66c4487..d0dc42f 100644
---- a/src/login/sd-login.c
-+++ b/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;
--- 
-1.8.2.2
-
diff --git a/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch b/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
deleted file mode 100644
index 186a9c554..000000000
--- a/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 7 May 2013 11:35:23 -0400
-Subject: [PATCH] systemd-sleep: it is not an error if the config file is
- missing
-
----
- src/shared/sleep-config.c | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index 73a3acb..cd3238b 100644
---- a/src/shared/sleep-config.c
-+++ b/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;
--- 
-1.8.2.2
-
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 9db7a26e4..e9546663e 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=203
-pkgrel=2
+pkgver=204
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,15 +16,11 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
-        '0001-login-add-missing-_public_-to-sd_get_machine_names.patch'
-        '0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch'
         'use-split-usr-path.patch')
-md5sums=('b5a124ae8aee2b9fa357f912e87e9048'
+md5sums=('a07619bb19f48164fbf0761d12fd39a8'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
-         '8504a59afaa5d52fa6b5b26fc89873cf'
-         '988cf83af952990ff48d3b97bcf06845'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 prepare() {
@@ -32,9 +28,6 @@ prepare() {
 
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
-
-  patch -Np1 <"$srcdir/0001-login-add-missing-_public_-to-sd_get_machine_names.patch"
-  patch -Np1 <"$srcdir/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch"
 }
 
 build() {
@@ -91,9 +84,6 @@ package_systemd() {
 
   printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
   # fix .so links in manpage stubs
   find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
       -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 53cd4b4af..508b384c3 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -82,6 +82,11 @@ post_upgrade() {
     printf '==> Persistent net naming rules have been shipped as disabled.\n'
     printf '    See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n'
   fi
+
+  if [ "$(vercmp 204-1 "$2")" -eq 1 ]; then
+    printf '==> The /bin/systemd symlink has been removed. Any references in your\n'
+    printf '    bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n'
+  fi
 }
 
 # vim:set ts=2 sw=2 et: