[Pkg-samba-maint] [samba] 03/03: releasing package samba version 2:4.4.2+dfsg-2
Jelmer Vernooij
jelmer at moszumanska.debian.org
Wed Apr 27 01:57:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
jelmer pushed a commit to branch master
in repository samba.
commit acaebfa2898221ff1fc15665a9e3b45872f1811b
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Wed Apr 27 01:37:16 2016 +0000
releasing package samba version 2:4.4.2+dfsg-2
---
VERSION | 2 +-
buildtools/wafsamba/samba_utils.py | 2 +-
buildtools/wafsamba/wafsamba.py | 3 +++
buildtools/wafsamba/wscript | 1 -
ctdb/web/footer.html | 4 ++--
ctdb/wscript | 2 +-
debian/changelog | 2 +-
docs-xml/wscript_build | 2 +-
docs/manpages/net.8 | 4 ++--
dynconfig/wscript | 2 ++
examples/LDAP/README | 3 +++
examples/misc/wall.perl | 2 +-
source3/include/libsmbclient.h | 10 ++++++++++
source3/include/local.h | 2 +-
source3/param/loadparm.c | 2 +-
source3/smbd/server.c | 5 +----
source3/wscript_build | 14 ++------------
source4/heimdal_build/wscript_build | 6 +++---
source4/param/wscript_build | 5 +++--
19 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/VERSION b/VERSION
index 8f6c55c..5f6f9a5 100644
--- a/VERSION
+++ b/VERSION
@@ -123,5 +123,5 @@ SAMBA_VERSION_RELEASE_NICKNAME=
# -> "3.0.0rc2-VendorVersion" #
# #
########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX=Debian
SAMBA_VERSION_VENDOR_PATCH=
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 49a8759..205bdc9 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/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))
- if bld.env.RPATH_ON_INSTALL_PRIVATE and needs_private_lib(bld, target):
+ if bld.env.RPATH_ON_INSTALL_PRIVATE:
ret.add(bld.EXPAND_VARIABLES(bld.env.PRIVATELIBDIR))
return list(ret)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 4a47dbf..4a502f2 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/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)
+ if private_library and not vnum:
+ vnum = '0'
+
if bundled_name is not None:
pass
elif target_type == 'PYTHON' or realname or not private_library:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 586cc4b..9e437e3 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -303,7 +303,6 @@ def configure(conf):
conf.CHECK_COMMAND(['uname', '-a'],
msg='Checking build system',
- define='BUILD_SYSTEM',
on_target=False)
conf.CHECK_UNAME()
diff --git a/ctdb/web/footer.html b/ctdb/web/footer.html
index a9758e8..36e48fc 100644
--- a/ctdb/web/footer.html
+++ b/ctdb/web/footer.html
@@ -2,13 +2,13 @@
</tr>
<TR ALIGN="center">
- <TD><BR><a name="search"></a><img src="/bar1.jpg" WIDTH="493" HEIGHT="26" BORDER="0" alt="=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=">
+ <TD><BR><a name="search"></a><img src="./bar1.jpg" WIDTH="493" HEIGHT="26" BORDER="0" alt="=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=">
<!-- SiteSearch Google -->
<form method="get" action="http://www.google.com/custom">
<table border="0">
<tr><td nowrap="nowrap" valign="top" align="left" height="32">
-<a href="http://www.google.com/"><img src="http://www.google.com/logos/Logo_25wht.gif" border="0" alt="Google" /></a>
+<a href="http://www.google.com/">Google</a>
</td><td nowrap="nowrap">
<input type="hidden" name="domains" value="samba.org" />
<input type="text" name="q" size="31" maxlength="255" value="CTDB " />
diff --git a/ctdb/wscript b/ctdb/wscript
index 5739269..7e6d264 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -318,7 +318,7 @@ def build(bld):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_aix.c')
elif sys.platform.startswith('freebsd'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_freebsd.c')
- elif sys.platform == 'kfreebsd':
+ elif sys.platform.startswith('gnukfreebsd'):
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_kfreebsd.c')
elif sys.platform == 'gnu':
CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_gnu.c')
diff --git a/debian/changelog b/debian/changelog
index c96f7b4..c2fac38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-samba (2:4.4.2+dfsg-2) UNRELEASED; urgency=medium
+samba (2:4.4.2+dfsg-2) unstable; urgency=medium
* Merge in 4.3 package changes.
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 11b826b..1485495 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -132,7 +132,7 @@ def SMBDOTCONF_MANPAGE(bld, target):
if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
- SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
+ #SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
bld.SAMBAMANPAGES(manpages)
if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
diff --git a/docs/manpages/net.8 b/docs/manpages/net.8
index 8b2478c..2e34efc 100644
--- a/docs/manpages/net.8
+++ b/docs/manpages/net.8
@@ -1201,9 +1201,9 @@ Something we failed to parse\&. Default action is to "edit" it in interactive an
.RE
.SS "USERSHARE"
.PP
-Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user defined shares to be exported using the "net usershare" commands\&.
+Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user-defined shares to be exported using the "net usershare" commands\&.
.PP
-To set this up, first set up your smb\&.conf by adding to the [global] section: usershare path = /usr/local/samba/lib/usershares Next create the directory /usr/local/samba/lib/usershares, change the owner to root and set the group owner to the UNIX group who should have the ability to create usershares, for example a group called "serverops"\&. Set the permissions on /usr/local/samba/lib/usershares to 01770\&. (Owner and group all access, no access for others, plus the sticky bit, which [...]
+Members of the UNIX group "sambashare" can create user-defined shares on demand using the commands below\&.
.PP
The usershare commands are:
.RS 4
diff --git a/dynconfig/wscript b/dynconfig/wscript
index dba74f6..2d17e7c 100755
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -254,6 +254,8 @@ dynconfig = {
'SMB_PASSWD_FILE' : {
'STD-PATH': '${PRIVATE_DIR}/smbpasswd',
'FHS-PATH': '${PRIVATE_DIR}/smbpasswd',
+ 'OPTION': '--with-smbpasswd-file',
+ 'HELPTEXT': 'Where to put the smbpasswd file',
'DELAY': True,
},
}
diff --git a/examples/LDAP/README b/examples/LDAP/README
index f6ce3a9..a918acf 100644
--- a/examples/LDAP/README
+++ b/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/
+On Debian systems, the smbldap-tools exists as a separate package
+and is not included in LDAP examples.
+
!==
!== end of README
!==
diff --git a/examples/misc/wall.perl b/examples/misc/wall.perl
index 9303658..72d6e89 100644
--- a/examples/misc/wall.perl
+++ b/examples/misc/wall.perl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
#@(#) smb-wall.pl Description:
#@(#) A perl script which allows you to announce whatever you choose to
diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index cf67b1d..ff9ed53 100644
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -80,6 +80,16 @@ extern "C" {
#include <fcntl.h>
#include <utime.h>
+ /* Debian bug #221618 */
+#ifdef _LARGEFILE64_SOURCE
+#undef _LARGEFILE64_SOURCE
+#endif
+#define _LARGEFILE64_SOURCE 1
+#ifdef _FILE_OFFSET_BITS
+#undef _FILE_OFFSET_BITS
+#endif
+#define _FILE_OFFSET_BITS 64
+
#define SMBC_BASE_FD 10000 /* smallest file descriptor returned */
#define SMBC_WORKGROUP 1
diff --git a/source3/include/local.h b/source3/include/local.h
index 7f97d4e..60a00d1 100644
--- a/source3/include/local.h
+++ b/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
-#define PAGER "more"
+#define PAGER "/usr/bin/pager"
#endif
/* the size of the uid cache used to reduce valid user checks */
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2ad1c6f..f409676 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -844,7 +844,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
lpcfg_string_set(Globals.ctx, &Globals.usershare_path, s);
TALLOC_FREE(s);
lpcfg_string_set(Globals.ctx, &Globals.usershare_template_share, "");
- Globals.usershare_max_shares = 0;
+ Globals.usershare_max_shares = 100;
/* 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/source3/smbd/server.c b/source3/smbd/server.c
index 42fcad6..4094108 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1301,7 +1301,7 @@ extern void build_options(bool screen);
}
if (print_build_options) {
- build_options(True); /* Display output to screen as well as debug */
+ DEBUG(0, ("For build options, please check the Debian packaging (apt-get source samba)."));
exit(0);
}
@@ -1373,9 +1373,6 @@ extern void build_options(bool screen);
DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
(int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
- /* Output the build options to the debug log */
- build_options(False);
-
if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4) {
DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
exit(1);
diff --git a/source3/wscript_build b/source3/wscript_build
index 3f6a43e..572e9a3 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -7,16 +7,6 @@ LIBS='ICONV'
config_h = "../include/config.h"
-bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
-
-t = bld.SAMBA_GENERATOR('build_env.h',
- source='script/build_env.sh',
- target='include/build_env.h',
- rule='${SRC} ${SRCDIR} ${BUILDDIR} ${CC} > ${TGT}')
-# todo: work out what is really wanted here
-t.env.SRCDIR = bld.path.abspath()
-t.env.BUILDDIR = bld.path.abspath()
-
bld.SETUP_BUILD_GROUPS()
######################## SUBSYSTEMS #################################
@@ -209,7 +199,7 @@ bld.SAMBA3_LIBRARY('smbregistry',
registry/reg_init_basic.c''',
deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
replace util_reg samba-util samba-security
- errors3 dbwrap samba3-util''',
+ errors3 dbwrap samba3-util samba3util''',
allow_undefined_symbols=True,
private_library=True)
@@ -601,7 +591,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
smbd/oplock_linux.c
smbd/notify.c
smbd/notify_msg.c
- smbd/build_options.c''' + NOTIFY_SOURCES,
+ ''' + NOTIFY_SOURCES,
deps='''
talloc
tevent
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index c733b8f..f3e9ab2 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'):
HEIMDAL_GENERATOR(
name="HEIMDAL_ERRORLIST",
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}' '${SRC[1].parent.abspath(env)}'",
- source = '../heimdal/lib/wind/gen-errorlist.py ../heimdal/lib/wind/rfc3454.txt ../heimdal/lib/wind/stringprep.py',
+ source = '../heimdal/lib/wind/gen-errorlist.py ../heimdal/lib/wind/rfc3454.txt-table ../heimdal/lib/wind/stringprep.py',
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'):
HEIMDAL_GENERATOR(
name = 'HEIMDAL_BIDI_TABLE',
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}' '${SRC[1].parent.abspath(env)}'",
- source = '../heimdal/lib/wind/gen-bidi.py ../heimdal/lib/wind/rfc3454.txt',
+ source = '../heimdal/lib/wind/gen-bidi.py ../heimdal/lib/wind/rfc3454.txt-table',
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'):
HEIMDAL_GENERATOR(
name = 'HEIMDAL_MAP_TABLE',
rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[2].abspath()}' '${SRC[2].parent.abspath(env)}'",
- source = '../heimdal/lib/wind/gen-map.py ../heimdal/lib/wind/stringprep.py ../heimdal/lib/wind/rfc3454.txt',
+ source = '../heimdal/lib/wind/gen-map.py ../heimdal/lib/wind/stringprep.py ../heimdal/lib/wind/rfc3454.txt-table',
target = '../heimdal/lib/wind/map_table.h ../heimdal/lib/wind/map_table.c'
)
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 2ad753b..6fa1c4c 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -18,7 +18,7 @@ bld.SAMBA_MODULE('share_classic',
source='share_classic.c',
subsystem='share',
init_function='share_classic_init',
- deps='samba-util'
+ deps='samba-util samba-hostconfig'
)
@@ -26,7 +26,8 @@ bld.SAMBA_MODULE('share_ldb',
source='share_ldb.c',
subsystem='share',
init_function='share_ldb_init',
- deps='ldbsamba auth_system_session'
+ deps='ldbsamba auth_system_session',
+ internal_module=False,
)
--
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