From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 4 Jan 2021 00:28:18 +0000 (-0800)
Subject: libevent2: update to 2.1.12
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1c264de177bbd80c994e7fdbec8ff63334f728e6;p=openwrt%2Fstaging%2Fjow.git

libevent2: update to 2.1.12

Remove upstream backports.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/package/libs/libevent2/Makefile b/package/libs/libevent2/Makefile
index 701840a871..85c159c2a6 100644
--- a/package/libs/libevent2/Makefile
+++ b/package/libs/libevent2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libevent2
-PKG_VERSION:=2.1.11
-PKG_RELEASE:=2
+PKG_VERSION:=2.1.12
+PKG_RELEASE:=1
 
 PKG_SOURCE:=libevent-$(PKG_VERSION)-stable.tar.gz
 PKG_SOURCE_URL:=https://github.com/libevent/libevent/releases/download/release-$(PKG_VERSION)-stable
-PKG_HASH:=a65bac6202ea8c5609fd5c7e480e6d25de467ea1917c08290c521752f147283d
+PKG_HASH:=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
 PKG_BUILD_DIR:=$(BUILD_DIR)/libevent-$(PKG_VERSION)-stable
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
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
deleted file mode 100644
index b0b4bf8c0b..0000000000
--- a/package/libs/libevent2/patches/0001-Add-missing-file-Uninstall.cmake.in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/0002-Add-Uninstall.cmake.in-into-dist-archive.patch b/package/libs/libevent2/patches/0002-Add-Uninstall.cmake.in-into-dist-archive.patch
deleted file mode 100644
index c5bea996b7..0000000000
--- a/package/libs/libevent2/patches/0002-Add-Uninstall.cmake.in-into-dist-archive.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-