Fri Nov 10 07:08:38 2017 UTC ()
Pullup ticket #5622 - requested by sevan
www/apache-tomcat7: security update

Revisions pulled up:
- www/apache-tomcat7/Makefile                                   1.34
- www/apache-tomcat7/distinfo                                   1.28

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   fhajny
   Date:           Tue Oct 31 14:31:10 UTC 2017

   Modified Files:
           pkgsrc/www/apache-tomcat7: Makefile distinfo

   Log Message:
   Update www/apache-tomcat7 to 7.0.82.

   Notable changes:

   - A fix for CVE-2017-12617.
   - Update the packaged version of the Tomcat Native Library to 1.2.14

   Full changelog:

     https://tomcat.apache.org/tomcat-7.0-doc/changelog.html

   To generate a diff of this commit:
   cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/apache-tomcat7/Makefile
   cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/apache-tomcat7/distinfo


(spz)
diff -r1.33 -r1.33.4.1 pkgsrc/www/apache-tomcat7/Makefile
diff -r1.27 -r1.27.4.1 pkgsrc/www/apache-tomcat7/distinfo
cvs diff -r1.33 -r1.33.4.1 pkgsrc/www/apache-tomcat7/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/Makefile 2017/09/04 13:54:39 1.33
+++ pkgsrc/www/apache-tomcat7/Makefile 2017/11/10 07:08:38 1.33.4.1
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.33 2017/09/04 13:54:39 ryoon Exp $ 1# $NetBSD: Makefile,v 1.33.4.1 2017/11/10 07:08:38 spz Exp $
2 2
3DISTNAME= apache-tomcat-${TOMCAT_VER} 3DISTNAME= apache-tomcat-${TOMCAT_VER}
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/} 5MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
6MASTER_SITES+= https://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VER}/bin/ 6MASTER_SITES+= https://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VER}/bin/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://tomcat.apache.org/ 9HOMEPAGE= http://tomcat.apache.org/
10COMMENT= Implementation of Java Servlet and JavaServer Pages technologies 10COMMENT= Implementation of Java Servlet and JavaServer Pages technologies
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13CONFLICTS+= jakarta-tomcat55-[0-9]* 13CONFLICTS+= jakarta-tomcat55-[0-9]*
14CONFLICTS+= jakarta-tomcat-[0-9]* 14CONFLICTS+= jakarta-tomcat-[0-9]*
15 15
16NO_BUILD= yes 16NO_BUILD= yes
17USE_LANGUAGES= # none 17USE_LANGUAGES= # none
18USE_JAVA= run 18USE_JAVA= run
19USE_JAVA2= 6 19USE_JAVA2= 6
20USE_TOOLS+= pax 20USE_TOOLS+= pax
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24TOMCAT_VER= 7.0.81 24TOMCAT_VER= 7.0.82
25TOMCAT_HOME= ${PREFIX}/share/tomcat 25TOMCAT_HOME= ${PREFIX}/share/tomcat
26EGDIR= ${PREFIX}/share/examples/tomcat 26EGDIR= ${PREFIX}/share/examples/tomcat
27DOCDIR= ${PREFIX}/share/doc/tomcat 27DOCDIR= ${PREFIX}/share/doc/tomcat
28RCD_SCRIPTS= tomcat 28RCD_SCRIPTS= tomcat
29SMF_NAME= tomcat 29SMF_NAME= tomcat
30TOMCAT_USER?= tomcat 30TOMCAT_USER?= tomcat
31TOMCAT_GROUP?= tomcat 31TOMCAT_GROUP?= tomcat
32PKG_GROUPS= ${TOMCAT_GROUP} 32PKG_GROUPS= ${TOMCAT_GROUP}
33PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP} 33PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP}
34PKG_GROUPS_VARS+= TOMCAT_GROUP 34PKG_GROUPS_VARS+= TOMCAT_GROUP
35PKG_USERS_VARS+= TOMCAT_USER 35PKG_USERS_VARS+= TOMCAT_USER
36PKG_HOME.tomcat= ${TOMCAT_HOME} 36PKG_HOME.tomcat= ${TOMCAT_HOME}
37PKG_SHELL.tomcat= ${SH} 37PKG_SHELL.tomcat= ${SH}
cvs diff -r1.27 -r1.27.4.1 pkgsrc/www/apache-tomcat7/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/distinfo 2017/09/04 13:54:39 1.27
+++ pkgsrc/www/apache-tomcat7/distinfo 2017/11/10 07:08:38 1.27.4.1
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.27 2017/09/04 13:54:39 ryoon Exp $ 1$NetBSD: distinfo,v 1.27.4.1 2017/11/10 07:08:38 spz Exp $
2 2
3SHA1 (apache-tomcat-7.0.81.tar.gz) = 7131e0af284a2f80c9f64209de1b3f69f966ef3d 3SHA1 (apache-tomcat-7.0.82.tar.gz) = 4681bfbc86bb4da76a7aabbb3c545475eb9a8075
4RMD160 (apache-tomcat-7.0.81.tar.gz) = e961019631f2182af916740708dcc2fb7264ce9e 4RMD160 (apache-tomcat-7.0.82.tar.gz) = 1496ceb71e3a1eadaa772cd56176066513709e8b
5SHA512 (apache-tomcat-7.0.81.tar.gz) = 2b788049a3e2654c342ab45a81547ea9ff095f71e63bcdf1a257325c855988c5106da2a6188a50e16fbd53e72189c08c2888ad928d33adf627aa65422f84f937 5SHA512 (apache-tomcat-7.0.82.tar.gz) = 15291c1f228ac0445729f023b69f4b0e2ffca5ff0c4e4719067e5a9ef3d508e2666dd9af7e9e32dbaa7e27a893868646988241a322a60cd7cab35ee8c6f045de
6Size (apache-tomcat-7.0.81.tar.gz) = 8989099 bytes 6Size (apache-tomcat-7.0.82.tar.gz) = 8997403 bytes