aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs/libevent2/patches
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2019-02-23 22:38:04 +0000
committerHans Dedecker <dedeckeh@gmail.com>2019-10-15 22:35:14 +0200
commitf351beedfd47766e5e44a04af50e3724bec54dbc (patch)
tree7867648e722e79dfa45e2e30ee6ba8eaa64a830c /package/libs/libevent2/patches
parent63c43e5674f346b8ed13377d551e5699afbeb673 (diff)
downloadupstream-f351beedfd47766e5e44a04af50e3724bec54dbc.tar.gz
upstream-f351beedfd47766e5e44a04af50e3724bec54dbc.tar.bz2
upstream-f351beedfd47766e5e44a04af50e3724bec54dbc.zip
libevent2: Update to 2.1.11
Update libevent to 2.1.11 Use CMake instead GNU Autotools Backport following commits: https://github.com/libevent/libevent/commit/f05ba671931e2b4e38459899f6f63f79f99869fe ..and partially https://github.com/libevent/libevent/commit/7201062f3ef505a77baa6ccaf1cf73812462308a to fix compilation Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'package/libs/libevent2/patches')
-rw-r--r--package/libs/libevent2/patches/0001-Add-missing-file-Uninstall.cmake.in.patch45
-rw-r--r--package/libs/libevent2/patches/0001-Do-not-check-for-ERR_remove_thread_state-do-not-link.patch49
-rw-r--r--package/libs/libevent2/patches/0002-Add-Uninstall.cmake.in-into-dist-archive.patch25
-rw-r--r--package/libs/libevent2/patches/0002-Makefile.am-omit-building-sample-and-test.patch13
4 files changed, 70 insertions, 62 deletions
diff --git a/package/libs/libevent2/patches/0001-Add-missing-file-Uninstall.cmake.in.patch b/package/libs/libevent2/patches/0001-Add-missing-file-Uninstall.cmake.in.patch
new file mode 100644
index 0000000000..b0b4bf8c0b
--- /dev/null
+++ b/package/libs/libevent2/patches/0001-Add-missing-file-Uninstall.cmake.in.patch
@@ -0,0 +1,45 @@
+From 9c2d9d2c8f65d7c6bb268c0e9795bac296661ca8 Mon Sep 17 00:00:00 2001
+From: Daniel Engberg <daniel.engberg.lists@pyret.net>
+Date: Wed, 7 Aug 2019 00:56:39 +0200
+Subject: [PATCH] Add missing file Uninstall.cmake.in
+
+Needed to fix compilation
+
+Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
+---
+ cmake/Uninstall.cmake.in | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+ create mode 100644 cmake/Uninstall.cmake.in
+
+diff --git a/cmake/Uninstall.cmake.in b/cmake/Uninstall.cmake.in
+new file mode 100644
+index 0000000..c6dc09e
+--- /dev/null
++++ b/cmake/Uninstall.cmake.in
+@@ -0,0 +1,23 @@
++# https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake
++
++if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
++ message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
++endif(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
++
++file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
++string(REGEX REPLACE "\n" ";" files "${files}")
++foreach(file ${files})
++ message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
++ if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
++ exec_program(
++ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
++ OUTPUT_VARIABLE rm_out
++ RETURN_VALUE rm_retval
++ )
++ if(NOT "${rm_retval}" STREQUAL 0)
++ message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
++ endif(NOT "${rm_retval}" STREQUAL 0)
++ else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
++ message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
++ endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
++endforeach(file)
+--
+2.22.0
+
diff --git a/package/libs/libevent2/patches/0001-Do-not-check-for-ERR_remove_thread_state-do-not-link.patch b/package/libs/libevent2/patches/0001-Do-not-check-for-ERR_remove_thread_state-do-not-link.patch
deleted file mode 100644
index d2677a1f61..0000000000
--- a/package/libs/libevent2/patches/0001-Do-not-check-for-ERR_remove_thread_state-do-not-link.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f519e0f30a00393b949c4e20868952726a9c6d2e Mon Sep 17 00:00:00 2001
-From: Pierce Lopez <pierce.lopez@gmail.com>
-Date: Thu, 2 Mar 2017 21:09:32 -0500
-Subject: [PATCH] Do not check for ERR_remove_thread_state() (do not link ssl
- into every library)
-
-This reverts commit c4e9d9bd662de7f575f2172c160795d452ebe709
-("sample/https-client: check for ERR_remove_thread_state() existence").
-
-Calling AC_SEARCH_LIBS() modifies LIBS - -lcrypto incorrectly
-ends up in LIBS, and thus linked to by libevent_core.so.
-
-Checking for ERR_remove_thread_state should no longer be needed
-because it was introduced in openssl 1.0.0, and the previous line
-0.9.8 had support discontinued at the end of 2015.
-
-Fixes: #473
----
- configure.ac | 4 ----
- sample/https-client.c | 4 ----
- 2 files changed, 8 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -791,10 +791,6 @@ fi
-
- # check if we have and should use openssl
- AM_CONDITIONAL(OPENSSL, [test "$enable_openssl" != "no" && test "$have_openssl" = "yes"])
--if test "x$enable_openssl" = "xyes"; then
-- AC_SEARCH_LIBS([ERR_remove_thread_state], [crypto eay32],
-- [AC_DEFINE(HAVE_ERR_REMOVE_THREAD_STATE, 1, [Define to 1 if you have ERR_remove_thread_stat().])])
--fi
-
- # Add some more warnings which we use in development but not in the
- # released versions. (Some relevant gcc versions can't handle these.)
---- a/sample/https-client.c
-+++ b/sample/https-client.c
-@@ -484,11 +484,7 @@ cleanup:
- EVP_cleanup();
- ERR_free_strings();
-
--#ifdef EVENT__HAVE_ERR_REMOVE_THREAD_STATE
- ERR_remove_thread_state(NULL);
--#else
-- ERR_remove_state(0);
--#endif
- CRYPTO_cleanup_all_ex_data();
-
- sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
diff --git a/package/libs/libevent2/patches/0002-Add-Uninstall.cmake.in-into-dist-archive.patch b/package/libs/libevent2/patches/0002-Add-Uninstall.cmake.in-into-dist-archive.patch
new file mode 100644
index 0000000000..c5bea996b7
--- /dev/null
+++ b/package/libs/libevent2/patches/0002-Add-Uninstall.cmake.in-into-dist-archive.patch
@@ -0,0 +1,25 @@
+From f05ba671931e2b4e38459899f6f63f79f99869fe Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin <a3at.mail@gmail.com>
+Date: Sat, 3 Aug 2019 14:32:21 +0300
+Subject: [PATCH] Add Uninstall.cmake.in into dist archive
+
+Fixes: #863
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index af75a963..92f9433c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -127,6 +127,7 @@ CMAKE_FILES = \
+ cmake/LibeventConfig.cmake.in \
+ cmake/LibeventConfigVersion.cmake.in \
+ cmake/VersionViaGit.cmake \
++ cmake/Uninstall.cmake.in \
+ event-config.h.cmake \
+ evconfig-private.h.cmake \
+ CMakeLists.txt
+--
+2.22.0
+
diff --git a/package/libs/libevent2/patches/0002-Makefile.am-omit-building-sample-and-test.patch b/package/libs/libevent2/patches/0002-Makefile.am-omit-building-sample-and-test.patch
deleted file mode 100644
index 506137d555..0000000000
--- a/package/libs/libevent2/patches/0002-Makefile.am-omit-building-sample-and-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -143,8 +143,8 @@ CLEANFILES=
- DISTCLEANFILES=
- BUILT_SOURCES =
- include include/include.am
--include sample/include.am
--include test/include.am
-+#include sample/include.am
-+#include test/include.am
-
- if BUILD_WIN32
-