diff --git a/.gitignore b/.gitignore index 40eebeb..fee622c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ tevent-0.9.8.tar.gz /tevent-0.9.11.tar.gz /tevent-0.9.13.tar.gz /tevent-0.9.14.tar.gz +/tevent-0.9.15.tar.gz diff --git a/0001-build-added-autoconf-disable-silent-rules-option.patch b/0001-build-added-autoconf-disable-silent-rules-option.patch deleted file mode 100644 index 0fc3ad6..0000000 --- a/0001-build-added-autoconf-disable-silent-rules-option.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6af702bdc9ea36a1f33232a818a819afde9bc4d2 Mon Sep 17 00:00:00 2001 -From: Sumit Bose -Date: Thu, 6 Oct 2011 10:32:58 +0200 -Subject: [PATCH] build: added autoconf --disable-silent-rules option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Günther Deschner ---- - buildtools/wafsamba/wscript | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript -index 1a7f3eb69974625e903f314c6c7b92547063e884..5c5e249758c36a64083499b9050c0c4e77c87b6d 100755 ---- a/buildtools/wafsamba/wscript -+++ b/buildtools/wafsamba/wscript -@@ -162,6 +162,9 @@ def set_options(opt): - opt.add_option('--disable-dependency-tracking', - help=SUPPRESS_HELP, - action='store_true', dest='AUTOCONF_DISABLE_DEPENDENCY_TRACKING', default=False) -+ opt.add_option('--disable-silent-rules', -+ help=SUPPRESS_HELP, -+ action='store_true', dest='AUTOCONF_DISABLE_SILENT_RULES', default=False) - - gr = opt.option_group('dist options') - gr.add_option('--sign-release', --- -1.7.7.3 - diff --git a/0002-Add-stub-python-module-for-tevent.patch b/0002-Add-stub-python-module-for-tevent.patch deleted file mode 100644 index 37c8551..0000000 --- a/0002-Add-stub-python-module-for-tevent.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5d1922739e852fcc2a143996e88420b09c5dbff9 Mon Sep 17 00:00:00 2001 -From: Jelmer Vernooij -Date: Tue, 6 Dec 2011 21:03:21 +0100 -Subject: [PATCH 1/3] Add stub python module for tevent. - ---- - lib/tevent/tevent.py | 28 ++++++++++++++++++++++++++++ - 1 files changed, 28 insertions(+), 0 deletions(-) - create mode 100644 lib/tevent/tevent.py - -diff --git a/lib/tevent/tevent.py b/lib/tevent/tevent.py -new file mode 100644 -index 0000000000000000000000000000000000000000..758ed48a483f922382241a86ae933e61881b8dda ---- /dev/null -+++ b/lib/tevent/tevent.py -@@ -0,0 +1,28 @@ -+#!/usr/bin/python -+# -+# Python integration for tevent -+# -+# Copyright (C) Jelmer Vernooij 2011 -+# -+# ** NOTE! The following LGPL license applies to the tevent -+# ** library. This does NOT imply that all of Samba is released -+# ** under the LGPL -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 3 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, see . -+ -+from _tevent import ( -+ backend_list, -+ Context, -+ Signal, -+ ) --- -1.7.7.3 - diff --git a/0003-Install-platform-independent-python-scripts-to-the-P.patch b/0003-Install-platform-independent-python-scripts-to-the-P.patch deleted file mode 100644 index 5591165..0000000 --- a/0003-Install-platform-independent-python-scripts-to-the-P.patch +++ /dev/null @@ -1,23 +0,0 @@ -From de4b8943bfb40e2f50c9e4e2ee5d39e986317d08 Mon Sep 17 00:00:00 2001 -From: Jelmer Vernooij -Date: Tue, 6 Dec 2011 21:08:15 +0100 -Subject: [PATCH 2/3] Install (platform-independent) python scripts to the - PYTHONDIR rather than PYTHONARCHDIR. - ---- - source4/scripting/python/wscript_build | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build -index 8879f759bad789e9647437722c2a64146259595c..73f7ae80aeaae4d9c33f8bf52274b808660c2e5e 100644 ---- a/source4/scripting/python/wscript_build -+++ b/source4/scripting/python/wscript_build -@@ -36,4 +36,4 @@ bld.SAMBA_SCRIPT('samba_python', - pattern='samba/**/*.py', - installdir='python') - --bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False) -+bld.INSTALL_WILDCARD('${PYTHONDIR}', 'samba/**/*.py', flat=False) --- -1.7.7.3 - diff --git a/0004-tevent-Install-python-tevent-modules.patch b/0004-tevent-Install-python-tevent-modules.patch deleted file mode 100644 index e8011d5..0000000 --- a/0004-tevent-Install-python-tevent-modules.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 817f7529d3e6483c83ef336600b8743af62c545e Mon Sep 17 00:00:00 2001 -From: Jelmer Vernooij -Date: Tue, 6 Dec 2011 21:18:43 +0100 -Subject: [PATCH 3/3] tevent: Install python tevent modules. - -Autobuild-User: Jelmer Vernooij -Autobuild-Date: Tue Dec 6 23:13:37 CET 2011 on sn-devel-104 ---- - lib/tevent/wscript | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/lib/tevent/wscript b/lib/tevent/wscript -index 5afaacaa55d80ca174ad8806385deddaf648b3f6..d240630b6a6fed3c75dca9a4f5ec211996683edf 100644 ---- a/lib/tevent/wscript -+++ b/lib/tevent/wscript -@@ -97,6 +97,12 @@ def build(bld): - 'pytevent.c', - deps='tevent', - realname='_tevent.so') -+ # install out various python scripts for use by make test -+ bld.SAMBA_SCRIPT('tevent_python', -+ pattern='tevent.py', -+ installdir='python') -+ -+ bld.INSTALL_WILDCARD('${PYTHONDIR}', 'tevent.py', flat=False) - - - def test(ctx): --- -1.7.7.3 - diff --git a/FED02-fix-pytevent-build.patch b/FED02-fix-pytevent-build.patch deleted file mode 100644 index 8b3010b..0000000 --- a/FED02-fix-pytevent-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ruN tevent-0.9.14.old/tevent.py tevent-0.9.14/tevent.py ---- tevent-0.9.14.old/tevent.py 1969-12-31 19:00:00.000000000 -0500 -+++ tevent-0.9.14/tevent.py 2011-12-06 20:07:08.386154680 -0500 -@@ -0,0 +1,29 @@ -+#!/usr/bin/python -+# -+# Python integration for tevent -+# -+# Copyright (C) Jelmer Vernooij 2011 -+# -+# ** NOTE! The following LGPL license applies to the tevent -+# ** library. This does NOT imply that all of Samba is released -+# ** under the LGPL -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 3 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, see . -+ -+from _tevent import ( -+ backend_list, -+ Context, -+ Signal, -+ ) -+ -diff -ruN tevent-0.9.14.old/wscript tevent-0.9.14/wscript ---- tevent-0.9.14.old/wscript 2011-08-10 02:37:18.000000000 -0400 -+++ tevent-0.9.14/wscript 2011-12-06 20:11:42.354645305 -0500 -@@ -94,6 +94,13 @@ - enabled=True, - realname='_tevent.so') - -+ # install out various python scripts for use by make test -+ bld.SAMBA_SCRIPT('tevent_python', -+ pattern='tevent.py', -+ installdir='python') -+ -+ bld.INSTALL_WILDCARD('${PYTHONDIR}', 'tevent.py', flat=False) -+ - - def test(ctx): - '''test tevent''' diff --git a/libtevent.spec b/libtevent.spec index 7c33018..95c4972 100644 --- a/libtevent.spec +++ b/libtevent.spec @@ -5,8 +5,8 @@ %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print(get_python_version())")} Name: libtevent -Version: 0.9.14 -Release: 6%{?dist} +Version: 0.9.15 +Release: 1%{?dist} Group: System Environment/Daemons Summary: The tevent library License: LGPLv3+ @@ -22,8 +22,6 @@ BuildRequires: doxygen Provides: bundled(libreplace) # Patches -Patch1001: 0001-build-added-autoconf-disable-silent-rules-option.patch -Patch1002: FED02-fix-pytevent-build.patch %description Tevent is an event system based on the talloc memory management library. @@ -69,13 +67,6 @@ UpdateTimestamps() { %setup -q -n tevent-%{version} -%patch1001 -p1 -UpdateTimestamps -p1 %{_sourcedir}/0001-build-added-autoconf-disable-silent-rules-option.patch - -%patch1002 -p1 -UpdateTimestamps -p1 %{_sourcedir}/FED02-fix-pytevent-build.patch - - %build %configure --disable-rpath \ --bundled-libraries=NONE \ @@ -124,6 +115,12 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Fri Feb 10 2012 Stephen Gallagher - 0.9.15-1 +- New upstream release 0.9.15 +- Properly re-sets the nested.level flag in the ev.ctx when reinitializing + after a fork() +- Allow tevent_signal events to be freed during their handler + * Fri Jan 13 2012 Fedora Release Engineering - 0.9.14-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 72b9b3e..38514c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fb9f344015aa423157cc702bead0f99 tevent-0.9.14.tar.gz +dc9ff17e5d6b89ac63df0d0a7f41eb6e tevent-0.9.15.tar.gz diff --git a/tevent_signal_segfault.patch b/tevent_signal_segfault.patch deleted file mode 100644 index b31101a..0000000 --- a/tevent_signal_segfault.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -uPr tevent-0.9.8.orig/tevent_signal.c tevent-0.9.8/tevent_signal.c ---- tevent-0.9.8.orig/tevent_signal.c 2009-09-23 12:41:48.000000000 -0400 -+++ tevent-0.9.8/tevent_signal.c 2009-09-23 12:42:25.000000000 -0400 -@@ -89,18 +89,12 @@ - SIG_INCREMENT(sig_state->signal_count[signum]); - SIG_INCREMENT(sig_state->got_signal); - -- if (sig_state->sig_handlers[signum] != NULL) { -- ev = sig_state->sig_handlers[signum]->se->event_ctx; -- /* doesn't matter if this pipe overflows */ -- res = write(ev->pipe_fds[1], &c, 1); -- } -- - /* Write to each unique event context. */ - for (sl = sig_state->sig_handlers[signum]; sl; sl = sl->next) { - if (sl->se->event_ctx != ev) { -+ ev = sl->se->event_ctx; - /* doesn't matter if this pipe overflows */ - res = write(ev->pipe_fds[1], &c, 1); -- ev = sl->se->event_ctx; - } - } - }