[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-12-05 Thread Maxime Gauduin via arch-commits 
Date: Saturday, December 5, 2020 @ 13:14:16
  Author: alucryd
Revision: 402892

upgpkg: tomcat9 9.0.41-1

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-05 13:13:53 UTC (rev 402891)
+++ PKGBUILD2020-12-05 13:14:16 UTC (rev 402892)
@@ -2,7 +2,7 @@
 # Contributor: Olli 
 
 pkgname=tomcat9
-pkgver=9.0.40
+pkgver=9.0.41
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
@@ -30,7 +30,7 @@
   etc/tomcat9/web.xml
 )
 install=tomcat9.install
-_tag=11cce490eb67a8aca64377a22c0cea2e38896725
+_tag=75d7a2069bf4360bcd8b885c6b7387d70c9cb052
 source=(
   git+https://github.com/apache/tomcat.git#tag=${_tag}
   tomcat9.service

[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-11-13 Thread Maxime Gauduin via arch-commits 
Date: Friday, November 13, 2020 @ 15:03:44
  Author: alucryd
Revision: 400753

upgpkg: tomcat9 9.0.40-1

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-13 15:02:43 UTC (rev 400752)
+++ PKGBUILD2020-11-13 15:03:44 UTC (rev 400753)
@@ -2,8 +2,8 @@
 # Contributor: Olli 
 
 pkgname=tomcat9
-pkgver=9.0.39
-pkgrel=2
+pkgver=9.0.40
+pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
 url=https://tomcat.apache.org/
@@ -30,7 +30,7 @@
   etc/tomcat9/web.xml
 )
 install=tomcat9.install
-_tag=6989c4e9360b4f9443862968c15a95d17f264321
+_tag=11cce490eb67a8aca64377a22c0cea2e38896725
 source=(
   git+https://github.com/apache/tomcat.git#tag=${_tag}
   tomcat9.service

[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-10-16 Thread Maxime Gauduin via arch-commits 
Date: Friday, October 16, 2020 @ 07:41:16
  Author: alucryd
Revision: 398432

FS#68224: tomcat9 9.0.39-2

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-16 07:26:07 UTC (rev 398431)
+++ PKGBUILD2020-10-16 07:41:16 UTC (rev 398432)
@@ -3,7 +3,7 @@
 
 pkgname=tomcat9
 pkgver=9.0.39
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
 url=https://tomcat.apache.org/
@@ -17,7 +17,7 @@
 makedepends=(
   ant
   git
-  java-environment
+  java-environment=8
 )
 optdepends=('tomcat-native: to allow optimal performance in production 
environments')
 backup=(
@@ -70,6 +70,9 @@
 build() {
   cd tomcat
 
+  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+  export PATH="$JAVA_HOME/bin:$PATH"
+
   ant
 }

[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-10-07 Thread Maxime Gauduin via arch-commits 
Date: Wednesday, October 7, 2020 @ 11:15:02
  Author: alucryd
Revision: 397468

upgpkg: tomcat9 9.0.39-1

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-07 11:14:44 UTC (rev 397467)
+++ PKGBUILD2020-10-07 11:15:02 UTC (rev 397468)
@@ -2,7 +2,7 @@
 # Contributor: Olli 
 
 pkgname=tomcat9
-pkgver=9.0.38
+pkgver=9.0.39
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
@@ -30,7 +30,7 @@
   etc/tomcat9/web.xml
 )
 install=tomcat9.install
-_tag=48b6a87171e502cc0becbb4c96e2266de4e805e7
+_tag=6989c4e9360b4f9443862968c15a95d17f264321
 source=(
   git+https://github.com/apache/tomcat.git#tag=${_tag}
   tomcat9.service

[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-09-20 Thread Maxime Gauduin via arch-commits 
Date: Sunday, September 20, 2020 @ 15:17:49
  Author: alucryd
Revision: 396353

upgpkg: tomcat9 9.0.38-1

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |   75 +++--
 1 file changed, 53 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-20 15:16:19 UTC (rev 396352)
+++ PKGBUILD2020-09-20 15:17:49 UTC (rev 396353)
@@ -2,7 +2,7 @@
 # Contributor: Olli 
 
 pkgname=tomcat9
-pkgver=9.0.37
+pkgver=9.0.38
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
@@ -14,6 +14,11 @@
   java-commons-daemon
   eclipse-ecj
 )
+makedepends=(
+  ant
+  git
+  java-environment
+)
 optdepends=('tomcat-native: to allow optimal performance in production 
environments')
 backup=(
   etc/tomcat9/catalina.policy
@@ -25,36 +30,61 @@
   etc/tomcat9/web.xml
 )
 install=tomcat9.install
+_tag=48b6a87171e502cc0becbb4c96e2266de4e805e7
 source=(
-  
https://archive.apache.org/dist/tomcat/tomcat-9/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
+  git+https://github.com/apache/tomcat.git#tag=${_tag}
   tomcat9.service
   tomcat9.sysusers
   tomcat9.tmpfiles
 )
-validpgpkeys=(
-  A9C5DF4D22E8D9875A5110C01C5A2F6059E7 # Mark E D Thomas
-  713DA88BE50911535FE716F5208B0AB1D63011C7 # Violeta Georgieva Georgieva
-)
-sha256sums=('8fb4cfa459a3f027b855334fbdc7197fa5378e504853a98009281d8e149b1bc7'
-'SKIP'
-'df2199080b3e4061eb8d454045428d7d340e527972c497309f69392ab2e3186f'
-'63d8a28af96e6c7232595e7eab3bb7930f0eebcd89a5b1e3bc17b80cb2580db5'
-'5cf1be7e6975c909d9935b2226a5aec4f783de154d910d3b65860286a3ce2a7b')
+b2sums=('SKIP'
+
'54b745cefdb9dbe5993b0b2ca08fae8d453a7610ffdeb2795b766d3ce321c267d570f6a1f5bd197f4c8053df3ab46ff68363f9d5ea1d96ddf96d19b84c075d21'
+
'b5206f649229ed67e8f9bfbd942d2fcdeb4056633e47b6a0cbbd813220c74a708a418fb09fe2e5a3c6fb17e271f268e2326bc3d26cdfd0e54c4f0eb9eeba3413'
+
'85a0dc807d3398856046e1450578e8f3a81ee34435eba119a883231ecd0e09ed32c97bf1747b20a253270df8a6e918d3823e6273ec52c01afd9a34a042e9dfcf')
+
 _gid_log=19
 _gid_tomcat=58
 _uid_tomcat=58
 
+pkgver() {
+  cd tomcat
+
+  _pkgver=$(git describe --tags)
+
+  if [[ ${_pkgver} != 9.* ]]; then
+exit 1
+  fi
+
+  echo ${_pkgver}
+}
+
+prepare() {
+  cd tomcat
+
+  cp build.properties.default build.properties
+  sed "/^base\.path=/c\base\.path=${srcdir}" -i build.properties
+  sed "/^compile.debug=/c\compile.debug=false" -i build.properties
+  sed "/^trydownload.httpusecaches=/c\trydownload.httpusecaches=false" -i 
build.properties
+}
+
+build() {
+  cd tomcat
+
+  ant
+}
+
 package() {
-  cd apache-tomcat-${pkgver}
+  cd tomcat/output/build
 
   # Tomcat general files
-  install -dm 755 "${pkgdir}"/usr/share/{,java/}tomcat9
-  cp -dr --no-preserve=ownership bin "${pkgdir}"/usr/share/tomcat9
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/tomcat9/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
+  install -dm 755 "${pkgdir}"/usr/share/tomcat9/bin
+  install -m 755  bin/* -t "${pkgdir}"/usr/share/tomcat9/bin/
+  # commons-daemon is packaged on its own
+  rm "${pkgdir}"/usr/share/tomcat9/bin/{*.bat,commons-daemon*}
   ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/tomcat9/bin/commons-daemon.jar
 
-  install -m 644 lib/* "${pkgdir}"/usr/share/java/tomcat9
+  install -dm 755 "${pkgdir}"/usr/share/java/tomcat9
+  install -m 644 lib/* -t "${pkgdir}"/usr/share/java/tomcat9/
   # eclipse-ecj is packaged on its own
   rm "${pkgdir}"/usr/share/java/tomcat9/ecj-*.jar
   ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/tomcat9/ecj.jar
@@ -68,12 +98,13 @@
   chgrp ${_gid_log} "${pkgdir}"/var/log/tomcat9/catalina.{out,err}
 
   install -dm 775 "${pkgdir}"/etc/tomcat9
-  install -m 640 -g ${_gid_tomcat} conf/* "${pkgdir}"/etc/tomcat9
+  install -m 640 -g ${_gid_tomcat} conf/* -t "${pkgdir}"/etc/tomcat9/
+
   install -dm 775 -g ${_gid_tomcat} "${pkgdir}"/etc/tomcat9/Catalina
   ln -s /etc/tomcat9 "${pkgdir}"/usr/share/tomcat9/conf
 
   install -dm 775 "${pkgdir}"/var/lib/tomcat9
-  cp -r webapps "${pkgdir}"/var/lib/tomcat9
+  cp -dr --no-preserve=ownership webapps "${pkgdir}"/var/lib/tomcat9/
   chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/tomcat9
   chmod 775 "${pkgdir}"/var/lib/tomcat9/webapps
   ln -s /var/lib/tomcat9/webapps "${pkgdir}"/usr/share/tomcat9/webapps
@@ -83,9 +114,9 @@
   ln -s /var/tmp/tomcat9/temp "${pkgdir}"/usr/share/tomcat9/temp
   ln -s /var/tmp/tomcat9/work "${pkgdir}"/usr/share/tomcat9/work
 
-  install -Dm 644 ../tomcat9.service 
"${pkgdir}"/usr/lib/systemd/system/tomcat9.service
-  install -Dm 644 ../tomcat9.sysusers 
"${pkgdir}"/usr/lib/sysusers.d/tomcat9.conf
-  install -Dm 644 ../tomcat9.tmpfiles 
"${pkgdir}"/usr/lib/tmpfiles.d/tomcat9.conf
+  install -Dm 644 ../../../tomcat9.serv

[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-07-21 Thread Maxime Gauduin via arch-commits 
Date: Tuesday, July 21, 2020 @ 09:57:44
  Author: alucryd
Revision: 392316

upgpkg: tomcat9 9.0.37-1

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-21 09:56:38 UTC (rev 392315)
+++ PKGBUILD2020-07-21 09:57:44 UTC (rev 392316)
@@ -2,7 +2,7 @@
 # Contributor: Olli 
 
 pkgname=tomcat9
-pkgver=9.0.35
+pkgver=9.0.37
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
@@ -35,7 +35,7 @@
   A9C5DF4D22E8D9875A5110C01C5A2F6059E7 # Mark E D Thomas
   713DA88BE50911535FE716F5208B0AB1D63011C7 # Violeta Georgieva Georgieva
 )
-sha256sums=('88b682fda5ffd0f27c61d14178ae880f71cea78355107ea2d176a6047859f0ac'
+sha256sums=('8fb4cfa459a3f027b855334fbdc7197fa5378e504853a98009281d8e149b1bc7'
 'SKIP'
 'df2199080b3e4061eb8d454045428d7d340e527972c497309f69392ab2e3186f'
 '63d8a28af96e6c7232595e7eab3bb7930f0eebcd89a5b1e3bc17b80cb2580db5'

[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-05-28 Thread Maxime Gauduin via arch-commits 
Date: Thursday, May 28, 2020 @ 08:21:41
  Author: alucryd
Revision: 387755

upgpkg: tomcat9 9.0.35-1

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-28 08:19:58 UTC (rev 387754)
+++ PKGBUILD2020-05-28 08:21:41 UTC (rev 387755)
@@ -2,7 +2,7 @@
 # Contributor: Olli 
 
 pkgname=tomcat9
-pkgver=9.0.34
+pkgver=9.0.35
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
@@ -35,7 +35,7 @@
   A9C5DF4D22E8D9875A5110C01C5A2F6059E7 # Mark E D Thomas
   713DA88BE50911535FE716F5208B0AB1D63011C7 # Violeta Georgieva Georgieva
 )
-sha256sums=('321de5b18a48ec09d2963d9faba4bfeafc7dd2203d80a2ef7e7a20b159e2120a'
+sha256sums=('88b682fda5ffd0f27c61d14178ae880f71cea78355107ea2d176a6047859f0ac'
 'SKIP'
 'df2199080b3e4061eb8d454045428d7d340e527972c497309f69392ab2e3186f'
 '63d8a28af96e6c7232595e7eab3bb7930f0eebcd89a5b1e3bc17b80cb2580db5'

[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-04-09 Thread Maxime Gauduin via arch-commits 
Date: Thursday, April 9, 2020 @ 10:51:22
  Author: alucryd
Revision: 379924

upgpkg: tomcat9 9.0.34-1

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-09 09:58:13 UTC (rev 379923)
+++ PKGBUILD2020-04-09 10:51:22 UTC (rev 379924)
@@ -2,7 +2,7 @@
 # Contributor: Olli 
 
 pkgname=tomcat9
-pkgver=9.0.33
+pkgver=9.0.34
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
@@ -35,7 +35,7 @@
   A9C5DF4D22E8D9875A5110C01C5A2F6059E7 # Mark E D Thomas
   713DA88BE50911535FE716F5208B0AB1D63011C7 # Violeta Georgieva Georgieva
 )
-sha256sums=('d5cd9463492f4552229295a9a8c00615748f85e9de36434847d495e95b0ef796'
+sha256sums=('321de5b18a48ec09d2963d9faba4bfeafc7dd2203d80a2ef7e7a20b159e2120a'
 'SKIP'
 'df2199080b3e4061eb8d454045428d7d340e527972c497309f69392ab2e3186f'
 '63d8a28af96e6c7232595e7eab3bb7930f0eebcd89a5b1e3bc17b80cb2580db5'

[arch-commits] Commit in tomcat9/trunk (PKGBUILD)

2020-03-18 Thread Maxime Gauduin via arch-commits 
Date: Wednesday, March 18, 2020 @ 10:27:17
  Author: alucryd
Revision: 377854

upgpkg: tomcat9 9.0.33-1

Modified:
  tomcat9/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-18 09:38:04 UTC (rev 377853)
+++ PKGBUILD2020-03-18 10:27:17 UTC (rev 377854)
@@ -2,7 +2,7 @@
 # Contributor: Olli 
 
 pkgname=tomcat9
-pkgver=9.0.31
+pkgver=9.0.33
 pkgrel=1
 pkgdesc='Open source implementation of the Java Servlet 4.0 and JavaServer 
Pages 2.3 technologies'
 arch=(any)
@@ -35,7 +35,7 @@
   A9C5DF4D22E8D9875A5110C01C5A2F6059E7 # Mark E D Thomas
   713DA88BE50911535FE716F5208B0AB1D63011C7 # Violeta Georgieva Georgieva
 )
-sha256sums=('1b111d890f8c0b3f3eb7f8f8f557a8e163ef6b06bca3e262ba1062808467cb43'
+sha256sums=('d5cd9463492f4552229295a9a8c00615748f85e9de36434847d495e95b0ef796'
 'SKIP'
 'df2199080b3e4061eb8d454045428d7d340e527972c497309f69392ab2e3186f'
 '63d8a28af96e6c7232595e7eab3bb7930f0eebcd89a5b1e3bc17b80cb2580db5'