diff --git a/.gitignore b/.gitignore index 932e07a..ebadec3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tevent-0.9.18.tar.gz +SOURCES/tevent-0.9.21.tar.gz diff --git a/.libtevent.metadata b/.libtevent.metadata index 783286e..f19d9b4 100644 --- a/.libtevent.metadata +++ b/.libtevent.metadata @@ -1 +1 @@ -783f6ed1971e053f893940c71276e04a82bca701 SOURCES/tevent-0.9.18.tar.gz +daa1a4f457773be2e0f645beede93db6943224a5 SOURCES/tevent-0.9.21.tar.gz diff --git a/SOURCES/0001-tevent-Fix-Coverity-ID-989236-Operands-don-t-affect-.patch b/SOURCES/0001-tevent-Fix-Coverity-ID-989236-Operands-don-t-affect-.patch deleted file mode 100644 index 6e2d8e5..0000000 --- a/SOURCES/0001-tevent-Fix-Coverity-ID-989236-Operands-don-t-affect-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dd0e38b5feb51c8aa44e76bb6c84202bf8373005 Mon Sep 17 00:00:00 2001 -From: Volker Lendecke -Date: Thu, 13 Jun 2013 20:35:32 +0200 -Subject: [PATCH] tevent: Fix Coverity ID 989236 Operands don't affect result - -"unsigned" could be less than uint64_t, so idx==UINT64_MAX is always false. - -Signed-off-by: Volker Lendecke -Reviewed-by: Jeremy Allison - -diff --git a/lib/tevent/tevent_poll.c b/lib/tevent/tevent_poll.c -index c6e2a00ffec6393fd6fccc1a3836f63e4ef4e045..75d0ced5a09ea86505a5df49b3c84073d3aa0f02 100644 ---- a/lib/tevent/tevent_poll.c -+++ b/lib/tevent/tevent_poll.c -@@ -546,7 +546,7 @@ static int poll_event_loop_poll(struct tevent_context *ev, - the handler to remove itself when called */ - - for (fde = ev->fd_events; fde; fde = fde->next) { -- unsigned idx = fde->additional_flags; -+ uint64_t idx = fde->additional_flags; - struct pollfd *pfd; - uint16_t flags = 0; - --- -1.8.2.1 - diff --git a/SOURCES/tevent-0.9.18-wait_never_finishes.patch b/SOURCES/tevent-0.9.18-wait_never_finishes.patch deleted file mode 100644 index 464a8c6..0000000 --- a/SOURCES/tevent-0.9.18-wait_never_finishes.patch +++ /dev/null @@ -1,38 +0,0 @@ -@@ -, +, @@ - tevent: Remove the signal pipe if no signal events are around - - It makes adding/removing the first/last sigevents a bit more expensive, but it - will fix tevent_loop_wait not finishing when one signal event was added and - removed. - - Bug: https://bugzilla.samba.org/show_bug.cgi?id=10012 - - Signed-off-by: Volker Lendecke - Signed-off-by: Stefan Metzmacher - Reviewed-by: Andreas Schneider ---- - lib/tevent/tevent_signal.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) ---- a/lib/tevent/tevent_signal.c -+++ a/lib/tevent/tevent_signal.c -@@ -175,7 +175,19 @@ static int tevent_signal_destructor(struct tevent_signal *se) - struct tevent_common_signal_list); - - if (se->event_ctx) { -- DLIST_REMOVE(se->event_ctx->signal_events, se); -+ struct tevent_context *ev = se->event_ctx; -+ -+ DLIST_REMOVE(ev->signal_events, se); -+ -+ if (ev->signal_events == NULL && ev->pipe_fde != NULL) { -+ /* -+ * This was the last signal. Destroy the pipe. -+ */ -+ TALLOC_FREE(ev->pipe_fde); -+ -+ close(ev->pipe_fds[0]); -+ close(ev->pipe_fds[1]); -+ } - } - - talloc_free(sl); diff --git a/SPECS/libtevent.spec b/SPECS/libtevent.spec index 50ffa9f..7b8b3dd 100644 --- a/SPECS/libtevent.spec +++ b/SPECS/libtevent.spec @@ -1,6 +1,6 @@ Name: libtevent -Version: 0.9.18 -Release: 6%{?dist} +Version: 0.9.21 +Release: 3%{?dist} Group: System Environment/Daemons Summary: The tevent library License: LGPLv3+ @@ -8,9 +8,9 @@ URL: http://tevent.samba.org/ Source: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: libtalloc-devel >= 2.0.7 +BuildRequires: libtalloc-devel >= 2.1.1 BuildRequires: python-devel -BuildRequires: pytalloc-devel >= 2.0.7 +BuildRequires: pytalloc-devel >= 2.1.1 BuildRequires: doxygen BuildRequires: docbook-style-xsl BuildRequires: libxslt @@ -18,8 +18,6 @@ BuildRequires: libxslt Provides: bundled(libreplace) # Patches -Patch0001: 0001-tevent-Fix-Coverity-ID-989236-Operands-don-t-affect-.patch -Patch0002: tevent-0.9.18-wait_never_finishes.patch %description Tevent is an event system based on the talloc memory management library. @@ -65,9 +63,6 @@ UpdateTimestamps() { %setup -q -n tevent-%{version} -%patch0001 -p3 -b .flags -%patch0002 -p3 -b .wait - %build %configure --disable-rpath \ --bundled-libraries=NONE \ @@ -117,6 +112,18 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Mon Nov 24 2014 Jakub Hrozek - 0.9.21-3 +- BuildRequire the minimal applicable libtalloc version +- Resolves: rhbz#1133919 - Rebase libtevent to version 0.9.21 or newer + +* Mon Nov 24 2014 Jakub Hrozek - 0.9.21-2 +- Allow building with RHEL-7.0 libtalloc +- Resolves: rhbz#1133919 - Rebase libtevent to version 0.9.21 or newer + +* Thu Sep 04 2014 Jakub Hrozek - 0.9.21-1 +- Resolves: rhbz#1133919 - Rebase libtevent to version 0.9.21 or newer +- removes upstreamed patches + * Fri Jan 24 2014 Daniel Mach - 0.9.18-6 - Mass rebuild 2014-01-24