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