← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/ntp/gutsy

« back to all changes in this revision

Viewing changes to debian/patches/ntpdate-ipv6.patch

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-05-18 22:41:56 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070518224156-563ruqxsxvqvoy8h
Tags: 1:4.2.4p0+dfsg-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - Update version in conflicts/replaces to that which was shipped in edgy,
    which was later than that in Debian (due to the ubuntuX).
  - Change default server to ntp.ubuntu.com.
  - Remove stop links from rc0 and rc6
  - Call dh_installinit with --error-handler
  - Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ntpdate-ipv6.patch
1
1
bug #249216
2
2
 
3
 
Index: ntp-4.2.2+dfsg/ntpdate/ntpdate.c
 
3
Index: ntp-4.2.4p0+dfsg/ntpdate/ntpdate.c
4
4
===================================================================
5
 
--- ntp-4.2.2+dfsg.orig/ntpdate/ntpdate.c       2006-06-06 20:16:59.000000000 +0000
6
 
+++ ntp-4.2.2+dfsg/ntpdate/ntpdate.c    2006-07-02 14:25:13.000000000 +0000
7
 
@@ -1777,8 +1777,7 @@
 
5
--- ntp-4.2.4p0+dfsg.orig/ntpdate/ntpdate.c     2007-04-10 10:48:06.000000000 +0200
 
6
+++ ntp-4.2.4p0+dfsg/ntpdate/ntpdate.c  2007-04-10 10:48:35.000000000 +0200
 
7
@@ -1757,8 +1757,7 @@
8
8
           if (res->ai_family == AF_INET6)
9
9
                if (setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval)) < 0) {
10
10
                           netsyslog(LOG_ERR, "setsockopt() IPV6_V6ONLY failed: %m");