Update to 2.06 (fixes PR pkg/31032). Changes:

@section v2_06 Changes with libapreq2-2.06 (released July 20, 2005)


- C API [Marc Gràcia, joes]
  Fix apreq_decode(v) when iso-latin-1 chars appear
  at the end of an encoded string.

- Perl API [Philip M. Gollucci]
  Fix "Attempt to free temp prematurely" error in apreq_xs_croak().

- C API [Philip M. Gollucci]
  Add mod_apreq2 to httpd's server tokens.

- Perl API [joes]
  Drop support for $req->env(), which also died with 2.05-dev.

- Perl API [joes]
  Support for table set/add/delete methods is formally withdrawn.
  Technically this feature died with the module API refactoring in
  2.05-dev.

- C API [max]
  Right-hand limit of apreq_brigade_move() is declared as "excluding",
  but APR_RING_UNSPLICE() wants an "including" right-hand limit. Fixed
  this by passing the previous bucket.

- Perl API [joes]
  Drop support for Apache2::Request::new's HOOK_DATA.
  UPLOAD_HOOK now takes only two arguments: ($upload, $data).

- Perl API [joes]
  Drop support for Apache2::Cookie::Jar::new's VALUE_CLASS.
  2.05-dev broke that API, and it's not worth trying to fix.
  People who need that should use APR::Request::Cookie::Table's
  cookie_class() API instead.

- Perl API [joes]
  Fix cookie domain/path munging in Apache2::Cookie::new().


@section v2_05_dev Changes with libapreq2-2.05-dev (released May 5, 2005)


- Win32 build [Randy Kobes]
  Have top-level 'nmake', 'nmake test', and 'nmake install'
  targets, respectively, also include building, testing, and
  installing the corresponding perl glue targets.

- C API [geoff]
  Minimum httpd version is now 2.0.48, which includes the official
  apr 0.9.4 release.

- C API [Max Kellermann]
  Fix apreq_quote.

- Perl API [joes]
  Remove Apache2::Request::args.  WARNING: through inheritance,
  args() now maps to Apache2::RequestRec::args.  Folks that want
  the pre-2.05-dev behavior need to invoke APR::Request::args by name.

- C API [joes, Max Kellermann]
  Add apreq_initialize, apreq_pre_initialize and apreq_post_initialize.
  These are not thread-safe operations, so applications need to ensure
  they are invoked (in the correct sequence) prior to using any apreq2
  modules.

- C, Perl API [joes]
  Add pool, bucket_alloc to apreq_handle_t.

- Perl API [joes]
  Drop $data argument from UPLOAD_HOOK, and also drop HOOK_DATA option.
  Perl folks should use a closure instead of passing in context data.

- Perl API [joes]
  Move bake, bake2 to Apache2::Cookie, now requiring
  an extra $r argument.  Also ""-operator is mapped
  to as_string() for Apache2::Cookie;  but APR::Request::Cookie
  maps it to value().

- C API [joes]
  Remove header_in & header_out from apreq_module_t.
  Remove apreq_ua_cookie_version() and apreq_cookie_bake*().
  Remove cookie2 argument to apreq_handle_custom().

- C API [joes]
  s/APREQ/APREQ2/g in webserver configuration directives.

- C API [Igor Shevchenko, Philip Gollucci]
  Fix segfault in mfd parser caused by parts w/ empty param names.

- C API [joes]
  Add apreq_cp1252_to_utf8().

- C, Perl API [joes]
  Add charset support for params and couple the SvUTF8 flag
  to the param's taint flag.

- C API [joes]
  Replace v->size with v->nlen + v->dlen.
  Added supporting apreq_value_table_add().

- C API [joes]
  Remove apreq_cookie_attr().

- C API [joes]
  - Add apreq_error.h, apreq_module.h.
  - Rename apreq_run* and apreq_make* funcs to conform with
    apreq_$obj_$meth scheme.
  - Replace c->version & c->secure with flags.
  - Parsers are assumed to be working with external data, so the
    cookies & params they produce are marked tainted.

- C API [joes]
  apreq_parse_cookie_header() failed to parse RFC Cookie headers which
  contained no space chars after the '$Version=1' preamble.

- C API [joes]
  Reorganize around include/, library/, and module/ dirs.

- C Tests [joes]
  Replace CuTest-based tests with custom TAP-compliant framework.

- C API [Max Kellermann]
  Continue the API improvements:

  - Convert APREQ_RUN_PARSER and APREQ_RUN_HOOK to inline, and downcase them.
  - Remove apreq_memmem.
  - Convert apreq_(un)escape to inline.
  - apreq_escape does not create an apreq_value_t*.
  - Initialize default_parsers explicitly to NULL.
  - Convert APREQ_BRIGADE_COPY to inline, and downcase it.
  - Lowercase APREQ_BRIGADE_SETASIDE, APREQ_BRIGADE_COPY.
  - Convert apreq_cookie_name and apreq_cookie_value macros to inline.
  - Convert apreq_param_name, apreq_param_value, apreq_param_info, and
    apreq_param_brigade to inline.

