Merge pull request #87 from avsm/master

0.17.0

.travis.yml

@@ -1,9 +1,22 @@
 language: c
-install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
-script: bash -ex .travis-opam.sh
+sudo: false
+services:
+  - docker
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh
+script: bash ./.travis-docker.sh
 env:
-  - PACKAGE="dns" OCAML_VERSION=4.02 REVDEPS=true
-  - PACKAGE="dns" OCAML_VERSION=4.01 POST_INSTALL_HOOK="./.travis-ci-post.sh"
-  - PACKAGE="dns" OCAML_VERSION=4.02 DEPOPTS="tcpip" POST_INSTALL_HOOK="./.travis-ci-post.sh"
-  - PACKAGE="dns" OCAML_VERSION=4.02 DEPOPTS="async"
-  - PACKAGE="dns" OCAML_VERSION=4.01 DEPOPTS="tcpip lwt" REVDEPS=true
+ global:
+   - PACKAGE="dns"
+   - DEPOPTS="tcpip lwt async"
+   - REVDEPS="true"
+ matrix:
+   - DISTRO=debian-stable OCAML_VERSION=4.02.3
+   - DISTRO=debian-testing OCAML_VERSION=4.02.3
+   - DISTRO=debian-unstable OCAML_VERSION=4.02.3
+   - DISTRO=ubuntu-12.04 OCAML_VERSION=4.02.3
+   - DISTRO=ubuntu-15.10 OCAML_VERSION=4.02.3
+   - DISTRO=ubuntu-16.04 OCAML_VERSION=4.02.3
+   - DISTRO=centos-6 OCAML_VERSION=4.02.3
+   - DISTRO=centos-7 OCAML_VERSION=4.02.3
+   - DISTRO=fedora-23 OCAML_VERSION=4.02.3
+   - DISTRO=alpine-3.3 OCAML_VERSION=4.02.3

CHANGES

@@ -1,3 +1,11 @@
+0.17.0 (2016-03-11):
+* This library now depends on the `hashcons` package rather than
+  containing a fork of it. Now that there is no LGPL (+ linking exception)
+  code left, clarify that the license is ISC. Previously the `opam`
+  file claimed a mixture of licenses (#86 via @djs55).
+* Add multi-distro Travis testing support.
+* Library now depends on OCaml 4.02+
+
 0.16.0 (2015-10-21):
 * Change source port randomization to avoid overflow in the port range
   (#83 from @yomimono).

LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2015 Luke Dunstan <[email protected]>
+Copyright (c) 2015 Heidi Howard <[email protected]>
+Copyright (c) 2013-2015 David Sheets <[email protected]>
+Copyright (c) 2014 marklrh <[email protected]>
+Copyright (c) 2005-2014 Anil Madhavapeddy <[email protected]>
+Copyright (c) 2011-2012 Richard Mortier <[email protected]>
+Copyright (c) 2011-2014 Anil Madhavapeddy <[email protected]>
+Copyright (c) 2005-2006 Tim Deegan <[email protected]>
+Copyright (c) 2005 Fraser Research Inc. <[email protected]>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

_oasis

@@ -1,7 +1,7 @@
 OASISFormat: 0.4
 Name:        dns
-Version:     0.16.0
-Authors:     Anil Madhavapeddy, Tim Deegan, Richard Mortier, Haris Rotsos, David Sheets, Thomas Gazagnaire, Luke Dunstan
+Version:     0.17.0
+Authors:     Anil Madhavapeddy, Tim Deegan, Richard Mortier, Haris Rotsos, David Sheets, Thomas Gazagnaire, Luke Dunstan, David Scott
 Maintainers: Anil Madhavapeddy <[email protected]>
 License:     ISC
 Synopsis:    DNS client and server implementation
@@ -33,11 +33,12 @@ Library dns
   Findlibname: dns
   Pack: true
   Modules:
-    Hashcons, Loader, Name, Operators, Packet, Query, RR, Trie,
+    Loader, Name, Operators, Packet, Query, RR, Trie,
     Zone, Zone_lexer, Zone_parser, Resolvconf, Buf, Protocol, Dig,
     Probe
   BuildDepends: cstruct (>= 1.0.1), re, re.str, ipaddr (>= 2.6.0),
-                base64 (>= 2.0.0), bytes, uri.services (>= 1.7.0)
+                base64 (>= 2.0.0), bytes, uri.services (>= 1.7.0),
+                hashcons
 
 Library "dns-lwt"
   Path: lwt
@@ -92,7 +93,7 @@ Document dns
   BuildTools+:          ocamldoc
   XOCamlbuildPath:      lib
   XOCamlbuildModules:
-    Hashcons, Loader, Name, Operators, Packet, Query, RR, Trie,
+    Loader, Name, Operators, Packet, Query, RR, Trie,
     Zone, Zone_lexer, Zone_parser, Resolvconf, Buf, Protocol, Probe
 
 Document dns_lwt

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 16d063bcae0b0ce1a0345f46677040eb)
+# DO NOT EDIT (digest: a0867a659f6565e6250a04efd08e1a0d)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -16,7 +16,6 @@ true: annot, bin_annot
 "_darcs": not_hygienic
 # Library dns
 "lib/dns.cmxs": use_dns
-"lib/hashcons.cmx": for-pack(Dns)
 "lib/loader.cmx": for-pack(Dns)
 "lib/name.cmx": for-pack(Dns)
 "lib/operators.cmx": for-pack(Dns)
@@ -35,6 +34,7 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: pkg_base64
 <lib/*.ml{,i,y}>: pkg_bytes
 <lib/*.ml{,i,y}>: pkg_cstruct
+<lib/*.ml{,i,y}>: pkg_hashcons
 <lib/*.ml{,i,y}>: pkg_ipaddr
 <lib/*.ml{,i,y}>: pkg_re
 <lib/*.ml{,i,y}>: pkg_re.str
@@ -46,6 +46,7 @@ true: annot, bin_annot
 <mirage/*.ml{,i,y}>: pkg_base64
 <mirage/*.ml{,i,y}>: pkg_bytes
 <mirage/*.ml{,i,y}>: pkg_cstruct
+<mirage/*.ml{,i,y}>: pkg_hashcons
 <mirage/*.ml{,i,y}>: pkg_io-page
 <mirage/*.ml{,i,y}>: pkg_ipaddr
 <mirage/*.ml{,i,y}>: pkg_lwt
@@ -68,6 +69,7 @@ true: annot, bin_annot
 <async/*.ml{,i,y}>: pkg_bytes
 <async/*.ml{,i,y}>: pkg_core.syntax
 <async/*.ml{,i,y}>: pkg_cstruct
+<async/*.ml{,i,y}>: pkg_hashcons
 <async/*.ml{,i,y}>: pkg_ipaddr
 <async/*.ml{,i,y}>: pkg_re
 <async/*.ml{,i,y}>: pkg_re.str
@@ -80,6 +82,7 @@ true: annot, bin_annot
 <lib_test/unix/lwt_server.{native,byte}>: pkg_bytes
 <lib_test/unix/lwt_server.{native,byte}>: pkg_cstruct
 <lib_test/unix/lwt_server.{native,byte}>: pkg_cstruct.lwt
+<lib_test/unix/lwt_server.{native,byte}>: pkg_hashcons
 <lib_test/unix/lwt_server.{native,byte}>: pkg_ipaddr
 <lib_test/unix/lwt_server.{native,byte}>: pkg_ipaddr.unix
 <lib_test/unix/lwt_server.{native,byte}>: pkg_lwt
@@ -97,6 +100,7 @@ true: annot, bin_annot
 <lib_test/unix/time_server.{native,byte}>: pkg_bytes
 <lib_test/unix/time_server.{native,byte}>: pkg_cstruct
 <lib_test/unix/time_server.{native,byte}>: pkg_cstruct.lwt
+<lib_test/unix/time_server.{native,byte}>: pkg_hashcons
 <lib_test/unix/time_server.{native,byte}>: pkg_ipaddr
 <lib_test/unix/time_server.{native,byte}>: pkg_ipaddr.unix
 <lib_test/unix/time_server.{native,byte}>: pkg_lwt
@@ -112,6 +116,7 @@ true: annot, bin_annot
 <lib_test/unix/*.ml{,i,y}>: pkg_bytes
 <lib_test/unix/*.ml{,i,y}>: pkg_cstruct
 <lib_test/unix/*.ml{,i,y}>: pkg_cstruct.lwt
+<lib_test/unix/*.ml{,i,y}>: pkg_hashcons
 <lib_test/unix/*.ml{,i,y}>: pkg_ipaddr
 <lib_test/unix/*.ml{,i,y}>: pkg_ipaddr.unix
 <lib_test/unix/*.ml{,i,y}>: pkg_lwt
@@ -130,6 +135,7 @@ true: annot, bin_annot
 <lwt/dig_unix.{native,byte}>: pkg_cmdliner
 <lwt/dig_unix.{native,byte}>: pkg_cstruct
 <lwt/dig_unix.{native,byte}>: pkg_cstruct.lwt
+<lwt/dig_unix.{native,byte}>: pkg_hashcons
 <lwt/dig_unix.{native,byte}>: pkg_ipaddr
 <lwt/dig_unix.{native,byte}>: pkg_ipaddr.unix
 <lwt/dig_unix.{native,byte}>: pkg_lwt
@@ -146,6 +152,7 @@ true: annot, bin_annot
 <lwt/*.ml{,i,y}>: pkg_cmdliner
 <lwt/*.ml{,i,y}>: pkg_cstruct
 <lwt/*.ml{,i,y}>: pkg_cstruct.lwt
+<lwt/*.ml{,i,y}>: pkg_hashcons
 <lwt/*.ml{,i,y}>: pkg_ipaddr
 <lwt/*.ml{,i,y}>: pkg_ipaddr.unix
 <lwt/*.ml{,i,y}>: pkg_lwt
@@ -165,6 +172,7 @@ true: annot, bin_annot
 <lib_test/async/test_async_dns_resolver_unix.{native,byte}>: pkg_bytes
 <lib_test/async/test_async_dns_resolver_unix.{native,byte}>: pkg_core.syntax
 <lib_test/async/test_async_dns_resolver_unix.{native,byte}>: pkg_cstruct
+<lib_test/async/test_async_dns_resolver_unix.{native,byte}>: pkg_hashcons
 <lib_test/async/test_async_dns_resolver_unix.{native,byte}>: pkg_ipaddr
 <lib_test/async/test_async_dns_resolver_unix.{native,byte}>: pkg_re
 <lib_test/async/test_async_dns_resolver_unix.{native,byte}>: pkg_re.str
@@ -179,6 +187,7 @@ true: annot, bin_annot
 <lib_test/async/*.ml{,i,y}>: pkg_bytes
 <lib_test/async/*.ml{,i,y}>: pkg_core.syntax
 <lib_test/async/*.ml{,i,y}>: pkg_cstruct
+<lib_test/async/*.ml{,i,y}>: pkg_hashcons
 <lib_test/async/*.ml{,i,y}>: pkg_ipaddr
 <lib_test/async/*.ml{,i,y}>: pkg_re
 <lib_test/async/*.ml{,i,y}>: pkg_re.str
@@ -192,6 +201,7 @@ true: annot, bin_annot
 <lib_test/ounit/test.{native,byte}>: pkg_base64
 <lib_test/ounit/test.{native,byte}>: pkg_bytes
 <lib_test/ounit/test.{native,byte}>: pkg_cstruct
+<lib_test/ounit/test.{native,byte}>: pkg_hashcons
 <lib_test/ounit/test.{native,byte}>: pkg_io-page
 <lib_test/ounit/test.{native,byte}>: pkg_io-page.unix
 <lib_test/ounit/test.{native,byte}>: pkg_ipaddr
@@ -212,6 +222,7 @@ true: annot, bin_annot
 <lib_test/ounit/*.ml{,i,y}>: pkg_base64
 <lib_test/ounit/*.ml{,i,y}>: pkg_bytes
 <lib_test/ounit/*.ml{,i,y}>: pkg_cstruct
+<lib_test/ounit/*.ml{,i,y}>: pkg_hashcons
 <lib_test/ounit/*.ml{,i,y}>: pkg_io-page
 <lib_test/ounit/*.ml{,i,y}>: pkg_io-page.unix
 <lib_test/ounit/*.ml{,i,y}>: pkg_ipaddr

lib/META

@@ -1,15 +1,15 @@
 # OASIS_START
-# DO NOT EDIT (digest: a464db0abf4bb1f6ebe7ab194be3e202)
-version = "0.16.0"
+# DO NOT EDIT (digest: d811563fddc83f8752e1f51737b88600)
+version = "0.17.0"
 description = "DNS client and server implementation"
-requires = "cstruct re re.str ipaddr base64 bytes uri.services"
+requires = "cstruct re re.str ipaddr base64 bytes uri.services hashcons"
 archive(byte) = "dns.cma"
 archive(byte, plugin) = "dns.cma"
 archive(native) = "dns.cmxa"
 archive(native, plugin) = "dns.cmxs"
 exists_if = "dns.cma"
 package "mirage" (
- version = "0.16.0"
+ version = "0.17.0"
  description = "DNS client and server implementation"
  requires = "cstruct lwt dns dns.lwt-core mirage-types io-page"
  archive(byte) = "dns-lwt-mirage.cma"
@@ -20,7 +20,7 @@ package "mirage" (
 )
 
 package "lwt-core" (
- version = "0.16.0"
+ version = "0.17.0"
  description = "DNS client and server implementation"
  requires = "lwt cstruct dns mirage-profile"
  archive(byte) = "dns-lwt-core.cma"
@@ -31,7 +31,7 @@ package "lwt-core" (
 )
 
 package "lwt" (
- version = "0.16.0"
+ version = "0.17.0"
  description = "DNS client and server implementation"
  requires = "lwt.unix cstruct.lwt dns dns.lwt-core ipaddr.unix"
  archive(byte) = "dns-lwt.cma"
@@ -42,7 +42,7 @@ package "lwt" (
 )
 
 package "async-unix" (
- version = "0.16.0"
+ version = "0.17.0"
  description = "DNS client and server implementation"
  requires = "async dns.async threads"
  archive(byte) = "dns-async-unix.cma"
@@ -53,7 +53,7 @@ package "async-unix" (
 )
 
 package "async" (
- version = "0.16.0"
+ version = "0.17.0"
  description = "DNS client and server implementation"
  requires = "async_kernel ipaddr dns"
  archive(byte) = "dns-async.cma"

lib/dns.mlpack

@@ -1,6 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: aa7d04c666ff887d07ad3d4805b5d2e3)
-Hashcons
+# DO NOT EDIT (digest: 2f56051cbef6f68897d06ab66f5274d0)
 Loader
 Name
 Operators

lib/dns.odocl

@@ -1,6 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 59887dbeb9a15f05695822d643f8d98d)
-Hashcons
+# DO NOT EDIT (digest: 424efe6e400b70b115832fcfa5e8727a)
 Loader
 Name
 Operators