Update databases/couchdb to 1.2.0.

Changes in 1.2.0
* Updated bundled erlang_oauth library to the latest version.
* cURL is no longer required to build CouchDB as it is only
  required by the command line JS test runner.
* Added a native JSON parser.
* Optional file compression (database and view index files). This feature
  is enabled by default.
* Several performance improvements, especially regarding database
  writes and view indexing.
* Added a 'data_size' property to database and view group
  information URIs.
* Added support for automatic compaction. This feature is disabled
  by default, but it can be enabled via the .ini configuration.
* A new replicator implementation that offers more performance
  and configuration options.
* Added optional field 'since_seq' to replication objects/documents.
* Simpler replication cancelation.
* The _active_tasks API now exposes more granular fields for each
  task type.
* Futon's 'Status' screen (active tasks) now displays two new task
  status fields: 'Started on' and 'Updated on'.
* Added built-in changes feed filter '_view'.
* Fixed old index file descriptor leaks after a view cleanup.
* Performance improvements for the built-in changes feed filters
  '_doc_ids' and '_design'.
* Fixes to the '_changes' feed heartbeat option when combined with
  a filter. It affected continuous pull replications with a filter.
* Fix use of OAuth with VHosts and URL rewriting.
* OAuth secrets can now be stored in the users system database.
* Documents in the _users database can no longer be read by everyone.
* Confidential information in the _replication database can no longer
  be read by everyone.
* Password hashes are now calculated by CouchDB instead of the client.
* Allow persistent authentication cookies.
* The requested_path property of query server request objects now has
  the path requested by clients before VHosts and rewriting.
* Fixed incorrect reduce query results when using pagination parameters.
* Made icu_driver work with Erlang R15B and later.
* Improvements to the build system and etap test suite.
* Avoid invalidating view indexes when running out of file descriptors.
* Log correct stacktrace in all cases.
* Improvements to log messages for file-related errors.

6 files changed, 63 insertions, 47 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 282f30de378..60cbcee2523 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2012/04/27 12:31:39 obache Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/17 09:42:46 fhajny Exp $
 #
 
-DISTNAME=		apache-couchdb-1.1.1
+DISTNAME=		apache-couchdb-1.2.0
 PKGNAME=		${DISTNAME:S/apache-//}
-PKGREVISION=		2
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/1.1.1/}
+MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/releases/1.2.0/}
 
 MAINTAINER=		filip@joyent.com
 HOMEPAGE=		http://couchdb.apache.org/
@@ -14,8 +13,10 @@ LICENSE=		apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+VERSION.ejson=		0.1.0
 VERSION.ibrowse=	2.2.0
-VERSION.mochiweb=	7c2bc2
+VERSION.mochiweb=	1.4.1
+VERSION.snappy=		1.0.3
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
@@ -85,8 +86,10 @@ SUBST_STAGE.unstrip=	post-configure
 SUBST_FILES.unstrip+=	src/couchdb/priv/Makefile
 SUBST_SED.unstrip=	-e '/^INSTALL_PROGRAM =/s, -s,,'
 
+PLIST_SUBST+=		VERSION.ejson=${VERSION.ejson}
 PLIST_SUBST+=		VERSION.ibrowse=${VERSION.ibrowse}
 PLIST_SUBST+=		VERSION.mochiweb=${VERSION.mochiweb}
