[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: libevent: Update to 2.1.0.
|
From: |
guix-commits |
|
Subject: |
01/02: gnu: libevent: Update to 2.1.0. |
|
Date: |
Sun, 26 May 2019 14:07:10 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 0d3dbe3f56949ad07d8a3816a8a884d3726d2c7d
Author: Marius Bakke <address@hidden>
Date: Sun May 26 14:18:26 2019 +0200
gnu: libevent: Update to 2.1.0.
* gnu/packages/patches/libevent-2.1-dns-tests.patch,
gnu/packages/patches/libevent-2.1-skip-failing-test.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/libevent.scm (libevent): Update to 2.1.10.
[source](patches): Remove.
---
gnu/local.mk | 2 --
gnu/packages/libevent.scm | 10 +++------
gnu/packages/patches/libevent-2.1-dns-tests.patch | 26 ----------------------
.../patches/libevent-2.1-skip-failing-test.patch | 24 --------------------
4 files changed, 3 insertions(+), 59 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 57d3590..3a199f8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -989,8 +989,6 @@ dist_patch_DATA =
\
%D%/packages/patches/libevent-2.0-CVE-2016-10196.patch \
%D%/packages/patches/libevent-2.0-CVE-2016-10197.patch \
%D%/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch
\
- %D%/packages/patches/libevent-2.1-dns-tests.patch \
- %D%/packages/patches/libevent-2.1-skip-failing-test.patch \
%D%/packages/patches/libexif-CVE-2016-6328.patch \
%D%/packages/patches/libexif-CVE-2017-7544.patch \
%D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index 01e1e3b..72227c1 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2015, 2017 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Eric Dvorsak <address@hidden>
;;; Copyright © 2016 David Thompson <address@hidden>
-;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017, 2019 Marius Bakke <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2019 Pierre Neidhardt <address@hidden>
@@ -41,7 +41,7 @@
(define-public libevent
(package
(name "libevent")
- (version "2.1.8")
+ (version "2.1.10")
(source (origin
(method url-fetch)
(uri (string-append
@@ -49,11 +49,7 @@
version "-stable/libevent-" version "-stable.tar.gz"))
(sha256
(base32
- "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n"))
- (patches (search-patches "libevent-2.1-dns-tests.patch"
- ;; XXX: Try removing this for > 2.1.8.
- ;;
https://github.com/libevent/libevent/issues/452
-
"libevent-2.1-skip-failing-test.patch"))))
+ "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78"))))
(build-system gnu-build-system)
(arguments
;; This skips some of the tests which fail on armhf and aarch64.
diff --git a/gnu/packages/patches/libevent-2.1-dns-tests.patch
b/gnu/packages/patches/libevent-2.1-dns-tests.patch
deleted file mode 100644
index 091752a..0000000
--- a/gnu/packages/patches/libevent-2.1-dns-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
- };
diff --git a/gnu/packages/patches/libevent-2.1-skip-failing-test.patch
b/gnu/packages/patches/libevent-2.1-skip-failing-test.patch
deleted file mode 100644
index d9ea1d4..0000000
--- a/gnu/packages/patches/libevent-2.1-skip-failing-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-These fail on 32-bit due to an overflow bug in the test program.
-
-See test/regress_util.c:1448.
-
-Upstream bug URL:
-
-https://github.com/libevent/libevent/issues/452
-
-diff --git a/test/regress_util.c b/test/regress_util.c
-index ef6a1487..4de501fc 100644
---- a/test/regress_util.c
-+++ b/test/regress_util.c
-@@ -1413,9 +1413,9 @@ static struct date_rfc1123_case {
- { 1323648000, "Mon, 12 Dec 2011 00:00:00 GMT"},
- #ifndef _WIN32
- /** In win32 case we have max "23:59:59 January 18, 2038, UTC" for
time32 */
-- { 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */,
-+ //{ 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */,
- /** In win32 case we have max "23:59:59, December 31, 3000, UTC" for
time64 */
-- {253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future no
one can imagine */,
-+ //{253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future
no one can imagine */,
- { 1456704000, "Mon, 29 Feb 2016 00:00:00 GMT"} /* leap year */,
- #endif
- { 1435708800, "Wed, 01 Jul 2015 00:00:00 GMT"} /* leap second */,