Cleaning
authorTorsten Veller <tove@gentoo.org>
Mon, 12 Mar 2007 10:39:01 +0000 (10:39 +0000)
committerTorsten Veller <tove@gentoo.org>
Mon, 12 Mar 2007 10:39:01 +0000 (10:39 +0000)
Package-Manager: portage-2.1.2.2

net-misc/chrony/ChangeLog
net-misc/chrony/Manifest
net-misc/chrony/chrony-1.20-r1.ebuild [deleted file]
net-misc/chrony/chrony-1.20.ebuild [deleted file]
net-misc/chrony/chrony-1.21.ebuild [deleted file]
net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff [deleted file]
net-misc/chrony/files/chrony-1.21-addrfilt.c.diff [deleted file]
net-misc/chrony/files/chrony-1.21-io_linux.h.diff [deleted file]
net-misc/chrony/files/digest-chrony-1.20 [deleted file]
net-misc/chrony/files/digest-chrony-1.20-r1 [deleted file]
net-misc/chrony/files/digest-chrony-1.21 [deleted file]

index 3dad0c9d7d8ae9e101bc7cc3a1bc0bb8807cc1f1..17bfbcfee26c39aa4be7a3c5b42c0ba5957b4b6f 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/chrony
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.34 2006/11/03 20:58:05 iluxa Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.35 2007/03/12 10:39:01 tove Exp $
+
+  12 Mar 2007; Torsten Veller <tove@gentoo.org>
+  -files/chrony-1.20-sys_linux.c-gentoo.diff,
+  -files/chrony-1.21-addrfilt.c.diff, -files/chrony-1.21-io_linux.h.diff,
+  -chrony-1.20.ebuild, -chrony-1.20-r1.ebuild, -chrony-1.21.ebuild:
+  Cleaning
 
   03 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
   chrony-1.21-r1.ebuild:
index 3026dc8a720f043fcedf5165814e283e89c2e067..abb7cd3885932df672cc96a2daefcc05954d98c9 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX chrony-1.20-chrony.conf.example-gentoo.diff 1592 RMD160 582a9ee48d12f677772c54c3e97f6baa2c19811d SHA1 d64706e3e96124c88254de569629bd52ec511cd5 SHA256 8eb8a3cec402ab25b24c595d113f41c901e975260e7106b738e6ec72368efb97
 MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.20-chrony.conf.example-gentoo.diff 1592
 RMD160 582a9ee48d12f677772c54c3e97f6baa2c19811d files/chrony-1.20-chrony.conf.example-gentoo.diff 1592
@@ -6,22 +9,10 @@ AUX chrony-1.20-conf.c-gentoo.diff 342 RMD160 8e7eaf6091171d7cca51e8f82f7c94f15f
 MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.20-conf.c-gentoo.diff 342
 RMD160 8e7eaf6091171d7cca51e8f82f7c94f15f8231ad files/chrony-1.20-conf.c-gentoo.diff 342
 SHA256 c99dd789529c1cb7a3533069f5cc66be672910c23cd7c7c1aea710bb4779e61f files/chrony-1.20-conf.c-gentoo.diff 342
