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 164c0d73e5858e7b9a791a954487a21cae51679e (commit) via 062f14b2a1b45969c0434d0601dd515447cd078c (commit) via 5feccd1492c0fb22ffb52d14b0e70989ad101247 (commit) via 3b95b236ddc9d12f5ab925f06351c0dc569d660b (commit) via b5fa6389f08a862d77492e76438a0b4a9a451a58 (commit) from fe7131a4276be30502ebcc39c22d2a40ca5e12cf (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 164c0d73e5858e7b9a791a954487a21cae51679e Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 25 14:22:35 2011 +0200
chrony: New package.
This package replaces ntp, because chrony is claimed to be more robust on buggy internet connections and does not make the CPU wake up too often.
commit 062f14b2a1b45969c0434d0601dd515447cd078c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 25 14:22:14 2011 +0200
ntp: Remove package.
commit 5feccd1492c0fb22ffb52d14b0e70989ad101247 Merge: 3b95b23 b5fa638 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 25 11:46:08 2011 +0200
Merge remote-tracking branch 'stevee/hostapd'
commit 3b95b236ddc9d12f5ab925f06351c0dc569d660b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 24 18:18:48 2011 +0200
build-essentials: Add support for prerequires.
commit b5fa6389f08a862d77492e76438a0b4a9a451a58 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jul 17 14:56:14 2011 +0200
hostapd: Process will be monitored by systemd.
-----------------------------------------------------------------------
Summary of changes: pkgs/build-essentials/build-essentials.nm | 6 +- .../buildsystem-tools/dependency-tracker | 6 ++- pkgs/build-essentials/buildsystem/Constants | 5 ++ pkgs/chrony/chrony-helper | 68 ++++++++++++++++++++ pkgs/chrony/chrony.conf | 39 +++++++++++ pkgs/chrony/chrony.dhclient | 24 +++++++ pkgs/chrony/chrony.keys | 1 + pkgs/chrony/chrony.logrotate | 8 ++ pkgs/{sqlite/sqlite.nm => chrony/chrony.nm} | 62 ++++++++++-------- pkgs/chrony/systemd/chrony-wait.service | 16 +++++ pkgs/chrony/systemd/chronyd.service | 13 ++++ pkgs/hostapd/hostapd.nm | 2 +- pkgs/hostapd/systemd/hostapd@.service | 18 +++++ pkgs/ntp/ntp.conf | 4 - pkgs/ntp/ntp.nm | 57 ---------------- pkgs/ntp/systemd/ntp.service | 10 --- 16 files changed, 236 insertions(+), 103 deletions(-) create mode 100644 pkgs/chrony/chrony-helper create mode 100644 pkgs/chrony/chrony.conf create mode 100644 pkgs/chrony/chrony.dhclient create mode 100644 pkgs/chrony/chrony.keys create mode 100644 pkgs/chrony/chrony.logrotate copy pkgs/{sqlite/sqlite.nm => chrony/chrony.nm} (58%) create mode 100644 pkgs/chrony/systemd/chrony-wait.service create mode 100644 pkgs/chrony/systemd/chronyd.service create mode 100644 pkgs/hostapd/systemd/hostapd@.service delete mode 100644 pkgs/ntp/ntp.conf delete mode 100644 pkgs/ntp/ntp.nm delete mode 100644 pkgs/ntp/systemd/ntp.service
Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index c708204..e29fa42 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -25,9 +25,9 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials -PKG_VER = $(DISTRO_VERSION) -PKG_REL = 20 -PKG_EPOCH = 1 +PKG_VER = 1.0 +PKG_REL = 1 +PKG_EPOCH = 2 PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org diff --git a/pkgs/build-essentials/buildsystem-tools/dependency-tracker b/pkgs/build-essentials/buildsystem-tools/dependency-tracker index 887b7f4..1c29025 100755 --- a/pkgs/build-essentials/buildsystem-tools/dependency-tracker +++ b/pkgs/build-essentials/buildsystem-tools/dependency-tracker @@ -16,8 +16,12 @@ for require in $(find_requires ${args}); do listmatch ${require} ${provides} || requires="${requires} ${require}" done
-echo "provides="${provides}"" +if [ -n "${PKG_PREREQUIRES}" ]; then + echo "prerequires="/bin/sh ${PKG_PREREQUIRES}"" +fi echo "requires="${requires}"" +echo "provides="${provides}"" +echo "provides="${PKG_CONFLICTS}"" echo "obsoletes="${PKG_OBSOLETES}""
exit 0 diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index 19a5e8a..d46d5f3 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -61,8 +61,12 @@ SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d PKG_VARIABLES = \ CONTROL_PREIN \ CONTROL_PREUN \ + CONTROL_PREUP \ CONTROL_POSTIN \ CONTROL_POSTUN \ + CONTROL_POSTUP \ + CONTROL_POSTTRANSIN \ + CONTROL_POSTTRANSUN \ \ PKG_ARCH \ PKG_BUILD_DEPS \ @@ -80,6 +84,7 @@ PKG_VARIABLES = \ PKG_URL \ PKG_VER \ \ + PKG_PREREQUIRES \ PKG_PROVIDES_FILTER \ PKG_REQUIRES_FILTER
diff --git a/pkgs/chrony/chrony-helper b/pkgs/chrony/chrony-helper new file mode 100644 index 0000000..a5bbf84 --- /dev/null +++ b/pkgs/chrony/chrony-helper @@ -0,0 +1,68 @@ +#!/bin/bash + +config=/etc/chrony.conf +keyfile=/etc/chrony.keys +chronyc=/usr/bin/chronyc +dhclient_servers=/var/lib/dhclient/chrony.servers.* +service_name=chronyd.service + +get_key() { + awk '/^[ \t]*'$1'>/ { print $2; exit }' < $keyfile +} + +get_commandkeyid() { + awk '/^[ \t]*commandkey>/ { keyid=$2 } END { print keyid }' < $config +} + +chrony_command() { + commandkeyid=$(get_commandkeyid) + [ -z "$commandkeyid" ] && return 1 + commandkey=$(get_key $commandkeyid) + [ -z "$commandkey" ] && return 2 + + $chronyc <<EOF +password $commandkey +$1 +EOF +} + +generate_commandkey() { + commandkeyid=$(get_commandkeyid) + [ -z "$commandkeyid" ] && return 1 + commandkey=$(get_key $commandkeyid) + [ -z "$commandkey" ] || return 0 + + commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 8) + [ -n "$commandkey" ] && echo "$commandkeyid $commandkey" >> $keyfile +} + +add_dhclient_servers() { + command=$(cat $dhclient_servers 2> /dev/null | + while read server serverargs; do + echo "add server $server $serverargs" + done) + if [ -n "$command" ]; then + chrony_command "$command" &> /dev/null + fi +} + +is_running() { + systemctl status chronyd.service &> /dev/null +} + +case "$1" in + generate-commandkey) + generate_commandkey + ;; + add-dhclient-servers) + add_dhclient_servers + ;; + command) + is_running && chrony_command "$2" + ;; + *) + echo $"Usage: $0 {generate-commandkey|add-dhclient-servers|command}" + exit 2 +esac +exit $? + diff --git a/pkgs/chrony/chrony.conf b/pkgs/chrony/chrony.conf new file mode 100644 index 0000000..7e3690b --- /dev/null +++ b/pkgs/chrony/chrony.conf @@ -0,0 +1,39 @@ +# Use public servers from the pool.ntp.org project. +# Please consider joining the pool (http://www.pool.ntp.org/join.html). +server 0.fedora.pool.ntp.org iburst +server 1.fedora.pool.ntp.org iburst +server 2.fedora.pool.ntp.org iburst +server 3.fedora.pool.ntp.org iburst + +# Ignore stratum in source selection. +stratumweight 0 + +# Record the rate at which the system clock gains/losses time. +driftfile /var/lib/chrony/drift + +# Enable kernel RTC synchronization. +rtcsync + +# In first three updates step the system clock instead of slew +# if the adjustment is larger than 100 seconds. +makestep 100 3 + +# Allow client access from local network. +#allow 192.168/16 + +# Serve time even if not synchronized to any NTP server. +#local stratum 10 + +keyfile /etc/chrony.keys + +# Specify the key used as password for chronyc. +commandkey 1 + +# Disable logging of client accesses. +noclientlog + +# Send a message to syslog if a clock adjustment is larger than 0.5 seconds. +logchange 0.5 + +logdir /var/log/chrony +#log measurements statistics tracking diff --git a/pkgs/chrony/chrony.dhclient b/pkgs/chrony/chrony.dhclient new file mode 100644 index 0000000..73fa893 --- /dev/null +++ b/pkgs/chrony/chrony.dhclient @@ -0,0 +1,24 @@ +#!/bin/bash + +SERVERFILE=$SAVEDIR/chrony.servers.$interface + +chrony_config() { + rm -f $SERVERFILE + if [ "$PEERNTP" != "no" ]; then + /usr/libexec/chrony-helper command "$( + for server in $new_ntp_servers; do + echo "add server $server $NTPSERVERARGS" + echo "$server $NTPSERVERARGS" >> $SERVERFILE + done)" &> /dev/null + fi +} + +chrony_restore() { + if [ -f $SERVERFILE ]; then + /usr/libexec/chrony-helper command "$( + while read server serverargs; do + echo "delete $server" + done < $SERVERFILE)" &> /dev/null + rm -f $SERVERFILE + fi +} diff --git a/pkgs/chrony/chrony.keys b/pkgs/chrony/chrony.keys new file mode 100644 index 0000000..6bed03a --- /dev/null +++ b/pkgs/chrony/chrony.keys @@ -0,0 +1 @@ +#1 a_key diff --git a/pkgs/chrony/chrony.logrotate b/pkgs/chrony/chrony.logrotate new file mode 100644 index 0000000..4bb83b2 --- /dev/null +++ b/pkgs/chrony/chrony.logrotate @@ -0,0 +1,8 @@ +/var/log/chrony/*.log { + missingok + nocreate + sharedscripts + postrotate + /usr/libexec/chrony-helper command cyclelogs > /dev/null 2>&1 || true + endscript +} diff --git a/pkgs/chrony/chrony.nm b/pkgs/chrony/chrony.nm new file mode 100644 index 0000000..d5d4e63 --- /dev/null +++ b/pkgs/chrony/chrony.nm @@ -0,0 +1,75 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = chrony +PKG_VER = 1.26 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = System/Daemons +PKG_URL = http://chrony.tuxfamily.org +PKG_LICENSE = GPLv2 +PKG_SUMMARY = An NTP client/server. + +PKG_BUILD_DEPS+= bison libcap-devel readline-devel texinfo + +define PKG_DESCRIPTION + A client/server for the Network Time Protocol, this program keeps your + computer's clock accurate. It was specially designed to support + systems with intermittent internet connections, but it also works well + in permanently connected environments. It can use also hardware reference + clocks, system real-time clock or manual input as time references. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME)-devel + +CONFIGURE_OPTIONS += \ + --with-sendmail=/usr/sbin/sendmail + +STAGE_BUILD_TARGETS += getdate all docs +STAGE_INSTALL_TARGETS += install-docs + +define STAGE_INSTALL_CMDS + -mkdir -pv $(BUILDROOT)/var/{lib,log}/chrony + touch $(BUILDROOT)/var/lib/chrony/{drift,rtc} + + -mkdir -pv $(BUILDROOT)/etc + install -m 644 -p $(DIR_SOURCE)/chrony.conf $(BUILDROOT)/etc/chrony.conf + install -m 640 -p $(DIR_SOURCE)/chrony.keys $(BUILDROOT)/etc/chrony.keys + + -mkdir -pv $(BUILDROOT)/etc/dhcp/dhclient.d + install -m 755 -p $(DIR_SOURCE)/chrony.dhclient \ + $(BUILDROOT)/etc/dhcp/dhclient.d/chrony.sh + + -mkdir -pv $(BUILDROOT)/etc/logrotate.d + install -m 644 -p $(DIR_SOURCE)/chrony.logrotate \ + $(BUILDROOT)/etc/logrotate.d/chrony + + -mkdir -pv $(BUILDROOT)/usr/lib/chrony + install -m 755 -p $(DIR_SOURCE)/chrony-helper $(BUILDROOT)/usr/lib/chrony-helper +endef diff --git a/pkgs/chrony/systemd/chrony-wait.service b/pkgs/chrony/systemd/chrony-wait.service new file mode 100644 index 0000000..3958160 --- /dev/null +++ b/pkgs/chrony/systemd/chrony-wait.service @@ -0,0 +1,16 @@ +[Unit] +Description=Wait for chrony to synchronize system clock +After=chronyd.service +Requires=chronyd.service +Before=time-sync.target +Wants=time-sync.target + +[Service] +Type=oneshot +# Wait up to ~10 minutes for chronyd to synchronize and the remaining +# clock correction to be less than 0.1 seconds +ExecStart=/usr/bin/chronyc waitsync 60 0.1 +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/chrony/systemd/chronyd.service b/pkgs/chrony/systemd/chronyd.service new file mode 100644 index 0000000..bcff9cb --- /dev/null +++ b/pkgs/chrony/systemd/chronyd.service @@ -0,0 +1,13 @@ +[Unit] +Description=NTP client/server +After=syslog.target ntpdate.service +Conflicts=ntpd.service + +[Service] +EnvironmentFile=-/etc/sysconfig/chronyd +ExecStartPre=/usr/libexec/chrony-helper generate-commandkey +ExecStart=/usr/sbin/chronyd -n -u chrony $OPTIONS +ExecStartPost=/usr/libexec/chrony-helper add-dhclient-servers + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/hostapd/hostapd.nm b/pkgs/hostapd/hostapd.nm index 1188bfa..fdcd248 100644 --- a/pkgs/hostapd/hostapd.nm +++ b/pkgs/hostapd/hostapd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = hostapd PKG_VER = 0.6.9 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = Networking/Tools diff --git a/pkgs/hostapd/systemd/hostapd@.service b/pkgs/hostapd/systemd/hostapd@.service new file mode 100644 index 0000000..2cff6d9 --- /dev/null +++ b/pkgs/hostapd/systemd/hostapd@.service @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=WLAN AP on %I +BindTo=dev-%I.device +After=dev-%I.device network.service +Requires=network.service + +[Service] +ExecStart=/usr/bin/hostapd -dd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config +#Restart=always +UtmpIdentifier=%I +KillMode=process diff --git a/pkgs/ntp/ntp.conf b/pkgs/ntp/ntp.conf deleted file mode 100644 index 4b89e83..0000000 --- a/pkgs/ntp/ntp.conf +++ /dev/null @@ -1,4 +0,0 @@ -restrict default nomodify noquery -restrict 127.0.0.1 -server pool.ntp.org -driftfile /etc/ntp/drift diff --git a/pkgs/ntp/ntp.nm b/pkgs/ntp/ntp.nm deleted file mode 100644 index 3fb3e92..0000000 --- a/pkgs/ntp/ntp.nm +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = ntp -PKG_VER = 4.2.6p1 -PKG_REL = 2 - -PKG_MAINTAINER = -PKG_GROUPS = Base System/Daemons -PKG_URL = http://www.ntp.org/ -PKG_LICENSE = MIT, BSD and GPLv2 -PKG_SUMMARY = The NTP daemon and utilities. - -PKG_BUILD_DEPS+= openssl-devel readline-devel - -define PKG_DESCRIPTION - The Network Time Protocol (NTP) is used to synchronize a computer's \ - time with another reference time source. This package includes ntpd \ - and utilities used to query and configure the ntpd daemon. -endef - -PKG_TARBALL = $(THISAPP).tar.gz - -CFLAGS += -DMOD_NANO - -CONFIGURE_OPTIONS += \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --with-binsubdir=sbin - -define STAGE_INSTALL_CMDS - -mkdir -pv $(BUILDROOT)/etc - cp -vf $(DIR_SOURCE)/ntp.conf $(BUILDROOT)/etc/ntp.conf -endef diff --git a/pkgs/ntp/systemd/ntp.service b/pkgs/ntp/systemd/ntp.service deleted file mode 100644 index f2cc060..0000000 --- a/pkgs/ntp/systemd/ntp.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Network Time Protocol Daemon -After=network.target - -[Service] -ExecStart=/usr/sbin/ntpd -4 -n -c /etc/ntp.conf - -[Install] -WantedBy=multi-user.target -
hooks/post-receive -- IPFire 3.x development tree