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 3c8feabab81c77fdace9ee9019ccfce07e5bd050 (commit) via 359e71fdf057920f505406d9ceaf89b7056cbdcd (commit) from 05cb8b09a912281250429564d711dbac009b4b7d (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 3c8feabab81c77fdace9ee9019ccfce07e5bd050 Merge: 05cb8b0 359e71f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 23 10:12:30 2013 +0200

Merge remote-tracking branch 'stevee/ntp-fix'

commit 359e71fdf057920f505406d9ceaf89b7056cbdcd Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Apr 14 17:55:31 2013 +0200

ntp: Fix ownership of "/var/lib/ntp".

The folder had the wrong owernship, so ntpd was not able to write to the containing file which may causes troubles and a lot of warnings in the log files.

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

Summary of changes: ntp/ntp.nm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)

Difference in files: diff --git a/ntp/ntp.nm b/ntp/ntp.nm index 2c97eee..9c8bb56 100644 --- a/ntp/ntp.nm +++ b/ntp/ntp.nm @@ -6,7 +6,7 @@ name = ntp version = %{ver_major}.6p5 ver_major = 4.2 -release = 1 +release = 2

groups = System/Daemons url = http://www.ntp.org/ @@ -41,6 +41,9 @@ build ln -svf ../ntpstat-0.2 .

%{MACRO_PATCHES} + + # Create ntp user and group. + %{create_user} end

configure_options += \ @@ -116,9 +119,18 @@ build

mkdir -pv %{unitdir}/ntp-units.d echo "ntpd.service" > %{unitdir}/ntp-units.d/60-ntpd.list + + # Fix ownership. + chown -R ntp:ntp %{BUILDROOT}%{sharedstatedir}/ntp end end

+create_user + getent group ntp >/dev/null || groupadd -g 38 ntp || : + getent passwd ntp >/dev/null || useradd -u 38 -g 38 -s /sbin/nologin \ + -M -r -d %{sysconfdir}/ntp ntp || : +end + packages package %{name} requires @@ -162,9 +174,7 @@ packages end

script prein - getent group ntp >/dev/null || groupadd -g 38 ntp || : - getent passwd ntp >/dev/null || useradd -u 38 -g 38 -s /sbin/nologin \ - -M -r -d %{sysconfdir}/ntp ntp || : + %{create_user} end

script postin

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