1 |
commit: 25f536fd3c74cb9a3913973d30e7f9bb54196440 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 25 16:04:32 2017 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 25 16:04:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f536fd |
7 |
|
8 |
www-servers/tomcat: version bump for slot 8 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
www-servers/tomcat/Manifest | 1 + |
13 |
www-servers/tomcat/tomcat-8.0.41.ebuild | 154 ++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 155 insertions(+) |
15 |
|
16 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
17 |
index 04643d9..b279e9e 100644 |
18 |
--- a/www-servers/tomcat/Manifest |
19 |
+++ b/www-servers/tomcat/Manifest |
20 |
@@ -1,5 +1,6 @@ |
21 |
DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6 WHIRLPOOL b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1 |
22 |
DIST apache-tomcat-7.0.75-src.tar.gz 4657629 SHA256 ffa9489ecd9aa0750598e5db0dc3275ce7e29de13f16d7bf863e0477bf338463 SHA512 2b7a0fc64ca58849713435993768b1f77666ad23f22cfb6091503bc1393f2c4fd3a61dac518efe4ccb22738d82fa81b1a1597ba148f4f829a0c642d131270117 WHIRLPOOL eada3af432dd943ca494ab3fbedfeaf655dbe621b639791e224cd0f58d1c26f8e6e99496757c21073249ef0af2bfa101dd8374f9d708777b331c31da663c435a |
23 |
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752 |
24 |
+DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8 |
25 |
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df |
26 |
DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757 WHIRLPOOL c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049 |
27 |
|
28 |
diff --git a/www-servers/tomcat/tomcat-8.0.41.ebuild b/www-servers/tomcat/tomcat-8.0.41.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000..0c46c3e |
31 |
--- /dev/null |
32 |
+++ b/www-servers/tomcat/tomcat-8.0.41.ebuild |
33 |
@@ -0,0 +1,154 @@ |
34 |
+# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI=6 |
39 |
+ |
40 |
+JAVA_PKG_IUSE="doc source test" |
41 |
+ |
42 |
+inherit eutils java-pkg-2 java-ant-2 prefix user |
43 |
+ |
44 |
+MY_P="apache-${P}-src" |
45 |
+ |
46 |
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container" |
47 |
+HOMEPAGE="http://tomcat.apache.org/" |
48 |
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
49 |
+ |
50 |
+LICENSE="Apache-2.0" |
51 |
+SLOT="8" |
52 |
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
53 |
+IUSE="extra-webapps" |
54 |
+ |
55 |
+RESTRICT="test" # can we run them on a production system? |
56 |
+ |
57 |
+ECJ_SLOT="4.5" |
58 |
+SAPI_SLOT="3.1" |
59 |
+ |
60 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
61 |
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
62 |
+RDEPEND="${COMMON_DEP} |
63 |
+ !<dev-java/tomcat-native-1.1.24 |
64 |
+ >=virtual/jre-1.7" |
65 |
+DEPEND="${COMMON_DEP} |
66 |
+ app-admin/pwgen |
67 |
+ >=virtual/jdk-1.7 |
68 |
+ test? ( |
69 |
+ >=dev-java/ant-junit-1.9:0 |
70 |
+ dev-java/easymock:3.2 |
71 |
+ )" |
72 |
+ |
73 |
+S=${WORKDIR}/${MY_P} |
74 |
+ |
75 |
+pkg_setup() { |
76 |
+ java-pkg-2_pkg_setup |
77 |
+ enewgroup tomcat 265 |
78 |
+ enewuser tomcat 265 -1 /dev/null tomcat |
79 |
+} |
80 |
+ |
81 |
+java_prepare() { |
82 |
+ find -name '*.jar' -type f -delete -print || die |
83 |
+ |
84 |
+ # Remove bundled servlet-api |
85 |
+ rm -rv java/javax/{el,servlet} || die |
86 |
+ |
87 |
+ epatch "${FILESDIR}/${P}-build.xml.patch" |
88 |
+ |
89 |
+ # For use of catalina.sh in netbeans |
90 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
91 |
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
92 |
+ bin/catalina.sh || die |
93 |
+} |
94 |
+ |
95 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
96 |
+ |
97 |
+EANT_BUILD_TARGET="deploy" |
98 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
99 |
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
100 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
101 |
+EANT_NEEDS_TOOLS="true" |
102 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
103 |
+ |
104 |
+# revisions of the scripts |
105 |
+IM_REV="-r2" |
106 |
+INIT_REV="-r1" |
107 |
+ |
108 |
+src_compile() { |
109 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
110 |
+ java-pkg-2_src_compile |
111 |
+} |
112 |
+ |
113 |
+src_test() { |
114 |
+ java-pkg-2_src_test |
115 |
+} |
116 |
+ |
117 |
+src_install() { |
118 |
+ local dest="/usr/share/${PN}-${SLOT}" |
119 |
+ |
120 |
+ java-pkg_jarinto "${dest}"/bin |
121 |
+ java-pkg_dojar output/build/bin/*.jar |
122 |
+ exeinto "${dest}"/bin |
123 |
+ doexe output/build/bin/*.sh |
124 |
+ |
125 |
+ java-pkg_jarinto "${dest}"/lib |
126 |
+ java-pkg_dojar output/build/lib/*.jar |
127 |
+ |
128 |
+ dodoc RELEASE-NOTES RUNNING.txt |
129 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
130 |
+ use source && java-pkg_dosrc java/* |
131 |
+ |
132 |
+ ### Webapps ### |
133 |
+ |
134 |
+ # add missing docBase |
135 |
+ local apps="host-manager manager" |
136 |
+ for app in ${apps}; do |
137 |
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
138 |
+ output/build/webapps/${app}/META-INF/context.xml || die |
139 |
+ done |
140 |
+ |
141 |
+ insinto "${dest}"/webapps |
142 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
143 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
144 |
+ |
145 |
+ ### Config ### |
146 |
+ |
147 |
+ # create "logs" directory in $CATALINA_BASE |
148 |
+ # and set correct perms, see #458890 |
149 |
+ dodir "${dest}"/logs |
150 |
+ fperms 0750 "${dest}"/logs |
151 |
+ |
152 |
+ # replace the default pw with a random one, see #92281 |
153 |
+ local randpw="$(pwgen -s -B 15 1)" |
154 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
155 |
+ |
156 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
157 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
158 |
+ |
159 |
+ insinto "${dest}" |
160 |
+ doins -r output/build/conf |
161 |
+ |
162 |
+ ### rc ### |
163 |
+ |
164 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
165 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
166 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
167 |
+ |
168 |
+ insinto "${dest}"/gentoo |
169 |
+ doins "${T}"/tomcat.conf |
170 |
+ exeinto "${dest}"/gentoo |
171 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
172 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
173 |
+} |
174 |
+ |
175 |
+pkg_postinst() { |
176 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
177 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
178 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
179 |
+ |
180 |
+ elog "To manage Tomcat instances, run:" |
181 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
182 |
+ |
183 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
184 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
185 |
+ |
186 |
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
187 |
+} |