projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 914ba20)
package/samba4: bump version to 4.10.7
authorBernd Kuhls <bernd.kuhls@t-online.de>
Sat, 24 Aug 2019 08:16:33 +0000 (10:16 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 25 Aug 2019 06:50:26 +0000 (08:50 +0200)
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 [deleted file] patch | blob | history
package/samba4/0005-fix_unistd_incl.patch [new file with mode: 0644] patch | blob
package/samba4/0006-fix_unistd_incl.patch [deleted file] patch | blob | history
package/samba4/0006-heimdal_build-wscript_build-do-not-add-host-include-.patch [new file with mode: 0644] patch | blob
package/samba4/0007-heimdal_build-wscript_build-do-not-add-host-include-.patch [deleted file] patch | blob | history
package/samba4/samba4.hash patch | blob | history
package/samba4/samba4.mk patch | blob | history

diff --git a/package/samba4/0005-disable_gnutls_build_fix.patch b/package/samba4/0005-disable_gnutls_build_fix.patch
deleted file mode 100644 (file)
index 5ea0f26..0000000
--- 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/0005-fix_unistd_incl.patch b/package/samba4/0005-fix_unistd_incl.patch
new file mode 100644 (file)
index 0000000..80467fa
--- /dev/null
+++ b/package/samba4/0005-fix_unistd_incl.patch
@@ -0,0 +1,27 @@
+Fix unistd.h include
+
+Fixes build error
+
+source4/heimdal/lib/asn1/asn1_err.c:47:23: error: 'link' redeclared as different kind of symbol
+ static struct et_list link = { 0, 0 };
+
+Downloaded from
+https://github.com/openwrt/packages/blob/master/net/samba4/patches/006-samba-4-10-musl_rm_unistd_incl.patch
+
+Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13856
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+--- a/lib/replace/replace.h
++++ b/lib/replace/replace.h
+@@ -162,10 +162,6 @@
+ #include <bsd/unistd.h>
+ #endif
+ 
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
diff --git a/package/samba4/0006-fix_unistd_incl.patch b/package/samba4/0006-fix_unistd_incl.patch
deleted file mode 100644 (file)
index 80467fa..0000000
--- a/package/samba4/0006-fix_unistd_incl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix unistd.h include
-
-Fixes build error
-
-source4/heimdal/lib/asn1/asn1_err.c:47:23: error: 'link' redeclared as different kind of symbol
- static struct et_list link = { 0, 0 };
-
-Downloaded from
-https://github.com/openwrt/packages/blob/master/net/samba4/patches/006-samba-4-10-musl_rm_unistd_incl.patch
-
-Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13856
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
---- a/lib/replace/replace.h
-+++ b/lib/replace/replace.h
-@@ -162,10 +162,6 @@
- #include <bsd/unistd.h>
- #endif
- 
--#ifdef HAVE_UNISTD_H
--#include <unistd.h>
--#endif
--
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
diff --git a/package/samba4/0006-heimdal_build-wscript_build-do-not-add-host-include-.patch b/package/samba4/0006-heimdal_build-wscript_build-do-not-add-host-include-.patch
new file mode 100644 (file)
index 0000000..08d8382
--- /dev/null
+++ b/package/samba4/0006-heimdal_build-wscript_build-do-not-add-host-include-.patch
@@ -0,0 +1,31 @@
+From 189440643157fbc872a1670b3e30b6c459dbd930 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 21 Jul 2019 15:12:03 +0200
+Subject: [PATCH] heimdal_build/wscript_build: do not add host include
+ patch
+
+Fixes cross-compile.
+
+Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13856
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ source4/heimdal_build/wscript_build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
+index 45938b88315..e896c3e9454 100644
+--- a/source4/heimdal_build/wscript_build
++++ b/source4/heimdal_build/wscript_build
+@@ -131,7 +131,7 @@ def HEIMDAL_ASN1(name, source,
+             samba_cflags   = CURRENT_CFLAGS(bld, name, ''),
+             depends_on     = '',
+             samba_deps     = to_list('roken replace'),
+-            samba_includes = includes + ["/usr/include/heimdal"],
++            samba_includes = includes,
+             local_include  = True)
+ 
+ 
+-- 
+2.20.1
+
diff --git a/package/samba4/0007-heimdal_build-wscript_build-do-not-add-host-include-.patch b/package/samba4/0007-heimdal_build-wscript_build-do-not-add-host-include-.patch
deleted file mode 100644 (file)
index 08d8382..0000000
--- a/package/samba4/0007-heimdal_build-wscript_build-do-not-add-host-include-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 189440643157fbc872a1670b3e30b6c459dbd930 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 21 Jul 2019 15:12:03 +0200
-Subject: [PATCH] heimdal_build/wscript_build: do not add host include
- patch
-
-Fixes cross-compile.
-
-Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13856
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- source4/heimdal_build/wscript_build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
-index 45938b88315..e896c3e9454 100644
---- a/source4/heimdal_build/wscript_build
-+++ b/source4/heimdal_build/wscript_build
-@@ -131,7 +131,7 @@ def HEIMDAL_ASN1(name, source,
-             samba_cflags   = CURRENT_CFLAGS(bld, name, ''),
-             depends_on     = '',
-             samba_deps     = to_list('roken replace'),
--            samba_includes = includes + ["/usr/include/heimdal"],
-+            samba_includes = includes,
-             local_include  = True)
- 
- 
--- 
-2.20.1
-
diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash
index 399fa2815948a43b09d8f10b2607e844b045d434..fbc680cb326591350b52d98d66ae48aae0f86bfb 100644 (file)
--- 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 072bb2c7c0f7d4b09b6b1d730985ba7f7f8fbb28..1d097f1d48bb2c1a4f9b602937df88b3d3595321 100644 (file)
--- 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