- C API [joes]
  Widespread API refactorization to remove apreq_jar_t and apreq_request_t:

  - Header includes reorganized; apreq_parsers.h added (back again).
  - Replaced apreq_jar_t and apreq_request_t with single apreq_env_handle_t.
  - Added const qualifier to "v" attribute of apreq_cookie_t and apreq_param_t.
  - Use union type-puns to drop const qualifiers inside the new
    apreq_value_to_cookie and apreq_value_to_param implementations
    (gcc generates same object code as the macro versions did).
  - Moved "flags" attribute from apreq_value_t to apreq_cookie_t and apreq_param_t.
  - Remove env argument from hooks and parsers.
  - Reduce apreq_env_module to minimal set of operations.
  - Replace apreq_log calls with apreq-specific error codes.
  - Hooks are called on each body param now, not just during file uploads.
  - Tie the cgi handle to its creator pool.

  Detailed changes by header file:

  [apreq.h]
  - Remove flags from apreq_value_t.
  - Remove const qualifier from apreq_value_t's "name" attribute.
  - Remove apreq_value_merge* and apreq_value_copy*.
  - Remove apreq_char_to_value, apreq_strtoval, and apreq_strlen.
  - Move apreq_enctype to apreq_env.h.
  - Move apreq_env_handle_t struct definition to apreq_env.h
  - Change signature of apreq_decode.
  - Move apreq_brigade_concat here, changed its signature and improved it alot.
  - Remove apreq_brigade_spoolfile.
  - Dropped APREQ_*_ENCTYPE, renamed some APREQ_$foo defaults APREQ_DEFAULT_$foo.
  - Added APREQ_ERROR_*.

  [apreq_cookie.h]
  - Remove apreq_env.h include.
  - Remove apreq_jar_t.
  - Add "flags" to apreq_cookie_t, add const qualifier to its "v" attr.
  - Remove apreq_jar* functions.
  - Add apreq_parse_cookie_header.
  - Move apreq_cookie, apreq_cookie_bake(2), and
    apreq_ua_cookie_version to apreq_env.h.

  [apreq_params.h]
  - Remove apreq_env.h include.
  - Remove apreq_request_t.
  - Add "flags" to apreq_param_t, and const qualifier to its "v" attr.
  - Rename "bb" attribute "upload" in apreq_param_t.
  - Remove apreq_request* functions.
  - Remove apreq_parse_request.
  - Changed apreq_decode_param signature.
  - Replace env argument with apr_table_t in apreq_params_as_array,
    apreq_params_as_string,
  - Move remaining apreq_param* to apreq_env.h.
  - Move parser and hook sections to apreq_parsers.h.
  - Change apreq_upload(s) old apreq_request_t arg to apr_table_t.

  [apreq_parsers.h]
  - Acquire the hook and parser sections of original apreq_params.h.
  - Remove env argument from APREQ_PARSER_ARGS and APREQ_HOOK_ARGS
  - Augment apreq_hook_t and apreq_parser_t to replace missing env features.
  - Change apreq_make_parser and apreq_make_hook signatures.
  - Rename apreq_add_hook to apreq_parser_add_hook, returning apr_status_t.
  - Change apreq_parser signature.

  [apreq_env.h]
  - Remove read, log, pool, bucket_alloc, request, jar, and query_string methods.
  - Include apreq_parsers.h.
  - Reorganize apreq_env_module_t to provide hook, parser, jar, args,
    & body table ops.
  - Rename max_brigade to "brigade_limit", max_body to "read_limit".
  - Change related module sigs, including temp_dir, to get/set methods.
  - Add parser and read_limit args to apreq_env_make_custom_handle.
  - Drop "name" arg and APREQ_ENV_MODULE =~ s/_ENV//.
  - s/apreq_env_make/apreq_handle/ in the handle constructor names.

  [mod_apreq.c, apreq_env_apache2.h]
  - Changed APREQ_Max* configs to APREQ_BrigadeLimit and APREQ_ReadLimit.
  - Handle constructor renamed apreq_handle_apache2.

- C API [joes]
  Make our "libtool current interface" number depend on apr's
  major number.  This allows libapreq2 to be installed into a
  system-wide location while avoiding ABI conflicts arising from
  our apr-based interfaces.

- C API [Max Kellermann]
  Introduce apreq_env_handle_t to replace the void *env usage.
  Also added apreq_env_custom for making private handles, and new
  apreq_env_apache2.h to let mod_apreq export apreq_env_make_apache2.

- C API [Max Kellermann]
  Rename apreq_env_t to apreq_env_module_t, to prepare for
  a new thread-safe apreq_env API.

- C API [Max Kellermann]
  mod_apreq must check the return value of apreq_brigade_concat
  to avoid a RAM-consuming infinite loop.  A bad APREQ_TempDir
  setting can cause this situation.

- C API [joes]
  Provide workaround for chunked trailers bug in ap_http_filter.

- C, Perl API [joes]
  Several upload-related bugfixes:
   1) apreq_upload and apreq_uploads did not search the full body table,
   2) $upload->slurp and $io->read did not autovivify the resultant string.

