Normalize sysincls in uWSGI, libuv and apache

commit_hash:8f7b3a0c4aea56570651888e16317f5123ab20eb

5 files changed, 130 insertions, 24 deletions

diff --git a/build/sysincl/darwin.yml b/build/sysincl/darwin.yml
index 0aaac646e5..06eaa50480 100644
--- a/build/sysincl/darwin.yml
+++ b/build/sysincl/darwin.yml
@@ -18,7 +18,6 @@
   # - pcap/pcap.h
   # - sasl/sasl.h
   # - sasl/saslutil.h
-  # - uuid/uuid.h
   # - zconf.h
 
   - Availability.h
@@ -174,6 +173,7 @@
   - timeconv.h
   - tzfile.h
   - util.h
+  - uuid/uuid.h
   - vis.h
   - xpc/xpc.h
 
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index bd44e8f8dc..aff59159af 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -9,6 +9,7 @@
 
 - includes:
   - cudnn.h:         contrib/libs/nvidia/cudnn/cudnn.h
+  - uuid/uuid.h:     contrib/libs/uuid/include/uuid/uuid.h
 
 # _cgo_export.h is generated into build dir of go package which uses cgo
 # and we are unable to resolve it correctly to whcih build dir to resolve
@@ -228,15 +229,6 @@
     - sqltypes.h
     - sqlucode.h
 
-- source_filter: "^contrib/libs/(apache/apr|llvm)"
-  includes:
-    - uuid.h
-    - uuid/uuid.h
-
-- source_filter: "^contrib/deprecated/glib"
-  includes:
-    - configmake.h
-
 - source_filter: "^contrib/libs/authparser"
   includes:
     - settings.h
@@ -245,10 +237,6 @@
   includes:
     - tbb/tbb_stddef.h
 
-- source_filter: "^contrib/libs/deprecated"
-  includes:
-    - hdf5.h
-
 - source_filter: "^contrib/libs/freetype"
   includes:
     - hb-ot.h
@@ -268,12 +256,6 @@
     - magic.h
     - xmlparse.h
 
-- source_filter: "^contrib/python/uWSGI"
-  includes:
-    - libxml/parser.h
-    - libxml/tree.h
-    - uuid/uuid.h
-
 - source_filter: "^contrib/tools/python"
   includes:
     - ioctl.h
@@ -559,3 +541,7 @@
     - netdb.h: smart_devices/third_party/beken_freertos_sdk/beken378/func/lwip_intf/lwip-2.1.2/src/include/lwip/netdb.h
     - signal.h: smart_devices/third_party/beken_freertos_sdk/beken378/func/wpa_supplicant_2_9/bk_patch/signal.h
     - check_config.h: smart_devices/third_party/beken_freertos_sdk/beken378/func/mbedtls/mbedtls-2.27.0/include/mbedtls/check_config.h
+
+- source_filter: "^sdg/sdc"
+  includes:
+    - uuid/uuid.h: sdg/sdc/contrib/uuid/uuid/uuid.h
diff --git a/build/sysincl/unsorted.yml b/build/sysincl/unsorted.yml
index d77ea088ee..3cd9e2039b 100644
--- a/build/sysincl/unsorted.yml
+++ b/build/sysincl/unsorted.yml
@@ -154,10 +154,6 @@
   - vasprintf.h
   #endif
 
-- source_filter: "^contrib/(libs/(apache|libuv)|python/uWSGI)"
-  includes:
-  - port.h
-
 - includes:
   - cpu-features.h
   - cpuid.h
diff --git a/contrib/libs/uuid/include/uuid/uuid.h b/contrib/libs/uuid/include/uuid/uuid.h
new file mode 100644
index 0000000000..834c1d4e6e
--- /dev/null
+++ b/contrib/libs/uuid/include/uuid/uuid.h
@@ -0,0 +1 @@
+#include "../../libuuid/src/uuid.h" /* inclink generated by yamaker */
diff --git a/contrib/libs/uuid/libuuid/src/uuid.h b/contrib/libs/uuid/libuuid/src/uuid.h
new file mode 100644
index 0000000000..e791abf678
--- /dev/null
+++ b/contrib/libs/uuid/libuuid/src/uuid.h
@@ -0,0 +1,123 @@
+/*
+ * Public include file for the UUID library
+ *
+ * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#ifndef _UL_LIBUUID_UUID_H
+#define _UL_LIBUUID_UUID_H
+
+#include <sys/types.h>
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+#include <time.h>
+
+typedef unsigned char uuid_t[16];
+
+/* UUID Variant definitions */
+#define UUID_VARIANT_NCS	0
+#define UUID_VARIANT_DCE	1
+#define UUID_VARIANT_MICROSOFT	2
+#define UUID_VARIANT_OTHER	3
+
+#define UUID_VARIANT_SHIFT	5
+#define UUID_VARIANT_MASK     0x7
+
+/* UUID Type definitions */
+#define UUID_TYPE_DCE_NIL    0
+#define UUID_TYPE_DCE_TIME   1
+#define UUID_TYPE_DCE_SECURITY 2
+#define UUID_TYPE_DCE_MD5    3
+#define UUID_TYPE_DCE_RANDOM 4
+#define UUID_TYPE_DCE_SHA1   5
+
+#define UUID_TYPE_SHIFT      4
+#define UUID_TYPE_MASK     0xf
+
+#define UUID_STR_LEN	37
+
+/* Allow UUID constants to be defined */
+#ifdef __GNUC__
+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
+	static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
+#else
+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
+	static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* clear.c */
+extern void uuid_clear(uuid_t uu);
+
+/* compare.c */
+extern int uuid_compare(const uuid_t uu1, const uuid_t uu2);
+
+/* copy.c */
+extern void uuid_copy(uuid_t dst, const uuid_t src);
+
+/* gen_uuid.c */
+extern void uuid_generate(uuid_t out);
+extern void uuid_generate_random(uuid_t out);
+extern void uuid_generate_time(uuid_t out);
+extern int uuid_generate_time_safe(uuid_t out);
+
+extern void uuid_generate_md5(uuid_t out, const uuid_t ns, const char *name, size_t len);
+extern void uuid_generate_sha1(uuid_t out, const uuid_t ns, const char *name, size_t len);
+
+/* isnull.c */
+extern int uuid_is_null(const uuid_t uu);
+
+/* parse.c */
+extern int uuid_parse(const char *in, uuid_t uu);
+extern int uuid_parse_range(const char *in_start, const char *in_end, uuid_t uu);
+
+/* unparse.c */
+extern void uuid_unparse(const uuid_t uu, char *out);
+extern void uuid_unparse_lower(const uuid_t uu, char *out);
+extern void uuid_unparse_upper(const uuid_t uu, char *out);
+
+/* uuid_time.c */
+extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
+extern int uuid_type(const uuid_t uu);
+extern int uuid_variant(const uuid_t uu);
+
+/* predefined.c */
+extern const uuid_t *uuid_get_template(const char *alias);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UL_LIBUUID_UUID_H */