Skip to contentSkip to conversation

package/samba4: bump version to 4.7.3

PATCH New Bernd Kuhls 2 participants 2 messages Nov 27, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/samba4: bump version to 4.7.3

Rebased 0001-libreplace-disable-libbsd-support.patch.

Added iconv-related entry to samba4-cache.txt to fix configure error:
Cross answers file
/home/buildroot/test-samba4/armv5-ctng-linux-gnueabi/build/samba4-4.7.3/cache.txt is incomplete

with this defconfig

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PACKAGE_LIBICONV=y
BR2_PACKAGE_SAMBA4=y
BR2_PACKAGE_SAMBA4_AD_DC=y
BR2_PACKAGE_SAMBA4_ADS=y
BR2_PACKAGE_SAMBA4_SMBTORTURE=y

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/samba4/0001-libreplace-disable-libbsd-support.patch | 11 +++++++----
 package/samba4/samba4-cache.txt                             |  1 +
 package/samba4/samba4.hash                                  |  2 +-
 package/samba4/samba4.mk                                    |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
package/samba4/0001-libreplace-disable-libbsd-support.patch +7 -4
index 4d0c770af4..ed6accfca1 100644
@@ -9,6 +9,8 @@ This causes redefinition conflicts for link(2) when both standard
 unistd.h and bsd/unistd.h get included.
 
 Signed-off-by: Gustavo Zacarias <[email protected]>
+(rebased for version 4.7.3)
+Signed-off-by: Bernd Kuhls <[email protected]>
 ---
  lib/replace/wscript | 12 ------------
  1 file changed, 12 deletions(-)

@@ -17,14 +19,15 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript
 index 1dfd902..456be9b 100644
 --- a/lib/replace/wscript
 +++ b/lib/replace/wscript
-@@ -248,18 +248,6 @@ def configure(conf):
+@@ -253,19 +253,6 @@
  
-     conf.CHECK_FUNCS('prctl dirname basename')
+     strlcpy_in_bsd = False
  
 -    # libbsd on some platforms provides strlcpy and strlcat
 -    if not conf.CHECK_FUNCS('strlcpy strlcat'):
--        conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
--                checklibc=True)
+-        if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
+-                               checklibc=True):
+-            strlcpy_in_bsd = True
 -    if not conf.CHECK_FUNCS('getpeereid'):
 -        conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
 -    if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
package/samba4/samba4-cache.txt +1 -0
index 3ba8a75ea6..4a6471dd7a 100644
@@ -37,3 +37,4 @@ Checking value of NSIG: "65"
 Checking value of _NSIG: "65"
 Checking value of SIGRTMAX: "64"
 Checking value of SIGRTMIN: "34"
+Checking errno of iconv for illegal multibyte sequence: "0"
package/samba4/samba4.hash +1 -1
index 7446b1bdb8..49122c60cb 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 c31db4aad82f0b9588ef6c4b4dab5dce3fa1787bd298e62d953c2628bb1af21a  samba-4.6.9.tar.gz
+sha256 06e4152ca1cb803f005e92eb6baedb6cc874998b44ee37c2a7819e77a55bfd2c  samba-4.7.3.tar.gz
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
package/samba4/samba4.mk +1 -1
index 7502fa6a13..f7dd30cd3e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA4_VERSION = 4.6.9
+SAMBA4_VERSION = 4.7.3
 SAMBA4_SITE = https://download.samba.org/pub/samba/stable
 SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
 SAMBA4_INSTALL_STAGING = YES
Signature · 1 line
2.11.0
Applied
#1 lore raw

PATCH 1/1 package/samba4: bump version to 4.7.3

Hello,

Quoted 16 lines · Bernd Kuhls

Rebased 0001-libreplace-disable-libbsd-support.patch.

Added iconv-related entry to samba4-cache.txt to fix configure error:
Cross answers file
/home/buildroot/test-samba4/armv5-ctng-linux-gnueabi/build/samba4-4.7.3/cache.txt is incomplete

with this defconfig

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PACKAGE_LIBICONV=y
BR2_PACKAGE_SAMBA4=y
BR2_PACKAGE_SAMBA4_AD_DC=y
BR2_PACKAGE_SAMBA4_ADS=y
BR2_PACKAGE_SAMBA4_SMBTORTURE=y

Quoted 7 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/samba4/0001-libreplace-disable-libbsd-support.patch | 11 +++++++----
 package/samba4/samba4-cache.txt                             |  1 +
 package/samba4/samba4.hash                                  |  2 +-
 package/samba4/samba4.mk                                    |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com