openkylin
/
samba
mirror of https://gitee.com/openkylin/samba.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 02:51:19 +08:00
parent 237c5c882b
commit 9355400977
14 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/patches/07_private_lib vendored
View File

@ -1,4 +1,5 @@
From: Jelmer Vernooij <jelmer@samba.org> From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: Always specify rpath for private libraries Subject: Always specify rpath for private libraries
Last-Update: 2012-02-24 Last-Update: 2012-02-24
@ -8,10 +9,10 @@ Applied-Upstream: no
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 0f95c12..f4bbf6c 100644 index ad97de1..67bc4fa 100644
--- a/buildtools/wafsamba/samba_utils.py --- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py
@@ -64,7 +64,7 @@ def install_rpath(target): @@ -126,7 +126,7 @@ def install_rpath(target):
ret = set() ret = set()
if bld.env.RPATH_ON_INSTALL: if bld.env.RPATH_ON_INSTALL:
ret.add(bld.EXPAND_VARIABLES(bld.env.LIBDIR)) ret.add(bld.EXPAND_VARIABLES(bld.env.LIBDIR))

1
debian/patches/README_nosmbldap-tools.patch vendored
View File

@ -1,4 +1,5 @@
From: Christian Perrier <bubulle@debian.org> From: Christian Perrier <bubulle@debian.org>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: Mention smbldap-tools package in examples/LDAP/README Subject: Mention smbldap-tools package in examples/LDAP/README
Bug-Debian: http://bugs.debian.org/341934 Bug-Debian: http://bugs.debian.org/341934

5
debian/patches/VERSION.patch vendored
View File

@ -1,4 +1,5 @@
From: Eloy A. Paris <peloy@debian.org> From: "Eloy A. Paris" <peloy@debian.org>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: Add "Ubuntu" as vendor suffix Subject: Add "Ubuntu" as vendor suffix
Forwarded: not-needed Forwarded: not-needed
@ -7,7 +8,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION b/VERSION diff --git a/VERSION b/VERSION
index d91963a..2650887 100644 index c07b1d1..8439f4a 100644
--- a/VERSION --- a/VERSION
+++ b/VERSION +++ b/VERSION
@@ -123,5 +123,5 @@ SAMBA_VERSION_RELEASE_NICKNAME= @@ -123,5 +123,5 @@ SAMBA_VERSION_RELEASE_NICKNAME=

5
debian/patches/add-so-version-to-private-libraries vendored
View File

