[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  26007a8 wafsamba: allow certain public libraries to be forced to be private
       via  18e8d49 libwbclient: bump version to 0.9, and add this version to .pc file
      from  4b29cf5 Move kdc_get_policy helper in the lsa server where it belongs.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 26007a89174760a830ba96cc1ee43ca8a958e986
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 19 15:34:48 2012 +1000

    wafsamba: allow certain public libraries to be forced to be private
    
    This will help installations where the Samba4 libraries must be used but
    the main system is not using the system libs that would normally
    be installed.  This in particular impacts on libwbclient, which is a
    core dep, but is different to that used by the rest of a Samba 3.x based
    system.
    
    Use eg:  ./configure --private-libraries=wbclient
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Fri Apr 20 03:27:22 CEST 2012 on sn-devel-104

commit 18e8d49d7e1adecb09fce63d266197da0d3b0f9e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 19 14:59:43 2012 +1000

    libwbclient: bump version to 0.9, and add this version to .pc file

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_bundled.py |    4 ++++
 buildtools/wafsamba/wafsamba.py      |    3 +++
 buildtools/wafsamba/wscript          |    5 +++++
 nsswitch/libwbclient/wbclient.h      |    3 ++-
 nsswitch/libwbclient/wscript         |    7 +++++--
 5 files changed, 19 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index c5b4022..1a5d565 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -81,6 +81,10 @@ def LIB_MUST_BE_BUNDLED(conf, libname):
     return ('ALL' in conf.env.BUNDLED_LIBS or 
             libname in conf.env.BUNDLED_LIBS)
 
+ at conf
+def LIB_MUST_BE_PRIVATE(conf, libname):
+    return ('ALL' in conf.env.PRIVATE_LIBS or
+            libname in conf.env.PRIVATE_LIBS)
 
 @conf
 def CHECK_PREREQUISITES(conf, prereqs):
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 317bca1..534bace 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -132,6 +132,9 @@ def SAMBA_LIBRARY(bld, libname, source,
                   enabled=True):
     '''define a Samba library'''
 
+    if LIB_MUST_BE_PRIVATE(bld, libname):
+        private_library=True
+
     if not enabled:
         SET_TARGET_TYPE(bld, libname, 'DISABLED')
         return
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index ff18777..4db3412 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -27,6 +27,10 @@ def set_options(opt):
                    help=("comma separated list of bundled libraries. May include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]"),
                    action="store", dest='BUNDLED_LIBS', default='')
 
+    gr.add_option('--private-libraries',
+                   help=("comma separated list of normally public libraries to build instead as private libraries. May include !LIBNAME to disable making a library private. Can be 'NONE' or 'ALL' [auto]"),
+                   action="store", dest='PRIVATE_LIBS', default='')
+
     extension_default = Options.options['PRIVATE_EXTENSION_DEFAULT']
     gr.add_option('--private-library-extension',
                    help=("name extension for private libraries [%s]" % extension_default),
@@ -233,6 +237,7 @@ def configure(conf):
     conf.env.MODULESDIR = Options.options.MODULESDIR
     conf.env.PRIVATELIBDIR = Options.options.PRIVATELIBDIR
     conf.env.BUNDLED_LIBS = Options.options.BUNDLED_LIBS.split(',')
+    conf.env.PRIVATE_LIBS = Options.options.PRIVATE_LIBS.split(',')
     conf.env.BUILTIN_LIBRARIES = Options.options.BUILTIN_LIBRARIES.split(',')
     conf.env.DISABLE_SHARED = Options.options.disable_shared
     conf.env.NONSHARED_BINARIES = Options.options.NONSHARED_BINARIES.split(',')
diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
index 809e00a..1dd387a 100644
--- a/nsswitch/libwbclient/wbclient.h
+++ b/nsswitch/libwbclient/wbclient.h
@@ -68,9 +68,10 @@ const char *wbcErrorString(wbcErr error);
  *  0.6: Made struct wbcInterfaceDetails char* members non-const
  *  0.7: Added wbcSidToStringBuf()
  *  0.8: Added wbcSidsToUnixIds() and wbcLookupSids()
+ *  0.9: Added support for WBC_ID_TYPE_BOTH
  **/
 #define WBCLIENT_MAJOR_VERSION 0
-#define WBCLIENT_MINOR_VERSION 8
+#define WBCLIENT_MINOR_VERSION 9
 #define WBCLIENT_VENDOR_VERSION "Samba libwbclient"
 struct wbcLibraryDetails {
 	uint16_t major_version;
diff --git a/nsswitch/libwbclient/wscript b/nsswitch/libwbclient/wscript
index 8390af1..f51c3d0 100644
--- a/nsswitch/libwbclient/wscript
+++ b/nsswitch/libwbclient/wscript
@@ -2,8 +2,11 @@
 
 import Options, Logs
 
+# Remember to also update wbclient.h
+VERSION="0.9"
+
 def configure(conf):
-    if conf.CHECK_BUNDLED_SYSTEM_PKG('wbclient', minversion='0'):
+    if conf.CHECK_BUNDLED_SYSTEM_PKG('wbclient', minversion=VERSION):
         conf.define('USING_SYSTEM_LIBWBCLIENT', 1)
 
 def build(bld):
@@ -25,4 +28,4 @@ def build(bld):
                       deps='winbind-client',
                       pc_files='wbclient.pc',
                       public_headers='wbclient.h',
-                      vnum='0')
+                      vnum=VERSION)


-- 
Samba Shared Repository