- C API [joes]
  Add "flags" attribute to apreq_value_t, planning for charset support.
  This is an ABI change, starting with libapreq2.so.2.0.24.

- C API [joes]
  Add apreq_env_bucket_alloc() to get an allocator directly from the
  environment instead of creating them from a pool.  This is an
  ABI change, starting with libapreq2.so.2.0.23.

- Build system [joes]
  Add --with-apache2-httpd option so users can override apxs's
  notion of where the httpd executable is.  XSBuilder's header
  parser runs from buildconf now instead of configure, so we
  will include those tables in the release tarball.  buildconf
  gets an additional --with-perl option for running the xsbuilder.pl
  parsing script.  The XS generation code in xsbuilder.pl has moved
  to glue/perl/Makefile.PL.

- Perl API [joes]
  Allow ctors for Apache::Cookie, Apache::Cookie::Jar
  and Apache:::Request to accept Apache::Request objects
  (instead of requiring an Apache::RequestRec object).
  This thread details the bug
        http://thread.gmane.org/gmane.comp.apache.mod-perl/15727

- C API [Bojan Smojver]
  Bake cookies with err_headers_out so they are
  sent on non-2xx server responses (ie. a 304 redirect).
  Also ensure that headers are copied with apr_table_add
  instead of apr_table_addn.  Since apreq_cookie_bake()
  allocates from the stack, the Set-Cookie headers would
  occasionally get mangled without this patch.

- C API [joes]
  Add apreq_register_parser(), which allows users to add
  their own parsers to apreq_parser()'s recognized MIME types.

- C API [joes]
  Support "multipart/mixed" file uploads.
  Support XForms' "multipart/related" enctype.

- C API [joes]
  Add apreq_hook_apr_xml_parser(), which is a simple wrapper
  hook around APR's expat-based apr_xml_parser.  Add a generic
  parser apreq_parse_generic() to parse arbitrary enctypes using
  the hook API.

3 files changed, 17 insertions, 14 deletions

diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index ab399af9e74..f171d0777a3 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:41 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/22 18:28:43 tv Exp $
 
-DISTNAME=	libapreq2-2.04_03-dev
-PKGNAME=	p5-libapreq2-2.4.3
+DISTNAME=	libapreq2-2.06-dev
+PKGNAME=	p5-libapreq2-2.06
 SVR4_PKGNAME=	p5la2
-PKGREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.apache.org/dist/httpd/libapreq/
 
@@ -14,9 +13,8 @@ COMMENT=	Lots of Apache specific httpd handling modules
 DEPENDS+=	p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder
 
 BUILDLINK_DEPENDS.apache+=	apache>=2.0.48
-BUILDLINK_DEPENDS.ap2-perl+=	ap2-perl>=1.99.15
+BUILDLINK_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
 
-WRKSRC=		${WRKDIR}/libapreq2-2.04-dev
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
 PERL5_PACKLIST=	auto/libapreq2/.packlist
diff --git a/www/p5-libapreq2/PLIST b/www/p5-libapreq2/PLIST
index 82da04e007f..d2cac9d911a 100644
--- a/www/p5-libapreq2/PLIST
+++ b/www/p5-libapreq2/PLIST
@@ -1,10 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/13 07:00:08 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/08/22 18:28:43 tv Exp $
 bin/apreq2-config
 include/apreq2/apreq.h
 include/apreq2/apreq_cookie.h
-include/apreq2/apreq_env.h
-include/apreq2/apreq_params.h
+include/apreq2/apreq_error.h
+include/apreq2/apreq_module.h
+include/apreq2/apreq_param.h
+include/apreq2/apreq_parser.h
+include/apreq2/apreq_util.h
 include/apreq2/apreq_version.h
-lib/httpd/mod_apreq.so
+include/httpd/apreq2/apreq_module_apache2.h
+lib/httpd/mod_apreq2.la
 lib/libapreq2.la
+@dirrm include/httpd/apreq2
 @dirrm include/apreq2
diff --git a/www/p5-libapreq2/distinfo b/www/p5-libapreq2/distinfo
index e09b57615f9..c05e2802236 100644
--- a/www/p5-libapreq2/distinfo
+++ b/www/p5-libapreq2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:37 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/08/22 18:28:43 tv Exp $
 
-SHA1 (libapreq2-2.04_03-dev.tar.gz) = 99c1f89357646cd25db9f9afc07ba57207256e51
-RMD160 (libapreq2-2.04_03-dev.tar.gz) = b1a48d006e5e3e3e8da964484f710a3ac39f061c
-Size (libapreq2-2.04_03-dev.tar.gz) = 592748 bytes
+SHA1 (libapreq2-2.06-dev.tar.gz) = 3e938e17c8f3aba6e680e3c7287183620aec6809
+RMD160 (libapreq2-2.06-dev.tar.gz) = 6d9d37d1b9440bcee2392c661a7ddef30129ee63
+Size (libapreq2-2.06-dev.tar.gz) = 711422 bytes