@ -1,4 +1,5 @@
From: Jeroen Dekkers <jeroen@dekkers.ch> From: Jeroen Dekkers <jeroen@dekkers.ch>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: Add so version number to private libraries for dpkg-shlibdeps Subject: Add so version number to private libraries for dpkg-shlibdeps
We also want dpkg-shlibdeps to generate correct dependency information We also want dpkg-shlibdeps to generate correct dependency information
@ -12,10 +13,10 @@ Forwarded: not-needed
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1bdabf6..008a214 100644 index 205d5b4..996a922 100644
--- a/buildtools/wafsamba/wafsamba.py --- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py
@@ -232,6 +232,9 @@ def SAMBA_LIBRARY(bld, libname, source, @@ -223,6 +223,9 @@ def SAMBA_LIBRARY(bld, libname, source,
raise Errors.WafError("public library '%s' must have header files" % raise Errors.WafError("public library '%s' must have header files" %
libname) libname)

3
debian/patches/bug_221618_precise-64bit-prototype.patch vendored
View File

@ -1,4 +1,5 @@
From: Christian Perrier <bubulle@debian.org> From: Christian Perrier <bubulle@debian.org>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: 64 bit fix for libsmbclient Subject: 64 bit fix for libsmbclient
Bug-Debian: http://bugs.debian.org/221618 Bug-Debian: http://bugs.debian.org/221618
@ -8,7 +9,7 @@ Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=221618#27
1 file changed, 10 insertions(+) 1 file changed, 10 insertions(+)
diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index cf67b1d..ff9ed53 100644 index b045221..53febba 100644
--- a/source3/include/libsmbclient.h --- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h +++ b/source3/include/libsmbclient.h
@@ -80,6 +80,16 @@ extern "C" { @@ -80,6 +80,16 @@ extern "C" {

12
debian/patches/build-Remove-tests-for-getdents-and-getdirentries.patch vendored
View File

@ -1,4 +1,3 @@
From f3b77f815ed9bba8e0969ecc8b359f6721210146 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org> From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Sep 2019 07:39:09 +1200 Date: Fri, 6 Sep 2019 07:39:09 +1200
Subject: [PATCH] build: Remove tests for getdents() and getdirentries() Subject: [PATCH] build: Remove tests for getdents() and getdirentries()
@ -24,10 +23,10 @@ Forwarded: https://gitlab.com/samba-team/samba/commit/16eb80058ca4a34df96388c267
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/replace/wscript b/lib/replace/wscript diff --git a/lib/replace/wscript b/lib/replace/wscript
index 4df1b4d77c4..fcdee8933d8 100644 index 56e2a22..fd06350 100644
--- a/lib/replace/wscript --- a/lib/replace/wscript
+++ b/lib/replace/wscript +++ b/lib/replace/wscript
@@ -421,7 +421,7 @@ def configure(conf): @@ -446,7 +446,7 @@ def configure(conf):
define = 'HAVE_BSD_STRTOLL', define = 'HAVE_BSD_STRTOLL',
) )
conf.CHECK_FUNCS('if_nametoindex strerror_r') conf.CHECK_FUNCS('if_nametoindex strerror_r')
@ -37,10 +36,10 @@ index 4df1b4d77c4..fcdee8933d8 100644
conf.CHECK_FUNCS('timegm getifaddrs freeifaddrs mmap setgroups syscall setsid') conf.CHECK_FUNCS('timegm getifaddrs freeifaddrs mmap setgroups syscall setsid')
conf.CHECK_FUNCS('getgrent_r getgrgid_r getgrnam_r getgrouplist getpagesize') conf.CHECK_FUNCS('getgrent_r getgrgid_r getgrnam_r getgrouplist getpagesize')
diff --git a/source3/wscript b/source3/wscript diff --git a/source3/wscript b/source3/wscript
index 4a3e75605e7..8fd759707ee 100644 index 7b257bc..b2a72cd 100644
--- a/source3/wscript --- a/source3/wscript
+++ b/source3/wscript +++ b/source3/wscript
@@ -392,7 +392,7 @@ __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync @@ -391,7 +391,7 @@ __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync
_fork __fork fseeko _fork __fork fseeko
_fstat __fstat fsync _fstat __fstat fsync
futimens futimes __fxstat getauthuid futimens futimes __fxstat getauthuid
@ -49,6 +48,3 @@ index 4a3e75605e7..8fd759707ee 100644
getgrent getgrnam getgrouplist getgrset getmntent getpagesize getgrent getgrnam getgrouplist getgrset getmntent getpagesize
getpwanam getpwent_r getrlimit getpwanam getpwent_r getrlimit
glob grantpt hstrerror initgroups innetgr glob grantpt hstrerror initgroups innetgr
--
2.20.1

10
debian/patches/ctdb-config-enable-syslog-by-default.patch vendored
View File

@ -1,5 +1,8 @@
ctdb-config: enable syslog by default From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: ctdb-config-enable-syslog-by-default
ctdb-config: enable syslog by default
CTDB uses /var/log/ctdb/ directory for the default log files. With CTDB uses /var/log/ctdb/ directory for the default log files. With
syslog disabled, systemd journal is not able to correctly inform syslog disabled, systemd journal is not able to correctly inform
errors happening during service initialization. errors happening during service initialization.
@ -28,7 +31,7 @@ Last-Update: 2018-06-27
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ctdb/config/ctdb.conf b/ctdb/config/ctdb.conf diff --git a/ctdb/config/ctdb.conf b/ctdb/config/ctdb.conf
index 5440600a4..cde24280e 100644 index 5440600..cde2428 100644
--- a/ctdb/config/ctdb.conf --- a/ctdb/config/ctdb.conf
+++ b/ctdb/config/ctdb.conf +++ b/ctdb/config/ctdb.conf
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
@ -44,6 +47,3 @@ index 5440600a4..cde24280e 100644
[cluster] [cluster]
# Shared recovery lock file to avoid split brain. Daemon # Shared recovery lock file to avoid split brain. Daemon
--
2.20.1

20
debian/patches/fix-nfs-service-name-to-nfs-kernel-server.patch vendored
View File

@ -1,4 +1,5 @@
From: Rafael David Tinoco <rafaeldtinoco@gmail.com> From: Rafael David Tinoco <rafaeldtinoco@gmail.com>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: fix nfs related service names Subject: fix nfs related service names
Upstream defines nfs related service names based on the Linux Upstream defines nfs related service names based on the Linux
@ -7,8 +8,15 @@ distribution. This patch fixes the names for Debian and derivatives.
Bug-Debian: https://bugs.debian.org/929931 Bug-Debian: https://bugs.debian.org/929931
Bug-Ubuntu: https://bugs.launchpad.net/bugs/722201 Bug-Ubuntu: https://bugs.launchpad.net/bugs/722201
Last-Update: 2018-08-05 Last-Update: 2018-08-05
---
ctdb/config/events/legacy/06.nfs.script | 2 +-
ctdb/config/events/legacy/60.nfs.script | 4 ++--
ctdb/config/nfs-linux-kernel-callout | 10 +++++++++-
ctdb/config/statd-callout | 2 +-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ctdb/config/events/legacy/06.nfs.script b/ctdb/config/events/legacy/06.nfs.script diff --git a/ctdb/config/events/legacy/06.nfs.script b/ctdb/config/events/legacy/06.nfs.script
index 97086f78ed0..7b7614228a5 100755 index 97086f7..7b76142 100755
--- a/ctdb/config/events/legacy/06.nfs.script --- a/ctdb/config/events/legacy/06.nfs.script
+++ b/ctdb/config/events/legacy/06.nfs.script +++ b/ctdb/config/events/legacy/06.nfs.script
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
@ -21,7 +29,7 @@ index 97086f78ed0..7b7614228a5 100755
load_script_options "service" "60.nfs" load_script_options "service" "60.nfs"
diff --git a/ctdb/config/events/legacy/60.nfs.script b/ctdb/config/events/legacy/60.nfs.script diff --git a/ctdb/config/events/legacy/60.nfs.script b/ctdb/config/events/legacy/60.nfs.script
index 2eb90b421c8..5c6a0903322 100755 index 2eb90b4..5c6a090 100755
--- a/ctdb/config/events/legacy/60.nfs.script --- a/ctdb/config/events/legacy/60.nfs.script
+++ b/ctdb/config/events/legacy/60.nfs.script +++ b/ctdb/config/events/legacy/60.nfs.script
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
@ -37,7 +45,7 @@ index 2eb90b421c8..5c6a0903322 100755
load_script_options load_script_options
diff --git a/ctdb/config/nfs-linux-kernel-callout b/ctdb/config/nfs-linux-kernel-callout diff --git a/ctdb/config/nfs-linux-kernel-callout b/ctdb/config/nfs-linux-kernel-callout
index 71d8ecf8074..9c698f5ad91 100755 index 71d8ecf..44244fc 100755
--- a/ctdb/config/nfs-linux-kernel-callout --- a/ctdb/config/nfs-linux-kernel-callout
+++ b/ctdb/config/nfs-linux-kernel-callout +++ b/ctdb/config/nfs-linux-kernel-callout
@@ -14,7 +14,7 @@ nfs_exports_file="${CTDB_NFS_EXPORTS_FILE:-/var/lib/nfs/etab}" @@ -14,7 +14,7 @@ nfs_exports_file="${CTDB_NFS_EXPORTS_FILE:-/var/lib/nfs/etab}"
@ -49,7 +57,7 @@ index 71d8ecf8074..9c698f5ad91 100755
case "$nfs_distro_style" in case "$nfs_distro_style" in
systemd-*) systemd-*)
@@ -33,6 +33,14 @@ @@ -33,6 +33,14 @@ systemd-*)
;; ;;
*-debian) *-debian)
nfs_rquotad_service="quotarpc" nfs_rquotad_service="quotarpc"
@ -64,9 +72,11 @@ index 71d8ecf8074..9c698f5ad91 100755
;; ;;
*) *)
echo "Internal error" echo "Internal error"
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout
index b75135b..2d99278 100755
--- a/ctdb/config/statd-callout --- a/ctdb/config/statd-callout
+++ b/ctdb/config/statd-callout +++ b/ctdb/config/statd-callout
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@ die ()
} }
# Try different variables to find config file for NFS_HOSTNAME # Try different variables to find config file for NFS_HOSTNAME

