[Frugalware-git] frugalware-current: ntp-4.2.6p4-2-i686

Michel Hermier hermier at frugalware.org
Wed Nov 2 20:29:21 CET 2011


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9cd00004a30f31b63aa7da531096b175ff8d96dc

commit 9cd00004a30f31b63aa7da531096b175ff8d96dc
Author: Michel Hermier <hermier at frugalware.org>
Date:   Wed Nov 2 20:27:44 2011 +0100

ntp-4.2.6p4-2-i686

* Rebuild with libedit instead of readline (expected by the configure
script).
* Migrate to systemd service.

diff --git a/source/network-extra/ntp/FrugalBuild b/source/network-extra/ntp/FrugalBuild
index 3fb6afa..3a87a42 100644
--- a/source/network-extra/ntp/FrugalBuild
+++ b/source/network-extra/ntp/FrugalBuild
@@ -1,34 +1,33 @@
# Compiling Time: 0.85 SBU
-# Maintainer: CSÉCSY László <boobaa at frugalware.org>
+# Maintainer: CSÉCSY László <boobaa at frugalware.org>
# Contributor: Krisztian VASAS <iron at frugalware.org>

pkgname=ntp
pkgver=4.2.6p4
-pkgrel=1
+pkgrel=2
pkgdesc="The ntp daemon from ntp.org"
url="http://www.ntp.org/"
conflicts=('openntpd')
groups=('network-extra')
archs=('i686' 'x86_64' 'arm')
-depends=('openssl>=1.0.0' 'readline')
+depends=('openssl>=1.0.0' 'libedit')
up2date="lynx -dump http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ | grep -m1 'http.*tar.gz$' | sed 's/.*ntp-\(.*\)\.tar.*/\1/'"
source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/$pkgname-$pkgver.tar.gz \
ntp-4.2.6p1-nano.patch \
-	rc.ntpd rc.ntpd.pot ntp.org.conf)
+	ntpd.service \
+	ntp.org.conf)
backup=(etc/ntp.org.conf)
sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' \
'21ecca90c622951fcb8469ee5822416bb6bf6a68' \
-          '2bf638fba95847568e45afc7b2cfdf6d1767b429' \
-          '6f0275b9c1adcdef0c441408d8b5c4e4c82e1de4' \
+          'e38e44b2e9e418f89417ac140991c02b8cf1e353' \
'9e116eabff29a0216bfc2c56817ba48d1f3182f6')

