| 1 |
monsieurp 15/06/03 14:41:13 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: tomcat-6.0.44.ebuild |
| 5 |
Removed: tomcat-6.0.41.ebuild tomcat-6.0.43.ebuild |
| 6 |
Log: |
| 7 |
Tomcat 6.0.44 version bump. EAPI 5 bump. Remove vulnerable versions. Fix security bug 549536. |
| 8 |
|
| 9 |
Signed-off-by: Patrice Clement <monsieurp@g.o> |
| 10 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.350 www-servers/tomcat/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.350&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.350&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.349&r2=1.350 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v |
| 22 |
retrieving revision 1.349 |
| 23 |
retrieving revision 1.350 |
| 24 |
diff -u -r1.349 -r1.350 |
| 25 |
--- ChangeLog 26 May 2015 20:07:51 -0000 1.349 |
| 26 |
+++ ChangeLog 3 Jun 2015 14:41:12 -0000 1.350 |
| 27 |
@@ -1,6 +1,15 @@ |
| 28 |
# ChangeLog for www-servers/tomcat |
| 29 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.349 2015/05/26 20:07:51 fordfrog Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.350 2015/06/03 14:41:12 monsieurp Exp $ |
| 32 |
+ |
| 33 |
+*tomcat-6.0.44 (03 Jun 2015) |
| 34 |
+ |
| 35 |
+ 03 Jun 2015; Patrice Clement <monsieurp@g.o> |
| 36 |
+ +files/tomcat-6.0.44-build.xml.patch, +tomcat-6.0.44.ebuild, |
| 37 |
+ -files/tomcat-6.0.41-build.xml.patch, -files/tomcat-6.0.43-build.xml.patch, |
| 38 |
+ -tomcat-6.0.41.ebuild, -tomcat-6.0.43.ebuild: |
| 39 |
+ Tomcat 6.0.44 version bump. EAPI 5 bump. Remove vulnerable versions. Fix |
| 40 |
+ security bug 549536. |
| 41 |
|
| 42 |
26 May 2015; Miroslav Šulc <fordfrog@g.o> |
| 43 |
-files/tomcat-8.0.20-build.xml.patch, -files/tomcat-8.0.21-build.xml.patch: |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 www-servers/tomcat/tomcat-6.0.44.ebuild |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-6.0.44.ebuild?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-6.0.44.ebuild?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: tomcat-6.0.44.ebuild |
| 53 |
=================================================================== |
| 54 |
# Copyright 1999-2015 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.44.ebuild,v 1.1 2015/06/03 14:41:12 monsieurp Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
JAVA_PKG_IUSE="source test" |
| 61 |
|
| 62 |
inherit eutils java-pkg-2 java-ant-2 prefix user |
| 63 |
|
| 64 |
MY_P="apache-${P}-src" |
| 65 |
|
| 66 |
DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" |
| 67 |
HOMEPAGE="http://tomcat.apache.org/" |
| 68 |
SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz" |
| 69 |
|
| 70 |
LICENSE="Apache-2.0" |
| 71 |
SLOT="6" |
| 72 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
| 73 |
IUSE="extra-webapps" |
| 74 |
|
| 75 |
RESTRICT="test" |
| 76 |
|
| 77 |
ECJ_SLOT="3.7" |
| 78 |
SAPI_SLOT="2.5" |
| 79 |
|
| 80 |
CDEPEND="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 81 |
dev-java/tomcat-servlet-api:2.5" |
| 82 |
RDEPEND="${CDEPEND} |
| 83 |
>=virtual/jre-1.6 |
| 84 |
!<dev-java/tomcat-native-1.1.20" |
| 85 |
DEPEND="${CDEPEND} |
| 86 |
>=virtual/jdk-1.6 |
| 87 |
>=dev-java/ant-core-1.8.1:0 |
| 88 |
test? ( |
| 89 |
dev-java/ant-junit:0 |
| 90 |
dev-java/junit:4 |
| 91 |
)" |
| 92 |
|
| 93 |
S=${WORKDIR}/${MY_P} |
| 94 |
|
| 95 |
pkg_setup() { |
| 96 |
java-pkg-2_pkg_setup |
| 97 |
enewgroup tomcat 265 |
| 98 |
enewuser tomcat 265 -1 /dev/null tomcat |
| 99 |
} |
| 100 |
|
| 101 |
java_prepare() { |
| 102 |
find -name '*.jar' -exec rm -v {} + || die |
| 103 |
epatch "${FILESDIR}/${P}-build.xml.patch" |
| 104 |
|
| 105 |
# For use of catalina.sh in netbeans |
| 106 |
sed -i -e "/^# ----- Execute The Requested Command/ a\ |
| 107 |
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
| 108 |
bin/catalina.sh || die |
| 109 |
} |
| 110 |
|
| 111 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 112 |
|
| 113 |
EANT_BUILD_TARGET="deploy" |
| 114 |
EANT_DOC_TARGET="" |
| 115 |
EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" |
| 116 |
EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
| 117 |
EANT_NEEDS_TOOLS="true" |
| 118 |
EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
| 119 |
|
| 120 |
# revision of the instance-manager script |
| 121 |
IM_REV="-r1" |
| 122 |
|
| 123 |
src_compile() { |
| 124 |
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
| 125 |
java-pkg-2_src_compile |
| 126 |
} |
| 127 |
|
| 128 |
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" |
| 129 |
|
| 130 |
src_test() { |
| 131 |
java-pkg-2_src_test |
| 132 |
} |
| 133 |
|
| 134 |
src_install() { |
| 135 |
local dest="/usr/share/${PN}-${SLOT}" |
| 136 |
|
| 137 |
java-pkg_jarinto "${dest}"/bin |
| 138 |
java-pkg_dojar output/build/bin/*.jar |
| 139 |
exeinto "${dest}"/bin |
| 140 |
doexe output/build/bin/*.sh |
| 141 |
|
| 142 |
java-pkg_jarinto "${dest}"/lib |
| 143 |
java-pkg_dojar output/build/lib/*.jar |
| 144 |
|
| 145 |
# so we don't have to call java-config with --with-dependencies, which might |
| 146 |
# bring in more jars than actually desired. |
| 147 |
java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" |
| 148 |
|
| 149 |
dodoc RELEASE-NOTES RUNNING.txt |
| 150 |
use source && java-pkg_dosrc java/* |
| 151 |
|
| 152 |
### Webapps ### |
| 153 |
|
| 154 |
insinto "${dest}"/webapps |
| 155 |
doins -r output/build/webapps/{host-manager,manager,ROOT} |
| 156 |
use extra-webapps && doins -r output/build/webapps/{docs,examples} |
| 157 |
|
| 158 |
### Config ### |
| 159 |
|
| 160 |
# replace the default pw with a random one, see #92281 |
| 161 |
local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
| 162 |
sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
| 163 |
|
| 164 |
insinto "${dest}" |
| 165 |
doins -r output/build/conf |
| 166 |
|
| 167 |
### rc ### |
| 168 |
|
| 169 |
cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} "${T}" || die |
| 170 |
eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} |
| 171 |
sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die |
| 172 |
|
| 173 |
insinto "${dest}"/gentoo |
| 174 |
doins "${T}"/tomcat.conf |
| 175 |
exeinto "${dest}"/gentoo |
| 176 |
doexe "${T}"/tomcat.init |
| 177 |
newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
| 178 |
} |
| 179 |
|
| 180 |
pkg_postinst() { |
| 181 |
elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
| 182 |
elog "of Tomcat (<6.0.36), you have to migrate your existing instance to work with new Tomcat." |
| 183 |
elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
| 184 |
|
| 185 |
elog "To manage Tomcat instances, run:" |
| 186 |
elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
| 187 |
|
| 188 |
ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
| 189 |
ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
| 190 |
|
| 191 |
# einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
| 192 |
} |
Archives