upgrading package: samba 3.0.30 -> 3.2.0

18 years ago · ee0d6647a1
2 changed files with 11 additions and 373 deletions
--- a/samba/samba.patch
+++ b/samba/samba.patch
@ -1,359 +1,7 @@
-Index: source/Makefile.in
--- source/Makefile.in.orig	2007-05-23 17:29:19 +0200
-+++ source/Makefile.in	2007-05-26 11:37:01 +0200
-@@ -92,7 +92,7 @@
- # or in smb.conf (see smb.conf(5))
- LOGFILEBASE = @logfilebase@
- CONFIGFILE = $(CONFIGDIR)/smb.conf
-LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-+LMHOSTSFILE = $(CONFIGDIR)/smb.hosts
- 
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
-@@ -965,26 +965,26 @@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
- 		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @SMBD_LIBS@
-+		$(ACL_LIBS) $(PASSDB_LIBS) @POPTLIBS@ @SMBD_LIBS@ $(LIBS)
- 
- bin/nmbd@EXEEXT@: proto_exists $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/swat@EXEEXT@: proto_exists $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
-	  $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+	  $(AUTH_LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/rpcclient@EXEEXT@: proto_exists $(RPCCLIENT_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
-		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
-		$(KRB5LIBS) $(LDAP_LIBS)
-+		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ \
-+		$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/smbclient@EXEEXT@: proto_exists $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/smbctool@EXEEXT@: proto_exists $(TOOL_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-@@ -992,19 +992,19 @@
- 
- bin/net@EXEEXT@: proto_exists $(NET_OBJ) @BUILD_POPT@ @BUILD_INIPARSER@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@ $(LIBS)
- 
- bin/profiles@EXEEXT@: proto_exists $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LDAP_LIBS) @POPTLIBS@ $(LIBS)
- 
- bin/smbspool@EXEEXT@: proto_exists $(CUPS_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/smbmount@EXEEXT@: proto_exists $(MOUNT_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/smbmnt@EXEEXT@: proto_exists $(MNT_OBJ) bin/.dummy
- 	@echo Linking $@
-@@ -1024,52 +1024,52 @@
- 
- bin/testparm@EXEEXT@: proto_exists $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LDAP_LIBS) @POPTLIBS@ $(LIBS)
- 
- bin/smbstatus@EXEEXT@: proto_exists $(STATUS_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) \
-	@POPTLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LDAP_LIBS) \
-+	@POPTLIBS@ $(LIBS)
- 
- bin/smbcontrol@EXEEXT@: proto_exists $(SMBCONTROL_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
- 	@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
- 	$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
-	$(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@
-+	$(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ $(LIBS)
- 
- bin/smbtree@EXEEXT@: proto_exists $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/smbpasswd@EXEEXT@: proto_exists $(SMBPASSWD_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
-		$(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+		$(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/pdbedit@EXEEXT@: proto_exists $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/smbget@EXEEXT@: proto_exists $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
- 
- bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/nmblookup@EXEEXT@: proto_exists $(NMBLOOKUP_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(LDAP_LIBS) $(LIBS)
- 
- bin/smbtorture@EXEEXT@: proto_exists $(SMBTORTURE_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/talloctort@EXEEXT@: proto_exists $(TALLOCTORT_OBJ) bin/.dummy
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
-		$(DYNEXP) $(LIBS) $(LDAP_LIBS)
-+		$(DYNEXP) $(LDAP_LIBS) $(LIBS)
- 
- bin/replacetort@EXEEXT@: $(REPLACETORT_OBJ) bin/.dummy
- 	@echo Linking $@
-@@ -1078,49 +1078,49 @@
- 
- bin/masktest@EXEEXT@: proto_exists $(MASKTEST_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/msgtest@EXEEXT@: proto_exists $(MSGTEST_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/smbcacls@EXEEXT@: proto_exists $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \
-	$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ \
-+	$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
- 
- bin/smbcquotas@EXEEXT@: proto_exists $(SMBCQUOTAS_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \
-	$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ \
-+	$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
- 
- bin/eventlogadm@EXEEXT@: proto_exists $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LDAP_LIBS) @POPTLIBS@ $(LIBS)
- 
- bin/sharesec@EXEEXT@: proto_exists $(SHARESEC_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LDAP_LIBS) @POPTLIBS@ $(LIBS)
- 
- bin/locktest@EXEEXT@: proto_exists $(LOCKTEST_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/nsstest@EXEEXT@: proto_exists $(NSSTEST_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS)  $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)  $(LDAP_LIBS) $(LIBS)
- 
- bin/pdbtest@EXEEXT@: proto_exists $(PDBTEST_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ $(LIBS)
- 
- bin/vfstest@EXEEXT@: proto_exists $(VFSTEST_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) $(LIBS)
- 
- bin/smbiconv@EXEEXT@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(LIBS)
- 
- bin/log2pcap@EXEEXT@: proto_exists $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-@@ -1128,11 +1128,11 @@
- 
- bin/locktest2@EXEEXT@: proto_exists $(LOCKTEST2_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/rpctorture@EXEEXT@: $(RPCTORTURE_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/debug2html@EXEEXT@: proto_exists $(DEBUG2HTML_OBJ) bin/.dummy
- 	@echo Linking $@
-@@ -1140,13 +1140,13 @@
- 
- bin/smbfilter@EXEEXT@: proto_exists $(SMBFILTER_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- 
- bin/libaddns.@SHLIBEXT@: proto_exists $(LIBADDNS_OBJ)
- 	@echo Linking libaddns shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ) $(LIBS) \
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ) \
- 		$(KRB5LIBS) $(UUID_LIBS)\
-		@SONAMEFLAG@`basename $@`.$(LIBADDNS_MAJOR)
-+		@SONAMEFLAG@`basename $@`.$(LIBADDNS_MAJOR) $(LIBS)
- 
- bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
- 	@echo Linking libaddns non-shared library $@
-@@ -1154,9 +1154,9 @@
- 
- bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
- 	@echo Linking libsmbclient shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
-+		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) $(LIBS)
- 
- bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
- 	@echo Linking libsmbclient non-shared library $@
-@@ -1164,9 +1164,9 @@
- 
- bin/libsmbsharemodes.@SHLIBEXT@: proto_exists $(LIBSMBSHAREMODES_OBJ)
- 	@echo Linking libsmbsharemodes shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ) $(LIBS) \
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ) \
- 		$(KRB5LIBS) $(LDAP_LIBS) \
-		@SONAMEFLAG@`basename $@`.$(LIBSMBSHAREMODES_MAJOR)
-+		@SONAMEFLAG@`basename $@`.$(LIBSMBSHAREMODES_MAJOR) $(LIBS)
- 
- bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODES_OBJ)
- 	@echo Linking libsmbsharemodes non-shared library $@
-@@ -1174,8 +1174,8 @@
- 
- bin/libmsrpc.@SHLIBEXT@: proto_exists $(CAC_OBJ)
- 	@echo Linking libmsrpc shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS) \
-	@SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) \
-+	@SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR) $(LIBS)
- 
- bin/libmsrpc.a: proto_exists $(CAC_OBJ)
- 	@echo Linking libmsrpc non-shared library $@
-@@ -1184,9 +1184,9 @@
- # This is probably wrong for anything other than the GNU linker.
- bin/libbigballofmud.@SHLIBEXT@: proto_exists $(LIBBIGBALLOFMUD_OBJ)
- 	@echo Linking bigballofmud shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) \
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
- 		$(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
-		@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR)
-+		@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) $(LIBS)
- 	ln -snf libbigballofmud.so bin/libbigballofmud.so.0
- 
- # It would be nice to build a static bigballofmud too, but when I try
-@@ -1276,8 +1276,8 @@
- 
- bin/winbindd@EXEEXT@: proto_exists $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo "Linking $@"
-	@$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-		@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS)
- 
- @WINBIND_NSS@: $(WINBIND_NSS_OBJ)
- 	@echo "Linking $@"
-@@ -1287,14 +1287,14 @@
- @WINBIND_WINS_NSS@: proto_exists $(WINBIND_WINS_NSS_OBJ)
- 	@echo "Linking $@"
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
-		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
-		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
-+		$(LDAP_LIBS) $(KRB5LIBS) \
-+		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ $(LIBS)
- 
- @SMB_KRB5_LOCATOR@: proto_exists $(SMB_KRB5_LOCATOR_OBJ)
- 	@echo "Linking $@"
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(SMB_KRB5_LOCATOR_OBJ) \
-		$(LDAP_LIBS) $(LIBS) -lcom_err \
-		@SONAMEFLAG@`basename $@`
-+		$(LDAP_LIBS) -lcom_err \
-+		@SONAMEFLAG@`basename $@` $(LIBS)
- 
- bin/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ) bin/.dummy
- 	@echo "Linking shared library $@"
-@@ -1520,30 +1520,30 @@
- 
- bin/wbinfo@EXEEXT@: proto_exists $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LDAP_LIBS) @POPTLIBS@ $(LIBS)
- 
- bin/ntlm_auth@EXEEXT@: proto_exists $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- 		@BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
-		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
-		@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+		@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
- 
- bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ)
- 	@echo "Linking shared library $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(LIBS)
- 
- bin/tdbbackup@EXEEXT@: proto_exists $(TDBBACKUP_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBBACKUP_OBJ) $(LIBS)
- 
- bin/tdbtool@EXEEXT@: $(TDBTOOL_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBTOOL_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBTOOL_OBJ) $(LIBS)
- 
- bin/tdbdump@EXEEXT@: $(TDBDUMP_OBJ) bin/.dummy
- 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBDUMP_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBDUMP_OBJ) $(LIBS)
- 
- bin/t_strcmp@EXEEXT@: proto_exists bin/libbigballofmud.@SHLIBEXT@ torture/t_strcmp.o
- 	$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud
-@@ -1666,7 +1666,7 @@
- 	fi
- 	PYTHON_OBJS="$(PYTHON_OBJ)" \
- 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
-	LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
-+	LIBS="$(LDFLAGS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)" \
- 		$(PYTHON) python/setup.py build
- 
- python_install: $(PYTHON_OBJ)
 Index: source/lib/sysquotas_4A.c
--- source/lib/sysquotas_4A.c.orig	2005-09-29 23:52:43 +0200
-+++ source/lib/sysquotas_4A.c	2007-05-26 11:37:01 +0200
-@@ -72,6 +72,10 @@
+--- source/lib/sysquotas_4A.c.orig	2008-07-01 14:33:07 +0200
+++ source/lib/sysquotas_4A.c	2008-07-01 21:00:55 +0200
+@@ -71,6 +71,10 @@
 #define dqb_curinodes	dqb_curfiles
 #endif
 
@ -364,22 +12,10 @@ Index: source/lib/sysquotas_4A.c
 #ifdef INITQFNAMES
 #define USERQUOTAFILE_EXTENSION ".user"
 #else
-Index: source/nsswitch/winbindd_util.c
--- source/nsswitch/winbindd_util.c.orig	2007-05-11 00:09:34 +0200
-+++ source/nsswitch/winbindd_util.c	2007-05-26 11:37:01 +0200
-@@ -936,7 +936,7 @@
- {
- 	if (_winbindd_priv_socket == -1) {
- 		_winbindd_priv_socket = create_pipe_sock(
-			get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0750);
-+			get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0755);
- 		DEBUG(10, ("open_winbindd_priv_socket: opened socket fd %d\n",
- 			   _winbindd_priv_socket));
- 	}
 Index: source/smbd/uid.c
