[Pkg-samba-maint] r3100 - trunk/samba/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-10-31 11:57:45 +0000 (Sat, 31 Oct 2009)
New Revision: 3100

Removed:
   trunk/samba/debian/patches/disable-talloctort.patch
Modified:
   trunk/samba/debian/patches/series
Log:
Patch was applied upstream


Deleted: trunk/samba/debian/patches/disable-talloctort.patch
===================================================================
--- trunk/samba/debian/patches/disable-talloctort.patch	2009-10-31 11:57:14 UTC (rev 3099)
+++ trunk/samba/debian/patches/disable-talloctort.patch	2009-10-31 11:57:45 UTC (rev 3100)
@@ -1,71 +0,0 @@
-From 258bc9bd60cc6ce5c11ff9ba24db0229ed6980f6 Mon Sep 17 00:00:00 2001
-Author: Stefan Metzmacher <metze at samba.org>, Steve Langasek <vorlon at debian.org>
-Date: Sun, 20 Sep 2009 19:14:51 +0200
-Bug-Debian: #546828
-Description: [PATCH] s3:build: only build talloctort if we build talloc
- This should fix bug #6742.
-
- metze
-
-Index: samba-deb.clean/source3/Makefile.in
-===================================================================
---- samba-deb.clean.orig/source3/Makefile.in
-+++ samba-deb.clean/source3/Makefile.in
-@@ -212,15 +212,15 @@
- TORTURE_PROGS = bin/smbtorture at EXEEXT@ bin/msgtest at EXEEXT@ \
- 	bin/masktest at EXEEXT@ bin/locktest at EXEEXT@ \
- 	bin/locktest2 at EXEEXT@ bin/nsstest at EXEEXT@ bin/vfstest at EXEEXT@ \
--	bin/pdbtest at EXEEXT@ bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
-+	bin/pdbtest at EXEEXT@ bin/replacetort at EXEEXT@ \
- 	bin/tdbtorture at EXEEXT@ \
--	bin/smbconftort at EXEEXT@ bin/vlp at EXEEXT@
-+	bin/smbconftort at EXEEXT@ bin/vlp at EXEEXT@ @TALLOCTORT@
- 
- BIN_PROGS = @EXTRA_BIN_PROGS@ \
- 	$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) 
- 
- EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
--	bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
-+	@TALLOCTORT@ bin/replacetort at EXEEXT@ \
- 	bin/log2pcap at EXEEXT@ \
- 	bin/vlp at EXEEXT@ bin/smbiconv at EXEEXT@ \
- 	bin/dbwrap_tool at EXEEXT@
-@@ -1248,7 +1248,7 @@
- 
- sharesec: SHOWFLAGS bin/sharesec at EXEEXT@
- 
--talloctort : SHOWFLAGS bin/talloctort at EXEEXT@
-+talloctort : SHOWFLAGS @TALLOCTORT@
- 
- replacetort : SHOWFLAGS bin/replacetort at EXEEXT@
- 
-Index: samba-deb.clean/source3/configure.in
-===================================================================
---- samba-deb.clean.orig/source3/configure.in
-+++ samba-deb.clean/source3/configure.in
-@@ -4752,6 +4752,8 @@
- 		LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
- 	done
- 	AC_SUBST(LIBTALLOC_OBJ0)
-+	TALLOCTORT="bin/talloctort"
-+	AC_SUBST(TALLOCTORT)
- else
- 	LIBTALLOC_LIBS="${TALLOC_LIBS}"
- fi
-Index: samba-deb.clean/source3/script/tests/test_local_s3.sh
-===================================================================
---- samba-deb.clean.orig/source3/script/tests/test_local_s3.sh
-+++ samba-deb.clean/source3/script/tests/test_local_s3.sh
-@@ -16,8 +16,10 @@
- 
- failed=0
- 
--testit "talloctort" $VALGRIND $BINDIR/talloctort || \
--    failed=`expr $failed + 1`
-+test -x $BINDIR/talloctort && {
-+	testit "talloctort" $VALGRIND $BINDIR/talloctort || \
-+	    failed=`expr $failed + 1`
-+}
- 
- testit "replacetort" $VALGRIND $BINDIR/replacetort || \
-     failed=`expr $failed + 1`

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2009-10-31 11:57:14 UTC (rev 3099)
+++ trunk/samba/debian/patches/series	2009-10-31 11:57:45 UTC (rev 3100)
@@ -13,5 +13,4 @@
 fix-manpages-warnings.patch
 codepages-location.patch
 external-talloc-support.patch
-disable-talloctort.patch
 autoconf.patch