[arch-commits] Commit in serf/trunk (3 files)
Felix Yan
fyan at archlinux.org
Sat Jan 24 08:17:06 UTC 2015
Date: Saturday, January 24, 2015 @ 09:17:05
Author: fyan
Revision: 229693
upgpkg: serf 1.3.8-1
Added:
serf/trunk/serf-1.3.x-fix-comment-style.patch
serf/trunk/serf-1.3.x-fix-deflate-buckets-test.patch
Modified:
serf/trunk/PKGBUILD
-------------------------------------------+
PKGBUILD | 16 ++++-
serf-1.3.x-fix-comment-style.patch | 40 +++++++++++++
serf-1.3.x-fix-deflate-buckets-test.patch | 81 ++++++++++++++++++++++++++++
3 files changed, 134 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-24 04:20:43 UTC (rev 229692)
+++ PKGBUILD 2015-01-24 08:17:05 UTC (rev 229693)
@@ -3,7 +3,7 @@
# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
pkgname=serf
-pkgver=1.3.7
+pkgver=1.3.8
pkgrel=1
pkgdesc="High-performance asynchronous HTTP client library"
arch=('i686' 'x86_64')
@@ -12,9 +12,19 @@
depends=('apr-util')
makedepends=('scons')
options=('!staticlibs')
-source=(http://serf.googlecode.com/svn/src_releases/${pkgname}-${pkgver}.zip)
-md5sums=('123ee11e5877d2f31f81965e60f83bb2')
+source=(http://serf.googlecode.com/svn/src_releases/${pkgname}-${pkgver}.zip
+ serf-1.3.x-fix-comment-style.patch
+ serf-1.3.x-fix-deflate-buckets-test.patch)
+md5sums=('92a9e90bf77d203de659d13adc2d1605'
+ 'c4aac5a2882c18535d63724ba6ec1148'
+ '9d6dcb3679d6309fbb3b1c1db1148df0')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 --binary -i ../serf-1.3.x-fix-comment-style.patch
+ patch -p1 --binary -i ../serf-1.3.x-fix-deflate-buckets-test.patch
+}
+
build() {
cd ${pkgname}-${pkgver}
scons PREFIX=/usr GSSAPI=/usr/bin/krb5-config
Added: serf-1.3.x-fix-comment-style.patch
===================================================================
--- serf-1.3.x-fix-comment-style.patch (rev 0)
+++ serf-1.3.x-fix-comment-style.patch 2015-01-24 08:17:05 UTC (rev 229693)
@@ -0,0 +1,40 @@
+From: Andreas Stieger <andreas.stieger at gmx.de>
+Date: 2014-10-21 22:42:56 +0100
+Subject: Correct comment style
+Upstream: Committed
+References: https://code.google.com/p/serf/source/detail?r=2443
+
+Fixes error:
+test/test_buckets.c: In function 'deflate_compress':
+test/test_buckets.c:1237:1: error: expected expression before '/' token
+ // buf_size = orig_len + (orig_len / 1000) + 12;
+ ^
+
+------------------------------------------------------------------------
+r2443 | andreas.stieger at gmx.de | 2014-10-21 22:42:56 +0100 (Tue, 21 Oct 2014) | 7 lines
+Changed paths:
+ M /trunk/test/test_buckets.c
+
+Follow-up to r2419: Correct comment style
+
+* test/test_buckets.c
+ (deflate_compress): Correct comment style not supported by strict
+ compilers, fails on /branches/1.3.x
+
+
+------------------------------------------------------------------------
+Index: trunk/test/test_buckets.c
+===================================================================
+--- trunk/test/test_buckets.c (revision 2442)
++++ trunk/test/test_buckets.c (revision 2443)
+@@ -1323,9 +1323,9 @@ static apr_status_t deflate_compress(const char **
+
+ /* The largest buffer we should need is 0.1% larger than the
+ uncompressed data, + 12 bytes. This info comes from zlib.h.
++ buf_size = orig_len + (orig_len / 1000) + 12;
+ Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed
+ data. Use a buffer bigger than what we need. */
+-// buf_size = orig_len + (orig_len / 1000) + 12;
+ buf_size = 100000;
+
+ write_buf = apr_palloc(pool, buf_size);
Added: serf-1.3.x-fix-deflate-buckets-test.patch
===================================================================
--- serf-1.3.x-fix-deflate-buckets-test.patch (rev 0)
+++ serf-1.3.x-fix-deflate-buckets-test.patch 2015-01-24 08:17:05 UTC (rev 229693)
@@ -0,0 +1,81 @@
+From: Ivan Zhakov <ivan at visualsvn.com>
+Date: 2014-10-23 17:15:22 +0100
+Subject: Reduce memory usage by deflate buckets test.
+Upstream: Committed
+References: https://code.google.com/p/serf/source/detail?r=2445 https://groups.google.com/d/msg/serf-dev/qoTK8BfRfrI/EJL7xj4PmT4J
+
+Fixes failing test program by reducing memory usage.
+
+------------------------------------------------------------------------
+r2445 | chemodax | 2014-10-23 17:15:22 +0100 (Thu, 23 Oct 2014) | 6 lines
+Changed paths:
+ M /trunk/test/test_buckets.c
+
+Reduce memory usage by deflate buckets test.
+
+* test/test_buckets.c
+ (deflate_buckets): Add POOL argument and use it instead of tb->pool.
+ (test_deflate_buckets): Use iterpool for deflate_buckets() call.
+
+------------------------------------------------------------------------
+Index: trunk/test/test_buckets.c
+===================================================================
+--- trunk/test/test_buckets.c (revision 2444)
++++ trunk/test/test_buckets.c (revision 2445)
+@@ -1400,12 +1400,12 @@ static void read_bucket_and_check_pattern(CuTest *
+ expected_len);
+ }
+
+-static void deflate_buckets(CuTest *tc, int nr_of_loops)
++static void deflate_buckets(CuTest *tc, int nr_of_loops, apr_pool_t *pool)
+ {
+ const char *msg = "12345678901234567890123456789012345678901234567890";
+
+ test_baton_t *tb = tc->testBaton;
+- serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(tb->pool, NULL,
++ serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(pool, NULL,
+ NULL);
+ z_stream zdestr;
+ int i;
+@@ -1424,8 +1424,8 @@ static void read_bucket_and_check_pattern(CuTest *
+ {
+ serf_config_t *config;
+
+- serf_context_t *ctx = serf_context_create(tb->pool);
+- /* status = */ serf__config_store_get_config(ctx, NULL, &config, tb->pool);
++ serf_context_t *ctx = serf_context_create(pool);
++ /* status = */ serf__config_store_get_config(ctx, NULL, &config, pool);
+
+ serf_bucket_set_config(defbkt, config);
+ }
+@@ -1447,11 +1447,11 @@ static void read_bucket_and_check_pattern(CuTest *
+ if (i == nr_of_loops - 1) {
+ CuAssertIntEquals(tc, APR_SUCCESS,
+ deflate_compress(&data, &len, &zdestr, msg,
+- strlen(msg), 1, tb->pool));
++ strlen(msg), 1, pool));
+ } else {
+ CuAssertIntEquals(tc, APR_SUCCESS,
+ deflate_compress(&data, &len, &zdestr, msg,
+- strlen(msg), 0, tb->pool));
++ strlen(msg), 0, pool));
+ }
+
+ if (len == 0)
+@@ -1469,10 +1469,15 @@ static void read_bucket_and_check_pattern(CuTest *
+ static void test_deflate_buckets(CuTest *tc)
+ {
+ int i;
++ apr_pool_t *iterpool;
++ test_baton_t *tb = tc->testBaton;
+
++ apr_pool_create(&iterpool, tb->pool);
+ for (i = 1; i < 1000; i++) {
+- deflate_buckets(tc, i);
++ apr_pool_clear(iterpool);
++ deflate_buckets(tc, i, iterpool);
+ }
++ apr_pool_destroy(iterpool);
+ }
+
+ static apr_status_t discard_data(serf_bucket_t *bkt,
More information about the arch-commits
mailing list