Mercurial > mxe-octave

changeset 2114:5b886542c865

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package gsoap
author Mark Brand <mabrand@mabrand.nl>
date Sun, 20 Nov 2011 16:58:42 +0100
parents 654060a2d416
children a6f0aed4afde
files src/gsoap-1-fixes.patch src/gsoap.mk
diffstat 2 files changed, 2 insertions(+), 115 deletions(-) [+]
line wrap: on
line diff
--- a/src/gsoap-1-fixes.patch	Mon Nov 21 02:44:08 2011 +1100
+++ b/src/gsoap-1-fixes.patch	Sun Nov 20 16:58:42 2011 +0100
@@ -107,116 +107,3 @@
 1.7.7
 
 
-From bdaf871136077ba282b1824eb7765143ccf4b40d Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Mon, 7 Nov 2011 14:43:55 +0100
-Subject: [PATCH 3/3] fix base64 encoding for Basic Authentication
-
-taken from:
-https://sourceforge.net/tracker/?func=detail&aid=3434518&group_id=52781&atid=468023
----
- gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp  |    4 ++--
- gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp |    4 ++--
- gsoap/stdsoap2.c                                   |    4 ++--
- gsoap/stdsoap2.cpp                                 |    4 ++--
- 4 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
-index 83405cd..71838e9 100644
---- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
-+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
-@@ -5684,8 +5684,8 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
-     else
- #endif
-     { strcpy(soap->tmpbuf, "Basic ");
--      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-       sprintf(soap->tmpbuf + 262, "%s:%s", soap->userid, soap->passwd);
-+      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-     }
-     if ((err = soap->fposthdr(soap, "Authorization", soap->tmpbuf)))
-       return err;
-@@ -5698,8 +5698,8 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
-     else
- #endif
-     { strcpy(soap->tmpbuf, "Basic ");
--      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-       sprintf(soap->tmpbuf + 262, "%s:%s", soap->proxy_userid, soap->proxy_passwd);
-+      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-     }
-     if ((err = soap->fposthdr(soap, "Proxy-Authorization", soap->tmpbuf)))
-       return err;
-diff --git a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
-index 83405cd..71838e9 100644
---- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
-+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
-@@ -5684,8 +5684,8 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
-     else
- #endif
-     { strcpy(soap->tmpbuf, "Basic ");
--      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-       sprintf(soap->tmpbuf + 262, "%s:%s", soap->userid, soap->passwd);
-+      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-     }
-     if ((err = soap->fposthdr(soap, "Authorization", soap->tmpbuf)))
-       return err;
-@@ -5698,8 +5698,8 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
-     else
- #endif
-     { strcpy(soap->tmpbuf, "Basic ");
--      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-       sprintf(soap->tmpbuf + 262, "%s:%s", soap->proxy_userid, soap->proxy_passwd);
-+      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-     }
-     if ((err = soap->fposthdr(soap, "Proxy-Authorization", soap->tmpbuf)))
-       return err;
-diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c
-index 83405cd..71838e9 100644
---- a/gsoap/stdsoap2.c
-+++ b/gsoap/stdsoap2.c
-@@ -5684,8 +5684,8 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
-     else
- #endif
-     { strcpy(soap->tmpbuf, "Basic ");
--      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-       sprintf(soap->tmpbuf + 262, "%s:%s", soap->userid, soap->passwd);
-+      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-     }
-     if ((err = soap->fposthdr(soap, "Authorization", soap->tmpbuf)))
-       return err;
-@@ -5698,8 +5698,8 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
-     else
- #endif
-     { strcpy(soap->tmpbuf, "Basic ");
--      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-       sprintf(soap->tmpbuf + 262, "%s:%s", soap->proxy_userid, soap->proxy_passwd);
-+      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-     }
-     if ((err = soap->fposthdr(soap, "Proxy-Authorization", soap->tmpbuf)))
-       return err;
-diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp
-index 83405cd..71838e9 100644
---- a/gsoap/stdsoap2.cpp
-+++ b/gsoap/stdsoap2.cpp
-@@ -5684,8 +5684,8 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
-     else
- #endif
-     { strcpy(soap->tmpbuf, "Basic ");
--      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-       sprintf(soap->tmpbuf + 262, "%s:%s", soap->userid, soap->passwd);
-+      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-     }
-     if ((err = soap->fposthdr(soap, "Authorization", soap->tmpbuf)))
-       return err;
-@@ -5698,8 +5698,8 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
-     else
- #endif
-     { strcpy(soap->tmpbuf, "Basic ");
--      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-       sprintf(soap->tmpbuf + 262, "%s:%s", soap->proxy_userid, soap->proxy_passwd);
-+      soap_s2base64(soap, (const unsigned char*)(soap->tmpbuf + 262), soap->tmpbuf + 6, (int)strlen(soap->tmpbuf + 262));
-     }
-     if ((err = soap->fposthdr(soap, "Proxy-Authorization", soap->tmpbuf)))
-       return err;
--- 
-1.7.7
-
--- a/src/gsoap.mk	Mon Nov 21 02:44:08 2011 +1100
+++ b/src/gsoap.mk	Sun Nov 20 16:58:42 2011 +0100
@@ -4,8 +4,8 @@
 # gSOAP
 PKG             := gsoap
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.4
-$(PKG)_CHECKSUM := fea8734c83c2b5f9d07c44c556b27a6ce7ff0649
+$(PKG)_VERSION  := 2.8.5
+$(PKG)_CHECKSUM := 500b87b26d67e11c8b372f23d07e02ab0ecc4610
 $(PKG)_SUBDIR   := gsoap-$(call SHORT_PKG_VERSION,$(PKG))
 $(PKG)_FILE     := gsoap_$($(PKG)_VERSION).zip
 $(PKG)_WEBSITE  := http://gsoap2.sourceforge.net/