Date: Mon, 1 Feb 2010 02:18:28 +0100 (CET) From: Stefan `Sec` Zehl <sec@42.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Ditesh Shashikant Gathani <ditesh@gathani.org> Subject: ports/143415: update of databases/coucdb port Message-ID: <20100201011828.A599128414@ice.42.org> Resent-Message-ID: <201002010120.o111K1uo017191@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143415
>Category: ports
>Synopsis: update of databases/coucdb port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 01 01:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Stefan `Sec` Zehl
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD ice 8.0-STABLE FreeBSD 8.0-STABLE #10: Wed Jan 20 01:49:34 CET 2010 root@ice:/usr/obj/usr/src/sys/ICE amd64
>Description:
This is an update of the couchdb port from 0.9 to 0.10.1
This also fixes a small but in the start/stop script.
("-gt" instead of ">")
The automake mess incorrectly tries to strip a shell script.
I don't know how to fix this in src/couchdb/priv/Makefile.am,
so I set "STRIP=" in the ports Makefile.
>How-To-Repeat:
>Fix:
diff -burN /usr/ports/databases/couchdb/Makefile couchdb/Makefile
--- /usr/ports/databases/couchdb/Makefile 2009-08-02 21:32:39.000000000 +0200
+++ couchdb/Makefile 2010-02-01 01:07:59.000000000 +0100
@@ -6,7 +6,7 @@
#
PORTNAME= couchdb
-PORTVERSION= 0.9.0
+PORTVERSION= 0.10.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= databases
@@ -31,6 +31,7 @@
USE_RC_SUBR= couchdb
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
+STRIP=
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-erlang=${LOCALBASE}/lib/erlang/usr/include \
--localstatedir=/var \
diff -burN /usr/ports/databases/couchdb/distinfo couchdb/distinfo
--- /usr/ports/databases/couchdb/distinfo 2009-04-21 17:43:03.000000000 +0200
+++ couchdb/distinfo 2010-01-31 23:19:28.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (apache-couchdb-0.9.0.tar.gz) = 16526c807ae8a455a0a4feb50d0357eb
-SHA256 (apache-couchdb-0.9.0.tar.gz) = 8e18416179860f893dc31e81948869195a07cbd69a81966bb9631a0d3ab9f99c
-SIZE (apache-couchdb-0.9.0.tar.gz) = 737185
+MD5 (apache-couchdb-0.10.1.tar.gz) = a34dae8bf402299e378d7e8c13b7ba46
+SHA256 (apache-couchdb-0.10.1.tar.gz) = 2c6af7216537d0e399674a83e4505dc04a02abe1bdd966f69074564c3521c66b
+SIZE (apache-couchdb-0.10.1.tar.gz) = 883259
diff -burN /usr/ports/databases/couchdb/files/couchdb.in couchdb/files/couchdb.in
--- /usr/ports/databases/couchdb/files/couchdb.in 2009-10-21 11:55:15.000000000 +0200
+++ couchdb/files/couchdb.in 2010-02-01 02:01:03.000000000 +0100
@@ -35,7 +35,7 @@
etcdir="%%PREFIX%%/etc/${name}"
respawn=""
-if [ "$couchdb_respawn" > 0 ]
+if [ "$couchdb_respawn" -gt 0 ]
then
respawn="-r ${couchdb_respawn} "
fi
@@ -50,7 +50,7 @@
fi
: ${couchdb_enable="NO"}
-: ${couchdb_flags="-b -c ${etcdir}/default.ini -c ${etcdir}/local.ini ${respawn}-o ${logfile} -e ${errfile} -p ${pidfile}"}
+: ${couchdb_flags="-b ${respawn}-o ${logfile} -e ${errfile} -p ${pidfile}"}
start_precmd=pid_touch
stop_cmd="${command} -d && rm -f ${pidfile}"
diff -burN /usr/ports/databases/couchdb/pkg-plist couchdb/pkg-plist
--- /usr/ports/databases/couchdb/pkg-plist 2009-04-21 17:43:03.000000000 +0200
+++ couchdb/pkg-plist 2010-02-01 02:15:40.000000000 +0100
@@ -4,55 +4,68 @@
etc/couchdb/local.ini
etc/logrotate.d/couchdb
lib/couchdb/bin/couchjs
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_sup.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_app.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_test.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_lib.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_lb.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_http_client.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse.app
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse.beam
-lib/couchdb/erlang/lib/couch-0.9.0/include/couch_db.hrl
-lib/couchdb/erlang/lib/couch-0.9.0/priv/lib/couch_erl_driver.la
-lib/couchdb/erlang/lib/couch-0.9.0/priv/lib/couch_erl_driver.so
-lib/couchdb/erlang/lib/couch-0.9.0/priv/lib/couch_erl_driver.a
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_os_process.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_server.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_stream.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_db_updater.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_rep.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_log.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_db_update_notifier_sup.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_event_sup.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_config_writer.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_stats_handlers.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch.app
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_db.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_util.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_task_status.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_db_update_notifier.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_config.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_file.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_view.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_db.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_btree.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_rep_sup.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_view.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_view_group.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_external_server.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_stats_aggregator.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_stats_collector.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_ref_counter.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_query_servers.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_doc.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_server_sup.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_misc_handlers.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_external.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_show.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_external_manager.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_view_updater.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_key_tree.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch.app
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_batch_save.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_batch_save_sup.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_btree.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_config.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_config_writer.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_db.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_db_update_notifier.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_db_update_notifier_sup.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_db_updater.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_doc.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_event_sup.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_external_manager.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_external_server.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_file.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd_auth.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd_db.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd_external.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd_misc_handlers.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd_oauth.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd_show.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd_stats_handlers.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_httpd_view.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_key_tree.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_log.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_native_process.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_os_process.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_query_servers.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_ref_counter.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_rep.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_rep_att.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_rep_changes_feed.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_rep_httpc.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_rep_missing_revs.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_rep_reader.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_rep_sup.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_rep_writer.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_server.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_server_sup.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_stats_aggregator.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_stats_collector.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_stream.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_task_status.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_util.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_view.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_view_compactor.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_view_group.beam
+lib/couchdb/erlang/lib/couch-0.10.1/ebin/couch_view_updater.beam
+lib/couchdb/erlang/lib/couch-0.10.1/include/couch_db.hrl
+lib/couchdb/erlang/lib/couch-0.10.1/priv/couchspawnkillable
+lib/couchdb/erlang/lib/couch-0.10.1/priv/lib/couch_erl_driver.a
+lib/couchdb/erlang/lib/couch-0.10.1/priv/lib/couch_erl_driver.la
+lib/couchdb/erlang/lib/couch-0.10.1/priv/lib/couch_erl_driver.so
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse.app
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_app.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_http_client.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_lb.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_lib.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_sup.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_test.beam
lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt.beam
lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt_records.beam
lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt_std.beam
@@ -77,6 +90,22 @@
lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_sup.beam
lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_util.beam
lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.app
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_hmac_sha1.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_http.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_plaintext.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_unix.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_uri.beam
+lib/couchdb/erlang/lib/etap/ebin/etap.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_application.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_can.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_exception.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_process.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_report.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_request.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_string.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_web.beam
share/couchdb/server/main.js
share/couchdb/www/_sidebar.html
share/couchdb/www/config.html
@@ -84,7 +113,6 @@
share/couchdb/www/database.html
share/couchdb/www/dialog/_compact_database.html
share/couchdb/www/dialog/_create_database.html
-share/couchdb/www/dialog/_create_document.html
share/couchdb/www/dialog/_delete_database.html
share/couchdb/www/dialog/_delete_document.html
share/couchdb/www/dialog/_save_view_as.html
@@ -120,6 +148,7 @@
share/couchdb/www/image/toggle-expand.gif
share/couchdb/www/image/twisty.gif
share/couchdb/www/index.html
+share/couchdb/www/image/sidebar-toggle.png
share/couchdb/www/replicator.html
share/couchdb/www/script/couch.js
share/couchdb/www/script/couch_test_runner.js
@@ -136,6 +165,8 @@
share/couchdb/www/script/jquery.resizer.js
share/couchdb/www/script/jquery.suggest.js
share/couchdb/www/script/json2.js
+share/couchdb/www/script/oauth.js
+share/couchdb/www/script/sha1.js
share/couchdb/www/script/test/view_include_docs.js
share/couchdb/www/script/test/conflicts.js
share/couchdb/www/script/test/show_documents.js
@@ -180,8 +211,22 @@
share/couchdb/www/script/test/view_multi_key_design.js
share/couchdb/www/script/test/basics.js
share/couchdb/www/script/test/content_negotiation.js
+share/couchdb/www/script/test/attachment_names.js
+share/couchdb/www/script/test/batch_save.js
+share/couchdb/www/script/test/changes.js
+share/couchdb/www/script/test/cookie_auth.js
+share/couchdb/www/script/test/erlang_views.js
+share/couchdb/www/script/test/form_submit.js
+share/couchdb/www/script/test/http.js
+share/couchdb/www/script/test/jsonp.js
+share/couchdb/www/script/test/lorem.txt
+share/couchdb/www/script/test/lorem_b64.txt
+share/couchdb/www/script/test/reduce_builtin.js
+share/couchdb/www/script/test/oauth.js
+share/couchdb/www/script/test/update_documents.js
share/couchdb/www/status.html
share/couchdb/www/style/layout.css
+share/couchdb/www/custom_test.html
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.gz
%%PORTDOCS%%%%DOCSDIR%%/BUGS.gz
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.gz
@@ -197,18 +242,24 @@
@dirrm share/couchdb/www
@dirrm share/couchdb/server
@dirrm share/couchdb
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0/ebin
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0/include
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0/priv/lib
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0/priv
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0
-@dirrm lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin
-@dirrm lib/couchdb/erlang/lib/ibrowse-1.4.1
+@dirrm lib/couchdb/erlang/lib/couch-0.10.1/ebin
+@dirrm lib/couchdb/erlang/lib/couch-0.10.1/include
+@dirrm lib/couchdb/erlang/lib/couch-0.10.1/priv/lib
+@dirrm lib/couchdb/erlang/lib/couch-0.10.1/priv
+@dirrm lib/couchdb/erlang/lib/couch-0.10.1
+@dirrm lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin
+@dirrm lib/couchdb/erlang/lib/ibrowse-1.5.2
@dirrm lib/couchdb/erlang/lib/mochiweb-r97/ebin
@dirrm lib/couchdb/erlang/lib/mochiweb-r97
+@dirrm lib/couchdb/erlang/lib/erlang-oauth/ebin
+@dirrm lib/couchdb/erlang/lib/erlang-oauth
+@dirrm lib/couchdb/erlang/lib/etap/ebin
+@dirrm lib/couchdb/erlang/lib/etap
@dirrm lib/couchdb/erlang/lib
@dirrm lib/couchdb/erlang
@dirrm lib/couchdb/bin
@dirrm lib/couchdb
@dirrm etc/logrotate.d
+@dirrm etc/couchdb/default.d
+@dirrm etc/couchdb/local.d
@dirrm etc/couchdb
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100201011828.A599128414>