From 5e914f2c1367490a61ca000d51ecbd3bd20cd0a4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 6 Nov 2007 19:24:12 +0100
Subject: r25882: Build shared library of talloc as well. (cherry picked from
 commit 3692ba8299d4177289ca401fa467143ad14ccad4) (This used to be commit
 ddfc86b71d7e6fa3d1bd6fcaca4f31dd262e84d2)

---
 source3/lib/talloc/Makefile.in  | 19 +++++++++++++++++--
 source3/lib/talloc/configure.ac |  5 +++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 18b48c3459..c9fcddf35c 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -14,12 +14,23 @@ INSTALLCMD = @INSTALL@
 CC = @CC@
 CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I@srcdir@
 EXTRA_TARGETS = @DOC_TARGET@
+PICFLAG = @PICFLAG@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+SHLIBEXT = @SHLIBEXT@
+SHLD_FLAGS = @SHLD_FLAGS@
+SONAMEFLAG = @SONAMEFLAG@
 
 .SUFFIXES: .c .o .3 .3.xml .xml .html
 
 LIBOBJ = @TALLOC_OBJ@ @LIBREPLACEOBJ@
 
-all: showflags libtalloc.a testsuite $(EXTRA_TARGETS)
+SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
+SONAME = libtalloc.$(SHLIBEXT).1
+
+.c.o:
+	$(CC) $(PICFLAG) -o $@ -c $< $(CFLAGS)
+
+all: showflags libtalloc.a $(SOLIB) testsuite $(EXTRA_TARGETS)
 
 showflags:
 	@echo 'talloc will be compiled with flags:'
@@ -33,10 +44,14 @@ libtalloc.a: $(LIBOBJ)
 	ar -rv $@ $(LIBOBJ)
 	@-ranlib $@
 
+$(SOLIB): $(LIBOBJ)
+	$(CC) $(SONAMEFLAG)$(SONAME) $(SHLD_FLAGS) -o $@ $^
+
 install: all 
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
 	${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
+	${INSTALLCMD} -m 755 $(SOLIB) $(DESTDIR)$(libdir)
 	${INSTALLCMD} -d $(DESTDIR)${includedir}
 	${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
 	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
@@ -52,7 +67,7 @@ doc: talloc.3 talloc.3.html
 	-test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 
 clean:
-	rm -f *~ $(LIBOBJ) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
+	rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
 
 test: testsuite
 	./testsuite
diff --git a/source3/lib/talloc/configure.ac b/source3/lib/talloc/configure.ac
index afc2a944f0..d76052007c 100644
--- a/source3/lib/talloc/configure.ac
+++ b/source3/lib/talloc/configure.ac
@@ -15,4 +15,9 @@ if test -n "$XSLTPROC"; then
 fi
 AC_SUBST(DOC_TARGET)
 
+AC_LD_PICFLAG
+AC_LD_SHLIBEXT
+AC_LD_SONAMEFLAG
+AC_LD_SHLDFLAGS
+
 AC_OUTPUT(Makefile talloc.pc)
-- 
cgit 


From 850ec9eb3a35e5140891be5ce0e2844ec45c3057 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 6 Nov 2007 19:53:33 +0100
Subject: r25884: Specify shldflags first, as required by some compilers.
 (cherry picked from commit 40a8cd0d2fd4d10110243ee75ff92bef73bb06b9) (This
 used to be commit 42b56f77ff88f8a9dccd7a8ac7df789d0223c945)

---
 source3/lib/talloc/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index c9fcddf35c..3da96cd457 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -45,7 +45,7 @@ libtalloc.a: $(LIBOBJ)
 	@-ranlib $@
 
 $(SOLIB): $(LIBOBJ)
-	$(CC) $(SONAMEFLAG)$(SONAME) $(SHLD_FLAGS) -o $@ $^
+	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
 
 install: all 
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
-- 
cgit 


From 07a5bd6027b6118906d78a2dd3d28efbb7d48406 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 14 Nov 2007 01:01:31 +0100
Subject: r25944: Fix handling of sonameflag on AIX, which doesn't have
 anything like that.

(cherry picked from parts of commit 228dd6830eb9c91287bb3e0233d8b3a404ff3676)

Michael
(This used to be commit 7a7dcd9b1265b8f031c9a5e9c4cfa89216827a28)
---
 source3/lib/replace/libreplace_ld.m4 | 4 ++++
 source3/lib/talloc/Makefile.in       | 2 +-
 source3/lib/tdb/Makefile.in          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source3/lib/replace/libreplace_ld.m4 b/source3/lib/replace/libreplace_ld.m4
index f0d10c1e3e..08defb091f 100644
--- a/source3/lib/replace/libreplace_ld.m4
+++ b/source3/lib/replace/libreplace_ld.m4
@@ -246,6 +246,10 @@ AC_DEFUN([AC_LD_SONAMEFLAG],
 			# Not supported
 			SONAMEFLAG="#"
 			;;
+		*aix*)
+			# Not supported
+			SONAMEFLAG="#"
+			;;
 		esac
 ])
 
diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 3da96cd457..619a8d008d 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -45,7 +45,7 @@ libtalloc.a: $(LIBOBJ)
 	@-ranlib $@
 
 $(SOLIB): $(LIBOBJ)
-	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
+	$(CC) $(SHLD_FLAGS) -o $@ $^ $(SONAMEFLAG)$(SONAME)
 
 install: all 
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
diff --git a/source3/lib/tdb/Makefile.in b/source3/lib/tdb/Makefile.in
index e1ecbb30ec..738d8566b5 100644
--- a/source3/lib/tdb/Makefile.in
+++ b/source3/lib/tdb/Makefile.in
@@ -74,7 +74,7 @@ $(SONAME): $(SOLIB)
 	ln -s $< $@
 
 $(SOLIB): $(TDB_OBJ)
-	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
+	$(CC) $(SHLD_FLAGS) -o $@ $^ $(SONAMEFLAG)$(SONAME) 
 
 TDB_LIB = libtdb.a
 
-- 
cgit 


From 12c81d1b5511b924baa7d2d0e98cb6cec2950d52 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 14 Nov 2007 10:51:32 +0100
Subject: r25953: AIX make doesn't support $^.

(cherry picked from parts of commit 91133d27110ee6447dbc64f1c8d52cb90ca1a86c)

Michael
(This used to be commit f231d03e53dcf291e0cb8870e531989ab855eae0)
---
 source3/lib/talloc/Makefile.in | 2 +-
 source3/lib/tdb/Makefile.in    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 619a8d008d..74c9557925 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -45,7 +45,7 @@ libtalloc.a: $(LIBOBJ)
 	@-ranlib $@
 
 $(SOLIB): $(LIBOBJ)
-	$(CC) $(SHLD_FLAGS) -o $@ $^ $(SONAMEFLAG)$(SONAME)
+	$(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) $(SONAMEFLAG)$(SONAME)
 
 install: all 
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
diff --git a/source3/lib/tdb/Makefile.in b/source3/lib/tdb/Makefile.in
index 738d8566b5..fd36ed078e 100644
--- a/source3/lib/tdb/Makefile.in
+++ b/source3/lib/tdb/Makefile.in
@@ -74,7 +74,7 @@ $(SONAME): $(SOLIB)
 	ln -s $< $@
 
 $(SOLIB): $(TDB_OBJ)
-	$(CC) $(SHLD_FLAGS) -o $@ $^ $(SONAMEFLAG)$(SONAME) 
+	$(CC) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) $(SONAMEFLAG)$(SONAME) 
 
 TDB_LIB = libtdb.a
 
-- 
cgit 


From 8943a43a4b76de5b64ab9b60925cbe7bd48d0da8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 15 Nov 2007 15:41:03 +0100
Subject: r25973: talloc: fix usage of SONAMEFLAG

metze
(cherry picked from commit 7fecb8f3cd9f5f69dce7b9e566011e5de1e01a4a)
(This used to be commit ce3625a3866376d78edc23b137f41be72f07e5eb)
---
 source3/lib/talloc/Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 74c9557925..6eee227f7a 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -18,7 +18,6 @@ PICFLAG = @PICFLAG@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 SHLIBEXT = @SHLIBEXT@
 SHLD_FLAGS = @SHLD_FLAGS@
-SONAMEFLAG = @SONAMEFLAG@
 
 .SUFFIXES: .c .o .3 .3.xml .xml .html
 
@@ -45,7 +44,7 @@ libtalloc.a: $(LIBOBJ)
 	@-ranlib $@
 
 $(SOLIB): $(LIBOBJ)
