Make the sources command output properly signed numbers.

Package-Manager: portage-2.1.5_rc6

4 files changed, 70 insertions, 8 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 217c79119886..77c1e85b1e5b 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/chrony
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.42 2008/03/29 08:11:16 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.43 2008/04/24 06:58:39 tove Exp $
+
+  24 Apr 2008; Torsten Veller <tove@gentoo.org>
+  +files/chrony-1.23-sources.diff, chrony-1.23.ebuild:
+  Make the sources command output properly signed numbers.
 
   29 Mar 2008; Torsten Veller <tove@gentoo.org> -chrony-1.21-r1.ebuild:
   Cleaning
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index c514950860a4..8a3949c22779 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -5,16 +5,17 @@ AUX chrony-1.20-chrony.conf.example-gentoo.diff 1592 RMD160 582a9ee48d12f677772c
 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 584 RMD160 53355fefd2cede585ee91f30fa624a2a157052c6 SHA1 a900bef7a884c4efe702584eaab43ca93761c0d7 SHA256 2fd6d1104f423e271592f773f43a19174d0fafe287fd1dbeb0b3a5be456b6525
 AUX chronyd.rc 1562 RMD160 43630070dd1571faecc1933b3bd6b5490b76d903 SHA1 1abf6e6d3cb4b2b33c3c291cd4f9efb0df8a47a4 SHA256 e6577a8475aaf71a7dc0fa5c0d2e8271ee71b9302c33e6ffaf3a9c60c8c7bfd5
 DIST chrony-1.23.tar.gz 321015 RMD160 6f92aeac15d252821ff72a02f340fc0e562eddc1 SHA1 f0c6b32099329f358dbdb4f62753d2c7cbc13c79 SHA256 889f292458ccb3f20ae4f5872110d776a639f1cda2d1df694eb88a14726832c5
-EBUILD chrony-1.23.ebuild 1814 RMD160 36933a302c0259f01d98335dce95f151ea68300e SHA1 a3390d0c6ddc154809343ab84d819cf5b7dded34 SHA256 a46b67f06d5f03497b59a5d6dd29ee85dffea243c2912700bf0998dfbeea583b
-MISC ChangeLog 5414 RMD160 7d4f92e4ffb401bb5356bd693929b469e799e8e2 SHA1 9dd58150fb842c0152d637ee3742be66790a9600 SHA256 ebdd7d4b0f907fd5b10f06e62b2166441de3168ce4d4c1a3ce4c691f3ec2dc7c
+EBUILD chrony-1.23.ebuild 1852 RMD160 d800c5963cc601f755dda8f844c275d27f0cf8bc SHA1 1aa97498c97cda44645516fab5e28bd3dd1b7d4c SHA256 13021eb71751ede04896a6969cf33f0154085193a44dc2a3a0cc57c13d4210cd
+MISC ChangeLog 5577 RMD160 a67b0035e0e7aecb6c360cd5954b6a4804ff0c35 SHA1 20b70462eba255adf0388c1f62f3b0a8f5f12027 SHA256 40837c94b9dd3207ee2b532df99994b7c4178b3d799933ac9997acf9bdee46e2
 MISC metadata.xml 1015 RMD160 bc4f53cbd06cae4ff0a69ba174b833e91ad5440c SHA1 69d13ba674429a8c83b9f44ed5041622307ce3cc SHA256 a7aea8351438b01c2f11e779007851f07c3bddfac99a2f1a87addbbdef15cb64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH7fmpV3J2n04EauwRAgHVAKDcVGbrJUwyQX97uabaiFKHogPZugCfcG0d
-RupKRVCKcvsI7mqQ3G8RBno=
-=vNah
+iEYEARECAAYFAkgQL6UACgkQV3J2n04EauzHEQCgiXYF0ZufwHE36k1q1jggxCAw
+VMEAnRQDGPd1eMIWWmueWqEAt7NaP5jE
+=IBC3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.23.ebuild b/net-misc/chrony/chrony-1.23.ebuild
index 9acd6d5ef7ad..7be7ab66bf39 100644
--- a/net-misc/chrony/chrony-1.23.ebuild
+++ b/net-misc/chrony/chrony-1.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4 2008/03/28 14:46:43 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.23.ebuild,v 1.5 2008/04/24 06:58:39 tove Exp $
 
 inherit eutils toolchain-funcs
 
@@ -23,6 +23,7 @@ src_unpack() {
 	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"
diff --git a/net-misc/chrony/files/chrony-1.23-sources.diff b/net-misc/chrony/files/chrony-1.23-sources.diff
new file mode 100644
index 000000000000..5f39ca3321f1
--- /dev/null
+++ b/net-misc/chrony/files/chrony-1.23-sources.diff
@@ -0,0 +1,56 @@
+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);