-
# TODO: add some sort init script
build()
{
Fbuild
-	Fmkdir etc/rc.d
Ffile ntp.org.conf /etc
-	Fexe rc.ntpd /etc/rc.d
+	Fmkdir lib/systemd/system/
+	Finstall 0644 ntpd.service /lib/systemd/system/ntpd.service
}
# optimization OK
diff --git a/source/network-extra/ntp/ntp-4.2.0-gcc4.diff b/source/network-extra/ntp/ntp-4.2.0-gcc4.diff
deleted file mode 100644
index b2be506..0000000
--- a/source/network-extra/ntp/ntp-4.2.0-gcc4.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur ntp-4.2.0.orig/include/ntp_control.h ntp-4.2.0/include/ntp_control.h
---- ntp-4.2.0.orig/include/ntp_control.h	2003-08-14 09:31:47.000000000 +0200
-+++ ntp-4.2.0/include/ntp_control.h	2006-01-30 16:14:44.000000000 +0100
-@@ -266,6 +266,7 @@
- 	u_char tr_flags;		/* trap flags */
- 	u_char tr_version;		/* version number of trapper */
- };
-+extern struct ctl_trap ctl_trap[];
-
- /*
-  * Flag bits
-diff -Naur ntp-4.2.0.orig/include/ntpd.h ntp-4.2.0/include/ntpd.h
---- ntp-4.2.0.orig/include/ntpd.h	2003-09-13 05:08:04.000000000 +0200
-+++ ntp-4.2.0/include/ntpd.h	2006-01-30 16:14:44.000000000 +0100
-@@ -226,8 +226,6 @@
- #endif
-
- /* ntp_control.c */
--struct ctl_trap;
--extern struct ctl_trap ctl_trap[];
- extern int	num_ctl_traps;
- extern keyid_t	ctl_auth_keyid;		/* keyid used for authenticating write requests */
-
-diff -Naur ntp-4.2.0.orig/include/ntp_refclock.h ntp-4.2.0/include/ntp_refclock.h
---- ntp-4.2.0.orig/include/ntp_refclock.h	2003-07-17 12:27:16.000000000 +0200
-+++ ntp-4.2.0/include/ntp_refclock.h	2006-01-30 16:14:44.000000000 +0100
-@@ -65,6 +65,7 @@
- 	const char *clocktype;	/* long description */
- 	const char *abbrev;	/* short description */
- };
-+extern struct clktype clktypes[];
-
- /*
-  * Configuration flag values
-diff -Naur ntp-4.2.0.orig/include/ntp_stdlib.h ntp-4.2.0/include/ntp_stdlib.h
---- ntp-4.2.0.orig/include/ntp_stdlib.h	2003-07-17 12:27:16.000000000 +0200
-+++ ntp-4.2.0/include/ntp_stdlib.h	2006-01-30 16:14:44.000000000 +0100
-@@ -133,10 +133,6 @@
- extern u_char *	cache_key;		/* key pointer */
- extern u_int	cache_keylen;		/* key length */
-
--/* clocktypes.c */
--struct clktype;
--extern struct clktype clktypes[];
--
- /* getopt.c */
- extern char *	ntp_optarg;		/* global argument pointer */
- extern int	ntp_optind;		/* global argv index */
diff --git a/source/network-extra/ntp/ntpd.service b/source/network-extra/ntp/ntpd.service
new file mode 100644
index 0000000..0df9402
--- /dev/null
+++ b/source/network-extra/ntp/ntpd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Network Time Service
+
+[Service]
+ExecStart=/usr/bin/ntpd -g -c /etc/ntp.org.conf
+
+[Install]
+WantedBy=time-sync.target
\ No newline at end of file
diff --git a/source/network-extra/ntp/rc.ntpd b/source/network-extra/ntp/rc.ntpd
deleted file mode 100644
index ea82a93..0000000
--- a/source/network-extra/ntp/rc.ntpd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# (c) 2005 Marcus Habermehl <bmh1980de at yahoo.de>
-# (c) 2004 Peter BARABAS <z0d at artifact.hu>
-# (c) 2007 CSÉCSY László <boobaa at frugalware.org>
-# rc.ntpd for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 32 56
-# description: Starts or stops NTP.org daemon
-
-source /lib/initscripts/functions
-TEXTDOMAIN=ntpd
-TEXTDOMAINDIR=/lib/initscripts/messages
-
-actions=(restart status start stop)
-daemon=$"NTP.org daemon"
-
-pidfile=/var/run/ntp.pid
-
-rc_start()
-{
-	start_msg
-	if [ ! -e $pidfile ]; then
-		/usr/bin/ntpd -g -c /etc/ntp.org.conf
-		ok $?
-	else
-		ok 999
-	fi
-}
-
-rc_stop()
-{
-	stop_msg
-	if [ -e $pidfile ]; then
-		kill `cat $pidfile`
-		rm $pidfile
-		ok $?
-	else
-		ok 999
-	fi
-}
-
-rc_exec $1
diff --git a/source/network-extra/ntp/rc.ntpd.pot b/source/network-extra/ntp/rc.ntpd.pot
deleted file mode 100644
index 7d9da8c..0000000
--- a/source/network-extra/ntp/rc.ntpd.pot
+++ /dev/null
@@ -1,20 +0,0 @@
-# rc.ntpd.
-# Copyright (C) YEAR THE rc.ntpd'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.ntpd package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 20:49+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "NTP.org daemon"
-msgstr ""


More information about the Frugalware-git mailing list