diff options
| author | Roberto Oliveira <robertoguimaraes8@gmail.com> | 2018-06-24 10:11:44 +0000 |
|---|---|---|
| committer | Roberto Oliveira <robertoguimaraes8@gmail.com> | 2018-06-24 10:11:44 +0000 |
| commit | d34bdff6f15392a821d5695afbe8143e0d7b41f5 (patch) | |
| tree | 9333c0548fb040bb7501d8603ca33816915d0ed0 /community/gsoap | |
| parent | 5ec10636b6e714a88d64fa59c1473b41531efe08 (diff) | |
| download | aports-d34bdff6f15392a821d5695afbe8143e0d7b41f5.tar.bz2 aports-d34bdff6f15392a821d5695afbe8143e0d7b41f5.tar.xz | |
community/gsoap: upgrade to 2.8.67
remove libressl patch that is already applied upstream
Diffstat (limited to 'community/gsoap')
| -rw-r--r-- | community/gsoap/APKBUILD | 8 | ||||
| -rw-r--r-- | community/gsoap/libressl.patch | 40 |
2 files changed, 3 insertions, 45 deletions
diff --git a/community/gsoap/APKBUILD b/community/gsoap/APKBUILD index 64884a8398..b59b33074c 100644 --- a/community/gsoap/APKBUILD +++ b/community/gsoap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: <xmingske@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gsoap -pkgver=2.8.66 +pkgver=2.8.67 pkgrel=0 arch="all" pkgdesc="Cross-platform C and C++ SDK for SOAP/XML Web services" @@ -11,7 +11,6 @@ makedepends="autoconf automake bison flex libressl-dev libtool zlib-dev" subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/project/gsoap2/gsoap-${pkgver%.*}/gsoap_$pkgver.zip musl-fixes.patch - libressl.patch " builddir="$srcdir/$pkgname-${pkgver%.*}" @@ -32,6 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee2ee5a8acc1d3a8da51296e940d6e239effcbb3d69516b94394edf74ba18549367bc450d3e36aebc8c3dc94cf0326b0a4420b9c41e0ba09935178378e2e0d09 gsoap_2.8.66.zip -cb276ffdd213f3626f212f304628d0e91974e493afd325bb324031d5e5ee2cb1de0f57d69da1608320f8e999984c64700fe9273ecdba97401366f662ac15d423 musl-fixes.patch -a0892700b55562880a58cd8411fb3386a2ae1785c9212a59d0d1c8ccdfa86553bb8d6fb3dd6c923453a1a47c586edbc924c6e7bd4f2436948693e39bd3b1ec73 libressl.patch" +sha512sums="57c2f0cadebfe81395335d30de181a218a0bf2305854f6297ca6593560b24cac7c02d2546c3c4bd823d796f0df7d8218306a836d11c87f94138d763e1a377feb gsoap_2.8.67.zip +cb276ffdd213f3626f212f304628d0e91974e493afd325bb324031d5e5ee2cb1de0f57d69da1608320f8e999984c64700fe9273ecdba97401366f662ac15d423 musl-fixes.patch" diff --git a/community/gsoap/libressl.patch b/community/gsoap/libressl.patch deleted file mode 100644 index f0aff5ba21..0000000000 --- a/community/gsoap/libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/gsoap/plugin/smdevp.c b/gsoap/plugin/smdevp.c -index a42d7be..193f470 100644 ---- a/gsoap/plugin/smdevp.c -+++ b/gsoap/plugin/smdevp.c -@@ -479,7 +479,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data *data, int alg, const void - /* allocate and init the OpenSSL HMAC or EVP_MD context */ - if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX)); - if (data->ctx) - HMAC_CTX_init((HMAC_CTX*)data->ctx); -@@ -489,7 +489,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data *data, int alg, const void - } - else - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX)); - if (data->ctx) - EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx); -@@ -642,7 +642,7 @@ soap_smd_final(struct soap *soap, struct soap_smd_data *data, char *buf, int *le - *len = (int)n; - } - /* cleanup */ --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); - else -@@ -687,7 +687,7 @@ soap_smd_check(struct soap *soap, struct soap_smd_data *data, int ok, const char - } - if (data->ctx) - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(OPENSSL_VERSION_NUMBER) - if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); - else |