1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 23 Oct 2011 21:36:53 +0200
Subject: [PATCH 1/4] support static linking to ntlm
diff --git a/configure b/configure
index 1111111..2222222 100755
--- a/configure
+++ b/configure
@@ -5132,8 +5132,8 @@ case "${host}" in
;;
*-*-cygwin*) platform=CYGWIN ;;
*-*-mingw*) platform=MINGW
- SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
- WSDL2H_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
+ SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
+ WSDL2H_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
;;
*-*-freebsd*) platform=FREEBSD ;;
*-*-openbsd*) platform=OPENBSD ;;
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Oct 2011 11:17:13 +0200
Subject: [PATCH 2/4] ntlm support in .pc files
diff --git a/gsoap++.pc.in b/gsoap++.pc.in
index 1111111..2222222 100644
--- a/gsoap++.pc.in
+++ b/gsoap++.pc.in
@@ -9,4 +9,4 @@ Version: 2.8.109
Requires:
Libs: -L${libdir} -lgsoap++
Libs.private: @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoap.pc.in b/gsoap.pc.in
index 1111111..2222222 100644
--- a/gsoap.pc.in
+++ b/gsoap.pc.in
@@ -9,4 +9,4 @@ Version: 2.8.109
Requires:
Libs: -L${libdir} -lgsoap
Libs.private: @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapck++.pc.in b/gsoapck++.pc.in
index 1111111..2222222 100644
--- a/gsoapck++.pc.in
+++ b/gsoapck++.pc.in
@@ -9,4 +9,4 @@ Version: 2.8.109
Requires:
Libs: -L${libdir} -lgsoapck++
Libs.private: @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapck.pc.in b/gsoapck.pc.in
index 1111111..2222222 100644
--- a/gsoapck.pc.in
+++ b/gsoapck.pc.in
@@ -9,4 +9,4 @@ Version: 2.8.109
Requires:
Libs: -L${libdir} -lgsoapck
Libs.private: @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in
index 1111111..2222222 100644
--- a/gsoapssl++.pc.in
+++ b/gsoapssl++.pc.in
@@ -9,4 +9,4 @@ Version: 2.8.109
Requires:
Libs: -L${libdir} -lgsoapssl++
Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ @WSDL2H_EXTRA_FLAGS@ -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ @WSDL2H_EXTRA_FLAGS@ -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in
index 1111111..2222222 100644
--- a/gsoapssl.pc.in
+++ b/gsoapssl.pc.in
@@ -9,4 +9,4 @@ Version: 2.8.109
Requires:
Libs: -L${libdir} -lgsoapssl
Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ @WSDL2H_EXTRA_FLAGS@ -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ @WSDL2H_EXTRA_FLAGS@ -DWITH_DOM -DWITH_NTLM -I${includedir}
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 1 Feb 2017 12:32:00 +1100
Subject: [PATCH 3/4] workaround for building on newer OSX, can be removed in
next update.
similar to https://github.com/unbit/uwsgi/pull/966
diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
index 1111111..2222222 100644
--- a/gsoap/stdsoap2.h
+++ b/gsoap/stdsoap2.h
@@ -3628,6 +3628,12 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_putsetcookies(struct soap *soap);
SOAP_FMAC1 int SOAP_FMAC2 soap_putcookies(struct soap *soap, const char *domain, const char *path, int secure);
#endif
+#ifdef TCP_FASTOPEN
+ #ifndef SOL_TCP
+ #define SOL_TCP IPPROTO_TCP
+ #endif
+#endif
+
#ifdef __cplusplus
} /* extern "C" */
#endif
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 17 Sep 2019 23:06:42 +0200
Subject: [PATCH 4/4] fix pthreads with MINGW
diff --git a/gsoap/plugin/threads.h b/gsoap/plugin/threads.h
index 1111111..2222222 100644
--- a/gsoap/plugin/threads.h
+++ b/gsoap/plugin/threads.h
@@ -102,7 +102,7 @@ The threads.h and threads.c code define the following portable API:
*
\******************************************************************************/
-#if defined(WIN32)
+#if defined(WIN32) && !defined(MINGW)
# define THREAD_TYPE HANDLE
# define THREAD_ID GetCurrentThreadId()
# define THREAD_CREATE(x,y,z) ((*(x) = (HANDLE)_beginthread((void(__cdecl*)(void*))(y), 0, (z))) == (HANDLE)-1L)
|
