--- serf-0.3.0.orig/debian/patches/series +++ serf-0.3.0/debian/patches/series @@ -0,0 +1,3 @@ +no-export-vars +kqueue +work-around-an-error-of-libtool.diff --- serf-0.3.0.orig/debian/patches/no-export-vars +++ serf-0.3.0/debian/patches/no-export-vars @@ -0,0 +1,15 @@ +Patch sent to serf-dev@googlegroups.com, applied upstream in r1223. + +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -619,8 +619,8 @@ + } + + #if APR_HAS_THREADS +-apr_pool_t *ssl_pool; +-apr_thread_mutex_t **ssl_locks; ++static apr_pool_t *ssl_pool; ++static apr_thread_mutex_t **ssl_locks; + + typedef struct CRYPTO_dynlock_value { + apr_thread_mutex_t *lock; --- serf-0.3.0.orig/debian/patches/work-around-an-error-of-libtool.diff +++ serf-0.3.0/debian/patches/work-around-an-error-of-libtool.diff @@ -0,0 +1,20 @@ +Work around libtool's error such as: + +[[[ +libtool: compile: unable to infer tagged configuration +libtool: compile: specify a tag with `--tag' +]]] +Index: pkg-serf/Makefile.in +=================================================================== +--- pkg-serf.orig/Makefile.in 2008-06-22 16:46:26.000000000 +0900 ++++ pkg-serf/Makefile.in 2008-06-22 16:46:41.000000000 +0900 +@@ -39,7 +39,7 @@ + libdir=@libdir@ + includedir=@includedir@ + +-LIBTOOL = @APR_LIBTOOL@ ++LIBTOOL = @APR_LIBTOOL@ --tag=CC + LTFLAGS = @LTFLAGS@ + CC = @CC@ + CFLAGS = @CFLAGS@ + --- serf-0.3.0.orig/debian/patches/kqueue +++ serf-0.3.0/debian/patches/kqueue @@ -0,0 +1,33 @@ +From: Aurelien Jarno + +serf fails to build from source on GNU/kFreeBSD due to failures in the +testsuite. They are due to the assumptions on the returned events that +are not true with the FreeBSD kernel. + + +--- a/test/test_util.c ++++ b/test/test_util.c +@@ -168,6 +168,7 @@ + apr_pollset_t *pollset; + apr_int32_t num; + const apr_pollfd_t *desc; ++ int client_sock_handled = 0; + + /* create a new pollset */ + status = apr_pollset_create(&pollset, 32, pool, 0); +@@ -211,7 +212,14 @@ + goto cleanup; + } + +- if (desc->desc.s == tb->client_sock) { ++ if (desc->desc.s == tb->client_sock && !client_sock_handled) { ++ /* Note: on some implementations (for example with kqueue), ++ apr_pollset_poll() returns separate events for APR_POLLIN ++ and APR_POLLOUT. client_sock_handled filters the second ++ event. ++ */ ++ client_sock_handled = 1; ++ + /* Replay data to socket. */ + status = replay(tb, pool); + --- serf-0.3.0.orig/debian/watch +++ serf-0.3.0/debian/watch @@ -0,0 +1,5 @@ +# Watch control file for uscan + +version=3 +http://code.google.com/p/serf/ \ + http://serf.googlecode.com/files/serf-(.*).tar.bz2 --- serf-0.3.0.orig/debian/changelog +++ serf-0.3.0/debian/changelog @@ -0,0 +1,78 @@ +serf (0.3.0-0.3ubuntu1~ppa1~hardy1) hardy; urgency=low + + * Rebuild for hardy (Launchpad PPA). + - Resurrect libtool tagging patch. + + -- Michael Diers Thu, 27 Aug 2009 16:51:59 +0200 + +serf (0.3.0-0.3) unstable; urgency=low + + * Non-maintainer upload. + * patches/kqueue: New patch: fix FTBFS due to testsuite bug on BSD kernels. + Thanks Aurelien Jarno. (Closes: #542063) + + -- Peter Samuelson Thu, 20 Aug 2009 08:36:44 -0500 + +serf (0.3.0-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Add symbols file. + * patches/no-export-vars: New patch: do not export variables outside the + serf_ namespace. + + -- Peter Samuelson Sat, 04 Jul 2009 12:16:46 -0500 + +serf (0.3.0-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream version. (Closes: #520546) + - Deleted patches/work-around-an-error-of-libtool.diff, no longer needed. + + -- Peter Samuelson Tue, 23 Jun 2009 18:03:44 -0500 + +serf (0.2.0-1) unstable; urgency=medium + + * New upstream version (Closes: #485025): + - debian/copyright: Document that CuTest files are licensed under the + zlib/libpng license. + - debian/patches/*.diff: Refresh. + * Update Standards-Version to 3.8.0. + - debian/control: Make binNMU-safe by using ${binary:Version} instead of + ${Source-Version}. + - debian/control: Add new Homepage field. + - debian/copyright: Delete copy of /usr/share/common-licenses/Apache-2.0. + - debian/README.source: New file explaining quilt. + * Update the debhelper compatibility level to 7. + - debian/libserf-0-0-dev.install, debian/libserf-0-0.install: + Do not begin with debian/tmp since it is assumed to be the source path. + * debian/control: Add new Vcs-Git, and Vcs-Browser fields. + * Install test programs as example ones for libserf-0-0-dev. + + -- Noritada Kobayashi Sun, 22 Jun 2008 11:14:06 +0900 + +serf (0.1.2-1) unstable; urgency=low + + * New upstream version. + + -- Noritada Kobayashi Tue, 19 Jun 2007 21:31:52 +0900 + +serf (0.1.1-1) unstable; urgency=low + + * New upstream version. + - Delete patches that are applied in the upstream: + r1091-remove-trailing-garbage.diff, r1092-implement-distclean.diff, and + r1094-add-readme.diff. + + -- Noritada Kobayashi Mon, 28 May 2007 20:45:20 +0900 + +serf (0.1.0-2) unstable; urgency=low + + * Add a new libserf-0-0-dbg package for debugging. + + -- Noritada Kobayashi Wed, 21 Feb 2007 03:27:51 +0900 + +serf (0.1.0-1) unstable; urgency=low + + * Initial release. (Closes: #403704) + + -- Noritada Kobayashi Tue, 26 Dec 2006 12:58:46 +0900 --- serf-0.3.0.orig/debian/control +++ serf-0.3.0/debian/control @@ -0,0 +1,51 @@ +Source: serf +Section: libs +Priority: optional +Maintainer: Noritada Kobayashi +Build-Depends: cdbs, debhelper (>= 5), quilt, autotools-dev, libapr1-dev, libaprutil1-dev +Standards-Version: 3.8.0 +Homepage: http://code.google.com/p/serf/ +Vcs-Git: git://git.debian.org/git/collab-maint/pkg-serf.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/pkg-serf.git + +Package: libserf-0-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: high-performance asynchronous HTTP client library + serf library is a C-based HTTP client library built upon the Apache + Portable Runtime (APR) library. It multiplexes connections, running the + read/write communication asynchronously. Memory copies and + transformations are kept to a minimum to provide high performance + operation. + +Package: libserf-0-0-dev +Section: libdevel +Architecture: any +Depends: libserf-0-0 (= ${binary:Version}), libapr1-dev, libaprutil1-dev +Provides: libserf-dev +Conflicts: libserf-dev +Description: high-performance asynchronous HTTP client library headers + serf library is a C-based HTTP client library built upon the Apache + Portable Runtime (APR) library. It multiplexes connections, running the + read/write communication asynchronously. Memory copies and + transformations are kept to a minimum to provide high performance + operation. + . + This package contains development headers for serf. + +Package: libserf-0-0-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libserf-0-0 (= ${binary:Version}) +Provides: libserf-dbg +Conflicts: libserf-dbg +Description: high-performance asynchronous HTTP client library debugging symbols + serf library is a C-based HTTP client library built upon the Apache + Portable Runtime (APR) library. It multiplexes connections, running the + read/write communication asynchronously. Memory copies and + transformations are kept to a minimum to provide high performance + operation. + . + This package contains the debugging symbols for serf. --- serf-0.3.0.orig/debian/rules +++ serf-0.3.0/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_DBG_PACKAGES := libserf-0-0-dbg +DEB_INSTALL_DOCS_ALL := NOTICE README design-guide.txt +DEB_INSTALL_EXAMPLES_libserf-0-0-dev := test/serf_*.c +DEB_MAKE_CHECK_TARGET := check +LDFLAGS := "-Wl,-z,defs,--as-needed" + +clean:: + rm -f config.nice --- serf-0.3.0.orig/debian/compat +++ serf-0.3.0/debian/compat @@ -0,0 +1 @@ +7 --- serf-0.3.0.orig/debian/copyright +++ serf-0.3.0/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by: + Noritada Kobayashi on 2006-12-21 + +It was downloaded from: + http://code.google.com/p/serf/ + +Upstream Authors: + Justin Erenkrantz and Greg Stein + (To contact them, use Serf Development Mailing List in + http://groups.google.com/group/serf-dev .) + +Copyright: + Copyright 2002-2004 Justin Erenkrantz and Greg Stein + +License: + serf is distributed under the Apache License 2.0, which can be found + in /usr/share/common-licenses/Apache-2.0. + +buildconf, which is also distributed under the Apache License 2.0, has +a copyright notice as follows: + + Copyright 2005 Justin Erenkrantz and Greg Stein + Copyright 2005 The Apache Software Foundation or its licensors, as + applicable. + +test/CuTest* are distributed under the zlib/libpng license with +copyright notices as follows: + + Copyright (c) 2003 Asim Jalis --- serf-0.3.0.orig/debian/README.source +++ serf-0.3.0/debian/README.source @@ -0,0 +1,4 @@ +This Debian package uses quilt(1) for patch management. +Please see /usr/share/doc/quilt/README.source for more information. + + -- Noritada Kobayashi Mon, 23 Jun 2008 22:26:17 +0900 --- serf-0.3.0.orig/debian/libserf-0-0.install +++ serf-0.3.0/debian/libserf-0-0.install @@ -0,0 +1 @@ +usr/lib/libserf*.so.* --- serf-0.3.0.orig/debian/libserf-0-0-dev.install +++ serf-0.3.0/debian/libserf-0-0-dev.install @@ -0,0 +1,6 @@ +usr/include/* +usr/lib/libserf*.a +usr/lib/libserf*.so +#usr/lib/pkgconfig/* +usr/lib/libserf*.la +#usr/share/pkgconfig/* --- serf-0.3.0.orig/debian/libserf-0-0.symbols +++ serf-0.3.0/debian/libserf-0-0.symbols @@ -0,0 +1,114 @@ +libserf-0.so.0 libserf-0-0 #MINVER# + serf_bmemdup@Base 0.1.0 + serf_bstrdup@Base 0.1.0 + serf_bstrmemdup@Base 0.1.0 + serf_bucket_aggregate_append@Base 0.1.0 + serf_bucket_aggregate_append_iovec@Base 0.1.0 + serf_bucket_aggregate_become@Base 0.1.0 + serf_bucket_aggregate_create@Base 0.1.0 + serf_bucket_aggregate_prepend@Base 0.1.0 + serf_bucket_aggregate_prepend_iovec@Base 0.1.0 + serf_bucket_allocator_create@Base 0.1.0 + serf_bucket_allocator_get_pool@Base 0.1.0 + serf_bucket_barrier_create@Base 0.1.0 + serf_bucket_chunk_create@Base 0.1.0 + serf_bucket_create@Base 0.1.0 + serf_bucket_dechunk_create@Base 0.1.0 + serf_bucket_deflate_create@Base 0.1.0 + serf_bucket_file_create@Base 0.1.0 + serf_bucket_headers_create@Base 0.1.0 + serf_bucket_headers_do@Base 0.1.0 + serf_bucket_headers_get@Base 0.1.0 + serf_bucket_headers_set@Base 0.1.0 + serf_bucket_headers_setc@Base 0.1.0 + serf_bucket_headers_setn@Base 0.1.0 + serf_bucket_headers_setx@Base 0.1.0 + serf_bucket_limit_create@Base 0.1.0 + serf_bucket_mem_alloc@Base 0.1.0 + serf_bucket_mem_calloc@Base 0.3.0 + serf_bucket_mem_free@Base 0.1.0 + serf_bucket_mmap_create@Base 0.1.0 + serf_bucket_request_become@Base 0.1.0 + serf_bucket_request_create@Base 0.1.0 + serf_bucket_request_get_headers@Base 0.1.0 + serf_bucket_request_set_root@Base 0.2.0 + serf_bucket_response_create@Base 0.1.0 + serf_bucket_response_get_headers@Base 0.1.0 + serf_bucket_response_set_head@Base 0.1.0 + serf_bucket_response_status@Base 0.1.0 + serf_bucket_response_wait_for_headers@Base 0.1.0 + serf_bucket_simple_copy_create@Base 0.1.0 + serf_bucket_simple_create@Base 0.1.0 + serf_bucket_socket_create@Base 0.1.0 + serf_bucket_socket_set_read_progress_cb@Base 0.2.0 + serf_bucket_ssl_decrypt_context_get@Base 0.1.0 + serf_bucket_ssl_decrypt_create@Base 0.1.0 + serf_bucket_ssl_encrypt_context_get@Base 0.1.0 + serf_bucket_ssl_encrypt_create@Base 0.1.0 + serf_bucket_type_aggregate@Base 0.1.0 + serf_bucket_type_barrier@Base 0.1.0 + serf_bucket_type_chunk@Base 0.1.0 + serf_bucket_type_dechunk@Base 0.1.0 + serf_bucket_type_deflate@Base 0.1.0 + serf_bucket_type_file@Base 0.1.0 + serf_bucket_type_headers@Base 0.1.0 + serf_bucket_type_limit@Base 0.1.0 + serf_bucket_type_mmap@Base 0.1.0 + serf_bucket_type_request@Base 0.1.0 + serf_bucket_type_response@Base 0.1.0 + serf_bucket_type_simple@Base 0.1.0 + serf_bucket_type_socket@Base 0.1.0 + serf_bucket_type_ssl_decrypt@Base 0.1.0 + serf_bucket_type_ssl_encrypt@Base 0.1.0 + serf_config_proxy@Base 0.2.0 + serf_connection_close@Base 0.1.0 + serf_connection_create2@Base 0.2.0 + serf_connection_create@Base 0.1.0 + serf_connection_priority_request_create@Base 0.2.0 + serf_connection_request_create@Base 0.1.0 + serf_connection_reset@Base 0.1.0 + serf_connection_set_max_outstanding_requests@Base 0.2.0 + serf_context_bucket_socket_create@Base 0.2.0 + serf_context_create@Base 0.1.0 + serf_context_create_ex@Base 0.2.0 + serf_context_prerun@Base 0.2.0 + serf_context_run@Base 0.1.0 + serf_context_set_progress_cb@Base 0.2.0 + serf_databuf_init@Base 0.1.0 + serf_databuf_peek@Base 0.1.0 + serf_databuf_read@Base 0.1.0 + serf_databuf_readline@Base 0.1.0 + serf_debug__bucket_alloc_check@Base 0.1.0 + serf_debug__bucket_destroy@Base 0.1.0 + serf_debug__closed_conn@Base 0.1.0 + serf_debug__entered_loop@Base 0.1.0 + serf_debug__record_read@Base 0.1.0 + serf_default_destroy@Base 0.1.0 + serf_default_destroy_and_data@Base 0.1.0 + serf_default_is_snapshot_set@Base 0.3.0 + serf_default_read_bucket@Base 0.1.0 + serf_default_read_for_sendfile@Base 0.1.0 + serf_default_read_iovec@Base 0.1.0 + serf_default_restore_snapshot@Base 0.3.0 + serf_default_snapshot@Base 0.3.0 + serf_event_trigger@Base 0.2.0 + serf_linebuf_fetch@Base 0.1.0 + serf_linebuf_init@Base 0.1.0 + serf_request_bucket_request_create@Base 0.2.0 + serf_request_cancel@Base 0.1.0 + serf_request_get_alloc@Base 0.1.0 + serf_request_get_conn@Base 0.1.0 + serf_request_get_pool@Base 0.1.0 + serf_request_set_handler@Base 0.1.0 + serf_ssl_cert_certificate@Base 0.2.0 + serf_ssl_cert_depth@Base 0.3.0 + serf_ssl_cert_export@Base 0.3.0 + serf_ssl_cert_issuer@Base 0.2.0 + serf_ssl_cert_subject@Base 0.2.0 + serf_ssl_client_cert_password_set@Base 0.1.1 + serf_ssl_client_cert_provider_set@Base 0.1.1 + serf_ssl_load_cert_file@Base 0.2.0 + serf_ssl_server_cert_callback_set@Base 0.2.0 + serf_ssl_trust_cert@Base 0.2.0 + serf_ssl_use_default_certificates@Base 0.2.0 + serf_util_readline@Base 0.1.0