From 4de7b9c9ec0ce0b19bbab57cb37b64ab38a19d22 Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Fri, 31 May 2013 07:40:03 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- doc/CHANGES-pkgsrc-2013Q1 | 4 +++- www/apache-tomcat6/Makefile | 4 ++-- www/apache-tomcat6/PLIST | 3 ++- www/apache-tomcat6/distinfo | 8 ++++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/doc/CHANGES-pkgsrc-2013Q1 b/doc/CHANGES-pkgsrc-2013Q1 index 1ba6401601d..dca4cec57e7 100644 --- a/doc/CHANGES-pkgsrc-2013Q1 +++ b/doc/CHANGES-pkgsrc-2013Q1 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2013Q1,v 1.1.2.20 2013/05/25 14:40:12 tron Exp $ +$NetBSD: CHANGES-pkgsrc-2013Q1,v 1.1.2.21 2013/05/30 08:30:05 tron Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2013Q1 branch: @@ -79,3 +79,5 @@ Pullup ticket #4141 - requested by obache print/acroread9: security update Pullup ticket #4142 - requested by spz devel/rt3: security update +Pullup ticket #4143 - requested by spz +www/apache-tomcat6: security update diff --git a/www/apache-tomcat6/Makefile b/www/apache-tomcat6/Makefile index 76973d7d403..17e16d19857 100644 --- a/www/apache-tomcat6/Makefile +++ b/www/apache-tomcat6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2011/12/13 09:44:17 spz Exp $ +# $NetBSD$ # DISTNAME= apache-tomcat-${TOMCAT_VER} @@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT= destdir .include "../../mk/bsd.prefs.mk" -TOMCAT_VER= 6.0.36 +TOMCAT_VER= 6.0.37 TOMCAT_HOME= ${PREFIX}/share/tomcat EGDIR= ${PREFIX}/share/examples/tomcat DOCDIR= ${PREFIX}/share/doc/tomcat diff --git a/www/apache-tomcat6/PLIST b/www/apache-tomcat6/PLIST index e93627221dd..c5c83709f07 100644 --- a/www/apache-tomcat6/PLIST +++ b/www/apache-tomcat6/PLIST @@ -16,6 +16,7 @@ share/tomcat/bin/catalina-tasks.xml share/tomcat/bin/catalina.sh share/tomcat/bin/commons-daemon-native.tar.gz share/tomcat/bin/commons-daemon.jar +share/tomcat/bin/daemon.sh share/tomcat/bin/digest.sh share/tomcat/bin/setclasspath.sh share/tomcat/bin/shutdown.sh @@ -29,7 +30,7 @@ share/tomcat/lib/catalina-ant.jar share/tomcat/lib/catalina-ha.jar share/tomcat/lib/catalina-tribes.jar share/tomcat/lib/catalina.jar -share/tomcat/lib/ecj-3.7.2.jar +share/tomcat/lib/ecj-4.2.2.jar share/tomcat/lib/el-api.jar share/tomcat/lib/jasper-el.jar share/tomcat/lib/jasper.jar diff --git a/www/apache-tomcat6/distinfo b/www/apache-tomcat6/distinfo index c0feaacdc2a..19dbe97029a 100644 --- a/www/apache-tomcat6/distinfo +++ b/www/apache-tomcat6/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2011/12/13 09:44:17 spz Exp $ +$NetBSD$ -SHA1 (apache-tomcat-6.0.36.tar.gz) = bfbc3944f0b2f87890e61bf31583ddb7cdf20fc0 -RMD160 (apache-tomcat-6.0.36.tar.gz) = a60fc6ac4770d0a1f5043aaaf881b57ac15fb987 -Size (apache-tomcat-6.0.36.tar.gz) = 6780936 bytes +SHA1 (apache-tomcat-6.0.37.tar.gz) = 722e6e4f35983b28170002d6b89b4915db682db6 +RMD160 (apache-tomcat-6.0.37.tar.gz) = 7aeb1fb9fb5afc4d19327401dfe3d57052c543aa +Size (apache-tomcat-6.0.37.tar.gz) = 6885442 bytes -- 2.41.0