[arch-commits] Commit in serf/repos (6 files)
Anatol Pomozov
anatolik at nymeria.archlinux.org
Fri Mar 14 16:58:44 UTC 2014
Date: Friday, March 14, 2014 @ 17:58:44
Author: anatolik
Revision: 207752
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
serf/repos/testing-i686/
serf/repos/testing-i686/PKGBUILD
(from rev 207751, serf/trunk/PKGBUILD)
serf/repos/testing-i686/serf-ssl-allocator-v2.patch
(from rev 207751, serf/trunk/serf-ssl-allocator-v2.patch)
serf/repos/testing-x86_64/
serf/repos/testing-x86_64/PKGBUILD
(from rev 207751, serf/trunk/PKGBUILD)
serf/repos/testing-x86_64/serf-ssl-allocator-v2.patch
(from rev 207751, serf/trunk/serf-ssl-allocator-v2.patch)
--------------------------------------------+
testing-i686/PKGBUILD | 32 +++++++++++++++
testing-i686/serf-ssl-allocator-v2.patch | 57 +++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 32 +++++++++++++++
testing-x86_64/serf-ssl-allocator-v2.patch | 57 +++++++++++++++++++++++++++
4 files changed, 178 insertions(+)
Copied: serf/repos/testing-i686/PKGBUILD (from rev 207751, serf/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-03-14 16:58:44 UTC (rev 207752)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=serf
+pkgver=1.3.4
+pkgrel=1
+pkgdesc="High-performance asynchronous HTTP client library"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/serf/"
+license=('Apache')
+depends=('apr-util')
+makedepends=('scons')
+options=('!staticlibs')
+source=(http://serf.googlecode.com/svn/src_releases/${pkgname}-${pkgver}.zip)
+md5sums=('f2d469ac03db98781c9d414fed5368ae')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ scons PREFIX=/usr
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ scons check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ install -d "${pkgdir}/usr"
+ scons PREFIX="${pkgdir}/usr" install
+}
Copied: serf/repos/testing-i686/serf-ssl-allocator-v2.patch (from rev 207751, serf/trunk/serf-ssl-allocator-v2.patch)
===================================================================
--- testing-i686/serf-ssl-allocator-v2.patch (rev 0)
+++ testing-i686/serf-ssl-allocator-v2.patch 2014-03-14 16:58:44 UTC (rev 207752)
@@ -0,0 +1,57 @@
+Index: buckets/ssl_buckets.c
+===================================================================
+--- buckets/ssl_buckets.c (revision 2130)
++++ buckets/ssl_buckets.c (working copy)
+@@ -1192,21 +1192,16 @@
+ context->server_cert_userdata = data;
+ }
+
+-static serf_ssl_context_t *ssl_init_context(void)
++static serf_ssl_context_t *ssl_init_context(serf_bucket_alloc_t *allocator)
+ {
+ serf_ssl_context_t *ssl_ctx;
+- apr_pool_t *pool;
+- serf_bucket_alloc_t *allocator;
+
+ init_ssl_libraries();
+
+- apr_pool_create(&pool, NULL);
+- allocator = serf_bucket_allocator_create(pool, NULL, NULL);
+-
+ ssl_ctx = serf_bucket_mem_alloc(allocator, sizeof(*ssl_ctx));
+
+ ssl_ctx->refcount = 0;
+- ssl_ctx->pool = pool;
++ ssl_ctx->pool = serf_bucket_allocator_get_pool(allocator);
+ ssl_ctx->allocator = allocator;
+
+ ssl_ctx->ctx = SSL_CTX_new(SSLv23_client_method());
+@@ -1263,8 +1258,6 @@
+ static apr_status_t ssl_free_context(
+ serf_ssl_context_t *ssl_ctx)
+ {
+- apr_pool_t *p;
+-
+ /* If never had the pending buckets, don't try to free them. */
+ if (ssl_ctx->decrypt.pending != NULL) {
+ serf_bucket_destroy(ssl_ctx->decrypt.pending);
+@@ -1277,10 +1270,7 @@
+ SSL_free(ssl_ctx->ssl);
+ SSL_CTX_free(ssl_ctx->ctx);
+
+- p = ssl_ctx->pool;
+-
+ serf_bucket_mem_free(ssl_ctx->allocator, ssl_ctx);
+- apr_pool_destroy(p);
+
+ return APR_SUCCESS;
+ }
+@@ -1294,7 +1284,7 @@
+
+ ctx = serf_bucket_mem_alloc(allocator, sizeof(*ctx));
+ if (!ssl_ctx) {
+- ctx->ssl_ctx = ssl_init_context();
++ ctx->ssl_ctx = ssl_init_context(allocator);
+ }
+ else {
+ ctx->ssl_ctx = ssl_ctx;
Copied: serf/repos/testing-x86_64/PKGBUILD (from rev 207751, serf/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-03-14 16:58:44 UTC (rev 207752)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=serf
+pkgver=1.3.4
+pkgrel=1
+pkgdesc="High-performance asynchronous HTTP client library"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/serf/"
+license=('Apache')
+depends=('apr-util')
+makedepends=('scons')
+options=('!staticlibs')
+source=(http://serf.googlecode.com/svn/src_releases/${pkgname}-${pkgver}.zip)
+md5sums=('f2d469ac03db98781c9d414fed5368ae')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ scons PREFIX=/usr
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ scons check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ install -d "${pkgdir}/usr"
+ scons PREFIX="${pkgdir}/usr" install
+}
Copied: serf/repos/testing-x86_64/serf-ssl-allocator-v2.patch (from rev 207751, serf/trunk/serf-ssl-allocator-v2.patch)
===================================================================
--- testing-x86_64/serf-ssl-allocator-v2.patch (rev 0)
+++ testing-x86_64/serf-ssl-allocator-v2.patch 2014-03-14 16:58:44 UTC (rev 207752)
@@ -0,0 +1,57 @@
+Index: buckets/ssl_buckets.c
+===================================================================
+--- buckets/ssl_buckets.c (revision 2130)
++++ buckets/ssl_buckets.c (working copy)
+@@ -1192,21 +1192,16 @@
+ context->server_cert_userdata = data;
+ }
+
+-static serf_ssl_context_t *ssl_init_context(void)
++static serf_ssl_context_t *ssl_init_context(serf_bucket_alloc_t *allocator)
+ {
+ serf_ssl_context_t *ssl_ctx;
+- apr_pool_t *pool;
+- serf_bucket_alloc_t *allocator;
+
+ init_ssl_libraries();
+
+- apr_pool_create(&pool, NULL);
+- allocator = serf_bucket_allocator_create(pool, NULL, NULL);
+-
+ ssl_ctx = serf_bucket_mem_alloc(allocator, sizeof(*ssl_ctx));
+
+ ssl_ctx->refcount = 0;
+- ssl_ctx->pool = pool;
++ ssl_ctx->pool = serf_bucket_allocator_get_pool(allocator);
+ ssl_ctx->allocator = allocator;
+
+ ssl_ctx->ctx = SSL_CTX_new(SSLv23_client_method());
+@@ -1263,8 +1258,6 @@
+ static apr_status_t ssl_free_context(
+ serf_ssl_context_t *ssl_ctx)
+ {
+- apr_pool_t *p;
+-
+ /* If never had the pending buckets, don't try to free them. */
+ if (ssl_ctx->decrypt.pending != NULL) {
+ serf_bucket_destroy(ssl_ctx->decrypt.pending);
+@@ -1277,10 +1270,7 @@
+ SSL_free(ssl_ctx->ssl);
+ SSL_CTX_free(ssl_ctx->ctx);
+
+- p = ssl_ctx->pool;
+-
+ serf_bucket_mem_free(ssl_ctx->allocator, ssl_ctx);
+- apr_pool_destroy(p);
+
+ return APR_SUCCESS;
+ }
+@@ -1294,7 +1284,7 @@
+
+ ctx = serf_bucket_mem_alloc(allocator, sizeof(*ctx));
+ if (!ssl_ctx) {
+- ctx->ssl_ctx = ssl_init_context();
++ ctx->ssl_ctx = ssl_init_context(allocator);
+ }
+ else {
+ ctx->ssl_ctx = ssl_ctx;
More information about the arch-commits
mailing list