* [Buildroot] [git commit] package/samba4: bump version to 4.10.7
@ 2019-08-25 6:50 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2019-08-25 6:50 UTC (permalink / raw
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=e7606d31f9a0c980c88b634edb93c7c1f1190282
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Release notes of this bugfix release:
https://www.samba.org/samba/history/samba-4.10.7.html
Removed 0005-disable_gnutls_build_fix.patch, applied upstream:
https://git.samba.org/samba.git/?p=samba.git;a=commitdiff;h=8128ceceb8702e596183dd509dd6f952a2f4efc2
Renumbered remaining patches.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/samba4/0005-disable_gnutls_build_fix.patch | 37 ----------------------
...nistd_incl.patch => 0005-fix_unistd_incl.patch} | 0
...d-wscript_build-do-not-add-host-include-.patch} | 0
package/samba4/samba4.hash | 4 +--
package/samba4/samba4.mk | 2 +-
5 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/package/samba4/0005-disable_gnutls_build_fix.patch b/package/samba4/0005-disable_gnutls_build_fix.patch
deleted file mode 100644
index 5ea0f26124..0000000000
--- a/package/samba4/0005-disable_gnutls_build_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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>
-
-Downloaded from
-https://github.com/openwrt/packages/blob/master/net/samba4/patches/005-samba-4.10-disable_gnutls_build_fix.patch
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- 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
-
diff --git a/package/samba4/0006-fix_unistd_incl.patch b/package/samba4/0005-fix_unistd_incl.patch
similarity index 100%
rename from package/samba4/0006-fix_unistd_incl.patch
rename to package/samba4/0005-fix_unistd_incl.patch
diff --git a/package/samba4/0007-heimdal_build-wscript_build-do-not-add-host-include-.patch b/package/samba4/0006-heimdal_build-wscript_build-do-not-add-host-include-.patch
similarity index 100%
rename from package/samba4/0007-heimdal_build-wscript_build-do-not-add-host-include-.patch
rename to package/samba4/0006-heimdal_build-wscript_build-do-not-add-host-include-.patch
diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash
index 399fa28159..fbc680cb32 100644
--- a/package/samba4/samba4.hash
+++ b/package/samba4/samba4.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
-# https://download.samba.org/pub/samba/stable/samba-4.10.6.tar.asc
-sha256 9efbeb52db1203dc779b118f1c48c161e569f7a6af5101e745497ee6296eef42 samba-4.10.6.tar.gz
+# https://download.samba.org/pub/samba/stable/samba-4.10.7.tar.asc
+sha256 34f30494b6b63700f54be22be636e8a6e0430577166a76a017075e11c02a1ebb samba-4.10.7.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index 072bb2c7c0..1d097f1d48 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SAMBA4_VERSION = 4.10.6
+SAMBA4_VERSION = 4.10.7
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
SAMBA4_INSTALL_STAGING = YES
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-08-25 6:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-25 6:50 [Buildroot] [git commit] package/samba4: bump version to 4.10.7 Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.