Update couchdb to 1.2.1.

Changes in 1.2.1:
* Fixed CVE-2012-5641: Apache CouchDB Information disclosure via unescaped
  backslashes in URLs on Windows
* Fixed CVE-2012-5649: Apache CouchDB JSONP arbitrary code execution with Adobe
  Flash
* Fixed CVE-2012-5650: Apache CouchDB DOM based Cross-Site Scripting via Futon
  UI
* Fix various bugs in the URL rewriter when recursion is involved.
* Fix couchdb start script.
* Futon: Disable buttons that aren't available for the logged-in user.
* Fix potential replication timeouts.
* Change use of signals to avoid broken view groups.

6 files changed, 73 insertions, 83 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 4e272d63130..804b90a181e 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2013/02/06 23:21:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2013/03/04 14:12:40 fhajny Exp $
 #
 
-DISTNAME=		apache-couchdb-1.2.0
+DISTNAME=		apache-couchdb-1.2.1
 PKGNAME=		${DISTNAME:S/apache-//}
-PKGREVISION=		3
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/releases/1.2.0/}
+MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/1.2.1/}
 
 MAINTAINER=		filip@joyent.com
 HOMEPAGE=		http://couchdb.apache.org/
diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo
index 94906d68e6d..9fc682540bd 100644
--- a/databases/couchdb/distinfo
+++ b/databases/couchdb/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2012/09/17 09:42:46 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2013/03/04 14:12:40 fhajny Exp $
 
-SHA1 (apache-couchdb-1.2.0.tar.gz) = da17af99cf3b1f9a89f0051b7d9de0cbd6fe81b6
-RMD160 (apache-couchdb-1.2.0.tar.gz) = c96da6e285201f001431c57ee84cc04e2e244115
-Size (apache-couchdb-1.2.0.tar.gz) = 1326925 bytes
-SHA1 (patch-aa) = 87851cdb03140110b5000f6f7b374b555bb1781d
-SHA1 (patch-ab) = 5efc967379dd4b1fcbc18c64266f7308892d7b71
-SHA1 (patch-ac) = ad77cac068fe07046275271f0d745b3a1c8a4baa
+SHA1 (apache-couchdb-1.2.1.tar.gz) = 70dac0304cdc9f4313f524db583170a2c59e265c
+RMD160 (apache-couchdb-1.2.1.tar.gz) = b89604089565c1f909046329c7e9d5faf84f036f
+Size (apache-couchdb-1.2.1.tar.gz) = 1372433 bytes
+SHA1 (patch-aa) = 73d09a34292bfa813c2396e7db98890b7ff3ccad
+SHA1 (patch-ab) = 9175abe3746859b16430ce2e41415addde05aabc
+SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872
 SHA1 (patch-ad) = 20fcfab5fe067d57703d2cc80e308b112ce60826
-SHA1 (patch-ae) = b9af6f55d1fcaf88d6f3cff42eac233787bd2ee0
+SHA1 (patch-ae) = a760518711e7f013de91a478fc2353183aa5ac5e
diff --git a/databases/couchdb/patches/patch-aa b/databases/couchdb/patches/patch-aa
index 61e45b23e62..7c7102cafa4 100644
--- a/databases/couchdb/patches/patch-aa
+++ b/databases/couchdb/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2012/09/17 09:42:47 fhajny Exp $
+$NetBSD: patch-aa,v 1.4 2013/03/04 14:12:40 fhajny Exp $
 
 Set pkgsrc standard paths.
 
---- configure.orig	2012-03-29 21:05:41.000000000 +0000
-+++ configure
-@@ -814,6 +814,7 @@ bug_uri
- localconfdir
- localdatadir
+--- configure.orig	2012-12-20 21:28:51.000000000 +0000
++++ configure	2013-03-04 13:05:12.523266279 +0000
+@@ -757,6 +757,7 @@ localstatelogdir
+ localstatelibdir
+ locallibdir
  localdocdir
 +localegdir
