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
commit014093e23a563d27634340762fb61aef65d15c96 (patch)
tree1171ea876819958064c64ce6744eb7f251be98b7
parentMaintain. (diff)
downloadgentoo-2-014093e23a563d27634340762fb61aef65d15c96.tar.gz
gentoo-2-014093e23a563d27634340762fb61aef65d15c96.tar.bz2
gentoo-2-014093e23a563d27634340762fb61aef65d15c96.zip
Old.
(Portage version: 2.2_rc67/cvs/Linux i686)
-rw-r--r--net-misc/chrony/Manifest6
-rw-r--r--net-misc/chrony/chrony-1.23.ebuild66
-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
6 files changed, 0 insertions, 200 deletions
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 4dc67d05ac27..fd756d67cae6 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,13 +1,7 @@
-AUX chrony-1.20-chrony.conf.example-gentoo.diff 1592 RMD160 582a9ee48d12f677772c54c3e97f6baa2c19811d SHA1 d64706e3e96124c88254de569629bd52ec511cd5 SHA256 8eb8a3cec402ab25b24c595d113f41c901e975260e7106b738e6ec72368efb97
-AUX chrony-1.20-conf.c-gentoo.diff 342 RMD160 8e7eaf6091171d7cca51e8f82f7c94f15f8231ad SHA1 0769dd921e1e52f678dc81232b12749e161ca92c SHA256 c99dd789529c1cb7a3533069f5cc66be672910c23cd7c7c1aea710bb4779e61f
AUX chrony-1.21-hppa.patch 572 RMD160 527c9dff58563168e34efbcc3da15b329cc6009f SHA1 159abdea72e63268ae87655859908404d4d179ed SHA256 b755684e28aea7da4276c540a51eb33016f3dbf8b5cd2e3228f2a2915dbc5c1c
-AUX chrony-1.21-makefile.diff 627 RMD160 4a661285ceebdf8609baa084454fdfdff3e47443 SHA1 7162220786f568f8170cf36fa9d6da8c2a0af6c5 SHA256 e90b6ac857b854aaa2f67124da3ec18933f3897eec075d5438ae3bdf751481ac
-AUX chrony-1.23-sources.diff 1719 RMD160 56c443d44647603407e05ea7b0c0ac6e8e4fa96c SHA1 2aaff60839745d43f28c6df7931bb7b932c09250 SHA256 f0ad08f480879fffd565a60a1d69a5f0283194b414e952d9ca587c947ecc92a3
AUX chronyd.conf 378 RMD160 929862983d9ac346506d074fd4d8d14452ce451a SHA1 4efc8a4259e54df7df3be8a1c848891c7bfd11bf SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99
AUX chronyd.rc 1744 RMD160 67f19b65a72619bf224fab034ff56438be9e3340 SHA1 9903364e1c3c5b30e14373b3b0387b925a5a7580 SHA256 3c15c635e656c1f83846270813754863033e996bed144f82bdbf65a2e5dd3aa5
-DIST chrony-1.23.tar.gz 321015 RMD160 6f92aeac15d252821ff72a02f340fc0e562eddc1 SHA1 f0c6b32099329f358dbdb4f62753d2c7cbc13c79 SHA256 889f292458ccb3f20ae4f5872110d776a639f1cda2d1df694eb88a14726832c5
DIST chrony-1.24.tar.gz 364311 RMD160 a393c3f51d99a24a1aefd1653575de5a6c642191 SHA1 6e17d7b8cdd3508751713bd2279202b75643e268 SHA256 dd0e6c98a7e094d760d83a1681f85d84f3a5103400c49b4a9e062bbe02ceb215
-EBUILD chrony-1.23.ebuild 1856 RMD160 9d0b47e1d365290eadc462fec6dc609b4c585223 SHA1 ce67919c45e510eaca10cf5ad7a01b8631ac585a SHA256 f65036a24acf5862f97fdd25ef09445e4f09fe6126bcf6ea0b66262c85c74d1c
EBUILD chrony-1.24-r1.ebuild 1720 RMD160 31c49b32eb8421c022cfd6669adad2f67c6bc043 SHA1 5c949b93d0788bbbf87db8dc37f047a7cad70554 SHA256 ea2b878c52b9f0829a810fe6ba94bfa7a6bba0ade4c589a61bf2a142f0058d0b
MISC ChangeLog 7035 RMD160 ad01412bc67b705a881662a5007e92b0fb46c1d2 SHA1 14674fda5fa3b93ee2f2c8c79cab9e77a5126da9 SHA256 03391bd66147df81ef6361066bc3a3a1609fd3d7d8bb3e0a6a51b1beda960b18
MISC metadata.xml 1014 RMD160 f46472683e7ec16a3bf736e0baeb7948f489cbed SHA1 fe8a55544286c7788ab58e8caa55b7f8b8cbd451 SHA256 10f827a848beb64f26a7fd9660a3692572dcfb20862dcae3fa44f47ed806bcff
diff --git a/net-misc/chrony/chrony-1.23.ebuild b/net-misc/chrony/chrony-1.23.ebuild
deleted file mode 100644
index 7a6548e3611d..000000000000
--- a/net-misc/chrony/chrony-1.23.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.23.ebuild,v 1.7 2009/10/26 07:47:26 tove Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/_pre/-pre}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE="readline"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1-r4 )"
-
-src_unpack() {
- unpack ${A} ; cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.20-conf.c-gentoo.diff
- epatch "${FILESDIR}"/${PN}-1.20-chrony.conf.example-gentoo.diff
- epatch "${FILESDIR}"/${PN}-1.21-makefile.diff
- epatch "${FILESDIR}"/${P}-sources.diff
-
- sed -i "s:/etc/chrony:/etc/chrony/chrony:g" \
- chrony*.{1,5,8} faq.txt chrony.texi || die "sed failed"
-
- # bug 214757
- sed -i "s:defined(__ppc__) ||:& defined(__powerpc__) ||:" \
- "${S}"/io_linux.h || die
-
- epatch "${FILESDIR}"/${PN}-1.21-hppa.patch
-}
-
-src_compile() {
- tc-export CC
- local myconf
- # selfwritten configure
- use readline || myconf="--disable-readline"
- ./configure --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- ${myconf} ${EXTRA_ECONF} || die "configure failed"
- emake all || die "make failed"
- emake docs || die "make docs failed"
-}
-
-src_install() {
- dobin chronyc || die
- dosbin chronyd || die
-
- dodoc chrony.txt README examples/chrony.{conf,keys}.example || die
- dohtml chrony.html || die
- doman *.{1,5,8}
- doinfo chrony.info*
-
- newinitd "${FILESDIR}"/chronyd.rc chronyd || die
- dosed "s:the documentation directory:/usr/share/doc/${PF}/:" \
- /etc/init.d/chronyd || die "doc sed failed"
- newconfd "${FILESDIR}"/chronyd.conf chronyd || die
-
- keepdir /var/{lib,log}/chrony /etc/chrony
-}
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);