diff options
| author | fhajny <fhajny@pkgsrc.org> | 2016-11-16 15:59:28 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2016-11-16 15:59:28 +0000 |
| commit | 95e10e3f89bc05cb756b69f34a5da7925e7aafd0 (patch) | |
| tree | a329f0b40832493d13220471467dc61d28db8b7a /databases | |
| parent | e996b0dd5b7033f1d17eec3cec4aa9c4d78fb84e (diff) | |
| download | pkgsrc-95e10e3f89bc05cb756b69f34a5da7925e7aafd0.tar.gz | |
Update databases/couchdb to 2.0.0.
- The build system embeds the Erlang VM into the package, which means that
the PLIST may differ across build systems. Hence why we use a semi-dynamic
PLIST here.
- That also means that lang/erlang is now a build dependency only.
- Include a couch-epmd service for the Erlang Port Mapper Daemon using the
embedded binary.
- Basic RCD script added.
Upstream changes since 1.6.x:
- Native clustering is now supported. Rather than use CouchDB replication
between multiple, distinct CouchDB servers, configure a cluster of CouchDB
nodes.
- Futon replaced by brand-new, completely re-engineered Fauxton interface.
URL remains the same.
- The new Mango Query Server provides a simple JSON-based way to perform
CouchDB queries without JavaScript or MapReduce.
- Mango selectors can be used in _changes feeds instead of JavaScript
MapReduce filters. Mango has been tested to be up to an order of magnitude
(10x) faster than JavaScript in this application.
- Rewrite rules for URLs can be performed using JavaScript functions.
- Multiple queries can be made of a view with a single HTTP request.
- Views can be queried with sorting turned off ( sorted=false) for a
performance boost.
- The global changes feed has been enhanced. It is now resumable and
persistent.
- New endpoints added (documentation forthcoming):
- /_membership shows all nodes in a cluster
- /_bulk_get speeds up the replication protocol over low-latency connections
- /_node/ api to access individual nodes' configuration and compaction
features
- /_cluster_setup api to set up a cluster from scratch.
- /_up api to signal health of a node to a load-balancer
- /db/_local_docs and /db/_design_docs (similar to /db/_all_docs)
- "Backend" interface on port 5986 used for specific cluster admin tasks. Of
interest are the _nodes and _dbs databases visible only through this
interface.
- Support added for Erlang/OTP 17.x, 18.x and 19
- New streamlined build system written for Unix-like systems and Microsoft
Windows
Upgrade Notes
- The update sequences returned by the /db/_changes feed are no longer
integers. They can be any JSON value. Applications should treat them as
opaque values and return them to CouchDB as-is.
- Temporary views are no longer supported.
- It is possible to have multiple replicator databases. replicator/db config
option has been removed. Instead _replicator and any database names ending
with the /_replicator suffix will be recognized as replicator databases by
the system.
- Note that the semantics of some API calls have changed due to the
introduction of the clustering feature. Specifically, make note of the
difference between receiving a 201 and a 202 when storing a document.
- all_or_nothing is no longer supported by the bulk_docs API
See full release notes:
http://docs.couchdb.org/en/latest/whatsnew/2.0.html
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/couchdb/Makefile | 117 | ||||
| -rw-r--r-- | databases/couchdb/Makefile.versions | 24 | ||||
| -rw-r--r-- | databases/couchdb/PLIST | 926 | ||||
| -rw-r--r-- | databases/couchdb/distinfo | 20 | ||||
| -rw-r--r-- | databases/couchdb/files/couchdb.sh | 32 | ||||
| -rw-r--r-- | databases/couchdb/files/smf/manifest.xml | 40 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-aa | 135 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-ab | 93 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-ac | 35 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-ad | 14 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-ae | 17 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-rel_overlay_bin_couchdb | 26 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-rel_overlay_etc_default.ini | 30 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-src_config_src_config__app.erl | 15 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-src_couch_rebar.config.script | 90 |
15 files changed, 631 insertions, 983 deletions
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index f21e9c1984b..1077e968f76 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2016/10/07 18:25:40 adam Exp $ +# $NetBSD: Makefile,v 1.37 2016/11/16 15:59:28 fhajny Exp $ # -DISTNAME= apache-couchdb-1.6.1 +DISTNAME= apache-couchdb-2.0.0 PKGNAME= ${DISTNAME:S/apache-//} -PKGREVISION= 8 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/} @@ -12,20 +11,22 @@ HOMEPAGE= http://couchdb.apache.org/ COMMENT= Document database server, accessible via a RESTful JSON API LICENSE= apache-2.0 -GNU_CONFIGURE= yes +HAS_CONFIGURE= yes USE_LANGUAGES= c c++ -USE_TOOLS+= gmake +USE_TOOLS+= gmake install-info pax pkg-config USE_LIBTOOL= yes INFO_FILES= yes BUILD_DEFS+= VARBASE BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man +BUILD_DEPENDS+= rebar>=2.6.0<3:../../devel/rebar .include "../../mk/bsd.prefs.mk" COUCH_DBDIR?= ${VARBASE}/db/couchdb COUCH_EGDIR= ${PREFIX}/share/examples/couchdb COUCH_LOGDIR?= ${VARBASE}/log/couchdb +COUCH_RUNDIR?= ${VARBASE}/run/couchdb COUCH_USER?= couchdb COUCH_GROUP?= ${COUCH_USER} @@ -35,16 +36,11 @@ PKG_GECOS.${COUCH_USER}=CouchDB Server User PKG_HOME.${COUCH_USER}= ${COUCH_DBDIR} PKG_SHELL.${COUCH_USER}=${COMMAND_SHELL} -# Solaris /var/run is root only -.if ${OPSYS} == "SunOS" -COUCH_RUNDIR?= ${VARBASE}/spool/couchdb -.else -COUCH_RUNDIR?= ${VARBASE}/run/couchdb -.endif - FILES_SUBST+= COUCH_USER=${COUCH_USER} FILES_SUBST+= COUCH_GROUP=${COUCH_GROUP} FILES_SUBST+= COUCH_DBDIR=${COUCH_DBDIR} +FILES_SUBST+= COUCH_RUNDIR=${COUCH_RUNDIR} +FILES_SUBST+= ERTS_VERSION=${VERSION.erts} OWN_DIRS= ${COUCH_LOGDIR} ${COUCH_DBDIR} ${COUCH_RUNDIR} ${PKG_SYSCONFDIR} OWN_DIRS_PERMS+= ${COUCH_DBDIR} ${COUCH_USER} ${COUCH_GROUP} 0770 @@ -53,46 +49,73 @@ OWN_DIRS_PERMS+= ${COUCH_RUNDIR} ${COUCH_USER} ${COUCH_GROUP} 0770 PKG_SYSCONFSUBDIR= couchdb PKG_SYSCONFDIR_PERMS= ${COUCH_USER} ${COUCH_GROUP} 0775 -CONF_FILES_PERMS+= ${COUCH_EGDIR}/default.ini ${PKG_SYSCONFDIR}/default.ini ${COUCH_USER} ${COUCH_GROUP} 0660 -CONF_FILES_PERMS+= ${COUCH_EGDIR}/local.ini ${PKG_SYSCONFDIR}/local.ini ${COUCH_USER} ${COUCH_GROUP} 0660 - -CONFIGURE_ARGS+= --disable-init -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --with-erlang=${BUILDLINK_PREFIX.erlang}/lib/erlang/usr/include -CONFIGURE_ARGS+= --with-js-include=${BUILDLINK_PREFIX.spidermonkey} -CONFIGURE_ARGS+= --with-js-lib=${BUILDLINK_PREFIX.spidermonkey} - -.if ${OPSYS} == "SunOS" -REPLACE_INTERPRETER+= sh -REPLACE.sh.old= /bin/sh -REPLACE.sh.new= /bin/ksh -REPLACE_FILES.sh= bin/couchdb.tpl.in -.endif +CONF_FILES_PERMS+= ${COUCH_EGDIR}/default.ini ${PKG_SYSCONFDIR}/default.ini\ + ${COUCH_USER} ${COUCH_GROUP} 0660 +CONF_FILES_PERMS+= ${COUCH_EGDIR}/local.ini ${PKG_SYSCONFDIR}/local.ini \ + ${COUCH_USER} ${COUCH_GROUP} 0660 +CONF_FILES_PERMS+= ${COUCH_EGDIR}/vm.args ${PKG_SYSCONFDIR}/vm.args \ + ${COUCH_USER} ${COUCH_GROUP} 0660 SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Setting standard paths SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths+= configure bin/couchdb.tpl.in -SUBST_VARS.paths= COUCH_EGDIR COUCH_DBDIR COUCH_LOGDIR COUCH_RUNDIR -SUBST_SED.paths= -e 's,@ERLANG_PREFIX@,${BUILDLINK_PREFIX.erlang},g' - -# This works around libtool abuse installing "couchspawnkillable". Will -# hopefully get fixed properly upstream. -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,,' - -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 "Makefile.versions" - +SUBST_FILES.paths= configure +SUBST_FILES.paths+= rel/overlay/bin/couchdb +SUBST_FILES.paths+= rel/overlay/etc/default.ini +SUBST_FILES.paths+= src/config/src/config_app.erl +SUBST_VARS.paths= COUCH_DBDIR COUCH_LOGDIR COUCH_RUNDIR PREFIX PKG_SYSCONFDIR + +CONFIGURE_ARGS+= --rebar\ ${PREFIX}/bin/rebar +CONFIGURE_ARGS+= --user\ ${COUCH_USER} +CONFIGURE_ARGS+= --skip-deps +CONFIGURE_ARGS+= --with-curl + +BUILD_TARGET= release + +INSTALLATION_DIRS+= bin couchdb/lib +INSTALLATION_DIRS+= couchdb/share/server couchdb/share/www/docs +INSTALLATION_DIRS+= ${PKGINFODIR} ${PKGMANDIR}/man1 +INSTALLATION_DIRS+= share/doc/couchdb share/examples/couchdb + +RCD_SCRIPTS+= couchdb + +# This is silly, but the rebar release target embeds the Erlang VM +# into the tree, including existing Erlang module versions that might +# differ from those included in the tarball. We use a dynamic PLIST +# for the parts that may change. +GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; ${FIND} \ + couchdb/erts-* couchdb/lib \ + \( -type f -o -type l \) -print | \ + ${SORT} -u; + +# We need to know the version of erts and subst it inside the SMF manifest +.include "../../lang/erlang/Makefile.versions" + +do-install: + cd ${WRKSRC}/rel/couchdb && \ + ${PAX} -rw -pp erts-${VERSION.erts} lib releases \ + ${DESTDIR}${PREFIX}/couchdb + ${INSTALL_SCRIPT} ${WRKSRC}/rel/couchdb/bin/couchdb \ + ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/rel/couchdb/bin/couchjs \ + ${DESTDIR}${PREFIX}/bin + ${INSTALL_INFO} ${WRKSRC}/rel/couchdb/share/docs/CouchDB.info \ + ${DESTDIR}${PREFIX}/${PKGINFODIR}/CouchDB.info + ${INSTALL_MAN} ${WRKSRC}/rel/couchdb/share/docs/couchdb.1 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/share/docs/pdf/CouchDB.pdf \ + ${DESTDIR}${PREFIX}/share/doc/couchdb + cd ${WRKSRC}/rel/couchdb/share && ${PAX} -rw -pp server www \ + ${DESTDIR}${PREFIX}/couchdb/share + cd ${WRKSRC}/rel/couchdb/etc && ${PAX} -rw -pp *.ini vm.args \ + ${DESTDIR}${COUCH_EGDIR} + +# The erlang VM gets embedded, but it may still need the curses lib +BUILDLINK_DEPMETHOD.erlang= build +.include "../../mk/termcap.buildlink3.mk" .include "../../lang/erlang/buildlink3.mk" -.include "../../lang/spidermonkey/buildlink3.mk" + +.include "../../lang/spidermonkey185/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/databases/couchdb/Makefile.versions b/databases/couchdb/Makefile.versions deleted file mode 100644 index 42b8ee644f3..00000000000 --- a/databases/couchdb/Makefile.versions +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile.versions,v 1.2 2014/01/02 17:10:22 fhajny Exp $ - -_VERSIONS= \ - couch_dbupdates 0.1 \ - couch_index 0.1 \ - couch_mrview 0.1 \ - couch_plugins 0.1 \ - couch_replicator 0.1 \ - ejson 0.1.0 \ - ibrowse 2.2.0 \ - mochiweb 1.4.1 \ - snappy 1.0.5 - -PLIST_SUBST+= VERSION=${DIST_VERSION_MAJOR} - -.for name version in ${_VERSIONS} -VERSION.${name}=${version} -PLIST_SUBST+= VERSION.${name}=${version} -.endfor - -# Generate PLIST -.for _pkg_ _version_ in $(_VERSIONS) -PRINT_PLIST_AWK+= {if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}} -.endfor diff --git a/databases/couchdb/PLIST b/databases/couchdb/PLIST index 0721284a3e4..524f3030303 100644 --- a/databases/couchdb/PLIST +++ b/databases/couchdb/PLIST @@ -1,637 +1,299 @@ -@comment $NetBSD: PLIST,v 1.7 2014/06/11 15:34:16 fhajny Exp $ -bin/couch-config +@comment $NetBSD: PLIST,v 1.8 2016/11/16 15:59:29 fhajny Exp $ bin/couchdb bin/couchjs -info/CouchDB -lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.app -lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.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 -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_httpd.beam -lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_auth.beam -lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_cors.beam -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_stats_handlers.beam -lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_vhost.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_passwords.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_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_work_queue.beam -lib/erlang/lib/couch-${PKGVERSION}/ebin/json_stream_parse.beam -lib/erlang/lib/couch-${PKGVERSION}/include/couch_db.hrl -lib/erlang/lib/couch-${PKGVERSION}/include/couch_js_functions.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/couch_dbupdates-${VERSION.couch_dbupdates}/ebin/couch_dbupdates.beam -lib/erlang/lib/couch_dbupdates-${VERSION.couch_dbupdates}/ebin/couch_dbupdates_httpd.beam -lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index.beam -lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index_compactor.beam -lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index_server.beam -lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index_updater.beam -lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index_util.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview.app -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_cleanup.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_compactor.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_http.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_index.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_show.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_test_util.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_updater.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_util.beam -lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/include/couch_mrview.hrl -lib/erlang/lib/couch_plugins-${VERSION.couch_plugins}/ebin/couch_plugins.app -lib/erlang/lib/couch_plugins-${VERSION.couch_plugins}/ebin/couch_plugins.beam -lib/erlang/lib/couch_plugins-${VERSION.couch_plugins}/ebin/couch_plugins_httpd.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator.app -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_api_wrap.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_httpc.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_httpc_pool.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_httpd.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_job_sup.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_manager.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_notifier.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_utils.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_worker.beam -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/include/couch_replicator.hrl -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/include/couch_replicator_api_wrap.hrl -lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/include/couch_replicator_js_functions.hrl -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/etap/ebin/etap.beam -lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse.app -lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse.beam -lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_app.beam -lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_http_client.beam -lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_lb.beam -lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_lib.beam -lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_socks5.beam -lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_sup.beam -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 -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 +couchdb/releases/${PKGVERSION}/couchdb.boot +couchdb/releases/${PKGVERSION}/couchdb.rel +couchdb/releases/${PKGVERSION}/couchdb.script +couchdb/releases/${PKGVERSION}/start_clean.boot +couchdb/releases/${PKGVERSION}/start_clean.rel +couchdb/releases/${PKGVERSION}/start_clean.script +couchdb/releases/${PKGVERSION}/sys.config +couchdb/releases/${PKGVERSION}/vm.args +couchdb/releases/RELEASES +couchdb/releases/start_erl.data +couchdb/share/server/coffee-script.js +couchdb/share/server/main.js +couchdb/share/www/dashboard.assets/ZeroClipboard.swf +couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.eot +couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.ttf +couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.woff +couchdb/share/www/dashboard.assets/fonts/fontawesome-webfont.eot +couchdb/share/www/dashboard.assets/fonts/fontawesome-webfont.ttf +couchdb/share/www/dashboard.assets/fonts/fontawesome-webfont.woff +couchdb/share/www/dashboard.assets/img/CouchDB-negative-logo.png +couchdb/share/www/dashboard.assets/img/asf-feather-logo.png +couchdb/share/www/dashboard.assets/img/couch-watermark.png +couchdb/share/www/dashboard.assets/img/couchdb-logo.png +couchdb/share/www/dashboard.assets/img/fauxtonicon5.svg +couchdb/share/www/dashboard.assets/img/fontawesome-webfont.svg +couchdb/share/www/dashboard.assets/img/github.png +couchdb/share/www/dashboard.assets/img/googleplus.png +couchdb/share/www/dashboard.assets/img/linkedin.png +couchdb/share/www/dashboard.assets/img/loader.gif +couchdb/share/www/dashboard.assets/img/twitter.png +couchdb/share/www/dashboard.assets/js/bundle-b8e0ba71119195edb7ec64b98f53d9b9.js +couchdb/share/www/docs/_images/intro-consistency-01.png +couchdb/share/www/docs/_images/intro-consistency-02.png +couchdb/share/www/docs/_images/intro-consistency-03.png +couchdb/share/www/docs/_images/intro-consistency-04.png +couchdb/share/www/docs/_images/intro-consistency-05.png +couchdb/share/www/docs/_images/intro-consistency-06.png +couchdb/share/www/docs/_images/intro-consistency-07.png +couchdb/share/www/docs/_images/intro-why-01.png +couchdb/share/www/docs/_images/intro-why-02.png +couchdb/share/www/docs/_images/intro-why-03.png +couchdb/share/www/docs/_images/views-intro-01.png +couchdb/share/www/docs/_images/views-intro-02.png +couchdb/share/www/docs/_images/views-intro-03.png +couchdb/share/www/docs/_images/views-intro-04.png +couchdb/share/www/docs/_sources/about.txt +couchdb/share/www/docs/_sources/api/basics.txt +couchdb/share/www/docs/_sources/api/database/bulk-api.txt +couchdb/share/www/docs/_sources/api/database/changes.txt +couchdb/share/www/docs/_sources/api/database/common.txt +couchdb/share/www/docs/_sources/api/database/compact.txt +couchdb/share/www/docs/_sources/api/database/find.txt +couchdb/share/www/docs/_sources/api/database/index.txt +couchdb/share/www/docs/_sources/api/database/misc.txt +couchdb/share/www/docs/_sources/api/database/security.txt +couchdb/share/www/docs/_sources/api/ddoc/common.txt +couchdb/share/www/docs/_sources/api/ddoc/index.txt +couchdb/share/www/docs/_sources/api/ddoc/render.txt +couchdb/share/www/docs/_sources/api/ddoc/rewrites.txt +couchdb/share/www/docs/_sources/api/ddoc/views.txt +couchdb/share/www/docs/_sources/api/document/attachments.txt +couchdb/share/www/docs/_sources/api/document/common.txt +couchdb/share/www/docs/_sources/api/document/index.txt +couchdb/share/www/docs/_sources/api/index.txt +couchdb/share/www/docs/_sources/api/local.txt +couchdb/share/www/docs/_sources/api/server/authn.txt +couchdb/share/www/docs/_sources/api/server/common.txt +couchdb/share/www/docs/_sources/api/server/configuration.txt +couchdb/share/www/docs/_sources/api/server/index.txt +couchdb/share/www/docs/_sources/cluster/databases.txt +couchdb/share/www/docs/_sources/cluster/index.txt +couchdb/share/www/docs/_sources/cluster/nodes.txt +couchdb/share/www/docs/_sources/cluster/setup.txt +couchdb/share/www/docs/_sources/cluster/sharding.txt +couchdb/share/www/docs/_sources/cluster/theory.txt +couchdb/share/www/docs/_sources/config/auth.txt +couchdb/share/www/docs/_sources/config/compaction.txt +couchdb/share/www/docs/_sources/config/couch-peruser.txt +couchdb/share/www/docs/_sources/config/couchdb.txt +couchdb/share/www/docs/_sources/config/externals.txt +couchdb/share/www/docs/_sources/config/http-handlers.txt +couchdb/share/www/docs/_sources/config/http.txt +couchdb/share/www/docs/_sources/config/index.txt +couchdb/share/www/docs/_sources/config/intro.txt +couchdb/share/www/docs/_sources/config/logging.txt +couchdb/share/www/docs/_sources/config/misc.txt +couchdb/share/www/docs/_sources/config/proxying.txt +couchdb/share/www/docs/_sources/config/query-servers.txt +couchdb/share/www/docs/_sources/config/replicator.txt +couchdb/share/www/docs/_sources/config/services.txt +couchdb/share/www/docs/_sources/contents.txt +couchdb/share/www/docs/_sources/contributing.txt +couchdb/share/www/docs/_sources/couchapp/ddocs.txt +couchdb/share/www/docs/_sources/couchapp/index.txt +couchdb/share/www/docs/_sources/couchapp/views/collation.txt +couchdb/share/www/docs/_sources/couchapp/views/index.txt +couchdb/share/www/docs/_sources/couchapp/views/intro.txt +couchdb/share/www/docs/_sources/couchapp/views/joins.txt +couchdb/share/www/docs/_sources/couchapp/views/nosql.txt +couchdb/share/www/docs/_sources/couchapp/views/pagination.txt +couchdb/share/www/docs/_sources/cve/2010-0009.txt +couchdb/share/www/docs/_sources/cve/2010-2234.txt +couchdb/share/www/docs/_sources/cve/2010-3854.txt +couchdb/share/www/docs/_sources/cve/2012-5641.txt +couchdb/share/www/docs/_sources/cve/2012-5649.txt +couchdb/share/www/docs/_sources/cve/2012-5650.txt +couchdb/share/www/docs/_sources/cve/2014-2668.txt +couchdb/share/www/docs/_sources/cve/index.txt +couchdb/share/www/docs/_sources/experimental.txt +couchdb/share/www/docs/_sources/externals.txt +couchdb/share/www/docs/_sources/fauxton/addons.txt +couchdb/share/www/docs/_sources/fauxton/index.txt +couchdb/share/www/docs/_sources/fauxton/install.txt +couchdb/share/www/docs/_sources/install/freebsd.txt +couchdb/share/www/docs/_sources/install/index.txt +couchdb/share/www/docs/_sources/install/mac.txt +couchdb/share/www/docs/_sources/install/troubleshooting.txt +couchdb/share/www/docs/_sources/install/unix.txt +couchdb/share/www/docs/_sources/install/windows.txt +couchdb/share/www/docs/_sources/intro/api.txt +couchdb/share/www/docs/_sources/intro/consistency.txt +couchdb/share/www/docs/_sources/intro/curl.txt +couchdb/share/www/docs/_sources/intro/index.txt +couchdb/share/www/docs/_sources/intro/overview.txt +couchdb/share/www/docs/_sources/intro/security.txt +couchdb/share/www/docs/_sources/intro/tour.txt +couchdb/share/www/docs/_sources/intro/why.txt +couchdb/share/www/docs/_sources/json-structure.txt +couchdb/share/www/docs/_sources/maintenance/compaction.txt +couchdb/share/www/docs/_sources/maintenance/index.txt +couchdb/share/www/docs/_sources/maintenance/performance.txt +couchdb/share/www/docs/_sources/query-server/erlang.txt +couchdb/share/www/docs/_sources/query-server/index.txt +couchdb/share/www/docs/_sources/query-server/javascript.txt +couchdb/share/www/docs/_sources/query-server/protocol.txt +couchdb/share/www/docs/_sources/replication/conflicts.txt +couchdb/share/www/docs/_sources/replication/index.txt +couchdb/share/www/docs/_sources/replication/intro.txt +couchdb/share/www/docs/_sources/replication/protocol.txt +couchdb/share/www/docs/_sources/replication/replicator.txt +couchdb/share/www/docs/_sources/whatsnew/0.10.txt +couchdb/share/www/docs/_sources/whatsnew/0.11.txt +couchdb/share/www/docs/_sources/whatsnew/0.8.txt +couchdb/share/www/docs/_sources/whatsnew/0.9.txt +couchdb/share/www/docs/_sources/whatsnew/1.0.txt +couchdb/share/www/docs/_sources/whatsnew/1.1.txt +couchdb/share/www/docs/_sources/whatsnew/1.2.txt +couchdb/share/www/docs/_sources/whatsnew/1.3.txt +couchdb/share/www/docs/_sources/whatsnew/1.4.txt +couchdb/share/www/docs/_sources/whatsnew/1.5.txt +couchdb/share/www/docs/_sources/whatsnew/1.6.txt +couchdb/share/www/docs/_sources/whatsnew/2.0.txt +couchdb/share/www/docs/_sources/whatsnew/index.txt +couchdb/share/www/docs/_static/ajax-loader.gif +couchdb/share/www/docs/_static/basic.css +couchdb/share/www/docs/_static/comment-bright.png +couchdb/share/www/docs/_static/comment-close.png +couchdb/share/www/docs/_static/comment.png +couchdb/share/www/docs/_static/doctools.js +couchdb/share/www/docs/_static/down-pressed.png +couchdb/share/www/docs/_static/down.png +couchdb/share/www/docs/_static/favicon.ico +couchdb/share/www/docs/_static/file.png +couchdb/share/www/docs/_static/jquery.js +couchdb/share/www/docs/_static/logo.png +couchdb/share/www/docs/_static/minus.png +couchdb/share/www/docs/_static/plus.png +couchdb/share/www/docs/_static/pygments.css +couchdb/share/www/docs/_static/rtd.css +couchdb/share/www/docs/_static/searchtools.js +couchdb/share/www/docs/_static/underscore.js +couchdb/share/www/docs/_static/up-pressed.png +couchdb/share/www/docs/_static/up.png +couchdb/share/www/docs/_static/websupport.js +couchdb/share/www/docs/about.html +couchdb/share/www/docs/api/basics.html +couchdb/share/www/docs/api/database/bulk-api.html +couchdb/share/www/docs/api/database/changes.html +couchdb/share/www/docs/api/database/common.html +couchdb/share/www/docs/api/database/compact.html +couchdb/share/www/docs/api/database/find.html +couchdb/share/www/docs/api/database/index.html +couchdb/share/www/docs/api/database/misc.html +couchdb/share/www/docs/api/database/security.html +couchdb/share/www/docs/api/ddoc/common.html +couchdb/share/www/docs/api/ddoc/index.html +couchdb/share/www/docs/api/ddoc/render.html +couchdb/share/www/docs/api/ddoc/rewrites.html +couchdb/share/www/docs/api/ddoc/views.html +couchdb/share/www/docs/api/document/attachments.html +couchdb/share/www/docs/api/document/common.html +couchdb/share/www/docs/api/document/index.html +couchdb/share/www/docs/api/index.html +couchdb/share/www/docs/api/local.html +couchdb/share/www/docs/api/server/authn.html +couchdb/share/www/docs/api/server/common.html +couchdb/share/www/docs/api/server/configuration.html +couchdb/share/www/docs/api/server/index.html +couchdb/share/www/docs/cluster/databases.html +couchdb/share/www/docs/cluster/index.html +couchdb/share/www/docs/cluster/nodes.html +couchdb/share/www/docs/cluster/setup.html +couchdb/share/www/docs/cluster/sharding.html +couchdb/share/www/docs/cluster/theory.html +couchdb/share/www/docs/config-ref.html +couchdb/share/www/docs/config/auth.html +couchdb/share/www/docs/config/compaction.html +couchdb/share/www/docs/config/couch-peruser.html +couchdb/share/www/docs/config/couchdb.html +couchdb/share/www/docs/config/externals.html +couchdb/share/www/docs/config/http-handlers.html +couchdb/share/www/docs/config/http.html +couchdb/share/www/docs/config/index.html +couchdb/share/www/docs/config/intro.html +couchdb/share/www/docs/config/logging.html +couchdb/share/www/docs/config/misc.html +couchdb/share/www/docs/config/proxying.html +couchdb/share/www/docs/config/query-servers.html +couchdb/share/www/docs/config/replicator.html +couchdb/share/www/docs/config/services.html +couchdb/share/www/docs/contents.html +couchdb/share/www/docs/contributing.html +couchdb/share/www/docs/couchapp/ddocs.html +couchdb/share/www/docs/couchapp/index.html +couchdb/share/www/docs/couchapp/views/collation.html +couchdb/share/www/docs/couchapp/views/index.html +couchdb/share/www/docs/couchapp/views/intro.html +couchdb/share/www/docs/couchapp/views/joins.html +couchdb/share/www/docs/couchapp/views/nosql.html +couchdb/share/www/docs/couchapp/views/pagination.html +couchdb/share/www/docs/cve/2010-0009.html +couchdb/share/www/docs/cve/2010-2234.html +couchdb/share/www/docs/cve/2010-3854.html +couchdb/share/www/docs/cve/2012-5641.html +couchdb/share/www/docs/cve/2012-5649.html +couchdb/share/www/docs/cve/2012-5650.html +couchdb/share/www/docs/cve/2014-2668.html +couchdb/share/www/docs/cve/index.html +couchdb/share/www/docs/download.html +couchdb/share/www/docs/experimental.html +couchdb/share/www/docs/externals.html +couchdb/share/www/docs/fauxton/addons.html +couchdb/share/www/docs/fauxton/index.html +couchdb/share/www/docs/fauxton/install.html +couchdb/share/www/docs/http-api.html +couchdb/share/www/docs/index.html +couchdb/share/www/docs/install/freebsd.html +couchdb/share/www/docs/install/index.html +couchdb/share/www/docs/install/mac.html +couchdb/share/www/docs/install/troubleshooting.html +couchdb/share/www/docs/install/unix.html +couchdb/share/www/docs/install/windows.html +couchdb/share/www/docs/intro/api.html +couchdb/share/www/docs/intro/consistency.html +couchdb/share/www/docs/intro/curl.html +couchdb/share/www/docs/intro/index.html +couchdb/share/www/docs/intro/overview.html +couchdb/share/www/docs/intro/security.html +couchdb/share/www/docs/intro/tour.html +couchdb/share/www/docs/intro/why.html +couchdb/share/www/docs/json-structure.html +couchdb/share/www/docs/maintenance/compaction.html +couchdb/share/www/docs/maintenance/index.html +couchdb/share/www/docs/maintenance/performance.html +couchdb/share/www/docs/objects.inv +couchdb/share/www/docs/query-server/erlang.html +couchdb/share/www/docs/query-server/index.html +couchdb/share/www/docs/query-server/javascript.html +couchdb/share/www/docs/query-server/protocol.html +couchdb/share/www/docs/replication/conflicts.html +couchdb/share/www/docs/replication/index.html +couchdb/share/www/docs/replication/intro.html +couchdb/share/www/docs/replication/protocol.html +couchdb/share/www/docs/replication/replicator.html +couchdb/share/www/docs/search.html +couchdb/share/www/docs/searchindex.js +couchdb/share/www/docs/whatsnew/0.10.html +couchdb/share/www/docs/whatsnew/0.11.html +couchdb/share/www/docs/whatsnew/0.8.html +couchdb/share/www/docs/whatsnew/0.9.html +couchdb/share/www/docs/whatsnew/1.0.html +couchdb/share/www/docs/whatsnew/1.1.html +couchdb/share/www/docs/whatsnew/1.2.html +couchdb/share/www/docs/whatsnew/1.3.html +couchdb/share/www/docs/whatsnew/1.4.html +couchdb/share/www/docs/whatsnew/1.5.html +couchdb/share/www/docs/whatsnew/1.6.html +couchdb/share/www/docs/whatsnew/2.0.html +couchdb/share/www/docs/whatsnew/index.html +couchdb/share/www/index.html +info/CouchDB.info 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 -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 -share/couchdb/www/dialog/_create_database.html -share/couchdb/www/dialog/_database_security.html -share/couchdb/www/dialog/_delete_database.html -share/couchdb/www/dialog/_delete_document.html -share/couchdb/www/dialog/_login.html -share/couchdb/www/dialog/_save_view_as.html -share/couchdb/www/dialog/_share_test_reports.html -share/couchdb/www/dialog/_signup.html -share/couchdb/www/dialog/_upload_attachment.html -share/couchdb/www/docs/_images/futon-createdb.png -share/couchdb/www/docs/_images/futon-editdoc.png -share/couchdb/www/docs/_images/futon-editeddoc.png -share/couchdb/www/docs/_images/futon-overview.png -share/couchdb/www/docs/_images/futon-replform.png -share/couchdb/www/docs/_images/intro-consistency-01.png -share/couchdb/www/docs/_images/intro-consistency-02.png -share/couchdb/www/docs/_images/intro-consistency-03.png -share/couchdb/www/docs/_images/intro-consistency-04.png -share/couchdb/www/docs/_images/intro-consistency-05.png -share/couchdb/www/docs/_images/intro-consistency-06.png -share/couchdb/www/docs/_images/intro-consistency-07.png -share/couchdb/www/docs/_images/intro-tour-01.png -share/couchdb/www/docs/_images/intro-tour-02.png -share/couchdb/www/docs/_images/intro-tour-03.png -share/couchdb/www/docs/_images/intro-tour-04.png -share/couchdb/www/docs/_images/intro-tour-05.png -share/couchdb/www/docs/_images/intro-tour-06.png -share/couchdb/www/docs/_images/intro-tour-07.png -share/couchdb/www/docs/_images/intro-tour-08.png -share/couchdb/www/docs/_images/intro-tour-09.png -share/couchdb/www/docs/_images/intro-tour-10.png -share/couchdb/www/docs/_images/intro-why-01.png -share/couchdb/www/docs/_images/intro-why-02.png -share/couchdb/www/docs/_images/intro-why-03.png -share/couchdb/www/docs/_images/views-intro-01.png -share/couchdb/www/docs/_images/views-intro-02.png -share/couchdb/www/docs/_images/views-intro-03.png -share/couchdb/www/docs/_images/views-intro-04.png -share/couchdb/www/docs/_sources/about.txt -share/couchdb/www/docs/_sources/api/basics.txt -share/couchdb/www/docs/_sources/api/database/bulk-api.txt -share/couchdb/www/docs/_sources/api/database/changes.txt -share/couchdb/www/docs/_sources/api/database/common.txt -share/couchdb/www/docs/_sources/api/database/compact.txt -share/couchdb/www/docs/_sources/api/database/index.txt -share/couchdb/www/docs/_sources/api/database/misc.txt -share/couchdb/www/docs/_sources/api/database/security.txt -share/couchdb/www/docs/_sources/api/database/temp-views.txt -share/couchdb/www/docs/_sources/api/ddoc/common.txt -share/couchdb/www/docs/_sources/api/ddoc/index.txt -share/couchdb/www/docs/_sources/api/ddoc/render.txt -share/couchdb/www/docs/_sources/api/ddoc/rewrites.txt -share/couchdb/www/docs/_sources/api/ddoc/views.txt -share/couchdb/www/docs/_sources/api/document/attachments.txt -share/couchdb/www/docs/_sources/api/document/common.txt -share/couchdb/www/docs/_sources/api/document/index.txt -share/couchdb/www/docs/_sources/api/index.txt -share/couchdb/www/docs/_sources/api/local.txt -share/couchdb/www/docs/_sources/api/server/authn.txt -share/couchdb/www/docs/_sources/api/server/common.txt -share/couchdb/www/docs/_sources/api/server/configuration.txt -share/couchdb/www/docs/_sources/api/server/index.txt -share/couchdb/www/docs/_sources/config/auth.txt -share/couchdb/www/docs/_sources/config/compaction.txt -share/couchdb/www/docs/_sources/config/couchdb.txt -share/couchdb/www/docs/_sources/config/externals.txt -share/couchdb/www/docs/_sources/config/http-handlers.txt -share/couchdb/www/docs/_sources/config/http.txt -share/couchdb/www/docs/_sources/config/index.txt -share/couchdb/www/docs/_sources/config/intro.txt -share/couchdb/www/docs/_sources/config/logging.txt -share/couchdb/www/docs/_sources/config/misc.txt -share/couchdb/www/docs/_sources/config/proxying.txt -share/couchdb/www/docs/_sources/config/query-servers.txt -share/couchdb/www/docs/_sources/config/replicator.txt -share/couchdb/www/docs/_sources/config/services.txt -share/couchdb/www/docs/_sources/contents.txt -share/couchdb/www/docs/_sources/contributing.txt -share/couchdb/www/docs/_sources/couchapp/ddocs.txt -share/couchdb/www/docs/_sources/couchapp/index.txt -share/couchdb/www/docs/_sources/couchapp/views/collation.txt -share/couchdb/www/docs/_sources/couchapp/views/index.txt -share/couchdb/www/docs/_sources/couchapp/views/intro.txt -share/couchdb/www/docs/_sources/couchapp/views/joins.txt -share/couchdb/www/docs/_sources/couchapp/views/nosql.txt -share/couchdb/www/docs/_sources/couchapp/views/pagination.txt -share/couchdb/www/docs/_sources/cve/2010-0009.txt -share/couchdb/www/docs/_sources/cve/2010-2234.txt -share/couchdb/www/docs/_sources/cve/2010-3854.txt -share/couchdb/www/docs/_sources/cve/2012-5641.txt -share/couchdb/www/docs/_sources/cve/2012-5649.txt -share/couchdb/www/docs/_sources/cve/2012-5650.txt -share/couchdb/www/docs/_sources/cve/index.txt -share/couchdb/www/docs/_sources/experimental.txt -share/couchdb/www/docs/_sources/externals.txt -share/couchdb/www/docs/_sources/fauxton/addons.txt -share/couchdb/www/docs/_sources/fauxton/index.txt -share/couchdb/www/docs/_sources/fauxton/install.txt -share/couchdb/www/docs/_sources/install/freebsd.txt -share/couchdb/www/docs/_sources/install/index.txt -share/couchdb/www/docs/_sources/install/mac.txt -share/couchdb/www/docs/_sources/install/unix.txt -share/couchdb/www/docs/_sources/install/windows.txt -share/couchdb/www/docs/_sources/intro/api.txt -share/couchdb/www/docs/_sources/intro/consistency.txt -share/couchdb/www/docs/_sources/intro/curl.txt -share/couchdb/www/docs/_sources/intro/futon.txt -share/couchdb/www/docs/_sources/intro/index.txt -share/couchdb/www/docs/_sources/intro/overview.txt -share/couchdb/www/docs/_sources/intro/security.txt -share/couchdb/www/docs/_sources/intro/tour.txt -share/couchdb/www/docs/_sources/intro/why.txt -share/couchdb/www/docs/_sources/json-structure.txt -share/couchdb/www/docs/_sources/maintenance/compaction.txt -share/couchdb/www/docs/_sources/maintenance/index.txt -share/couchdb/www/docs/_sources/maintenance/performance.txt -share/couchdb/www/docs/_sources/query-server/erlang.txt -share/couchdb/www/docs/_sources/query-server/index.txt -share/couchdb/www/docs/_sources/query-server/javascript.txt -share/couchdb/www/docs/_sources/query-server/protocol.txt -share/couchdb/www/docs/_sources/replication/conflicts.txt -share/couchdb/www/docs/_sources/replication/index.txt -share/couchdb/www/docs/_sources/replication/intro.txt -share/couchdb/www/docs/_sources/replication/protocol.txt -share/couchdb/www/docs/_sources/replication/replicator.txt -share/couchdb/www/docs/_sources/whatsnew/0.10.txt -share/couchdb/www/docs/_sources/whatsnew/0.11.txt -share/couchdb/www/docs/_sources/whatsnew/0.8.txt -share/couchdb/www/docs/_sources/whatsnew/0.9.txt -share/couchdb/www/docs/_sources/whatsnew/1.0.txt -share/couchdb/www/docs/_sources/whatsnew/1.1.txt -share/couchdb/www/docs/_sources/whatsnew/1.2.txt -share/couchdb/www/docs/_sources/whatsnew/1.3.txt -share/couchdb/www/docs/_sources/whatsnew/1.4.txt -share/couchdb/www/docs/_sources/whatsnew/1.5.txt -share/couchdb/www/docs/_sources/whatsnew/1.6.txt -share/couchdb/www/docs/_sources/whatsnew/index.txt -share/couchdb/www/docs/_static/ajax-loader.gif -share/couchdb/www/docs/_static/basic.css -share/couchdb/www/docs/_static/comment-bright.png -share/couchdb/www/docs/_static/comment-close.png -share/couchdb/www/docs/_static/comment.png -share/couchdb/www/docs/_static/default.css -share/couchdb/www/docs/_static/doctools.js -share/couchdb/www/docs/_static/down-pressed.png -share/couchdb/www/docs/_static/down.png -share/couchdb/www/docs/_static/favicon.ico -share/couchdb/www/docs/_static/file.png -share/couchdb/www/docs/_static/jquery.js -share/couchdb/www/docs/_static/logo.png -share/couchdb/www/docs/_static/minus.png -share/couchdb/www/docs/_static/plus.png -share/couchdb/www/docs/_static/pygments.css -share/couchdb/www/docs/_static/rtd.css -share/couchdb/www/docs/_static/searchtools.js -share/couchdb/www/docs/_static/sidebar.js -share/couchdb/www/docs/_static/underscore.js -share/couchdb/www/docs/_static/up-pressed.png -share/couchdb/www/docs/_static/up.png -share/couchdb/www/docs/_static/websupport.js -share/couchdb/www/docs/about.html -share/couchdb/www/docs/api/basics.html -share/couchdb/www/docs/api/database/bulk-api.html -share/couchdb/www/docs/api/database/changes.html -share/couchdb/www/docs/api/database/common.html -share/couchdb/www/docs/api/database/compact.html -share/couchdb/www/docs/api/database/index.html -share/couchdb/www/docs/api/database/misc.html -share/couchdb/www/docs/api/database/security.html -share/couchdb/www/docs/api/database/temp-views.html -share/couchdb/www/docs/api/ddoc/common.html -share/couchdb/www/docs/api/ddoc/index.html -share/couchdb/www/docs/api/ddoc/render.html -share/couchdb/www/docs/api/ddoc/rewrites.html -share/couchdb/www/docs/api/ddoc/views.html -share/couchdb/www/docs/api/document/attachments.html -share/couchdb/www/docs/api/document/common.html -share/couchdb/www/docs/api/document/index.html -share/couchdb/www/docs/api/index.html -share/couchdb/www/docs/api/local.html -share/couchdb/www/docs/api/server/authn.html -share/couchdb/www/docs/api/server/common.html -share/couchdb/www/docs/api/server/configuration.html -share/couchdb/www/docs/api/server/index.html -share/couchdb/www/docs/config-ref.html -share/couchdb/www/docs/config/auth.html -share/couchdb/www/docs/config/compaction.html -share/couchdb/www/docs/config/couchdb.html -share/couchdb/www/docs/config/externals.html -share/couchdb/www/docs/config/http-handlers.html -share/couchdb/www/docs/config/http.html -share/couchdb/www/docs/config/index.html -share/couchdb/www/docs/config/intro.html -share/couchdb/www/docs/config/logging.html -share/couchdb/www/docs/config/misc.html -share/couchdb/www/docs/config/proxying.html -share/couchdb/www/docs/config/query-servers.html -share/couchdb/www/docs/config/replicator.html -share/couchdb/www/docs/config/services.html -share/couchdb/www/docs/contents.html -share/couchdb/www/docs/contributing.html -share/couchdb/www/docs/couchapp/ddocs.html -share/couchdb/www/docs/couchapp/index.html -share/couchdb/www/docs/couchapp/views/collation.html -share/couchdb/www/docs/couchapp/views/index.html -share/couchdb/www/docs/couchapp/views/intro.html -share/couchdb/www/docs/couchapp/views/joins.html -share/couchdb/www/docs/couchapp/views/nosql.html -share/couchdb/www/docs/couchapp/views/pagination.html -share/couchdb/www/docs/cve/2010-0009.html -share/couchdb/www/docs/cve/2010-2234.html -share/couchdb/www/docs/cve/2010-3854.html -share/couchdb/www/docs/cve/2012-5641.html -share/couchdb/www/docs/cve/2012-5649.html -share/couchdb/www/docs/cve/2012-5650.html -share/couchdb/www/docs/cve/index.html -share/couchdb/www/docs/download.html -share/couchdb/www/docs/experimental.html -share/couchdb/www/docs/externals.html -share/couchdb/www/docs/fauxton/addons.html -share/couchdb/www/docs/fauxton/index.html -share/couchdb/www/docs/fauxton/install.html -share/couchdb/www/docs/http-api.html -share/couchdb/www/docs/index.html -share/couchdb/www/docs/install/freebsd.html -share/couchdb/www/docs/install/index.html -share/couchdb/www/docs/install/mac.html -share/couchdb/www/docs/install/unix.html -share/couchdb/www/docs/install/windows.html -share/couchdb/www/docs/intro/api.html -share/couchdb/www/docs/intro/consistency.html -share/couchdb/www/docs/intro/curl.html -share/couchdb/www/docs/intro/futon.html -share/couchdb/www/docs/intro/index.html -share/couchdb/www/docs/intro/overview.html -share/couchdb/www/docs/intro/security.html -share/couchdb/www/docs/intro/tour.html -share/couchdb/www/docs/intro/why.html -share/couchdb/www/docs/json-structure.html -share/couchdb/www/docs/maintenance/compaction.html -share/couchdb/www/docs/maintenance/index.html -share/couchdb/www/docs/maintenance/performance.html -share/couchdb/www/docs/objects.inv -share/couchdb/www/docs/query-server/erlang.html -share/couchdb/www/docs/query-server/index.html -share/couchdb/www/docs/query-server/javascript.html -share/couchdb/www/docs/query-server/protocol.html -share/couchdb/www/docs/replication/conflicts.html -share/couchdb/www/docs/replication/index.html -share/couchdb/www/docs/replication/intro.html -share/couchdb/www/docs/replication/protocol.html -share/couchdb/www/docs/replication/replicator.html -share/couchdb/www/docs/search.html -share/couchdb/www/docs/searchindex.js -share/couchdb/www/docs/whatsnew/0.10.html -share/couchdb/www/docs/whatsnew/0.11.html -share/couchdb/www/docs/whatsnew/0.8.html -share/couchdb/www/docs/whatsnew/0.9.html -share/couchdb/www/docs/whatsnew/1.0.html -share/couchdb/www/docs/whatsnew/1.1.html -share/couchdb/www/docs/whatsnew/1.2.html -share/couchdb/www/docs/whatsnew/1.3.html -share/couchdb/www/docs/whatsnew/1.4.html -share/couchdb/www/docs/whatsnew/1.5.html -share/couchdb/www/docs/whatsnew/1.6.html -share/couchdb/www/docs/whatsnew/index.html -share/couchdb/www/document.html -share/couchdb/www/fauxton/css/index.css -share/couchdb/www/fauxton/img/FontAwesome.otf -share/couchdb/www/fauxton/img/couchdb-site.png -share/couchdb/www/fauxton/img/couchdblogo.png -share/couchdb/www/fauxton/img/fontawesome-webfont.eot -share/couchdb/www/fauxton/img/fontawesome-webfont.svg -share/couchdb/www/fauxton/img/fontawesome-webfont.ttf -share/couchdb/www/fauxton/img/fontawesome-webfont.woff -share/couchdb/www/fauxton/img/fontcustom_fauxton.eot -share/couchdb/www/fauxton/img/fontcustom_fauxton.svg -share/couchdb/www/fauxton/img/fontcustom_fauxton.ttf -share/couchdb/www/fauxton/img/fontcustom_fauxton.woff -share/couchdb/www/fauxton/img/glyphicons-halflings-white.png -share/couchdb/www/fauxton/img/glyphicons-halflings.png -share/couchdb/www/fauxton/img/linen.png -share/couchdb/www/fauxton/img/loader.gif -share/couchdb/www/fauxton/img/minilogo.png -share/couchdb/www/fauxton/index.html -share/couchdb/www/fauxton/js/ace/mode-javascript.js -share/couchdb/www/fauxton/js/ace/mode-json.js -share/couchdb/www/fauxton/js/ace/theme-crimson_editor.js -share/couchdb/www/fauxton/js/ace/worker-javascript.js -share/couchdb/www/fauxton/js/ace/worker-json.js -share/couchdb/www/fauxton/js/require.js -share/couchdb/www/favicon.ico -share/couchdb/www/image/add.png -share/couchdb/www/image/apply.gif -share/couchdb/www/image/bg.png -share/couchdb/www/image/cancel.gif -share/couchdb/www/image/compact.png -share/couchdb/www/image/delete-mini.png -share/couchdb/www/image/delete.png -share/couchdb/www/image/grippie.gif -share/couchdb/www/image/hgrad.gif -share/couchdb/www/image/key.png -share/couchdb/www/image/load.png -share/couchdb/www/image/logo.png -share/couchdb/www/image/order-asc.gif -share/couchdb/www/image/order-desc.gif -share/couchdb/www/image/path.gif -share/couchdb/www/image/progress.gif -share/couchdb/www/image/rarrow.png -share/couchdb/www/image/run-mini.png -share/couchdb/www/image/run.png -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 -share/couchdb/www/image/thead.gif -share/couchdb/www/image/toggle-collapse.gif -share/couchdb/www/image/toggle-expand.gif -share/couchdb/www/image/twisty.gif -share/couchdb/www/index.html -share/couchdb/www/plugins.html -share/couchdb/www/replicator.html -share/couchdb/www/script/base64.js -share/couchdb/www/script/couch.js -share/couchdb/www/script/couch_test_runner.js -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 -share/couchdb/www/script/jquery.form.js -share/couchdb/www/script/jquery.js -share/couchdb/www/script/jquery.resizer.js -share/couchdb/www/script/jquery.suggest.js -share/couchdb/www/script/json2.js -share/couchdb/www/script/jspec/jspec.css -share/couchdb/www/script/jspec/jspec.jquery.js -share/couchdb/www/script/jspec/jspec.js -share/couchdb/www/script/jspec/jspec.xhr.js -share/couchdb/www/script/oauth.js -share/couchdb/www/script/replicator_db_inc.js -share/couchdb/www/script/sha1.js -share/couchdb/www/script/test/all_docs.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 -share/couchdb/www/script/test/auth_cache.js -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 -share/couchdb/www/script/test/content_negotiation.js -share/couchdb/www/script/test/cookie_auth.js -share/couchdb/www/script/test/copy_doc.js -share/couchdb/www/script/test/delayed_commits.js -share/couchdb/www/script/test/design_docs.js -share/couchdb/www/script/test/design_options.js -share/couchdb/www/script/test/design_paths.js -share/couchdb/www/script/test/erlang_views.js -share/couchdb/www/script/test/etags_head.js -share/couchdb/www/script/test/etags_views.js -share/couchdb/www/script/test/form_submit.js -share/couchdb/www/script/test/http.js -share/couchdb/www/script/test/invalid_docids.js -share/couchdb/www/script/test/jsonp.js -share/couchdb/www/script/test/large_docs.js -share/couchdb/www/script/test/list_views.js -share/couchdb/www/script/test/lorem.txt -share/couchdb/www/script/test/lorem_b64.txt -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 -share/couchdb/www/script/test/recreate_doc.js -share/couchdb/www/script/test/reduce.js -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_bad_rep_id.js -share/couchdb/www/script/test/replicator_db_by_doc_id.js -share/couchdb/www/script/test/replicator_db_compact_rep_db.js -share/couchdb/www/script/test/replicator_db_continuous.js -share/couchdb/www/script/test/replicator_db_credential_delegation.js -share/couchdb/www/script/test/replicator_db_field_validation.js -share/couchdb/www/script/test/replicator_db_filtered.js -share/couchdb/www/script/test/replicator_db_identical.js -share/couchdb/www/script/test/replicator_db_identical_continuous.js -share/couchdb/www/script/test/replicator_db_invalid_filter.js -share/couchdb/www/script/test/replicator_db_security.js -share/couchdb/www/script/test/replicator_db_simple.js -share/couchdb/www/script/test/replicator_db_successive.js -share/couchdb/www/script/test/replicator_db_survives.js -share/couchdb/www/script/test/replicator_db_swap_rep_db.js -share/couchdb/www/script/test/replicator_db_update_security.js -share/couchdb/www/script/test/replicator_db_user_ctx.js -share/couchdb/www/script/test/replicator_db_write_auth.js -share/couchdb/www/script/test/rev_stemming.js -share/couchdb/www/script/test/rewrite.js -share/couchdb/www/script/test/security_validation.js -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 -share/couchdb/www/script/test/view_collation_raw.js -share/couchdb/www/script/test/view_compaction.js -share/couchdb/www/script/test/view_conflicts.js -share/couchdb/www/script/test/view_errors.js -share/couchdb/www/script/test/view_include_docs.js -share/couchdb/www/script/test/view_multi_key_all_docs.js -share/couchdb/www/script/test/view_multi_key_design.js -share/couchdb/www/script/test/view_multi_key_temp.js -share/couchdb/www/script/test/view_offsets.js -share/couchdb/www/script/test/view_pagination.js -share/couchdb/www/script/test/view_sandboxing.js -share/couchdb/www/script/test/view_update_seq.js -share/couchdb/www/session.html -share/couchdb/www/spec/couch_js_class_methods_spec.js -share/couchdb/www/spec/couch_js_instance_methods_1_spec.js -share/couchdb/www/spec/couch_js_instance_methods_2_spec.js -share/couchdb/www/spec/couch_js_instance_methods_3_spec.js -share/couchdb/www/spec/custom_helpers.js -share/couchdb/www/spec/jquery_couch_js_class_methods_spec.js -share/couchdb/www/spec/jquery_couch_js_instance_methods_1_spec.js -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/couchdb/www/verify_install.html -share/doc/couchdb/AUTHORS.gz -share/doc/couchdb/BUGS.gz -share/doc/couchdb/CouchDB.pdf.gz -share/doc/couchdb/DEVELOPERS.gz -share/doc/couchdb/INSTALL.Unix.gz -share/doc/couchdb/INSTALL.Windows.gz -share/doc/couchdb/INSTALL.gz -share/doc/couchdb/LICENSE.gz -share/doc/couchdb/NOTICE.gz -share/doc/couchdb/README.gz -share/doc/couchdb/THANKS.gz +share/doc/couchdb/CouchDB.pdf share/examples/couchdb/default.ini share/examples/couchdb/local.ini -@pkgdir share/examples/couchdb/local.d -@pkgdir share/examples/couchdb/default.d +share/examples/couchdb/vm.args diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo index 7a12a77bbb8..ee48834433d 100644 --- a/databases/couchdb/distinfo +++ b/databases/couchdb/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.14 2016/09/08 16:03:55 fhajny Exp $ +$NetBSD: distinfo,v 1.15 2016/11/16 15:59:29 fhajny Exp $ -SHA1 (apache-couchdb-1.6.1.tar.gz) = 6275f3818579d7b307052e9735c42a8a64313229 -RMD160 (apache-couchdb-1.6.1.tar.gz) = 9701c8cb7f712ce792ede3fc73e9cf028cea54b5 -SHA512 (apache-couchdb-1.6.1.tar.gz) = 70630a27dec7281fa5bdca0601796baa28fba1d7c9975d8f38b9623bbeedd62b26081118357886c7be00b7769360238b2c99695234e13cecb15a210eb986eadc -Size (apache-couchdb-1.6.1.tar.gz) = 12085350 bytes -SHA1 (patch-aa) = 67c5fa5f8bb084302a416bb838c08db378200fcd -SHA1 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a -SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872 -SHA1 (patch-ad) = ce73b043244b5a3f657bd7e13e11d686d8f77f92 -SHA1 (patch-ae) = a760518711e7f013de91a478fc2353183aa5ac5e +SHA1 (apache-couchdb-2.0.0.tar.gz) = ea59ff4be4550acdf5fd75e4b83d3e67dea38fd9 +RMD160 (apache-couchdb-2.0.0.tar.gz) = 7229c189e342a505e032f61d5f35c82d007ac545 +SHA512 (apache-couchdb-2.0.0.tar.gz) = a22b50823be9b71dcc10d130ce378aa2af9f27d21d27fb5bfc71ecf6501cbc1cfe49d5b258fd21776c9d8ffb5ba95ddebc1c8bde46ab66044cd5e7252599d9aa +Size (apache-couchdb-2.0.0.tar.gz) = 13494157 bytes +SHA1 (patch-aa) = f3e0451e68cfc6ab9ba7eef94680d1481a013ff4 +SHA1 (patch-rel_overlay_bin_couchdb) = 4c0c88bee25cd8c539bf4e61d4fbaf684c77176e +SHA1 (patch-rel_overlay_etc_default.ini) = 628a8b506cd578afaa31c65bf03171cc3f5b0c81 +SHA1 (patch-src_config_src_config__app.erl) = 6c0be4a23c47973234ede0435fe4573a620fae6f +SHA1 (patch-src_couch_rebar.config.script) = d68ffff8e0d368e8f071293b9bcb5525acc2b30f diff --git a/databases/couchdb/files/couchdb.sh b/databases/couchdb/files/couchdb.sh new file mode 100644 index 00000000000..8a0b09c59aa --- /dev/null +++ b/databases/couchdb/files/couchdb.sh @@ -0,0 +1,32 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: couchdb.sh,v 1.1 2016/11/16 15:59:29 fhajny Exp $ +# +# PROVIDE: couchdb +# REQUIRE: DAEMON network +# KEYWORD: shutdown + +if [ -f /etc/rc.subr ]; then + . /etc/rc.subr +fi + +name="couchdb" +rcvar=$name +command="@PREFIX@/bin/couchdb" +command_args="&" +pidfile="@COUCH_RUNDIR@/couchdb.pid" +procname="@PREFIX@/couchdb/erts-@ERTS_VERSION@/bin/beam" +couchdb_user="@COUCH_USER@" + +if [ -f /etc/rc.subr ]; then + load_rc_config $name + run_rc_command "$1" +else + echo -n "${name}" + @SU@ -m ${couchdb_user} -c "${command} ${command_args}" +fi + +if [ "$1" != "stop" -o "$1" != "status" ]; then + sleep 2 + echo $(check_process $procname) > $pidfile +fi diff --git a/databases/couchdb/files/smf/manifest.xml b/databases/couchdb/files/smf/manifest.xml index 0c54ee1a9db..2def7bf02ba 100644 --- a/databases/couchdb/files/smf/manifest.xml +++ b/databases/couchdb/files/smf/manifest.xml @@ -10,8 +10,9 @@ <dependency name="filesystem" grouping="require_all" restart_on="error" type="service"> <service_fmri value="svc:/system/filesystem/local" /> </dependency> - <dependency name='@SMF_NAME@-epmd' grouping='require_all' restart_on='none' type='service'> - <service_fmri value='svc:/@SMF_PREFIX@/epmd' /> + <dependency name='@SMF_NAME@-epmd' grouping='require_any' restart_on='restart' type='service'> + <service_fmri value="svc:/@SMF_PREFIX@/couch-epmd:default" /> + <service_fmri value='svc:/@SMF_PREFIX@/epmd:default' /> </dependency> <method_context working_directory="@COUCH_DBDIR@"> <method_credential user="@COUCH_USER@" group="@COUCH_GROUP@" /> @@ -20,11 +21,11 @@ <envvar name="HOME" value="@COUCH_DBDIR@" /> </method_environment> </method_context> - <exec_method type="method" name="start" exec="@PREFIX@/bin/couchdb -b" timeout_seconds="60" /> + <exec_method type="method" name="start" exec="@PREFIX@/bin/couchdb" timeout_seconds="60" /> <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" /> <property_group name="startd" type="framework"> - <propval name="duration" type="astring" value="contract" /> - <propval name="ignore_error" type="astring" value="core,signal" /> + <propval name="duration" type="astring" value="child" /> + <propval name="ignore_error" type="astring" value="core" /> </property_group> <property_group name="application" type="application"> <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/local.ini" /> @@ -35,4 +36,33 @@ </common_name> </template> </service> + <service name="@SMF_PREFIX@/couch-epmd" type="service" version="1"> + <create_default_instance enabled="false" /> + <single_instance /> + <dependency name="network" grouping="require_all" restart_on="error" type="service"> + <service_fmri value="svc:/milestone/network:default" /> + </dependency> + <dependency name="filesystem" grouping="require_all" restart_on="error" type="service"> + <service_fmri value="svc:/system/filesystem/local" /> + </dependency> + <dependency name="couch-epmd" grouping="exclude_all" restart_on="restart" type="service"> + <service_fmri value="svc:/@SMF_PREFIX@/epmd:default" /> + </dependency> + <method_context> + <method_credential user="@COUCH_USER@" group="@COUCH_GROUP@" /> + </method_context> + <exec_method type="method" name="start" exec="@PREFIX@/couchdb/erts-@ERTS_VERSION@/bin/epmd -daemon" timeout_seconds="60" /> + <exec_method type="method" name="stop" exec="@PREFIX@/couchdb/erts-@ERTS_VERSION@/bin/epmd -kill" timeout_seconds="60" /> + <property_group name="startd" type="framework"> + <propval name="duration" type="astring" value="contract" /> + <propval name="ignore_error" type="astring" value="core,signal" /> + </property_group> + <property_group name="application" type="application"></property_group> + <stability value="Evolving" /> + <template> + <common_name> + <loctext xml:lang="C">Erlang Port Mapper Daemon</loctext> + </common_name> + </template> + </service> </service_bundle> diff --git a/databases/couchdb/patches/patch-aa b/databases/couchdb/patches/patch-aa index 8e2e7f5110f..b80fbd7be66 100644 --- a/databases/couchdb/patches/patch-aa +++ b/databases/couchdb/patches/patch-aa @@ -1,109 +1,32 @@ -$NetBSD: patch-aa,v 1.8 2016/09/08 16:03:55 fhajny Exp $ +$NetBSD: patch-aa,v 1.9 2016/11/16 15:59:29 fhajny Exp $ -Set pkgsrc standard paths. -Expand compatibility to Erlang 18 and 19. +Set pkgsrc standard paths. Portability. ---- configure.orig 2014-08-21 23:15:40.000000000 +0000 +--- configure.orig 2016-09-12 09:34:26.000000000 +0000 +++ configure -@@ -647,6 +647,7 @@ localstatelogdir - localstatelibdir - locallibdir - localdocdir -+localegdir - localdatadir - localconfdir - bug_uri -@@ -18383,7 +18384,7 @@ fi - done - test -n "$CURL_CONFIG" || CURL_CONFIG="no" - -- if test "$CURL_CONFIG" == "no"; then : -+ if test "$CURL_CONFIG" = "no"; then : - - : - -@@ -18395,7 +18396,7 @@ $as_echo "$as_me: WARNING: You will be u - - else - -- if test x"" == x; then : -+ if test x"" = x; then : - - CURL_CFLAGS="`$CURL_CONFIG $curl_config_args --cflags`" - -@@ -18405,7 +18406,7 @@ else - - fi - -- if test x"" == x; then : -+ if test x"" = x; then : - - CURL_LIBS="`$CURL_CONFIG $curl_config_args --libs`" - -@@ -18532,7 +18533,7 @@ esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5 - $as_echo_n "checking Erlang version compatibility... " >&6; } --erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)" -+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)" - - version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0" - major_version=`echo $version | ${AWK} "{print \\$1}"` -@@ -18540,7 +18541,7 @@ minor_version=`echo $version | ${AWK} "{ - patch_version=`echo $version | ${AWK} "{print \\$3}"` - echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..." - --if test $major_version -lt 5 -o $major_version -gt 6; then -+if test $major_version -lt 5 -o $major_version -gt 8; then - as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5 - fi - -@@ -18559,7 +18560,7 @@ otp_release="`\ - - - -- if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then -+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)"); then - USE_OTP_NIFS_TRUE= - USE_OTP_NIFS_FALSE='#' - else -@@ -18567,7 +18568,7 @@ else - USE_OTP_NIFS_FALSE= - fi - -- if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then -+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)"); then - USE_EJSON_COMPARE_NIF_TRUE= - USE_EJSON_COMPARE_NIF_FALSE='#' - else -@@ -19212,13 +19213,15 @@ localdatadir=${datadir}/${package_identi - - localdocdir=${datadir}/doc/${package_identifier} - -+localegdir=@COUCH_EGDIR@ -+ - locallibdir=${libdir}/${package_identifier} - --localstatelibdir=${localstatedir}/lib/${package_identifier} -+localstatelibdir=@COUCH_DBDIR@ - --localstatelogdir=${localstatedir}/log/${package_identifier} -+localstatelogdir=@COUCH_LOGDIR@ - --localstaterundir=${localstatedir}/run/${package_identifier} -+localstaterundir=@COUCH_RUNDIR@ - - erlangversion=${erlangversion} - -@@ -19233,9 +19236,9 @@ if test x${IS_WINDOWS} = xTRUE; then - localerlanglibdir=${libdir} - - else -- locallibbindir=${locallibdir}/bin -+ locallibbindir=${libexecdir}/${package_identifier} - -- localerlanglibdir=${locallibdir}/erlang/lib -+ localerlanglibdir=@ERLANG_PREFIX@/lib/erlang/lib - - fi - +@@ -82,7 +82,7 @@ parse_opts() { + + --rebar) + if [ -x "$2" ]; then +- version=`$2 --version 2> /dev/null | grep -o "2\.[6-9]\.[0-9]"` ++ version=`$2 --version 2> /dev/null | grep -w "2\.[6-9]\.[0-9]"` + if [ $? -ne 0 ]; then + printf 'Rebar >=2.6.0 and <3.0.0 required' >&2 + exit 1 +@@ -147,11 +147,11 @@ cat > rel/couchdb.config << EOF + % The contents of this file are auto-generated by configure + % + {package_author_name, "$PACKAGE_AUTHOR_NAME"}. +-{prefix, "."}. +-{data_dir, "./data"}. +-{view_index_dir, "./data"}. +-{log_file, "$LOG_FILE"}. +-{fauxton_root, "./share/www"}. ++{prefix, "@PREFIX@/couchdb"}. ++{data_dir, "@COUCH_DBDIR@"}. ++{view_index_dir, "@COUCH_DBDIR@"}. ++{log_file, "@COUCH_LOGDIR@/couch.log"}. ++{fauxton_root, "@PREFIX@/couchdb/share/www"}. + {user, "$COUCHDB_USER"}. + {node_name, "-name couchdb@localhost"}. + {cluster_port, 5984}. diff --git a/databases/couchdb/patches/patch-ab b/databases/couchdb/patches/patch-ab deleted file mode 100644 index 32c28270f5c..00000000000 --- a/databases/couchdb/patches/patch-ab +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2013/04/24 12:22:38 jperkin Exp $ - -Install into examples, not sysconfdir. - ---- etc/couchdb/Makefile.in.orig 2013-03-30 14:46:47.000000000 +0000 -+++ etc/couchdb/Makefile.in -@@ -99,7 +99,7 @@ am__uninstall_files_from_dir = { \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } --am__installdirs = "$(DESTDIR)$(localconfdir)" -+am__installdirs = "$(DESTDIR)$(localegdir)" - DATA = $(localconf_DATA) $(noinst_DATA) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - transform = @program_transform_name@ -@@ -240,6 +240,7 @@ launchddir = @launchddir@ - libdir = @libdir@ - libexecdir = @libexecdir@ - localconfdir = @localconfdir@ -+localegdir = @localegdir@ - localdatadir = @localdatadir@ - localdocdir = @localdocdir@ - localedir = @localedir@ -@@ -331,25 +332,25 @@ clean-libtool: - -rm -rf .libs _libs - install-localconfDATA: $(localconf_DATA) - @$(NORMAL_INSTALL) -- @list='$(localconf_DATA)'; test -n "$(localconfdir)" || list=; \ -+ @list='$(localconf_DATA)'; test -n "$(localegdir)" || list=; \ - if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(localconfdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(localconfdir)" || exit 1; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(localegdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(localegdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(localconfdir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(localconfdir)" || exit $$?; \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(localegdir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(localegdir)" || exit $$?; \ - done - - uninstall-localconfDATA: - @$(NORMAL_UNINSTALL) -- @list='$(localconf_DATA)'; test -n "$(localconfdir)" || list=; \ -+ @list='$(localconf_DATA)'; test -n "$(localegdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(localconfdir)'; $(am__uninstall_files_from_dir) -+ dir='$(DESTDIR)$(localegdir)'; $(am__uninstall_files_from_dir) - tags: TAGS - TAGS: - -@@ -391,7 +392,7 @@ check-am: all-am - check: check-am - all-am: Makefile $(DATA) - installdirs: -- for dir in "$(DESTDIR)$(localconfdir)"; do \ -+ for dir in "$(DESTDIR)$(localegdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am -@@ -558,20 +559,20 @@ local_dev.ini: local.ini - fi - - install-data-hook: -- if test ! -f "$(DESTDIR)$(localconfdir)/local.ini"; then \ -- cp $(srcdir)/local.ini "$(DESTDIR)$(localconfdir)/local.ini"; \ -+ if test ! -f "$(DESTDIR)$(localegdir)/local.ini"; then \ -+ cp $(srcdir)/local.ini "$(DESTDIR)$(localegdir)/local.ini"; \ - fi - if test ! "$(mkdir_p)" = ""; then \ -- $(mkdir_p) "$(DESTDIR)$(localconfdir)/default.d"; \ -- $(mkdir_p) "$(DESTDIR)$(localconfdir)/local.d"; \ -+ $(mkdir_p) "$(DESTDIR)$(localegdir)/default.d"; \ -+ $(mkdir_p) "$(DESTDIR)$(localegdir)/local.d"; \ - else \ - echo "WARNING: You may have to create these directories by hand."; \ -- mkdir -p "$(DESTDIR)$(localconfdir)/default.d"; \ -- mkdir -p "$(DESTDIR)$(localconfdir)/local.d"; \ -+ mkdir -p "$(DESTDIR)$(localegdir)/default.d"; \ -+ mkdir -p "$(DESTDIR)$(localegdir)/local.d"; \ - fi - - uninstall-local: -- rm -f "$(DESTDIR)/$(localconfdir)/local.ini" -+ rm -f "$(DESTDIR)/$(localegdir)/local.ini" - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/databases/couchdb/patches/patch-ac b/databases/couchdb/patches/patch-ac deleted file mode 100644 index 4bc644592e1..00000000000 --- a/databases/couchdb/patches/patch-ac +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2013/03/04 14:12:40 fhajny Exp $ - -Remove logrotate files. - ---- etc/Makefile.in.orig 2012-12-20 21:28:48.000000000 +0000 -+++ etc/Makefile.in 2013-03-04 13:01:29.096858946 +0000 -@@ -296,15 +296,15 @@ version_minor = @version_minor@ - version_release = @version_release@ - version_revision = @version_revision@ - version_stage = @version_stage@ --SUBDIRS = couchdb default init launchd logrotate.d windows -+SUBDIRS = couchdb default init launchd windows - default_sysconf_data = logrotate.d/couchdb - @INIT_TRUE@init_sysconf_data = default/couchdb - @INIT_TRUE@init_DATA = init/couchdb - @LAUNCHD_TRUE@launchd_DATA = launchd/org.apache.couchdb.plist --nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data) -+nobase_sysconf_DATA = $(init_sysconf_data) - EXTRA_DIST = default/couchdb windows/couchdb.iss.tpl \ - windows/README.txt.tpl $(am__append_1) --CLEANFILES = $(init_DATA) $(default_sysconf_data) $(launchd_DATA) -+CLEANFILES = $(init_DATA) $(launchd_DATA) - couchdb_command_name = `echo couchdb | sed '$(transform)'` - all: all-recursive - -@@ -740,9 +740,6 @@ init/couchdb: init/couchdb.tpl - -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \ - < $< > $@ - --logrotate.d/couchdb: logrotate.d/couchdb.tpl -- sed -e "s|%localstatelogdir%|@localstatelogdir@|g" < $< > $@ -- - launchd/org.apache.couchdb.plist: launchd/org.apache.couchdb.plist.tpl - if test "$(mkdir_p)"; then \ - $(mkdir_p) launchd; \ diff --git a/databases/couchdb/patches/patch-ad b/databases/couchdb/patches/patch-ad deleted file mode 100644 index 10a7c4676fd..00000000000 --- a/databases/couchdb/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2014/01/02 17:10:23 fhajny Exp $ - -Set pkgsrc standard paths. ---- bin/couchdb.tpl.in.orig 2013-10-20 09:38:19.000000000 +0000 -+++ bin/couchdb.tpl.in -@@ -28,7 +28,7 @@ KILL=false - PLUGINS_DIR=%locallibdir%/plugins - LOCAL_CONFIG_DIR=%localconfdir%/local.d - LOCAL_CONFIG_FILE=%localconfdir%/%localini% --PID_FILE=%localstatedir%/run/couchdb/couchdb.pid -+PID_FILE=@COUCH_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 deleted file mode 100644 index 10c135029a6..00000000000 --- a/databases/couchdb/patches/patch-ae +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2013/03/04 14:12:40 fhajny Exp $ - -Use proper installer for script files. - ---- src/couchdb/priv/Makefile.in.orig 2012-12-20 21:28:49.000000000 +0000 -+++ src/couchdb/priv/Makefile.in 2013-03-04 13:13:06.147877580 +0000 -@@ -447,8 +447,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 - diff --git a/databases/couchdb/patches/patch-rel_overlay_bin_couchdb b/databases/couchdb/patches/patch-rel_overlay_bin_couchdb new file mode 100644 index 00000000000..20239afab03 --- /dev/null +++ b/databases/couchdb/patches/patch-rel_overlay_bin_couchdb @@ -0,0 +1,26 @@ +$NetBSD: patch-rel_overlay_bin_couchdb,v 1.1 2016/11/16 15:59:29 fhajny Exp $ + +Set pkgsrc standard paths. + +--- rel/overlay/bin/couchdb.orig 2016-09-12 09:34:26.000000000 +0000 ++++ rel/overlay/bin/couchdb +@@ -12,11 +12,7 @@ + # License for the specific language governing permissions and limitations under + # the License. + +-COUCHDB_BIN_DIR=$(cd "${0%/*}" && pwd) +-ERTS_BIN_DIR=$COUCHDB_BIN_DIR/../ +-cd "$COUCHDB_BIN_DIR/../" +- +-export ROOTDIR=${ERTS_BIN_DIR%/*} ++export ROOTDIR=@PREFIX@/couchdb + + START_ERL=`cat "$ROOTDIR/releases/start_erl.data"` + ERTS_VSN=${START_ERL% *} +@@ -27,5 +23,5 @@ export EMU=beam + export PROGNAME=`echo $0 | sed 's/.*\///'` + + exec "$BINDIR/erlexec" -boot "$ROOTDIR/releases/$APP_VSN/couchdb" \ +- -args_file "$ROOTDIR/etc/vm.args" \ ++ -args_file "@PKG_SYSCONFDIR@/vm.args" \ + -config "$ROOTDIR/releases/$APP_VSN/sys.config" diff --git a/databases/couchdb/patches/patch-rel_overlay_etc_default.ini b/databases/couchdb/patches/patch-rel_overlay_etc_default.ini new file mode 100644 index 00000000000..25851069708 --- /dev/null +++ b/databases/couchdb/patches/patch-rel_overlay_etc_default.ini @@ -0,0 +1,30 @@ +$NetBSD: patch-rel_overlay_etc_default.ini,v 1.1 2016/11/16 15:59:29 fhajny Exp $ + +Set pkgsrc standard paths. + +--- rel/overlay/etc/default.ini.orig 2016-09-12 09:34:26.000000000 +0000 ++++ rel/overlay/etc/default.ini +@@ -204,8 +204,8 @@ credentials = false + use_users_db = false + + [query_servers] +-javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js +-coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js ++javascript = {{prefix}}/../bin/couchjs {{prefix}}/share/server/main.js ++coffeescript = {{prefix}}/../bin/couchjs {{prefix}}/share/server/main-coffee.js + + ; enable mango query engine + [native_query_servers] +@@ -461,10 +461,10 @@ min_file_size = 131072 + ; here if you want to implement your own + ; writer. See couch_log_writer.erl for + ; more information on the (simple) API. +-writer = stderr ++writer = file + + ; Options for the file writer +-; file = /path/to/couch.log ++ file = @COUCH_LOGDIR@/couch.log + ; write_buffer = size_in_bytes + ; write_delay = time_in_milliseconds + diff --git a/databases/couchdb/patches/patch-src_config_src_config__app.erl b/databases/couchdb/patches/patch-src_config_src_config__app.erl new file mode 100644 index 00000000000..9cf399fd454 --- /dev/null +++ b/databases/couchdb/patches/patch-src_config_src_config__app.erl @@ -0,0 +1,15 @@ +$NetBSD: patch-src_config_src_config__app.erl,v 1.1 2016/11/16 15:59:29 fhajny Exp $ + +Set pkgsrc standard paths. + +--- src/config/src/config_app.erl.orig 2016-08-24 19:21:47.000000000 +0000 ++++ src/config/src/config_app.erl +@@ -48,7 +48,7 @@ command_line() -> + end. + + default() -> +- Etc = filename:join(code:root_dir(), "etc"), ++ Etc = "@PKG_SYSCONFDIR@", + Default = [ + filename:join(Etc, "default.ini"), + filename:join(Etc, "default.d"), diff --git a/databases/couchdb/patches/patch-src_couch_rebar.config.script b/databases/couchdb/patches/patch-src_couch_rebar.config.script new file mode 100644 index 00000000000..45d25239b56 --- /dev/null +++ b/databases/couchdb/patches/patch-src_couch_rebar.config.script @@ -0,0 +1,90 @@ +$NetBSD: patch-src_couch_rebar.config.script,v 1.1 2016/11/16 15:59:29 fhajny Exp $ + +Set pkgsrc standard paths. +Use pkg-config to set SpiderMonkey CFLAGS/LDFLAGS. + +--- src/couch/rebar.config.script.orig 2016-09-12 09:28:51.000000000 +0000 ++++ src/couch/rebar.config.script +@@ -64,23 +64,28 @@ ConfigSrc = [["#define ", K, " ", V, $\n + ConfigBin = iolist_to_binary(ConfigSrc), + ok = CopyIfDifferent(CouchJSConfig, ConfigBin), + ++CFLAGS = [os:getenv("CFLAGS")], ++LDFLAGS = [os:getenv("LDFLAGS")], ++JSFLAGS = string:strip(os:cmd("pkg-config --cflags mozjs185"), right, $\n), ++JSLIBS = string:strip(os:cmd("pkg-config --libs mozjs185"), right, $\n), ++ + %% TODO support curl on Windows + {JS_CFLAGS, JS_LDFLAGS} = case lists:keyfind(with_curl, 1, CouchConfig) of + {with_curl, true} -> + case os:type() of + {win32, _} -> + {"/DHAVE_CURL /IC:\\relax\\curl\\include", "/LIBPATH:C:\\relax\\js-1.8.5\\js\\src /LIBPATH:C:\\Relax\\curl\\lib\\release-ssl mozjs185-1.0.lib libcurl_imp.lib"}; +- {unix, freebsd} -> +- {"-DHAVE_CURL -I/usr/local/include", "-DHAVE_CURL -lmozjs185 -lcurl"}; ++ {unix, bsd} -> ++ {"$CFLAGS -DHAVE_CURL " ++ JSFLAGS, "$LDFLAGS -DHAVE_CURL -lcurl " ++ JSLIBS}; + _ -> +- {"-DHAVE_CURL", "-DHAVE_CURL -lmozjs185 -lcurl"} ++ {"$CFLAGS -DHAVE_CURL " ++ JSFLAGS, "$LDFLAGS -DHAVE_CURL -lcurl " ++ JSLIBS} + end; + _ -> + case os:type() of + {win32, _} -> + {"", "/LIBPATH:C:\\relax\\js-1.8.5\\js\\src mozjs185-1.0.lib"}; + _ -> +- {"", "-lmozjs185"} ++ {"$CFLAGS " ++ JSFLAGS, "$LDFLAGS " ++ JSLIBS} + end + end, + +@@ -88,33 +93,38 @@ CouchJSSrc = ["priv/couch_js/*.c"], + + IcuPath = "priv/couch_icu_driver.so", + IcuSrc = ["priv/icu_driver/*.c"], +-IcuEnv = [{"DRV_CFLAGS", "$DRV_CFLAGS -DPIC -O2 -fno-common"}, +- {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"}], ++IcuEnv = [{"DRV_CFLAGS", "$CFLAGS $DRV_CFLAGS -DPIC -O2 -fno-common"}, ++ {"DRV_LDFLAGS", "$DRV_LDFLAGS $LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"}], + IcuDarwinEnv = [{"CFLAGS", "-DXP_UNIX -I/usr/local/opt/icu4c/include"}, + {"LDFLAGS", "-L/usr/local/opt/icu4c/lib"}], + IcuBsdEnv = [{"CFLAGS", "-DXP_UNIX -I/usr/local/include"}, + {"LDFLAGS", "-L/usr/local/lib"}], + IcuWinEnv = [{"CFLAGS", "/DXP_WIN /IC:\\relax\\icu\\include"}, + {"LDFLAGS", "/LIBPATH:C:\\relax\\icu\\lib64 icuin.lib icudt.lib icuuc.lib"}], ++UnixEnv = [{"CFLAGS", " $CFLAGS -DXP_UNIX"}, ++ {"LDFLAGS", " $LDFLAGS -lm"}], + + ComparePath = "priv/couch_ejson_compare.so", + CompareSrc = ["priv/couch_ejson_compare/*.c"], + + BaseSpecs = [ + %% couchjs +- {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib"}]}]}, +- {"linux", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX -I/usr/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, +- {"bsd", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib -lm"}]}]}, ++ {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS}]}]}, ++ {"linux", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, ++ {"bsd", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, ++ {"solaris", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, + {"win32", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " /DXP_WIN /IC:\\relax\\js-1.8.5\\js\\src"}, {"LDFLAGS", JS_LDFLAGS}]}]}, + % ICU +- {"darwin", IcuPath, IcuSrc, [{env, IcuEnv ++ IcuDarwinEnv}]}, +- {"linux", IcuPath, IcuSrc, [{env, IcuEnv}]}, +- {"bsd", IcuPath, IcuSrc, [{env, IcuEnv ++ IcuBsdEnv}]}, ++ {"darwin", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"linux", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"bsd", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"solaris", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, + {"win32", IcuPath, IcuSrc, [{env, IcuWinEnv}]}, + % ejson_compare +- {"darwin", ComparePath, CompareSrc, [{env, IcuEnv ++ IcuDarwinEnv}]}, +- {"linux", ComparePath, CompareSrc, [{env, IcuEnv}]}, +- {"bsd", ComparePath, CompareSrc, [{env, IcuEnv ++ IcuBsdEnv}]}, ++ {"darwin", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"linux", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"bsd", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"solaris", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, + {"win32", ComparePath, CompareSrc, [{env, IcuWinEnv}]} + ], + |