svn commit: r319429 - head/databases/couchdb

[Chris Rees]

Author: crees
Date: Thu May 30 14:07:20 2013
New Revision: 319429
URL: http://svnweb.freebsd.org/changeset/ports/319429

Log:
  Update to 1.2.2, fixing security issues.
  
  PR:		ports/178331
  Submitted by:	wollman
  Security:	CVE-2012-5649
  Security:	CVE-2012-5650

Modified:
  head/databases/couchdb/Makefile
  head/databases/couchdb/distinfo

Modified: head/databases/couchdb/Makefile
==============================================================================
--- head/databases/couchdb/Makefile	Thu May 30 14:04:10 2013	(r319428)
+++ head/databases/couchdb/Makefile	Thu May 30 14:07:20 2013	(r319429)
@@ -2,19 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	couchdb
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.2
 PORTEPOCH=	1
-PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	couchdb/releases/${PORTVERSION}
+MASTER_SITE_SUBDIR=	couchdb/source/${PORTVERSION}
 DISTNAME=	apache-couchdb-${PORTVERSION}
 
 MAINTAINER=	adams-ports at ateamsystems.com
 COMMENT=	A document database server, accessible via a RESTful JSON API
 
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu \
-		js:${PORTSDIR}/lang/spidermonkey17 \
+		mozjs185:${PORTSDIR}/lang/spidermonkey185 \
 		curl:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=	${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man \
 		erlc:${PORTSDIR}/lang/erlang
@@ -35,6 +34,11 @@ CONFIGURE_ARGS=	--with-erlang=${LOCALBAS
 		--with-js-lib=${LOCALBASE}/lib
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
+# Override default value of ${STRIP} because the underlying Makefile
+# erroneously tries to install a shell script with ${STRIP}, causing
+# an install error.
+STRIP=	#empty
+
 MAN1=	couchdb.1 couchjs.1
 
 .include <bsd.port.options.mk>

Modified: head/databases/couchdb/distinfo
==============================================================================
--- head/databases/couchdb/distinfo	Thu May 30 14:04:10 2013	(r319428)
+++ head/databases/couchdb/distinfo	Thu May 30 14:07:20 2013	(r319429)
@@ -1,2 +1,2 @@
-SHA256 (apache-couchdb-1.2.0.tar.gz) = 0f254ddea2471dbc4d3c6cd1fa61e4782c75475fb325024e10f68bf1aa8d5c37
-SIZE (apache-couchdb-1.2.0.tar.gz) = 1326925
+SHA256 (apache-couchdb-1.2.2.tar.gz) = 6824b9eec0c05d022ef52f663074c67eca5493d848574ff2d73611e92bff8701
+SIZE (apache-couchdb-1.2.2.tar.gz) = 1408271