- locallibdir
- localstatelibdir
- localstatelogdir
-@@ -18661,13 +18662,15 @@ localdatadir=${datadir}/${package_identi
+ localdatadir
+ localconfdir
+ bug_uri
+@@ -18159,13 +18160,15 @@ localdatadir=${datadir}/${package_identi
  
  localdocdir=${datadir}/doc/${package_identifier}
  
@@ -30,7 +30,7 @@ Set pkgsrc standard paths.
  
  
  # On Windows we install directly into our erlang distribution.
-@@ -18677,9 +18680,9 @@ if test x${IS_WINDOWS} = xTRUE; then
+@@ -18175,9 +18178,9 @@ if test x${IS_WINDOWS} = xTRUE; then
      localerlanglibdir=${libdir}
  
  else
@@ -42,20 +42,3 @@ Set pkgsrc standard paths.
  
  fi
  
-@@ -20087,6 +20090,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
-@@ -20099,7 +20103,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/databases/couchdb/patches/patch-ab b/databases/couchdb/patches/patch-ab
index fb6a5ddadad..201deb6a399 100644
--- a/databases/couchdb/patches/patch-ab
+++ b/databases/couchdb/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2011/12/20 14:08:55 fhajny Exp $
+$NetBSD: patch-ab,v 1.3 2013/03/04 14:12:40 fhajny Exp $
 
 Install into examples, not sysconfdir.
 
---- etc/couchdb/Makefile.in.orig	2011-10-24 09:38:34.000000000 +0000
-+++ etc/couchdb/Makefile.in
-@@ -53,7 +53,7 @@ am__vpath_adj = case $$p in \
-     *) f=$$p;; \
-   esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+--- etc/couchdb/Makefile.in.orig	2012-12-20 21:28:48.000000000 +0000
++++ etc/couchdb/Makefile.in	2013-03-04 13:08:45.587487445 +0000
+@@ -73,7 +73,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'
 -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)
-@@ -174,6 +174,7 @@ launchddir = @launchddir@
+ transform = @program_transform_name@
+@@ -211,6 +211,7 @@ launchddir = @launchddir@
  libdir = @libdir@
  libexecdir = @libexecdir@
  localconfdir = @localconfdir@
@@ -21,33 +21,38 @@ Install into examples, not sysconfdir.
  localdatadir = @localdatadir@
  localdocdir = @localdocdir@
  localedir = @localedir@
-@@ -263,20 +264,20 @@ clean-libtool:
+@@ -303,24 +304,24 @@ 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)'; for p in $$list; do \
+ 	@list='$(localconf_DATA)'; test -n "$(localconfdir)" || list=; \
+ 	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  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"; \
+ 	  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)'; 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
+-	@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
  tags: TAGS
  TAGS:
-@@ -315,7 +316,7 @@ check-am: all-am
+ 
+@@ -362,7 +363,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(DATA)
  installdirs:
@@ -56,7 +61,7 @@ Install into examples, not sysconfdir.
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -458,20 +459,20 @@ local_dev.ini: local.ini
+@@ -517,20 +518,20 @@ local_dev.ini: local.ini
  	fi
  
  install-data-hook:
@@ -81,6 +86,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-ac b/databases/couchdb/patches/patch-ac
index 2abb3edc839..4bc644592e1 100644
--- a/databases/couchdb/patches/patch-ac
+++ b/databases/couchdb/patches/patch-ac
@@ -1,9 +1,10 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/09/21 12:11:39 fhajny Exp $
+$NetBSD: patch-ac,v 1.2 2013/03/04 14:12:40 fhajny Exp $
 
 Remove logrotate files.
---- etc/Makefile.in.orig	2010-08-11 18:18:52.000000000 +0000
-+++ etc/Makefile.in
-@@ -277,15 +277,15 @@ version_minor = @version_minor@
+
+--- 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@
@@ -22,7 +23,7 @@ Remove logrotate files.
  couchdb_command_name = `echo couchdb | sed '$(transform)'`
  all: all-recursive
  
-@@ -721,9 +721,6 @@ init/couchdb: init/couchdb.tpl
+@@ -740,9 +740,6 @@ init/couchdb: init/couchdb.tpl
  	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
  	< $< > $@
  
diff --git a/databases/couchdb/patches/patch-ae b/databases/couchdb/patches/patch-ae
index 2713116bd1e..10c135029a6 100644
--- a/databases/couchdb/patches/patch-ae
+++ b/databases/couchdb/patches/patch-ae
@@ -1,15 +1,17 @@
-$NetBSD: patch-ae,v 1.3 2012/09/17 09:42:47 fhajny Exp $
+$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-03-29 21:05:38.000000000 +0000
-+++ src/couchdb/priv/Makefile.in
-@@ -85,7 +85,7 @@ couch_icu_driver_la_OBJECTS = $(am_couch
- couch_icu_driver_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(couch_icu_driver_la_LDFLAGS) $(LDFLAGS) -o $@
--couchprivPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+couchprivPROGRAMS_INSTALL = $(INSTALL_SCRIPT)
- locallibbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(couchpriv_PROGRAMS) $(locallibbin_PROGRAMS)
- am__objects_1 = couchjs-http.$(OBJEXT) couchjs-main.$(OBJEXT) \
+--- 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
+