From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 6 Aug 2011 20:29:32 +0000 (+0200)
Subject: systemd: Update to 33.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=862634339eebc7b9c502b07d17e4d3cdb96e0ef7;p=ipfire-3.x.git

systemd: Update to 33.

Fixes #224
---

diff --git a/pkgs/systemd/patches/systemd-29-no-manpages.patch b/pkgs/systemd/patches/systemd-33-no_manpages.patch
similarity index 84%
rename from pkgs/systemd/patches/systemd-29-no-manpages.patch
rename to pkgs/systemd/patches/systemd-33-no_manpages.patch
index f935d257a..b416d8033 100644
--- a/pkgs/systemd/patches/systemd-29-no-manpages.patch
+++ b/pkgs/systemd/patches/systemd-33-no_manpages.patch
@@ -1,9 +1,9 @@
 diff -Nur a/Makefile.am b/Makefile.am
---- a/Makefile.am	2011-06-16 13:17:51.000000000 +0200
-+++ b/Makefile.am	2011-07-10 19:09:54.169403422 +0200
-@@ -565,79 +565,13 @@
- 	src/readahead-common.h \
- 	src/ask-password-api.h
+--- 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 @@
+         src/dbus-loop.h \
+         src/spawn-agent.h
  
 -MANPAGES = \
 -	man/systemd.1 \
@@ -39,6 +39,7 @@ diff -Nur a/Makefile.am b/Makefile.am
 -	man/shutdown.8 \
 -	man/pam_systemd.8 \
 -	man/systemd.conf.5 \
+-	man/systemd-logind.conf.5 \
 -	man/tmpfiles.d.5 \
 -	man/hostname.5 \
 -	man/machine-id.5 \
@@ -48,14 +49,16 @@ diff -Nur a/Makefile.am b/Makefile.am
 -        man/machine-info.5 \
 -	man/modules-load.d.5 \
 -	man/sysctl.d.5 \
--        man/systemd-ask-password.1
+-        man/systemd-ask-password.1 \
+-        man/systemd-loginctl.1
 +MANPAGES =
  
--if ENABLE_BINFMT
+ if ENABLE_BINFMT
 -MANPAGES += \
 -	man/binfmt.d.5
--endif
-+MANPAGES_ALIAS =
++MANPAGES +=
++
+ endif
  
 -MANPAGES_ALIAS = \
 -	man/reboot.8 \
@@ -77,6 +80,8 @@ 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/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm
index bc24e14c9..a19df4086 100644
--- a/pkgs/systemd/systemd.nm
+++ b/pkgs/systemd/systemd.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = systemd
-PKG_VER        = 29
-PKG_REL        = 4
+PKG_VER        = 33
+PKG_REL        = 1
 
 PKG_MAINTAINER = Stefan Schantl <stefan.schantl@ipfire.org>
 PKG_GROUPS     = System/Base
@@ -35,10 +35,11 @@ PKG_LICENSE    = GPLv2+
 PKG_SUMMARY    = A System and Service Manager.
 
 PKG_BUILD_DEPS+= audit-devel automake autoconf cryptsetup-luks-devel dbus-devel \
-	libcap-devel libselinux-devel libtool libudev-devel pam-devel
+	gperf intltool libcap-devel libselinux-devel libtool libudev-devel>=172 \
+	pam-devel
 
 # systemd-analyze requires python-cairo + python-dbus
-PKG_DEPS-systemd = dbus python-cairo python-dbus
+PKG_DEPS-systemd = dbus python-cairo python-dbus udev>=172
 
 define PKG_DESCRIPTION
 	systemd is a system and service manager for Linux, compatible with \