Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (c7e082887ba5578bf3096189a12c0cb6780b3d5b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (c7e082887ba5578bf3096189a12c0cb6780b3d5b)
  • Date: Thu, 22 Apr 2010 18:36:40 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

utils/ntp/HISTORY | 6 ++++++
utils/ntp/PRE_BUILD | 11 ++++++++---
utils/ntp/glibc-2.10.patch | 4 ++--
utils/ntp/ntp-4.2.4p7-ipv6.patch | 10 ++++++++++
4 files changed, 26 insertions(+), 5 deletions(-)

New commits:
commit c7e082887ba5578bf3096189a12c0cb6780b3d5b
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

utils/ntp: changed applying of glibc-2.10 patch; added upstream fix for
IPv6 support on glibc >2.9

diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 041acf9..65239b1 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,9 @@
+2010-04-22 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PRE_BUILD: added new IPv6 fix patch, changed old way of applying
glibc patch
+ * glibc-2.10.patch: paths at top so no need to specify file, cleaner.
+ * ntp-4.2.6p7-ipv6.patch: IPv6 patch to get the ipv6 addr structs on
glibc-2.10 (upstream)
+ http://support.ntp.org/bugs/show_bug.cgi?id=1143
+
2009-05-27 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Add /ntp-4.2/ to SOURCE_URL[1] Bug #15236
* PRE_BUILD: Apply glibc-2.10.patch
diff --git a/utils/ntp/PRE_BUILD b/utils/ntp/PRE_BUILD
index 6b773db..1050cb7 100755
--- a/utils/ntp/PRE_BUILD
+++ b/utils/ntp/PRE_BUILD
@@ -1,3 +1,8 @@
-default_pre_build &&
-patch $SOURCE_DIRECTORY/include/ntp_syscall.h \
- $SCRIPT_DIRECTORY/glibc-2.10.patch
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 -i "$SCRIPT_DIRECTORY/glibc-2.10.patch" &&
+
+if list_find "$NTP_IPV6" "--with-ipv6"; then
+ patch -p1 -i "$SCRIPT_DIRECTORY/ntp-4.2.4p7-ipv6.patch"
+fi
diff --git a/utils/ntp/glibc-2.10.patch b/utils/ntp/glibc-2.10.patch
index c75b58c..99101e5 100644
--- a/utils/ntp/glibc-2.10.patch
+++ b/utils/ntp/glibc-2.10.patch
@@ -1,8 +1,8 @@
#
# 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
+--- a/include/ntp_syscall.h 2009-05-19 16:44:55.048156467 -0400
++++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400
@@ -14,6 +14,14 @@
# include <sys/timex.h>
#endif
diff --git a/utils/ntp/ntp-4.2.4p7-ipv6.patch
b/utils/ntp/ntp-4.2.4p7-ipv6.patch
new file mode 100644
index 0000000..253a424
--- /dev/null
+++ b/utils/ntp/ntp-4.2.4p7-ipv6.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac 2009-06-18 14:48:12.151346763 +0200
++++ b/configure.ac 2009-06-18 14:50:07.054692531 +0200
+@@ -4456,6 +4456,7 @@
+ [
+ AC_LANG_PROGRAM(
+ [
++ #define _GNU_SOURCE
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (c7e082887ba5578bf3096189a12c0cb6780b3d5b), Elisamuel Resto, 04/22/2010

Archive powered by MHonArc 2.6.24.

Top of Page