[Pkg-samba-maint] r2742 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

tags 524048 pending
thanks

Author: bubulle
Date: 2009-05-02 12:35:58 +0000 (Sat, 02 May 2009)
New Revision: 2742

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/shrink-dead-code.patch
Log:
winbindd and vfstest also shouldn't be trimmed


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-05-02 06:48:31 UTC (rev 2741)
+++ trunk/samba/debian/changelog	2009-05-02 12:35:58 UTC (rev 2742)
@@ -1,12 +1,12 @@
-samba (2:3.3.4-1) UNRELEASED; urgency=low
+samba (2:3.3.4-1) unstable; urgency=low
 
   [ Christian Perrier ]
   * New upstream release:
     - Fixed daily winbind crash when retrieving users from an ADS server
       Closes: #522907.
   * Add idmap_tdb2 module to winbind package
-  * No longer shrink "dead" code from smbd as it prevents VFS modules
-    to properly load. Closes: #524048.
+  * No longer shrink "dead" code from smbd, winbindd and vfstest as it prevents
+    VFS modules to properly load. Closes: #524048.
 
   [ Debconf translations ]
   * Bengali added.
@@ -14,7 +14,7 @@
   [ Steve Langasek ]
   * Recommend logrotate instead of depending on it.  Closes: #504219.
 
- -- Christian Perrier <bubulle at debian.org>  Sun, 19 Apr 2009 22:31:33 +0200
+ -- Christian Perrier <bubulle at debian.org>  Sat, 02 May 2009 10:06:16 +0200
 
 samba (2:3.3.3-1) unstable; urgency=low
 

Modified: trunk/samba/debian/patches/shrink-dead-code.patch
===================================================================
--- trunk/samba/debian/patches/shrink-dead-code.patch	2009-05-02 06:48:31 UTC (rev 2741)
+++ trunk/samba/debian/patches/shrink-dead-code.patch	2009-05-02 12:35:58 UTC (rev 2742)
@@ -16,11 +16,11 @@
 
 Michael
 
-Index: samba-3.4.0/source/Makefile.in
+Index: samba-3.3.4/source/Makefile.in
 ===================================================================
---- samba-3.4.0.orig/source/Makefile.in	2009-05-02 07:06:20.433929231 +0200
-+++ samba-3.4.0/source/Makefile.in	2009-05-02 07:07:48.726174813 +0200
-@@ -1336,259 +1336,346 @@
+--- samba-3.3.4.orig/source/Makefile.in	2009-05-02 14:33:23.654935629 +0200
++++ samba-3.3.4/source/Makefile.in	2009-05-02 14:34:41.393926942 +0200
+@@ -1336,182 +1336,243 @@
  
  bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@
@@ -296,14 +296,7 @@
  
  bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(AVAHI_LIBS) \
-+	@$(AR) -rc $@.a $(VFSTEST_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(TERMLDFLAGS) $(AVAHI_LIBS) \
- 		$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
- 		$(ACL_LIBS) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
- 		@SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(WINBIND_LIBS)
-+	@rm -f $@.a
+@@ -1523,72 +1584,96 @@
  
  bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@
@@ -412,17 +405,8 @@
  
  
  #####################################################################
-@@ -2181,16 +2268,20 @@
+@@ -2187,10 +2272,12 @@
  
- bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo "Linking $@"
--	@$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@$(AR) -rc $@.a $(WINBINDD_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
- 		$(PASSDB_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
  bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo "Linking $@"
 -	@$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
@@ -435,7 +419,7 @@
  
  @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
  	@echo "Linking $@"
-@@ -2477,9 +2568,11 @@
+@@ -2477,9 +2564,11 @@
  
  bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo Linking $@
@@ -448,7 +432,7 @@
  
  bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
  	$(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
-@@ -2497,23 +2590,31 @@
+@@ -2497,23 +2586,31 @@
  
  bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@