From 1e069ff4ec0fc91bc635d6fd532e80aec20d9114 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 22 May 2012 10:11:22 -0400 Subject: [PATCH] New upstream release 1.2.10 - Remove upstreamed patches - Provides functionality for the upcoming Samba 4 beta --- .gitignore | 1 + ...indings-in-the-arch-specific-locatio.patch | 35 ------------------- ...autoconf-disable-silent-rules-option.patch | 30 ---------------- libtdb.spec | 18 ++++------ sources | 2 +- tdb-1.2.9-limit-tdb_expand.patch | 34 ------------------ 6 files changed, 9 insertions(+), 111 deletions(-) delete mode 100644 0001-Install-python-bindings-in-the-arch-specific-locatio.patch delete mode 100644 0001-build-added-autoconf-disable-silent-rules-option.patch delete mode 100644 tdb-1.2.9-limit-tdb_expand.patch diff --git a/.gitignore b/.gitignore index 9fa6ce0..07c72ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /tdb-1.2.9.tar.gz +/tdb-1.2.10.tar.gz diff --git a/0001-Install-python-bindings-in-the-arch-specific-locatio.patch b/0001-Install-python-bindings-in-the-arch-specific-locatio.patch deleted file mode 100644 index 0488a1e..0000000 --- a/0001-Install-python-bindings-in-the-arch-specific-locatio.patch +++ /dev/null @@ -1,35 +0,0 @@ -From feff3aad50304450248aa66aed59d09439699234 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Wed, 12 Jan 2011 15:01:52 -0500 -Subject: [PATCH] Install python bindings in the arch-specific location - ---- - buildtools/wafsamba/samba_python.py | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py -index a663b1910d063336c1340142ae8855d7e176ecdb..9b72f3fd112288a022a2de0701594814616f202f 100644 ---- a/buildtools/wafsamba/samba_python.py -+++ b/buildtools/wafsamba/samba_python.py -@@ -51,6 +51,9 @@ def SAMBA_PYTHON(bld, name, - - link_name = 'python/%s' % realname - -+ from distutils.sysconfig import get_python_lib -+ arch_install_dir = get_python_lib(1) -+ - bld.SAMBA_LIBRARY(name, - source=source, - deps=deps, -@@ -63,7 +66,7 @@ def SAMBA_PYTHON(bld, name, - link_name=link_name, - pyembed=True, - target_type='PYTHON', -- install_path='${PYTHONDIR}', -+ install_path=arch_install_dir, - enabled=enabled) - - Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON --- -1.7.3.4 - 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/libtdb.spec b/libtdb.spec index 14bd704..a404db6 100644 --- a/libtdb.spec +++ b/libtdb.spec @@ -5,8 +5,8 @@ %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print(get_python_version())")} Name: libtdb -Version: 1.2.9 -Release: 14%{?dist} +Version: 1.2.10 +Release: 15%{?dist} Group: System Environment/Daemons Summary: The tdb library License: LGPLv3+ @@ -22,10 +22,6 @@ BuildRequires: python-devel Provides: bundled(libreplace) # Patches -Patch0001: 0001-Install-python-bindings-in-the-arch-specific-locatio.patch -Patch0002: tdb-1.2.9-limit-tdb_expand.patch - -Patch1001: 0001-build-added-autoconf-disable-silent-rules-option.patch %description A library that implements a trivial database. @@ -57,13 +53,8 @@ Python bindings for libtdb %prep %setup -q -n tdb-%{version} -%patch0001 -p1 -%patch0002 -p1 - -%patch1001 -p1 %build -./autogen.sh %configure --disable-rpath \ --bundled-libraries=NONE \ --builtin-libraries=replace @@ -118,6 +109,11 @@ rm -rf $RPM_BUILD_ROOT %postun -n python-tdb -p /sbin/ldconfig %changelog +* Tue May 22 2012 Stephen Gallagher - 1.2.10-15 +- New upstream release 1.2.10 +- Remove upstreamed patches +- Provides functionality for the upcoming Samba 4 beta + * Fri Jan 13 2012 Fedora Release Engineering - 1.2.9-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 9834dc0..7eea8fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d97d18bbe9040038d4e003495bb8cd1 tdb-1.2.9.tar.gz +cc28048309df19782b04359282e9f98b tdb-1.2.10.tar.gz diff --git a/tdb-1.2.9-limit-tdb_expand.patch b/tdb-1.2.9-limit-tdb_expand.patch deleted file mode 100644 index 71e0895..0000000 --- a/tdb-1.2.9-limit-tdb_expand.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -uPpr tdb-1.2.9/common/io.c tdb-1.2.9.fix/common/io.c ---- tdb-1.2.9/common/io.c 2010-10-13 21:08:49.000000000 -0400 -+++ tdb-1.2.9.fix/common/io.c 2011-04-05 11:47:14.761341926 -0400 -@@ -299,7 +299,7 @@ static int tdb_expand_file(struct tdb_co - int tdb_expand(struct tdb_context *tdb, tdb_off_t size) - { - struct tdb_record rec; -- tdb_off_t offset, new_size; -+ tdb_off_t offset, new_size, top_size; - - if (tdb_lock(tdb, -1, F_WRLCK) == -1) { - TDB_LOG((tdb, TDB_DEBUG_ERROR, "lock failed in tdb_expand\n")); -@@ -309,10 +309,18 @@ int tdb_expand(struct tdb_context *tdb, - /* must know about any previous expansions by another process */ - tdb->methods->tdb_oob(tdb, tdb->map_size + 1, 1); - -+ /* limit size in order to avoid using up huge amounts of memory for -+ * in memory tdbs if an oddball huge record creeps in */ -+ if (size > 100 * 1024) { -+ top_size = size * 2; -+ } else { -+ top_size = size * 100; -+ } -+ - /* always make room for at least 100 more records, and at -- least 25% more space. Round the database up to a multiple -- of the page size */ -- new_size = MAX(tdb->map_size + size*100, tdb->map_size * 1.25); -+ least 25% more space. Round the database up to a multiple -+ of the page size */ -+ new_size = MAX(tdb->map_size + top_size, tdb->map_size * 1.25); - size = TDB_ALIGN(new_size, tdb->page_size) - tdb->map_size; - - if (!(tdb->flags & TDB_INTERNAL))