diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-02 14:00:49 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:14 +0000 |
| commit | 648a9c6b8927b0e7c88fbd10a286b90138fff748 (patch) | |
| tree | 3493f3267675fb1ef1e78bffe01868e39fdc9ea2 /community | |
| parent | 3011be68ebf8a8f308b7851f1720bbb42510956b (diff) | |
| download | aports-648a9c6b8927b0e7c88fbd10a286b90138fff748.tar.bz2 aports-648a9c6b8927b0e7c88fbd10a286b90138fff748.tar.xz | |
community/libdroplet: rebuild against openssl-1.1
Diffstat (limited to 'community')
| -rw-r--r-- | community/libdroplet/APKBUILD | 15 | ||||
| -rw-r--r-- | community/libdroplet/openssl-1.1.patch | 24 |
2 files changed, 31 insertions, 8 deletions
diff --git a/community/libdroplet/APKBUILD b/community/libdroplet/APKBUILD index 9cdded80bc..4cf852ee9c 100644 --- a/community/libdroplet/APKBUILD +++ b/community/libdroplet/APKBUILD @@ -3,18 +3,20 @@ pkgname=libdroplet _pkgname=Droplet pkgver=2.0 -pkgrel=6 +pkgrel=7 pkgdesc="Cloud storage client library" url="http://www.scality.com" arch="all" license="BSD" depends="" depends_dev="json-c-dev" -makedepends="$depends_dev autoconf automake libtool libxml2-dev libressl-dev" +makedepends="$depends_dev autoconf automake libtool libxml2-dev openssl-dev" install="" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/scality/Droplet/archive/v$pkgver.tar.gz - libdroplet-json-c.patch" + libdroplet-json-c.patch + openssl-1.1.patch + " builddir="$srcdir"/$_pkgname-$pkgver build() { @@ -31,9 +33,6 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="82f7020eef057e21731a3f05efb2e9d5 libdroplet-2.0.tar.gz -f4e877941e6d5b3b790351b8e0975a62 libdroplet-json-c.patch" -sha256sums="7cd810e936e490289a6cbaec32a45d80ad206f9a1fbd8ad2a3b947752597a7b9 libdroplet-2.0.tar.gz -76f9caf0e29cfa25aea6da10887740ade8c0385a1541fef0b2de036314d3ea11 libdroplet-json-c.patch" sha512sums="9c580bcca80148de85d9a27cb584867401f318610badc2d82ca2cdf220678a857220a5186e888f7c81e8b7fbbeabe9c2ca93e114ca8f6d92d667894f09b53ab5 libdroplet-2.0.tar.gz -56468c69f5a4b6005ededced2ea9ff689beb74ff3cd4883289ef62390f8e82a59a946e207fe98baf0eb4bf701737d36cf86f7fcfed37a2bcf5c66ad0198f76ed libdroplet-json-c.patch" +56468c69f5a4b6005ededced2ea9ff689beb74ff3cd4883289ef62390f8e82a59a946e207fe98baf0eb4bf701737d36cf86f7fcfed37a2bcf5c66ad0198f76ed libdroplet-json-c.patch +f75f1990c04fee846a32b971134bdb0303c433234ce552974a8c6fe7163f88359e8c8099226c97dced708e9e5f85da960b317b84598695db89819aecb1e10e46 openssl-1.1.patch" diff --git a/community/libdroplet/openssl-1.1.patch b/community/libdroplet/openssl-1.1.patch new file mode 100644 index 0000000000..f0f9a422a9 --- /dev/null +++ b/community/libdroplet/openssl-1.1.patch @@ -0,0 +1,24 @@ +diff --git a/libdroplet/src/utils.c b/libdroplet/src/utils.c +index 6c0738d..b2fac52 100644 +--- a/libdroplet/src/utils.c ++++ b/libdroplet/src/utils.c +@@ -475,14 +475,13 @@ dpl_hmac_sha1(const char *key_buf, + unsigned int data_len, + char *digest_buf) + { +- HMAC_CTX ctx; ++ HMAC_CTX *ctx = HMAC_CTX_new(); + u_int digest_len; + +- HMAC_CTX_init(&ctx); +- HMAC_Init_ex(&ctx, key_buf, key_len, EVP_sha1(), NULL); +- HMAC_Update(&ctx, (u_char *) data_buf, data_len); +- HMAC_Final(&ctx, (u_char *) digest_buf, &digest_len); +- HMAC_CTX_cleanup(&ctx); ++ HMAC_Init_ex(ctx, key_buf, key_len, EVP_sha1(), NULL); ++ HMAC_Update(ctx, (u_char *) data_buf, data_len); ++ HMAC_Final(ctx, (u_char *) digest_buf, &digest_len); ++ HMAC_CTX_free(ctx); + + return digest_len; + } |