9
debian/patches/heimdal-rfc3454.txt vendored
View File

@ -1,4 +1,5 @@
From: Brian May <bam@debian.org> From: Brian May <bam@debian.org>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: Patch in symbol table from rfc3454, for Heimdal scripts Subject: Patch in symbol table from rfc3454, for Heimdal scripts
Status: cherry-picked from heimdal package Status: cherry-picked from heimdal package
@ -7089,10 +7090,10 @@ index 0000000..5bef0b5
+ ----- End Table D.2 ----- + ----- End Table D.2 -----
+ +
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 2072be4..c93bdb8 100644 index 27adbc0..3d0bd52 100644
--- a/source4/heimdal_build/wscript_build --- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build
@@ -842,7 +842,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'): @@ -860,7 +860,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
HEIMDAL_GENERATOR( HEIMDAL_GENERATOR(
name="HEIMDAL_ERRORLIST", name="HEIMDAL_ERRORLIST",
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}' '${SRC[1].parent.abspath(env)}'", rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}' '${SRC[1].parent.abspath(env)}'",
@ -7101,7 +7102,7 @@ index 2072be4..c93bdb8 100644
target = '../heimdal/lib/wind/errorlist_table.c ../heimdal/lib/wind/errorlist_table.h' target = '../heimdal/lib/wind/errorlist_table.c ../heimdal/lib/wind/errorlist_table.h'
) )
@@ -864,7 +864,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'): @@ -882,7 +882,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
HEIMDAL_GENERATOR( HEIMDAL_GENERATOR(
name = 'HEIMDAL_BIDI_TABLE', name = 'HEIMDAL_BIDI_TABLE',
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}' '${SRC[1].parent.abspath(env)}'", rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}' '${SRC[1].parent.abspath(env)}'",
@ -7110,7 +7111,7 @@ index 2072be4..c93bdb8 100644
target = '../heimdal/lib/wind/bidi_table.h ../heimdal/lib/wind/bidi_table.c' target = '../heimdal/lib/wind/bidi_table.h ../heimdal/lib/wind/bidi_table.c'
) )
@@ -872,7 +872,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'): @@ -890,7 +890,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
HEIMDAL_GENERATOR( HEIMDAL_GENERATOR(
name = 'HEIMDAL_MAP_TABLE', name = 'HEIMDAL_MAP_TABLE',
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[2].abspath()}' '${SRC[2].parent.abspath(env)}'", rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[2].abspath()}' '${SRC[2].parent.abspath(env)}'",

3
debian/patches/smbclient-pager.patch vendored
View File

@ -1,4 +1,5 @@
From: Steve Langasek <vorlon@debian.org> From: Steve Langasek <vorlon@debian.org>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: Use the pager alternative as pager is PAGER is undefined Subject: Use the pager alternative as pager is PAGER is undefined
Bug-Debian: http://bugs.debian.org/135603 Bug-Debian: http://bugs.debian.org/135603
@ -8,7 +9,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source3/include/local.h b/source3/include/local.h diff --git a/source3/include/local.h b/source3/include/local.h
index 7f97d4e..60a00d1 100644 index 9ae1bcf..83d6194 100644
--- a/source3/include/local.h --- a/source3/include/local.h
+++ b/source3/include/local.h +++ b/source3/include/local.h
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@

6
debian/patches/smbd.service-Run-update-apparmor-samba-profile-befor.patch vendored
View File

@ -1,4 +1,3 @@
From 0ecd28ff3fd7f3d5c20705a2b8233fc8648cbf9c Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com> From: Mathieu Parent <math.parent@gmail.com>
Date: Thu, 21 Feb 2019 21:04:30 +0100 Date: Thu, 21 Feb 2019 21:04:30 +0100
Subject: [PATCH] smbd.service: Run update-apparmor-samba-profile before start Subject: [PATCH] smbd.service: Run update-apparmor-samba-profile before start
@ -9,7 +8,7 @@ Bug-Debian: https://bugs.debian.org/896080
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/packaging/systemd/smb.service.in b/packaging/systemd/smb.service.in diff --git a/packaging/systemd/smb.service.in b/packaging/systemd/smb.service.in
index 18912ef0e98..6bb24861682 100644 index 18912ef..6bb2486 100644
--- a/packaging/systemd/smb.service.in --- a/packaging/systemd/smb.service.in
+++ b/packaging/systemd/smb.service.in +++ b/packaging/systemd/smb.service.in
@@ -10,6 +10,7 @@ NotifyAccess=all @@ -10,6 +10,7 @@ NotifyAccess=all
@ -20,6 +19,3 @@ index 18912ef0e98..6bb24861682 100644
ExecStart=@SBINDIR@/smbd --foreground --no-process-group $SMBDOPTIONS ExecStart=@SBINDIR@/smbd --foreground --no-process-group $SMBDOPTIONS
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
LimitCORE=infinity LimitCORE=infinity
--
2.20.1

15
debian/patches/usershare.patch vendored
View File

@ -1,4 +1,5 @@
From: Mathias Gug <mathiaz@ubuntu.com>, Steve Langasek <vorlon@debian.org> From: "mathiaz@ubuntu.com" <mathiaz@ubuntu.com>
Date: Sat, 14 May 2022 02:51:19 +0800
Subject: Enable net usershares by default at build time Subject: Enable net usershares by default at build time
Enable net usershares by default at build time, with a limit of 100, and update Enable net usershares by default at build time, with a limit of 100, and update
@ -26,10 +27,10 @@ index 0d69bb8..e985857 100644
+<value type="default">100</value> +<value type="default">100</value>
</samba:parameter> </samba:parameter>
diff --git a/docs/manpages/net.8 b/docs/manpages/net.8 diff --git a/docs/manpages/net.8 b/docs/manpages/net.8
index 5d9a631..5c1c8c3 100644 index ef6bd74..80b7690 100644
--- a/docs/manpages/net.8 --- a/docs/manpages/net.8
+++ b/docs/manpages/net.8 +++ b/docs/manpages/net.8
@@ -1194,9 +1194,9 @@ Something we failed to parse\&. Default action is to "edit" it in interactive an @@ -1270,9 +1270,9 @@ Something we failed to parse\&. Default action is to "edit" it in interactive an
.RE .RE
.SS "USERSHARE" .SS "USERSHARE"
.PP .PP
@ -42,10 +43,10 @@ index 5d9a631..5c1c8c3 100644
The usershare commands are: The usershare commands are:
.RS 4 .RS 4
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index a221e87..c5367fd 100644 index 883d416..a447eb5 100644
--- a/lib/param/loadparm.c --- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c +++ b/lib/param/loadparm.c
@@ -2966,6 +2966,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) @@ -2985,6 +2985,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "init logon delay", "100"); lpcfg_do_global_parameter(lp_ctx, "init logon delay", "100");
@ -55,10 +56,10 @@ index a221e87..c5367fd 100644
lpcfg_do_global_parameter(lp_ctx, "-valid", "yes"); lpcfg_do_global_parameter(lp_ctx, "-valid", "yes");
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d5b1c56..5cd0a18 100644 index a8d5fdc..c21777b 100644
--- a/source3/param/loadparm.c --- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c +++ b/source3/param/loadparm.c
@@ -847,7 +847,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) @@ -850,7 +850,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
lpcfg_string_set(Globals.ctx, &Globals.usershare_path, s); lpcfg_string_set(Globals.ctx, &Globals.usershare_path, s);
TALLOC_FREE(s); TALLOC_FREE(s);
lpcfg_string_set(Globals.ctx, &Globals.usershare_template_share, ""); lpcfg_string_set(Globals.ctx, &Globals.usershare_template_share, "");