+PLIST_SUBST+=		VERSION.snappy=${VERSION.snappy}
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../lang/spidermonkey/buildlink3.mk"
diff --git a/databases/couchdb/PLIST b/databases/couchdb/PLIST
index c2d2fc80398..8033477dd31 100644
--- a/databases/couchdb/PLIST
+++ b/databases/couchdb/PLIST
@@ -1,12 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2011/07/27 19:20:57 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/09/17 09:42:46 fhajny Exp $
+bin/couch-config
 bin/couchdb
 bin/couchjs
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.app
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_api_wrap.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_api_wrap_httpc.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_app.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_auth_cache.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_btree.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_changes.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_compaction_daemon.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_compress.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_config.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_config_writer.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db.beam
@@ -14,10 +19,13 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db_update_notifier.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db_update_notifier_sup.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db_updater.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_doc.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_drv.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_ejson_compare.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_event_sup.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_external_manager.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_external_server.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_file.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpc_pool.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_auth.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_db.beam
@@ -25,6 +33,7 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_external.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_misc_handlers.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_oauth.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_proxy.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_replicator.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_rewrite.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_show.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_stats_handlers.beam
@@ -35,23 +44,23 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_log.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_native_process.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_os_daemons.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_os_process.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_primary_sup.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_query_servers.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_ref_counter.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_rep.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_rep_att.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_rep_changes_feed.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_rep_httpc.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_rep_missing_revs.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_rep_reader.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_rep_sup.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_rep_writer.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_replication_manager.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_replication_notifier.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_replicator.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_replicator_utils.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_replicator_worker.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_secondary_sup.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_server.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_server_sup.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stats_aggregator.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stats_collector.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stream.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_task_status.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_users_db.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_util.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_uuids.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_view.beam
@@ -59,11 +68,20 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_view_compactor.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_view_group.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_view_updater.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_work_queue.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/json_stream_parse.beam
+lib/erlang/lib/couch-${PKGVERSION}/include/couch_api_wrap.hrl
 lib/erlang/lib/couch-${PKGVERSION}/include/couch_db.hrl
 lib/erlang/lib/couch-${PKGVERSION}/include/couch_js_functions.hrl
+lib/erlang/lib/couch-${PKGVERSION}/include/couch_replicator.hrl
 lib/erlang/lib/couch-${PKGVERSION}/priv/couchspawnkillable
+lib/erlang/lib/couch-${PKGVERSION}/priv/lib/couch_ejson_compare.la
 lib/erlang/lib/couch-${PKGVERSION}/priv/lib/couch_icu_driver.la
 lib/erlang/lib/couch-${PKGVERSION}/priv/stat_descriptions.cfg
+lib/erlang/lib/ejson-${VERSION.ejson}/ebin/ejson.app
+lib/erlang/lib/ejson-${VERSION.ejson}/ebin/ejson.beam
+lib/erlang/lib/ejson-${VERSION.ejson}/ebin/mochijson2.beam
+lib/erlang/lib/ejson-${VERSION.ejson}/ebin/mochinum.beam
+lib/erlang/lib/ejson-${VERSION.ejson}/priv/ejson.la
 lib/erlang/lib/erlang-oauth/ebin/oauth.app
 lib/erlang/lib/erlang-oauth/ebin/oauth.beam
 lib/erlang/lib/erlang-oauth/ebin/oauth_hmac_sha1.beam
@@ -122,9 +140,13 @@ lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_socket_server.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_sup.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_util.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/reloader.beam
+lib/erlang/lib/snappy-${VERSION.snappy}/ebin/snappy.app
+lib/erlang/lib/snappy-${VERSION.snappy}/ebin/snappy.beam
+lib/erlang/lib/snappy-${VERSION.snappy}/priv/snappy_nif.la
 libexec/couchdb/couchjs
 man/man1/couchdb.1
 man/man1/couchjs.1
+share/couchdb/server/main-coffee.js
 share/couchdb/server/main.js
 share/couchdb/www/_sidebar.html
 share/couchdb/www/config.html
@@ -204,7 +226,6 @@ share/couchdb/www/script/jspec/jspec.xhr.js
 share/couchdb/www/script/oauth.js
 share/couchdb/www/script/sha1.js
 share/couchdb/www/script/test/all_docs.js
-share/couchdb/www/script/test/attachment_conflicts.js
 share/couchdb/www/script/test/attachment_names.js
 share/couchdb/www/script/test/attachment_paths.js
 share/couchdb/www/script/test/attachment_ranges.js
@@ -216,6 +237,7 @@ share/couchdb/www/script/test/basics.js
 share/couchdb/www/script/test/batch_save.js
 share/couchdb/www/script/test/bulk_docs.js
 share/couchdb/www/script/test/changes.js
+share/couchdb/www/script/test/coffee.js
 share/couchdb/www/script/test/compact.js
 share/couchdb/www/script/test/config.js
 share/couchdb/www/script/test/conflicts.js