-AUX chrony-1.20-sys_linux.c-gentoo.diff 797 RMD160 37354808d59030b3f9deb0b6f3310e06a54f47a3 SHA1 4b7ddfc98a39dc7a165c386124349a33adbef321 SHA256 3e1a0dc953c989a91e93da19b95c60b2b0c314aa4a3822bad59d5f82118f2529
-MD5 19fc6632603680a145092ca56fe9aaa1 files/chrony-1.20-sys_linux.c-gentoo.diff 797
-RMD160 37354808d59030b3f9deb0b6f3310e06a54f47a3 files/chrony-1.20-sys_linux.c-gentoo.diff 797
-SHA256 3e1a0dc953c989a91e93da19b95c60b2b0c314aa4a3822bad59d5f82118f2529 files/chrony-1.20-sys_linux.c-gentoo.diff 797
-AUX chrony-1.21-addrfilt.c.diff 2399 RMD160 a8b0ed18efe301260bb274b58317a807a105a0c5 SHA1 1272e1d45994a95b40023dc7253af9abe87703ea SHA256 2f12a17be48f697c8610c99ce75d5cb1fdd9104cadf96f266649d29bd6549a3e
-MD5 b9bcc47cfb5fd0ac9a2a8b07de8946c1 files/chrony-1.21-addrfilt.c.diff 2399
-RMD160 a8b0ed18efe301260bb274b58317a807a105a0c5 files/chrony-1.21-addrfilt.c.diff 2399
-SHA256 2f12a17be48f697c8610c99ce75d5cb1fdd9104cadf96f266649d29bd6549a3e files/chrony-1.21-addrfilt.c.diff 2399
 AUX chrony-1.21-hppa.patch 572 RMD160 527c9dff58563168e34efbcc3da15b329cc6009f SHA1 159abdea72e63268ae87655859908404d4d179ed SHA256 b755684e28aea7da4276c540a51eb33016f3dbf8b5cd2e3228f2a2915dbc5c1c
 MD5 3549be61bff8e930a15d2a6c912fe3fa files/chrony-1.21-hppa.patch 572
 RMD160 527c9dff58563168e34efbcc3da15b329cc6009f files/chrony-1.21-hppa.patch 572
 SHA256 b755684e28aea7da4276c540a51eb33016f3dbf8b5cd2e3228f2a2915dbc5c1c files/chrony-1.21-hppa.patch 572
-AUX chrony-1.21-io_linux.h.diff 1494 RMD160 29199dbe6262bfc659a62df0b59a8101603b9d8e SHA1 0e9a22716ac2b9a44a949584be12cd61a8bcbee9 SHA256 946a86169cb463888776c6e117dbfd098eb4f0766466df5ac188418d7fef738c
-MD5 4ffb608d9233a525d9e8532b53c0c532 files/chrony-1.21-io_linux.h.diff 1494
-RMD160 29199dbe6262bfc659a62df0b59a8101603b9d8e files/chrony-1.21-io_linux.h.diff 1494
-SHA256 946a86169cb463888776c6e117dbfd098eb4f0766466df5ac188418d7fef738c files/chrony-1.21-io_linux.h.diff 1494
 AUX chrony-1.21-makefile.diff 627 RMD160 4a661285ceebdf8609baa084454fdfdff3e47443 SHA1 7162220786f568f8170cf36fa9d6da8c2a0af6c5 SHA256 e90b6ac857b854aaa2f67124da3ec18933f3897eec075d5438ae3bdf751481ac
 MD5 0a90763a3f9931fd60ea067adf2d0348 files/chrony-1.21-makefile.diff 627
 RMD160 4a661285ceebdf8609baa084454fdfdff3e47443 files/chrony-1.21-makefile.diff 627
@@ -34,42 +25,27 @@ AUX chronyd.rc 1566 RMD160 4ab439fb439b6efac53a595837c1067e771f072f SHA1 929be1d
 MD5 519712266fb09ea5a7275b55fcafe78c files/chronyd.rc 1566
 RMD160 4ab439fb439b6efac53a595837c1067e771f072f files/chronyd.rc 1566
 SHA256 c7e62cef77106eb531fa4000fc3e039f5fbc1a63ebb0bba140f642c0c1aae51d files/chronyd.rc 1566
