diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-05-01 13:47:41 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-05-01 13:47:48 -0500 |
| commit | a797fbeb4d82187d10df431c6e5a3dc0a33e5b35 (patch) | |
| tree | 47438ff0f447b55c8fcd267286fad7ccec4d27f1 /package | |
| parent | e553b50c7e7b74c8bf5457e625f0875134b38e68 (diff) | |
use embedded heimdal and bundled com_err
Diffstat (limited to 'package')
| -rw-r--r-- | package/samba/Makefile | 4 | ||||
| -rw-r--r-- | package/samba/patches/patch-wscript_build | 22 |
2 files changed, 24 insertions, 2 deletions
diff --git a/package/samba/Makefile b/package/samba/Makefile index 508b7a9d6..e37e0f979 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= samba PKG_VERSION:= 4.2.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_HASH:= 37eaa239c116dc2c22c29c5a2931eb178ed22e48b594687247446703119b4ac3 PKG_DESCR:= file and print server PKG_SECTION:= net/fs @@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --enable-fhs \ --disable-cups \ --disable-avahi \ --disable-rpath \ - --bundled-libraries='!asn1_compile,!compile_et' \ + --bundled-libraries='com_err,!asn1_compile,!compile_et' \ --disable-rpath-install CONFIGURE_ENV+= PYTHON_CONFIG="$(STAGING_TARGET_DIR)/usr/bin/python-config" \ python_LDFLAGS="" \ diff --git a/package/samba/patches/patch-wscript_build b/package/samba/patches/patch-wscript_build new file mode 100644 index 000000000..ec7527dd8 --- /dev/null +++ b/package/samba/patches/patch-wscript_build @@ -0,0 +1,22 @@ +--- samba-4.2.1.orig/wscript_build 2014-12-20 09:07:55.000000000 -0600 ++++ samba-4.2.1/wscript_build 2015-04-30 23:51:25.915427028 -0500 +@@ -123,18 +123,7 @@ bld.RECURSE('libcli/samsync') + bld.RECURSE('libcli/registry') + bld.RECURSE('source4/lib/policy') + bld.RECURSE('libcli/named_pipe_auth') +- +-if bld.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'): +- if bld.CONFIG_GET("HEIMDAL_KRB5_CONFIG") and bld.CONFIG_GET("USING_SYSTEM_KRB5"): +- # When both HEIMDAL_KRB5_CONFIG and KRB5_CONFIG are set and not equal, +- # it means one is Heimdal-specific (krb5-config.heimdal, for example) +- # and there is system heimdal +- bld.PROCESS_SEPARATE_RULE('system_heimdal') +- else: +- bld.PROCESS_SEPARATE_RULE('embedded_heimdal') +-else: +- bld.PROCESS_SEPARATE_RULE('system_mitkrb5') +- ++bld.PROCESS_SEPARATE_RULE('embedded_heimdal') + bld.RECURSE('libcli/smbreadline') + bld.RECURSE('codepages') + if bld.AD_DC_BUILD_IS_ENABLED(): |