samba-ads: Upgrade from 3.3.0 to 3.3.9 to benefit from various fixes

There were certain but bugs that were fixed between 3.3.0
and 3.3.8, it makes sense to upgrade to this version.

diff --git a/recipes/samba/samba-ads-3.3.0/wbstatic.patch b/recipes/samba/samba-ads-3.3.0/wbstatic.patch
deleted file mode 100644 (file)
index 1d2260c..0000000
--- a/recipes/samba/samba-ads-3.3.0/wbstatic.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -urN source.old//Makefile.in source//Makefile.in
---- source.old//Makefile.in    2009-01-26 13:56:34.000000000 +0000
-+++ source//Makefile.in        2009-02-13 22:53:43.197061293 +0000
-@@ -690,7 +690,7 @@
-               $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-               $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
-               $(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
--              $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) @LIBWBCLIENT_STATIC@ \
-+              $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) bin/libwbclient.a \
-               $(LIBSMBCONF_OBJ) \
-               $(PRIVILEGES_BASIC_OBJ)
- 
-@@ -725,7 +725,7 @@
-            web/swat.o web/neg_lang.o
- 
- SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_OBJ) \
--         $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(KRBCLIENT_OBJ) \
-+         $(LOCKING_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(KRBCLIENT_OBJ) \
-          $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
-          $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
-            $(PASSCHANGE_OBJ) $(LDB_OBJ)
-@@ -745,7 +745,7 @@
-            $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-              rpc_client/cli_pipe.o librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \
-              $(RPC_CLIENT_OBJ1) \
--           $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
-+           $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
-            $(LIBMSRPC_GEN_OBJ)
- 
- TESTPARM_OBJ = utils/testparm.o \
-@@ -755,18 +755,18 @@
- PASSWD_UTIL_OBJ = utils/passwd_util.o
- 
- SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
--              $(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
-+              $(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \
-               $(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
-               $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) \
-               $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ)
- 
--PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
-+PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \
-               $(LIBSAMBA_OBJ) \
-               $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
-               $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
-               $(LDB_OBJ)
- 
--SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-+SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) bin/libwbclient.a
- 
- DISPLAY_SEC_OBJ= lib/display_sec.o
- 
-@@ -782,7 +782,7 @@
- 
- RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
-              $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
--             $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
-+             $(RPC_PARSE_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
-              $(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
-            $(LIBADS_OBJ) $(POPT_LIB_OBJ) \
-            $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) 
-@@ -810,7 +810,7 @@
-                   $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-                   $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
- 
--LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-+LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) bin/libwbclient.a
- 
- # This shared library is intended for linking with unit test programs
- # to test Samba internals.  It's called libbigballofmud.so to
-@@ -819,7 +819,7 @@
- LIBBIGBALLOFMUD_MAJOR = 0
- 
- LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
--      $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
-+      $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \
-       $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
- 
- CLIENT_OBJ1 = client/client.o client/clitar.o rpc_client/cli_pipe.o \
-@@ -831,7 +831,7 @@
- CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-            $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
-              $(READLINE_OBJ) $(POPT_LIB_OBJ) \
--             $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-+             $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-            $(DISPLAY_SEC_OBJ)
- 
- LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \
-@@ -886,7 +886,7 @@
-         $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
-         $(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
-         $(LIBSMBCONF_OBJ) \
--        @LIBWBCLIENT_STATIC@ \
-+        bin/libwbclient.a \
-         $(PRIVILEGES_BASIC_OBJ)
- 
- CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
-@@ -926,7 +926,7 @@
-                $(LIBNDR_GEN_OBJ0)
- 
- PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
--              $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
-+              $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \
-               $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ) \
-               $(LIBNDR_GEN_OBJ0)
- 
-@@ -942,14 +942,14 @@
- 
- SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
-               $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
--              $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+              $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-               $(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
- 
- SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-               $(PARAM_OBJ) \
-               $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
-               $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \
--              $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
-+              $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
- 
- EVTLOGADM_OBJ0        = utils/eventlogadm.o
- 
-@@ -988,7 +988,7 @@
- 
- PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
-               pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
--PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
-+PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \
-               $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
-               $(LDB_OBJ)
- 
-@@ -1036,7 +1036,7 @@
-               smbd/connection.o
- 
- WINBINDD_OBJ = \
--              $(WINBINDD_OBJ1) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
-+              $(WINBINDD_OBJ1) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \
-               $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-               $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-               $(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
-@@ -1047,7 +1047,7 @@
- 
- WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-               $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
--              lib/winbind_util.o $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@
-+              lib/winbind_util.o $(WBCOMMON_OBJ) bin/libwbclient.a
- 
- WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
- 
-@@ -1111,7 +1111,7 @@
-               $(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
-               $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-               $(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
--              $(LDB_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
-+              $(LDB_OBJ) $(WBCOMMON_OBJ) bin/libwbclient.a \
-               $(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1)
- 
- 
-@@ -1120,14 +1120,14 @@
- VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-         $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
-         $(READLINE_OBJ) $(POPT_LIB_OBJ) \
--        $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-+        $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-         $(DISPLAY_SEC_OBJ)
- 
- RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
-                  $(LIBSMB_OBJ) \
-                  $(PARAM_OBJ) \
-                  $(PASSDB_OBJ) \
--                 @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
-+                 bin/libwbclient.a $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
-                  $(LIB_NONSMBD_OBJ) \
-                  $(KRBCLIENT_OBJ) \
-                  $(RPC_PARSE_OBJ2) \
-@@ -1743,7 +1743,7 @@
- LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
- LIBWBCLIENT_SHARED_TARGET_SONAME=$(LIBWBCLIENT_SHARED_TARGET).$(LIBWBCLIENT_SOVER)
- LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
--LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
-+LIBWBCLIENT=bin/libwbclient.a @LIBWBCLIENT_SHARED@
- LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@
- LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
- 
-@@ -1880,7 +1880,7 @@
-                $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
-                $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-                $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
--               $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-+               $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-                $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \
-                auth/token_util.o
- 

diff --git a/recipes/samba/samba-ads_3.3.0.bb b/recipes/samba/samba-ads_3.3.9.bb
similarity index 88%
rename from recipes/samba/samba-ads_3.3.0.bb
rename to recipes/samba/samba-ads_3.3.9.bb
index e5184cf..4b2e365 100644 (file)
--- a/recipes/samba/samba-ads_3.3.0.bb
+++ b/recipes/samba/samba-ads_3.3.9.bb
@@ -8,7 +8,6 @@ SRC_URI += "file://config-lfs.patch;patch=1 \
             file://configure-3.3.0.patch;patch=1 \
             file://config-h.patch;patch=1 \
             file://mtab.patch;patch=1 \
-            file://wbstatic.patch;patch=1 \
                "
 
 do_compile () {