[PATCH 1/1] gnu: libevent: Update to 2.1.8.

[Marius Bakke]

* gnu/packages/libevent.scm (libevent): Update to 2.1.8.
[inputs]: Move everything to ...
[native-inputs]: ... here. Change 'python-wrapper' to 'python-2'.
(libevent-2.0): New variable.
* gnu/packages/patches/libevent-2.1-dns-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gnuzilla.scm (icecat)[inputs]: Change 'libevent' to 
'libevent-2.0'.
---
 gnu/local.mk                                      |  1 +
 gnu/packages/gnuzilla.scm                         |  2 +-
 gnu/packages/libevent.scm                         | 25 +++++++++++++++++-----
 gnu/packages/patches/libevent-2.1-dns-tests.patch | 26 +++++++++++++++++++++++
 4 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 gnu/packages/patches/libevent-2.1-dns-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 269af5fe1..2e68a8c1b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -672,6 +672,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/libdrm-symbol-check.patch               \
   %D%/packages/patches/libepoxy-gl-null-checks.patch           \
   %D%/packages/patches/libevent-dns-tests.patch                        \
+  %D%/packages/patches/libevent-2.1-dns-tests.patch            \
   %D%/packages/patches/libextractor-ffmpeg-3.patch             \
   %D%/packages/patches/libjxr-fix-function-signature.patch     \
   %D%/packages/patches/libjxr-fix-typos.patch                  \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 7758f27f8..9279c46b5 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -441,7 +441,7 @@ standards.")
        ("libgnome" ,libgnome)
        ("libjpeg-turbo" ,libjpeg-turbo)
        ("libxft" ,libxft)
-       ("libevent" ,libevent)
+       ("libevent" ,libevent-2.0)
        ("libxinerama" ,libxinerama)
        ("libxscrnsaver" ,libxscrnsaver)
        ("libxcomposite" ,libxcomposite)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index cb76915ef..a6229c209 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Eric Dvorsak <address@hidden>
 ;;; Copyright © 2016 David Thompson <address@hidden>
+;;; Copyright © 2017 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,7 +34,7 @@
 (define-public libevent
   (package
     (name "libevent")
-    (version "2.0.22")
+    (version "2.1.8")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -41,13 +42,13 @@
                    version "-stable/libevent-" version "-stable.tar.gz"))
              (sha256
               (base32
-               "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"))
-             (patches (search-patches "libevent-dns-tests.patch"))))
+               "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n"))
+             (patches (search-patches "libevent-2.1-dns-tests.patch"))))
     (build-system gnu-build-system)
-    (inputs
+    (native-inputs
      `(;; Dependencies used for the tests and for `event_rpcgen.py'.
        ("which" ,which)
-       ("python" ,python-wrapper)))
+       ("python" ,python-2))) ; 'print' syntax
     (home-page "http://libevent.org/";)
     (synopsis "Event notification library")
     (description
@@ -62,6 +63,20 @@ then add or remove events dynamically without having to 
change the event
 loop.")
     (license bsd-3)))
 
+(define-public libevent-2.0
+  (package
+    (inherit libevent)
+    (version "2.0.22")
+    (source (origin
+          (method url-fetch)
+          (uri (string-append
+                
"https://github.com/libevent/libevent/releases/download/release-";
+                version "-stable/libevent-" version "-stable.tar.gz"))
+          (sha256
+           (base32
+            "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"))
+          (patches (search-patches "libevent-dns-tests.patch"))))))
+
 (define-public libev
   (package
     (name "libev")
diff --git a/gnu/packages/patches/libevent-2.1-dns-tests.patch 
b/gnu/packages/patches/libevent-2.1-dns-tests.patch
new file mode 100644
index 000000000..091752a49
--- /dev/null
+++ b/gnu/packages/patches/libevent-2.1-dns-tests.patch
@@ -0,0 +1,26 @@
+Disable tests that rely on usable DNS lookups, which aren't available
+in build chroots.
+
+--- libevent-2.0.21-stable/test/regress_dns.c  2013-01-20 22:32:09.000000000 
+0100
++++ libevent-2.0.21-stable/test/regress_dns.c  2013-01-20 22:32:30.000000000 
+0100
+@@ -2120,10 +2120,6 @@
+ 
+ struct testcase_t dns_testcases[] = {
+       DNS_LEGACY(server, TT_FORK|TT_NEED_BASE),
+-      DNS_LEGACY(gethostbyname, 
TT_FORK|TT_NEED_BASE|TT_NEED_DNS|TT_OFF_BY_DEFAULT),
+-      DNS_LEGACY(gethostbyname6, 
TT_FORK|TT_NEED_BASE|TT_NEED_DNS|TT_OFF_BY_DEFAULT),
+-      DNS_LEGACY(gethostbyaddr, 
TT_FORK|TT_NEED_BASE|TT_NEED_DNS|TT_OFF_BY_DEFAULT),
+-      { "resolve_reverse", dns_resolve_reverse, TT_FORK|TT_OFF_BY_DEFAULT, 
NULL, NULL },
+       { "search_empty", dns_search_empty_test, TT_FORK|TT_NEED_BASE, 
&basic_setup, NULL },
+       { "search", dns_search_test, TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
+       { "search_lower", dns_search_lower_test, TT_FORK|TT_NEED_BASE, 
&basic_setup, NULL },
+@@ -2163,9 +2159,6 @@
+ 
+       { "client_fail_requests", dns_client_fail_requests_test,
+         TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
+-      { "client_fail_requests_getaddrinfo",
+-        dns_client_fail_requests_getaddrinfo_test,
+-        TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
+ 
+       END_OF_TESTCASES
+ };
-- 
2.11.0