[Pkg-samba-maint] [samba] 05/06: Refresh patches with quilt
Mathieu Parent
sathieu at moszumanska.debian.org
Sat Sep 10 20:04:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
sathieu pushed a commit to branch master
in repository samba.
commit 884b779f27c9d629c4a17abee1ebb6a85e1d0db9
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sat Sep 10 21:22:32 2016 +0200
Refresh patches with quilt
---
debian/patches/05_share_ldb_module | 10 +++--
debian/patches/07_private_lib | 9 +++--
.../Add-documentation-to-systemd-Unit-files.patch | 43 ++++++++++------------
debian/patches/README_nosmbldap-tools.patch | 8 ++--
debian/patches/Skip-raw.write-tests.patch | 11 ++----
debian/patches/VERSION.patch | 6 ++-
debian/patches/add-so-version-to-private-libraries | 10 ++---
.../bug_221618_precise-64bit-prototype.patch | 2 +-
debian/patches/fix_kill_path_in_units.patch | 35 ++++++++----------
debian/patches/heimdal-rfc3454.txt | 20 +++++-----
debian/patches/no_build_env.patch | 11 ++----
debian/patches/no_build_system.patch | 10 ++---
debian/patches/smbclient-pager.patch | 8 ++--
.../systemd-syslog.target-is-obsolete.patch | 35 ++++++++----------
debian/patches/usershare.patch | 36 +++++++++---------
.../patches/xsltproc_dont_build_smb.conf.5.patch | 10 ++---
16 files changed, 130 insertions(+), 134 deletions(-)
diff --git a/debian/patches/05_share_ldb_module b/debian/patches/05_share_ldb_module
index afad92f..e4f6a8f 100644
--- a/debian/patches/05_share_ldb_module
+++ b/debian/patches/05_share_ldb_module
@@ -1,7 +1,9 @@
=== modified file 'source4/param/wscript_build'
---- a/source4/param/wscript_build
-+++ b/source4/param/wscript_build
-@@ -18,7 +18,7 @@
+Index: samba/source4/param/wscript_build
+===================================================================
+--- samba.orig/source4/param/wscript_build
++++ samba/source4/param/wscript_build
+@@ -18,7 +18,7 @@ bld.SAMBA_MODULE('share_classic',
source='share_classic.c',
subsystem='share',
init_function='share_classic_init',
@@ -10,7 +12,7 @@
)
-@@ -26,7 +26,8 @@
+@@ -26,7 +26,8 @@ bld.SAMBA_MODULE('share_ldb',
source='share_ldb.c',
subsystem='share',
init_function='share_ldb_init',
diff --git a/debian/patches/07_private_lib b/debian/patches/07_private_lib
index 2d1f8cd..4ad8ed4 100644
--- a/debian/patches/07_private_lib
+++ b/debian/patches/07_private_lib
@@ -4,9 +4,11 @@ Last-Update: 2012-02-24
Applied-Upstream: no
=== modified file 'buildtools/wafsamba/samba_utils.py'
---- old/buildtools/wafsamba/samba_utils.py 2012-02-12 17:44:09 +0000
-+++ new/buildtools/wafsamba/samba_utils.py 2012-02-24 14:11:05 +0000
-@@ -79,7 +79,7 @@
+Index: samba/buildtools/wafsamba/samba_utils.py
+===================================================================
+--- samba.orig/buildtools/wafsamba/samba_utils.py
++++ samba/buildtools/wafsamba/samba_utils.py
+@@ -63,7 +63,7 @@ def install_rpath(target):
ret = set()
if bld.env.RPATH_ON_INSTALL:
ret.add(bld.EXPAND_VARIABLES(bld.env.LIBDIR))
@@ -15,4 +17,3 @@ Applied-Upstream: no
ret.add(bld.EXPAND_VARIABLES(bld.env.PRIVATELIBDIR))
return list(ret)
-
diff --git a/debian/patches/Add-documentation-to-systemd-Unit-files.patch b/debian/patches/Add-documentation-to-systemd-Unit-files.patch
index 0dff620..481629c 100644
--- a/debian/patches/Add-documentation-to-systemd-Unit-files.patch
+++ b/debian/patches/Add-documentation-to-systemd-Unit-files.patch
@@ -11,10 +11,10 @@ Subject: Add documentation to systemd Unit files
packaging/systemd/winbind.service | 1 +
5 files changed, 5 insertions(+)
-diff --git a/ctdb/config/ctdb.service b/ctdb/config/ctdb.service
-index ea37c30..f4abfb6 100644
---- a/ctdb/config/ctdb.service
-+++ b/ctdb/config/ctdb.service
+Index: samba/ctdb/config/ctdb.service
+===================================================================
+--- samba.orig/ctdb/config/ctdb.service
++++ samba/ctdb/config/ctdb.service
@@ -1,5 +1,6 @@
[Unit]
Description=CTDB
@@ -22,10 +22,10 @@ index ea37c30..f4abfb6 100644
After=network.target
[Service]
-diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
-index 98d8080..3033c6b 100644
---- a/packaging/systemd/nmb.service
-+++ b/packaging/systemd/nmb.service
+Index: samba/packaging/systemd/nmb.service
+===================================================================
+--- samba.orig/packaging/systemd/nmb.service
++++ samba/packaging/systemd/nmb.service
@@ -1,5 +1,6 @@
[Unit]
Description=Samba NMB Daemon
@@ -33,10 +33,10 @@ index 98d8080..3033c6b 100644
After=network.target
[Service]
-diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
-index 83e0daf..6512bef 100644
---- a/packaging/systemd/samba.service
-+++ b/packaging/systemd/samba.service
+Index: samba/packaging/systemd/samba.service
+===================================================================
+--- samba.orig/packaging/systemd/samba.service
++++ samba/packaging/systemd/samba.service
@@ -1,5 +1,6 @@
[Unit]
Description=Samba AD Daemon
@@ -44,10 +44,10 @@ index 83e0daf..6512bef 100644
After=network.target
[Service]
-diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
-index 949f798..a732d19 100644
---- a/packaging/systemd/smb.service
-+++ b/packaging/systemd/smb.service
+Index: samba/packaging/systemd/smb.service
+===================================================================
+--- samba.orig/packaging/systemd/smb.service
++++ samba/packaging/systemd/smb.service
@@ -1,5 +1,6 @@
[Unit]
Description=Samba SMB Daemon
@@ -55,10 +55,10 @@ index 949f798..a732d19 100644
After=network.target nmb.service winbind.service
[Service]
-diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
-index 26c6752..a937f51 100644
---- a/packaging/systemd/winbind.service
-+++ b/packaging/systemd/winbind.service
+Index: samba/packaging/systemd/winbind.service
+===================================================================
+--- samba.orig/packaging/systemd/winbind.service
++++ samba/packaging/systemd/winbind.service
@@ -1,5 +1,6 @@
[Unit]
Description=Samba Winbind Daemon
@@ -66,6 +66,3 @@ index 26c6752..a937f51 100644
After=network.target nmb.service
[Service]
---
-2.8.1
-
diff --git a/debian/patches/README_nosmbldap-tools.patch b/debian/patches/README_nosmbldap-tools.patch
index 60db0b7..4e9912a 100644
--- a/debian/patches/README_nosmbldap-tools.patch
+++ b/debian/patches/README_nosmbldap-tools.patch
@@ -3,11 +3,11 @@ Author: Christian Perrier <bubulle at debian.org>
Bug-Debian: http://bugs.debian.org/341934
Forwarded: not-needed
-Index: experimental/examples/LDAP/README
+Index: samba/examples/LDAP/README
===================================================================
---- experimental.orig/examples/LDAP/README
-+++ experimental/examples/LDAP/README
-@@ -69,6 +69,9 @@
+--- samba.orig/examples/LDAP/README
++++ samba/examples/LDAP/README
+@@ -69,6 +69,9 @@ in Samba releases.
The smbldap-tools package can be downloaded individually from
https://gna.org/projects/smbldap-tools/
diff --git a/debian/patches/Skip-raw.write-tests.patch b/debian/patches/Skip-raw.write-tests.patch
index 1090766..a195394 100644
--- a/debian/patches/Skip-raw.write-tests.patch
+++ b/debian/patches/Skip-raw.write-tests.patch
@@ -6,10 +6,10 @@ Subject: Skip raw.write tests for now as they fail on 32-bit
selftest/quick | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/selftest/quick b/selftest/quick
-index 7605f3f..19903c6 100644
---- a/selftest/quick
-+++ b/selftest/quick
+Index: samba/selftest/quick
+===================================================================
+--- samba.orig/selftest/quick
++++ samba/selftest/quick
@@ -14,7 +14,8 @@ raw.qfileinfo
raw.mkdir
raw.seek
@@ -20,6 +20,3 @@ index 7605f3f..19903c6 100644
raw.read
raw.close
raw.ioctl
---
-2.8.1
-
diff --git a/debian/patches/VERSION.patch b/debian/patches/VERSION.patch
index 021bd3b..ade1e3f 100644
--- a/debian/patches/VERSION.patch
+++ b/debian/patches/VERSION.patch
@@ -2,8 +2,10 @@ Description: Add "Debian" as vendor suffix
Author: Eloy A. Paris <peloy at debian.org>
Forwarded: not-needed
---- samba-4.0.3+dfsg1.orig/VERSION
-+++ samba-4.0.3+dfsg1/VERSION
+Index: samba/VERSION
+===================================================================
+--- samba.orig/VERSION
++++ samba/VERSION
@@ -123,5 +123,5 @@ SAMBA_VERSION_RELEASE_NICKNAME=
# -> "3.0.0rc2-VendorVersion" #
# #
diff --git a/debian/patches/add-so-version-to-private-libraries b/debian/patches/add-so-version-to-private-libraries
index 5b447ca..77e3e02 100644
--- a/debian/patches/add-so-version-to-private-libraries
+++ b/debian/patches/add-so-version-to-private-libraries
@@ -7,11 +7,11 @@ We also want dpkg-shlibdeps to generate correct dependency information
for the private libraries in our binary packages, but dpkg-shlibdeps
only works when the library has a version number.
-diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
-index 188e535..a7cc5d1 100644
---- a/buildtools/wafsamba/wafsamba.py
-+++ b/buildtools/wafsamba/wafsamba.py
-@@ -224,6 +224,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+Index: samba/buildtools/wafsamba/wafsamba.py
+===================================================================
+--- samba.orig/buildtools/wafsamba/wafsamba.py
++++ samba/buildtools/wafsamba/wafsamba.py
+@@ -232,6 +232,9 @@ def SAMBA_LIBRARY(bld, libname, source,
raise Utils.WafError("public library '%s' must have header files" %
libname)
diff --git a/debian/patches/bug_221618_precise-64bit-prototype.patch b/debian/patches/bug_221618_precise-64bit-prototype.patch
index 3f8b302..ef54a47 100644
--- a/debian/patches/bug_221618_precise-64bit-prototype.patch
+++ b/debian/patches/bug_221618_precise-64bit-prototype.patch
@@ -7,7 +7,7 @@ Index: samba/source3/include/libsmbclient.h
===================================================================
--- samba.orig/source3/include/libsmbclient.h
+++ samba/source3/include/libsmbclient.h
-@@ -79,6 +79,16 @@
+@@ -80,6 +80,16 @@ extern "C" {
#include <fcntl.h>
#include <utime.h>
diff --git a/debian/patches/fix_kill_path_in_units.patch b/debian/patches/fix_kill_path_in_units.patch
index 4151f54..509e341 100644
--- a/debian/patches/fix_kill_path_in_units.patch
+++ b/debian/patches/fix_kill_path_in_units.patch
@@ -12,10 +12,10 @@ Debian-bug: https://bugs.debian.org/828730
packaging/systemd/winbind.service | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
-index 2c152ba..c02e65d 100644
---- a/packaging/systemd/nmb.service
-+++ b/packaging/systemd/nmb.service
+Index: samba/packaging/systemd/nmb.service
+===================================================================
+--- samba.orig/packaging/systemd/nmb.service
++++ samba/packaging/systemd/nmb.service
@@ -9,7 +9,7 @@ NotifyAccess=all
PIDFile=/run/nmbd.pid
EnvironmentFile=-/etc/sysconfig/samba
@@ -25,10 +25,10 @@ index 2c152ba..c02e65d 100644
LimitCORE=infinity
[Install]
-diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
-index 6512bef..11d2e47 100644
---- a/packaging/systemd/samba.service
-+++ b/packaging/systemd/samba.service
+Index: samba/packaging/systemd/samba.service
+===================================================================
+--- samba.orig/packaging/systemd/samba.service
++++ samba/packaging/systemd/samba.service
@@ -10,7 +10,7 @@ PIDFile=/run/samba.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
@@ -38,10 +38,10 @@ index 6512bef..11d2e47 100644
[Install]
WantedBy=multi-user.target
-diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
-index 491f45e..cc7831c 100644
---- a/packaging/systemd/smb.service
-+++ b/packaging/systemd/smb.service
+Index: samba/packaging/systemd/smb.service
+===================================================================
+--- samba.orig/packaging/systemd/smb.service
++++ samba/packaging/systemd/smb.service
@@ -10,7 +10,7 @@ PIDFile=/run/smbd.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
@@ -51,10 +51,10 @@ index 491f45e..cc7831c 100644
LimitCORE=infinity
[Install]
-diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
-index cd28767..e7f1651 100644
---- a/packaging/systemd/winbind.service
-+++ b/packaging/systemd/winbind.service
+Index: samba/packaging/systemd/winbind.service
+===================================================================
+--- samba.orig/packaging/systemd/winbind.service
++++ samba/packaging/systemd/winbind.service
@@ -9,7 +9,7 @@ NotifyAccess=all
PIDFile=/run/winbindd.pid
EnvironmentFile=-/etc/sysconfig/samba
@@ -64,6 +64,3 @@ index cd28767..e7f1651 100644
LimitCORE=infinity
[Install]
---
-2.8.1
-
diff --git a/debian/patches/heimdal-rfc3454.txt b/debian/patches/heimdal-rfc3454.txt
index e2eb377..58c76a9 100644
--- a/debian/patches/heimdal-rfc3454.txt
+++ b/debian/patches/heimdal-rfc3454.txt
@@ -2,8 +2,10 @@ Description: Patch in symbol table from rfc3454, for Heimdal scripts.
Author: Brian May <bam at debian.org>
Status: cherry-picked from heimdal package
---- /dev/null 2015-06-04 12:39:41.770564441 +0000
-+++ a/source4/heimdal/lib/wind/rfc3454.txt-table 2015-06-05 23:09:32.545337704 +0000
+Index: samba/source4/heimdal/lib/wind/rfc3454.txt-table
+===================================================================
+--- /dev/null
++++ samba/source4/heimdal/lib/wind/rfc3454.txt-table
@@ -0,0 +1,7074 @@
+ ----- Start Table A.1 -----
+
@@ -7079,11 +7081,11 @@ Status: cherry-picked from heimdal package
+
+ ----- End Table D.2 -----
+
-diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
-index 0eb1e38..633fec9 100644
---- a/source4/heimdal_build/wscript_build
-+++ b/source4/heimdal_build/wscript_build
-@@ -843,7 +843,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
+Index: samba/source4/heimdal_build/wscript_build
+===================================================================
+--- samba.orig/source4/heimdal_build/wscript_build
++++ samba/source4/heimdal_build/wscript_build
+@@ -843,7 +843,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND
HEIMDAL_GENERATOR(
name="HEIMDAL_ERRORLIST",
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}' '${SRC[1].parent.abspath(env)}'",
@@ -7092,7 +7094,7 @@ index 0eb1e38..633fec9 100644
target = '../heimdal/lib/wind/errorlist_table.c ../heimdal/lib/wind/errorlist_table.h'
)
-@@ -865,7 +865,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
+@@ -865,7 +865,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND
HEIMDAL_GENERATOR(
name = 'HEIMDAL_BIDI_TABLE',
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}' '${SRC[1].parent.abspath(env)}'",
@@ -7101,7 +7103,7 @@ index 0eb1e38..633fec9 100644
target = '../heimdal/lib/wind/bidi_table.h ../heimdal/lib/wind/bidi_table.c'
)
-@@ -873,7 +873,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
+@@ -873,7 +873,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND
HEIMDAL_GENERATOR(
name = 'HEIMDAL_MAP_TABLE',
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[2].abspath()}' '${SRC[2].parent.abspath(env)}'",
diff --git a/debian/patches/no_build_env.patch b/debian/patches/no_build_env.patch
index 1f53978..fe590dd 100644
--- a/debian/patches/no_build_env.patch
+++ b/debian/patches/no_build_env.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Remove unreproducible build environment
source3/script/build_env.sh | 11 -----------
1 file changed, 11 deletions(-)
-diff --git a/source3/script/build_env.sh b/source3/script/build_env.sh
-index eb54f37..bdaa2c6 100755
---- a/source3/script/build_env.sh
-+++ b/source3/script/build_env.sh
+Index: samba/source3/script/build_env.sh
+===================================================================
+--- samba.orig/source3/script/build_env.sh
++++ samba/source3/script/build_env.sh
@@ -27,15 +27,4 @@ host=`hostname`
cat <<EOF
/* This file is automatically generated with "make include/build_env.h". DO NOT EDIT */
@@ -27,6 +27,3 @@ index eb54f37..bdaa2c6 100755
-#define BUILD_ENV_COMPILER "${compiler}"
-#endif /* _BUILD_ENV_H */
EOF
---
-2.8.0.rc3
-
diff --git a/debian/patches/no_build_system.patch b/debian/patches/no_build_system.patch
index 5df7093..c27a7d0 100644
--- a/debian/patches/no_build_system.patch
+++ b/debian/patches/no_build_system.patch
@@ -2,11 +2,11 @@ From: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Sat, 9 Apr 2016 12:18:38 +0000
Subject: drop host-specific define that prevents reproducible builds
-diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
-index d6bb688..7831b75 100755
---- a/buildtools/wafsamba/wscript
-+++ b/buildtools/wafsamba/wscript
-@@ -296,7 +296,6 @@ def configure(conf):
+Index: samba/buildtools/wafsamba/wscript
+===================================================================
+--- samba.orig/buildtools/wafsamba/wscript
++++ samba/buildtools/wafsamba/wscript
+@@ -303,7 +303,6 @@ def configure(conf):
conf.CHECK_COMMAND(['uname', '-a'],
msg='Checking build system',
diff --git a/debian/patches/smbclient-pager.patch b/debian/patches/smbclient-pager.patch
index 6c5a57e..fb9e9d9 100644
--- a/debian/patches/smbclient-pager.patch
+++ b/debian/patches/smbclient-pager.patch
@@ -3,9 +3,11 @@ Author: Steve Langasek <vorlon at debian.org>
Bug-Debian: http://bugs.debian.org/135603
Forwarded: not-needed
---- a/source3/include/local.h
-+++ b/source3/include/local.h
-@@ -93,7 +93,7 @@
+Index: samba/source3/include/local.h
+===================================================================
+--- samba.orig/source3/include/local.h
++++ samba/source3/include/local.h
+@@ -88,7 +88,7 @@
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
#ifndef PAGER
diff --git a/debian/patches/systemd-syslog.target-is-obsolete.patch b/debian/patches/systemd-syslog.target-is-obsolete.patch
index ff55302..c130616 100644
--- a/debian/patches/systemd-syslog.target-is-obsolete.patch
+++ b/debian/patches/systemd-syslog.target-is-obsolete.patch
@@ -13,10 +13,10 @@ Ref: https://lintian.debian.org/tags/systemd-service-file-refers-to-obsolete-tar
packaging/systemd/winbind.service | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
-index 3d71a7d..98d8080 100644
---- a/packaging/systemd/nmb.service
-+++ b/packaging/systemd/nmb.service
+Index: samba/packaging/systemd/nmb.service
+===================================================================
+--- samba.orig/packaging/systemd/nmb.service
++++ samba/packaging/systemd/nmb.service
@@ -1,6 +1,6 @@
[Unit]
Description=Samba NMB Daemon
@@ -25,10 +25,10 @@ index 3d71a7d..98d8080 100644
[Service]
Type=notify
-diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
-index 824f89c..83e0daf 100644
---- a/packaging/systemd/samba.service
-+++ b/packaging/systemd/samba.service
+Index: samba/packaging/systemd/samba.service
+===================================================================
+--- samba.orig/packaging/systemd/samba.service
++++ samba/packaging/systemd/samba.service
@@ -1,6 +1,6 @@
[Unit]
Description=Samba AD Daemon
@@ -37,10 +37,10 @@ index 824f89c..83e0daf 100644
[Service]
Type=notify
-diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
-index 9810891..949f798 100644
---- a/packaging/systemd/smb.service
-+++ b/packaging/systemd/smb.service
+Index: samba/packaging/systemd/smb.service
+===================================================================
+--- samba.orig/packaging/systemd/smb.service
++++ samba/packaging/systemd/smb.service
@@ -1,6 +1,6 @@
[Unit]
Description=Samba SMB Daemon
@@ -49,10 +49,10 @@ index 9810891..949f798 100644
[Service]
Type=notify
-diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
-index f711a17..26c6752 100644
---- a/packaging/systemd/winbind.service
-+++ b/packaging/systemd/winbind.service
+Index: samba/packaging/systemd/winbind.service
+===================================================================
+--- samba.orig/packaging/systemd/winbind.service
++++ samba/packaging/systemd/winbind.service
@@ -1,6 +1,6 @@
[Unit]
Description=Samba Winbind Daemon
@@ -61,6 +61,3 @@ index f711a17..26c6752 100644
[Service]
Type=notify
---
-2.8.1
-
diff --git a/debian/patches/usershare.patch b/debian/patches/usershare.patch
index c92e891..4086e4e 100644
--- a/debian/patches/usershare.patch
+++ b/debian/patches/usershare.patch
@@ -7,9 +7,11 @@ Bug-Debian: http://bugs.debian.org/443230
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
Forwarded: not-needed
---- a/docs/manpages/net.8
-+++ b/docs/manpages/net.8
-@@ -944,9 +944,9 @@
+Index: samba/docs/manpages/net.8
+===================================================================
+--- samba.orig/docs/manpages/net.8
++++ samba/docs/manpages/net.8
+@@ -1201,9 +1201,9 @@ Something we failed to parse\&. Default
.RE
.SS "USERSHARE"
.PP
@@ -21,11 +23,11 @@ Forwarded: not-needed
.PP
The usershare commands are:
.RS 4
-diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
-index c576b22..ef37e7a 100644
---- a/source3/param/loadparm.c
-+++ b/source3/param/loadparm.c
-@@ -833,7 +833,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
+Index: samba/source3/param/loadparm.c
+===================================================================
+--- samba.orig/source3/param/loadparm.c
++++ samba/source3/param/loadparm.c
+@@ -842,7 +842,7 @@ static void init_globals(struct loadparm
lpcfg_string_set(Globals.ctx, &Globals.usershare_path, s);
TALLOC_FREE(s);
lpcfg_string_set(Globals.ctx, &Globals.usershare_template_share, "");
@@ -34,10 +36,10 @@ index c576b22..ef37e7a 100644
/* By default disallow sharing of directories not owned by the sharer. */
Globals.usershare_owner_only = true;
/* By default disallow guest access to usershares. */
-diff --git a/docs-xml/smbdotconf/misc/usersharemaxshares.xml b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
-index 1d2bab7..55b68e4 100644
---- a/docs-xml/smbdotconf/misc/usersharemaxshares.xml
-+++ b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
+Index: samba/docs-xml/smbdotconf/misc/usersharemaxshares.xml
+===================================================================
+--- samba.orig/docs-xml/smbdotconf/misc/usersharemaxshares.xml
++++ samba/docs-xml/smbdotconf/misc/usersharemaxshares.xml
@@ -9,5 +9,5 @@
</para>
@@ -45,11 +47,11 @@ index 1d2bab7..55b68e4 100644
-<value type="default">0</value>
+<value type="default">100</value>
</samba:parameter>
-diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
-index 7b75f13..a59f1fd 100644
---- a/lib/param/loadparm.c
-+++ b/lib/param/loadparm.c
-@@ -2769,6 +2769,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
+Index: samba/lib/param/loadparm.c
+===================================================================
+--- samba.orig/lib/param/loadparm.c
++++ samba/lib/param/loadparm.c
+@@ -2878,6 +2878,8 @@ struct loadparm_context *loadparm_init(T
lpcfg_do_global_parameter(lp_ctx, "init logon delay", "100");
diff --git a/debian/patches/xsltproc_dont_build_smb.conf.5.patch b/debian/patches/xsltproc_dont_build_smb.conf.5.patch
index 6aee334..436fbcc 100644
--- a/debian/patches/xsltproc_dont_build_smb.conf.5.patch
+++ b/debian/patches/xsltproc_dont_build_smb.conf.5.patch
@@ -5,11 +5,11 @@ Author: Ivo De Decker <ivo.dedecker at ugent.be>
Bug-Debian: http://bugs.debian.org/750593
Forwarded: not-needed
-diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
-index 9c6042f..7949c88 100644
---- a/docs-xml/wscript_build
-+++ b/docs-xml/wscript_build
-@@ -116,7 +116,7 @@ def SMBDOTCONF_MANPAGE(bld, target):
+Index: samba/docs-xml/wscript_build
+===================================================================
+--- samba.orig/docs-xml/wscript_build
++++ samba/docs-xml/wscript_build
+@@ -133,7 +133,7 @@ def SMBDOTCONF_MANPAGE(bld, target):
if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list