[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2148-g303a3eb
Michael Adam
obnox at samba.org
Wed Feb 13 00:46:47 GMT 2008
The branch, v3-2-test has been updated
via 303a3eb128b410be0f4ebb936cd3b983e639c07f (commit)
via da98f4d223997709b42b4f05ab94d564261f5aee (commit)
via a780c0594aeea3705d601a327aa04d9182060cbd (commit)
via 7710d3dea350a85348d46747e4f4cde2b20741de (commit)
via 6f8165e4b064f37335e2b0b185ae6433c06a061a (commit)
via 0d9ae82f51302c9755b6e50f1df88eb2a079f12a (commit)
via 4b03f88c1ed8c1a2c1e5e7d461ca2d64a8d6a054 (commit)
via 77664bc482071798571096a299e7d8b190f53797 (commit)
via a146145c28cc355fed47b8a1f322311ffc1a51ab (commit)
via f4c59316b9251477556dd22cdd246607f4dfa845 (commit)
via d6198f2bd7d13b5f30bcc46e12026a00f52d9adc (commit)
via f1267f74a91374692c3564d783c527f94035b323 (commit)
via 8276ec7596b41980aea3f93949edd224fe842fa5 (commit)
via 22d48224d3235403b916c98c92915165fe7ef330 (commit)
via 8e35bbeac286c3b8d64d69ebe9bb4a8f5405a9c0 (commit)
via 5938a732381abed9f5da1db505626b354fe7293e (commit)
via 6c092918725019274cd26218168c5b551ab3c7d2 (commit)
via ce3625a3866376d78edc23b137f41be72f07e5eb (commit)
via f231d03e53dcf291e0cb8870e531989ab855eae0 (commit)
via 7a7dcd9b1265b8f031c9a5e9c4cfa89216827a28 (commit)
via 42b56f77ff88f8a9dccd7a8ac7df789d0223c945 (commit)
via ddfc86b71d7e6fa3d1bd6fcaca4f31dd262e84d2 (commit)
from c62c89c8f0d1ff8e384b88b3b192aa96f0b2183e (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 303a3eb128b410be0f4ebb936cd3b983e639c07f
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 12 22:52:58 2008 +0100
Raise version of talloc from 1.1.0 to 1.2.0 after adding talloc pools.
Michael
(cherry picked from commit 38855a9f145b54d05f4a508562fc1a6595e0d895)
commit da98f4d223997709b42b4f05ab94d564261f5aee
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 12 12:46:33 2008 +0100
Make sure talloc.so is build before installing.
(cherry picked from commit 51769f5cfc0f3a9f85ea533598a1f769e108d075)
commit a780c0594aeea3705d601a327aa04d9182060cbd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 11 23:51:59 2008 +0100
Fix out of tree builds.
(cherry picked from parts of commit 35c8ebdca2612b52cd3eb2aafd35041d17173722)
Michael
commit 7710d3dea350a85348d46747e4f4cde2b20741de
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 11 22:52:42 2008 +0100
Split actual content out of talloc Makefile into talloc.mk.
(cherry picked from commit 2b8939975267fc4774bccd2a35ea9a35129d0a2b)
commit 6f8165e4b064f37335e2b0b185ae6433c06a061a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 11 22:05:52 2008 +0100
Split rules.mk out of Makefile.
(cherry picked from commit 75ffc2c50d70e6f4108c3e6843c8d2bb212f6d9e)
commit 0d9ae82f51302c9755b6e50f1df88eb2a079f12a
Author: Michael Adam <obnox at samba.org>
Date: Mon Feb 11 12:50:03 2008 +0100
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)
commit 4b03f88c1ed8c1a2c1e5e7d461ca2d64a8d6a054
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jan 22 18:49:51 2008 +0100
build: Remove support for DESCRIPTION setting that is now unused.
(cherry picked from parts of commit 91d7ba5202e6c375456a42c2c6861f63c7fcfc20)
Michael
commit 77664bc482071798571096a299e7d8b190f53797
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jan 22 18:24:00 2008 +0100
talloc/tdb: Use manually written pc file.
(cherry picked from parts of c8947fda23eb874a7694bdee1b4de605744c2769)
Michael
commit a146145c28cc355fed47b8a1f322311ffc1a51ab
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 23 19:19:41 2007 -0600
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
commit f4c59316b9251477556dd22cdd246607f4dfa845
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 14 14:28:07 2007 +0100
r26454: Add simple SWIG macro for wrapping talloced types.
(cherry picked from talloc parts of commit 760fcc8bfa2a7cd7641465cb3bae889e9e0fbc75)
Michael
commit d6198f2bd7d13b5f30bcc46e12026a00f52d9adc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Dec 4 18:24:16 2007 +0100
r26292: Make sure swig directory exists.
(cherry picked from commit 7962d221fcb877c9fd3bbc890827338de54ca94a)
commit f1267f74a91374692c3564d783c527f94035b323
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Dec 4 02:04:25 2007 +0100
r26280: Fix installation if swig is not available.
(cherry picked from commit 3320bd401f7b669bd62f83bf16a1c16ad0543a5c)
commit 8276ec7596b41980aea3f93949edd224fe842fa5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Dec 4 01:37:28 2007 +0100
r26276: Install SWIG files if swig is present.
(cherry picked from talloc parts of commit dfd5b456f932268e2b1a82e2775037d356b9483e)
Michael
commit 22d48224d3235403b916c98c92915165fe7ef330
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Nov 29 14:49:47 2007 +0100
r26197: Add bindings for libsecurity.
(cherry picked from parts of commit 8625cd403ba3a7d2b1b1fccfeb5efd7e21de0135)
Michael
commit 8e35bbeac286c3b8d64d69ebe9bb4a8f5405a9c0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 28 22:41:34 2007 +0100
r26187: Fix module name, indentation.
(cherry picked from parts of commit ef790ebf3a712dbbb85d6af65c804199c2c084fc)
Michael
commit 5938a732381abed9f5da1db505626b354fe7293e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 21 12:31:23 2007 +0100
r26072: Import trivial SWIG wrapper for talloc.
(cherry picked from commit 02d259c2c45c03dbfcd16173df93d7ba96ed1419)
commit 6c092918725019274cd26218168c5b551ab3c7d2
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 16 10:10:58 2007 +0100
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
commit ce3625a3866376d78edc23b137f41be72f07e5eb
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Nov 15 15:41:03 2007 +0100
r25973: talloc: fix usage of SONAMEFLAG
metze
(cherry picked from commit 7fecb8f3cd9f5f69dce7b9e566011e5de1e01a4a)
commit f231d03e53dcf291e0cb8870e531989ab855eae0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 14 10:51:32 2007 +0100
r25953: AIX make doesn't support $^.
(cherry picked from parts of commit 91133d27110ee6447dbc64f1c8d52cb90ca1a86c)
Michael
commit 7a7dcd9b1265b8f031c9a5e9c4cfa89216827a28
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 14 01:01:31 2007 +0100
r25944: Fix handling of sonameflag on AIX, which doesn't have anything like that.
(cherry picked from parts of commit 228dd6830eb9c91287bb3e0233d8b3a404ff3676)
Michael
commit 42b56f77ff88f8a9dccd7a8ac7df789d0223c945
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Nov 6 19:53:33 2007 +0100
r25884: Specify shldflags first, as required by some compilers.
(cherry picked from commit 40a8cd0d2fd4d10110243ee75ff92bef73bb06b9)
commit ddfc86b71d7e6fa3d1bd6fcaca4f31dd262e84d2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Nov 6 19:24:12 2007 +0100
r25882: Build shared library of talloc as well.
(cherry picked from commit 3692ba8299d4177289ca401fa467143ad14ccad4)
-----------------------------------------------------------------------
Summary of changes:
source/lib/replace/libreplace_ld.m4 | 4 ++
source/lib/talloc/Makefile.in | 60 +++++---------------
source/lib/talloc/config.mk | 11 +---
source/lib/talloc/configure.ac | 7 ++-
source/lib/talloc/rules.mk | 18 ++++++
source/{include/hmacmd5.h => lib/talloc/talloc.i} | 24 +++++----
source/lib/talloc/talloc.mk | 37 +++++++++++++
source/lib/tdb/Makefile.in | 2 +-
source/lib/tdb/config.mk | 2 +-
source/lib/tdb/configure.ac | 2 +-
10 files changed, 99 insertions(+), 68 deletions(-)
create mode 100644 source/lib/talloc/rules.mk
copy source/{include/hmacmd5.h => lib/talloc/talloc.i} (64%)
create mode 100644 source/lib/talloc/talloc.mk
Changeset truncated at 500 lines:
diff --git a/source/lib/replace/libreplace_ld.m4 b/source/lib/replace/libreplace_ld.m4
index f0d10c1..08defb0 100644
--- a/source/lib/replace/libreplace_ld.m4
+++ b/source/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/source/lib/talloc/Makefile.in b/source/lib/talloc/Makefile.in
index 18b48c3..851dc81 100644
--- a/source/lib/talloc/Makefile.in
+++ b/source/lib/talloc/Makefile.in
@@ -14,59 +14,29 @@ INSTALLCMD = @INSTALL@
CC = @CC@
CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@
EXTRA_TARGETS = @DOC_TARGET@
+PICFLAG = @PICFLAG@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+SHLIBEXT = @SHLIBEXT@
+SHLD_FLAGS = @SHLD_FLAGS@
+tallocdir = @tallocdir@
-.SUFFIXES: .c .o .3 .3.xml .xml .html
+LIBOBJ = $(TALLOC_OBJ) @LIBREPLACEOBJ@
-LIBOBJ = @TALLOC_OBJ@ @LIBREPLACEOBJ@
+all:: showflags $(EXTRA_TARGETS)
-all: showflags libtalloc.a testsuite $(EXTRA_TARGETS)
+include $(tallocdir)/rules.mk
+include $(tallocdir)/talloc.mk
-showflags:
- @echo 'talloc will be compiled with flags:'
- @echo ' CFLAGS = $(CFLAGS)'
- @echo ' LIBS = $(LIBS)'
+$(SOLIB): $(LIBOBJ)
+ $(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
-testsuite: $(LIBOBJ) testsuite.o
- $(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
+check: test
-libtalloc.a: $(LIBOBJ)
- ar -rv $@ $(LIBOBJ)
- @-ranlib $@
+installcheck:: test install
-install: all
- ${INSTALLCMD} -d $(DESTDIR)$(libdir)
- ${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
- ${INSTALLCMD} -m 755 libtalloc.a $(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
-
-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 $<
-
-.xml.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
-
-test: testsuite
- ./testsuite
-
-gcov:
- gcov talloc.c
-
-installcheck:
- $(MAKE) 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/source/lib/talloc/config.mk b/source/lib/talloc/config.mk
index 714ad72..540a05d 100644
--- a/source/lib/talloc/config.mk
+++ b/source/lib/talloc/config.mk
@@ -1,13 +1,8 @@
-################################################
-# Start LIBRARY LIBTALLOC
[LIBRARY::LIBTALLOC]
-VERSION = 0.0.1
-SO_VERSION = 0
+VERSION = 1.2.0
+SO_VERSION = 1
OBJ_FILES = talloc.o
+PC_FILE = talloc.pc
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/source/lib/talloc/configure.ac b/source/lib/talloc/configure.ac
index afc2a94..3dcf74b 100644
--- a/source/lib/talloc/configure.ac
+++ b/source/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)
@@ -15,4 +15,9 @@ if test -n "$XSLTPROC"; then
fi
AC_SUBST(DOC_TARGET)
+AC_LD_PICFLAG
+AC_LD_SHLIBEXT
+AC_LD_SONAMEFLAG
+AC_LIBREPLACE_SHLD_FLAGS
+
AC_OUTPUT(Makefile talloc.pc)
diff --git a/source/lib/talloc/rules.mk b/source/lib/talloc/rules.mk
new file mode 100644
index 0000000..6cee126
--- /dev/null
+++ b/source/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 *~ */*~
diff --git a/source/include/hmacmd5.h b/source/lib/talloc/talloc.i
similarity index 64%
copy from source/include/hmacmd5.h
copy to source/lib/talloc/talloc.i
index ae588fb..a9afb97 100644
--- a/source/include/hmacmd5.h
+++ b/source/lib/talloc/talloc.i
@@ -1,8 +1,6 @@
/*
Unix SMB/CIFS implementation.
- Interface header: Scheduler service
- Copyright (C) Luke Kenneth Casson Leighton 1996-1999
- Copyright (C) Andrew Tridgell 1992-1999
+ Copyright (C) Jelmer Vernooij <jelmer at 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
@@ -18,12 +16,16 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _HMAC_MD5_H
+/* 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, noblock=1) TALLOC_CTX * {
+ $1 = NULL;
+}
-typedef struct {
- struct MD5Context ctx;
- unsigned char k_ipad[65];
- unsigned char k_opad[65];
-} HMACMD5Context;
-
-#endif /* _HMAC_MD5_H */
+%define %talloctype(TYPE)
+%nodefaultctor TYPE;
+%extend TYPE {
+ ~TYPE() { talloc_free($self); }
+}
+%enddef
diff --git a/source/lib/talloc/talloc.mk b/source/lib/talloc/talloc.mk
new file mode 100644
index 0000000..590adc7
--- /dev/null
+++ b/source/lib/talloc/talloc.mk
@@ -0,0 +1,37 @@
+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)
+
+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
diff --git a/source/lib/tdb/Makefile.in b/source/lib/tdb/Makefile.in
index e1ecbb3..fd36ed0 100644
--- a/source/lib/tdb/Makefile.in
+++ b/source/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 $@ $(TDB_OBJ) $(SONAMEFLAG)$(SONAME)
TDB_LIB = libtdb.a
diff --git a/source/lib/tdb/config.mk b/source/lib/tdb/config.mk
index ab90ed7..01a23f0 100644
--- a/source/lib/tdb/config.mk
+++ b/source/lib/tdb/config.mk
@@ -3,7 +3,7 @@
[LIBRARY::LIBTDB]
VERSION = 0.0.1
SO_VERSION = 0
-DESCRIPTION = Trivial Database Library
+PC_FILE = tdb.pc
OBJ_FILES = \
common/tdb.o common/dump.o common/io.o common/lock.o \
common/open.o common/traverse.o common/freelist.o \
diff --git a/source/lib/tdb/configure.ac b/source/lib/tdb/configure.ac
index 1085055..14761bc 100644
--- a/source/lib/tdb/configure.ac
+++ b/source/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)
--
Samba Shared Repository
More information about the samba-cvs
mailing list