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

[bubulle at alioth.debian.org]

tags 524048 pending
thanks

Author: bubulle
Date: 2009-05-02 05:14:52 +0000 (Sat, 02 May 2009)
New Revision: 2739

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/shrink-dead-code.patch
Log:
No longer shrink dead code from smbd as suggested by Michael Adam on IRC


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-05-01 17:42:39 UTC (rev 2738)
+++ trunk/samba/debian/changelog	2009-05-02 05:14:52 UTC (rev 2739)
@@ -3,6 +3,8 @@
   [ Christian Perrier ]
   * New upstream release
   * Add idmap_tdb2 module to winbind package
+  * No longer shrink "dead" code from smbd as it prevents VFS modules
+    to properly load. Closes: #524048.
 
   [ Debconf translations ]
   * Bengali added.

Modified: trunk/samba/debian/patches/shrink-dead-code.patch
===================================================================
--- trunk/samba/debian/patches/shrink-dead-code.patch	2009-05-01 17:42:39 UTC (rev 2738)
+++ trunk/samba/debian/patches/shrink-dead-code.patch	2009-05-02 05:14:52 UTC (rev 2739)
@@ -16,23 +16,12 @@
 
 Michael
 
-Index: samba/source/Makefile.in
+Index: samba-3.4.0/source/Makefile.in
 ===================================================================
---- samba.orig/source/Makefile.in
-+++ samba/source/Makefile.in
-@@ -1328,267 +1328,356 @@
+--- 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 @@
  
- bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
-+	@$(AR) -rc $@.a $(SMBD_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(LDAP_LIBS) \
- 		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
- 		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
- 		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(WINBIND_LIBS)
-+	@rm -f $@.a
- 
  bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@
 -	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
@@ -423,7 +412,7 @@
  
  
  #####################################################################
-@@ -2181,16 +2270,20 @@
+@@ -2181,16 +2268,20 @@
  
  bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo "Linking $@"
@@ -446,7 +435,7 @@
  
  @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
  	@echo "Linking $@"
-@@ -2477,9 +2570,11 @@
+@@ -2477,9 +2568,11 @@
  
  bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo Linking $@
@@ -459,7 +448,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 +2592,31 @@
+@@ -2497,23 +2590,31 @@
  
  bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@