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 48e451a7e47ee58d5c16c98c4ec658c382c86f07 (commit) via 109f657eada08444d744a43379de5a989decc0a3 (commit) via 4f1f4ba14a8452536c6227793962b32f983c86fc (commit) via 8d3f5467a72e4b4058a597e9e740ec03c68020cc (commit) via 703b1e14b006e0d4a716d7622e0b7fc85bfcc1b0 (commit) via d3d5a42141aefd9d249520ecc4434a60b6705c08 (commit) from d69919baac0125bc8524d52accb9964c29f82b57 (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 48e451a7e47ee58d5c16c98c4ec658c382c86f07 Merge: d3d5a42 109f657 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 5 01:05:39 2011 +0200

Merge remote-tracking branch 'stevee/systemd-update'

commit 109f657eada08444d744a43379de5a989decc0a3 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jun 4 23:13:34 2011 +0200

lighttpd: Rebuild for tmpfile.

commit 4f1f4ba14a8452536c6227793962b32f983c86fc Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jun 4 23:12:27 2011 +0200

freeradius: Rebuild for tmpfile.

commit 8d3f5467a72e4b4058a597e9e740ec03c68020cc Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jun 4 23:11:17 2011 +0200

radvd: Rebuild for tmpfile.

commit 703b1e14b006e0d4a716d7622e0b7fc85bfcc1b0 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jun 4 23:05:57 2011 +0200

systemd: Update to version 28.

commit d3d5a42141aefd9d249520ecc4434a60b6705c08 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jun 4 23:04:45 2011 +0200

build-essentials: Add support for systemd tmpfiles.

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

Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem/Constants | 2 + pkgs/build-essentials/buildsystem/Functions | 11 +++++++ pkgs/freeradius/freeradius.nm | 2 +- .../{freeradius.tmpfile => freeradius.tmpfiles} | 0 pkgs/lighttpd/lighttpd.nm | 2 +- .../{lighttpd.tmpfile => lighttpd.tmpfiles} | 0 pkgs/radvd/radvd.nm | 2 +- pkgs/radvd/{radvd.tmpfile => radvd.tmpfiles} | 0 ...manpages.patch => systemd-28-no-manpages.patch} | 30 +++++++++++-------- pkgs/systemd/systemd.nm | 4 +- 11 files changed, 36 insertions(+), 19 deletions(-) rename pkgs/freeradius/{freeradius.tmpfile => freeradius.tmpfiles} (100%) rename pkgs/lighttpd/{lighttpd.tmpfile => lighttpd.tmpfiles} (100%) rename pkgs/radvd/{radvd.tmpfile => radvd.tmpfiles} (100%) rename pkgs/systemd/patches/{systemd-24-no-manpages.patch => systemd-28-no-manpages.patch} (80%)

Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 67b5e89..3164b8e 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 17 +PKG_REL = 18 PKG_EPOCH = 1 PKG_ARCH = noarch

diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index e506d6a..19a5e8a 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -49,6 +49,7 @@ CONFIGURE_OPTIONS = \ --prefix=/usr

SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d

############################################################################### # @@ -149,6 +150,7 @@ PKG_DEFAULT_FILES += $(wildcard $(DIR_SOURCE)/default/*) PKG_PAM_FILES = $(wildcard $(DIR_SOURCE)/*.pam) PKG_PAM_FILES += $(wildcard $(DIR_SOURCE)/pam.d/*) PKG_SYSTEMD_FILES += $(wildcard $(DIR_SOURCE)/systemd/*) +PKG_SYSTEMD_TMPFILES += $(wildcard $(DIR_SOURCE)/*.tmpfiles)

############################################################################### # diff --git a/pkgs/build-essentials/buildsystem/Functions b/pkgs/build-essentials/buildsystem/Functions index b4a629c..90776ff 100644 --- a/pkgs/build-essentials/buildsystem/Functions +++ b/pkgs/build-essentials/buildsystem/Functions @@ -69,6 +69,16 @@ define DO_INSTALL_SYSTEMD $(foreach file,$(PKG_SYSTEMD_FILES),$(call __INSTALL_SYSTEMD,$(file))) endef

+define __INSTALL_SYSTEMD_TMPFILES + -mkdir -pv $(BUILDROOT)$(SYSTEMD_TMPFILES_DIR) + cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)$(SYSTEMD_TMPFILES_DIR)/$(subst .tmpfiles,.conf,$(notdir $(1))) + +endef + +define DO_INSTALL_SYSTEMD_TMPFILES + $(foreach file,$(PKG_SYSTEMD_TMPFILES),$(call __INSTALL_SYSTEMD_TMPFILES,$(file))) +endef + define __INSTALL_PAM -mkdir -pv $(BUILDROOT)/etc/pam.d cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)/etc/pam.d/$(subst .pam,,$(notdir $(1))) @@ -142,6 +152,7 @@ define DO_INSTALL

$(DO_INSTALL_DEFAULT) $(DO_INSTALL_SYSTEMD) + $(DO_INSTALL_SYSTEMD_TMPFILES) $(DO_INSTALL_PAM)

