From c7f33aa9d12b3c756a9aae9325ffc9a53d06bb5c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 27 Nov 2017 07:24:06 +0100 Subject: 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 Signed-off-by: Thomas Petazzoni --- package/samba4/0001-libreplace-disable-libbsd-support.patch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'package/samba4/0001-libreplace-disable-libbsd-support.patch') diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index 4d0c770af4..ed6accfca1 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -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 +(rebased for version 4.7.3) +Signed-off-by: Bernd Kuhls --- 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'): -- cgit v1.2.3