diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:08:31 +0200 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:13:17 +0200 |
commit | 721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch) | |
tree | 2967ef4e10e2592661f664df4515d67dbc80cfe5 /package/samba4/0001-libreplace-disable-libbsd-support.patch | |
parent | 89920e9735cb561dccf1e1f81d35788fd10a655b (diff) | |
parent | cec266ee1f708f11cc679cb4f81613fa4186003c (diff) | |
download | buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.zip |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/samba4/0001-libreplace-disable-libbsd-support.patch')
-rw-r--r-- | package/samba4/0001-libreplace-disable-libbsd-support.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index 4794cb02fd..ae46c447fd 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -9,17 +9,17 @@ This causes redefinition conflicts for link(2) when both standard unistd.h and bsd/unistd.h get included. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> -(rebased for versions 4.7.3 & 4.8.0) +[Bernd: rebased for versions 4.7.3, 4.8.0 & 4.8.5] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- - lib/replace/wscript | 12 ------------ - 1 file changed, 12 deletions(-) + lib/replace/wscript | 15 --------------- + 1 file changed, 15 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 1dfd902..456be9b 100644 +index 6c7de5953f0..ac230d719f7 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -296,21 +296,6 @@ +@@ -304,21 +304,6 @@ def configure(conf): strlcpy_in_bsd = False @@ -42,5 +42,5 @@ index 1dfd902..456be9b 100644 struct ucred cred; socklen_t cred_len; -- -2.7.3 +2.18.0 |