summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-06-09 22:16:17 +0000
committerJeroen Roovers <jer@gentoo.org>2010-06-09 22:16:17 +0000
commit35125c38aefa01ecceae522ea32f81a46dc5cc58 (patch)
tree8d2733d8e67293b3648f5664694c41a00586ae21 /net-misc/chrony/files
parentMaintain. (diff)
downloadhistorical-35125c38aefa01ecceae522ea32f81a46dc5cc58.tar.gz
historical-35125c38aefa01ecceae522ea32f81a46dc5cc58.tar.bz2
historical-35125c38aefa01ecceae522ea32f81a46dc5cc58.zip
Old.
Package-Manager: portage-2.2_rc67/cvs/Linux i686
Diffstat (limited to 'net-misc/chrony/files')
-rw-r--r--net-misc/chrony/files/chrony-1.20-chrony.conf.example-gentoo.diff46
-rw-r--r--net-misc/chrony/files/chrony-1.20-conf.c-gentoo.diff11
-rw-r--r--net-misc/chrony/files/chrony-1.21-makefile.diff15
-rw-r--r--net-misc/chrony/files/chrony-1.23-sources.diff56
4 files changed, 0 insertions, 128 deletions
diff --git a/net-misc/chrony/files/chrony-1.20-chrony.conf.example-gentoo.diff b/net-misc/chrony/files/chrony-1.20-chrony.conf.example-gentoo.diff
deleted file mode 100644
index 7f1f2c9cccfc..000000000000
--- a/net-misc/chrony/files/chrony-1.20-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.20-conf.c-gentoo.diff b/net-misc/chrony/files/chrony-1.20-conf.c-gentoo.diff
deleted file mode 100644
index fabc47097ff9..000000000000
--- a/net-misc/chrony/files/chrony-1.20-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-makefile.diff b/net-misc/chrony/files/chrony-1.21-makefile.diff
deleted file mode 100644
index 9114f6fdeb01..000000000000
--- a/net-misc/chrony/files/chrony-1.21-makefile.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.in_old 2006-08-12 17:42:57.000000000 +0200
-+++ Makefile.in 2006-08-12 17:44:35.000000000 +0200
-@@ -68,10 +68,10 @@
- all : chronyd chronyc
-
- chronyd : $(OBJS) $(EXTRA_OBJS)
-- $(CC) $(OPTFLAGS) -o chronyd $(OBJS) $(EXTRA_OBJS) $(LIBS) $(EXTRA_LIBS)
-+ $(CC) $(OPTFLAGS) $(LDFLAGS) -o chronyd $(OBJS) $(EXTRA_OBJS) $(LIBS) $(EXTRA_LIBS)
-
- chronyc : $(CLI_OBJS)
-- $(CC) $(OPTFLAGS) -o chronyc $(CLI_OBJS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS)
-+ $(CC) $(OPTFLAGS) $(LDFLAGS) -o chronyc $(CLI_OBJS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS)
-
- client.o : client.c
- $(CC) $(CFLAGS) $(DEFS) @READLINE_COMPILE@ -c $<
diff --git a/net-misc/chrony/files/chrony-1.23-sources.diff b/net-misc/chrony/files/chrony-1.23-sources.diff
deleted file mode 100644
index 5f39ca3321f1..000000000000
--- a/net-misc/chrony/files/chrony-1.23-sources.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 2f2446c7dc074b2d1728a5e3f7a600c10cea2425
-Author: Goswin Brederlow <brederlo@informatik.uni-tuebingen.de>
-Date: Sat Mar 29 20:49:59 2008 +0000
-
- Fix for chronyc "sources" command on 64 bit machines
-
- (Taken from
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=348412
- )
-
- Attached is a patchlet to make the "sources" command of chrony output properly
- signed numbers. The chronyd code (see e.g. ntp.h) properly uses int32_t and
- friends to get the right number of bits per datatype while client.c just uses
- short, int, long. But long will be 64 bit or 32 bit depending on the cpu.
-
-diff --git a/client.c b/client.c
-index b7e5bcb..85d6e84 100644
---- a/client.c
-+++ b/client.c
-@@ -45,6 +45,12 @@
- #include <readline/history.h>
- #endif
-
-+#ifdef HAS_STDINT_H
-+#include <stdint.h>
-+#elif defined(HAS_INTTYPES_H)
-+#include <inttypes.h>
-+#endif
-+
- /* ================================================== */
-
- static int sock_fd;
-@@ -1383,16 +1389,16 @@ process_cmd_sources(char *line)
- int n_sources, i;
- int verbose = 0;
-
-- long orig_latest_meas, latest_meas, est_offset;
-- unsigned long ip_addr;
-- unsigned long latest_meas_err, est_offset_err;
-- unsigned long latest_meas_ago;
-- unsigned short poll, stratum;
-- unsigned short state, mode;
-+ int32_t orig_latest_meas, latest_meas, est_offset;
-+ uint32_t ip_addr;
-+ uint32_t latest_meas_err, est_offset_err;
-+ uint32_t latest_meas_ago;
-+ uint16_t poll, stratum;
-+ uint16_t state, mode;
- double resid_freq, resid_skew;
- const char *dns_lookup;
- char hostname_buf[32];
-- unsigned short status;
-+ uint16_t status;
-
- /* Check whether to output verbose headers */
- verbose = check_for_verbose_flag(line);