Skip to content

Commit d969a26

Browse files
robot-clickhouserobot-clickhouse
committed
Backport #81187 to 25.5: Bump libxml2 to 2.14.3
1 parent 2627056 commit d969a26

5 files changed

Lines changed: 70 additions & 426 deletions

File tree

‎contrib/libxml2‎

Submodule libxml2 updated 1530 files

‎contrib/libxml2-cmake/CMakeLists.txt‎

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,42 @@ set(LIBXML2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libxml2")
22
set(LIBXML2_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/libxml2")
33

44
set(SRCS
5-
"${LIBXML2_SOURCE_DIR}/SAX.c"
6-
"${LIBXML2_SOURCE_DIR}/entities.c"
5+
"${LIBXML2_SOURCE_DIR}/buf.c"
6+
"${LIBXML2_SOURCE_DIR}/chvalid.c"
7+
"${LIBXML2_SOURCE_DIR}/dict.c"
78
"${LIBXML2_SOURCE_DIR}/encoding.c"
9+
"${LIBXML2_SOURCE_DIR}/entities.c"
810
"${LIBXML2_SOURCE_DIR}/error.c"
9-
"${LIBXML2_SOURCE_DIR}/parserInternals.c"
10-
"${LIBXML2_SOURCE_DIR}/parser.c"
11-
"${LIBXML2_SOURCE_DIR}/tree.c"
11+
"${LIBXML2_SOURCE_DIR}/globals.c"
1212
"${LIBXML2_SOURCE_DIR}/hash.c"
1313
"${LIBXML2_SOURCE_DIR}/list.c"
14-
"${LIBXML2_SOURCE_DIR}/xmlIO.c"
15-
"${LIBXML2_SOURCE_DIR}/xmlmemory.c"
14+
"${LIBXML2_SOURCE_DIR}/parser.c"
15+
"${LIBXML2_SOURCE_DIR}/parserInternals.c"
16+
"${LIBXML2_SOURCE_DIR}/SAX2.c"
17+
"${LIBXML2_SOURCE_DIR}/threads.c"
18+
"${LIBXML2_SOURCE_DIR}/tree.c"
1619
"${LIBXML2_SOURCE_DIR}/uri.c"
1720
"${LIBXML2_SOURCE_DIR}/valid.c"
18-
"${LIBXML2_SOURCE_DIR}/xlink.c"
19-
"${LIBXML2_SOURCE_DIR}/HTMLparser.c"
20-
"${LIBXML2_SOURCE_DIR}/HTMLtree.c"
21-
"${LIBXML2_SOURCE_DIR}/debugXML.c"
21+
"${LIBXML2_SOURCE_DIR}/xmlIO.c"
22+
"${LIBXML2_SOURCE_DIR}/xmlmemory.c"
23+
"${LIBXML2_SOURCE_DIR}/xmlstring.c"
24+
"${LIBXML2_SOURCE_DIR}/pattern.c"
25+
"${LIBXML2_SOURCE_DIR}/xmlreader.c"
26+
"${LIBXML2_SOURCE_DIR}/xinclude.c"
2227
"${LIBXML2_SOURCE_DIR}/xpath.c"
28+
"${LIBXML2_SOURCE_DIR}/xlink.c"
2329
"${LIBXML2_SOURCE_DIR}/xpointer.c"
24-
"${LIBXML2_SOURCE_DIR}/xinclude.c"
25-
"${LIBXML2_SOURCE_DIR}/nanohttp.c"
26-
"${LIBXML2_SOURCE_DIR}/nanoftp.c"
27-
"${LIBXML2_SOURCE_DIR}/catalog.c"
28-
"${LIBXML2_SOURCE_DIR}/globals.c"
29-
"${LIBXML2_SOURCE_DIR}/threads.c"
30-
"${LIBXML2_SOURCE_DIR}/c14n.c"
31-
"${LIBXML2_SOURCE_DIR}/xmlstring.c"
32-
"${LIBXML2_SOURCE_DIR}/buf.c"
33-
"${LIBXML2_SOURCE_DIR}/xmlregexp.c"
3430
"${LIBXML2_SOURCE_DIR}/xmlschemas.c"
3531
"${LIBXML2_SOURCE_DIR}/xmlschemastypes.c"
32+
"${LIBXML2_SOURCE_DIR}/xmlregexp.c"
3633
"${LIBXML2_SOURCE_DIR}/xmlunicode.c"
37-
"${LIBXML2_SOURCE_DIR}/triostr.c"
38-
"${LIBXML2_SOURCE_DIR}/xmlreader.c"
3934
"${LIBXML2_SOURCE_DIR}/relaxng.c"
40-
"${LIBXML2_SOURCE_DIR}/dict.c"
41-
"${LIBXML2_SOURCE_DIR}/SAX2.c"
35+
"${LIBXML2_SOURCE_DIR}/catalog.c"
36+
"${LIBXML2_SOURCE_DIR}/HTMLparser.c"
37+
"${LIBXML2_SOURCE_DIR}/HTMLtree.c"
4238
"${LIBXML2_SOURCE_DIR}/xmlwriter.c"
43-
"${LIBXML2_SOURCE_DIR}/legacy.c"
44-
"${LIBXML2_SOURCE_DIR}/chvalid.c"
45-
"${LIBXML2_SOURCE_DIR}/pattern.c"
4639
"${LIBXML2_SOURCE_DIR}/xmlsave.c"
47-
"${LIBXML2_SOURCE_DIR}/xmlmodule.c"
48-
"${LIBXML2_SOURCE_DIR}/schematron.c"
49-
"${LIBXML2_SOURCE_DIR}/xzlib.c"
40+
"${LIBXML2_SOURCE_DIR}/debugXML.c"
5041
)
5142
add_library(_libxml2 ${SRCS})
5243

‎contrib/libxml2-cmake/README.MD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<!-- config.h and libxml/xmlversion.h is generate with the following config -->
2+
./configure CPPFLAGS="-DHAVE_GETENTROPY=0"

‎contrib/libxml2-cmake/linux_x86_64/include/config.h‎

Lines changed: 28 additions & 208 deletions
Original file line numberDiff line numberDiff line change
@@ -1,235 +1,71 @@
11
/* config.h. Generated from config.h.in by configure. */
22
/* config.h.in. Generated from configure.ac by autoheader. */
33

4-
/* Type cast for the gethostbyname() argument */
5-
#define GETHOSTBYNAME_ARG_CAST /**/
6-
7-
/* Define to 1 if you have the <arpa/inet.h> header file. */
8-
#define HAVE_ARPA_INET_H 1
9-
10-
/* Define to 1 if you have the <arpa/nameser.h> header file. */
11-
#define HAVE_ARPA_NAMESER_H 1
12-
13-
/* Whether struct sockaddr::__ss_family exists */
14-
/* #undef HAVE_BROKEN_SS_FAMILY */
15-
16-
/* Define to 1 if you have the <ctype.h> header file. */
17-
#define HAVE_CTYPE_H 1
4+
/* Define to 1 if you have the declaration of `glob', and to 0 if you don't.
5+
*/
6+
#define HAVE_DECL_GLOB 1
187

19-
/* Define to 1 if you have the <dirent.h> header file. */
20-
#define HAVE_DIRENT_H 1
8+
/* Define to 1 if you have the declaration of `mmap', and to 0 if you don't.
9+
*/
10+
#define HAVE_DECL_MMAP 1
2111

2212
/* Define to 1 if you have the <dlfcn.h> header file. */
2313
#define HAVE_DLFCN_H 1
2414

2515
/* Have dlopen based dso */
2616
#define HAVE_DLOPEN /**/
2717

28-
/* Define to 1 if you have the <dl.h> header file. */
29-
/* #undef HAVE_DL_H */
30-
31-
/* Define to 1 if you have the <errno.h> header file. */
32-
#define HAVE_ERRNO_H 1
33-
34-
/* Define to 1 if you have the <fcntl.h> header file. */
35-
#define HAVE_FCNTL_H 1
36-
37-
/* Define to 1 if you have the <float.h> header file. */
38-
#define HAVE_FLOAT_H 1
39-
40-
/* Define to 1 if you have the `fprintf' function. */
41-
#define HAVE_FPRINTF 1
42-
43-
/* Define to 1 if you have the `ftime' function. */
44-
#define HAVE_FTIME 1
45-
46-
/* Define if getaddrinfo is there */
47-
#define HAVE_GETADDRINFO /**/
48-
49-
/* Define to 1 if you have the `gettimeofday' function. */
50-
#define HAVE_GETTIMEOFDAY 1
18+
/* Define to 1 if the system has the `destructor' function attribute */
19+
#define HAVE_FUNC_ATTRIBUTE_DESTRUCTOR 1
5120

5221
/* Define to 1 if you have the <inttypes.h> header file. */
5322
#define HAVE_INTTYPES_H 1
5423

55-
/* Define to 1 if you have the `isascii' function. */
56-
#define HAVE_ISASCII 1
57-
58-
/* Define if isinf is there */
59-
#define HAVE_ISINF /**/
60-
61-
/* Define if isnan is there */
62-
#define HAVE_ISNAN /**/
63-
64-
/* Define if history library is there (-lhistory) */
24+
/* Define if history library is available */
6525
/* #undef HAVE_LIBHISTORY */
6626

67-
/* Define if pthread library is there (-lpthread) */
68-
#define HAVE_LIBPTHREAD /**/
69-
70-
/* Define if readline library is there (-lreadline) */
27+
/* Define if readline library is available */
7128
/* #undef HAVE_LIBREADLINE */
7229

73-
/* Define to 1 if you have the <limits.h> header file. */
74-
#define HAVE_LIMITS_H 1
75-
76-
/* Define to 1 if you have the `localtime' function. */
77-
#define HAVE_LOCALTIME 1
78-
7930
/* Define to 1 if you have the <lzma.h> header file. */
8031
/* #undef HAVE_LZMA_H */
8132

82-
/* Define to 1 if you have the <malloc.h> header file. */
83-
#define HAVE_MALLOC_H 1
84-
85-
/* Define to 1 if you have the <math.h> header file. */
86-
#define HAVE_MATH_H 1
87-
88-
/* Define to 1 if you have the <memory.h> header file. */
89-
#define HAVE_MEMORY_H 1
90-
91-
/* Define to 1 if you have the `mmap' function. */
92-
#define HAVE_MMAP 1
93-
94-
/* Define to 1 if you have the `munmap' function. */
95-
#define HAVE_MUNMAP 1
96-
97-
/* mmap() is no good without munmap() */
98-
#if defined(HAVE_MMAP) && !defined(HAVE_MUNMAP)
99-
# undef /**/ HAVE_MMAP
100-
#endif
101-
102-
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
103-
/* #undef HAVE_NDIR_H */
104-
105-
/* Define to 1 if you have the <netdb.h> header file. */
106-
#define HAVE_NETDB_H 1
107-
108-
/* Define to 1 if you have the <netinet/in.h> header file. */
109-
#define HAVE_NETINET_IN_H 1
110-
11133
/* Define to 1 if you have the <poll.h> header file. */
112-
#define HAVE_POLL_H 1
113-
114-
/* Define to 1 if you have the `printf' function. */
115-
#define HAVE_PRINTF 1
116-
117-
/* Define if <pthread.h> is there */
118-
#define HAVE_PTHREAD_H /**/
119-
120-
/* Define to 1 if you have the `putenv' function. */
121-
#define HAVE_PUTENV 1
122-
123-
/* Define to 1 if you have the `rand' function. */
124-
#define HAVE_RAND 1
125-
126-
/* Define to 1 if you have the `rand_r' function. */
127-
#define HAVE_RAND_R 1
34+
/* #undef HAVE_POLL_H */
12835

129-
/* Define to 1 if you have the <resolv.h> header file. */
130-
#define HAVE_RESOLV_H 1
36+
/* Define to 1 if you have the <pthread.h> header file. */
37+
#define HAVE_PTHREAD_H 1
13138

13239
/* Have shl_load based dso */
13340
/* #undef HAVE_SHLLOAD */
13441

135-
/* Define to 1 if you have the `signal' function. */
136-
#define HAVE_SIGNAL 1
137-
138-
/* Define to 1 if you have the <signal.h> header file. */
139-
#define HAVE_SIGNAL_H 1
140-
141-
/* Define to 1 if you have the `snprintf' function. */
142-
#define HAVE_SNPRINTF 1
143-
144-
/* Define to 1 if you have the `sprintf' function. */
145-
#define HAVE_SPRINTF 1
146-
147-
/* Define to 1 if you have the `srand' function. */
148-
#define HAVE_SRAND 1
149-
150-
/* Define to 1 if you have the `sscanf' function. */
151-
#define HAVE_SSCANF 1
152-
153-
/* Define to 1 if you have the `stat' function. */
154-
#define HAVE_STAT 1
155-
156-
/* Define to 1 if you have the <stdarg.h> header file. */
157-
#define HAVE_STDARG_H 1
158-
15942
/* Define to 1 if you have the <stdint.h> header file. */
16043
#define HAVE_STDINT_H 1
16144

45+
/* Define to 1 if you have the <stdio.h> header file. */
46+
#define HAVE_STDIO_H 1
47+
16248
/* Define to 1 if you have the <stdlib.h> header file. */
16349
#define HAVE_STDLIB_H 1
16450

165-
/* Define to 1 if you have the `strftime' function. */
166-
#define HAVE_STRFTIME 1
167-
16851
/* Define to 1 if you have the <strings.h> header file. */
16952
#define HAVE_STRINGS_H 1
17053

17154
/* Define to 1 if you have the <string.h> header file. */
17255
#define HAVE_STRING_H 1
17356

174-
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
175-
*/
176-
/* #undef HAVE_SYS_DIR_H */
177-
178-
/* Define to 1 if you have the <sys/mman.h> header file. */
179-
#define HAVE_SYS_MMAN_H 1
180-
181-
/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
182-
*/
183-
/* #undef HAVE_SYS_NDIR_H */
184-
185-
/* Define to 1 if you have the <sys/select.h> header file. */
186-
#define HAVE_SYS_SELECT_H 1
187-
188-
/* Define to 1 if you have the <sys/socket.h> header file. */
189-
#define HAVE_SYS_SOCKET_H 1
190-
19157
/* Define to 1 if you have the <sys/stat.h> header file. */
19258
#define HAVE_SYS_STAT_H 1
19359

194-
/* Define to 1 if you have the <sys/timeb.h> header file. */
195-
#define HAVE_SYS_TIMEB_H 1
196-
197-
/* Define to 1 if you have the <sys/time.h> header file. */
198-
#define HAVE_SYS_TIME_H 1
199-
20060
/* Define to 1 if you have the <sys/types.h> header file. */
20161
#define HAVE_SYS_TYPES_H 1
20262

203-
/* Define to 1 if you have the `time' function. */
204-
#define HAVE_TIME 1
205-
206-
/* Define to 1 if you have the <time.h> header file. */
207-
#define HAVE_TIME_H 1
208-
20963
/* Define to 1 if you have the <unistd.h> header file. */
21064
#define HAVE_UNISTD_H 1
21165

212-
/* Whether va_copy() is available */
213-
#define HAVE_VA_COPY 1
214-
215-
/* Define to 1 if you have the `vfprintf' function. */
216-
#define HAVE_VFPRINTF 1
217-
218-
/* Define to 1 if you have the `vsnprintf' function. */
219-
#define HAVE_VSNPRINTF 1
220-
221-
/* Define to 1 if you have the `vsprintf' function. */
222-
#define HAVE_VSPRINTF 1
223-
22466
/* Define to 1 if you have the <zlib.h> header file. */
22567
/* #undef HAVE_ZLIB_H */
22668

227-
/* Whether __va_copy() is available */
228-
/* #undef HAVE___VA_COPY */
229-
230-
/* Define as const if the declaration of iconv() needs const. */
231-
#define ICONV_CONST
232-
23369
/* Define to the sub-directory where libtool stores uninstalled libraries. */
23470
#define LT_OBJDIR ".libs/"
23571

@@ -240,46 +76,30 @@
24076
#define PACKAGE_BUGREPORT ""
24177

24278
/* Define to the full name of this package. */
243-
#define PACKAGE_NAME ""
79+
#define PACKAGE_NAME "libxml2"
24480

24581
/* Define to the full name and version of this package. */
246-
#define PACKAGE_STRING ""
82+
#define PACKAGE_STRING "libxml2 2.14.3"
24783

24884
/* Define to the one symbol short name of this package. */
249-
#define PACKAGE_TARNAME ""
85+
#define PACKAGE_TARNAME "libxml2"
25086

25187
/* Define to the home page for this package. */
25288
#define PACKAGE_URL ""
25389

25490
/* Define to the version of this package. */
255-
#define PACKAGE_VERSION ""
256-
257-
/* Type cast for the send() function 2nd arg */
258-
#define SEND_ARG2_CAST /**/
91+
#define PACKAGE_VERSION "2.14.3"
25992

260-
/* Define to 1 if you have the ANSI C header files. */
93+
/* Define to 1 if all of the C90 standard headers exist (not just the ones
94+
required in a freestanding environment). This macro is provided for
95+
backward compatibility; new code need not use it. */
26196
#define STDC_HEADERS 1
26297

263-
/* Support for IPv6 */
264-
#define SUPPORT_IP6 /**/
265-
266-
/* Define if va_list is an array type */
267-
#define VA_LIST_IS_ARRAY 1
268-
26998
/* Version number of package */
270-
#define VERSION "2.9.8"
271-
272-
/* Determine what socket length (socklen_t) data type is */
273-
#define XML_SOCKLEN_T socklen_t
274-
275-
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
276-
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
277-
#define below would cause a syntax error. */
278-
/* #undef _UINT32_T */
99+
#define VERSION "2.14.3"
279100

280-
/* ss_family is not defined here, use __ss_family instead */
281-
/* #undef ss_family */
101+
/* System configuration directory (/etc) */
102+
#define XML_SYSCONFDIR "/usr/local/etc"
282103

283-
/* Define to the type of an unsigned integer type of width exactly 32 bits if
284-
such a type exists and the standard includes do not define it. */
285-
/* #undef uint32_t */
104+
/* TLS specifier */
105+
/* #undef XML_THREAD_LOCAL */

0 commit comments

Comments
 (0)