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 45ec81cff7eb1c3130c061ef7f3d38d5ea533039 (commit) via 045f6086c758e8faae50a6654af9e3435992b83d (commit) from f3ee8a0fa545fbe65c2244821183b7625eaf1fff (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 45ec81cff7eb1c3130c061ef7f3d38d5ea533039 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 27 22:53:37 2011 +0200

chrony: Fix path to chrony-helper in systemd unit file.

commit 045f6086c758e8faae50a6654af9e3435992b83d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Jul 27 20:28:29 2011 +0200

texinfo: Fix error in testsuite.

Fixes #222

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

Summary of changes: pkgs/chrony/chrony.nm | 2 +- pkgs/chrony/systemd/chronyd.service | 4 ++-- .../patches/texinfo-4.13a-testsuite_fix.patch | 13 +++++++++++++ pkgs/texinfo/texinfo.nm | 9 ++++----- 4 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 pkgs/texinfo/patches/texinfo-4.13a-testsuite_fix.patch

Difference in files: diff --git a/pkgs/chrony/chrony.nm b/pkgs/chrony/chrony.nm index ae3a269..40cf580 100644 --- a/pkgs/chrony/chrony.nm +++ b/pkgs/chrony/chrony.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = chrony PKG_VER = 1.26 -PKG_REL = 3 +PKG_REL = 4

PKG_MAINTAINER = PKG_GROUPS = Base System/Daemons diff --git a/pkgs/chrony/systemd/chronyd.service b/pkgs/chrony/systemd/chronyd.service index bcff9cb..0180982 100644 --- a/pkgs/chrony/systemd/chronyd.service +++ b/pkgs/chrony/systemd/chronyd.service @@ -5,9 +5,9 @@ Conflicts=ntpd.service

[Service] EnvironmentFile=-/etc/sysconfig/chronyd -ExecStartPre=/usr/libexec/chrony-helper generate-commandkey +ExecStartPre=/usr/lib/chrony-helper generate-commandkey ExecStart=/usr/sbin/chronyd -n -u chrony $OPTIONS -ExecStartPost=/usr/libexec/chrony-helper add-dhclient-servers +ExecStartPost=/usr/lib/chrony-helper add-dhclient-servers

[Install] WantedBy=multi-user.target diff --git a/pkgs/texinfo/patches/texinfo-4.13a-testsuite_fix.patch b/pkgs/texinfo/patches/texinfo-4.13a-testsuite_fix.patch new file mode 100644 index 0000000..5286e7d --- /dev/null +++ b/pkgs/texinfo/patches/texinfo-4.13a-testsuite_fix.patch @@ -0,0 +1,13 @@ +diff -Nur a/makeinfo/tests/accentenc b/makeinfo/tests/accentenc +--- a/makeinfo/tests/accentenc 2004-04-11 19:56:47.000000000 +0200 ++++ b/makeinfo/tests/accentenc 2011-07-27 20:24:36.603237061 +0200 +@@ -1,7 +1,8 @@ + #!/bin/sh + # Test encoded accent info output. + +-unset TEXINFO_OUTPUT ++unset TEXINFO_OUTPUT LANG LANGUAGE ++LC_ALL=POSIX; export LC_ALL + : ${srcdir=.} + input=`basename $0`.txi + output=`basename $0`.info diff --git a/pkgs/texinfo/texinfo.nm b/pkgs/texinfo/texinfo.nm index 99cea53..04ea3eb 100644 --- a/pkgs/texinfo/texinfo.nm +++ b/pkgs/texinfo/texinfo.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = texinfo PKG_VER = 4.13a -PKG_REL = 1 +PKG_REL = 2

PKG_MAINTAINER = PKG_GROUPS = Applications/Publishing @@ -46,7 +46,6 @@ PKG_TARBALL = $(THISAPP).tar.gz

DIR_APP = $(DIR_SRC)/$(PKG_NAME)-4.13

-# XXX testsuite fails and needs to be fixed. -#define STAGE_TEST -# cd $(DIR_APP) && make check -#endef +define STAGE_TEST + cd $(DIR_APP) && make check +endef

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