diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-01-10 13:03:43 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-01-10 13:03:43 +0000 |
| commit | b8d8e8adb81b03d876045d89ce4fdc611e759f3a (patch) | |
| tree | 4a687031c178f2ae978706d8f7f33513002cfb8b /net-misc/ntp | |
| parent | old (diff) | |
| download | gentoo-2-b8d8e8adb81b03d876045d89ce4fdc611e759f3a.tar.gz gentoo-2-b8d8e8adb81b03d876045d89ce4fdc611e759f3a.tar.bz2 gentoo-2-b8d8e8adb81b03d876045d89ce4fdc611e759f3a.zip | |
Fix by me for building on uClibc systems with adjtimex() crap #254030 by Tom Lloyd.
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'net-misc/ntp')
| -rw-r--r-- | net-misc/ntp/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch | 33 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.4_p5.ebuild | 5 |
3 files changed, 43 insertions, 4 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index f2bbc0dcdfe4..c6b8a7caa3c4 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/ntp -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.131 2008/11/17 01:58:33 gentoofan23 Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.132 2009/01/10 13:03:43 vapier Exp $ + + 10 Jan 2009; Mike Frysinger <vapier@gentoo.org> + +files/ntp-4.2.4_p5-adjtimex.patch, ntp-4.2.4_p5.ebuild: + Fix by me for building on uClibc systems with adjtimex() crap #254030 by + Tom Lloyd. 17 Nov 2008; Thomas Anderson <gentoofan23@gentoo.org> ntp-4.2.4_p5.ebuild: stable amd64, bug 246242 diff --git a/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch b/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch new file mode 100644 index 000000000000..40625fa18fb3 --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch @@ -0,0 +1,33 @@ +https://support.ntp.org/bugs/show_bug.cgi?id=769 +http://bugs.gentoo.org/254030 + +--- ntp/util/tickadj.c ++++ ntp/util/tickadj.c +@@ -21,7 +21,8 @@ + # include <unistd.h> + #endif /* HAVE_UNISTD_H */ + +-#ifdef HAVE___ADJTIMEX /* Linux */ ++/* proper handling here has been moved to upstream ntp bugzilla */ ++#ifdef linux + + #include <sys/timex.h> + struct timex txc; +@@ -91,7 +92,7 @@ + } + + if (!errflg) { +- if (__adjtimex(&txc) < 0) ++ if (adjtimex(&txc) < 0) + perror("adjtimex"); + else if (!quiet) + printf("tick = %ld\ntick_adj = %d\n", +@@ -146,7 +147,7 @@ + #endif + } + +- if (__adjtimex(&txc) < 0) ++ if (adjtimex(&txc) < 0) + { + perror("adjtimex"); + } diff --git a/net-misc/ntp/ntp-4.2.4_p5.ebuild b/net-misc/ntp/ntp-4.2.4_p5.ebuild index 10f1513d088e..3d20ae856da9 100644 --- a/net-misc/ntp/ntp-4.2.4_p5.ebuild +++ b/net-misc/ntp/ntp-4.2.4_p5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p5.ebuild,v 1.6 2008/12/07 11:05:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p5.ebuild,v 1.7 2009/01/10 13:03:43 vapier Exp $ inherit eutils toolchain-funcs @@ -52,6 +52,7 @@ src_unpack() { # Needs to be ported ... #epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch + epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 sed -i \ -e 's:md5\.h:touch_not_my_md5:g' \ |