diff options
Diffstat (limited to 'net-misc/chrony/files')
| -rw-r--r-- | net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff | 46 | ||||
| -rw-r--r-- | net-misc/chrony/files/chrony-1.19-conf.c-gentoo.diff | 11 | ||||
| -rw-r--r-- | net-misc/chrony/files/chrony-1.21-addrfilt.c.diff | 86 | ||||
| -rw-r--r-- | net-misc/chrony/files/chrony-1.21-io_linux.h.diff | 43 | ||||
| -rw-r--r-- | net-misc/chrony/files/chronyd.conf | 34 | ||||
| -rw-r--r-- | net-misc/chrony/files/chronyd.rc | 34 | ||||
| -rw-r--r-- | net-misc/chrony/files/digest-chrony-1.19 | 1 | ||||
| -rw-r--r-- | net-misc/chrony/files/digest-chrony-1.21 | 3 |
8 files changed, 164 insertions, 94 deletions
diff --git a/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff b/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff deleted file mode 100644 index 7f1f2c9cccfc..000000000000 --- a/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- examples/chrony.conf.example.orig 2003-06-16 11:59:01.000000000 -0400 -+++ examples/chrony.conf.example 2003-06-16 12:00:13.000000000 -0400 -@@ -3,5 +3,5 @@ - # - # This is an example chrony configuration file. You should copy it to --# /etc/chrony.conf after uncommenting and editing the options that you -+# /etc/chrony/chrony.conf after uncommenting and editing the options that you - # want to enable. I have not included the more obscure options. Refer - # to the documentation for these. -@@ -91,5 +91,5 @@ - # generally want this, so it is uncommented. - --driftfile /etc/chrony.drift -+driftfile /etc/chrony/chrony.drift - - # If you want to use the program called chronyc to configure aspects of -@@ -100,5 +100,5 @@ - # assumed by default. - --keyfile /etc/chrony.keys -+keyfile /etc/chrony/chrony.keys - - # Tell chronyd which numbered key in the file is used as the password -@@ -158,6 +158,6 @@ - ! log measurements statistics tracking - --If you have real time clock support enabled (see below), you might want --this line instead: -+# If you have real time clock support enabled (see below), you might want -+# this line instead: - - ! log measurements statistics tracking rtc -@@ -269,5 +269,5 @@ - # kernel. (Note, these options apply only to Linux.) - --! rtcfile /etc/chrony.rtc -+! rtcfile /etc/chrony/chrony.rtc - - # Your RTC can be set to keep Universal Coordinated Time (UTC) or local -@@ -285,5 +285,5 @@ - # using devfs), uncomment and edit the following line. - --! rtcdevice /dev/misc/rtc -+rtcdevice /dev/misc/rtc - - ####################################################################### diff --git a/net-misc/chrony/files/chrony-1.19-conf.c-gentoo.diff b/net-misc/chrony/files/chrony-1.19-conf.c-gentoo.diff deleted file mode 100644 index fabc47097ff9..000000000000 --- a/net-misc/chrony/files/chrony-1.19-conf.c-gentoo.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- conf.c.orig Sun May 12 14:07:31 2002 -+++ conf.c Sun May 12 14:07:52 2002 -@@ -45,7 +45,7 @@ - - /* ================================================== */ - --#define DEFAULT_CONF_FILE "/etc/chrony.conf" -+#define DEFAULT_CONF_FILE "/etc/chrony/chrony.conf" - - /* ================================================== */ - /* Forward prototypes */ diff --git a/net-misc/chrony/files/chrony-1.21-addrfilt.c.diff b/net-misc/chrony/files/chrony-1.21-addrfilt.c.diff new file mode 100644 index 000000000000..07f7cb36b511 --- /dev/null +++ b/net-misc/chrony/files/chrony-1.21-addrfilt.c.diff @@ -0,0 +1,86 @@ +Patched addrfilt.c to fix gcc 4.0 build problem. +"array type has incomplete element type" +Taken from Debian: <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298709> +diff -ur chrony-1.21/addrfilt.c chrony-1.21/addrfilt.c +--- chrony-1.21/addrfilt.c 2005-08-11 22:32:54.000000000 +0200 ++++ chrony-1.21/addrfilt.c 2005-11-15 04:05:06.000000000 +0100 +@@ -43,17 +43,15 @@ + /* Define the table size */ + #define TABLE_SIZE (1UL<<NBITS) + +-struct _TableNode; +- +-typedef struct _TableNode ExtendedTable[TABLE_SIZE]; +- + typedef enum {DENY, ALLOW, AS_PARENT} State; + + typedef struct _TableNode { + State state; +- ExtendedTable *extended; ++ struct _TableNode *extended; + } TableNode; + ++typedef struct _TableNode ExtendedTable[TABLE_SIZE]; ++ + struct ADF_AuthTableInst { + TableNode base; + }; +@@ -101,7 +99,7 @@ + + if (node->extended != NULL) { + for (i=0; i<TABLE_SIZE; i++) { +- child_node = &((*(node->extended))[i]); ++ child_node = node->extended + i; + close_node(child_node); + } + Free(node->extended); +@@ -124,10 +122,11 @@ + + if (node->extended == NULL) { + +- node->extended = MallocNew(ExtendedTable); ++ ++ node->extended = (TableNode *) MallocArray(ExtendedTable, TABLE_SIZE); + + for (i=0; i<TABLE_SIZE; i++) { +- child_node = &((*(node->extended))[i]); ++ child_node = node->extended + i; + child_node->state = AS_PARENT; + child_node->extended = NULL; + } +@@ -168,7 +167,7 @@ + if (!(node->extended)) { + open_node(node); + } +- node = &((*(node->extended))[subnet]); ++ node = node->extended + subnet; + bits_to_go -= NBITS; + } + +@@ -187,7 +186,7 @@ + if (!(node->extended)) { + open_node(node); + } +- node = &((*(node->extended))[subnet]); ++ node = node->extended + subnet; + bits_to_go -= NBITS; + } + +@@ -199,7 +198,7 @@ + } + + for (i=subnet, j=0; j<N; i++, j++) { +- this_node = &((*(node->extended))[i]); ++ this_node = node->extended + i; + if (delete_children) { + close_node(this_node); + } +@@ -283,7 +282,7 @@ + if (node->extended) { + subnet = get_subnet(residual); + residual = get_residual(residual); +- node = &((*(node->extended))[subnet]); ++ node = node->extended + subnet; + } else { + /* Make decision on this node */ + finished = 1; diff --git a/net-misc/chrony/files/chrony-1.21-io_linux.h.diff b/net-misc/chrony/files/chrony-1.21-io_linux.h.diff new file mode 100644 index 000000000000..3a9085c0f638 --- /dev/null +++ b/net-misc/chrony/files/chrony-1.21-io_linux.h.diff @@ -0,0 +1,43 @@ +Patched io_linux.h to add missing architectures. +#error "I don't know the values of the _IOC_* constants for your architecture" +Taken from Debian's chrony_1.21-2.diff.gz. +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=339764 +--- chrony-1.21/io_linux.h ++++ chrony-1.21/io_linux.h +@@ -6,26 +6,24 @@ + + /* Hmm. These constants vary a bit between systems. */ + /* (__sh__ includes both sh and sh64) */ +-#if defined(__i386__) || defined(__sh__) ++#if defined(__alpha__) || defined(__sparc__) || defined(__mips__) || defined(__ppc__) || defined(__ppc64__) || defined(__sparc64__) + #define CHRONY_IOC_NRBITS 8 + #define CHRONY_IOC_TYPEBITS 8 +-#define CHRONY_IOC_SIZEBITS 14 ++#define CHRONY_IOC_SIZEBITS 13 + #define CHRONY_IOC_DIRBITS 2 + +-#define CHRONY_IOC_NONE 0U +-#define CHRONY_IOC_WRITE 1U +-#define CHRONY_IOC_READ 2U +-#elif defined(__alpha__) || defined(__sparc__) ++#define CHRONY_IOC_NONE 1U ++#define CHRONY_IOC_READ 2U ++#define CHRONY_IOC_WRITE 4U ++#else + #define CHRONY_IOC_NRBITS 8 + #define CHRONY_IOC_TYPEBITS 8 +-#define CHRONY_IOC_SIZEBITS 13 ++#define CHRONY_IOC_SIZEBITS 14 + #define CHRONY_IOC_DIRBITS 2 + +-#define CHRONY_IOC_NONE 1U +-#define CHRONY_IOC_READ 2U +-#define CHRONY_IOC_WRITE 4U +-#else +-#error "I don't know the values of the _IOC_* constants for your architecture" ++#define CHRONY_IOC_NONE 0U ++#define CHRONY_IOC_WRITE 1U ++#define CHRONY_IOC_READ 2U + #endif + + #define CHRONY_IOC_NRMASK ((1 << CHRONY_IOC_NRBITS)-1) diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf index 0677197012a5..3cb25637fb4c 100644 --- a/net-misc/chrony/files/chronyd.conf +++ b/net-misc/chrony/files/chronyd.conf @@ -1,22 +1,18 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.conf,v 1.3 2004/07/14 23:55:32 agriffis Exp $ +# /etc/conf.d/chronyd.conf -CFGFILE=/etc/chrony/chrony.conf +CFGFILE="/etc/chrony/chrony.conf" -# -# Configuration dependant options : -# -s - Set system time from RTC if rtcfile directive present -# -r - Reload sample histories if dumponexit directive present -# -# The combination of "-s -r" allows chronyd to perform long term averaging of -# the gain or loss rate across system reboots and shutdowns. -# -ARGS="" -# -# devfs creates the device for RTC if it's compiled into kernel -test -c /dev/rtc && { - grep -q '^rtcfile' $CFGFILE && ARGS="$ARGS -s" -} -grep -q '^dumponexit$' $CFGFILE && ARGS="$ARGS -r" +# Configuration dependant options : +# -s - Set system time from RTC if rtcfile directive present +# -r - Reload sample histories if dumponexit directive present +# +# The combination of "-s -r" allows chronyd to perform long term averaging of +# the gain or loss rate across system reboots and shutdowns. +ARGS="" + +# devfs creates the device for RTC if it's compiled into kernel +test -c /dev/rtc && { + grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s" +} +grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r" diff --git a/net-misc/chrony/files/chronyd.rc b/net-misc/chrony/files/chronyd.rc index 54737451cd0d..caee53d1245d 100644 --- a/net-misc/chrony/files/chronyd.rc +++ b/net-misc/chrony/files/chronyd.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.6 2004/10/23 16:56:51 wmertens Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.7 2006/03/25 09:50:41 tove Exp $ depend() { need net @@ -9,12 +9,12 @@ depend() { } checkconfig() { - # Note that /etc/chrony.keys is *NOT* checked. This + # Note that /etc/chrony/chrony.keys is *NOT* checked. This # is because the user may have specified another key # file, and we don't want to force the user to use that # exact name for the key file. - if [ ! -f $CFGFILE ] ; then - eerror "Please create $CFGFILE and the" + if [[ ! -f ${CFGFILE} ]] ; then + eerror "Please create ${CFGFILE} and the" eerror "chrony key file (usually /etc/chrony/chrony.keys)" eerror "by using the" eerror "" @@ -24,35 +24,35 @@ checkconfig() { eerror "files (from the documentation directory)" eerror "as templates." return 1 - else - # Actually, I tried it, and chrony seems to ignore the pidfile - # option. I'm going to leave it here anyway, since you never - # know if it might be handy - PIDFILE=`awk '/^ *pidfile/{print $2}' $CFGFILE` + else + # Actually, I tried it, and chrony seems to ignore the pidfile + # option. I'm going to leave it here anyway, since you never + # know if it might be handy + PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"` fi return 0 } start() { checkconfig || return $? - - [ -n "$PIDFILE" ] || PIDFILE=/var/run/chronyd.pid - + + [[ -n "${PIDFILE}" ]] || PIDFILE=/var/run/chronyd.pid + ebegin "Starting chronyd" start-stop-daemon --start --quiet \ --exec /usr/sbin/chronyd \ - --pidfile $PIDFILE \ - -- -f $CFGFILE $ARGS + --pidfile "${PIDFILE}" \ + -- -f "${CFGFILE}" ${ARGS} eend $? "Failed to start chronyd" } stop() { checkconfig || return $? - - [ -n "$PIDFILE" ] || PIDFILE=/var/run/chronyd.pid + + [[ -n "${PIDFILE}" ]] || PIDFILE=/var/run/chronyd.pid ebegin "Stopping chronyd" start-stop-daemon --stop --quiet \ - --pidfile $PIDFILE + --pidfile "${PIDFILE}" eend $? "Failed to stop chronyd" } diff --git a/net-misc/chrony/files/digest-chrony-1.19 b/net-misc/chrony/files/digest-chrony-1.19 deleted file mode 100644 index f419b6ec30ad..000000000000 --- a/net-misc/chrony/files/digest-chrony-1.19 +++ /dev/null @@ -1 +0,0 @@ -MD5 d1f55269fe0d6013de5455764752a52d chrony-1.19.tar.gz 311066 diff --git a/net-misc/chrony/files/digest-chrony-1.21 b/net-misc/chrony/files/digest-chrony-1.21 new file mode 100644 index 000000000000..01a8f27f64db --- /dev/null +++ b/net-misc/chrony/files/digest-chrony-1.21 @@ -0,0 +1,3 @@ +MD5 84f76a73dff5a3c9e9f11f3c29a4e93b chrony-1.21.tar.gz 310709 +RMD160 5a758608b0ff0d578b3d4597f4ee6ef740492b9b chrony-1.21.tar.gz 310709 +SHA256 baca3d36e6f458bed31c82f08f3c5f9d61b43baafc4d17f3e0a74dec7ff737d3 chrony-1.21.tar.gz 310709 |