Date: Tuesday, August 12, 2014 @ 01:47:37 Author: fyan Revision: 219587
archrelease: copy trunk to extra-i686, extra-x86_64 Added: serf/repos/extra-i686/PKGBUILD (from rev 219586, serf/trunk/PKGBUILD) serf/repos/extra-x86_64/PKGBUILD (from rev 219586, serf/trunk/PKGBUILD) Deleted: serf/repos/extra-i686/PKGBUILD serf/repos/extra-i686/serf-ssl-allocator-v2.patch serf/repos/extra-x86_64/PKGBUILD serf/repos/extra-x86_64/serf-ssl-allocator-v2.patch ------------------------------------------+ /PKGBUILD | 64 +++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 32 -------------- extra-i686/serf-ssl-allocator-v2.patch | 57 ------------------------- extra-x86_64/PKGBUILD | 32 -------------- extra-x86_64/serf-ssl-allocator-v2.patch | 57 ------------------------- 5 files changed, 64 insertions(+), 178 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-08-11 23:46:50 UTC (rev 219586) +++ extra-i686/PKGBUILD 2014-08-11 23:47:37 UTC (rev 219587) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> - -pkgname=serf -pkgver=1.3.6 -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=('a9f7445530ea7e2755b6df1225b25a4a') - -build() { - cd ${pkgname}-${pkgver} - scons PREFIX=/usr GSSAPI=/usr/bin/krb5-config -} - -check() { - cd ${pkgname}-${pkgver} - scons check -} - -package() { - cd ${pkgname}-${pkgver} - install -d "${pkgdir}/usr" - scons PREFIX="${pkgdir}/usr" install -} Copied: serf/repos/extra-i686/PKGBUILD (from rev 219586, serf/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-08-11 23:47:37 UTC (rev 219587) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> + +pkgname=serf +pkgver=1.3.7 +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=('123ee11e5877d2f31f81965e60f83bb2') + +build() { + cd ${pkgname}-${pkgver} + scons PREFIX=/usr GSSAPI=/usr/bin/krb5-config +} + +check() { + cd ${pkgname}-${pkgver} + scons check +} + +package() { + cd ${pkgname}-${pkgver} + install -d "${pkgdir}/usr" + scons PREFIX="${pkgdir}/usr" install +} Deleted: extra-i686/serf-ssl-allocator-v2.patch =================================================================== --- extra-i686/serf-ssl-allocator-v2.patch 2014-08-11 23:46:50 UTC (rev 219586) +++ extra-i686/serf-ssl-allocator-v2.patch 2014-08-11 23:47:37 UTC (rev 219587) @@ -1,57 +0,0 @@ -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; Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-08-11 23:46:50 UTC (rev 219586) +++ extra-x86_64/PKGBUILD 2014-08-11 23:47:37 UTC (rev 219587) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> - -pkgname=serf -pkgver=1.3.6 -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=('a9f7445530ea7e2755b6df1225b25a4a') - -build() { - cd ${pkgname}-${pkgver} - scons PREFIX=/usr GSSAPI=/usr/bin/krb5-config -} - -check() { - cd ${pkgname}-${pkgver} - scons check -} - -package() { - cd ${pkgname}-${pkgver} - install -d "${pkgdir}/usr" - scons PREFIX="${pkgdir}/usr" install -} Copied: serf/repos/extra-x86_64/PKGBUILD (from rev 219586, serf/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-08-11 23:47:37 UTC (rev 219587) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> + +pkgname=serf +pkgver=1.3.7 +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=('123ee11e5877d2f31f81965e60f83bb2') + +build() { + cd ${pkgname}-${pkgver} + scons PREFIX=/usr GSSAPI=/usr/bin/krb5-config +} + +check() { + cd ${pkgname}-${pkgver} + scons check +} + +package() { + cd ${pkgname}-${pkgver} + install -d "${pkgdir}/usr" + scons PREFIX="${pkgdir}/usr" install +} Deleted: extra-x86_64/serf-ssl-allocator-v2.patch =================================================================== --- extra-x86_64/serf-ssl-allocator-v2.patch 2014-08-11 23:46:50 UTC (rev 219586) +++ extra-x86_64/serf-ssl-allocator-v2.patch 2014-08-11 23:47:37 UTC (rev 219587) @@ -1,57 +0,0 @@ -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;