cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

samba4: add package samba-4.8

Browse Source 
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
This commit is contained in:
Andy Walsh
2018-01-31 14:17:11 +01:00
parent 4529584690
commit 0d23c9f2ea
16 changed files with 1203 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/samba4/patches/001-samba-4.4.0-pam.patch
+29
View File
@@ -0,0 +1,29 @@
--- samba-4.4.0rc2/source3/wscript
+++ samba-4.4.0rc2/source3/wscript
@@ -870,7 +870,7 @@
if conf.env.with_iconv:
conf.DEFINE('HAVE_ICONV', 1)
- if Options.options.with_pam:
+ if Options.options.with_pam != False:
use_pam=True
conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
@@ -943,6 +943,17 @@
conf.DEFINE('WITH_PAM', 1)
conf.DEFINE('WITH_PAM_MODULES', 1)
+ else:
+ Logs.warn("PAM disabled")
+ use_pam=False
+ conf.undefine('WITH_PAM')
+ conf.undefine('WITH_PAM_MODULES')
+ conf.undefine('HAVE_SECURITY_PAM_APPL_H')
+ conf.undefine('PAM_RHOST')
+ conf.undefine('PAM_TTY')
+ conf.undefine('HAVE_PAM_PAM_APPL_H')
+
+
seteuid = False
#
net/samba4/patches/002-dnsserver-4.7.0.patch
+19
View File
@@ -0,0 +1,19 @@
samba: build dnsserver_common code
Just 'install' does not seem to do it.
Upstream-Status: Pending
Signed-off-by: Joe Slater <joe.slater@windriver.com>
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('dnsserver_common',
source='dnsserver_common.c',
deps='samba-util samba-errors ldbsamba clidns',
private_library=True,
- install=bld.AD_DC_BUILD_IS_ENABLED()
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
)
bld.SAMBA_MODULE('service_dns',
net/samba4/patches/010-source3-msgsock-nvram-fix.patch
+20
View File
@@ -0,0 +1,20 @@
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -221,7 +221,7 @@ struct messaging_context *messaging_init
return NULL;
}
- priv_path = private_path("msg.sock");
+ priv_path = lock_path("msg.sock");
if (priv_path == NULL) {
TALLOC_FREE(ctx);
return NULL;
@@ -311,7 +311,7 @@ NTSTATUS messaging_reinit(struct messagi
msg_ctx->msg_dgm_ref = messaging_dgm_ref(
msg_ctx, msg_ctx->event_ctx, &msg_ctx->id.unique_id,
- private_path("msg.sock"), lck_path,
+ lock_path("msg.sock"), lck_path,
messaging_recv_cb, msg_ctx, &ret);
if (msg_ctx->msg_dgm_ref == NULL) {
net/samba4/patches/011-source4-msgsock-nvram-fix.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -323,7 +323,7 @@ struct imessaging_context *imessaging_in
goto fail;
}
- msg->sock_dir = lpcfg_private_path(msg, lp_ctx, "msg.sock");
+ msg->sock_dir = lpcfg_lock_path(msg, lp_ctx, "msg.sock");
if (msg->sock_dir == NULL) {
goto fail;
}
net/samba4/patches/100-do-not-import-target-module-while-cross-compile.patch
+58
View File
@@ -0,0 +1,58 @@
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 <biannm@cn.fujitsu.com>
Index: samba-4.4.2/buildtools/wafsamba/samba_bundled.py
===================================================================
--- samba-4.4.2.orig/buildtools/wafsamba/samba_bundled.py
+++ samba-4.4.2/buildtools/wafsamba/samba_bundled.py
@@ -2,6 +2,7 @@
import sys
import Build, Options, Logs
+import imp, os
from Configure import conf
from samba_utils import TO_LIST
@@ -230,17 +231,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)
net/samba4/patches/101-do-not-check-xsltproc-manpages.patch
+43
View File
@@ -0,0 +1,43 @@
Don't check xsltproc manpages
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
Index: samba-4.4.2/lib/ldb/wscript
===================================================================
--- samba-4.4.2.orig/lib/ldb/wscript
+++ samba-4.4.2/lib/ldb/wscript
@@ -65,7 +65,7 @@ def configure(conf):
conf.define('USING_SYSTEM_LDB', 1)
if conf.env.standalone_ldb:
- conf.CHECK_XSLTPROC_MANPAGES()
+ #conf.CHECK_XSLTPROC_MANPAGES()
# we need this for the ldap backend
if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
Index: samba-4.4.2/lib/talloc/wscript
===================================================================
--- samba-4.4.2.orig/lib/talloc/wscript
+++ samba-4.4.2/lib/talloc/wscript
@@ -56,7 +56,7 @@ def configure(conf):
if conf.env.standalone_talloc:
conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
- conf.CHECK_XSLTPROC_MANPAGES()
+ #conf.CHECK_XSLTPROC_MANPAGES()
if not conf.env.disable_python:
# also disable if we don't have the python libs installed
Index: samba-4.4.2/lib/tdb/wscript
===================================================================
--- samba-4.4.2.orig/lib/tdb/wscript
+++ samba-4.4.2/lib/tdb/wscript
@@ -92,7 +92,7 @@ def configure(conf):
not conf.env.disable_tdb_mutex_locking):
conf.define('USE_TDB_MUTEX_LOCKING', 1)
- conf.CHECK_XSLTPROC_MANPAGES()
+ #conf.CHECK_XSLTPROC_MANPAGES()
if not conf.env.disable_python:
# also disable if we don't have the python libs installed
net/samba4/patches/102-samba-4.8.2-unbundle-libreadline.patch
+21
View File
@@ -0,0 +1,21 @@
--- 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