1 |
commit: 8b759f9265a627a3599cca48a8a8aadab9949b8a |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 27 09:57:30 2018 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 27 09:57:30 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b759f92 |
7 |
|
8 |
www-servers/tomcat: version bump in slot 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
11 |
|
12 |
www-servers/tomcat/Manifest | 1 + |
13 |
www-servers/tomcat/tomcat-7.0.90.ebuild | 147 ++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 148 insertions(+) |
15 |
|
16 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
17 |
index f50dacf90f9..4b8050606ef 100644 |
18 |
--- a/www-servers/tomcat/Manifest |
19 |
+++ b/www-servers/tomcat/Manifest |
20 |
@@ -1,5 +1,6 @@ |
21 |
DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044 |
22 |
DIST apache-tomcat-7.0.88-src.tar.gz 4733229 BLAKE2B 2e2009f64ae8f027e93bd7f3cec21f98fbb1f5c741b6525da1638c6188ebe44aa8b43d984abd769385992a997226392c59ec059e408873261a04d9e96a4603c3 SHA512 2ad5c11ec7c5e8e68fba6c0427b0479969a56e7ccb3f0b1ee6c6f139d5f2b718ee9c56f044e982013108ee6e06c43037d0061e539203e95453e9cae7cb38711d |
23 |
+DIST apache-tomcat-7.0.90-src.tar.gz 4752747 BLAKE2B 5062ead2756aa8461de5e8387f14838661c082b6e397934fc92c91403f1950d84d79f05b9d4420a973d1b4921515b66c2c847550e1a06d75e722b62d9aa3f8bd SHA512 b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a |
24 |
DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff |
25 |
DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56 |
26 |
DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265 |
27 |
|
28 |
diff --git a/www-servers/tomcat/tomcat-7.0.90.ebuild b/www-servers/tomcat/tomcat-7.0.90.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..8ed5c13fa74 |
31 |
--- /dev/null |
32 |
+++ b/www-servers/tomcat/tomcat-7.0.90.ebuild |
33 |
@@ -0,0 +1,147 @@ |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+ |
39 |
+JAVA_PKG_IUSE="doc source test" |
40 |
+ |
41 |
+inherit eutils java-pkg-2 java-ant-2 prefix user |
42 |
+ |
43 |
+MY_P="apache-${P}-src" |
44 |
+ |
45 |
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
46 |
+HOMEPAGE="https://tomcat.apache.org/" |
47 |
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
48 |
+ |
49 |
+LICENSE="Apache-2.0" |
50 |
+SLOT="7" |
51 |
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
52 |
+IUSE="extra-webapps websockets" |
53 |
+ |
54 |
+RESTRICT="test" # can we run them on a production system? |
55 |
+ |
56 |
+ECJ_SLOT="4.5" |
57 |
+SAPI_SLOT="3.0" |
58 |
+ |
59 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
60 |
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
61 |
+RDEPEND="${COMMON_DEP} |
62 |
+ virtual/jre |
63 |
+ !<dev-java/tomcat-native-1.1.24" |
64 |
+DEPEND="${COMMON_DEP} |
65 |
+ virtual/jdk:1.8 |
66 |
+ test? ( dev-java/ant-junit:0 )" |
67 |
+ |
68 |
+S=${WORKDIR}/${MY_P} |
69 |
+ |
70 |
+pkg_setup() { |
71 |
+ java-pkg-2_pkg_setup |
72 |
+ enewgroup tomcat 265 |
73 |
+ enewuser tomcat 265 -1 /dev/null tomcat |
74 |
+} |
75 |
+ |
76 |
+src_prepare() { |
77 |
+ default |
78 |
+ |
79 |
+ # Remove bundled servlet-api |
80 |
+ rm -rv java/javax/{el,servlet} || die |
81 |
+ |
82 |
+ java-pkg_clean |
83 |
+ |
84 |
+ eapply "${FILESDIR}/${PN}-7.0.84-build.xml.patch" |
85 |
+ |
86 |
+ # For use of catalina.sh in netbeans |
87 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
88 |
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
89 |
+ bin/catalina.sh || die |
90 |
+ |
91 |
+ java-pkg-2_src_prepare |
92 |
+} |
93 |
+ |
94 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
95 |
+ |
96 |
+EANT_BUILD_TARGET="deploy" |
97 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
98 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
99 |
+EANT_NEEDS_TOOLS="true" |
100 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
101 |
+ |
102 |
+# revisions of the scripts |
103 |
+IM_REV="-r1" |
104 |
+INIT_REV="-r1" |
105 |
+ |
106 |
+src_compile() { |
107 |
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
108 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
109 |
+ java-pkg-2_src_compile |
110 |
+} |
111 |
+ |
112 |
+src_test() { |
113 |
+ java-pkg-2_src_test |
114 |
+} |
115 |
+ |
116 |
+src_install() { |
117 |
+ local dest="/usr/share/${PN}-${SLOT}" |
118 |
+ |
119 |
+ java-pkg_jarinto "${dest}"/bin |
120 |
+ java-pkg_dojar output/build/bin/*.jar |
121 |
+ exeinto "${dest}"/bin |
122 |
+ doexe output/build/bin/*.sh |
123 |
+ |
124 |
+ java-pkg_jarinto "${dest}"/lib |
125 |
+ java-pkg_dojar output/build/lib/*.jar |
126 |
+ |
127 |
+ dodoc RELEASE-NOTES RUNNING.txt |
128 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
129 |
+ use source && java-pkg_dosrc java/* |
130 |
+ |
131 |
+ ### Webapps ### |
132 |
+ |
133 |
+ insinto "${dest}"/webapps |
134 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
135 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
136 |
+ |
137 |
+ ### Config ### |
138 |
+ |
139 |
+ # create "logs" directory in $CATALINA_BASE |
140 |
+ # and set correct perms, see #458890 |
141 |
+ dodir "${dest}"/logs |
142 |
+ fperms 0750 "${dest}"/logs |
143 |
+ |
144 |
+ # replace the default pw with a random one, see #92281 |
145 |
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
146 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
147 |
+ |
148 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
149 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
150 |
+ |
151 |
+ insinto "${dest}" |
152 |
+ doins -r output/build/conf |
153 |
+ |
154 |
+ ### rc ### |
155 |
+ |
156 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
157 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
158 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
159 |
+ |
160 |
+ insinto "${dest}"/gentoo |
161 |
+ doins "${T}"/tomcat.conf |
162 |
+ exeinto "${dest}"/gentoo |
163 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
164 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
165 |
+} |
166 |
+ |
167 |
+pkg_postinst() { |
168 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
169 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
170 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
171 |
+ |
172 |
+ elog "To manage Tomcat instances, run:" |
173 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
174 |
+ |
175 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
176 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
177 |
+ |
178 |
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
179 |
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
180 |
+} |