-DIST chrony-1.20.tar.gz 308253 RMD160 ec6f570c29b68983752ff8b025d908372bdf2fb1 SHA1 8a739038b208bf63e4d0afbee44e8fea3c9aa480 SHA256 216b7d5d138d7300b4f73e66d04a075a9ac0647ddfd72e533c39ba4c4c89ec65
 DIST chrony-1.21-patches-1.tar.bz2 5093 RMD160 c278b29087751395e934fc47866f2e377247cfbd SHA1 498dfcb1c46ca7cdf1914dfef41ba96369b2f6ae SHA256 97568234a0844f54deab250d049c2f30de2dde48c216ca3d12a070e367516dce
 DIST chrony-1.21.tar.gz 310709 RMD160 5a758608b0ff0d578b3d4597f4ee6ef740492b9b SHA1 fd274296eb1af0bd558e57c6b1c219e3054e9de8 SHA256 baca3d36e6f458bed31c82f08f3c5f9d61b43baafc4d17f3e0a74dec7ff737d3
-EBUILD chrony-1.20-r1.ebuild 1312 RMD160 f8e2c6b262093a4d93e655270b9de345cd6b2c5b SHA1 4e4cba790695c919f0659bd89628f7edc2b804d5 SHA256 a14e792a288125e64b1c4c86c976b3bb063f84d16e660c0ef5947bac946b2e93
-MD5 984f0954ec16c0c10aca58c0329dd971 chrony-1.20-r1.ebuild 1312
-RMD160 f8e2c6b262093a4d93e655270b9de345cd6b2c5b chrony-1.20-r1.ebuild 1312
-SHA256 a14e792a288125e64b1c4c86c976b3bb063f84d16e660c0ef5947bac946b2e93 chrony-1.20-r1.ebuild 1312
-EBUILD chrony-1.20.ebuild 1192 RMD160 2f27cccc5e0d8ce0754359289fbf8bc0468cfc7e SHA1 fe3302152f397c6e3dfa83903b6875df7330a108 SHA256 1a3980b4c4b22a874d8e9e98bf79b8e5b7b6bb71888e635ea16db5919295095e
-MD5 565f5d4296870313099305a298cffc43 chrony-1.20.ebuild 1192
-RMD160 2f27cccc5e0d8ce0754359289fbf8bc0468cfc7e chrony-1.20.ebuild 1192
-SHA256 1a3980b4c4b22a874d8e9e98bf79b8e5b7b6bb71888e635ea16db5919295095e chrony-1.20.ebuild 1192
 EBUILD chrony-1.21-r1.ebuild 2159 RMD160 b35778a53cc0777b05c8c3a69f682b2e1ac0381e SHA1 33d3621417c259fb5f104d9da9cf3b687c77f9e4 SHA256 588bd58e02cb9c697767e19ea926b3e826f93d1fa31a1688d3216ad43beadb3b
 MD5 b09df91703a8a2e02db36ec02e36ce50 chrony-1.21-r1.ebuild 2159
 RMD160 b35778a53cc0777b05c8c3a69f682b2e1ac0381e chrony-1.21-r1.ebuild 2159
 SHA256 588bd58e02cb9c697767e19ea926b3e826f93d1fa31a1688d3216ad43beadb3b chrony-1.21-r1.ebuild 2159
