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 1efc7351a29d2727123266a62f0de63330fb0956 (commit) via 7f84cbd56fe203915620fa003aff0e2ccaf6d2eb (commit) via 75203eee9d91d687d27c6bb6958b52a799ba04ff (commit) from b91c8dd61cda16dba35771a7ccc0673c26a8f83c (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 1efc7351a29d2727123266a62f0de63330fb0956 Merge: 7f84cbd 75203ee Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 14 17:10:43 2013 +0200

Merge remote-tracking branch 'stevee/aiccu'

commit 7f84cbd56fe203915620fa003aff0e2ccaf6d2eb Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Apr 14 16:45:31 2013 +0200

systemd: Update to 201.

* Remove old patch for branding, because this doens't work in this way anymore. * Drop rpm stuff, we don't want to ship that. * Add dependeny to python-gobect3 for systemd-analyze.

Fixes #10327.

commit 75203eee9d91d687d27c6bb6958b52a799ba04ff Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Apr 14 14:28:22 2013 +0200

aiccu: Add service file for systemd.

Fixes #10348.

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

Summary of changes: aiccu/aiccu.nm | 21 +++++++++++++++----- aiccu/systemd/aiccu@.service | 17 ++++++++++++++++ systemd/patches/systemd-187-ipfire.patch | 33 -------------------------------- systemd/systemd.nm | 19 ++++++++++++------ 4 files changed, 46 insertions(+), 44 deletions(-) create mode 100644 aiccu/systemd/aiccu@.service delete mode 100644 systemd/patches/systemd-187-ipfire.patch

Difference in files: diff --git a/aiccu/aiccu.nm b/aiccu/aiccu.nm index a879172..a97fb4e 100644 --- a/aiccu/aiccu.nm +++ b/aiccu/aiccu.nm @@ -5,7 +5,7 @@

name = aiccu version = 20070115 -release = 1 +release = 2

groups = System/Daemons url = http://www.sixxs.net/tools/aiccu/ @@ -19,6 +19,7 @@ description end

source_dl = http://www.sixxs.net/archive/sixxs/aiccu/unix/ +sources = %{name}_%{version}.tar.gz

build requires @@ -27,11 +28,10 @@ build

DIR_APP = %{DIR_SRC}/%{name}

- build - %{DO_FIX_LIBTOOL} - make %{PARALLELISMFLAGS} RPM_OPT_FLAGS="%{CFLAGS}" - end + make_build_targets += \ + RPM_OPT_FLAGS="%{CFLAGS}"

+ # Remove old sysvinit stuff and emtpy usr/share directory. install_cmds rm -rvf %{BUILDROOT}/{etc,usr/share} end @@ -39,6 +39,17 @@ end

packages package %{name} + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end end

package %{name}-debuginfo diff --git a/aiccu/systemd/aiccu@.service b/aiccu/systemd/aiccu@.service new file mode 100644 index 0000000..38653a6 --- /dev/null +++ b/aiccu/systemd/aiccu@.service @@ -0,0 +1,17 @@ +[Unit] +Description=AICCU (Automatic IPv6 Connectivity Configuration Utility) on %I + +[Service] +ExecStartPre=/usr/lib/network/helpers/aiccu-config-helper create %I +ExecStart=/usr/sbin/aiccu start /run/network/%I/aiccu.conf +ExecStop=/usr/sbin/aiccu stop /run/network/%I/aiccu.conf +ExecStopPost=/usr/lib/network/helpers/aiccu-config-helper remove %I + +UtmpIdentifier=%I + +# WARNING: never run AICCU from DaemonTools or a similar automated +# 'restart' tool/script. When AICCU does not start, it has a reason +# not to start which it gives on either the stdout or in the (sys)log +# file. The TIC server *will* automatically disable accounts which +# are detected to run in this mode. +Restart=no diff --git a/systemd/patches/systemd-187-ipfire.patch b/systemd/patches/systemd-187-ipfire.patch deleted file mode 100644 index fbd8ea6..0000000 --- a/systemd/patches/systemd-187-ipfire.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/systemd.nm b/systemd/systemd.nm index d93414b..9c1ca21 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ###############################################################################

name = systemd -version = 196 -release = 3 +version = 201 +release = 1

maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -54,7 +54,9 @@ build end

configure_options += \ - --with-distro=ipfire \ + --with-sysvinit-path= \ + --with-sysvrcnd-path= \ + --enable-introspection=yes \ --disable-static

prepare_cmds @@ -101,15 +103,18 @@ build

# Replace absolute symlinks by relative ones. cd %{BUILDROOT}%{unitdir}/../user - for i in bluetooth local-fs printer remote-fs shutdown sockets sound swap; do + for i in bluetooth local-fs paths printer remote-fs shutdown smartcard sockets sound swap timers; do ln -svf ../system/${i}.target ${i}.target || exit 1 done

# Remove tmpfile for X11 rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf

- # Remove unneeded symlink for xdg - rm -rfv %{BUILDROOT}/etc/xdg/systemd + # Remove unneeded stuff for xdg + rm -rfv %{BUILDROOT}/etc/xdg + + # Remove unneeded stuff for rpm. + rm -rvf %{BUILDROOT}/etc/rpm

# Use journald. Enable the import of kernel messages. # Stop forwarding to a syslog daemon. @@ -134,6 +139,7 @@ packages hwdata python-cairo python-dbus + python-gobject3 %{name}-units=%{thisver} util-linux>=2.19 end @@ -151,6 +157,7 @@ packages end

conflicts + bash-completion < 2.1 dracut < 019 filesystem < 002 rsyslog < 5.8.6-4

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