rpms/libldb
5
0
Fork 0
Code Issues Pull Requests Releases Activity

The 1.1.15 rebase obsoletes the patch from 1.1.14-2

Browse Source
This commit is contained in:
Jakub Hrozek 2013-02-07 12:08:22 +01:00
parent 6bddbb4e59
commit 2843dc3c67
2 changed files with 4 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
0001-ldb-Move-doxygen-comments-for-ldb_connect-to-the-rig.patch
View File

@ -1,56 +0,0 @@
From 813bd0353fda0eb6d7c78392d5abd3002115da96 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 2 Jan 2013 11:22:16 -0500
Subject: [PATCH] ldb: Move doxygen comments for ldb_connect to the right place
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Jan 14 16:21:02 CET 2013 on sn-devel-104
diff --git a/lib/ldb/include/ldb.h b/lib/ldb/include/ldb.h
index b60fc9b5ebb94096fa823fe8981aa57998a27bea..748def9435f39e9194b3313d434a6ef6152796ed 100644
--- a/lib/ldb/include/ldb.h
+++ b/lib/ldb/include/ldb.h
@@ -1033,6 +1033,18 @@ int ldb_global_init(void);
*/
struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx);
+typedef void (*ldb_async_timeout_fn) (void *);
+typedef bool (*ldb_async_callback_fn) (void *);
+typedef int (*ldb_async_ctx_add_op_fn)(void *, time_t, void *, ldb_async_timeout_fn, ldb_async_callback_fn);
+typedef int (*ldb_async_ctx_wait_op_fn)(void *);
+
+void ldb_async_ctx_set_private_data(struct ldb_context *ldb,
+ void *private_data);
+void ldb_async_ctx_set_add_op(struct ldb_context *ldb,
+ ldb_async_ctx_add_op_fn add_op);
+void ldb_async_ctx_set_wait_op(struct ldb_context *ldb,
+ ldb_async_ctx_wait_op_fn wait_op);
+
/**
Connect to a database.
@@ -1056,19 +1068,6 @@ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx)
(that is, with LDB_FLG_RDONLY). However in read-write mode, the database will be
created if it does not exist.
*/
-
-typedef void (*ldb_async_timeout_fn) (void *);
-typedef bool (*ldb_async_callback_fn) (void *);
-typedef int (*ldb_async_ctx_add_op_fn)(void *, time_t, void *, ldb_async_timeout_fn, ldb_async_callback_fn);
-typedef int (*ldb_async_ctx_wait_op_fn)(void *);
-
-void ldb_async_ctx_set_private_data(struct ldb_context *ldb,
- void *private_data);
-void ldb_async_ctx_set_add_op(struct ldb_context *ldb,
- ldb_async_ctx_add_op_fn add_op);
-void ldb_async_ctx_set_wait_op(struct ldb_context *ldb,
- ldb_async_ctx_wait_op_fn wait_op);
-
int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[]);
/*
--
1.8.1

7
libldb.spec
View File

@ -9,7 +9,7 @@
Name: libldb Name: libldb
Version: 1.1.15 Version: 1.1.15
Release: 1%{?dist} Release: 2%{?dist}
Group: Development/Libraries Group: Development/Libraries
Summary: A schema-less, ldap like, API and database Summary: A schema-less, ldap like, API and database
Requires: libtalloc >= %{talloc_version} Requires: libtalloc >= %{talloc_version}
@ -42,7 +42,6 @@ Provides: bundled(libreplace)
Provides: bundled(libtdb_compat) Provides: bundled(libtdb_compat)
# Patches # Patches
Patch0001: 0001-ldb-Move-doxygen-comments-for-ldb_connect-to-the-rig.patch
%description %description
An extensible library that implements an LDAP like API to access remote LDAP An extensible library that implements an LDAP like API to access remote LDAP
@ -87,7 +86,6 @@ Development files for the Python bindings for the LDB library
%prep %prep
%setup -q -n ldb-%{version} %setup -q -n ldb-%{version}
%patch0001 -p3 -b .docs
%build %build
@ -179,6 +177,9 @@ rm -rf %{buildroot}
%postun -n pyldb -p /sbin/ldconfig %postun -n pyldb -p /sbin/ldconfig
%changelog %changelog
* Thu Feb 07 2013 Jakub Hrozek <jhrozek@redhat.com> - 1.1.15-2
- The 1.1.15 rebase obsoletes the patch from 1.1.14-2
* Thu Feb 07 2013 Jakub Hrozek <jhrozek@redhat.com> - 1.1.15-1 * Thu Feb 07 2013 Jakub Hrozek <jhrozek@redhat.com> - 1.1.15-1
- New upstream release 1.1.15 - New upstream release 1.1.15