--- source/smbd/uid.c.orig	2007-05-23 17:29:15 +0200
-+++ source/smbd/uid.c	2007-05-26 11:38:34 +0200
-@@ -158,7 +158,11 @@
+--- source/smbd/uid.c.orig	2008-07-01 14:33:07 +0200
+++ source/smbd/uid.c	2008-07-01 21:00:55 +0200
+@@ -157,7 +157,11 @@
 	NT_USER_TOKEN *token = NULL;
 	int num_groups = 0;
 	gid_t *group_list = NULL;
--- a/samba/samba.spec
+++ b/samba/samba.spec
@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Filesystem
 License:      GPL
-Version:      3.0.30
-Release:      20080530
+Version:      3.2.0
+Release:      20080702

 #   package options
 %option       with_pam   no
@ -99,7 +99,9 @@ AutoReqProv:  no
    %patch -p0
    %{l_shtool} subst \
        -e '/WINBINDD_SOCKET_DIR/s;/tmp/\.winbindd;%{l_prefix}/var/samba/tmp/.winbindd;' \
-        source/nsswitch/winbindd_nss.h
+        source/nsswitch/winbind_struct_protocol.h
+    perl -e '$txt = join("", <STDIN>); $txt =~ s/(\$\(LIBS\))((?:[^\n]*\\\n)*[^\n]*)(\n)/$2 $1$3/sg; print STDOUT $txt;' \
+        <source/Makefile.in >source/Makefile.in.new && mv source/Makefile.in.new source/Makefile.in

 %build
    cd source