From 36956153b9b5da8c0f50386298acca4c115ca122 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 2 Nov 2017 12:19:55 +0000 Subject: [PATCH 1/2] samba: update to samba-4.7.1 --- packages/network/samba/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index f068937577..9eb237060d 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="samba" -PKG_VERSION="4.7.0" -PKG_SHA256="bd16d169988eb513e685a87e9964a5210482498fa9b3a22aaa8287a061e3c936" +PKG_VERSION="4.7.1" +PKG_SHA256="7ba932523c821ebfa4c31ebd183f7aa20d663059f9761563fcdec85cd1e9be1a" PKG_ARCH="any" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" From 4d7f89c30ac871aaa9633ee79d625d0bd979b3d1 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 2 Nov 2017 13:31:17 +0000 Subject: [PATCH 2/2] samba: drop libbsd patch --- ...00-libreplace-disable-libbsd-support.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 packages/network/samba/patches/samba-000-libreplace-disable-libbsd-support.patch diff --git a/packages/network/samba/patches/samba-000-libreplace-disable-libbsd-support.patch b/packages/network/samba/patches/samba-000-libreplace-disable-libbsd-support.patch deleted file mode 100644 index 4d0c770af4..0000000000 --- a/packages/network/samba/patches/samba-000-libreplace-disable-libbsd-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fc0304ba92ec7ae9a2f75fbc31d97fee39d19665 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 7 Sep 2016 23:03:43 -0300 -Subject: [PATCH] libreplace: disable libbsd support - -Disable libbsd support, samba4 uses a global config.h for its own -codebase and that of heimdal (when building with builtin). -This causes redefinition conflicts for link(2) when both standard -unistd.h and bsd/unistd.h get included. - -Signed-off-by: Gustavo Zacarias ---- - lib/replace/wscript | 12 ------------ - 1 file changed, 12 deletions(-) - -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): - - conf.CHECK_FUNCS('prctl dirname basename') - -- # 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 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'): -- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -- - conf.CHECK_CODE(''' - struct ucred cred; - socklen_t cred_len; --- -2.7.3 -