From 80c51284f0017d5765c7ae39207be9c58f4bfa17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 Feb 2023 14:14:16 +0000 Subject: gentoo auto-resync : 19:02:2023 - 14:14:15 --- dev-java/Manifest.gz | Bin 56785 -> 56786 bytes dev-java/tomcat-native/Manifest | 10 +-- .../files/tomcat-native-2.0.2-slibtool.patch | 32 -------- .../files/tomcat-native-2.0.3-slibtool.patch | 32 ++++++++ dev-java/tomcat-native/metadata.xml | 2 +- dev-java/tomcat-native/tomcat-native-2.0.2.ebuild | 78 ------------------ .../tomcat-native/tomcat-native-2.0.3-r1.ebuild | 88 +++++++++++++++++++++ 7 files changed, 126 insertions(+), 116 deletions(-) delete mode 100644 dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch create mode 100644 dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch delete mode 100644 dev-java/tomcat-native/tomcat-native-2.0.2.ebuild create mode 100644 dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 6f92ae5cb3ce..047ab0785ba8 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 098ca0937d41..5c90429540a8 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,9 +1,9 @@ -AUX tomcat-native-2.0.2-slibtool.patch 1099 BLAKE2B e5c294cd96747a576afcc4ad80d0a99d97cf9037d750febe681d3e4ee3cd1c3ef96b14e73829b90aa40ec85e6a33e69ce062eeed9a91a278a67ffca94f39224c SHA512 24f890d5b697a10c702f9149679df6a70ddcc663de3abbbffa863151ed655d17ef16b585ac9c6354e1d4c56ddcb920acc6ba9236095d50b96d06c17307734353 +AUX tomcat-native-2.0.3-slibtool.patch 1085 BLAKE2B a23d3756071916a550c8418ab1ded93077106313b399545c7e8c5c91201c4d61b5a8c4ae550f197b50186012d64c0be1057cb9099e762f72c3f1dea32f047734 SHA512 c0bb7146e41f4c2785d6675bd46c5c7ba9279119ea8d81db0271c9874d4da9c4d60d8df219adfe02d59d19f5be1be4e659ee3bf50475052a60d43c3d029487dd DIST tomcat-native-1.2.35-src.tar.gz 436593 BLAKE2B 808ed0396e421609092f9e59676a55501e67fef7b0ca466ad15e4fe11cc88abb8b07043364c63a53760052a6258585aa13a53378c3fb8823bc8349371ad12245 SHA512 a290eb0cd940e1f8de0caba72517d9999d4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d DIST tomcat-native-1.2.36-src.tar.gz 437622 BLAKE2B c553fee65bc9ff9eec099afde7516b3108ed4175915e853a720d188f684f39b9a8a040b9b9c28e64deecd0c1b0c61cd24e03a552f465c7646b0b6e47d9f12372 SHA512 ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094 -DIST tomcat-native-2.0.2-src.tar.gz 315063 BLAKE2B c044a0b6ef226a038728d5c009a7415bc95cd4317bf8fcbcc0a0a9a9ee930c0c2e74cd6c028a92cc9e96c218f38d580c7af6599c3df35e9c677d1a382727582f SHA512 a0badfaa537dd8dc24901bbf2a11dbaab7cabe5c033eb9162daa5c748269c3dace08f99c0a477c0d0e051b7d226e2e2c6c3031ab7c45d007333cb53d72738c21 -DIST tomcat-native-2.0.2-src.tar.gz.asc 833 BLAKE2B 8368c96d6bff84c1281ab08699401286ce89adcf21ffda5d896e19d05f8279746070256612038c8b670b13e0cef4d43e678dfa785175b54b15aa68e33268bb29 SHA512 9d2e2c64cde1c1812192ad451610e32480ad005832e2b781f0eb5f5559a23730715ccf7bfd04937091bb6635b098badc61f73a926fcfa5ea09175d7a9fe0e002 +DIST tomcat-native-2.0.3-src.tar.gz 318403 BLAKE2B a9936ad951bd521c77b8a3fe3306cb1a7a78bdbb229f84fdf53e5bd71caa55bfcee049de406df0047341c6896e05e7da4e0e2a8524fdda91a24f007176f26503 SHA512 d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339 +DIST tomcat-native-2.0.3-src.tar.gz.asc 873 BLAKE2B f9998b9b7c410ac7fe2c72207cec64dcd003142ede4f37abd4ebb04ee930a5d536169c84e24bc7fb328cead15da19c13a991f30bdcce80ffd5380114884ec5f6 SHA512 bc513239ccd2a4b4eb60d30513328bb008b926e702ece8ddb4a9a084d64fc7db02b894f741d7073e5f869e7df948b4539d849e8c602549bab91f7055e3c23222 EBUILD tomcat-native-1.2.35.ebuild 1193 BLAKE2B ce3e060b2f3d2cdaa88161e14b486040e452add5f499aaf3015b02a5c79564c281889fd8c1248f36b0f4069d472215ca8e8e58525e038b65c56186b7e7323b82 SHA512 42fbee312e571add71350399e3768b3856ec4f3ebf7a60dc1a8769f417114414cc9001ce29c7731c332b60eed1ad408c917e99975ba761707c5325231ab57710 EBUILD tomcat-native-1.2.36.ebuild 1194 BLAKE2B 85ceafd1111a3cba29edf38c638ec33d68d64a69da15c06ba8c0c060b2353c1cae1b4d60aacc6cd19af34f557dc66d98f90c157e4c31ca4602aea0b7fd27f27c SHA512 c532e8cce0fd7b628a6602d01af7123d2c9dc87357ceb418dd54ad7546924d409f7b83e2351a8ad1d0eb1b4d9d9221ef5d0e69d3f857fd361aa4439252c6eb3f -EBUILD tomcat-native-2.0.2.ebuild 1719 BLAKE2B 37404ca16bddb1af928d4d6defd7e69d31970ef12960e7a5fb5ed8071227a884d0dfd6fe8b2c4169a1bc270ab7bf50b23bc1103ed9ad3af13542aa0aa1a0c55f SHA512 d88ecaa32c6a845f8a9634d1cb590a4550d5404f55a474ac7b39a5a6a42ed426b47c279694e0afb35a9b788e7a77d12c2e8c866d94984a65522e0cc1d0db952e -MISC metadata.xml 1096 BLAKE2B 5927d60847798f2e90ee40af5947bf0fec8a2a9a9b98730be22a4471155f9a627aea8f52d4f8cee6fb6b77457c7977d0aea025f2e5eedd938a64787ddeca9f29 SHA512 bbd9ec012b1b50b3c4a5967068fb2901dc184e18c5b9a8f545ff396fae4c198daeb2c5d09a377e0adeaa76580ca7c87d5b98f246db6ce83fd58d52502dc3f006 +EBUILD tomcat-native-2.0.3-r1.ebuild 2169 BLAKE2B ef455d4fe17957c4e52c38fa3946483e299b80b49106a586f0b43c96be9b57b886049eb2d42c41b7a77b85c04ad88ce8f36f6af8ce5b309b90041f3830d3638e SHA512 0bd0176625f1c10b9b7ee67add2a35a5f1df7195590c8b3d6c6c22afc5d298d069459cca951e2e3108735f370cc2de218b9db9a1d4be332dbebe4b4fd6963d88 +MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc diff --git a/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch deleted file mode 100644 index e0378669aad5..000000000000 --- a/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-PR: https://github.com/apache/tomcat-native/pull/14 -Upstream-Commit: -https://github.com/apache/tomcat-native/commit/4f7fb7f442de3d9a9bb2f72b5dabc2f4bc8e3384 - -From 54dccd3a4dc01801d9311b3160808305ec9fc2cf Mon Sep 17 00:00:00 2001 -From: orbea -Date: Thu, 21 Jul 2022 17:59:14 -0700 -Subject: [PATCH] native: Fix the build with rlibtool - -When building tomcat-native with slibtool using the rlibtool symlink the -build will fail. This is because rlibtool requires the generated libtool -script to determine if the build is shared, static or both. - -Gentoo bug: https://bugs.gentoo.org/778914 ---- - native/configure.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/native/configure.in b/native/configure.in -index 567894b10..e082ae6d2 100644 ---- a/native/configure.in -+++ b/native/configure.in -@@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION) - AC_CANONICAL_TARGET - AC_PROG_INSTALL - -+dnl Generate the libtool script which is needed for rlibtool -+LT_INIT -+ - dnl - dnl compute the top directory of the build - dnl note: this is needed for LIBTOOL and exporting the bundled Expat diff --git a/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch new file mode 100644 index 000000000000..cd090afb9854 --- /dev/null +++ b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch @@ -0,0 +1,32 @@ +Upstream-PR: https://github.com/apache/tomcat-native/pull/14 +Upstream-Commit: +https://github.com/apache/tomcat-native/commit/4f7fb7f442de3d9a9bb2f72b5dabc2f4bc8e3384 + +From 54dccd3a4dc01801d9311b3160808305ec9fc2cf Mon Sep 17 00:00:00 2001 +From: orbea +Date: Thu, 21 Jul 2022 17:59:14 -0700 +Subject: [PATCH] native: Fix the build with rlibtool + +When building tomcat-native with slibtool using the rlibtool symlink the +build will fail. This is because rlibtool requires the generated libtool +script to determine if the build is shared, static or both. + +Gentoo bug: https://bugs.gentoo.org/778914 +--- + native/configure.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/native/configure.in b/native/configure.in +index 567894b10..e082ae6d2 100644 +--- a/configure.in ++++ b/configure.in +@@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION) + AC_CANONICAL_TARGET + AC_PROG_INSTALL + ++dnl Generate the libtool script which is needed for rlibtool ++LT_INIT ++ + dnl + dnl compute the top directory of the build + dnl note: this is needed for LIBTOOL and exporting the bundled Expat diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml index e07558c04674..1989b45b9137 100644 --- a/dev-java/tomcat-native/metadata.xml +++ b/dev-java/tomcat-native/metadata.xml @@ -16,9 +16,9 @@ memory, NT pipes and Unix sockets). - apache/tomcat-native https://tomcat.apache.org/bugreport.html https://tomcat.apache.org/native-doc/ https://tomcat.apache.org/native-doc/miscellaneous/changelog.html + apache/tomcat-native diff --git a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild deleted file mode 100644 index 5874a906ef17..000000000000 --- a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools java-pkg-2 java-ant-2 verify-sig - -DESCRIPTION="Allows Tomcat to use certain native resources for better performance" -HOMEPAGE="https://tomcat.apache.org/native-doc/" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc )" -S=${WORKDIR}/${P}-src - -KEYWORDS="~amd64 ~x86" -LICENSE="Apache-2.0" -SLOT="2" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/apr:1= - dev-libs/openssl:0/3 - >=virtual/jre-1.8:*" - -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/ant-junit:0 )" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -PATCHES=( - "${FILESDIR}"/${P}-slibtool.patch #778914 -) - -src_prepare() { - default - - # Needed for the slibtool patch - cd native || die - sed -i 's/configure.in/configure.ac/' configure.in || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-apr="${EPREFIX}"/usr/bin/apr-1-config - --with-ssl="${EPREFIX}"/usr - ) - - cd native || die - econf "${myeconfargs[@]}" -} - -src_compile() { - eant jar - - cd native || die - default -} - -src_install() { - java-pkg_newjar "dist/${P}.jar" "${PN}.jar" - - cd native || die - default - - ! use static-libs && find "${D}" -name '*.la' -delete || die -} - -src_test() { - java-pkg-2_src_test -} - -pkg_postinst() { - elog "For more information, please visit" - elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" -} diff --git a/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild new file mode 100644 index 000000000000..e5d555c68e08 --- /dev/null +++ b/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit autotools java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Allows Tomcat to use certain native resources for better performance" +HOMEPAGE="https://tomcat.apache.org/native-doc/" +SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz + verify-sig? ( + https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc + )" +S=${WORKDIR}/${P}-src/native + +KEYWORDS="~amd64 ~x86" +LICENSE="Apache-2.0" +SLOT="2" +IUSE="static-libs" + +DEPEND=" + >=virtual/jdk-1.8:* +" +RDEPEND=" + dev-libs/apr:1= + dev-libs/openssl:0/3 + >=virtual/jre-1.8:* +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" + +JAVA_RESOURCE_DIRS="../resources" +JAVA_SRC_DIR="../java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="../test" + +PATCHES=( + "${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914 +) + +DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) + +src_prepare() { + java-pkg-2_src_prepare + mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die + sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \ + ../build.xml \ + | sed "s:\${version}:${PV}:" \ + > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die + default + + # Needed for the slibtool patch + sed -i 's/configure.in/configure.ac/' configure.in || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-apr="${EPREFIX}"/usr/bin/apr-1-config + --with-ssl="${EPREFIX}"/usr + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + java-pkg-simple_src_compile + default +} + +src_test() { + JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" ) + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_doso .libs/*.so* + dodoc -r ../docs + ! use static-libs && find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "For more information, please visit" + elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" +} -- cgit v1.2.3