Merge remote-tracking branch 'up/f31' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2019-09-25 22:46:41 +02:00
commit 71389c4ebc
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
6 changed files with 533 additions and 623 deletions

42
.gitignore vendored
View File

@ -137,3 +137,45 @@ samba-3.6.0pre1.tar.gz
/samba-4.9.0rc4.tar.asc
/samba-4.9.0rc5.tar.asc
/samba-4.9.0rc5.tar.xz
/samba-4.9.0.tar.xz
/samba-4.9.0.tar.asc
/samba-4.9.1.tar.asc
/samba-4.9.1.tar.xz
/samba-4.9.2.tar.xz
/samba-4.9.2.tar.asc
/samba-4.9.3.tar.xz
/samba-4.9.3.tar.asc
/samba-4.9.4.tar.xz
/samba-4.9.4.tar.asc
/samba-4.10.0rc1.tar.xz
/samba-4.10.0rc1.tar.asc
/samba-4.10.0rc2.tar.xz
/samba-4.10.0rc2.tar.asc
/samba-4.10.0rc3.tar.xz
/samba-4.10.0rc3.tar.asc
/samba-4.10.0rc4.tar.xz
/samba-4.10.0rc4.tar.asc
/samba-4.10.0.tar.xz
/samba-4.10.0.tar.asc
/samba-4.10.1.tar.xz
/samba-4.10.1.tar.asc
/samba-4.10.2.tar.xz
/samba-4.10.2.tar.asc
/samba-4.10.3.tar.xz
/samba-4.10.3.tar.asc
/samba-4.10.4.tar.xz
/samba-4.10.4.tar.asc
/samba-4.10.5.tar.xz
/samba-4.10.5.tar.asc
/samba-4.10.6.tar.xz
/samba-4.10.6.tar.asc
/samba-4.11.0rc1.tar.xz
/samba-4.11.0rc1.tar.asc
/samba-4.11.0rc2.tar.xz
/samba-4.11.0rc2.tar.asc
/samba-4.11.0rc3.tar.xz
/samba-4.11.0rc3.tar.asc
/samba-4.11.0rc4.tar.xz
/samba-4.11.0rc4.tar.asc
/samba-4.11.0.tar.xz
/samba-4.11.0.tar.asc

View File

@ -1,12 +0,0 @@
MIT Kerberos 5 Support
=======================
Fedora is using MIT Kerberos implementation as its Kerberos infrastructure of
choice. The Samba build in Fedora is using MIT Kerberos implementation in order
to allow system-wide interoperability between both desktop and server
applications running on the same machine.
In this build the Active Directory support has been disabled.
In case of further questions do not hesitate to send your inquiries to
samba-owner@fedoraproject.org

View File

