From c37eda5f2847e0e251d4e8ef560d7a42f1fe0c4c Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Sun, 14 Jul 2019 14:57:44 +0200 Subject: [PATCH] samba4: add libreadline dep, cleanup old patches * add missing libreadline dep * remove old patches Signed-off-by: Andy Walsh --- net/samba4/Makefile | 4 +- ...rt-target-module-while-cross-compile.patch | 56 ------------------- ...102-samba-4.8.2-unbundle-libreadline.patch | 21 ------- ... => 102-samba-4.8.5-unbundle-libbsd.patch} | 0 ...ix.patch => 103-tmsize-overflow-fix.patch} | 0 5 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 net/samba4/patches/100-do-not-import-target-module-while-cross-compile.patch delete mode 100644 net/samba4/patches/102-samba-4.8.2-unbundle-libreadline.patch rename net/samba4/patches/{103-samba-4.8.5-unbundle-libbsd.patch => 102-samba-4.8.5-unbundle-libbsd.patch} (100%) rename net/samba4/patches/{104-tmsize-overflow-fix.patch => 103-tmsize-overflow-fix.patch} (100%) diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 86c7641ec..52a15485e 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=samba PKG_VERSION:=4.10.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-3.0-only @@ -58,7 +58,7 @@ endef define Package/samba4-libs $(call Package/samba4/Default) TITLE+= libs - DEPENDS:= +zlib +libtirpc +libpopt +libcomerr +libtasn1 +libopenssl \ + DEPENDS:= +zlib +libtirpc +libpopt +libcomerr +libtasn1 +libopenssl +libreadline \ +PACKAGE_libcap:libcap +PACKAGE_libpthread:libpthread +PACKAGE_libnettle:libnettle \ +PACKAGE_libgcrypt:libgcrypt +PACKAGE_libpam:libpam +PACKAGE_dbus:dbus +PACKAGE_libavahi-client:libavahi-client \ +SAMBA4_SERVER_VFS:attr \ diff --git a/net/samba4/patches/100-do-not-import-target-module-while-cross-compile.patch b/net/samba4/patches/100-do-not-import-target-module-while-cross-compile.patch deleted file mode 100644 index 6f30e44dd..000000000 --- a/net/samba4/patches/100-do-not-import-target-module-while-cross-compile.patch +++ /dev/null @@ -1,56 +0,0 @@ -Some modules such as dynamic library maybe cann't be imported while cross compile, -we just check whether does the module exist. - -Signed-off-by: Bian Naimeng - ---- a/buildtools/wafsamba/samba_bundled.py -+++ b/buildtools/wafsamba/samba_bundled.py -@@ -2,6 +2,7 @@ - - import sys - from waflib import Build, Options, Logs -+import imp, os - from waflib.Configure import conf - from wafsamba import samba_utils - -@@ -249,17 +250,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li - # versions - minversion = minimum_library_version(conf, libname, minversion) - -- try: -- m = __import__(modulename) -- except ImportError: -- found = False -- else: -+ # Find module in PYTHONPATH -+ stuff = imp.find_module(modulename, [os.environ["PYTHONPATH"]]) -+ if stuff: - try: -- version = m.__version__ -- except AttributeError: -+ m = imp.load_module(modulename, stuff[0], stuff[1], stuff[2]) -+ except ImportError: - found = False -+ -+ if conf.env.CROSS_COMPILE: -+ # Some modules such as dynamic library maybe cann't be imported -+ # while cross compile, we just check whether the module exist -+ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (stuff[1])) -+ found = True - else: -- found = tuplize_version(version) >= tuplize_version(minversion) -+ try: -+ version = m.__version__ -+ except AttributeError: -+ found = False -+ else: -+ found = tuplize_version(version) >= tuplize_version(minversion) -+ finally: -+ if stuff[0]: -+ stuff[0].close() -+ else: -+ found = False -+ - if not found and not conf.LIB_MAY_BE_BUNDLED(libname): - Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) - sys.exit(1) diff --git a/net/samba4/patches/102-samba-4.8.2-unbundle-libreadline.patch b/net/samba4/patches/102-samba-4.8.2-unbundle-libreadline.patch deleted file mode 100644 index e164d56f5..000000000 --- a/net/samba4/patches/102-samba-4.8.2-unbundle-libreadline.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/libcli/smbreadline/wscript_configure -+++ b/libcli/smbreadline/wscript_configure -@@ -1,11 +1,13 @@ - #!/usr/bin/env python - - --conf.CHECK_HEADERS('readline.h history.h readline/readline.h readline/history.h') --for termlib in ['ncurses', 'curses', 'termcap', 'terminfo', 'termlib', 'tinfo']: -- if conf.CHECK_FUNCS_IN('tgetent', termlib): -- conf.env['READLINE_TERMLIB'] = termlib -- break -+#conf.CHECK_HEADERS('readline.h history.h readline/readline.h readline/history.h') -+#for termlib in ['ncurses', 'curses', 'termcap', 'terminfo', 'termlib', 'tinfo']: -+# if conf.CHECK_FUNCS_IN('tgetent', termlib): -+# conf.env['READLINE_TERMLIB'] = termlib -+# break -+ -+conf.undefine('HAVE_READLINE_READLINE_H') - - # - # Check if we need to work around readline/readline.h diff --git a/net/samba4/patches/103-samba-4.8.5-unbundle-libbsd.patch b/net/samba4/patches/102-samba-4.8.5-unbundle-libbsd.patch similarity index 100% rename from net/samba4/patches/103-samba-4.8.5-unbundle-libbsd.patch rename to net/samba4/patches/102-samba-4.8.5-unbundle-libbsd.patch diff --git a/net/samba4/patches/104-tmsize-overflow-fix.patch b/net/samba4/patches/103-tmsize-overflow-fix.patch similarity index 100% rename from net/samba4/patches/104-tmsize-overflow-fix.patch rename to net/samba4/patches/103-tmsize-overflow-fix.patch