[Buildroot] [git commit] package/samba4: drop third patch
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2021-12-02 17:40:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=5847208213952c5d2e1ce44d2db19ead9706d5d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop third patch as it is not needed when using compile_et from heimdal instead of compile_et from e2fprogs as spotted by upstream in: https://bugzilla.samba.org/show_bug.cgi?id=13856#c20 Signed-off-by: Fabrice Fontaine <redacted> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/samba4/0003-Fix-unistd.h-include.patch | 38 ---------------------- ...e_test.c-include-stdint.h-before-cmoka.h.patch} | 0 ...uild.patch => 0004-dcesrv_core-fix-build.patch} | 0 3 files changed, 38 deletions(-)
diff --git a/package/samba4/0003-Fix-unistd.h-include.patch b/package/samba4/0003-Fix-unistd.h-include.patch
deleted file mode 100644
index f01b899a18..0000000000
--- a/package/samba4/0003-Fix-unistd.h-include.patch
+++ /dev/null@@ -1,38 +0,0 @@ -From 85c33f89df8607ace0707e1360ff0f79f3e8f5f3 Mon Sep 17 00:00:00 2001 -From: Andy Walsh <andy.walsh44+github@gmail.com> -Date: Wed, 6 Nov 2019 19:28:30 +0100 -Subject: [PATCH] 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/Andy2244/openwrt-extra/blob/samba-4.10/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> ---- - lib/replace/replace.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/lib/replace/replace.h b/lib/replace/replace.h -index 1658465866e..e6768c4ae51 100644 ---- a/lib/replace/replace.h -+++ b/lib/replace/replace.h -@@ -168,10 +168,6 @@ - #include <bsd/unistd.h> - #endif - --#ifdef HAVE_UNISTD_H --#include <unistd.h> --#endif -- - #ifdef HAVE_STRING_H - #include <string.h> - #endif --- -2.20.1 -
diff --git a/package/samba4/0004-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch b/package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch
similarity index 100%
rename from package/samba4/0004-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch
rename to package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch
diff --git a/package/samba4/0005-dcesrv_core-fix-build.patch b/package/samba4/0004-dcesrv_core-fix-build.patch
similarity index 100%
rename from package/samba4/0005-dcesrv_core-fix-build.patch
rename to package/samba4/0004-dcesrv_core-fix-build.patch_______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot