* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/, dev-libs/libevent/files/
@ 2015-10-15 7:39 Tobias Klausmann
0 siblings, 0 replies; 3+ messages in thread
From: Tobias Klausmann @ 2015-10-15 7:39 UTC (permalink / raw
To: gentoo-commits
commit: 9183fd4b8989b9411c96db8b7f71780422af4b2e
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 07:38:47 2015 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 07:38:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9183fd4b
dev-libs/libevent: Add patch to fix Zombie leftovers
When-if upstream makes a release that contains this patch, we can drop it. But
since it has been six months without a release, let'suse it directly ourselves.
Gentoo-Bug: 540456
Libevent-Bug: http://sourceforge.net/p/levent/bugs/350/
Package-Manager: portage-2.2.23
.../libevent/files/event_signals_ordering.patch | 36 +++++++++++
dev-libs/libevent/libevent-2.1.5-r4.ebuild | 70 ++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/dev-libs/libevent/files/event_signals_ordering.patch b/dev-libs/libevent/files/event_signals_ordering.patch
new file mode 100644
index 0000000..d0cb2b3
--- /dev/null
+++ b/dev-libs/libevent/files/event_signals_ordering.patch
@@ -0,0 +1,36 @@
+diff --git a/event.c b/event.c
+index acef2b2..ad4c7f0 100644
+--- a/event.c
++++ b/event.c
+@@ -926,13 +926,13 @@ event_reinit(struct event_base *base)
+ event_del_nolock_(&base->sig.ev_signal, EVENT_DEL_AUTOBLOCK);
+ event_debug_unassign(&base->sig.ev_signal);
+ memset(&base->sig.ev_signal, 0, sizeof(base->sig.ev_signal));
+- if (base->sig.ev_signal_pair[0] != -1)
+- EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
+- if (base->sig.ev_signal_pair[1] != -1)
+- EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
+ had_signal_added = 1;
+ base->sig.ev_signal_added = 0;
+ }
++ if (base->sig.ev_signal_pair[0] != -1)
++ EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
++ if (base->sig.ev_signal_pair[1] != -1)
++ EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
+ if (base->th_notify_fn != NULL) {
+ was_notifiable = 1;
+ base->th_notify_fn = NULL;
+@@ -981,8 +981,12 @@ event_reinit(struct event_base *base)
+ if (evmap_reinit_(base) < 0)
+ res = -1;
+ } else {
+- if (had_signal_added)
+ res = evsig_init_(base);
++ if (res == 0 && had_signal_added) {
++ res = event_add_nolock_(&base->sig.ev_signal, NULL, 0);
++ if (res == 0)
++ base->sig.ev_signal_added = 1;
++ }
+ }
+
+ /* If we were notifiable before, and nothing just exploded, become
diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
new file mode 100644
index 0000000..e55213f
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+MY_P="${P}-beta"
+
+DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# libevent-2.1.so.5
+SLOT="0/2.1-5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug libressl +ssl static-libs test +threads"
+
+DEPEND="
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+"
+RDEPEND="
+ ${DEPEND}
+ !<=dev-libs/9libs-1.0
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/event2/event-config.h
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ elibtoolize
+ epatch "${FILESDIR}/event_signals_ordering.patch"
+ # don't waste time building tests
+ # https://github.com/libevent/libevent/pull/144
+ sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
+}
+
+multilib_src_configure() {
+ # fix out-of-source builds
+ mkdir -p test || die
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_enable debug debug-mode) \
+ $(use_enable debug malloc-replacement) \
+ $(use_enable ssl openssl) \
+ $(use_enable static-libs static) \
+ $(use_enable threads thread-support)
+}
+
+src_test() {
+ # The test suite doesn't quite work (see bug #406801 for the latest
+ # installment in a riveting series of reports).
+ :
+ # emake -C test check | tee "${T}"/tests
+}
+
+DOCS=( ChangeLog{,-1.4,-2.0} )
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/, dev-libs/libevent/files/
@ 2015-10-16 4:48 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2015-10-16 4:48 UTC (permalink / raw
To: gentoo-commits
commit: 5bba0a896a1a1a66684a6c7bf072ee297df24e96
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 04:48:19 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 04:48:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bba0a89
dev-libs/libevent: Clean up/properly name patch.
Package-Manager: portage-2.2.23
...gnals_ordering.patch => libevent-2.1.5-event_signals_ordering.patch} | 2 --
dev-libs/libevent/libevent-2.1.5-r4.ebuild | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev-libs/libevent/files/event_signals_ordering.patch b/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
similarity index 95%
rename from dev-libs/libevent/files/event_signals_ordering.patch
rename to dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
index d0cb2b3..27578b1 100644
--- a/dev-libs/libevent/files/event_signals_ordering.patch
+++ b/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
@@ -1,5 +1,3 @@
-diff --git a/event.c b/event.c
-index acef2b2..ad4c7f0 100644
--- a/event.c
+++ b/event.c
@@ -926,13 +926,13 @@ event_reinit(struct event_base *base)
diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
index e55213f..16300fc 100644
--- a/dev-libs/libevent/libevent-2.1.5-r4.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
@@ -36,7 +36,7 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
elibtoolize
- epatch "${FILESDIR}/event_signals_ordering.patch"
+ epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch"
# don't waste time building tests
# https://github.com/libevent/libevent/pull/144
sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/, dev-libs/libevent/files/
@ 2017-02-02 14:28 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2017-02-02 14:28 UTC (permalink / raw
To: gentoo-commits
commit: cff4c006298f6c732eeb856aac354bd036230414
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 14:08:57 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 14:28:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff4c006
dev-libs/libevent: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-libs/libevent/Manifest | 1 -
.../libevent-2.1.5-event_signals_ordering.patch | 34 -----------
dev-libs/libevent/libevent-2.1.5-r4.ebuild | 69 ----------------------
3 files changed, 104 deletions(-)
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 6e66ac6..1f0c68a 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,3 +1,2 @@
DIST libevent-2.0.22-stable.tar.gz 854987 SHA256 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3 SHA512 990637f12e890bfa7f86c194c8b112701436e92b60afb829194879efb85d558b986261e6508fe29bde73981feada874438e2d442cec8ea5730c889954f9bc907 WHIRLPOOL fe465e94a35dc489a86fad93fd4a82d5c314e3a66ebf1bcf8ba29014fe9bd2ebce4546b4a6a9fedee40d17010d73eb89b99596cec1dde3b7f9a4240cf6b6760d
-DIST libevent-2.1.5-beta.tar.gz 972344 SHA256 79e1b82236a02f1432b6d95ef94186915790eb9910211647f9c01a85149066d8 SHA512 cc38885fc9c7f884085d6adb4bfa51834935475f9c24b76e1fe301b43520dd88935aea588eb4c5795942fa625a790ff575f06b709775e8424691f3307becd216 WHIRLPOOL a040e9b63933d422a7ffa75c4dd0649ae239ebd747fb733420df9f40eb48e9d6ff4d4e6f217b87655a1cbde53cba1ef03beed107d62bf8720391c1f05e010adb
DIST libevent-2.1.7_rc.tar.gz 696447 SHA256 548362d202e22fe24d4c3fad38287b4f6d683e6c21503341373b89785fa6f991 SHA512 72187614ddd5ce0ef0560d54e526ca9986dde90d4c1542637217ce62a596d800dedda88e4da383529ebf961c198929da59a2b570b1a19dba9d2506684af8cb3a WHIRLPOOL 5e7e71c22729b068890aacc1e157680489662078c509a1be7689f21707d1b4d40538f97debb6e93df0393fbaa309d3c81f900bebddd2a352782299ff441e2efc
diff --git a/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch b/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
deleted file mode 100644
index 27578b1..00000000
--- a/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/event.c
-+++ b/event.c
-@@ -926,13 +926,13 @@ event_reinit(struct event_base *base)
- event_del_nolock_(&base->sig.ev_signal, EVENT_DEL_AUTOBLOCK);
- event_debug_unassign(&base->sig.ev_signal);
- memset(&base->sig.ev_signal, 0, sizeof(base->sig.ev_signal));
-- if (base->sig.ev_signal_pair[0] != -1)
-- EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
-- if (base->sig.ev_signal_pair[1] != -1)
-- EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
- had_signal_added = 1;
- base->sig.ev_signal_added = 0;
- }
-+ if (base->sig.ev_signal_pair[0] != -1)
-+ EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
-+ if (base->sig.ev_signal_pair[1] != -1)
-+ EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
- if (base->th_notify_fn != NULL) {
- was_notifiable = 1;
- base->th_notify_fn = NULL;
-@@ -981,8 +981,12 @@ event_reinit(struct event_base *base)
- if (evmap_reinit_(base) < 0)
- res = -1;
- } else {
-- if (had_signal_added)
- res = evsig_init_(base);
-+ if (res == 0 && had_signal_added) {
-+ res = event_add_nolock_(&base->sig.ev_signal, NULL, 0);
-+ if (res == 0)
-+ base->sig.ev_signal_added = 1;
-+ }
- }
-
- /* If we were notifiable before, and nothing just exploded, become
diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
deleted file mode 100644
index f3b169a..00000000
--- a/dev-libs/libevent/libevent-2.1.5-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils libtool multilib-minimal
-
-MY_P="${P}-beta"
-
-DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="http://libevent.org/"
-SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-# libevent-2.1.so.5
-SLOT="0/2.1-5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug libressl +ssl static-libs test +threads"
-
-DEPEND="
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
-"
-RDEPEND="
- ${DEPEND}
- !<=dev-libs/9libs-1.0
-"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/event2/event-config.h
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- elibtoolize
- epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch"
-}
-
-multilib_src_configure() {
- # fix out-of-source builds
- mkdir -p test || die
-
- ECONF_SOURCE="${S}" \
- econf \
- --disable-samples \
- $(use_enable debug debug-mode) \
- $(use_enable debug malloc-replacement) \
- $(use_enable ssl openssl) \
- $(use_enable static-libs static) \
- $(use_enable test libevent-regress) \
- $(use_enable threads thread-support)
-}
-
-src_test() {
- # The test suite doesn't quite work (see bug #406801 for the latest
- # installment in a riveting series of reports).
- :
- # emake -C test check | tee "${T}"/tests
-}
-
-DOCS=( ChangeLog{,-1.4,-2.0} )
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-02 14:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-16 4:48 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/, dev-libs/libevent/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2017-02-02 14:28 Jeroen Roovers
2015-10-15 7:39 Tobias Klausmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox