This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via e067b858d6948b9cd698804975842ef65e3b3218 (commit) via 862634339eebc7b9c502b07d17e4d3cdb96e0ef7 (commit) from 734534fbbf53589f671897dcaf56782d6b38b1fd (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit e067b858d6948b9cd698804975842ef65e3b3218 Merge: 734534f 8626343 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 7 01:05:43 2011 +0200

Merge remote-tracking branch 'stevee/systemd'

commit 862634339eebc7b9c502b07d17e4d3cdb96e0ef7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Aug 6 22:29:32 2011 +0200

systemd: Update to 33.

Fixes #224

-----------------------------------------------------------------------

Summary of changes: ...manpages.patch => systemd-33-no_manpages.patch} | 23 ++++++++++++------- pkgs/systemd/systemd.nm | 9 ++++--- 2 files changed, 19 insertions(+), 13 deletions(-) rename pkgs/systemd/patches/{systemd-29-no-manpages.patch => systemd-33-no_manpages.patch} (84%)

Difference in files: diff --git a/pkgs/systemd/patches/systemd-29-no-manpages.patch b/pkgs/systemd/patches/systemd-29-no-manpages.patch deleted file mode 100644 index f935d25..0000000 --- a/pkgs/systemd/patches/systemd-29-no-manpages.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 - --MANPAGES = \ -- man/systemd.1 \ -- man/systemctl.1 \ -- man/systemadm.1 \ -- man/systemd-cgls.1 \ -- man/systemd-nspawn.1 \ -- man/systemd-tmpfiles.8 \ -- man/systemd-notify.1 \ -- man/sd_notify.3 \ -- man/sd_readahead.3 \ -- man/sd_booted.3 \ -- man/sd_listen_fds.3 \ -- man/sd_is_fifo.3 \ -- man/systemd.unit.5 \ -- man/systemd.service.5 \ -- man/systemd.socket.5 \ -- man/systemd.mount.5 \ -- man/systemd.automount.5 \ -- man/systemd.swap.5 \ -- man/systemd.timer.5 \ -- man/systemd.path.5 \ -- man/systemd.target.5 \ -- man/systemd.device.5 \ -- man/systemd.snapshot.5 \ -- man/systemd.exec.5 \ -- man/daemon.7 \ -- man/sd-daemon.7 \ -- man/sd-readahead.7 \ -- man/runlevel.8 \ -- man/telinit.8 \ -- man/halt.8 \ -- man/shutdown.8 \ -- man/pam_systemd.8 \ -- man/systemd.conf.5 \ -- man/tmpfiles.d.5 \ -- man/hostname.5 \ -- man/machine-id.5 \ -- man/vconsole.conf.5 \ -- man/locale.conf.5 \ -- man/os-release.5 \ -- man/machine-info.5 \ -- man/modules-load.d.5 \ -- man/sysctl.d.5 \ -- man/systemd-ask-password.1 -+MANPAGES = - --if ENABLE_BINFMT --MANPAGES += \ -- man/binfmt.d.5 --endif -+MANPAGES_ALIAS = - --MANPAGES_ALIAS = \ -- man/reboot.8 \ -- man/poweroff.8 \ -- man/sd_is_socket.3 \ -- man/sd_is_socket_unix.3 \ -- man/sd_is_socket_inet.3 \ -- man/sd_notifyf.3 \ -- man/init.1 -- --man/reboot.8: man/halt.8 --man/poweroff.8: man/halt.8 --man/sd_is_socket.3: man/sd_is_fifo.3 --man/sd_is_socket_unix.3: man/sd_is_fifo.3 --man/sd_is_socket_inet.3: man/sd_is_fifo.3 --man/sd_notifyf.3: man/sd_notify.3 --man/init.1: man/systemd.1 -- --dist_man_MANS = \ -- $(MANPAGES) \ -- $(MANPAGES_ALIAS) -+dist_man_MANS = - --nodist_man_MANS = \ -- man/systemd.special.7 -+nodist_man_MANS = - - XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/pkgs/systemd/patches/systemd-33-no_manpages.patch b/pkgs/systemd/patches/systemd-33-no_manpages.patch new file mode 100644 index 0000000..b416d80 --- /dev/null +++ b/pkgs/systemd/patches/systemd-33-no_manpages.patch @@ -0,0 +1,92 @@ +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 @@ + src/dbus-loop.h \ + src/spawn-agent.h + +-MANPAGES = \ +- man/systemd.1 \ +- man/systemctl.1 \ +- man/systemadm.1 \ +- man/systemd-cgls.1 \ +- man/systemd-nspawn.1 \ +- man/systemd-tmpfiles.8 \ +- man/systemd-notify.1 \ +- man/sd_notify.3 \ +- man/sd_readahead.3 \ +- man/sd_booted.3 \ +- man/sd_listen_fds.3 \ +- man/sd_is_fifo.3 \ +- man/systemd.unit.5 \ +- man/systemd.service.5 \ +- man/systemd.socket.5 \ +- man/systemd.mount.5 \ +- man/systemd.automount.5 \ +- man/systemd.swap.5 \ +- man/systemd.timer.5 \ +- man/systemd.path.5 \ +- man/systemd.target.5 \ +- man/systemd.device.5 \ +- man/systemd.snapshot.5 \ +- man/systemd.exec.5 \ +- man/daemon.7 \ +- man/sd-daemon.7 \ +- man/sd-readahead.7 \ +- man/runlevel.8 \ +- man/telinit.8 \ +- man/halt.8 \ +- 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 \ +- man/vconsole.conf.5 \ +- man/locale.conf.5 \ +- man/os-release.5 \ +- man/machine-info.5 \ +- man/modules-load.d.5 \ +- man/sysctl.d.5 \ +- man/systemd-ask-password.1 \ +- man/systemd-loginctl.1 ++MANPAGES = + + if ENABLE_BINFMT +-MANPAGES += \ +- man/binfmt.d.5 ++MANPAGES += ++ + endif + +-MANPAGES_ALIAS = \ +- man/reboot.8 \ +- man/poweroff.8 \ +- man/sd_is_socket.3 \ +- man/sd_is_socket_unix.3 \ +- man/sd_is_socket_inet.3 \ +- man/sd_notifyf.3 \ +- man/init.1 +- +-man/reboot.8: man/halt.8 +-man/poweroff.8: man/halt.8 +-man/sd_is_socket.3: man/sd_is_fifo.3 +-man/sd_is_socket_unix.3: man/sd_is_fifo.3 +-man/sd_is_socket_inet.3: man/sd_is_fifo.3 +-man/sd_notifyf.3: man/sd_notify.3 +-man/init.1: man/systemd.1 +- +-dist_man_MANS = \ +- $(MANPAGES) \ +- $(MANPAGES_ALIAS) ++MANPAGES_ALIAS = ++ ++dist_man_MANS = + +-nodist_man_MANS = \ +- man/systemd.special.7 ++nodist_man_MANS = + + XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm index bc24e14..a19df40 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 \

hooks/post-receive -- IPFire 3.x development tree