@echo "#####################################################################" diff --git a/pkgs/freeradius/freeradius.nm b/pkgs/freeradius/freeradius.nm index 81f3fd5..4cc46b0 100644 --- a/pkgs/freeradius/freeradius.nm +++ b/pkgs/freeradius/freeradius.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = freeradius-server PKG_VER = 2.1.9 -PKG_REL = 1 +PKG_REL = 2

PKG_MAINTAINER = PKG_GROUPS = System/Daemons diff --git a/pkgs/freeradius/freeradius.tmpfile b/pkgs/freeradius/freeradius.tmpfile deleted file mode 100644 index f06f7f3..0000000 --- a/pkgs/freeradius/freeradius.tmpfile +++ /dev/null @@ -1,2 +0,0 @@ -d /var/run/radiusd 0750 root root - - diff --git a/pkgs/freeradius/freeradius.tmpfiles b/pkgs/freeradius/freeradius.tmpfiles new file mode 100644 index 0000000..f06f7f3 --- /dev/null +++ b/pkgs/freeradius/freeradius.tmpfiles @@ -0,0 +1,2 @@ +d /var/run/radiusd 0750 root root - + diff --git a/pkgs/lighttpd/lighttpd.nm b/pkgs/lighttpd/lighttpd.nm index fefdfd9..ee53eba 100644 --- a/pkgs/lighttpd/lighttpd.nm +++ b/pkgs/lighttpd/lighttpd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = lighttpd PKG_VER = 1.4.28 -PKG_REL = 2 +PKG_REL = 3

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = Networking/Webservers diff --git a/pkgs/lighttpd/lighttpd.tmpfile b/pkgs/lighttpd/lighttpd.tmpfile deleted file mode 100644 index b1fdefd..0000000 --- a/pkgs/lighttpd/lighttpd.tmpfile +++ /dev/null @@ -1 +0,0 @@ -d /var/run/lighttpd 0750 lighttpd lighttpd - diff --git a/pkgs/lighttpd/lighttpd.tmpfiles b/pkgs/lighttpd/lighttpd.tmpfiles new file mode 100644 index 0000000..b1fdefd --- /dev/null +++ b/pkgs/lighttpd/lighttpd.tmpfiles @@ -0,0 +1 @@ +d /var/run/lighttpd 0750 lighttpd lighttpd - diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm index 53d51c6..b9c97ad 100644 --- a/pkgs/radvd/radvd.nm +++ b/pkgs/radvd/radvd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = radvd PKG_VER = 1.7 -PKG_REL = 1 +PKG_REL = 2

PKG_MAINTAINER = PKG_GROUPS = System/Daemons diff --git a/pkgs/radvd/radvd.tmpfile b/pkgs/radvd/radvd.tmpfile deleted file mode 100644 index 8bab232..0000000 --- a/pkgs/radvd/radvd.tmpfile +++ /dev/null @@ -1,2 +0,0 @@ -d /var/run/radvd 0750 radvd radvd - - diff --git a/pkgs/radvd/radvd.tmpfiles b/pkgs/radvd/radvd.tmpfiles new file mode 100644 index 0000000..8bab232 --- /dev/null +++ b/pkgs/radvd/radvd.tmpfiles @@ -0,0 +1,2 @@ +d /var/run/radvd 0750 radvd radvd - + diff --git a/pkgs/systemd/patches/systemd-24-no-manpages.patch b/pkgs/systemd/patches/systemd-24-no-manpages.patch deleted file mode 100644 index 693a24e..0000000 --- a/pkgs/systemd/patches/systemd-24-no-manpages.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -Nur old/Makefile.am new/Makefile.am ---- old/Makefile.am 2011-04-06 21:28:41.000000000 +0200 -+++ new/Makefile.am 2011-04-08 19:45:31.779256001 +0200 -@@ -530,73 +530,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/modules-load.d.5 \ -- man/binfmt.d.5 \ -- man/sysctl.d.5 -- --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 = - --nodist_man_MANS = \ -- man/systemd.special.7 -+MANPAGES_ALIAS = -+ -+dist_man_MANS = -+ -+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-28-no-manpages.patch b/pkgs/systemd/patches/systemd-28-no-manpages.patch new file mode 100644 index 0000000..9685c60 --- /dev/null +++ b/pkgs/systemd/patches/systemd-28-no-manpages.patch @@ -0,0 +1,87 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2011-05-26 19:18:54.000000000 +0200 ++++ b/Makefile.am 2011-06-04 20:56:50.863488131 +0200 +@@ -567,79 +567,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/systemd.nm b/pkgs/systemd/systemd.nm index 9ea2a18..4105734 100644 --- a/pkgs/systemd/systemd.nm +++ b/pkgs/systemd/systemd.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = systemd -PKG_VER = 24 +PKG_VER = 28 PKG_REL = 1

PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org @@ -44,7 +44,7 @@ endef

PKG_CONFLICTS += upstart

-PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.gz

PKG_PACKAGES += $(PKG_NAME)-units $(PKG_NAME)-devel

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