@@ -241,6 +263,7 @@ share/couchdb/www/script/test/lots_of_docs.js
 share/couchdb/www/script/test/method_override.js
 share/couchdb/www/script/test/multiple_rows.js
 share/couchdb/www/script/test/oauth.js
+share/couchdb/www/script/test/oauth_users_db.js
 share/couchdb/www/script/test/proxyauth.js
 share/couchdb/www/script/test/purge.js
 share/couchdb/www/script/test/reader_acl.js
@@ -251,6 +274,7 @@ share/couchdb/www/script/test/reduce_false.js
 share/couchdb/www/script/test/reduce_false_temp.js
 share/couchdb/www/script/test/replication.js
 share/couchdb/www/script/test/replicator_db.js
+share/couchdb/www/script/test/replicator_db_security.js
 share/couchdb/www/script/test/rev_stemming.js
 share/couchdb/www/script/test/rewrite.js
 share/couchdb/www/script/test/security_validation.js
@@ -258,6 +282,7 @@ share/couchdb/www/script/test/show_documents.js
 share/couchdb/www/script/test/stats.js
 share/couchdb/www/script/test/update_documents.js
 share/couchdb/www/script/test/users_db.js
+share/couchdb/www/script/test/users_db_security.js
 share/couchdb/www/script/test/utf8.js
 share/couchdb/www/script/test/uuids.js
 share/couchdb/www/script/test/view_collation.js
@@ -288,6 +313,7 @@ share/couchdb/www/spec/run.html
 share/couchdb/www/status.html
 share/couchdb/www/style/jquery-ui-1.8.11.custom.css
 share/couchdb/www/style/layout.css
+share/couchdb/www/verify_install.html
 share/doc/couchdb/AUTHORS.gz
 share/doc/couchdb/BUGS.gz
 share/doc/couchdb/CHANGES.gz
diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo
index 55b8bc9a2d8..94906d68e6d 100644
--- a/databases/couchdb/distinfo
+++ b/databases/couchdb/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.3 2011/12/20 14:08:55 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2012/09/17 09:42:46 fhajny Exp $
 
-SHA1 (apache-couchdb-1.1.1.tar.gz) = c901676663279338095642462bafa2d0667df98b
-RMD160 (apache-couchdb-1.1.1.tar.gz) = e61acf6649dbcfdd4834cc5f0920f38fd0d4ba76
-Size (apache-couchdb-1.1.1.tar.gz) = 1070948 bytes
-SHA1 (patch-aa) = 86666a2454c2a4540d95cb67e362b635942440f9
+SHA1 (apache-couchdb-1.2.0.tar.gz) = da17af99cf3b1f9a89f0051b7d9de0cbd6fe81b6
+RMD160 (apache-couchdb-1.2.0.tar.gz) = c96da6e285201f001431c57ee84cc04e2e244115
+Size (apache-couchdb-1.2.0.tar.gz) = 1326925 bytes
+SHA1 (patch-aa) = 87851cdb03140110b5000f6f7b374b555bb1781d
 SHA1 (patch-ab) = 5efc967379dd4b1fcbc18c64266f7308892d7b71
 SHA1 (patch-ac) = ad77cac068fe07046275271f0d745b3a1c8a4baa
 SHA1 (patch-ad) = 20fcfab5fe067d57703d2cc80e308b112ce60826
-SHA1 (patch-ae) = 4e8ed625790191b429a5116a6062ccb131cb4d18
-SHA1 (patch-src__couchdb__priv__couch_js__utf8.h) = 2134e3b717d04592ab24763fa8127d99df49b27b
+SHA1 (patch-ae) = b9af6f55d1fcaf88d6f3cff42eac233787bd2ee0
diff --git a/databases/couchdb/patches/patch-aa b/databases/couchdb/patches/patch-aa
index 5c32828dc80..61e45b23e62 100644
--- a/databases/couchdb/patches/patch-aa
+++ b/databases/couchdb/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2011/12/20 14:08:55 fhajny Exp $
+$NetBSD: patch-aa,v 1.3 2012/09/17 09:42:47 fhajny Exp $
 
 Set pkgsrc standard paths.
 
