[SCM] Samba Shared Repository - branch v3-6-test updated

Karolin Seeger kseeger at samba.org
Wed Jun 19 01:34:18 MDT 2013


The branch, v3-6-test has been updated
       via  c81635a WHATSNEW: Add another fix since 3.6.15.
       via  30187a8 s3-autoconf: Add missing libtevent dependency for dbwrap_torture.
       via  f46e512 s3-autoconf: Add missing libtevent dependency to dbwrap_tool.
       via  f7588c7 s3-autoconf: Add missing libtevent dependency.
      from  a1a0c53 WHATSNEW: Add changes since 3.6.15.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit c81635ab7a6f2d6ed68cba92809053ea036dae76
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Jun 19 09:33:11 2013 +0200

    WHATSNEW: Add another fix since 3.6.15.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

commit 30187a839643337415ce78efec566aeff80f5a60
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 18 11:47:17 2013 +0200

    s3-autoconf: Add missing libtevent dependency for dbwrap_torture.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    
    The last 3 patches are part of a fix for bug #9881 - Samba doesn't check for
    system libtevent.

commit f46e512bc033fb7b1303fbadfba96634041bcdcb
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 18 11:32:19 2013 +0200

    s3-autoconf: Add missing libtevent dependency to dbwrap_tool.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

commit f7588c73b9e8d95dcf3ca15067e05284dc117d3d
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jun 17 11:53:09 2013 +0200

    s3-autoconf: Add missing libtevent dependency.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt        |    4 ++++
 source3/Makefile.in |   12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index eb1fcad..0e6f7ce 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -15,6 +15,10 @@ o  Properly handle Oplock breaks in compound requests (bug #9722).
 Changes since 3.6.15:
 ---------------------
 
+o   Michael Adam <obnox at samba.org>
+    * BUG 9881: Link dbwrap_tool and dbwrap_torture against libtevent.
+
+
 o   Jeremy Allison <jra at samba.org>
     * BUG 9722: Properly handle Oplock breaks in compound requests.
     * BUG 9822: Fix crash bug during Win8 sync.
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d0f9e74..9e8e03d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1969,11 +1969,11 @@ bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC)
 		@SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) \
 		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB)
 	@echo Linking $@
 	@$(CC) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
 		$(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
-		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
+		$(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS)
 
 bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ $(LIBTALLOC)
 	@echo Linking $@
@@ -3273,23 +3273,23 @@ bin/test_lp_load at EXEEXT@: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ $(L
 		$(LDAP_LIBS) $(LIBWBCLIENT_LIBS) \
 		$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS)
 
-bin/dbwrap_tool at EXEEXT@: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/dbwrap_tool at EXEEXT@: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBTEVENT)
 	@echo "Linking $@"
 	@$(CC) -o $@ $(DBWRAP_TOOL_OBJ)\
 		$(LDFLAGS) $(DYNEXP) $(LIBS) \
 		$(LDAP_LIBS) \
-		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
+		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBTEVENT_LIBS)
 
 install-dbwrap_tool:: bin/dbwrap_tool at EXEEXT@
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $<
 
-bin/dbwrap_torture at EXEEXT@: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/dbwrap_torture at EXEEXT@: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBTEVENT)
 	@echo "Linking $@"
 	@$(CC) -o $@ $(DBWRAP_TORTURE_OBJ)\
 		$(LDFLAGS) $(DYNEXP) $(LIBS) \
 		$(LDAP_LIBS) \
 		$(POPT_LIBS) \
-		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
+		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBTEVENT_LIBS)
 
 install-dbwrap_torture:: bin/dbwrap_torture at EXEEXT@
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $<


-- 
Samba Shared Repository


More information about the samba-cvs mailing list