Re: [PR PATCH] [Updated] libevent: update to 2.1.11.

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages libevent-2.1.11
https://github.com/void-linux/void-packages/pull/13873

libevent: update to 2.1.11.
what builds: all packages build, except
* icecat ( fixed in #15221)
* firefox-esr (fixed in #15402)
* thunderbird (fixed in #15429)

what works: firefox, thunderbird, tmux, tor and qt work fine (tested on x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/13873.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libevent-2.1.11-13873.patch --]
[-- Type: text/x-diff, Size: 26983 bytes --]

From 09d214638b0e95be8379069afdad7db14bd99054 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:25:46 +0200
Subject: [PATCH 01/32] libevent: update to 2.1.11.

---
 common/shlibs                                 | 10 ++---
 ...aef59ab6808a0801007d0a681f2415af4871.patch | 43 +++++++++++++++++++
 srcpkgs/libevent/template                     |  8 ++--
 3 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libevent/patches/ddacaef59ab6808a0801007d0a681f2415af4871.patch

diff --git a/common/shlibs b/common/shlibs
index 5d5fe02cf6a..05307286d86 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -713,9 +713,11 @@ libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
 libldap_r-2.4.so.2 libldap-2.4.21_1
-libevent-2.1.so.6 libevent-2.1.8_1
-libevent_core-2.1.so.6 libevent-2.1.8_1
-libevent_pthreads-2.1.so.6 libevent-2.1.8_1
+libevent-2.1.so.7 libevent-2.1.11_1
+libevent_core-2.1.so.7 libevent-2.1.11_1
+libevent_pthreads-2.1.so.7 libevent-2.1.11_1
+libevent_extra-2.1.so.7 libevent-2.1.11_3
+libevent_openssl-2.1.so.7 libevent-2.1.11_3
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.3.9_1
@@ -2929,8 +2931,6 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libixml.so.10 libupnp1.8-1.8.2_1
 libupnp.so.13 libupnp1.8-1.8.4_1
-libevent_extra-2.1.so.6 libevent-2.1.8_3
-libevent_openssl-2.1.so.6 libevent-2.1.8_3
 libsysprof-2.so sysprof-3.24.1_1
 libsysprof-ui-2.so sysprof-3.24.1_1
 libmozjs-52.so mozjs52-52.3.0_1
diff --git a/srcpkgs/libevent/patches/ddacaef59ab6808a0801007d0a681f2415af4871.patch b/srcpkgs/libevent/patches/ddacaef59ab6808a0801007d0a681f2415af4871.patch
new file mode 100644
index 00000000000..8f98c9534b5
--- /dev/null
+++ b/srcpkgs/libevent/patches/ddacaef59ab6808a0801007d0a681f2415af4871.patch
@@ -0,0 +1,43 @@
+#upstream: yes
+
+From ddacaef59ab6808a0801007d0a681f2415af4871 Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin <azat@libevent.org>
+Date: Thu, 29 Aug 2019 22:57:44 +0300
+Subject: [PATCH] Revert "Warn if forked from the event loop during
+ event_reinit()"
+
+Thinking about this more and realizing that this was a mistake, so
+should be reverted.
+
+In a nut shell I guess most of the apps calls event_reinit() from the
+loop (see [1] for example), and this should be totally fine (the bit
+with the signals [2] handled in event_reinit() gracefully)
+
+  [1]: https://archives.seul.org/libevent/users/Aug-2019/msg00009.html
+  [2]: https://github.com/libevent/libevent/pull/833#issuecomment-501834453
+
+This reverts commit 497ef904d544ac51de43934549dbeccce8e6e8f8.
+
+Reported-by: mikulas@twibright.com
+Backport-to: 2.1
+---
+ event.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/event.c b/event.c
+index 8cae318d1..ff4e79c84 100644
+--- event.c
++++ event.c
+@@ -1003,12 +1003,6 @@ event_reinit(struct event_base *base)
+ 
+ 	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+ 
+-	if (base->running_loop) {
+-		event_warnx("%s: forked from the event_loop.", __func__);
+-		res = -1;
+-		goto done;
+-	}
+-
+ 	evsel = base->evsel;
+ 
+ 	/* check if this event mechanism requires reinit on the backend */
diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 713369e490c..4a1d62e907f 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,16 +1,16 @@
 # Template file for 'libevent'
 pkgname=libevent
-version=2.1.10
-revision=2
+version=2.1.11
+revision=1
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
 makedepends="libressl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
 homepage="http://libevent.org/"
-license="3-clause-BSD"
 distfiles="https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"
-checksum=e864af41a336bb11dab1a23f32993afe963c1f69618bd9292b89ecf6904845b0
+checksum=a65bac6202ea8c5609fd5c7e480e6d25de467ea1917c08290c521752f147283d
 
 post_install() {
 	vlicense LICENSE

From fc14cc76a61a7abca0f51502c644efa0bcd5f64b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:48 +0200
Subject: [PATCH 02/32] bitcoin: rebuild for libevent-2.1.11

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index b91af62be02..a1a3c2b242c 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 0576f292ccfed4ed9fb05c18bb8d3ccbf4f84a5d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:49 +0200
Subject: [PATCH 03/32] chromium: rebuild for libevent-2.1.11

---
 srcpkgs/chromium/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 45893b5f8e1..3eaad048059 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -2,7 +2,7 @@
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
 version=77.0.3865.120
-revision=1
+revision=2
 archs="i686 x86_64*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From b3ce9d01d8069a999724fe79aeae0d4074f41e61 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:49 +0200
Subject: [PATCH 04/32] coturn: rebuild for libevent-2.1.11

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 92de4f60168..540193574ae 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.1
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
 makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel

From 7f22ace18ca09f2242064eb8aea0cce3618efc06 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:49 +0200
Subject: [PATCH 05/32] crystal: rebuild for libevent-2.1.11

---
 srcpkgs/crystal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index 2bb0db5dc81..10c0bd99246 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -1,7 +1,7 @@
 # Template file for 'crystal'
 pkgname=crystal
 version=0.31.1
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 _shardsversion=0.9.0
 _bootstrapversion=0.31.1

From 93af3c1299373ad8460b6e8160340bd677304cb4 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:50 +0200
Subject: [PATCH 06/32] firefox: rebuild for libevent-2.1.11

---
 srcpkgs/firefox-i18n/template | 2 +-
 srcpkgs/firefox/template      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index c901f5c9123..e18ba583880 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -3,10 +3,10 @@ pkgname=firefox-i18n
 version=69.0.2
 revision=1
 build_style=meta
-homepage="https://www.mozilla.org/firefox/"
 short_desc="Firefox language packs"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
+homepage="https://www.mozilla.org/firefox/"
 
 create_wrksrc=yes
 
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index ec5516269f3..618e478b723 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -4,7 +4,7 @@
 #
 pkgname=firefox
 version=69.0.2
-revision=1
+revision=2
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"

From 6deaed3573193ad236efe3cae2bb95135760009e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:50 +0200
Subject: [PATCH 07/32] firefox-esr: rebuild for libevent-2.1.11

---
 srcpkgs/firefox-esr/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 8f1c983c8b4..c7a4de0221c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -4,9 +4,9 @@
 #
 pkgname=firefox-esr
 version=68.1.0
-revision=2
-build_helper="rust"
+revision=3
 wrksrc="firefox-${version}"
+build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -138,7 +138,7 @@ do_build() {
 
 	export MOZ_MAKE_FLAGS="${makejobs}"
 	export MOZ_NOSPAM=1
-        export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
+	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
 
 	export AS=$CC
 

From af01b9257769d7de0deee554def5f4aa4cbd28df Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:50 +0200
Subject: [PATCH 08/32] freshplayerplugin: rebuild for libevent-2.1.11

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 068009f3753..00f0168d245 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From e364a8544f32fc79f217050be794422b44c17082 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:51 +0200
Subject: [PATCH 09/32] fstrm: rebuild for libevent-2.1.11

---
 srcpkgs/fstrm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index e8664894354..a6c21d27a5b 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,7 +1,7 @@
 # Template file for 'fstrm'
 pkgname=fstrm
 version=0.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libevent-devel"

From 2c791c79f246501e119690b6244cf4c755f32c2d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:51 +0200
Subject: [PATCH 10/32] getdns: rebuild for libevent-2.1.11

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index 469348b67ce..16c54edbf87 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 472f35108b228bcc2b67fcf8f117a8d3dadbdcd2 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:52 +0200
Subject: [PATCH 11/32] icecat: rebuild for libevent-2.1.11

---
 srcpkgs/icecat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index 655d7cab66e..fddef282b51 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -1,7 +1,7 @@
 # Template file for 'icecat'
 pkgname=icecat
 version=60.7.0
-revision=2
+revision=3
 build_helper="rust"
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
  cargo llvm clang rust cbindgen"

From fe9d017f79a4e66c862c5622d4c673d4137583bd Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:52 +0200
Subject: [PATCH 12/32] litecoin: rebuild for libevent-2.1.11

---
 srcpkgs/litecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 01ca47ee964..0ef983d1b8b 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.16.3
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
  --disable-tests --with-libressl"

From ad521d4c535b25971201541404d1aef756541ee0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:52 +0200
Subject: [PATCH 13/32] memcached: rebuild for libevent-2.1.11

---
 srcpkgs/memcached/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template
index 0d2e3ff9fcf..8dfd0095a83 100644
--- a/srcpkgs/memcached/template
+++ b/srcpkgs/memcached/template
@@ -1,7 +1,7 @@
 # Template file for 'memcached'
 pkgname=memcached
 version=1.5.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-seccomp"
 makedepends="libevent-devel libseccomp-devel"
@@ -24,4 +24,3 @@ memcached-devel_package() {
 		vmove usr/include
 	}
 }
-

From 43bfa111727d26981eccce5781db862c257e8dd3 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:53 +0200
Subject: [PATCH 14/32] namecoin: rebuild for libevent-2.1.11

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 4436180804f..b4d282e14a8 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=1
+revision=2
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 9b6bf6f17e46ea292217698301774009756c6cca Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:53 +0200
Subject: [PATCH 15/32] nfs-utils: rebuild for libevent-2.1.11

---
 srcpkgs/nfs-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 894941b882f..83c8f811691 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
 version=2.3.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
  --with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss

From cd3fec56e751067c604c37629d3d48221df57fc0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:53 +0200
Subject: [PATCH 16/32] nsd: rebuild for libevent-2.1.11

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 241682461ec..a2e4d3c6c01 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.2.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From a59b262780374578f2325235c4d2795719321e2b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:54 +0200
Subject: [PATCH 17/32] ntp: rebuild for libevent-2.1.11

---
 srcpkgs/ntp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index 5e7984ab81f..0dbda877001 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p13
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"

From 99822b38b928bec68a4f2f853d3fd78ff260d154 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:54 +0200
Subject: [PATCH 18/32] opensmtpd: rebuild for libevent-2.1.11

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index c3d02e404d3..be40a5935c4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.4.2p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 19e3a39cf12723034897855d42da2dd504a40ebd Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:55 +0200
Subject: [PATCH 19/32] pgbouncer: rebuild for libevent-2.1.11

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6d12693733f..0b8524693d6 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.11.0
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="libevent-devel"
 short_desc="Lightweight connection pooler for PostgreSQL"

From 4b2001104497321be2c70411d1e651f3fccda407 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:55 +0200
Subject: [PATCH 20/32] qt5: rebuild for libevent-2.1.11

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 0b74add5101..8641832bc7a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.13.1
-revision=1
+revision=2
 wrksrc="qt-everywhere-src-${version}"
 build_style=gnu-configure
 hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config

From 9d6673e9c474951c4d2c160a08639d1756181a52 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:55 +0200
Subject: [PATCH 21/32] redsocks: rebuild for libevent-2.1.11

---
 srcpkgs/redsocks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/redsocks/template b/srcpkgs/redsocks/template
index 062cd568bd6..59d356064da 100644
--- a/srcpkgs/redsocks/template
+++ b/srcpkgs/redsocks/template
@@ -1,9 +1,9 @@
 # Template file for 'redsocks'
 pkgname=redsocks
 version=0.5
-revision=3
-build_style=gnu-makefile
+revision=4
 wrksrc="${pkgname}-release-${version}"
+build_style=gnu-makefile
 makedepends="libevent-devel"
 short_desc="Transparent redirector of any TCP connection to a SOCKS or HTTP proxy"
 maintainer="cipr3s <cipr3s@gmx.com>"

From 7aace569d6d2f045f551187d0ded4117ac132bab Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:56 +0200
Subject: [PATCH 22/32] rspamd: rebuild for libevent-2.1.11

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 4f197e382ae..9dcc659183a 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
  -DDBDIR=/var/lib/rspamd"

From 80ca5a898b9c9fd4feb874cf53ef3b74361217f8 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:56 +0200
Subject: [PATCH 23/32] saldl: rebuild for libevent-2.1.11

---
 srcpkgs/saldl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/saldl/template b/srcpkgs/saldl/template
index 88751071d05..d60266117ce 100644
--- a/srcpkgs/saldl/template
+++ b/srcpkgs/saldl/template
@@ -1,7 +1,7 @@
 # Template file for 'saldl'
 pkgname=saldl
 version=40
-revision=1
+revision=2
 build_style=waf
 configure_args="--saldl-version v${version}"
 hostmakedepends="pkg-config asciidoc"

From 4638d6fdac971ecaa1c3a6b801aa6f2e32e9c315 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:57 +0200
Subject: [PATCH 24/32] seafile-libclient: rebuild for libevent-2.1.11

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 47c49d5ceb2..5eda59c1041 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,7 +1,7 @@
 # Template file for 'seafile-libclient'
 pkgname=seafile-libclient
 version=7.0.2
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From da99a6f1764f8ed491486eefd6af4692af465dd8 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:57 +0200
Subject: [PATCH 25/32] thunderbird: rebuild for libevent-2.1.11

---
 srcpkgs/thunderbird/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 7aacf91d0af..a8818b013f1 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
 #
 pkgname=thunderbird
 version=68.1.0
-revision=1
+revision=2
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 0dfb0bdf5c77850234ea16549dae661d06acb797 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:57 +0200
Subject: [PATCH 26/32] tlsdate: rebuild for libevent-2.1.11

---
 srcpkgs/tlsdate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
index b8ba170e146..217d4e6604f 100644
--- a/srcpkgs/tlsdate/template
+++ b/srcpkgs/tlsdate/template
@@ -1,7 +1,7 @@
 # Template file for 'tlsdate'
 pkgname=tlsdate
 version=0.0.13
-revision=13
+revision=14
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes"

From d5c7ff1ce489aa8666e679b12a7256345a024df4 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:58 +0200
Subject: [PATCH 27/32] tmate: rebuild for libevent-2.1.11

---
 srcpkgs/tmate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tmate/template b/srcpkgs/tmate/template
index 3b5b25843b1..f1bf9a93adf 100644
--- a/srcpkgs/tmate/template
+++ b/srcpkgs/tmate/template
@@ -1,7 +1,7 @@
 # Template file for 'tmate'
 pkgname=tmate
 version=2.2.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="libevent-devel libssh-devel msgpack-devel ncurses-devel"

From 0843f63ebd610c10a25a5febba14928f4bdb7e60 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 13 Oct 2019 20:47:02 +0200
Subject: [PATCH 28/32] tmux: rebuild for libevent-2.1.11

---
 srcpkgs/tmux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index 3f11d2031cf..80f577d3f76 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -1,7 +1,7 @@
 # Template file for 'tmux'
 pkgname=tmux
 version=2.9a
-revision=2
+revision=3
 build_style=gnu-configure
 makedepends="libevent-devel ncurses-devel"
 short_desc="Terminal Multiplexer"

From 4123871b5b7b2ed7b79726b624385be592256dcb Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:58 +0200
Subject: [PATCH 29/32] tor: rebuild for libevent-2.1.11

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index f7f6fba4dfd..cb991fbaa35 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.1.6
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="libevent-devel libseccomp-devel zlib-devel"
 depends="ca-certificates torsocks"

From 0b2a8bca20fab27cdbcb8c0b26fbb195c58890f6 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:59 +0200
Subject: [PATCH 30/32] transmission: rebuild for libevent-2.1.11

---
 srcpkgs/transmission/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 52500345934..552bcd87352 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,14 +1,14 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=2.94
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp
  --without-systemd-daemon"
 hostmakedepends="intltool pkg-config"
 makedepends="dbus-glib-devel gtk+3-devel libcurl-devel libevent-devel
  qt5-tools-devel"
-short_desc="A fast, easy, and free BitTorrent client"
+short_desc="Fast, easy and free BitTorrent client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://www.transmissionbt.com"

From e7fe6ec01b6bd476f923d122d48a4d8c110af4b1 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:42:59 +0200
Subject: [PATCH 31/32] unbound: rebuild for libevent-2.1.11

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index c4deafd3af1..696d238d688 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr

From 506cfd025d3fe2e29ee3d9c727eb0482605a2a0e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 21 Aug 2019 23:43:00 +0200
Subject: [PATCH 32/32] zabbix: rebuild for libevent-2.1.11

[ci skip]
---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index 02b90b235a2..b4d0978a537 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libxml2 --with-gnutls --with-libcurl --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent