diff options
author | fhajny <fhajny@pkgsrc.org> | 2011-12-20 14:08:55 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2011-12-20 14:08:55 +0000 |
commit | c95a28bbe99dbc282ab28f607259d0ba927745b1 (patch) | |
tree | 5330495b05b0dd7c44933fcad14f4b62607c092f /databases/couchdb | |
parent | e8876507ac321972a2a8e527c29b34933e4b9ae7 (diff) | |
download | pkgsrc-c95a28bbe99dbc282ab28f607259d0ba927745b1.tar.gz |
Update couchdb to 1.1.1.
Changes:
* Support SpiderMonkey 1.8.5
* Add configurable maximum to the number of bytes returned by _log.
* Allow CommonJS modules to be an empty string.
* Bump minimum Erlang version to R13B02.
* Do not run deleted validate_doc_update functions.
* ETags for views include current sequence if include_docs=true.
* Fix bug where duplicates can appear in _changes feed.
* Fix bug where update handlers break after conflict resolution.
* Fix bug with _replicator where include "filter" could crash couch.
* Fix crashes when compacting large views.
* Fix file descriptor leak in _log
* Fix missing revisions in _changes?style=all_docs.
* Improve handling of compaction at max_dbs_open limit.
* JSONP responses now send "text/javascript" for Content-Type.
* Link to ICU 4.2 on Windows.
* Permit forward slashes in path to update functions.
* Reap couchjs processes that hit reduce_overflow error.
* Status code can be specified in update handlers.
* Support provides() in show functions.
* _view_cleanup when ddoc has no views now removes all index files.
* max_replication_retry_count now supports "infinity".
* Fix replication crash when source database has a document with empty ID.
* Fix deadlock when assigning couchjs processes to serve requests.
* Fixes to the document multipart PUT API.
* Fixes regarding file descriptor leaks for databases with views.
Diffstat (limited to 'databases/couchdb')
-rw-r--r-- | databases/couchdb/Makefile | 10 | ||||
-rw-r--r-- | databases/couchdb/distinfo | 15 | ||||
-rw-r--r-- | databases/couchdb/patches/patch-aa | 43 | ||||
-rw-r--r-- | databases/couchdb/patches/patch-ab | 55 | ||||
-rw-r--r-- | databases/couchdb/patches/patch-ae | 24 | ||||
-rw-r--r-- | databases/couchdb/patches/patch-src__couchdb__priv__couch_js__utf8.h | 12 |
6 files changed, 89 insertions, 70 deletions
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index 9fc7654de55..aa794be588c 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2011/07/27 19:20:57 fhajny Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/20 14:08:55 fhajny Exp $ # -DISTNAME= apache-couchdb-1.1.0 +DISTNAME= apache-couchdb-1.1.1 PKGNAME= ${DISTNAME:S/apache-//} CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/1.1.0/} +MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/1.1.1/} MAINTAINER= filip@joyent.com HOMEPAGE= http://couchdb.apache.org/ @@ -17,7 +17,7 @@ VERSION.ibrowse= 2.2.0 VERSION.mochiweb= 7c2bc2 GNU_CONFIGURE= yes -USE_LANGUAGES+= c c++ +USE_LANGUAGES= c c++ USE_TOOLS+= gmake USE_LIBTOOL= yes BUILD_DEFS+= VARBASE @@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --with-js-lib=${BUILDLINK_PREFIX.spidermonkey} REPLACE_INTERPRETER+= sh REPLACE.sh.old= /bin/sh REPLACE.sh.new= /bin/ksh -REPLACE_FILES.sh= bin/couchdb.tpl.in bin/couchjs.tpl.in +REPLACE_FILES.sh= bin/couchdb.tpl.in .endif SUBST_CLASSES+= paths diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo index f7f7575a85b..55b8bc9a2d8 100644 --- a/databases/couchdb/distinfo +++ b/databases/couchdb/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.2 2011/07/27 19:20:57 fhajny Exp $ +$NetBSD: distinfo,v 1.3 2011/12/20 14:08:55 fhajny Exp $ -SHA1 (apache-couchdb-1.1.0.tar.gz) = 7cb6a12f3becaae4eeb8ee75b15fbe6395fa7a98 -RMD160 (apache-couchdb-1.1.0.tar.gz) = 4dcb5c520b0402366e82a1c195fc4404bc7bd37d -Size (apache-couchdb-1.1.0.tar.gz) = 1088226 bytes -SHA1 (patch-aa) = 533449b95db713f3a47b3ff861a6cf4f5443eeee -SHA1 (patch-ab) = cb3ce6abef55535a9729c9881107f69238036516 +SHA1 (apache-couchdb-1.1.1.tar.gz) = c901676663279338095642462bafa2d0667df98b +RMD160 (apache-couchdb-1.1.1.tar.gz) = e61acf6649dbcfdd4834cc5f0920f38fd0d4ba76 +Size (apache-couchdb-1.1.1.tar.gz) = 1070948 bytes +SHA1 (patch-aa) = 86666a2454c2a4540d95cb67e362b635942440f9 +SHA1 (patch-ab) = 5efc967379dd4b1fcbc18c64266f7308892d7b71 SHA1 (patch-ac) = ad77cac068fe07046275271f0d745b3a1c8a4baa SHA1 (patch-ad) = 20fcfab5fe067d57703d2cc80e308b112ce60826 -SHA1 (patch-ae) = a1c49fbfdeb60176384738d64398a84c99ee095c +SHA1 (patch-ae) = 4e8ed625790191b429a5116a6062ccb131cb4d18 +SHA1 (patch-src__couchdb__priv__couch_js__utf8.h) = 2134e3b717d04592ab24763fa8127d99df49b27b diff --git a/databases/couchdb/patches/patch-aa b/databases/couchdb/patches/patch-aa index 8d54579b58d..5c32828dc80 100644 --- a/databases/couchdb/patches/patch-aa +++ b/databases/couchdb/patches/patch-aa @@ -1,27 +1,23 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/09/21 12:11:39 fhajny Exp $ +$NetBSD: patch-aa,v 1.2 2011/12/20 14:08:55 fhajny Exp $ Set pkgsrc standard paths. ---- configure.orig 2009-11-24 23:54:09.000000000 +0000 +--- configure.orig 2011-10-24 09:38:37.000000000 +0000 +++ configure -@@ -753,6 +753,7 @@ locallibdir - localdocdir - localdatadir +@@ -916,6 +916,7 @@ bug_uri localconfdir + localdatadir + localdocdir +localegdir - bug_uri - version_release - version_stage -@@ -12081,17 +12082,19 @@ bug_uri="https://issues.apache.org/jira/ + locallibdir + localstatelibdir + localstatelogdir +@@ -12937,13 +12938,15 @@ localdatadir=${datadir}/${package_identi - localconfdir=${sysconfdir}/${package_identifier} + localdocdir=${datadir}/doc/${package_identifier} +localegdir=@EGDIR@ + - localdatadir=${datadir}/${package_identifier} - - localdocdir=${datadir}/doc/${package_identifier} - locallibdir=${libdir}/${package_identifier} -localstatelibdir=${localstatedir}/lib/${package_identifier} @@ -34,7 +30,7 @@ Set pkgsrc standard paths. # On Windows we install directly into our erlang distribution. -@@ -12101,9 +12104,9 @@ if test x${IS_WINDOWS} = xTRUE; then +@@ -12953,9 +12956,9 @@ if test x${IS_WINDOWS} = xTRUE; then localerlanglibdir=${libdir} else @@ -46,3 +42,20 @@ Set pkgsrc standard paths. fi +@@ -14177,6 +14180,7 @@ bug_uri!$bug_uri$ac_delim + localconfdir!$localconfdir$ac_delim + localdatadir!$localdatadir$ac_delim + localdocdir!$localdocdir$ac_delim ++localegdir!$localegdir$ac_delim + locallibdir!$locallibdir$ac_delim + localstatelibdir!$localstatelibdir$ac_delim + localstatelogdir!$localstatelogdir$ac_delim +@@ -14189,7 +14193,7 @@ LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/databases/couchdb/patches/patch-ab b/databases/couchdb/patches/patch-ab index 27a7337b6ba..fb6a5ddadad 100644 --- a/databases/couchdb/patches/patch-ab +++ b/databases/couchdb/patches/patch-ab @@ -1,19 +1,19 @@ -$NetBSD: patch-ab,v 1.1.1.1 2010/09/21 12:11:39 fhajny Exp $ +$NetBSD: patch-ab,v 1.2 2011/12/20 14:08:55 fhajny Exp $ Install into examples, not sysconfdir. ---- etc/couchdb/Makefile.in.orig 2009-11-24 23:54:07.000000000 +0000 +--- etc/couchdb/Makefile.in.orig 2011-10-24 09:38:34.000000000 +0000 +++ etc/couchdb/Makefile.in -@@ -69,7 +69,7 @@ am__nobase_list = $(am__nobase_strip_set - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +@@ -53,7 +53,7 @@ am__vpath_adj = case $$p in \ + *) f=$$p;; \ + esac; + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(localconfdir)" +am__installdirs = "$(DESTDIR)$(localegdir)" + localconfDATA_INSTALL = $(INSTALL_DATA) DATA = $(localconf_DATA) $(noinst_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - transform = @program_transform_name@ -@@ -187,6 +187,7 @@ launchddir = @launchddir@ +@@ -174,6 +174,7 @@ launchddir = @launchddir@ libdir = @libdir@ libexecdir = @libexecdir@ localconfdir = @localconfdir@ @@ -21,38 +21,33 @@ Install into examples, not sysconfdir. localdatadir = @localdatadir@ localdocdir = @localdocdir@ localedir = @localedir@ -@@ -275,24 +276,24 @@ clean-libtool: +@@ -263,20 +264,20 @@ clean-libtool: -rm -rf .libs _libs install-localconfDATA: $(localconf_DATA) @$(NORMAL_INSTALL) - test -z "$(localconfdir)" || $(MKDIR_P) "$(DESTDIR)$(localconfdir)" + test -z "$(localegdir)" || $(MKDIR_P) "$(DESTDIR)$(localegdir)" - @list='$(localconf_DATA)'; test -n "$(localconfdir)" || list=; \ - for p in $$list; do \ + @list='$(localconf_DATA)'; 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 $$?; \ + f=$(am__strip_dir) \ +- echo " $(localconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(localconfdir)/$$f'"; \ +- $(localconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(localconfdir)/$$f"; \ ++ echo " $(localconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(localegdir)/$$f'"; \ ++ $(localconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(localegdir)/$$f"; \ 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|^.*/||'`; \ - test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(localconfdir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(localconfdir)" && rm -f $$files -+ echo " ( cd '$(DESTDIR)$(localegdir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(localegdir)" && rm -f $$files + @list='$(localconf_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(localconfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(localconfdir)/$$f"; \ ++ echo " rm -f '$(DESTDIR)$(localegdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(localegdir)/$$f"; \ + done tags: TAGS TAGS: - -@@ -334,7 +335,7 @@ check-am: all-am +@@ -315,7 +316,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: @@ -61,7 +56,7 @@ Install into examples, not sysconfdir. test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -486,20 +487,20 @@ local_dev.ini: local.ini +@@ -458,20 +459,20 @@ local_dev.ini: local.ini fi install-data-hook: @@ -86,6 +81,6 @@ Install into examples, not sysconfdir. 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. + .NOEXPORT: diff --git a/databases/couchdb/patches/patch-ae b/databases/couchdb/patches/patch-ae index c264d22bea2..c3ff9e7699e 100644 --- a/databases/couchdb/patches/patch-ae +++ b/databases/couchdb/patches/patch-ae @@ -1,17 +1,15 @@ -$NetBSD: patch-ae,v 1.1 2011/07/27 19:20:57 fhajny Exp $ +$NetBSD: patch-ae,v 1.2 2011/12/20 14:08:55 fhajny Exp $ Use proper installer for script files. ---- src/couchdb/priv/Makefile.in.orig 2010-08-11 18:18:53.000000000 +0000 +--- src/couchdb/priv/Makefile.in.orig 2011-10-24 09:38:34.000000000 +0000 +++ src/couchdb/priv/Makefile.in -@@ -398,8 +398,8 @@ install-couchprivPROGRAMS: $(couchpriv_P - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(couchprivdir)$$dir'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(couchprivdir)$$dir" || exit $$?; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(couchprivdir)$$dir'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(couchprivdir)$$dir" || exit $$?; \ - } \ - ; done - +@@ -71,7 +71,7 @@ couch_icu_driver_la_LINK = $(LIBTOOL) -- + $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(couch_icu_driver_la_CFLAGS) $(CFLAGS) \ + $(couch_icu_driver_la_LDFLAGS) $(LDFLAGS) -o $@ +-couchprivPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++couchprivPROGRAMS_INSTALL = $(INSTALL_SCRIPT) + locallibbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(couchpriv_PROGRAMS) $(locallibbin_PROGRAMS) + am__objects_1 = couchjs-http.$(OBJEXT) couchjs-main.$(OBJEXT) \ diff --git a/databases/couchdb/patches/patch-src__couchdb__priv__couch_js__utf8.h b/databases/couchdb/patches/patch-src__couchdb__priv__couch_js__utf8.h new file mode 100644 index 00000000000..b1de86bdcfc --- /dev/null +++ b/databases/couchdb/patches/patch-src__couchdb__priv__couch_js__utf8.h @@ -0,0 +1,12 @@ +$NetBSD: patch-src__couchdb__priv__couch_js__utf8.h,v 1.1 2011/12/20 14:08:55 fhajny Exp $ + +Fix missing newline. +--- src/couchdb/priv/couch_js/utf8.h.orig 2011-10-23 17:38:54.000000000 +0000 ++++ src/couchdb/priv/couch_js/utf8.h +@@ -16,4 +16,4 @@ + char* enc_string(JSContext* cx, jsval arg, size_t* buflen); + JSString* dec_string(JSContext* cx, const char* buf, size_t buflen); + +-#endif +\ No newline at end of file ++#endif |