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 cf106a2116fe4643499d8afa5b5e68e19d63f465 (commit) via 755fe9863249649ec57a1d9557f16f253ba52b9b (commit) via e633b4ff0a5c0212a8c6416e797b50c9588eb4be (commit) from 74af03130fc87ecb5a25b23d39ff03c2f2c971a7 (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 cf106a2116fe4643499d8afa5b5e68e19d63f465 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jul 29 15:06:01 2012 +0200

rsyslog: Don't automatically enable this service anymore.

As a result after the movement to journald as logging daemon we don't want to autostart the rsyslog after reboot.

Fixes #10199.

commit 755fe9863249649ec57a1d9557f16f253ba52b9b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jul 29 14:58:21 2012 +0200

systemd: Use journald for system and kernel logging.

From now we will use the shipped journal daemon, to log and watch our messages from system and kernel.

Reference #10199.

commit e633b4ff0a5c0212a8c6416e797b50c9588eb4be Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jul 26 21:14:51 2012 +0200

systemd: Update to 187.

Permanently disable testsuite, because it isn't working in our chroot environment.

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

Summary of changes: rsyslog/rsyslog.nm | 9 +++--- ...md-44-ipfire.patch => systemd-187-ipfire.patch} | 29 +++++++++---------- systemd/systemd.nm | 26 +++++++++++++---- 3 files changed, 39 insertions(+), 25 deletions(-) rename systemd/patches/{systemd-44-ipfire.patch => systemd-187-ipfire.patch} (60%)

Difference in files: diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm index 70ceb94..1956a38 100644 --- a/rsyslog/rsyslog.nm +++ b/rsyslog/rsyslog.nm @@ -5,7 +5,7 @@

name = rsyslog version = 5.8.6 -release = 3 +release = 4

groups = System/Daemons url = http://www.rsyslog.com/ @@ -74,8 +74,6 @@ packages [ -f "${n}" ] && continue umask 066 && touch ${n} done - - /bin/systemctl enable rsyslog.service >/dev/null 2>&1 || : end

script preun @@ -87,9 +85,12 @@ packages /bin/systemctl daemon-reload >/dev/null 2>&1 || : end

+ # Disable and stop rsyslog after update, because we use the + # journal daemon from systemd from now. script postup /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl try-restart rsyslog.service >/dev/null 2>&1 || : + /bin/systemctl disable rsyslog.service >/dev/null 2>&1 || : + /bin/systemctl stop rsyslog.service >/dev/null 2>&1 || : end end

diff --git a/systemd/patches/systemd-187-ipfire.patch b/systemd/patches/systemd-187-ipfire.patch new file mode 100644 index 0000000..fbd8ea6 --- /dev/null +++ b/systemd/patches/systemd-187-ipfire.patch @@ -0,0 +1,33 @@ +diff -Nur a/configure.ac b/configure.ac +--- a/configure.ac 2012-07-20 00:40:32.000000000 +0200 ++++ b/configure.ac 2012-07-26 21:01:58.319135633 +0200 +@@ -504,7 +504,7 @@ + AC_PATH_PROG([XSLTPROC], [xsltproc]) + AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) + +-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other])) ++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom, ipfire or other])) + if test "z$with_distro" = "z"; then + if test "$cross_compiling" = yes; then + AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) +@@ -587,6 +587,12 @@ + AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia]) + M4_DEFINES=-DTARGET_MAGEIA=1 + ;; ++ ipfire) ++ SYSTEM_SYSVINIT_PATH= ++ SYSTEM_SYSVRCND_PATH= ++ AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire]) ++ M4_DEFINES=-DTARGET_IPFIRE=1 ++ ;; + other) + ;; + *) +@@ -639,6 +645,7 @@ + AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) + AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) + AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia) ++AM_CONDITIONAL(TARGET_IPFIRE, test x"$with_distro" = xipfire) + + AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") + diff --git a/systemd/patches/systemd-44-ipfire.patch b/systemd/patches/systemd-44-ipfire.patch deleted file mode 100644 index 6dca550..0000000 --- a/systemd/patches/systemd-44-ipfire.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur a/configure.ac b/configure.ac ---- a/configure.ac 2012-03-16 01:46:57.000000000 +0100 -+++ b/configure.ac 2012-03-24 20:43:33.723789319 +0100 -@@ -396,7 +396,7 @@ - - AC_PATH_PROG([M4], [m4]) - --AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom or other])) -+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom, ipfire or other])) - if test "z$with_distro" = "z"; then - if test "$cross_compiling" = yes; then - AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) -@@ -492,6 +492,13 @@ - M4_DISTRO_FLAG=-DTARGET_MAGEIA=1 - have_plymouth=yes - ;; -+ ipfire) -+ SYSTEM_SYSVINIT_PATH= -+ SYSTEM_SYSVRCND_PATH= -+ AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire]) -+ M4_DEFINES=-DTARGET_IPFIRE=1 -+ have_plymouth=yes -+ ;; - other) - ;; - *) -@@ -550,6 +557,7 @@ - AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego) - AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) - AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia) -+AM_CONDITIONAL(TARGET_IPFIRE, test x"$with_distro" = xipfire) - - AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes") - AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 30e72e1..b3575f6 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ###############################################################################

name = systemd -version = 186 -release = 1 +version = 187 +release = 2

maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -58,11 +58,10 @@ build ./autogen.sh ac end

- test - make check - end - install_cmds + # Create folder in log to store the journal. + mkdir -pv %{BUILDROOT}/var/log/journal + # Create sysv compatible symlinks. mkdir -pv %{BUILDROOT}%{sbindir} ln -svf ../lib/systemd/systemd %{BUILDROOT}/%{sbindir}/init @@ -108,6 +107,13 @@ build

# Remove unneeded symlink for xdg rm -rfv %{BUILDROOT}/etc/xdg/systemd + + # Use journald. Enable the import of kernel messages. + # Stop forwarding to a syslog daemon. + sed \ + -e "s/^#ForwardToSyslog=.*$/ForwardToSyslog=no/" \ + -e "s/^#ImportKernel=.*$/ImportKernel=yes/" \ + -i %{BUILDROOT}/etc/systemd/journald.conf end end

@@ -134,12 +140,14 @@ packages /sbin/reboot /sbin/shutdown

+ syslog udev = %{thisver} end

conflicts dracut < 019 filesystem < 002 + rsyslog < 5.8.6-4 upstart end

@@ -199,6 +207,12 @@ packages # Restart login service after update /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : + + # Use the new journald configuration file and restart the service. + if ! grep -xq ImportKernel=yes /etc/systemd/journald.conf ; then + mv /etc/systemd/journald.conf.paknew /etc/systemd/journald.conf + /usr/bin/systemctl restart systemd-journald.service >/dev/null 2>&1 || : + fi end

# Be sure to start the new udev after everything is done.

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