| 1 |
fordfrog 12/10/29 10:57:07 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: tomcat-7.0.32.ebuild tomcat-6.0.36.ebuild |
| 5 |
Log: |
| 6 |
www-servers/tomcat: version bump |
| 7 |
|
| 8 |
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.299 www-servers/tomcat/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.299&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.299&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.298&r2=1.299 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v |
| 20 |
retrieving revision 1.298 |
| 21 |
retrieving revision 1.299 |
| 22 |
diff -u -r1.298 -r1.299 |
| 23 |
--- ChangeLog 6 Sep 2012 14:51:05 -0000 1.298 |
| 24 |
+++ ChangeLog 29 Oct 2012 10:57:07 -0000 1.299 |
| 25 |
@@ -1,6 +1,14 @@ |
| 26 |
# ChangeLog for www-servers/tomcat |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.298 2012/09/06 14:51:05 fordfrog Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.299 2012/10/29 10:57:07 fordfrog Exp $ |
| 30 |
+ |
| 31 |
+*tomcat-7.0.32 (29 Oct 2012) |
| 32 |
+*tomcat-6.0.36 (29 Oct 2012) |
| 33 |
+ |
| 34 |
+ 29 Oct 2012; Miroslav Šulc <fordfrog@g.o> +tomcat-6.0.36.ebuild, |
| 35 |
+ +files/tomcat-6.0.36-build.xml.patch, +tomcat-7.0.32.ebuild, |
| 36 |
+ +files/tomcat-7.0.32-build.xml.patch: |
| 37 |
+ version bump |
| 38 |
|
| 39 |
*tomcat-7.0.30 (06 Sep 2012) |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 www-servers/tomcat/tomcat-7.0.32.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.32.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.32.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: tomcat-7.0.32.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2012 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.32.ebuild,v 1.1 2012/10/29 10:57:07 fordfrog Exp $ |
| 54 |
|
| 55 |
EAPI=4 |
| 56 |
|
| 57 |
JAVA_PKG_IUSE="doc source test" |
| 58 |
|
| 59 |
inherit eutils java-pkg-2 java-ant-2 prefix |
| 60 |
|
| 61 |
MY_P="apache-${P}-src" |
| 62 |
|
| 63 |
DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
| 64 |
HOMEPAGE="http://tomcat.apache.org/" |
| 65 |
SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
| 66 |
|
| 67 |
LICENSE="Apache-2.0" |
| 68 |
SLOT="7" |
| 69 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
| 70 |
IUSE="extra-webapps" |
| 71 |
|
| 72 |
RESTRICT="test" # can we run them on a production system? |
| 73 |
|
| 74 |
ECJ_SLOT="3.7" |
| 75 |
SAPI_SLOT="3.0" |
| 76 |
|
| 77 |
COMMON_DEP=" |
| 78 |
dev-java/eclipse-ecj:${ECJ_SLOT} |
| 79 |
~dev-java/tomcat-servlet-api-${PV} |
| 80 |
extra-webapps? ( dev-java/jakarta-jstl:0 )" |
| 81 |
RDEPEND="${COMMON_DEP} |
| 82 |
!<dev-java/tomcat-native-1.1.20 |
| 83 |
>=virtual/jre-1.6" |
| 84 |
DEPEND="${COMMON_DEP} |
| 85 |
>=virtual/jdk-1.6 |
| 86 |
>=dev-java/ant-core-1.8.1:0 |
| 87 |
test? ( |
| 88 |
dev-java/ant-junit:0 |
| 89 |
dev-java/junit:4 |
| 90 |
)" |
| 91 |
|
| 92 |
S=${WORKDIR}/${MY_P} |
| 93 |
|
| 94 |
pkg_setup() { |
| 95 |
java-pkg-2_pkg_setup |
| 96 |
enewgroup tomcat 265 |
| 97 |
enewuser tomcat 265 -1 /dev/null tomcat |
| 98 |
} |
| 99 |
|
| 100 |
java_prepare() { |
| 101 |
find -name '*.jar' -exec rm -v {} + || die |
| 102 |
epatch "${FILESDIR}/${P}-build.xml.patch" |
| 103 |
|
| 104 |
# For use of catalina.sh in netbeans |
| 105 |
sed -i -e "/^# ----- Execute The Requested Command/ a\ |
| 106 |
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
| 107 |
bin/catalina.sh || die |
| 108 |
} |
| 109 |
|
| 110 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 111 |
|
| 112 |
EANT_BUILD_TARGET="deploy" |
| 113 |
EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" |
| 114 |
EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
| 115 |
EANT_NEEDS_TOOLS="true" |
| 116 |
EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
| 117 |
|
| 118 |
src_compile() { |
| 119 |
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
| 120 |
java-pkg-2_src_compile |
| 121 |
} |
| 122 |
|
| 123 |
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" |
| 124 |
|
| 125 |
src_test() { |
| 126 |
java-pkg-2_src_test |
| 127 |
} |
| 128 |
|
| 129 |
src_install() { |
| 130 |
local dest="/usr/share/${PN}-${SLOT}" |
| 131 |
|
| 132 |
java-pkg_jarinto "${dest}"/bin |
| 133 |
java-pkg_dojar output/build/bin/*.jar |
| 134 |
exeinto "${dest}"/bin |
| 135 |
doexe output/build/bin/*.sh |
| 136 |
|
| 137 |
java-pkg_jarinto "${dest}"/lib |
| 138 |
java-pkg_dojar output/build/lib/*.jar |
| 139 |
|
| 140 |
# so we don't have to call java-config with --with-dependencies, which might |
| 141 |
# bring in more jars then actually desired. |
| 142 |
java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" |
| 143 |
|
| 144 |
dodoc RELEASE-NOTES RUNNING.txt |
| 145 |
use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
| 146 |
use source && java-pkg_dosrc java/* |
| 147 |
|
| 148 |
### Webapps ### |
| 149 |
|
| 150 |
insinto "${dest}"/webapps |
| 151 |
doins -r output/build/webapps/{host-manager,manager,ROOT} |
| 152 |
use extra-webapps && doins -r output/build/webapps/{docs,examples} |
| 153 |
|
| 154 |
### Config ### |
| 155 |
|
| 156 |
# replace the default pw with a random one, see #92281 |
| 157 |
local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
| 158 |
sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
| 159 |
|
| 160 |
insinto "${dest}" |
| 161 |
doins -r output/build/conf |
| 162 |
|
| 163 |
### rc ### |
| 164 |
|
| 165 |
cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die |
| 166 |
eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash} |
| 167 |
sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die |
| 168 |
|
| 169 |
insinto "${dest}"/gentoo |
| 170 |
doins "${T}"/tomcat.conf |
| 171 |
exeinto "${dest}"/gentoo |
| 172 |
doexe "${T}"/tomcat{.init,-instance-manager.bash} |
| 173 |
} |
| 174 |
|
| 175 |
pkg_postinst() { |
| 176 |
elog "For how to deploy a server instance run:" |
| 177 |
elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
| 178 |
|
| 179 |
ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
| 180 |
ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
| 181 |
|
| 182 |
# einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
| 183 |
} |
| 184 |
|
| 185 |
|
| 186 |
|
| 187 |
1.1 www-servers/tomcat/tomcat-6.0.36.ebuild |
| 188 |
|
| 189 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-6.0.36.ebuild?rev=1.1&view=markup |
| 190 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-6.0.36.ebuild?rev=1.1&content-type=text/plain |
| 191 |
|
| 192 |
Index: tomcat-6.0.36.ebuild |
| 193 |
=================================================================== |
| 194 |
# Copyright 1999-2012 Gentoo Foundation |
| 195 |
# Distributed under the terms of the GNU General Public License v2 |
| 196 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.36.ebuild,v 1.1 2012/10/29 10:57:07 fordfrog Exp $ |
| 197 |
|
| 198 |
EAPI=4 |
| 199 |
|
| 200 |
JAVA_PKG_IUSE="source test" |
| 201 |
|
| 202 |
inherit eutils java-pkg-2 java-ant-2 prefix |
| 203 |
|
| 204 |
MY_P="apache-${P}-src" |
| 205 |
|
| 206 |
DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" |
| 207 |
HOMEPAGE="http://tomcat.apache.org/" |
| 208 |
SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz" |
| 209 |
|
| 210 |
LICENSE="Apache-2.0" |
| 211 |
SLOT="6" |
| 212 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
| 213 |
IUSE="extra-webapps" |
| 214 |
|
| 215 |
RESTRICT="test" |
| 216 |
|
| 217 |
ECJ_SLOT="3.7" |
| 218 |
SAPI_SLOT="2.5" |
| 219 |
|
| 220 |
COMMON_DEP=" |
| 221 |
dev-java/eclipse-ecj:${ECJ_SLOT} |
| 222 |
~dev-java/tomcat-servlet-api-${PV} |
| 223 |
extra-webapps? ( dev-java/jakarta-jstl:0 )" |
| 224 |
RDEPEND="${COMMON_DEP} |
| 225 |
!<dev-java/tomcat-native-1.1.20 |
| 226 |
>=virtual/jre-1.5" |
| 227 |
DEPEND="${COMMON_DEP} |
| 228 |
>=virtual/jdk-1.5 |
| 229 |
>=dev-java/ant-core-1.8.1:0 |
| 230 |
test? ( |
| 231 |
dev-java/ant-junit:0 |
| 232 |
dev-java/junit:4 |
| 233 |
)" |
| 234 |
|
| 235 |
S=${WORKDIR}/${MY_P} |
| 236 |
|
| 237 |
pkg_setup() { |
| 238 |
java-pkg-2_pkg_setup |
| 239 |
enewgroup tomcat 265 |
| 240 |
enewuser tomcat 265 -1 /dev/null tomcat |
| 241 |
} |
| 242 |
|
| 243 |
java_prepare() { |
| 244 |
find -name '*.jar' -exec rm -v {} + || die |
| 245 |
epatch "${FILESDIR}/${P}-build.xml.patch" |
| 246 |
|
| 247 |
# For use of catalina.sh in netbeans |
| 248 |
sed -i -e "/^# ----- Execute The Requested Command/ a\ |
| 249 |
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
| 250 |
bin/catalina.sh || die |
| 251 |
} |
| 252 |
|
| 253 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 254 |
|
| 255 |
EANT_BUILD_TARGET="deploy" |
| 256 |
EANT_DOC_TARGET="" |
| 257 |
EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" |
| 258 |
EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
| 259 |
EANT_NEEDS_TOOLS="true" |
| 260 |
EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
| 261 |
|
| 262 |
src_compile() { |
| 263 |
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
| 264 |
java-pkg-2_src_compile |
| 265 |
} |
| 266 |
|
| 267 |
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" |
| 268 |
|
| 269 |
src_test() { |
| 270 |
java-pkg-2_src_test |
| 271 |
} |
| 272 |
|
| 273 |
src_install() { |
| 274 |
local dest="/usr/share/${PN}-${SLOT}" |
| 275 |
|
| 276 |
java-pkg_jarinto "${dest}"/bin |
| 277 |
java-pkg_dojar output/build/bin/*.jar |
| 278 |
exeinto "${dest}"/bin |
| 279 |
doexe output/build/bin/*.sh |
| 280 |
|
| 281 |
java-pkg_jarinto "${dest}"/lib |
| 282 |
java-pkg_dojar output/build/lib/*.jar |
| 283 |
|
| 284 |
# so we don't have to call java-config with --with-dependencies, which might |
| 285 |
# bring in more jars then actually desired. |
| 286 |
java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" |
| 287 |
|
| 288 |
dodoc RELEASE-NOTES RUNNING.txt |
| 289 |
#use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
| 290 |
use source && java-pkg_dosrc java/* |
| 291 |
|
| 292 |
### Webapps ### |
| 293 |
|
| 294 |
insinto "${dest}"/webapps |
| 295 |
doins -r output/build/webapps/{host-manager,manager,ROOT} |
| 296 |
use extra-webapps && doins -r output/build/webapps/{docs,examples} |
| 297 |
|
| 298 |
### Config ### |
| 299 |
|
| 300 |
# replace the default pw with a random one, see #92281 |
| 301 |
local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
| 302 |
sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
| 303 |
|
| 304 |
insinto "${dest}" |
| 305 |
doins -r output/build/conf |
| 306 |
|
| 307 |
### rc ### |
| 308 |
|
| 309 |
cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die |
| 310 |
eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash} |
| 311 |
sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die |
| 312 |
|
| 313 |
insinto "${dest}"/gentoo |
| 314 |
doins "${T}"/tomcat.conf |
| 315 |
exeinto "${dest}"/gentoo |
| 316 |
doexe "${T}"/tomcat{.init,-instance-manager.bash} |
| 317 |
} |
| 318 |
|
| 319 |
pkg_postinst() { |
| 320 |
elog "For how to deploy a server instance run:" |
| 321 |
elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
| 322 |
|
| 323 |
ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
| 324 |
ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
| 325 |
|
| 326 |
# einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
| 327 |
} |
Archives