aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcrees <crees@FreeBSD.org>2013-05-30 22:07:20 +0800
committercrees <crees@FreeBSD.org>2013-05-30 22:07:20 +0800
commit99a1abbb155c8735341b63f8c6ce21546aea5962 (patch)
tree19ae64baa799fa92508c2da4dc27f2b562089c82
parent39be30310515159820e649f58fa24c53fc50a281 (diff)
downloadfreebsd-ports-gnome-99a1abbb155c8735341b63f8c6ce21546aea5962.tar.gz
freebsd-ports-gnome-99a1abbb155c8735341b63f8c6ce21546aea5962.tar.zst
freebsd-ports-gnome-99a1abbb155c8735341b63f8c6ce21546aea5962.zip
Update to 1.2.2, fixing security issues.
PR: ports/178331 Submitted by: wollman Security: CVE-2012-5649 Security: CVE-2012-5650
-rw-r--r--databases/couchdb/Makefile12
-rw-r--r--databases/couchdb/distinfo4
2 files changed, 10 insertions, 6 deletions
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 1d3ade5b0a66..08d4fab1d1fb 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -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@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=${LOCALBASE}/lib/erlang/usr/include \
--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>
diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo
index 0ec786cb5bd2..a6e74fcd4093 100644
--- a/databases/couchdb/distinfo
+++ b/databases/couchdb/distinfo
@@ -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