diff options
author | fhajny <fhajny> | 2011-07-27 19:20:57 +0000 |
---|---|---|
committer | fhajny <fhajny> | 2011-07-27 19:20:57 +0000 |
commit | 62b3afa37614cc835c1a583771723d9b808faeb4 (patch) | |
tree | 8ff17e36ae4b0eb7ab67f9cd766816f544fdfd23 /databases | |
parent | c577fcef6747a77664cad94647ed9d2789a73f19 (diff) | |
download | pkgsrc-62b3afa37614cc835c1a583771723d9b808faeb4.tar.gz |
Updated databases/couchdb to 1.1.0.
Also fixed INSTALL_PROGRAM patch to not break install-sh.
Changes since 1.0.1
============================================================================
HTTP Interface:
* Native SSL support.
* Added support for HTTP range requests for attachments.
* Added built-in filters for '_changes': '_doc_ids' and '_design'.
* Added configuration option for TCP_NODELAY aka "Nagle".
* Allow POSTing arguments to '_changes'.
* Allow 'keys' parameter for GET requests to views.
* Allow wildcards in vhosts definitions.
* More granular ETag support for views.
* More flexible URL rewriter.
* Added support for recognizing "Q values" and media parameters in
HTTP Accept headers.
* Validate doc ids that come from a PUT to a URL.
Externals:
* Added OS Process module to manage daemons outside of CouchDB.
* Added HTTP Proxy handler for more scalable externals.
Replicator:
* Added '_replicator' database to manage replications.
* Fixed issues when an endpoint is a remote database accessible via SSL.
* Added support for continuous by-doc-IDs replication.
* Fix issue where revision info was omitted when replicating attachments.
* Integrity of attachment replication is now verified by MD5.
Storage System:
* Multiple micro-optimizations when reading data.
View Server:
* Added CommonJS support to map functions.
* Added 'stale=update_after' query option that triggers a view update after
returning a 'stale=ok' response.
* Warn about empty result caused by 'startkey' and 'endkey' limiting.
* Built-in reduce function '_sum' now accepts lists of integers as input.
* Added view query aliases start_key, end_key, start_key_doc_id and
end_key_doc_id.
Futon:
* Added a "change password"-feature to Futon.
URL Rewriter & Vhosts:
* Fix for variable substituion
Diffstat (limited to 'databases')
-rw-r--r-- | databases/couchdb/Makefile | 15 | ||||
-rw-r--r-- | databases/couchdb/PLIST | 24 | ||||
-rw-r--r-- | databases/couchdb/distinfo | 10 | ||||
-rw-r--r-- | databases/couchdb/patches/patch-ad | 15 | ||||
-rw-r--r-- | databases/couchdb/patches/patch-ae | 17 |
5 files changed, 68 insertions, 13 deletions
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index a269ec6b909..9fc7654de55 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2011/06/19 02:32:52 dholland Exp $ +# $NetBSD: Makefile,v 1.7 2011/07/27 19:20:57 fhajny Exp $ # -DISTNAME= apache-couchdb-1.0.1 +DISTNAME= apache-couchdb-1.1.0 PKGNAME= ${DISTNAME:S/apache-//} -PKGREVISION= 3 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/1.0.1/} +MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/1.1.0/} MAINTAINER= filip@joyent.com HOMEPAGE= http://couchdb.apache.org/ @@ -14,8 +13,8 @@ LICENSE= apache-2.0 PKG_DESTDIR_SUPPORT= user-destdir -VERSION.ibrowse= 1.5.2 -VERSION.mochiweb= r113 +VERSION.ibrowse= 2.2.0 +VERSION.mochiweb= 7c2bc2 GNU_CONFIGURE= yes USE_LANGUAGES+= c c++ @@ -72,7 +71,7 @@ REPLACE_FILES.sh= bin/couchdb.tpl.in bin/couchjs.tpl.in SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Setting standard paths SUBST_STAGE.paths= post-patch -SUBST_FILES.paths+= configure +SUBST_FILES.paths+= configure bin/couchdb.tpl.in SUBST_SED.paths= -e 's,@EGDIR@,${COUCH_EGDIR},g' SUBST_SED.paths+= -e 's,@RUNDIR@,${COUCH_RUNDIR},g' SUBST_SED.paths+= -e 's,@ERLANG_PREFIX@,${BUILDLINK_PREFIX.erlang},g' @@ -83,7 +82,7 @@ SUBST_CLASSES+= unstrip SUBST_MESSAGE.unstrip= Avoiding trying to strip a shell script SUBST_STAGE.unstrip= post-configure SUBST_FILES.unstrip+= src/couchdb/priv/Makefile -SUBST_SED.unstrip= -e '/^INSTALL_PROGRAM =/s,-s,,' +SUBST_SED.unstrip= -e '/^INSTALL_PROGRAM =/s, -s,,' PLIST_SUBST+= VERSION.ibrowse=${VERSION.ibrowse} PLIST_SUBST+= VERSION.mochiweb=${VERSION.mochiweb} diff --git a/databases/couchdb/PLIST b/databases/couchdb/PLIST index 1a1c7d627cc..c2d2fc80398 100644 --- a/databases/couchdb/PLIST +++ b/databases/couchdb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/21 12:11:39 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/07/27 19:20:57 fhajny Exp $ bin/couchdb bin/couchjs lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.app @@ -24,13 +24,16 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_db.beam 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_rewrite.beam lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_show.beam lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_stats_handlers.beam +lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_vhost.beam lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_view.beam lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_key_tree.beam 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_query_servers.beam lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_ref_counter.beam @@ -42,6 +45,7 @@ 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_server.beam lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_server_sup.beam lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stats_aggregator.beam @@ -87,23 +91,33 @@ lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_test.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochifmt.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochifmt_records.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochifmt_std.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiglobal.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochihex.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochijson.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochijson2.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochilists.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochilogfile2.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochinum.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochitemp.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiutf8.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb.app lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_acceptor.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_app.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_charref.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_cookies.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_cover.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_echo.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_headers.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_html.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_http.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_io.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_mime.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_multipart.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_request.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_response.beam lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_skel.beam +lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_socket.beam 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 @@ -118,6 +132,7 @@ share/couchdb/www/couch_tests.html share/couchdb/www/custom_test.html share/couchdb/www/database.html share/couchdb/www/dialog/_admin_party.html +share/couchdb/www/dialog/_change_password.html share/couchdb/www/dialog/_compact_cleanup.html share/couchdb/www/dialog/_create_admin.html share/couchdb/www/dialog/_create_config.html @@ -155,6 +170,8 @@ share/couchdb/www/image/running.png share/couchdb/www/image/save.png share/couchdb/www/image/sidebar-toggle.png share/couchdb/www/image/spinner.gif +share/couchdb/www/image/spinner_33.gif +share/couchdb/www/image/spinner_6b.gif share/couchdb/www/image/test_failure.gif share/couchdb/www/image/test_success.gif share/couchdb/www/image/thead-key.gif @@ -171,6 +188,7 @@ share/couchdb/www/script/couch_tests.js share/couchdb/www/script/futon.browse.js share/couchdb/www/script/futon.format.js share/couchdb/www/script/futon.js +share/couchdb/www/script/jquery-ui-1.8.11.custom.min.js share/couchdb/www/script/jquery.couch.js share/couchdb/www/script/jquery.dialog.js share/couchdb/www/script/jquery.editinline.js @@ -186,8 +204,10 @@ 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 share/couchdb/www/script/test/attachment_views.js share/couchdb/www/script/test/attachments.js share/couchdb/www/script/test/attachments_multipart.js @@ -230,6 +250,7 @@ share/couchdb/www/script/test/reduce_builtin.js 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/rev_stemming.js share/couchdb/www/script/test/rewrite.js share/couchdb/www/script/test/security_validation.js @@ -265,6 +286,7 @@ share/couchdb/www/spec/jquery_couch_js_instance_methods_2_spec.js share/couchdb/www/spec/jquery_couch_js_instance_methods_3_spec.js 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/doc/couchdb/AUTHORS.gz share/doc/couchdb/BUGS.gz diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo index 1a26817d484..f7f7575a85b 100644 --- a/databases/couchdb/distinfo +++ b/databases/couchdb/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/09/21 12:11:39 fhajny Exp $ +$NetBSD: distinfo,v 1.2 2011/07/27 19:20:57 fhajny Exp $ -SHA1 (apache-couchdb-1.0.1.tar.gz) = 470c88bca6a157e8a40b0713192a7a169bb0395e -RMD160 (apache-couchdb-1.0.1.tar.gz) = d5e6616c71472a7f6769774dc13fc07ccbf33350 -Size (apache-couchdb-1.0.1.tar.gz) = 986352 bytes +SHA1 (apache-couchdb-1.1.0.tar.gz) = 7cb6a12f3becaae4eeb8ee75b15fbe6395fa7a98 +RMD160 (apache-couchdb-1.1.0.tar.gz) = 4dcb5c520b0402366e82a1c195fc4404bc7bd37d +Size (apache-couchdb-1.1.0.tar.gz) = 1088226 bytes SHA1 (patch-aa) = 533449b95db713f3a47b3ff861a6cf4f5443eeee SHA1 (patch-ab) = cb3ce6abef55535a9729c9881107f69238036516 SHA1 (patch-ac) = ad77cac068fe07046275271f0d745b3a1c8a4baa +SHA1 (patch-ad) = 20fcfab5fe067d57703d2cc80e308b112ce60826 +SHA1 (patch-ae) = a1c49fbfdeb60176384738d64398a84c99ee095c diff --git a/databases/couchdb/patches/patch-ad b/databases/couchdb/patches/patch-ad new file mode 100644 index 00000000000..7a19c6e1d32 --- /dev/null +++ b/databases/couchdb/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2011/07/27 19:20:57 fhajny Exp $ + +Fix default PID file location in script. + +--- bin/couchdb.tpl.in.orig 2010-06-25 18:50:03.000000000 +0000 ++++ bin/couchdb.tpl.in +@@ -22,7 +22,7 @@ INTERACTIVE=false + KILL=false + LOCAL_CONFIG_DIR=%localconfdir%/local.d + LOCAL_CONFIG_FILE=%localconfdir%/%localini% +-PID_FILE=%localstatedir%/run/couchdb/couchdb.pid ++PID_FILE=@RUNDIR@/couchdb.pid + RECURSED=false + RESET_CONFIG=true + RESPAWN_TIMEOUT=0 diff --git a/databases/couchdb/patches/patch-ae b/databases/couchdb/patches/patch-ae new file mode 100644 index 00000000000..c264d22bea2 --- /dev/null +++ b/databases/couchdb/patches/patch-ae @@ -0,0 +1,17 @@ +$NetBSD: patch-ae,v 1.1 2011/07/27 19:20:57 fhajny Exp $ + +Use proper installer for script files. + +--- src/couchdb/priv/Makefile.in.orig 2010-08-11 18:18:53.000000000 +0000 ++++ src/couchdb/priv/Makefile.in +@@ -398,8 +398,8 @@ install-couchprivPROGRAMS: $(couchpriv_P + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(couchprivdir)$$dir'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(couchprivdir)$$dir" || exit $$?; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(couchprivdir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(couchprivdir)$$dir" || exit $$?; \ + } \ + ; done + |