diff -u ntp-4.2.4p4+dfsg/debian/changelog ntp-4.2.4p4+dfsg/debian/changelog --- ntp-4.2.4p4+dfsg/debian/changelog +++ ntp-4.2.4p4+dfsg/debian/changelog @@ -1,3 +1,9 @@ +ntp (1:4.2.4p4+dfsg-6ubuntu3~ppa1) intrepid; urgency=low + + * Define _GNU_SOURCE to make IPv6 work. + + -- Matt LaPlante Thu, 04 Dec 2008 00:39:51 -0600 + ntp (1:4.2.4p4+dfsg-6ubuntu2) intrepid; urgency=low * debian/ntpdate.ifup: use a different lockfile to avoid dead-locks diff -u ntp-4.2.4p4+dfsg/debian/patches/series ntp-4.2.4p4+dfsg/debian/patches/series --- ntp-4.2.4p4+dfsg/debian/patches/series +++ ntp-4.2.4p4+dfsg/debian/patches/series @@ -13,0 +14 @@ +ipv6-gnu-source.diff only in patch2: unchanged: --- ntp-4.2.4p4+dfsg.orig/debian/patches/ipv6-gnu-source.diff +++ ntp-4.2.4p4+dfsg/debian/patches/ipv6-gnu-source.diff @@ -0,0 +1,197 @@ +Index: ntp-4.2.4p4+dfsg/configure +=================================================================== +--- ntp-4.2.4p4+dfsg.orig/configure 2008-12-04 10:53:53.755460796 -0600 ++++ ntp-4.2.4p4+dfsg/configure 2008-12-04 10:54:08.300533538 -0600 +@@ -2619,6 +2619,11 @@ + + iCFLAGS="$CFLAGS" + ++cat >>confdefs.h <<\_ACEOF ++#define _GNU_SOURCE 1 ++_ACEOF ++ ++ + DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" +@@ -15798,7 +15803,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 15801 "configure"' > conftest.$ac_ext ++ echo '#line 15806 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -18377,11 +18382,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18380: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18385: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18384: \$? = $ac_status" >&5 ++ echo "$as_me:18389: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -18667,11 +18672,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18670: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18675: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18674: \$? = $ac_status" >&5 ++ echo "$as_me:18679: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -18771,11 +18776,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18774: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18779: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:18778: \$? = $ac_status" >&5 ++ echo "$as_me:18783: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -21148,7 +21153,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:23657: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:23656: \$? = $ac_status" >&5 ++ echo "$as_me:23661: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -23753,11 +23758,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:23756: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:23761: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:23760: \$? = $ac_status" >&5 ++ echo "$as_me:23765: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -25351,11 +25356,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:25354: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:25359: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:25358: \$? = $ac_status" >&5 ++ echo "$as_me:25363: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -25455,11 +25460,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:25458: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:25463: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:25462: \$? = $ac_status" >&5 ++ echo "$as_me:25467: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -27675,11 +27680,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:27678: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:27683: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:27682: \$? = $ac_status" >&5 ++ echo "$as_me:27687: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -27965,11 +27970,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:27968: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:27973: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:27972: \$? = $ac_status" >&5 ++ echo "$as_me:27977: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -28069,11 +28074,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:28072: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:28077: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:28076: \$? = $ac_status" >&5 ++ echo "$as_me:28081: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +Index: ntp-4.2.4p4+dfsg/configure.ac +=================================================================== +--- ntp-4.2.4p4+dfsg.orig/configure.ac 2008-12-04 10:52:42.242180500 -0600 ++++ ntp-4.2.4p4+dfsg/configure.ac 2008-12-04 10:53:12.412406268 -0600 +@@ -20,6 +20,9 @@ + dnl Grab any initial CFLAGS so we can pick better defaults. + iCFLAGS="$CFLAGS" + ++dnl Define _GNU_SOURCE, this should be done before any feature test. ++AC_DEFINE(_GNU_SOURCE) ++ + dnl check these early to avoid autoconf warnings + AC_AIX + AC_MINIX