diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2019-04-09 07:32:07 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2019-04-09 08:05:34 +0200 |
| commit | fa902078740e4df285dd222d95352b6cebeb7fc5 (patch) | |
| tree | 523584252704f0aeda6a4e0ab36b8cc020b785e0 /net-fs/samba/files | |
| parent | net-misc/mikutter: cleanup ruby23-only version (diff) | |
| download | gentoo-fa902078740e4df285dd222d95352b6cebeb7fc5.tar.gz gentoo-fa902078740e4df285dd222d95352b6cebeb7fc5.tar.bz2 gentoo-fa902078740e4df285dd222d95352b6cebeb7fc5.zip | |
net-fs/samba: Bump to versions 4.9.6 and 4.10.2
apply patch to v4.10.2 fixing builds with USE="-gnutls"
Bug: https://bugs.gentoo.org/675694
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-fs/samba/files')
| -rw-r--r-- | net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch b/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch new file mode 100644 index 000000000000..12b2df3a5979 --- /dev/null +++ b/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch @@ -0,0 +1,32 @@ +From 41eeabcb0175659aebf6d480c43fb64310f37d9c Mon Sep 17 00:00:00 2001 +From: Andrew Bartlett <abartlet@samba.org> +Date: Wed, 20 Mar 2019 13:57:50 +1300 +Subject: [PATCH] build: Allow build when --disable-gnutls is set + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844 + +Signed-off-by: Andrew Bartlett <abartlet@samba.org> +--- + lib/mscat/wscript | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/mscat/wscript b/lib/mscat/wscript +index 7ca9ef567ee..4d1f752a3c1 100644 +--- a/lib/mscat/wscript ++++ b/lib/mscat/wscript +@@ -12,7 +12,11 @@ def configure(conf): + if not conf.find_program('asn1Parser', var='ASN1PARSER'): + Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)') + +- conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') ++ # GnuTLS is currently able to be disabled ++ if conf.env.enable_gnutls: ++ conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') ++ else: ++ Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built') + + def build(bld): + if (bld.CONFIG_SET('HAVE_LIBTASN1') and +-- +2.11.0 + |