8
debian/patches/wscript-remove-all-checks-for-_FUNC-and-__FUNC.patch vendored
View File

@ -1,4 +1,3 @@
From c5239c6505545c4e686cf09f02c7f1fb4a39401f Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow@samba.org> From: Ralph Boehme <slow@samba.org>
Date: Mon, 30 Sep 2019 11:49:28 +0200 Date: Mon, 30 Sep 2019 11:49:28 +0200
Subject: [PATCH 1/2] wscript: remove all checks for _FUNC and __FUNC Subject: [PATCH 1/2] wscript: remove all checks for _FUNC and __FUNC
@ -11,10 +10,10 @@ Signed-off-by: Ralph Boehme <slow@samba.org>
1 file changed, 18 insertions(+), 21 deletions(-) 1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/source3/wscript b/source3/wscript diff --git a/source3/wscript b/source3/wscript
index d45222625c4..8d499704c62 100644 index b2a72cd..70fe3a8 100644
--- a/source3/wscript --- a/source3/wscript
+++ b/source3/wscript +++ b/source3/wscript
@@ -383,34 +383,31 @@ int main(int argc, char **argv) { @@ -382,34 +382,31 @@ int main(int argc, char **argv) {
msg="Checking for LL suffix on long long integers") msg="Checking for LL suffix on long long integers")
conf.CHECK_FUNCS(''' conf.CHECK_FUNCS('''
@ -67,6 +66,3 @@ index d45222625c4..8d499704c62 100644
''') ''')
conf.CHECK_SAMBA3_CHARSET() # see build/charset.py conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
--
2.20.1

10
debian/patches/wscript-split-function-check-to-one-per-line-and-sor.patch vendored
View File

@ -1,4 +1,3 @@
From 3761ccecbb081eec439d2327a5978d98a03e131c Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow@samba.org> From: Ralph Boehme <slow@samba.org>
Date: Mon, 30 Sep 2019 11:52:06 +0200 Date: Mon, 30 Sep 2019 11:52:06 +0200
Subject: [PATCH 2/2] wscript: split function check to one per line and sort Subject: [PATCH 2/2] wscript: split function check to one per line and sort
@ -6,14 +5,14 @@ Subject: [PATCH 2/2] wscript: split function check to one per line and sort
Signed-off-by: Ralph Boehme <slow@samba.org> Signed-off-by: Ralph Boehme <slow@samba.org>
--- ---
source3/wscript | 77 +++++++++++++++++++++++++++++++++++++++---------- source3/wscript | 77 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 62 insertions(+), 15 deletions(-) 1 file changed, 62 insertions(+), 15 deletions(-)
diff --git a/source3/wscript b/source3/wscript diff --git a/source3/wscript b/source3/wscript
index 8d499704c62..9580c3b552a 100644 index 70fe3a8..245a8d5 100644
--- a/source3/wscript --- a/source3/wscript
+++ b/source3/wscript +++ b/source3/wscript
@@ -383,31 +383,78 @@ int main(int argc, char **argv) { @@ -382,31 +382,78 @@ int main(int argc, char **argv) {
msg="Checking for LL suffix on long long integers") msg="Checking for LL suffix on long long integers")
conf.CHECK_FUNCS(''' conf.CHECK_FUNCS('''
@ -107,6 +106,3 @@ index 8d499704c62..9580c3b552a 100644
''') ''')
conf.CHECK_SAMBA3_CHARSET() # see build/charset.py conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
--
2.20.1