From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 9 Oct 2011 17:25:46 +0000 (+0200)
Subject: systemd: Update to 36.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef4383756eb71e5a89e61af59d702e3b65017268;p=ipfire-3.x.git

systemd: Update to 36.
---

diff --git a/systemd/patches/systemd-33-no_manpages.patch b/systemd/patches/systemd-36-no_manpages.patch
similarity index 91%
rename from systemd/patches/systemd-33-no_manpages.patch
rename to systemd/patches/systemd-36-no_manpages.patch
index b416d8033..5c5480fce 100644
--- a/systemd/patches/systemd-33-no_manpages.patch
+++ b/systemd/patches/systemd-36-no_manpages.patch
@@ -1,7 +1,7 @@
 diff -Nur a/Makefile.am b/Makefile.am
---- a/Makefile.am	2011-08-03 04:19:53.000000000 +0200
-+++ b/Makefile.am	2011-08-05 19:41:33.923993685 +0200
-@@ -692,81 +692,18 @@
+--- a/Makefile.am	2011-09-23 18:30:02.000000000 +0200
++++ b/Makefile.am	2011-10-09 16:44:18.293116056 +0200
+@@ -749,82 +749,13 @@
          src/dbus-loop.h \
          src/spawn-agent.h
  
@@ -42,6 +42,7 @@ diff -Nur a/Makefile.am b/Makefile.am
 -	man/systemd-logind.conf.5 \
 -	man/tmpfiles.d.5 \
 -	man/hostname.5 \
+-        man/timezone.5 \
 -	man/machine-id.5 \
 -	man/vconsole.conf.5 \
 -	man/locale.conf.5 \
@@ -53,12 +54,11 @@ diff -Nur a/Makefile.am b/Makefile.am
 -        man/systemd-loginctl.1
 +MANPAGES =
  
- if ENABLE_BINFMT
+-if ENABLE_BINFMT
 -MANPAGES += \
 -	man/binfmt.d.5
-+MANPAGES +=
-+
- endif
+-endif
++MANPAGES_ALIAS =
  
 -MANPAGES_ALIAS = \
 -	man/reboot.8 \
@@ -80,8 +80,6 @@ diff -Nur a/Makefile.am b/Makefile.am
 -dist_man_MANS = \
 -	$(MANPAGES) \
 -	$(MANPAGES_ALIAS)
-+MANPAGES_ALIAS =
-+
 +dist_man_MANS =
  
 -nodist_man_MANS = \
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 1ffaf3b8c..1b6267f5e 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 33
-release    = 3
+version    = 36
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -114,6 +114,8 @@ packages
 			util-linux>=2.19
 		end
 
+		prerequires += authconfig
+
 		script postin
 			# Generate Machine ID.
 			/bin/systemd-machine-id-setup > /dev/null 2>&1 || :