@ -140,7 +140,7 @@ subscribe go to [mailman](http://lists.samba.org) or send mail to
samba list, so you only need to be on one.
For details of other Samba mailing lists and for access to archives, see
[mailman](<http://lists.samba.org)
[mailman](http://lists.samba.org)
### MAILING LIST ETIQUETTE

119
pidl.patch Normal file
View File

@ -0,0 +1,119 @@
From 838457ac4f9f3f6c1bb5936738566210a62cbdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Tue, 27 Aug 2019 15:25:13 +0200
Subject: [PATCH] Revert "waf: install: Remove installation of PIDL and
manpages."
This reverts commit e24e344d0da58013fd5fa404529fe1d25ef403bf.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14103
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
---
pidl/lib/wscript_build | 37 +++++++++++++++++++++++++++++++++++++
pidl/wscript | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
create mode 100644 pidl/lib/wscript_build
diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build
new file mode 100644
index 00000000000..54b3170c4e2
--- /dev/null
+++ b/pidl/lib/wscript_build
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+# install the pidl modules
+bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR,
+ '''
+ Parse/Pidl.pm
+ Parse/Pidl/Samba4.pm
+ Parse/Pidl/CUtil.pm
+ Parse/Pidl/Expr.pm
+ Parse/Pidl/Wireshark/Conformance.pm
+ Parse/Pidl/Wireshark/NDR.pm
+ Parse/Pidl/ODL.pm
+ Parse/Pidl/Dump.pm
+ Parse/Pidl/Util.pm
+ Parse/Pidl/Samba4/Header.pm
+ Parse/Pidl/Samba4/COM/Header.pm
+ Parse/Pidl/Samba4/COM/Proxy.pm
+ Parse/Pidl/Samba4/COM/Stub.pm
+ Parse/Pidl/Samba4/TDR.pm
+ Parse/Pidl/Samba4/NDR/Server.pm
+ Parse/Pidl/Samba4/NDR/Client.pm
+ Parse/Pidl/Samba4/NDR/Parser.pm
+ Parse/Pidl/Samba4/Python.pm
+ Parse/Pidl/Samba4/Template.pm
+ Parse/Pidl/IDL.pm
+ Parse/Pidl/Typelist.pm
+ Parse/Pidl/Samba3/ClientNDR.pm
+ Parse/Pidl/Samba3/ServerNDR.pm
+ Parse/Pidl/Compat.pm
+ Parse/Pidl/NDR.pm
+ ''',
+ flat=False)
+
+if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'):
+ bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR,
+ 'Parse/Yapp/Driver.pm',
+ flat=False)
diff --git a/pidl/wscript b/pidl/wscript
index 01b71bd8b27..a2a15d36851 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -32,11 +32,49 @@ def configure(conf):
# Check if perl(Parse::Yapp::Driver) is available.
check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05)
+ # we need a recent version of MakeMaker to get the right man page names
+ if conf.CHECK_PERL_MANPAGE():
+ conf.env.PERLMAN1EXT = conf.CHECK_PERL_MANPAGE(section='1')
+ conf.env.PERLMAN3EXT = conf.CHECK_PERL_MANPAGE(section='3')
+ conf.DEFINE('HAVE_PERL_MAKEMAKER', 1)
+
# yapp is used for building the parser
conf.find_program('yapp', var='YAPP')
conf.find_program('pod2man', var='POD2MAN')
def build(bld):
+ bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755, perl_fixup=True)
+
+ bld.RECURSE('lib')
+
+ if not bld.CONFIG_SET('HAVE_PERL_MAKEMAKER'):
+ return
+
+ pidl_manpages = {
+ 'pidl': 'man1/pidl.${PERLMAN1EXT}',
+ 'lib/Parse/Pidl/NDR.pm': 'man3/Parse::Pidl::NDR.${PERLMAN3EXT}',
+ 'lib/Parse/Pidl/Wireshark/Conformance.pm': 'man3/Parse::Pidl::Wireshark::Conformance.${PERLMAN3EXT}',
+ 'lib/Parse/Pidl/Dump.pm': 'man3/Parse::Pidl::Dump.${PERLMAN3EXT}',
+ 'lib/Parse/Pidl/Util.pm': 'man3/Parse::Pidl::Util.${PERLMAN3EXT}',
+ 'lib/Parse/Pidl/Wireshark/NDR.pm': 'man3/Parse::Pidl::Wireshark::NDR.${PERLMAN3EXT}'
+ }
+
+ for k in pidl_manpages.keys():
+ pidl_manpages[k] = bld.EXPAND_VARIABLES(pidl_manpages[k])
+
+ # use perl to build the manpages
+ bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl')
+
+ bld.SET_BUILD_GROUP('final')
+ if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
+ for src in pidl_manpages.keys():
+ manpage = pidl_manpages[src]
+ section = manpage.rsplit( ".", 1)[1]
+ bld(rule='${POD2MAN} -c "Samba Documentation" -s %s ${SRC} ${TGT}' % section,
+ shell=True,
+ source=src,
+ install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
+ target=os.path.basename(manpage))
# we want to prefer the git version of the parsers if we can.
# Only if the source has changed do we want to re-run yapp
--
2.21.0

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
SHA512 (samba-4.9.0rc5.tar.asc) = c70796cd5ffdea99ce474c07695af652b21df41de0dfe9548eb178e37792eecef0acaa4610361a88dee2e8e67fd5ab1dfefb5c214ee7f31b6dc34f68400868ab
SHA512 (samba-4.9.0rc5.tar.xz) = e6c1d49868044a3d7a33d5baf99a09869a6a3bfec6a81ee0042f381f7065215d0204f190b2a6cb679b4544e1ed31c34a0d7c0237f7ddcf72a94933cbae138d91
SHA512 (samba-4.11.0.tar.xz) = 7e044c761c342030930f7988f484657664aad269236cb9103aa029540417e34263e47b5910aff8ef3e913fd00bdd375d940b4d24d09ab9244b05ab79c0814ae2
SHA512 (samba-4.11.0.tar.asc) = 09dfb708b691d3e4d460f8c08b353c6d511c60176b6ff29f4723ea905b05fdd6bcd2a68d62d52f6bcf9514ad6feaf75e1d08b76136852e6f1a944fe814ab763b