summaryrefslogtreecommitdiffstats
path: root/src/gsoap-1-fixes.patch
blob: b046df7532505ec54367dca73eaae4941c944beb (plain)
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
This file is part of MXE.
See index.html for further information.

Contains ad hoc patches for cross building.

From 538418ded4554eec40b6a889d58cfbb493cd9a2c 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/3] support static linking to ntlm


diff --git a/configure b/configure
index 6ac9ee7..0570bb6 100755
--- a/configure
+++ b/configure
@@ -4822,7 +4822,7 @@ case "${host}" in
 			;;
 	*-*-cygwin*)	platform=CYGWIN ;;
 	*-*-mingw*)	platform=MINGW
-			SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32"
+			SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32"
 			;;
         *-*-freebsd*)   platform=FREEBSD ;;
         *-*-openbsd*)   platform=OPENBSD ;;
-- 
1.7.11.4


From 41c709c382a1aa268c85d98df65562eb4563d640 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/3] ntlm support in .pc files


diff --git a/gsoap++.pc.in b/gsoap++.pc.in
index 035afd9..3411d55 100644
--- a/gsoap++.pc.in
+++ b/gsoap++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services
 Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lgsoap++ @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 e2607aa..96a54b9 100644
--- a/gsoap.pc.in
+++ b/gsoap.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services
 Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lgsoap @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 cb03e2f..b349049 100644
--- a/gsoapck++.pc.in
+++ b/gsoapck++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with Cookies Enabled
 Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lgsoapck++ @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 859a922..e5ce5eb 100644
--- a/gsoapck.pc.in
+++ b/gsoapck.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services with Cookies Enabled
 Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lgsoapck @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 391d820..791408a 100644
--- a/gsoapssl++.pc.in
+++ b/gsoapssl++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with SSL and ZLIB
 Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in
index 79c940a..17c9ee3 100644
--- a/gsoapssl.pc.in
+++ b/gsoapssl.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services with SSL and ZLIB
 Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
-- 
1.7.11.4


From 3b8d0a7db13b9c607e66c6a9d5455f26576d80fd Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 20 Aug 2012 13:12:49 +0200
Subject: [PATCH 3/3] fix MINGW compatibility

taken from
https://sourceforge.net/tracker/?func=detail&aid=3559816&group_id=52781&atid=468023

diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
index 8718592..ab5bed4 100644
--- a/gsoap/stdsoap2.h
+++ b/gsoap/stdsoap2.h
@@ -2195,13 +2195,13 @@ soap_wchar soap_get1(struct soap*);
  SOAP_FMAC1 unsigned long SOAP_FMAC2 soap_strtoul(const char *s, char **t, int b);
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
 # define soap_strtoll _strtoi64
 #else
 # define soap_strtoll strtoll
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
 # define soap_strtoull _strtoui64
 #else
 # define soap_strtoull strtoull
-- 
1.7.11.4