-EBUILD chrony-1.21.ebuild 1725 RMD160 30a722b5e4e8d722da705c0ee25278bba851cc56 SHA1 619de7f69b3dbde2bc732952500dad516961bcdb SHA256 81bdeb5c3316a3c88ea9a2906648bf61e6c2c4fa40424a1729e8b1639cab7a97
-MD5 2b03ce824ca6024e896553ce92fa30f2 chrony-1.21.ebuild 1725
-RMD160 30a722b5e4e8d722da705c0ee25278bba851cc56 chrony-1.21.ebuild 1725
-SHA256 81bdeb5c3316a3c88ea9a2906648bf61e6c2c4fa40424a1729e8b1639cab7a97 chrony-1.21.ebuild 1725
-MISC ChangeLog 4487 RMD160 f2c1a0918fe7b491f1cf5c293d04bd4971762060 SHA1 477fb4c79e5d414870777653271ced24b6d8b831 SHA256 09a4d6e6a699fe2b46aff40ad5d31724575a0209c2f281d5f1fbfeb996aec0bd
-MD5 f57c7ec69be72c2dc30156207489fbbe ChangeLog 4487
-RMD160 f2c1a0918fe7b491f1cf5c293d04bd4971762060 ChangeLog 4487
-SHA256 09a4d6e6a699fe2b46aff40ad5d31724575a0209c2f281d5f1fbfeb996aec0bd ChangeLog 4487
+MISC ChangeLog 4734 RMD160 8678376ac3f33b78c7183e314a24e184043ca72a SHA1 4e061e4dbd104cb93b9994479e85b5e82b1f44a7 SHA256 680d7effe084836a5bf37357da6971d950c9c04d123b82c46a89f6f65b3d1776
+MD5 e7dafdbae7bf4fd8a48e9ffe619b5ce4 ChangeLog 4734
+RMD160 8678376ac3f33b78c7183e314a24e184043ca72a ChangeLog 4734
+SHA256 680d7effe084836a5bf37357da6971d950c9c04d123b82c46a89f6f65b3d1776 ChangeLog 4734
 MISC metadata.xml 1015 RMD160 bc4f53cbd06cae4ff0a69ba174b833e91ad5440c SHA1 69d13ba674429a8c83b9f44ed5041622307ce3cc SHA256 a7aea8351438b01c2f11e779007851f07c3bddfac99a2f1a87addbbdef15cb64
 MD5 ba90673e1587f5db474645441572737c metadata.xml 1015
 RMD160 bc4f53cbd06cae4ff0a69ba174b833e91ad5440c metadata.xml 1015
 SHA256 a7aea8351438b01c2f11e779007851f07c3bddfac99a2f1a87addbbdef15cb64 metadata.xml 1015
