diff options
| author | spz <spz@pkgsrc.org> | 2012-12-20 14:31:46 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2012-12-20 14:31:46 +0000 |
| commit | b3d594d193711b3fe61c69a4bf6a40cbbe746a23 (patch) | |
| tree | 416c12cfc3ba9e444e57ac49b24c9c4ed40ab5c0 /www/apache-roller | |
| parent | 46b50d003a3d364d0d5f4e0dfa8b69b97bed06ae (diff) | |
| download | pkgsrc-b3d594d193711b3fe61c69a4bf6a40cbbe746a23.tar.gz | |
Update to version 5.0.1.
Upstream changelog:
5.0.1:
This release fixes two security vulnerabilities in Roller, listed below:
CVE-2012-2380: Apache Roller Cross-Site-Resource-Forgery (XSRF) vulnerability
CVE-2012-2381: Apache Roller Cross-Site-Scripting (XSS) vulnerability
5.0:
What's new in Roller 5.0:
https://cwiki.apache.org/confluence/display/ROLLER/What's+new+in+Roller+5.0
Diffstat (limited to 'www/apache-roller')
| -rw-r--r-- | www/apache-roller/Makefile | 19 | ||||
| -rw-r--r-- | www/apache-roller/distinfo | 8 |
2 files changed, 14 insertions, 13 deletions
diff --git a/www/apache-roller/Makefile b/www/apache-roller/Makefile index cc49ad91b16..18d529bfe65 100644 --- a/www/apache-roller/Makefile +++ b/www/apache-roller/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.7 2012/10/28 06:30:09 asau Exp $ +# $NetBSD: Makefile,v 1.8 2012/12/20 14:31:46 spz Exp $ # -DISTNAME= apache-roller-${ROLLER_VER} -PKGREVISION= 3 +DISTNAME= roller-weblogger-${ROLLER_VER}-for-tomcat +PKGNAME= apache-roller-${ROLLER_VER} +WRKSRC= ${WRKDIR}/${DISTNAME:S/-for//} CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_APACHE:=roller/roller-4/v${ROLLER_VER}/bin/} +MASTER_SITES= ${MASTER_SITE_APACHE:=roller/roller-5/v${ROLLER_VER}/bin/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://roller.apache.org/ @@ -14,15 +15,15 @@ BUILD_DEPENDS+= fastjar-[0-9]*:../../archivers/fastjar USE_JAVA= run USE_JAVA2= 1.5 -ROLLER_VER= 4.0.1 +ROLLER_VER= 5.0.1 +PKG_DESTDIR_SUPPORT= user-destdir PLIST_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} .include "options.mk" do-build: - cd ${WRKSRC}/webapp && ${PREFIX}/bin/fastjar \ - cf ${PKGNAME_NOREV}.war -C roller/ . + : do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/apache-roller @@ -33,8 +34,8 @@ do-install: ${DESTDIR}${PREFIX}/share/doc/apache-roller ${INSTALL_DATA} ${WRKSRC}/*.txt \ ${DESTDIR}${PREFIX}/share/doc/apache-roller - ${INSTALL_DATA} ${WRKSRC}/webapp/${PKGNAME_NOREV}.war \ - ${DESTDIR}${PREFIX}/share/apache-roller + ${INSTALL_DATA} ${WRKSRC}/webapp/roller-${ROLLER_VER}-tomcat.war \ + ${DESTDIR}${PREFIX}/share/apache-roller/${PKGNAME_NOREV}.war ${INSTALL_DATA} ${FILESDIR}/roller-custom.properties \ ${DESTDIR}${PREFIX}/share/examples/apache-roller diff --git a/www/apache-roller/distinfo b/www/apache-roller/distinfo index 6a46c475d66..7ede4c35117 100644 --- a/www/apache-roller/distinfo +++ b/www/apache-roller/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2009/02/13 20:21:28 adrianp Exp $ +$NetBSD: distinfo,v 1.3 2012/12/20 14:31:46 spz Exp $ -SHA1 (apache-roller-4.0.1.tar.gz) = ae4af6af3b6bec03d7f1d8784ee610af78ebebea -RMD160 (apache-roller-4.0.1.tar.gz) = f909d7f7fdf09f6b9bb57d979e19602b192f0d6e -Size (apache-roller-4.0.1.tar.gz) = 27630829 bytes +SHA1 (roller-weblogger-5.0.1-for-tomcat.tar.gz) = 5db36e4c77cb626dac7e0e0edb0c1c26d3bf49f2 +RMD160 (roller-weblogger-5.0.1-for-tomcat.tar.gz) = b94150deab739a4a8623ffea9e6571e66e7a514a +Size (roller-weblogger-5.0.1-for-tomcat.tar.gz) = 31638162 bytes |