---- configure.orig	2011-10-24 09:38:37.000000000 +0000
+--- configure.orig	2012-03-29 21:05:41.000000000 +0000
 +++ configure
-@@ -916,6 +916,7 @@ bug_uri
+@@ -814,6 +814,7 @@ bug_uri
  localconfdir
  localdatadir
  localdocdir
@@ -12,7 +12,7 @@ Set pkgsrc standard paths.
  locallibdir
  localstatelibdir
  localstatelogdir
-@@ -12937,13 +12938,15 @@ localdatadir=${datadir}/${package_identi
+@@ -18661,13 +18662,15 @@ localdatadir=${datadir}/${package_identi
  
  localdocdir=${datadir}/doc/${package_identifier}
  
@@ -30,7 +30,7 @@ Set pkgsrc standard paths.
  
  
  # On Windows we install directly into our erlang distribution.
-@@ -12953,9 +12956,9 @@ if test x${IS_WINDOWS} = xTRUE; then
+@@ -18677,9 +18680,9 @@ if test x${IS_WINDOWS} = xTRUE; then
      localerlanglibdir=${libdir}
  
  else
@@ -42,7 +42,7 @@ Set pkgsrc standard paths.
  
  fi
  
-@@ -14177,6 +14180,7 @@ bug_uri!$bug_uri$ac_delim
+@@ -20087,6 +20090,7 @@ bug_uri!$bug_uri$ac_delim
  localconfdir!$localconfdir$ac_delim
  localdatadir!$localdatadir$ac_delim
  localdocdir!$localdocdir$ac_delim
@@ -50,12 +50,12 @@ Set pkgsrc standard paths.
  locallibdir!$locallibdir$ac_delim
  localstatelibdir!$localstatelibdir$ac_delim
  localstatelogdir!$localstatelogdir$ac_delim
-@@ -14189,7 +14193,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -20099,7 +20103,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/databases/couchdb/patches/patch-ae b/databases/couchdb/patches/patch-ae
index c3ff9e7699e..2713116bd1e 100644
--- a/databases/couchdb/patches/patch-ae
+++ b/databases/couchdb/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.2 2011/12/20 14:08:55 fhajny Exp $
+$NetBSD: patch-ae,v 1.3 2012/09/17 09:42:47 fhajny Exp $
 
 Use proper installer for script files.
 
---- src/couchdb/priv/Makefile.in.orig	2011-10-24 09:38:34.000000000 +0000
+--- src/couchdb/priv/Makefile.in.orig	2012-03-29 21:05:38.000000000 +0000
 +++ src/couchdb/priv/Makefile.in
-@@ -71,7 +71,7 @@ couch_icu_driver_la_LINK = $(LIBTOOL) --
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(couch_icu_driver_la_CFLAGS) $(CFLAGS) \
+@@ -85,7 +85,7 @@ couch_icu_driver_la_OBJECTS = $(am_couch
+ couch_icu_driver_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(couch_icu_driver_la_LDFLAGS) $(LDFLAGS) -o $@
 -couchprivPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 +couchprivPROGRAMS_INSTALL = $(INSTALL_SCRIPT)
diff --git a/databases/couchdb/patches/patch-src__couchdb__priv__couch_js__utf8.h b/databases/couchdb/patches/patch-src__couchdb__priv__couch_js__utf8.h
deleted file mode 100644
index b1de86bdcfc..00000000000
--- a/databases/couchdb/patches/patch-src__couchdb__priv__couch_js__utf8.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src__couchdb__priv__couch_js__utf8.h,v 1.1 2011/12/20 14:08:55 fhajny Exp $
-
-Fix missing newline.
---- src/couchdb/priv/couch_js/utf8.h.orig	2011-10-23 17:38:54.000000000 +0000
-+++ src/couchdb/priv/couch_js/utf8.h
-@@ -16,4 +16,4 @@
- char* enc_string(JSContext* cx, jsval arg, size_t* buflen);
- JSString* dec_string(JSContext* cx, const char* buf, size_t buflen);
- 
--#endif
-\ No newline at end of file
-+#endif