-MD5 bbace746054254df414e349024e1b94c files/digest-chrony-1.20 235
-RMD160 139dcc1f86277c36a301f3237b580055dd85dc4c files/digest-chrony-1.20 235
-SHA256 0c1f3b58a98e29228355727fc05feb5794bb936c29cf3f30eb890ad9f9781176 files/digest-chrony-1.20 235
-MD5 bbace746054254df414e349024e1b94c files/digest-chrony-1.20-r1 235
-RMD160 139dcc1f86277c36a301f3237b580055dd85dc4c files/digest-chrony-1.20-r1 235
-SHA256 0c1f3b58a98e29228355727fc05feb5794bb936c29cf3f30eb890ad9f9781176 files/digest-chrony-1.20-r1 235
-MD5 cac4a306475f85d33d04e514e069f958 files/digest-chrony-1.21 235
-RMD160 45f480b810278c715cc2180f33a3f240dc0d44fc files/digest-chrony-1.21 235
-SHA256 ee3be7360bd99c50ca14561828371a71ca351cd8f1d4f80d5fb2c600792be43b files/digest-chrony-1.21 235
 MD5 12aca16f9ede073d447027004feef2d3 files/digest-chrony-1.21-r1 497
 RMD160 282b95229558f0b50dec4d772c58f46493f2ca80 files/digest-chrony-1.21-r1 497
 SHA256 ce1d5871f430ff58f908e8772008355f2557ed4db720e5d95aa5c512ea8f02d1 files/digest-chrony-1.21-r1 497
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF9S3MV3J2n04EauwRAkaUAKCxTdtR2Jjzzygstav64OfXYNyZ3wCeKbfL
+Ykl0bP3xFmOBCMv7lwSK5Zs=
+=vO8s
+-----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.20-r1.ebuild b/net-misc/chrony/chrony-1.20-r1.ebuild
deleted file mode 100644 (file)
index ea6b345..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.20-r1.ebuild,v 1.4 2005/07/15 18:56:25 killerfox Exp $
-
-inherit eutils
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.sunsite.dk/"
-SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="hppa ~mips ~ppc ~sparc ~x86"
-IUSE="readline"
-
-DEPEND="virtual/libc
-       readline? ( >=sys-libs/readline-4.1-r4 )"
-
-src_unpack() {
-       unpack ${A} ; cd ${S}
-
-       epatch ${FILESDIR}/${P}-conf.c-gentoo.diff
-       epatch ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
-       # Allow Hz=200 detection (#21058, Alexander Papaspyrou)
-       epatch ${FILESDIR}/${P}-sys_linux.c-gentoo.diff
-}
-
-src_compile() {
-       econf `use_enable readline` || die
-       emake all docs || die
-}
-
-src_install() {
-       # the chrony install is brain-dead so we'll just do it ourselves
-       dobin chronyc
-       dosbin chronyd
-
-       dodoc chrony.txt README examples/chrony.{conf,keys}.example
-       dohtml chrony.html
-       doman *.{1,5,8}
-       doinfo chrony.info*
-
-       dodir /etc/chrony
-       exeinto /etc/init.d ; newexe ${FILESDIR}/chronyd.rc chronyd
-       insinto /etc/conf.d ; newins ${FILESDIR}/chronyd.conf chronyd
-       dosed "s:the documentation directory:/usr/share/doc/${PF}/:" /etc/init.d/chronyd
-}
diff --git a/net-misc/chrony/chrony-1.20.ebuild b/net-misc/chrony/chrony-1.20.ebuild
deleted file mode 100644 (file)
index 47059f4..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.20.ebuild,v 1.8 2005/05/01 17:05:34 hansmi Exp $
-
-inherit eutils
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.sunsite.dk/"
-SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~mips sparc ppc"
-IUSE="readline"
-
-DEPEND="virtual/libc
-       readline? ( >=sys-libs/readline-4.1-r4 )"
-
-src_unpack() {
-       unpack ${A} ; cd ${S}
-
-       epatch ${FILESDIR}/${P}-conf.c-gentoo.diff
-       epatch ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
-}
-
-src_compile() {
-       econf `use_enable readline` || die
-       emake all docs || die
-}
-
-src_install() {
-       # the chrony install is brain-dead so we'll just do it ourselves
-       dobin chronyc
-       dosbin chronyd
-
-       dodoc chrony.txt README examples/chrony.{conf,keys}.example
-       dohtml chrony.html
-       doman *.{1,5,8}
-       doinfo chrony.info*
-
-       dodir /etc/chrony
-       exeinto /etc/init.d ; newexe ${FILESDIR}/chronyd.rc chronyd
-       insinto /etc/conf.d ; newins ${FILESDIR}/chronyd.conf chronyd
-       dosed "s:the documentation directory:/usr/share/doc/${PF}/:" /etc/init.d/chronyd
-}
diff --git a/net-misc/chrony/chrony-1.21.ebuild b/net-misc/chrony/chrony-1.21.ebuild
deleted file mode 100644 (file)
index 4f20dea..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.21.ebuild,v 1.3 2006/04/26 18:30:53 squinky86 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.sunsite.dk/"
-SRC_URI="http://chrony.sunsite.dk/download/${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}"/${P}-addrfilt.c.diff
-       epatch "${FILESDIR}"/${P}-io_linux.h.diff
-
-       # Allow Hz=200 detection (#21058, Alexander Papaspyrou)
-#      epatch "${FILESDIR}"/${PN}-1.20-sys_linux.c-gentoo.diff
-
-       sed -i "s:/etc/chrony:/etc/chrony/chrony:g" \
-               chrony.conf.5 faq.txt chrony.texi || die "sed failed"
-}
-
-src_compile() {
-       export CC="$(tc-getCC)"
-       econf $(use_enable readline) || die "configure failed"
-       emake all || die "make failed"
-       emake docs || die "make docs failed"
-}
-
-src_install() {
-       dobin chronyc || die "dobin failed"
-       dosbin chronyd || die "dosbin failed"
-
-       dodoc chrony.txt README examples/chrony.{conf,keys}.example || die "dodoc failed"
-       dohtml chrony.html || die "dohtml failed"
-       doman *.{1,5,8}
-       doinfo chrony.info*
-
-       exeinto /etc/init.d
-       newexe "${FILESDIR}"/chronyd.rc chronyd || die "newexe failed"
-       insinto /etc/conf.d
-       newins "${FILESDIR}"/chronyd.conf chronyd || die "newins failed"
-       dosed "s:the documentation directory:/usr/share/doc/${PF}/:" /etc/init.d/chronyd
-
-       keepdir /var/{lib,log}/chrony /etc/chrony
-}
diff --git a/net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff b/net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff
deleted file mode 100644 (file)
index 063be7a..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- sys_linux.c.orig   2003-10-04 15:56:40.000000000 -0400
-+++ sys_linux.c        2003-10-09 21:06:06.000000000 -0400
-@@ -448,6 +448,7 @@
-   if (TMX_SetFrequency(scaled_freq, required_tick) < 0) {
-     char buffer[1024];
-+      perror("failed");
-     sprintf(buffer, "adjtimex failed for set_frequency, freq_ppm=%10.4e scaled_freq=%10.4e required_tick=%ld",
-             freq_ppm, scaled_freq, required_tick);
-     CROAK(buffer);
-@@ -600,6 +601,16 @@
-     *shift_hz = 7;
-     return;
-   }
-+  /* GENTOO: Gentoo Linux has hz=200
-+   * tick_nominal: 5000
-+   * tick_lo: 3333
-+   * tick_hi: 6667 */
-+  if (tick >= 3333 && tick <= 6667) {
-+    *hz = 200;
-+    *shift_hz = 8;
-+    return;
-+  }
-+  /* END GENTOO */
-   for (i=4; i<16; i++) { /* surely 16 .. 32768 is a wide enough range? */
-     ihz = 1 << i;
diff --git a/net-misc/chrony/files/chrony-1.21-addrfilt.c.diff b/net-misc/chrony/files/chrony-1.21-addrfilt.c.diff
deleted file mode 100644 (file)
index 07f7cb3..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-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
deleted file mode 100644 (file)
index 3a9085c..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-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/digest-chrony-1.20 b/net-misc/chrony/files/digest-chrony-1.20
deleted file mode 100644 (file)
index 6b73fa5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0f89e9e13fa47d04fd9f99e56c615c2 chrony-1.20.tar.gz 308253
-RMD160 ec6f570c29b68983752ff8b025d908372bdf2fb1 chrony-1.20.tar.gz 308253
-SHA256 216b7d5d138d7300b4f73e66d04a075a9ac0647ddfd72e533c39ba4c4c89ec65 chrony-1.20.tar.gz 308253
diff --git a/net-misc/chrony/files/digest-chrony-1.20-r1 b/net-misc/chrony/files/digest-chrony-1.20-r1
deleted file mode 100644 (file)
index 6b73fa5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0f89e9e13fa47d04fd9f99e56c615c2 chrony-1.20.tar.gz 308253
-RMD160 ec6f570c29b68983752ff8b025d908372bdf2fb1 chrony-1.20.tar.gz 308253
-SHA256 216b7d5d138d7300b4f73e66d04a075a9ac0647ddfd72e533c39ba4c4c89ec65 chrony-1.20.tar.gz 308253
diff --git a/net-misc/chrony/files/digest-chrony-1.21 b/net-misc/chrony/files/digest-chrony-1.21
deleted file mode 100644 (file)
index 01a8f27..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84f76a73dff5a3c9e9f11f3c29a4e93b chrony-1.21.tar.gz 310709
-RMD160 5a758608b0ff0d578b3d4597f4ee6ef740492b9b chrony-1.21.tar.gz 310709
-SHA256 baca3d36e6f458bed31c82f08f3c5f9d61b43baafc4d17f3e0a74dec7ff737d3 chrony-1.21.tar.gz 310709