Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (b6a4e281254bd9b4de5f59b276e4ffd7b1c4b036)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (b6a4e281254bd9b4de5f59b276e4ffd7b1c4b036)
  • Date: Thu, 28 May 2009 00:09:55 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/ntp/HISTORY | 5 +++++
utils/ntp/PRE_BUILD | 3 +++
utils/ntp/glibc-2.10.patch | 21 +++++++++++++++++++++
3 files changed, 29 insertions(+)

New commits:
commit b6a4e281254bd9b4de5f59b276e4ffd7b1c4b036
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ntp: Fixes compilation with glibc 2.10
From http://bugs.gentoo.org/show_bug.cgi?id=270483

diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 73305d1..f39ee85 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,8 @@
+2009-05-27 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.10.patch
+ * glibc-2.10.patch: Fixes compilation with glibc 2.10
+ From http://bugs.gentoo.org/show_bug.cgi?id=270483
+
2009-05-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de
* DETAILS: updated to 4.2.4p7, SECURITY_PATCH++, cf
http://www.kb.cert.org/vuls/id/853097
diff --git a/utils/ntp/PRE_BUILD b/utils/ntp/PRE_BUILD
new file mode 100755
index 0000000..6b773db
--- /dev/null
+++ b/utils/ntp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/include/ntp_syscall.h \
+ $SCRIPT_DIRECTORY/glibc-2.10.patch
diff --git a/utils/ntp/glibc-2.10.patch b/utils/ntp/glibc-2.10.patch
new file mode 100644
index 0000000..c75b58c
--- /dev/null
+++ b/utils/ntp/glibc-2.10.patch
@@ -0,0 +1,21 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=270483
+#
+--- include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400
++++ include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400
+@@ -14,6 +14,14 @@
+ # include <sys/timex.h>
+ #endif
+
++#if defined(ADJ_NANO) && !defined(MOD_NANO)
++#define MOD_NANO ADJ_NANO
++#endif
++
++#if defined(ADJ_TAI) && !defined(MOD_TAI)
++#define MOD_TAI ADJ_TAI
++#endif
++
+ #ifndef NTP_SYSCALLS_LIBC
+ #ifdef NTP_SYSCALLS_STD
+ # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t))
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (b6a4e281254bd9b4de5f59b276e4ffd7b1c4b036), Eric Sandall, 05/28/2009

Archive powered by MHonArc 2.6.24.

Top of Page