-	$(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) $(SONAMEFLAG)$(SONAME)
+	$(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
 
 install: all 
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
-- 
cgit 


From 68c7089552019dd92e6ffb14e13f47ce3051868b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 16 Nov 2007 10:10:58 +0100
Subject: r25987: libreplace: rename AC_LD_SHLDFLAGS into
 AC_LIBREPLACE_SHLD_FLAGS

metze

(cherry picked from parts of commit c179807165b84dd832ab64f794034960668e5957.
The changes to lib/replaces have already been merged.)

Michael
(This used to be commit 6c092918725019274cd26218168c5b551ab3c7d2)
---
 source3/lib/talloc/configure.ac | 2 +-
 source3/lib/tdb/configure.ac    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source3/lib/talloc/configure.ac b/source3/lib/talloc/configure.ac
index d76052007c..e5f9575f22 100644
--- a/source3/lib/talloc/configure.ac
+++ b/source3/lib/talloc/configure.ac
@@ -18,6 +18,6 @@ AC_SUBST(DOC_TARGET)
 AC_LD_PICFLAG
 AC_LD_SHLIBEXT
 AC_LD_SONAMEFLAG
-AC_LD_SHLDFLAGS
+AC_LIBREPLACE_SHLD_FLAGS
 
 AC_OUTPUT(Makefile talloc.pc)
diff --git a/source3/lib/tdb/configure.ac b/source3/lib/tdb/configure.ac
index 1085055bc9..14761bcc1a 100644
--- a/source3/lib/tdb/configure.ac
+++ b/source3/lib/tdb/configure.ac
@@ -8,7 +8,7 @@ AC_CONFIG_HEADER(include/config.h)
 AC_LIBREPLACE_ALL_CHECKS
 AC_LD_SONAMEFLAG
 AC_LD_PICFLAG
-AC_LD_SHLDFLAGS
 AC_LD_SHLIBEXT
+AC_LIBREPLACE_SHLD_FLAGS
 m4_include(libtdb.m4)
 AC_OUTPUT(Makefile tdb.pc)
-- 
cgit 


From 4e066d4f8308501647577e3db31726f67509178c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 12:31:23 +0100
Subject: r26072: Import trivial SWIG wrapper for talloc. (cherry picked from
 commit 02d259c2c45c03dbfcd16173df93d7ba96ed1419) (This used to be commit
 5938a732381abed9f5da1db505626b354fe7293e)

---
 source3/lib/talloc/talloc.i | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 source3/lib/talloc/talloc.i

diff --git a/source3/lib/talloc/talloc.i b/source3/lib/talloc/talloc.i
new file mode 100644
index 0000000000..c35d5d2411
--- /dev/null
+++ b/source3/lib/talloc/talloc.i
@@ -0,0 +1,24 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program 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 General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* Don't expose talloc contexts in Python code. Python does reference 
+   counting for us, so just create a new top-level talloc context.
+ */
+%typemap(in, numinputs=0) TALLOC_CTX * {
+    $1 = NULL;
+}
-- 
cgit 


From fbc295fb37c8787d01472d3cec63adb3efea5803 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 28 Nov 2007 22:41:34 +0100
Subject: r26187: Fix module name, indentation.

(cherry picked from parts of commit ef790ebf3a712dbbb85d6af65c804199c2c084fc)

Michael
(This used to be commit 8e35bbeac286c3b8d64d69ebe9bb4a8f5405a9c0)
---
 source3/lib/talloc/talloc.i | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source3/lib/talloc/talloc.i b/source3/lib/talloc/talloc.i
index c35d5d2411..593c20465e 100644
--- a/source3/lib/talloc/talloc.i
+++ b/source3/lib/talloc/talloc.i
@@ -19,6 +19,8 @@
 /* Don't expose talloc contexts in Python code. Python does reference 
    counting for us, so just create a new top-level talloc context.
  */
+%module talloc;
+
 %typemap(in, numinputs=0) TALLOC_CTX * {
     $1 = NULL;
 }
-- 
cgit 


From 461ad00b1f090d5328c234e45eb7ab906252d93d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 Nov 2007 14:49:47 +0100
Subject: r26197: Add bindings for libsecurity.

(cherry picked from parts of commit 8625cd403ba3a7d2b1b1fccfeb5efd7e21de0135)

Michael
(This used to be commit 22d48224d3235403b916c98c92915165fe7ef330)
---
 source3/lib/talloc/config.mk | 9 ++-------
 source3/lib/talloc/talloc.i  | 2 --
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/source3/lib/talloc/config.mk b/source3/lib/talloc/config.mk
index 714ad72d1c..942ced6b86 100644
--- a/source3/lib/talloc/config.mk
+++ b/source3/lib/talloc/config.mk
@@ -1,13 +1,8 @@
-################################################
-# Start LIBRARY LIBTALLOC
 [LIBRARY::LIBTALLOC]
-VERSION = 0.0.1
-SO_VERSION = 0
+VERSION = 1.0.0
+SO_VERSION = 1
 OBJ_FILES = talloc.o
 MANPAGE = talloc.3
 CFLAGS = -Ilib/talloc
 PUBLIC_HEADERS = talloc.h
 DESCRIPTION = A hierarchical pool based memory system with destructors
-#
-# End LIBRARY LIBTALLOC
-################################################
diff --git a/source3/lib/talloc/talloc.i b/source3/lib/talloc/talloc.i
index 593c20465e..c35d5d2411 100644
--- a/source3/lib/talloc/talloc.i
+++ b/source3/lib/talloc/talloc.i
@@ -19,8 +19,6 @@
 /* Don't expose talloc contexts in Python code. Python does reference 
    counting for us, so just create a new top-level talloc context.
  */
-%module talloc;
-
 %typemap(in, numinputs=0) TALLOC_CTX * {
     $1 = NULL;
 }
-- 
cgit 


From 580bb2a6ad8f44a27843dafc031e8edb145c6fb2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Dec 2007 01:37:28 +0100
Subject: r26276: Install SWIG files if swig is present.

(cherry picked from talloc parts of commit dfd5b456f932268e2b1a82e2775037d356b9483e)

Michael
(This used to be commit 8276ec7596b41980aea3f93949edd224fe842fa5)
---
 source3/lib/talloc/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 6eee227f7a..5d93e1f2fb 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -56,6 +56,7 @@ install: all
 	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
 	if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
 	if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
+	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib`
 
 doc: talloc.3 talloc.3.html
 
-- 
cgit 


From 6a7dff4a73eecc494faf1fcf5e4862e1b7151648 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Dec 2007 02:04:25 +0100
Subject: r26280: Fix installation if swig is not available. (cherry picked
 from commit 3320bd401f7b669bd62f83bf16a1c16ad0543a5c) (This used to be commit
 f1267f74a91374692c3564d783c527f94035b323)

---
 source3/lib/talloc/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 5d93e1f2fb..da0ecb6ca0 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -56,7 +56,7 @@ install: all
 	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
 	if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
 	if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
-	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib`
+	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
 
 doc: talloc.3 talloc.3.html
 
-- 
cgit 


From b59da67d2f6285bfe0275f045a8a18fbd5f19834 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Dec 2007 18:24:16 +0100
Subject: r26292: Make sure swig directory exists. (cherry picked from commit
 7962d221fcb877c9fd3bbc890827338de54ca94a) (This used to be commit
 d6198f2bd7d13b5f30bcc46e12026a00f52d9adc)

---
 source3/lib/talloc/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index da0ecb6ca0..9ba557dd8e 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -56,6 +56,7 @@ install: all
 	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
 	if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
 	if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
+	which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
 	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
 
 doc: talloc.3 talloc.3.html
-- 
cgit 


From 5a9f0cabf6512bcda1c05510a0f6f3affa91bd85 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 14 Dec 2007 14:28:07 +0100
Subject: r26454: Add simple SWIG macro for wrapping talloced types.

(cherry picked from talloc parts of commit 760fcc8bfa2a7cd7641465cb3bae889e9e0fbc75)

Michael
(This used to be commit f4c59316b9251477556dd22cdd246607f4dfa845)
---
 source3/lib/talloc/talloc.i | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source3/lib/talloc/talloc.i b/source3/lib/talloc/talloc.i
index c35d5d2411..c852ae8f9f 100644
--- a/source3/lib/talloc/talloc.i
+++ b/source3/lib/talloc/talloc.i
@@ -22,3 +22,10 @@
 %typemap(in, numinputs=0) TALLOC_CTX * {
     $1 = NULL;
 }
+
+%define %talloctype(TYPE)
+%nodefaultctor TYPE;
+%extend TYPE {
+    ~TYPE() { talloc_free($self); }
+}
+%enddef
-- 
cgit 


From 3d33ad711c6a700e57a73126a17a88b637b36679 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Dec 2007 19:19:41 -0600
Subject: r26570: - Trim size of the swig-generated Python bindings by removing
 a bunch of {}'s.

- Start working on Python equivalents for various EJS tests.
- Fix regression in argument order for reg_diff_apply() in EJS bindings.

(cherry picked from talloc part of commit c550c03372cb260b78f6a6c132e70571bc4cb852)

Michael
(This used to be commit a146145c28cc355fed47b8a1f322311ffc1a51ab)
---
 source3/lib/talloc/talloc.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/talloc/talloc.i b/source3/lib/talloc/talloc.i
index c852ae8f9f..a9afb97ed7 100644
--- a/source3/lib/talloc/talloc.i
+++ b/source3/lib/talloc/talloc.i
@@ -19,7 +19,7 @@
 /* Don't expose talloc contexts in Python code. Python does reference 
    counting for us, so just create a new top-level talloc context.
  */
-%typemap(in, numinputs=0) TALLOC_CTX * {
+%typemap(in, numinputs=0, noblock=1) TALLOC_CTX * {
     $1 = NULL;
 }
 
-- 
cgit 


From df202a4ec4421bbfeb7d3f5b3c159a079257b38b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 22 Jan 2008 18:24:00 +0100
Subject: talloc/tdb: Use manually written pc file.

(cherry picked from parts of c8947fda23eb874a7694bdee1b4de605744c2769)

Michael
(This used to be commit 77664bc482071798571096a299e7d8b190f53797)
---
 source3/lib/talloc/config.mk | 1 +
 source3/lib/tdb/config.mk    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/source3/lib/talloc/config.mk b/source3/lib/talloc/config.mk
index 942ced6b86..c31f9a7515 100644
--- a/source3/lib/talloc/config.mk
+++ b/source3/lib/talloc/config.mk
@@ -2,6 +2,7 @@
 VERSION = 1.0.0
 SO_VERSION = 1
 OBJ_FILES = talloc.o
+PC_FILE = talloc.pc
 MANPAGE = talloc.3
 CFLAGS = -Ilib/talloc
 PUBLIC_HEADERS = talloc.h
diff --git a/source3/lib/tdb/config.mk b/source3/lib/tdb/config.mk
index ab90ed728d..e0b8c371a7 100644
--- a/source3/lib/tdb/config.mk
+++ b/source3/lib/tdb/config.mk
@@ -3,6 +3,7 @@
 [LIBRARY::LIBTDB]
 VERSION = 0.0.1
 SO_VERSION = 0
+PC_FILE = tdb.pc
 DESCRIPTION = Trivial Database Library
 OBJ_FILES = \
 	common/tdb.o common/dump.o common/io.o common/lock.o \
-- 
cgit 


From defae9b5016c7bb33a374c6ac49a6625cf72a35b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 22 Jan 2008 18:49:51 +0100
Subject: build: Remove support for DESCRIPTION setting that is now unused.

(cherry picked from parts of commit 91d7ba5202e6c375456a42c2c6861f63c7fcfc20)

Michael
(This used to be commit 4b03f88c1ed8c1a2c1e5e7d461ca2d64a8d6a054)
---
 source3/lib/talloc/config.mk | 1 -
 source3/lib/tdb/config.mk    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/source3/lib/talloc/config.mk b/source3/lib/talloc/config.mk
index c31f9a7515..16b5063f87 100644
--- a/source3/lib/talloc/config.mk
+++ b/source3/lib/talloc/config.mk
@@ -6,4 +6,3 @@ PC_FILE = talloc.pc
 MANPAGE = talloc.3
 CFLAGS = -Ilib/talloc
 PUBLIC_HEADERS = talloc.h
-DESCRIPTION = A hierarchical pool based memory system with destructors
diff --git a/source3/lib/tdb/config.mk b/source3/lib/tdb/config.mk
index e0b8c371a7..01a23f00de 100644
--- a/source3/lib/tdb/config.mk
+++ b/source3/lib/tdb/config.mk
@@ -4,7 +4,6 @@
 VERSION = 0.0.1
 SO_VERSION = 0
 PC_FILE = tdb.pc
-DESCRIPTION = Trivial Database Library
 OBJ_FILES = \
 	common/tdb.o common/dump.o common/io.o common/lock.o \
 	common/open.o common/traverse.o common/freelist.o \
-- 
cgit 


From 38b92adebcbd30975dcc9977822ff305f324ef2d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 11 Feb 2008 12:50:03 +0100
Subject: Make versions in lib/talloc/config.mk and lib/talloc/configure.ac the
 same.

Not sure if we can produce one from the other, so I manually made
them equal for now.

Michael
(cherry picked from commit 1c14c457bea75fb3055712547cca501e8ef3fc20)
(This used to be commit 0d9ae82f51302c9755b6e50f1df88eb2a079f12a)
---
 source3/lib/talloc/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/talloc/config.mk b/source3/lib/talloc/config.mk
index 16b5063f87..9e949f900f 100644
--- a/source3/lib/talloc/config.mk
+++ b/source3/lib/talloc/config.mk
@@ -1,5 +1,5 @@
 [LIBRARY::LIBTALLOC]
-VERSION = 1.0.0
+VERSION = 1.1.0
 SO_VERSION = 1
 OBJ_FILES = talloc.o
 PC_FILE = talloc.pc
-- 
cgit 


From ff0065672e99c4693d2b3e1dcce969fd4852e609 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Feb 2008 22:05:52 +0100
Subject: Split rules.mk out of Makefile. (cherry picked from commit
 75ffc2c50d70e6f4108c3e6843c8d2bb212f6d9e) (This used to be commit
 6f8165e4b064f37335e2b0b185ae6433c06a061a)

---
 source3/lib/talloc/Makefile.in | 40 +++++++++++++---------------------------
 source3/lib/talloc/rules.mk    | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 source3/lib/talloc/rules.mk

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 9ba557dd8e..5b0506d17f 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -19,24 +19,16 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 SHLIBEXT = @SHLIBEXT@
 SHLD_FLAGS = @SHLD_FLAGS@
 
-.SUFFIXES: .c .o .3 .3.xml .xml .html
-
 LIBOBJ = @TALLOC_OBJ@ @LIBREPLACEOBJ@
 
 SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
 SONAME = libtalloc.$(SHLIBEXT).1
 
-.c.o:
-	$(CC) $(PICFLAG) -o $@ -c $< $(CFLAGS)
-
-all: showflags libtalloc.a $(SOLIB) testsuite $(EXTRA_TARGETS)
+all:: showflags libtalloc.a $(SOLIB) testsuite $(EXTRA_TARGETS)
 
-showflags:
-	@echo 'talloc will be compiled with flags:'
-	@echo '  CFLAGS = $(CFLAGS)'
-	@echo '  LIBS = $(LIBS)'
+include rules.mk
 
-testsuite: $(LIBOBJ) testsuite.o
+testsuite:: $(LIBOBJ) testsuite.o
 	$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
 
 libtalloc.a: $(LIBOBJ)
@@ -46,7 +38,7 @@ libtalloc.a: $(LIBOBJ)
 $(SOLIB): $(LIBOBJ)
 	$(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
 
-install: all 
+install:: all 
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
 	${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
@@ -59,30 +51,24 @@ install: all
 	which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
 	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
 
-doc: talloc.3 talloc.3.html
-
-.3.xml.3:
-	-test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+doc:: talloc.3 talloc.3.html
 
-.xml.html:
-	-test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
-
-clean:
+clean::
 	rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
 
-test: testsuite
+check: test
+
+test:: testsuite
 	./testsuite
 
-gcov:
+gcov::
 	gcov talloc.c
 
-installcheck: 
-	$(MAKE) test
+installcheck:: test
 
-distclean: clean
-	rm -f *~ */*~
+distclean:: clean
 	rm -f Makefile
 	rm -f config.log config.status config.h config.cache
 
-realdistclean: distclean
+realdistclean:: distclean
 	rm -f configure config.h.in
diff --git a/source3/lib/talloc/rules.mk b/source3/lib/talloc/rules.mk
new file mode 100644
index 0000000000..6cee126529
--- /dev/null
+++ b/source3/lib/talloc/rules.mk
@@ -0,0 +1,18 @@
+.SUFFIXES: .c .o .3 .3.xml .xml .html
+
+showflags::
+	@echo 'talloc will be compiled with flags:'
+	@echo '  CFLAGS = $(CFLAGS)'
+	@echo '  LIBS = $(LIBS)'
+
+.c.o:
+	$(CC) $(PICFLAG) -o $@ -c $< $(CFLAGS)
+
+.3.xml.3:
+	-test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+.xml.html:
+	-test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
+
+distclean::
+	rm -f *~ */*~
-- 
cgit 


From 81a44cb69924c6a80b631b2a8283f5f8d3049b3f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Feb 2008 22:52:42 +0100
Subject: Split actual content out of talloc Makefile into talloc.mk. (cherry
 picked from commit 2b8939975267fc4774bccd2a35ea9a35129d0a2b) (This used to be
 commit 7710d3dea350a85348d46747e4f4cde2b20741de)

---
 source3/lib/talloc/Makefile.in | 42 +++++-------------------------------------
 source3/lib/talloc/talloc.mk   | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 source3/lib/talloc/talloc.mk

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index 5b0506d17f..ca7c302c06 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -18,53 +18,21 @@ PICFLAG = @PICFLAG@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 SHLIBEXT = @SHLIBEXT@
 SHLD_FLAGS = @SHLD_FLAGS@
+tallocdir = @tallocdir@
 
-LIBOBJ = @TALLOC_OBJ@ @LIBREPLACEOBJ@
+LIBOBJ = $(TALLOC_OBJ) @LIBREPLACEOBJ@
 
-SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
-SONAME = libtalloc.$(SHLIBEXT).1
-
-all:: showflags libtalloc.a $(SOLIB) testsuite $(EXTRA_TARGETS)
+all:: showflags $(EXTRA_TARGETS)
 
 include rules.mk
-
-testsuite:: $(LIBOBJ) testsuite.o
-	$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
-
-libtalloc.a: $(LIBOBJ)
-	ar -rv $@ $(LIBOBJ)
-	@-ranlib $@
+include talloc.mk
 
 $(SOLIB): $(LIBOBJ)
 	$(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
 
-install:: all 
-	${INSTALLCMD} -d $(DESTDIR)$(libdir)
-	${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
-	${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
-	${INSTALLCMD} -m 755 $(SOLIB) $(DESTDIR)$(libdir)
-	${INSTALLCMD} -d $(DESTDIR)${includedir}
-	${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
-	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
-	if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
-	if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
-	which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
-	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
-
-doc:: talloc.3 talloc.3.html
-
-clean::
-	rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
-
 check: test
 
-test:: testsuite
-	./testsuite
-
-gcov::
-	gcov talloc.c
-
-installcheck:: test
+installcheck:: test install
 
 distclean:: clean
 	rm -f Makefile
diff --git a/source3/lib/talloc/talloc.mk b/source3/lib/talloc/talloc.mk
new file mode 100644
index 0000000000..2dc75dd716
--- /dev/null
+++ b/source3/lib/talloc/talloc.mk
@@ -0,0 +1,37 @@
+all:: libtalloc.a $(SOLIB) testsuite
+
+TALLOC_OBJ = $(tallocdir)/talloc.o 
+
+SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
+SONAME = libtalloc.$(SHLIBEXT).1
+
+testsuite:: $(LIBOBJ) testsuite.o
+	$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
+
+libtalloc.a: $(LIBOBJ)
+	ar -rv $@ $(LIBOBJ)
+	@-ranlib $@
+
+install:: all 
+	${INSTALLCMD} -d $(DESTDIR)$(libdir)
+	${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
+	${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
+	${INSTALLCMD} -m 755 $(SOLIB) $(DESTDIR)$(libdir)
+	${INSTALLCMD} -d $(DESTDIR)${includedir}
+	${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
+	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
+	if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
+	if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
+	which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
+	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
+
+doc:: talloc.3 talloc.3.html
+
+clean::
+	rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
+
+test:: testsuite
+	./testsuite
+
+gcov::
+	gcov talloc.c
-- 
cgit 


From 9a7e977a73bd8596387b1d7302489425b2aaa40b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Feb 2008 23:51:59 +0100
Subject: Fix out of tree builds.

(cherry picked from parts of commit 35c8ebdca2612b52cd3eb2aafd35041d17173722)

Michael
(This used to be commit a780c0594aeea3705d601a327aa04d9182060cbd)
---
 source3/lib/talloc/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source3/lib/talloc/Makefile.in b/source3/lib/talloc/Makefile.in
index ca7c302c06..851dc81aea 100644
--- a/source3/lib/talloc/Makefile.in
+++ b/source3/lib/talloc/Makefile.in
@@ -24,8 +24,8 @@ LIBOBJ = $(TALLOC_OBJ) @LIBREPLACEOBJ@
 
 all:: showflags $(EXTRA_TARGETS)
 
-include rules.mk
-include talloc.mk
+include $(tallocdir)/rules.mk
+include $(tallocdir)/talloc.mk
 
 $(SOLIB): $(LIBOBJ)
 	$(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
-- 
cgit 


From 3519e91a856b291904caa1f26c3704ab8b1f5b97 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 12 Feb 2008 12:46:33 +0100
Subject: Make sure talloc.so is build before installing. (cherry picked from
 commit 51769f5cfc0f3a9f85ea533598a1f769e108d075) (This used to be commit
 da98f4d223997709b42b4f05ab94d564261f5aee)

---
 source3/lib/talloc/talloc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source3/lib/talloc/talloc.mk b/source3/lib/talloc/talloc.mk
index 2dc75dd716..590adc74f2 100644
--- a/source3/lib/talloc/talloc.mk
+++ b/source3/lib/talloc/talloc.mk
@@ -1,10 +1,10 @@
-all:: libtalloc.a $(SOLIB) testsuite
-
 TALLOC_OBJ = $(tallocdir)/talloc.o 
 
 SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
 SONAME = libtalloc.$(SHLIBEXT).1
 
+all:: libtalloc.a $(SOLIB) testsuite
+
 testsuite:: $(LIBOBJ) testsuite.o
 	$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
 
-- 
cgit 


From 114fe09af789fb4ca41d72b330783371ecf78be5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 12 Feb 2008 22:52:58 +0100
Subject: Raise version of talloc from 1.1.0 to 1.2.0 after adding talloc
 pools.

Michael
(cherry picked from commit 38855a9f145b54d05f4a508562fc1a6595e0d895)
(This used to be commit 303a3eb128b410be0f4ebb936cd3b983e639c07f)
---
 source3/lib/talloc/config.mk    | 2 +-
 source3/lib/talloc/configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source3/lib/talloc/config.mk b/source3/lib/talloc/config.mk
index 9e949f900f..540a05d100 100644
--- a/source3/lib/talloc/config.mk
+++ b/source3/lib/talloc/config.mk
@@ -1,5 +1,5 @@
 [LIBRARY::LIBTALLOC]
-VERSION = 1.1.0
+VERSION = 1.2.0
 SO_VERSION = 1
 OBJ_FILES = talloc.o
 PC_FILE = talloc.pc
diff --git a/source3/lib/talloc/configure.ac b/source3/lib/talloc/configure.ac
index e5f9575f22..3dcf74ba25 100644
--- a/source3/lib/talloc/configure.ac
+++ b/source3/lib/talloc/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT(talloc, 1.1.0)
+AC_INIT(talloc, 1.2.0)
 AC_CONFIG_SRCDIR([talloc.c])
 AC_SUBST(datarootdir)
 AC_CONFIG_HEADER(config.h)
-- 
cgit 


From fbe8014b650d1b104d1a7624669fa92fbc6605b8 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 13 Feb 2008 01:39:49 +0100
Subject: Fix copy & paste typo in function prototype.

Michael
(This used to be commit 4c2f0e027d2d0c5c5845550b72e6568c503f6cf9)
---
 source3/include/dynconfig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h
index fac027ccfe..57909bc614 100644
--- a/source3/include/dynconfig.h
+++ b/source3/include/dynconfig.h
@@ -61,7 +61,7 @@ bool is_default_dyn_LOGFILEBASE(void);
 
 const char *get_dyn_LMHOSTSFILE(void);
 const char *set_dyn_LMHOSTSFILE(const char *newpath);
-bool is_default_dyn_LOGFILEBASE(void);
+bool is_default_dyn_LMHOSTSFILE(void);
 
 const char *get_dyn_CODEPAGEDIR(void);
 const char *set_dyn_CODEPAGEDIR(const char *newpath);
-- 
cgit