From 612b4b89ed9e554057f540a74826eb21d37843bd Mon Sep 17 00:00:00 2001 From: fdov Date: Wed, 9 Jun 2021 23:39:38 +0200 Subject: [PATCH 1/2] depends: libevent 2.1.12-stable cherry-picked from 1.21-dev --- depends/packages/libevent.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk index e570e91e5..1173768ea 100644 --- a/depends/packages/libevent.mk +++ b/depends/packages/libevent.mk @@ -1,8 +1,8 @@ package=libevent -$(package)_version=2.1.11-stable -$(package)_download_path=https://github.com/libevent/libevent/archive/ -$(package)_file_name=release-$($(package)_version).tar.gz -$(package)_sha256_hash=229393ab2bf0dc94694f21836846b424f3532585bac3468738b7bf752c03901e +$(package)_version=2.1.12-stable +$(package)_download_path=https://github.com/libevent/libevent/releases/download/release-$($(package)_version)/ +$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb define $(package)_preprocess_cmds ./autogen.sh From 211db366c4462bb0c0cd9f82ab1b08105f652e91 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 22 Jun 2021 18:21:47 +0300 Subject: [PATCH 2/2] build: Avoid getrandom@GLIBC_2.25 symbol in libevent package --- depends/packages/libevent.mk | 5 +++++ depends/patches/libevent/glibc_compatibility.patch | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 depends/patches/libevent/glibc_compatibility.patch diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk index 1173768ea..1157364a5 100644 --- a/depends/packages/libevent.mk +++ b/depends/packages/libevent.mk @@ -3,6 +3,7 @@ $(package)_version=2.1.12-stable $(package)_download_path=https://github.com/libevent/libevent/releases/download/release-$($(package)_version)/ $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb +$(package)_patches = glibc_compatibility.patch define $(package)_preprocess_cmds ./autogen.sh @@ -14,6 +15,10 @@ define $(package)_set_vars $(package)_config_opts_linux=--with-pic endef +define $(package)_preprocess_cmds + patch -p1 -i $($(package)_patch_dir)/glibc_compatibility.patch +endef + define $(package)_config_cmds $($(package)_autoconf) endef diff --git a/depends/patches/libevent/glibc_compatibility.patch b/depends/patches/libevent/glibc_compatibility.patch new file mode 100644 index 000000000..e27777a67 --- /dev/null +++ b/depends/patches/libevent/glibc_compatibility.patch @@ -0,0 +1,14 @@ +Avoid getrandom@GLIBC_2.25 symbol. + +--- old/config.h.in ++++ new/config.h.in +@@ -101,9 +101,6 @@ + /* Define to 1 if you have the `getprotobynumber' function. */ + #undef HAVE_GETPROTOBYNUMBER + +-/* Define to 1 if you have the `getrandom' function. */ +-#undef HAVE_GETRANDOM +- + /* Define to 1 if you have the `getservbyname' function. */ + #undef HAVE_GETSERVBYNAME +