From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 20 Dec 2011 04:23:32 +0000 (+0000)
Subject: samba3: add patches missing from previous package update commit
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9346a25e8a7b05c2f98cb11f88d2d06b97928695;p=openwrt%2Fsvn-archive%2Fpackages.git

samba3: add patches missing from previous package update commit

SVN-Revision: 29579
---

diff --git a/net/samba3/patches/200-fix-configure.patch b/net/samba3/patches/200-fix-configure.patch
deleted file mode 100644
index 2ab0d61ab..000000000
--- a/net/samba3/patches/200-fix-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Get rid of error due to cross compilation, as glibc version in OpenWRT is high enough
---- a/source/configure
-+++ b/source/configure
-@@ -37222,7 +37222,7 @@ rm -f core conftest.err conftest.$ac_obj
- case "$host_os" in
-     *linux*)
-        # glibc <= 2.3.2 has a broken getgrouplist
--       if test "$cross_compiling" = yes; then
-+       if test "false" = yes; then
-   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
diff --git a/net/samba3/patches/500-remove_avm_smaller.patch b/net/samba3/patches/500-remove_avm_smaller.patch
deleted file mode 100644
index fdc07ddc1..000000000
--- a/net/samba3/patches/500-remove_avm_smaller.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/source/Makefile.in
-+++ b/source/Makefile.in
-@@ -291,7 +291,7 @@ SECRETS_OBJ = passdb/secrets.o passdb/ma
- LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
- 	     libsmb/namequery.o libsmb/conncache.o libads/dns.o
- 
--LIBSAMBA_OBJ = libsmb/nterr.o libsmb/dcerpc_err.o libsmb/smbdes.o \
-+LIBSAMBA_OBJ = libsmb/nterr.o $(if $(OWRT_SMALLER),,libsmb/dcerpc_err.o) libsmb/smbdes.o \
- 	       libsmb/smbencrypt.o libsmb/ntlm_check.o \
- 	       libsmb/ntlmssp.o libsmb/ntlmssp_parse.o libsmb/ntlmssp_sign.o
- 
-@@ -323,35 +323,35 @@ REGISTRY_OBJ = registry/reg_frontend.o r
-                registry/reg_db.o registry/reg_eventlog.o registry/reg_shares.o \
-                registry/reg_util.o registry/reg_dynamic.o registry/reg_perfcount.o
- 
--RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o
-+RPC_LSA_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o)
- 
--RPC_NETLOG_OBJ = rpc_server/srv_netlog.o rpc_server/srv_netlog_nt.o
-+RPC_NETLOG_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_netlog.o rpc_server/srv_netlog_nt.o)
- 
--RPC_SAMR_OBJ = rpc_server/srv_samr.o rpc_server/srv_samr_nt.o \
--               rpc_server/srv_samr_util.o
-+RPC_SAMR_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_samr.o rpc_server/srv_samr_nt.o \
-+               rpc_server/srv_samr_util.o)
- 
- REGFIO_OBJ = registry/regfio.o
- 
--RPC_REG_OBJ =  rpc_server/srv_reg.o rpc_server/srv_reg_nt.o $(REGFIO_OBJ)
-+RPC_REG_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_reg.o rpc_server/srv_reg_nt.o $(REGFIO_OBJ))
- 
--RPC_LSA_DS_OBJ =  rpc_server/srv_lsa_ds.o rpc_server/srv_lsa_ds_nt.o
-+RPC_LSA_DS_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_lsa_ds.o rpc_server/srv_lsa_ds_nt.o)
- 
- RPC_SVC_OBJ = rpc_server/srv_srvsvc.o rpc_server/srv_srvsvc_nt.o
- 
- RPC_WKS_OBJ =  librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
- 
--RPC_SVCCTL_OBJ =  rpc_server/srv_svcctl.o rpc_server/srv_svcctl_nt.o \
-+RPC_SVCCTL_OBJ = $(if $(OWRT_SMALLER),, rpc_server/srv_svcctl.o) rpc_server/srv_svcctl_nt.o \
-                   services/svc_spoolss.o services/svc_rcinit.o services/services_db.o \
-                   services/svc_netlogon.o services/svc_winreg.o \
-                   services/svc_wins.o
- 
--RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs.o rpc_server/srv_ntsvcs_nt.o
-+RPC_NTSVCS_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_ntsvcs.o rpc_server/srv_ntsvcs_nt.o)
- 
--RPC_DFS_OBJ =  rpc_server/srv_dfs.o rpc_server/srv_dfs_nt.o
-+RPC_DFS_OBJ =  $(if $(OWRT_SMALLER),,rpc_server/srv_dfs.o rpc_server/srv_dfs_nt.o)
- 
--RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o
-+RPC_SPOOLSS_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o)
- 
--RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o
-+RPC_EVENTLOG_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o)
- 
- RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \
-                rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o
-@@ -431,7 +431,7 @@ PLAINTEXT_AUTH_OBJ = auth/pampass.o auth
- 
- SLCACHE_OBJ = libsmb/samlogon_cache.o
- 
--DCUTIL_OBJ  = libsmb/namequery_dc.o libsmb/trustdom_cache.o libsmb/trusts_util.o
-+DCUTIL_OBJ  = libsmb/namequery_dc.o $(if $(OWRT_SMALLER),,libsmb/trustdom_cache.o libsmb/trusts_util.o)
- 
- AUTH_BUILTIN_OBJ = auth/auth_builtin.o
- AUTH_DOMAIN_OBJ = auth/auth_domain.o
-@@ -468,7 +468,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpass
- 	       smbd/change_trust_pw.o smbd/fake_file.o \
- 	       smbd/ntquotas.o $(AFS_OBJ) smbd/msdfs.o \
- 	       $(AFS_SETTOKEN_OBJ) smbd/aio.o smbd/statvfs.o \
--	       smbd/dmapi.o $(MANGLE_OBJ) @VFS_STATIC@
-+	       $(if $(OWRT_SMALLER),,smbd/dmapi.o) $(MANGLE_OBJ) @VFS_STATIC@
- 
- SMBD_OBJ_BASE = $(PARAM_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
- 		$(RPC_SERVER_OBJ) $(RPC_PARSE_OBJ) $(SECRETS_OBJ) \
diff --git a/net/samba3/patches/510-remove-printing.patch b/net/samba3/patches/510-remove-printing.patch
deleted file mode 100644
index c9260d183..000000000
--- a/net/samba3/patches/510-remove-printing.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/source/Makefile.in
-+++ b/source/Makefile.in
-@@ -319,7 +319,7 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_wk
- 
- REGOBJS_OBJ = registry/reg_objects.o
- 
--REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_printing.o \
-+REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o $(if $(OWRT_NO_PRINTING),,registry/reg_printing.o) \
-                registry/reg_db.o registry/reg_eventlog.o registry/reg_shares.o \
-                registry/reg_util.o registry/reg_dynamic.o registry/reg_perfcount.o
- 
-@@ -349,7 +349,7 @@ RPC_NTSVCS_OBJ = $(if $(OWRT_SMALLER),,r
- 
- RPC_DFS_OBJ =  $(if $(OWRT_SMALLER),,rpc_server/srv_dfs.o rpc_server/srv_dfs_nt.o)
- 
--RPC_SPOOLSS_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o)
-+RPC_SPOOLSS_OBJ = $(if $(OWRT_NO_PRINTING),,rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o)
- 
- RPC_EVENTLOG_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o)
- 
-@@ -463,7 +463,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpass
- 	       smbd/vfs.o smbd/statcache.o \
-                smbd/posix_acls.o lib/sysacls.o $(SERVER_MUTEX_OBJ) \
- 	       smbd/process.o smbd/service.o smbd/error.o \
--	       printing/printfsp.o lib/sysquotas.o lib/sysquotas_linux.o \
-+	       $(if $(OWRT_NO_PRINTING),,printing/printfsp.o) lib/sysquotas.o lib/sysquotas_linux.o \
- 	       lib/sysquotas_xfs.o lib/sysquotas_4A.o \
- 	       smbd/change_trust_pw.o smbd/fake_file.o \
- 	       smbd/ntquotas.o $(AFS_OBJ) smbd/msdfs.o \
-@@ -480,13 +480,13 @@ SMBD_OBJ_BASE = $(PARAM_OBJ) $(SMBD_OBJ_
- 		$(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
- 		$(BUILDOPT_OBJ) $(SMBLDAP_OBJ)
- 
--PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
-+PRINTING_OBJ = $(if $(OWRT_NO_PRINTING),,printing/pcap.o printing/print_svid.o printing/print_aix.o \
-                printing/print_cups.o printing/print_generic.o \
-                printing/lpq_parse.o printing/load.o \
--               printing/print_iprint.o printing/print_test.o
-+               printing/print_iprint.o printing/print_test.o)
- 
--PRINTBASE_OBJ = printing/notify.o printing/printing_db.o
--PRINTBACKEND_OBJ = printing/printing.o printing/nt_printing.o $(PRINTBASE_OBJ)
-+PRINTBASE_OBJ = $(if $(OWRT_NO_PRINTING),,printing/notify.o printing/printing_db.o)
-+PRINTBACKEND_OBJ = $(if $(OWRT_NO_PRINTING),,printing/printing.o printing/nt_printing.o $(PRINTBASE_OBJ))
- 
- SMBD_OBJ = $(SMBD_OBJ_BASE) $(SMBD_OBJ_MAIN)
- NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \