[arch-commits] Commit in java7-openjdk/repos (24 files)
Date: Monday, July 20, 2015 @ 14:35:48 Author: guillaume Revision: 242385 archrelease: copy trunk to extra-i686, extra-x86_64 Added: java7-openjdk/repos/extra-i686/PKGBUILD (from rev 242384, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/extra-i686/fontconfig-paths.diff (from rev 242384, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/extra-i686/jdk7-openjdk.install (from rev 242384, java7-openjdk/trunk/jdk7-openjdk.install) java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install (from rev 242384, java7-openjdk/trunk/jre7-openjdk-headless.install) java7-openjdk/repos/extra-i686/jre7-openjdk.install (from rev 242384, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff (from rev 242384, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) java7-openjdk/repos/extra-x86_64/PKGBUILD (from rev 242384, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff (from rev 242384, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install (from rev 242384, java7-openjdk/trunk/jdk7-openjdk.install) java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install (from rev 242384, java7-openjdk/trunk/jre7-openjdk-headless.install) java7-openjdk/repos/extra-x86_64/jre7-openjdk.install (from rev 242384, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff (from rev 242384, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) Deleted: java7-openjdk/repos/extra-i686/PKGBUILD java7-openjdk/repos/extra-i686/fontconfig-paths.diff java7-openjdk/repos/extra-i686/jdk7-openjdk.install java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install java7-openjdk/repos/extra-i686/jre7-openjdk.install java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff java7-openjdk/repos/extra-x86_64/PKGBUILD java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install java7-openjdk/repos/extra-x86_64/jre7-openjdk.install java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff --+ /PKGBUILD| 624 + /fontconfig-paths.diff | 268 ++ /jdk7-openjdk.install| 100 /jre7-openjdk-headless.install | 96 +++ /jre7-openjdk.install| 110 /openjdk7_nonreparenting-wm.diff | 116 extra-i686/PKGBUILD | 308 extra-i686/fontconfig-paths.diff | 134 - extra-i686/jdk7-openjdk.install | 50 -- extra-i686/jre7-openjdk-headless.install | 48 - extra-i686/jre7-openjdk.install | 55 -- extra-i686/openjdk7_nonreparenting-wm.diff | 58 -- extra-x86_64/PKGBUILD| 308 extra-x86_64/fontconfig-paths.diff | 134 - extra-x86_64/jdk7-openjdk.install| 50 -- extra-x86_64/jre7-openjdk-headless.install | 48 - extra-x86_64/jre7-openjdk.install| 55 -- extra-x86_64/openjdk7_nonreparenting-wm.diff | 58 -- 18 files changed, 1314 insertions(+), 1306 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 242384:242385 to see the changes.
[arch-commits] Commit in java7-openjdk/trunk (3 files)
Date: Monday, July 20, 2015 @ 14:34:57
Author: guillaume
Revision: 242384
Upstream release 7.u80_2.6.0
Modified:
java7-openjdk/trunk/PKGBUILD
Deleted:
java7-openjdk/trunk/hotspot_fix_memory_leak.diff
java7-openjdk/trunk/icedtea-7.2.5.5-gcc5.diff
--+
PKGBUILD | 34 --
hotspot_fix_memory_leak.diff | 46 -
icedtea-7.2.5.5-gcc5.diff| 41
3 files changed, 14 insertions(+), 107 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-20 10:27:59 UTC (rev 242383)
+++ PKGBUILD2015-07-20 12:34:57 UTC (rev 242384)
@@ -6,13 +6,13 @@
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src'
'openjdk7-doc')
pkgbase=java7-openjdk
_java_ver=7
-_icedtea_ver=2.5.5
+_icedtea_ver=2.6.0
#pkgver() {
# _updatever=$(grep -E ^JDK_UPDATE_VERSION = (.)+
${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
#| sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
# echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
#}
-_updatever=79
+_updatever=80
pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
pkgrel=1
@@ -25,7 +25,7 @@
makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
'alsa-lib' 'apache-ant=1.8.1' 'giflib' 'libpng=1.5.7' 'gtk2'
'java-rhino' 'libpulse=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar'
'wget'
- 'eclipse-ecj')
+ 'eclipse-ecj' 'pcsclite' 'lksctp-tools')
_icedtea_url=http://icedtea.classpath.org/download
_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
@@ -38,24 +38,20 @@
icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
-openjdk7_nonreparenting-wm.diff
-icedtea-7.2.5.5-gcc5.diff
-hotspot_fix_memory_leak.diff)
+openjdk7_nonreparenting-wm.diff)
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
-sha256sums=('f05b1db06021f4cd3a39647f358a47130136d189431fb55f79855f627b1d6619'
-'5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d'
-'f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51'
-'293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256'
-'76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be'
-'c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483'
-'71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660'
-'d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb'
+sha256sums=('b45c829dc937360ed7fbd19505be42007a3abfa8df4afeb77cd9ef70abcdc7a9'
+'20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b'
+'5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb'
+'8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07'
+'816a6d7a4bd302871d73f5681f6b35459000d76bfb9fa04b3479ffb630dc39f5'
+'900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c'
+'63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661'
+'8e580046488e2fc15fd98892add37fffd4f9f17bf5d62c5db0f5d1832707a31c'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
-'49f8b65e24f6e6c8afa9e48b11f6e1675ef2c5d3bfe31fd7d73c8de1f4150cf2'
-'0de78abc8ff96e11ba3ad43f1e8194c26c5d06363cb5b7c8aa660e1ea21127a1')
+'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -87,9 +83,7 @@
cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES=patches/fontconfig-paths.diff \
- patches/openjdk7_nonreparenting-wm.diff \
- patches/icedtea-7.2.5.5-gcc5.diff \
- patches/hotspot_fix_memory_leak.diff
+ patches/openjdk7_nonreparenting-wm.diff
if [ $_bootstrap = 1 ]; then
BOOTSTRAPOPT=--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar
Deleted: hotspot_fix_memory_leak.diff
===
--- hotspot_fix_memory_leak.diff2015-07-20 10:27:59 UTC (rev 242383)
+++ hotspot_fix_memory_leak.diff2015-07-20 12:34:57 UTC (rev 242384)
@@ -1,46 +0,0 @@
-
-# HG changeset patch
-# User sgehwolf
-# Date 1430335428 25200
-# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b
-# Parent cd8fe1a9205aedb6b5a1fc16e664412e48aee565
-8078666: JVM fastdebug build compiled with GCC 5 asserts with widen increases
-Summary: do
[arch-commits] Commit in tomcat8/repos/extra-any (10 files)
Date: Sunday, July 19, 2015 @ 20:59:16
Author: guillaume
Revision: 242373
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 242372, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
(from rev 242372, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 242372, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 242372, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 242372, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat8.conf |2
systemd_tmpfiles.d_tomcat8.conf | 10 +-
systemd_tomcat8.service | 66
tomcat8.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-07-19 18:58:44 UTC (rev 242372)
+++ PKGBUILD2015-07-19 18:59:16 UTC (rev 242373)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.23
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('c98b19a1edaaef2859991f304d0ec8f29c5ccacc6d63a0bc8bf7078d63191a38'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
-'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Sunday, July 19, 2015 @ 20:58:44
Author: guillaume
Revision: 242372
Upstream release 8.0.24
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-19 18:55:46 UTC (rev 242371)
+++ PKGBUILD2015-07-19 18:58:44 UTC (rev 242372)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
-pkgver=8.0.23
+pkgver=8.0.24
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('c98b19a1edaaef2859991f304d0ec8f29c5ccacc6d63a0bc8bf7078d63191a38'
+sha256sums=('41980bdc3a0bb0abb820aa8ae269938946e219ae2d870f1615d5071564ccecee'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
[arch-commits] Commit in tomcat7/trunk (PKGBUILD)
Date: Sunday, July 19, 2015 @ 20:54:26
Author: guillaume
Revision: 242370
Upstream release 7.0.63
Modified:
tomcat7/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-19 15:06:11 UTC (rev 242369)
+++ PKGBUILD2015-07-19 18:54:26 UTC (rev 242370)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
-pkgver=7.0.62
+pkgver=7.0.63
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('a787ea12e163e78ccebbb9662d7da78e707aef051d15af9ab5be20489adf1f6d'
+sha256sums=('b5d878a17de2421a078d8907583076b507e67dbf1567c6f4346d70c88473f8ad'
'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
[arch-commits] Commit in tomcat7/repos/extra-any (10 files)
Date: Sunday, July 19, 2015 @ 20:55:46
Author: guillaume
Revision: 242371
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 242370, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 242370, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 242370, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 242370, tomcat7/trunk/systemd_tomcat7.service)
tomcat7/repos/extra-any/tomcat7.install
(from rev 242370, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tomcat7.service
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat7.conf |2
systemd_tmpfiles.d_tomcat7.conf | 10 +-
systemd_tomcat7.service | 66
tomcat7.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-07-19 18:54:26 UTC (rev 242370)
+++ PKGBUILD2015-07-19 18:55:46 UTC (rev 242371)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.62
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('a787ea12e163e78ccebbb9662d7da78e707aef051d15af9ab5be20489adf1f6d'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in java-common/trunk (PKGBUILD test_archlinux-java)
Date: Sunday, July 19, 2015 @ 21:36:48
Author: guillaume
Revision: 242376
Fix FS#45598 update shunit2 download location
Modified:
java-common/trunk/PKGBUILD
java-common/trunk/test_archlinux-java
-+
PKGBUILD|8 +---
test_archlinux-java |4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-19 19:01:35 UTC (rev 242375)
+++ PKGBUILD2015-07-19 19:36:48 UTC (rev 242376)
@@ -7,20 +7,22 @@
url='www.archlinux.org'
license=('GPL')
checkdepends=('wget')
+_shunitver=2.1.6
source=(profile_jre.csh
profile_jre.sh
bin_archlinux-java
test_archlinux-java
-https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz)
+
shunit2-${_shunitver}.tar.gz::https://github.com/kward/shunit2/archive/source.tar.gz)
sha256sums=('9d25638cafc2fabd1ba6f2f26aa01233eccf3d31db003d956b571f0ab655dd23'
'519e9881a2a9f4fc3d581ea0ef0da594eedbfdfcf734f9fdc0bb595e8ac77e4c'
'272296ec7ca673b4f9f59fb70565328b6daef682c29cd964c988c018090c3fc2'
-'c2c413a6b2f8b88ed170a5b19f7cb620518e09686f0d286b4b27d30f571e5050'
-'65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee')
+'565aad3e35b7435d5050cba2363c39affa739c9af8b9626aff0678850fa64025'
+'6beca93d20b72b46083c8271c4cf1da21b45f250a92b401c2565c65e1d75138f')
check() {
cd ${srcdir}
+ ln -s shunit2-source/${_shunitver} shunit2
./test_archlinux-java
}
Modified: test_archlinux-java
===
--- test_archlinux-java 2015-07-19 19:01:35 UTC (rev 242375)
+++ test_archlinux-java 2015-07-19 19:36:48 UTC (rev 242376)
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# To run this script, ensure shunit2 (https://code.google.com/p/shunit2/)
+# To run this script, ensure shunit2 (https://github.com/kward/shunit2)
# is available on the local directory, then just run sh
bin_archlinux-java_tests
#
# inotifywait -r -m -e MODIFY . | while read l; do sh
bin_archlinux-java_tests; done
@@ -283,4 +283,4 @@
}
# load shunit2
-. shunit2-2.1.6/src/shunit2
+. shunit2/src/shunit2
[arch-commits] Commit in java8-openjdk/trunk (PKGBUILD)
Date: Sunday, July 19, 2015 @ 21:00:32
Author: guillaume
Revision: 242374
Upstream release 1.8.0_51-b16
Modified:
java8-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-19 18:59:16 UTC (rev 242373)
+++ PKGBUILD2015-07-19 19:00:32 UTC (rev 242374)
@@ -10,8 +10,9 @@
pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src'
'openjdk8-doc')
pkgbase=java8-openjdk
_java_ver=8
-_jdk_update=45
-_jdk_build=14
+#
http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
+_jdk_update=51
+_jdk_build=16
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
pkgrel=1
@@ -32,14 +33,14 @@
JDK-8074312-hotspot.patch
JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch)
-sha256sums=('b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2'
-'6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de'
-'1dc7c5038f57f77a1e92cf1b48a188a0291805e69f570e1164efb7adb34c5a59'
-'2b125825962a2ff110afadb37784faf276e7146023c4a6cede6a3f923f48c692'
-'e6f6233c26335536436de89ebf741df8b142119d8b41abc34c3287dd155a43bb'
-'c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976'
-'eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9'
-'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9'
+sha256sums=('02eab2b937ed83c4505e93f58ad0b84a4e1a69e6d0baa4d041ec09ed98f18c2d'
+'00d783dda3a7d87eb55a72febe7666c4b3297616ef3f11bbd679a05f19a81825'
+'a7236d5e5824cea20b48ca4efb8e5109007024af9b85214e9153c4d633665d0a'
+'f7554dc2fba5dfd36af0ed618ebe4c7b1527b5a067052299a1679a4142bbbeee'
+'aa202ddf3bcc1dc54723bb26c0ae5ccaefc1693647e6b463955065d2b1720382'
+'5d6faf6c726392212659cebd93fdbf89a11b86bab60f5b220493d9d8e7ff0686'
+'3171ec4dbd96747eeb876a8fd3caf1e1e52da3dc91b63308193c914a5501d6e4'
+'ffdd0446fce7b624f2cdc80297b99eecfdf30adfee39d3b8832a78c1dc202636'
'95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50'
'8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05')
[arch-commits] Commit in java8-openjdk/repos (20 files)
Date: Sunday, July 19, 2015 @ 21:01:35 Author: guillaume Revision: 242375 archrelease: copy trunk to extra-i686, extra-x86_64 Added: java8-openjdk/repos/extra-i686/JDK-8074312-hotspot.patch (from rev 242374, java8-openjdk/trunk/JDK-8074312-hotspot.patch) java8-openjdk/repos/extra-i686/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch (from rev 242374, java8-openjdk/trunk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch) java8-openjdk/repos/extra-i686/PKGBUILD (from rev 242374, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-i686/install_jdk8-openjdk.sh (from rev 242374, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-i686/install_jre8-openjdk-headless.sh (from rev 242374, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-i686/install_jre8-openjdk.sh (from rev 242374, java8-openjdk/trunk/install_jre8-openjdk.sh) java8-openjdk/repos/extra-x86_64/JDK-8074312-hotspot.patch (from rev 242374, java8-openjdk/trunk/JDK-8074312-hotspot.patch) java8-openjdk/repos/extra-x86_64/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch (from rev 242374, java8-openjdk/trunk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch) java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 242374, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh (from rev 242374, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh (from rev 242374, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 242374, java8-openjdk/trunk/install_jre8-openjdk.sh) Deleted: java8-openjdk/repos/extra-i686/PKGBUILD java8-openjdk/repos/extra-i686/install_jdk8-openjdk.sh java8-openjdk/repos/extra-i686/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-i686/install_jre8-openjdk.sh java8-openjdk/repos/extra-x86_64/PKGBUILD java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh -+ /PKGBUILD | 588 ++ /install_jdk8-openjdk.sh | 100 + /install_jre8-openjdk-headless.sh | 96 + /install_jre8-openjdk.sh | 110 + extra-i686/JDK-8074312-hotspot.patch | 12 extra-i686/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch | 46 extra-i686/PKGBUILD | 280 extra-i686/install_jdk8-openjdk.sh | 50 extra-i686/install_jre8-openjdk-headless.sh | 48 extra-i686/install_jre8-openjdk.sh | 55 extra-x86_64/JDK-8074312-hotspot.patch | 12 extra-x86_64/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch | 46 extra-x86_64/PKGBUILD | 280 extra-x86_64/install_jdk8-openjdk.sh | 50 extra-x86_64/install_jre8-openjdk-headless.sh | 48 extra-x86_64/install_jre8-openjdk.sh | 55 16 files changed, 1010 insertions(+), 866 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 242374:242375 to see the changes.
[arch-commits] Commit in liblouis/repos/extra-x86_64 (4 files)
Date: Monday, July 6, 2015 @ 22:55:32
Author: guillaume
Revision: 241848
archrelease: copy trunk to extra-x86_64
Added:
liblouis/repos/extra-x86_64/PKGBUILD
(from rev 241847, liblouis/trunk/PKGBUILD)
liblouis/repos/extra-x86_64/liblouis.install
(from rev 241847, liblouis/trunk/liblouis.install)
Deleted:
liblouis/repos/extra-x86_64/PKGBUILD
liblouis/repos/extra-x86_64/liblouis.install
--+
PKGBUILD | 64 ++---
liblouis.install | 40 -
2 files changed, 52 insertions(+), 52 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-07-06 20:54:12 UTC (rev 241847)
+++ PKGBUILD2015-07-06 20:55:32 UTC (rev 241848)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-pkgname=liblouis
-pkgver=2.5.2
-pkgrel=3
-pkgdesc=Open-source braille translator and back-translator
-arch=(i686 x86_64)
-url=http://code.google.com/p/liblouis/;
-license=('GPL3')
-depends=(glibc)
-makedepends=(help2man python2 python)
-install=liblouis.install
-source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=(' 93437f3c3a9a178ad08bdf6daca2a82cf3df2cc2')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-
- cd python
- LD_PRELOAD+=:$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so
- python2 setup.py install --root=$pkgdir --prefix=/usr --optimize=1
- python setup.py install --root=$pkgdir --prefix=/usr --optimize=1
-}
-# vim:set ts=2 sw=2 et:
Copied: liblouis/repos/extra-x86_64/PKGBUILD (from rev 241847,
liblouis/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-07-06 20:55:32 UTC (rev 241848)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+pkgname=liblouis
+pkgver=2.6.3
+pkgrel=1
+pkgdesc=Open-source braille translator and back-translator
+arch=(i686 x86_64)
+url=http://liblouis.org/;
+license=('GPL3')
+depends=(glibc)
+makedepends=(help2man python2 python)
+install=liblouis.install
+source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha1sums=('b4673678966efcc140ead49aab5e975280b815ce')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ cd python
+ LD_PRELOAD+=:$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so
+ python2 setup.py install --root=$pkgdir --prefix=/usr --optimize=1
+ python setup.py install --root=$pkgdir --prefix=/usr --optimize=1
+}
+# vim:set ts=2 sw=2 et:
Deleted: liblouis.install
===
--- liblouis.install2015-07-06 20:54:12 UTC (rev 241847)
+++ liblouis.install2015-07-06 20:55:32 UTC (rev 241848)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(liblouis.info)
-
-post_install() {
-[ -x usr/bin/install-info ] || return 0
-for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2 /dev/null
-done
-}
-
-post_upgrade() {
-post_install $1
-}
-
-pre_remove() {
-[ -x usr/bin/install-info ] || return 0
-for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
-done
-}
Copied: liblouis/repos/extra-x86_64/liblouis.install (from rev 241847,
liblouis/trunk/liblouis.install)
===
--- liblouis.install(rev 0)
+++ liblouis.install2015-07-06 20:55:32 UTC (rev 241848)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(liblouis.info)
+
+post_install() {
+[ -x usr/bin/install-info ] || return 0
+for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+done
+}
+
+post_upgrade() {
+post_install $1
+}
+
+pre_remove() {
+[ -x usr/bin/install-info ] || return 0
+for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+done
+}
[arch-commits] Commit in liblouis/repos (8 files)
Date: Monday, July 6, 2015 @ 22:56:51
Author: guillaume
Revision: 241849
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
liblouis/repos/extra-i686/PKGBUILD
(from rev 241848, liblouis/trunk/PKGBUILD)
liblouis/repos/extra-i686/liblouis.install
(from rev 241848, liblouis/trunk/liblouis.install)
liblouis/repos/extra-x86_64/PKGBUILD
(from rev 241848, liblouis/trunk/PKGBUILD)
liblouis/repos/extra-x86_64/liblouis.install
(from rev 241848, liblouis/trunk/liblouis.install)
Deleted:
liblouis/repos/extra-i686/PKGBUILD
liblouis/repos/extra-i686/liblouis.install
liblouis/repos/extra-x86_64/PKGBUILD
liblouis/repos/extra-x86_64/liblouis.install
---+
/PKGBUILD | 64
/liblouis.install | 40 +
extra-i686/PKGBUILD | 32
extra-i686/liblouis.install | 20
extra-x86_64/PKGBUILD | 32
extra-x86_64/liblouis.install | 20
6 files changed, 104 insertions(+), 104 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-07-06 20:55:32 UTC (rev 241848)
+++ extra-i686/PKGBUILD 2015-07-06 20:56:51 UTC (rev 241849)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-pkgname=liblouis
-pkgver=2.5.2
-pkgrel=3
-pkgdesc=Open-source braille translator and back-translator
-arch=(i686 x86_64)
-url=http://code.google.com/p/liblouis/;
-license=('GPL3')
-depends=(glibc)
-makedepends=(help2man python2 python)
-install=liblouis.install
-source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=(' 93437f3c3a9a178ad08bdf6daca2a82cf3df2cc2')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-
- cd python
- LD_PRELOAD+=:$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so
- python2 setup.py install --root=$pkgdir --prefix=/usr --optimize=1
- python setup.py install --root=$pkgdir --prefix=/usr --optimize=1
-}
-# vim:set ts=2 sw=2 et:
Copied: liblouis/repos/extra-i686/PKGBUILD (from rev 241848,
liblouis/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-07-06 20:56:51 UTC (rev 241849)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+pkgname=liblouis
+pkgver=2.6.3
+pkgrel=1
+pkgdesc=Open-source braille translator and back-translator
+arch=(i686 x86_64)
+url=http://liblouis.org/;
+license=('GPL3')
+depends=(glibc)
+makedepends=(help2man python2 python)
+install=liblouis.install
+source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha1sums=('b4673678966efcc140ead49aab5e975280b815ce')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ cd python
+ LD_PRELOAD+=:$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so
+ python2 setup.py install --root=$pkgdir --prefix=/usr --optimize=1
+ python setup.py install --root=$pkgdir --prefix=/usr --optimize=1
+}
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/liblouis.install
===
--- extra-i686/liblouis.install 2015-07-06 20:55:32 UTC (rev 241848)
+++ extra-i686/liblouis.install 2015-07-06 20:56:51 UTC (rev 241849)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(liblouis.info)
-
-post_install() {
-[ -x usr/bin/install-info ] || return 0
-for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2 /dev/null
-done
-}
-
-post_upgrade() {
-post_install $1
-}
-
-pre_remove() {
-[ -x usr/bin/install-info ] || return 0
-for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
-done
-}
Copied: liblouis/repos/extra-i686/liblouis.install (from rev 241848,
liblouis/trunk/liblouis.install)
===
--- extra-i686/liblouis.install (rev 0)
+++ extra-i686/liblouis.install 2015-07-06 20:56:51 UTC (rev 241849)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(liblouis.info)
+
+post_install() {
+[ -x usr/bin/install-info ] || return 0
+for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+done
+}
+
+post_upgrade() {
+post_install $1
+}
+
+pre_remove() {
+[ -x usr/bin/install-info ] || return 0
+for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+done
+}
Deleted: extra-x86_64/PKGBUILD
[arch-commits] Commit in liblouis/trunk (PKGBUILD)
Date: Monday, July 6, 2015 @ 22:54:12
Author: guillaume
Revision: 241847
Upstream release 2.6.3
Modified:
liblouis/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-06 18:04:36 UTC (rev 241846)
+++ PKGBUILD2015-07-06 20:54:12 UTC (rev 241847)
@@ -2,17 +2,17 @@
# Maintainer: Ionut Biru ib...@archlinux.org
pkgname=liblouis
-pkgver=2.5.2
-pkgrel=3
+pkgver=2.6.3
+pkgrel=1
pkgdesc=Open-source braille translator and back-translator
arch=(i686 x86_64)
-url=http://code.google.com/p/liblouis/;
+url=http://liblouis.org/;
license=('GPL3')
depends=(glibc)
makedepends=(help2man python2 python)
install=liblouis.install
-source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=(' 93437f3c3a9a178ad08bdf6daca2a82cf3df2cc2')
+source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha1sums=('b4673678966efcc140ead49aab5e975280b815ce')
build() {
cd $srcdir/$pkgname-$pkgver
[arch-commits] Commit in apache-ant/repos/extra-any (12 files)
Date: Friday, July 3, 2015 @ 09:52:23
Author: guillaume
Revision: 241730
archrelease: copy trunk to extra-any
Added:
apache-ant/repos/extra-any/PKGBUILD
(from rev 241729, apache-ant/trunk/PKGBUILD)
apache-ant/repos/extra-any/ant.conf
(from rev 241729, apache-ant/trunk/ant.conf)
apache-ant/repos/extra-any/apache-ant.csh
(from rev 241729, apache-ant/trunk/apache-ant.csh)
apache-ant/repos/extra-any/apache-ant.install
(from rev 241729, apache-ant/trunk/apache-ant.install)
apache-ant/repos/extra-any/apache-ant.sh
(from rev 241729, apache-ant/trunk/apache-ant.sh)
apache-ant/repos/extra-any/bin_ant
(from rev 241729, apache-ant/trunk/bin_ant)
Deleted:
apache-ant/repos/extra-any/PKGBUILD
apache-ant/repos/extra-any/ant.conf
apache-ant/repos/extra-any/apache-ant.csh
apache-ant/repos/extra-any/apache-ant.install
apache-ant/repos/extra-any/apache-ant.sh
apache-ant/repos/extra-any/bin_ant
+
PKGBUILD | 176 +--
ant.conf |8 +-
apache-ant.csh |2
apache-ant.install | 22 +++---
apache-ant.sh |2
bin_ant| 12 +--
6 files changed, 111 insertions(+), 111 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-07-03 07:44:55 UTC (rev 241729)
+++ PKGBUILD2015-07-03 07:52:23 UTC (rev 241730)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-# Contributor: Paul Mattal p...@archlinux.org
-pkgbase=apache-ant
-pkgname=('apache-ant' 'apache-ant-doc')
-pkgver=1.9.5
-pkgrel=1
-arch=('any')
-url='http://ant.apache.org/'
-license=('APACHE')
-makedepends=('java-environment' 'apache-ant' 'junit')
-source=(http://apache.org/dist/ant/source/${pkgbase}-${pkgver}-src.tar.bz2
-apache-ant.sh
-apache-ant.csh
-apache-ant.install
-bin_ant
-ant.conf)
-sha256sums=('a4a9c797597ffab321384afa06286e37d75449b74940b3e683a4b695f6fc'
-'182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718'
-'919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995'
-'3de451d0f963ba96e83f4e068a8325e3d4fc42b1e5c4818e9d7962ed4f5393b3'
-'29b443ae3af7e246b4ff0b5ec9f023ae95992db1a010a362e70ca7a65a6df461'
-'b86ce60f61cbd85a9faa61d698b0fc4607f1ff375cd15673aee57f053012eacb')
-
-_ant_home=/usr/share/${pkgbase}
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- # ant needs HOME to download libs to $HOME/.m2/repository
- export ANT_OPTS=-Duser.home=${srcdir}
- ant -Ddest=optional -f fetch.xml
-
- rm lib/optional/junit-4.11.jar
- ln -s /usr/share/java/junit.jar lib/optional/junit-4.11.jar
- rm lib/optional/hamcrest-core-1.3.jar
- ln -s /usr/share/java/hamcrest-core.jar lib/optional/hamcrest-core-1.3.jar
-
- ant dist
-}
-
-package_apache-ant() {
- pkgdesc='A java-based build tool'
- depends=('java-environment')
- optdepends=('junit: to use the junit tasks')
- install=apache-ant.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}
-
- install -dm755 ${pkgdir}${_ant_home}
-
- install -dm755 ${pkgdir}/etc/${pkgbase}
- cp -Rp etc/* ${pkgdir}/etc/${pkgbase}
- rm ${pkgdir}/etc/${pkgbase}/ant-bootstrap.jar
- ln -s /etc/${pkgbase} ${pkgdir}${_ant_home}/etc
-
- install -dm755 ${pkgdir}${_ant_home}/bin
- find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
--exec install -m755 {} ${pkgdir}${_ant_home}/bin \;
-
- install -Dm755 ${srcdir}/bin_ant ${pkgdir}/usr/bin/ant
- install -Dm644 ${srcdir}/ant.conf ${pkgdir}/etc/apache-ant/ant.conf
-
- install -dm755 ${pkgdir}/usr/share/java/${pkgbase}
- install -m644 lib/*.jar ${pkgdir}/usr/share/java/${pkgbase}
- ln -s /usr/share/java/${pkgbase} ${pkgdir}${_ant_home}/lib
-
- # fix python2 path
- sed -i 's|/usr/bin/python|/usr/bin/python2|'
${pkgdir}${_ant_home}/bin/runant.py
-
- # install profile.d script
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/apache-ant.{csh,sh} ${pkgdir}/etc/profile.d/
-
- # License says NOTICE file should be redistributed for derivative works
- cd ${srcdir}/${pkgbase}-${pkgver}
- install -dm755 ${pkgdir}/usr/share/licenses/${pkgbase}
- install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgbase}
-}
-
-package_apache-ant-doc() {
- pkgdesc='Apache Ant build tool documentation'
-
- install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}
- cp -r ${srcdir}/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}/manual/* \
-${pkgdir}/usr/share/doc/${pkgbase}/
-}
Copied: apache-ant/repos/extra-any/PKGBUILD (from rev 241729,
apache-ant/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-07-03 07:52:23 UTC (rev 241730)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor
[arch-commits] Commit in apache-ant/trunk (PKGBUILD)
Date: Friday, July 3, 2015 @ 09:44:55
Author: guillaume
Revision: 241729
Upstream release 1.9.6
Modified:
apache-ant/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-03 05:50:23 UTC (rev 241728)
+++ PKGBUILD2015-07-03 07:44:55 UTC (rev 241729)
@@ -4,7 +4,7 @@
# Contributor: Paul Mattal p...@archlinux.org
pkgbase=apache-ant
pkgname=('apache-ant' 'apache-ant-doc')
-pkgver=1.9.5
+pkgver=1.9.6
pkgrel=1
arch=('any')
url='http://ant.apache.org/'
@@ -16,7 +16,7 @@
apache-ant.install
bin_ant
ant.conf)
-sha256sums=('a4a9c797597ffab321384afa06286e37d75449b74940b3e683a4b695f6fc'
+sha256sums=('2ad98dd3a4805452e546e0f5b682360370ae11692a2157fff8ec6d177c957123'
'182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718'
'919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995'
'3de451d0f963ba96e83f4e068a8325e3d4fc42b1e5c4818e9d7962ed4f5393b3'
[arch-commits] Commit in java7-openjdk/trunk (hotspot_fix_memory_leak.diff)
Date: Monday, June 29, 2015 @ 09:58:11
Author: guillaume
Revision: 241389
Add hotspot_fix_memory_leak.diff to SVN
Added:
java7-openjdk/trunk/hotspot_fix_memory_leak.diff
--+
hotspot_fix_memory_leak.diff | 46 +
1 file changed, 46 insertions(+)
Added: hotspot_fix_memory_leak.diff
===
--- hotspot_fix_memory_leak.diff(rev 0)
+++ hotspot_fix_memory_leak.diff2015-06-29 07:58:11 UTC (rev 241389)
@@ -0,0 +1,46 @@
+
+# HG changeset patch
+# User sgehwolf
+# Date 1430335428 25200
+# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b
+# Parent cd8fe1a9205aedb6b5a1fc16e664412e48aee565
+8078666: JVM fastdebug build compiled with GCC 5 asserts with widen increases
+Summary: do the math on the unsigned type where overflows are well defined
+Reviewed-by: kvn, aph
+
+diff -r cd8fe1a9205a -r 2a55e4998f0d src/share/vm/opto/type.cpp
+--- openjdk/hotspot/src/share/vm/opto/type.cpp Wed Jun 10 20:15:29 2015 -0400
openjdk/hotspot/src/share/vm/opto/type.cpp Wed Apr 29 12:23:48 2015 -0700
+@@ -1180,11 +1180,11 @@
+ // Certain normalizations keep us sane when comparing types.
+ // The 'SMALLINT' covers constants and also CC and its relatives.
+ if (lo = hi) {
+-if ((juint)(hi - lo) = SMALLINT) w = Type::WidenMin;
+-if ((juint)(hi - lo) = max_juint) w = Type::WidenMax; // TypeInt::INT
++if (((juint)hi - lo) = SMALLINT) w = Type::WidenMin;
++if (((juint)hi - lo) = max_juint) w = Type::WidenMax; // TypeInt::INT
+ } else {
+-if ((juint)(lo - hi) = SMALLINT) w = Type::WidenMin;
+-if ((juint)(lo - hi) = max_juint) w = Type::WidenMin; // dual
TypeInt::INT
++if (((juint)lo - hi) = SMALLINT) w = Type::WidenMin;
++if (((juint)lo - hi) = max_juint) w = Type::WidenMin; // dual
TypeInt::INT
+ }
+ return w;
+ }
+@@ -1438,11 +1438,11 @@
+ // Certain normalizations keep us sane when comparing types.
+ // The 'SMALLINT' covers constants.
+ if (lo = hi) {
+-if ((julong)(hi - lo) = SMALLINT) w = Type::WidenMin;
+-if ((julong)(hi - lo) = max_julong) w = Type::WidenMax; // TypeLong::LONG
++if (((julong)hi - lo) = SMALLINT) w = Type::WidenMin;
++if (((julong)hi - lo) = max_julong) w = Type::WidenMax; // TypeLong::LONG
+ } else {
+-if ((julong)(lo - hi) = SMALLINT) w = Type::WidenMin;
+-if ((julong)(lo - hi) = max_julong) w = Type::WidenMin; // dual
TypeLong::LONG
++if (((julong)lo - hi) = SMALLINT) w = Type::WidenMin;
++if (((julong)lo - hi) = max_julong) w = Type::WidenMin; // dual
TypeLong::LONG
+ }
+ return w;
+ }
+
[arch-commits] Commit in tomcat8/repos/extra-any (10 files)
Date: Sunday, June 28, 2015 @ 20:47:38
Author: guillaume
Revision: 241383
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 241382, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
(from rev 241382, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 241382, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 241382, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 241382, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat8.conf |2
systemd_tmpfiles.d_tomcat8.conf | 10 +-
systemd_tomcat8.service | 66
tomcat8.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-06-28 18:47:02 UTC (rev 241382)
+++ PKGBUILD2015-06-28 18:47:38 UTC (rev 241383)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.22
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('cb163576d03f45981bf025b62b46e71c3c634584daa4662fc721d37d46989eff'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
-'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Sunday, June 28, 2015 @ 20:47:02
Author: guillaume
Revision: 241382
Upstream release 8.0.23
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-28 17:03:42 UTC (rev 241381)
+++ PKGBUILD2015-06-28 18:47:02 UTC (rev 241382)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
-pkgver=8.0.22
+pkgver=8.0.23
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('cb163576d03f45981bf025b62b46e71c3c634584daa4662fc721d37d46989eff'
+sha256sums=('c98b19a1edaaef2859991f304d0ec8f29c5ccacc6d63a0bc8bf7078d63191a38'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Thursday, June 25, 2015 @ 22:30:11
Author: guillaume
Revision: 241283
Add patch to fix hotspot memory leak
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-25 20:01:34 UTC (rev 241282)
+++ PKGBUILD2015-06-25 20:30:11 UTC (rev 241283)
@@ -39,7 +39,8 @@
icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
openjdk7_nonreparenting-wm.diff
-icedtea-7.2.5.5-gcc5.diff)
+icedtea-7.2.5.5-gcc5.diff
+hotspot_fix_memory_leak.diff)
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
@@ -53,7 +54,8 @@
'd724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
-'49f8b65e24f6e6c8afa9e48b11f6e1675ef2c5d3bfe31fd7d73c8de1f4150cf2')
+'49f8b65e24f6e6c8afa9e48b11f6e1675ef2c5d3bfe31fd7d73c8de1f4150cf2'
+'0de78abc8ff96e11ba3ad43f1e8194c26c5d06363cb5b7c8aa660e1ea21127a1')
noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -86,7 +88,8 @@
cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES=patches/fontconfig-paths.diff \
patches/openjdk7_nonreparenting-wm.diff \
- patches/icedtea-7.2.5.5-gcc5.diff
+ patches/icedtea-7.2.5.5-gcc5.diff \
+ patches/hotspot_fix_memory_leak.diff
if [ $_bootstrap = 1 ]; then
BOOTSTRAPOPT=--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar
[arch-commits] Commit in java8-openjdk/trunk (2 files)
Date: Sunday, June 21, 2015 @ 23:33:13
Author: guillaume
Revision: 241170
Add upstream patch to fix OOM
Added:
java8-openjdk/trunk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
Modified:
java8-openjdk/trunk/PKGBUILD
+
JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch |
46 ++
PKGBUILD |
13 +-
2 files changed, 55 insertions(+), 4 deletions(-)
Added:
JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
===
--- JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
(rev 0)
+++ JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
2015-06-21 21:33:13 UTC (rev 241170)
@@ -0,0 +1,46 @@
+
+# HG changeset patch
+# User sgehwolf
+# Date 1430335428 25200
+# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b
+# Parent cd8fe1a9205aedb6b5a1fc16e664412e48aee565
+8078666: JVM fastdebug build compiled with GCC 5 asserts with widen increases
+Summary: do the math on the unsigned type where overflows are well defined
+Reviewed-by: kvn, aph
+
+diff -r cd8fe1a9205a -r 2a55e4998f0d src/share/vm/opto/type.cpp
+--- a/src/share/vm/opto/type.cpp Wed Jun 10 20:15:29 2015 -0400
b/src/share/vm/opto/type.cpp Wed Apr 29 12:23:48 2015 -0700
+@@ -1180,11 +1180,11 @@
+ // Certain normalizations keep us sane when comparing types.
+ // The 'SMALLINT' covers constants and also CC and its relatives.
+ if (lo = hi) {
+-if ((juint)(hi - lo) = SMALLINT) w = Type::WidenMin;
+-if ((juint)(hi - lo) = max_juint) w = Type::WidenMax; // TypeInt::INT
++if (((juint)hi - lo) = SMALLINT) w = Type::WidenMin;
++if (((juint)hi - lo) = max_juint) w = Type::WidenMax; // TypeInt::INT
+ } else {
+-if ((juint)(lo - hi) = SMALLINT) w = Type::WidenMin;
+-if ((juint)(lo - hi) = max_juint) w = Type::WidenMin; // dual
TypeInt::INT
++if (((juint)lo - hi) = SMALLINT) w = Type::WidenMin;
++if (((juint)lo - hi) = max_juint) w = Type::WidenMin; // dual
TypeInt::INT
+ }
+ return w;
+ }
+@@ -1438,11 +1438,11 @@
+ // Certain normalizations keep us sane when comparing types.
+ // The 'SMALLINT' covers constants.
+ if (lo = hi) {
+-if ((julong)(hi - lo) = SMALLINT) w = Type::WidenMin;
+-if ((julong)(hi - lo) = max_julong) w = Type::WidenMax; // TypeLong::LONG
++if (((julong)hi - lo) = SMALLINT) w = Type::WidenMin;
++if (((julong)hi - lo) = max_julong) w = Type::WidenMax; // TypeLong::LONG
+ } else {
+-if ((julong)(lo - hi) = SMALLINT) w = Type::WidenMin;
+-if ((julong)(lo - hi) = max_julong) w = Type::WidenMin; // dual
TypeLong::LONG
++if (((julong)lo - hi) = SMALLINT) w = Type::WidenMin;
++if (((julong)lo - hi) = max_julong) w = Type::WidenMin; // dual
TypeLong::LONG
+ }
+ return w;
+ }
+
Modified: PKGBUILD
===
--- PKGBUILD2015-06-21 21:13:49 UTC (rev 241169)
+++ PKGBUILD2015-06-21 21:33:13 UTC (rev 241170)
@@ -29,7 +29,8 @@
jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
-JDK-8074312-hotspot.patch)
+JDK-8074312-hotspot.patch
+
JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch)
sha256sums=('b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2'
'6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de'
@@ -39,7 +40,8 @@
'c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976'
'eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9'
'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9'
-'95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50')
+'95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50'
+'8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05')
case ${CARCH} in
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -63,9 +65,12 @@
ln -s ../${subrepo}-${_repo_ver} ${subrepo}
done
+ cd ${srcdir}/hotspot-${_repo_ver}
# https://bugs.openjdk.java.net/browse/JDK-8074312
- cd ${srcdir}/hotspot-${_repo_ver}
- patch -p1 ${srcdir}/JDK-8074312-hotspot.patch
+ patch -p1 ${srcdir}/JDK-8074312-hotspot.patch
+ # https://bugs.archlinux.org/task/45386
+ # https://bugs.openjdk.java.net/browse/JDK-8078666
+ patch -p1
${srcdir}/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
}
build() {
[arch-commits] Commit in java8-openjdk/trunk (JDK-8074312-hotspot.patch PKGBUILD)
Date: Sunday, June 21, 2015 @ 23:13:49
Author: guillaume
Revision: 241169
Add patch to fix build with linux4
Added:
java8-openjdk/trunk/JDK-8074312-hotspot.patch
Modified:
java8-openjdk/trunk/PKGBUILD
---+
JDK-8074312-hotspot.patch | 12
PKGBUILD | 10 --
2 files changed, 20 insertions(+), 2 deletions(-)
Added: JDK-8074312-hotspot.patch
===
--- JDK-8074312-hotspot.patch (rev 0)
+++ JDK-8074312-hotspot.patch 2015-06-21 21:13:49 UTC (rev 241169)
@@ -0,0 +1,12 @@
+diff -r 61edd5c7412e make/linux/Makefile
+--- a/make/linux/Makefile Mon Mar 02 18:12:06 2015 +
b/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100
+@@ -233,7 +233,7 @@
+ # Solaris 2.5.1, 2.6).
+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
+
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
+ OS_VERSION := $(shell uname -r)
+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
+
Modified: PKGBUILD
===
--- PKGBUILD2015-06-21 20:51:27 UTC (rev 241168)
+++ PKGBUILD2015-06-21 21:13:49 UTC (rev 241169)
@@ -28,7 +28,8 @@
jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
-
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
+
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
+JDK-8074312-hotspot.patch)
sha256sums=('b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2'
'6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de'
@@ -37,7 +38,8 @@
'e6f6233c26335536436de89ebf741df8b142119d8b41abc34c3287dd155a43bb'
'c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976'
'eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9'
-'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9')
+'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9'
+'95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50')
case ${CARCH} in
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -60,6 +62,10 @@
do
ln -s ../${subrepo}-${_repo_ver} ${subrepo}
done
+
+ # https://bugs.openjdk.java.net/browse/JDK-8074312
+ cd ${srcdir}/hotspot-${_repo_ver}
+ patch -p1 ${srcdir}/JDK-8074312-hotspot.patch
}
build() {
[arch-commits] Commit in apache-ant/repos/extra-any (12 files)
Date: Friday, June 5, 2015 @ 10:04:03
Author: guillaume
Revision: 240364
archrelease: copy trunk to extra-any
Added:
apache-ant/repos/extra-any/PKGBUILD
(from rev 240363, apache-ant/trunk/PKGBUILD)
apache-ant/repos/extra-any/ant.conf
(from rev 240363, apache-ant/trunk/ant.conf)
apache-ant/repos/extra-any/apache-ant.csh
(from rev 240363, apache-ant/trunk/apache-ant.csh)
apache-ant/repos/extra-any/apache-ant.install
(from rev 240363, apache-ant/trunk/apache-ant.install)
apache-ant/repos/extra-any/apache-ant.sh
(from rev 240363, apache-ant/trunk/apache-ant.sh)
apache-ant/repos/extra-any/bin_ant
(from rev 240363, apache-ant/trunk/bin_ant)
Deleted:
apache-ant/repos/extra-any/PKGBUILD
apache-ant/repos/extra-any/ant.conf
apache-ant/repos/extra-any/apache-ant.csh
apache-ant/repos/extra-any/apache-ant.install
apache-ant/repos/extra-any/apache-ant.sh
apache-ant/repos/extra-any/bin_ant
+
PKGBUILD | 176 +--
ant.conf |8 +-
apache-ant.csh |2
apache-ant.install | 22 +++---
apache-ant.sh |2
bin_ant| 12 +--
6 files changed, 111 insertions(+), 111 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-06-05 08:03:03 UTC (rev 240363)
+++ PKGBUILD2015-06-05 08:04:03 UTC (rev 240364)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-# Contributor: Paul Mattal p...@archlinux.org
-pkgbase=apache-ant
-pkgname=('apache-ant' 'apache-ant-doc')
-pkgver=1.9.4
-pkgrel=3
-arch=('any')
-url='http://ant.apache.org/'
-license=('APACHE')
-makedepends=('java-environment' 'apache-ant' 'junit')
-source=(http://apache.org/dist/ant/source/${pkgbase}-${pkgver}-src.tar.bz2
-apache-ant.sh
-apache-ant.csh
-apache-ant.install
-bin_ant
-ant.conf)
-sha256sums=('ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c'
-'182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718'
-'919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995'
-'3de451d0f963ba96e83f4e068a8325e3d4fc42b1e5c4818e9d7962ed4f5393b3'
-'29b443ae3af7e246b4ff0b5ec9f023ae95992db1a010a362e70ca7a65a6df461'
-'b86ce60f61cbd85a9faa61d698b0fc4607f1ff375cd15673aee57f053012eacb')
-
-_ant_home=/usr/share/${pkgbase}
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- # ant needs HOME to download libs to $HOME/.m2/repository
- export ANT_OPTS=-Duser.home=${srcdir}
- ant -Ddest=optional -f fetch.xml
-
- rm lib/optional/junit-4.11.jar
- ln -s /usr/share/java/junit.jar lib/optional/junit-4.11.jar
- rm lib/optional/hamcrest-core-1.3.jar
- ln -s /usr/share/java/hamcrest-core.jar lib/optional/hamcrest-core-1.3.jar
-
- ant dist
-}
-
-package_apache-ant() {
- pkgdesc='A java-based build tool'
- depends=('java-environment')
- optdepends=('junit: to use the junit tasks')
- install=apache-ant.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}
-
- install -dm755 ${pkgdir}${_ant_home}
-
- install -dm755 ${pkgdir}/etc/${pkgbase}
- cp -Rp etc/* ${pkgdir}/etc/${pkgbase}
- rm ${pkgdir}/etc/${pkgbase}/ant-bootstrap.jar
- ln -s /etc/${pkgbase} ${pkgdir}${_ant_home}/etc
-
- install -dm755 ${pkgdir}${_ant_home}/bin
- find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
--exec install -m755 {} ${pkgdir}${_ant_home}/bin \;
-
- install -Dm755 ${srcdir}/bin_ant ${pkgdir}/usr/bin/ant
- install -Dm644 ${srcdir}/ant.conf ${pkgdir}/etc/apache-ant/ant.conf
-
- install -dm755 ${pkgdir}/usr/share/java/${pkgbase}
- install -m644 lib/*.jar ${pkgdir}/usr/share/java/${pkgbase}
- ln -s /usr/share/java/${pkgbase} ${pkgdir}${_ant_home}/lib
-
- # fix python2 path
- sed -i 's|/usr/bin/python|/usr/bin/python2|'
${pkgdir}${_ant_home}/bin/runant.py
-
- # install profile.d script
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/apache-ant.{csh,sh} ${pkgdir}/etc/profile.d/
-
- # License says NOTICE file should be redistributed for derivative works
- cd ${srcdir}/${pkgbase}-${pkgver}
- install -dm755 ${pkgdir}/usr/share/licenses/${pkgbase}
- install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgbase}
-}
-
-package_apache-ant-doc() {
- pkgdesc='Apache Ant build tool documentation'
-
- install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}
- cp -r ${srcdir}/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}/manual/* \
-${pkgdir}/usr/share/doc/${pkgbase}/
-}
Copied: apache-ant/repos/extra-any/PKGBUILD (from rev 240363,
apache-ant/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-06-05 08:04:03 UTC (rev 240364)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor
[arch-commits] Commit in apache-ant/trunk (PKGBUILD)
Date: Friday, June 5, 2015 @ 10:03:03
Author: guillaume
Revision: 240363
Upstream release 1.9.5
Modified:
apache-ant/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-05 06:22:12 UTC (rev 240362)
+++ PKGBUILD2015-06-05 08:03:03 UTC (rev 240363)
@@ -4,8 +4,8 @@
# Contributor: Paul Mattal p...@archlinux.org
pkgbase=apache-ant
pkgname=('apache-ant' 'apache-ant-doc')
-pkgver=1.9.4
-pkgrel=3
+pkgver=1.9.5
+pkgrel=1
arch=('any')
url='http://ant.apache.org/'
license=('APACHE')
@@ -16,7 +16,7 @@
apache-ant.install
bin_ant
ant.conf)
-sha256sums=('ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c'
+sha256sums=('a4a9c797597ffab321384afa06286e37d75449b74940b3e683a4b695f6fc'
'182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718'
'919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995'
'3de451d0f963ba96e83f4e068a8325e3d4fc42b1e5c4818e9d7962ed4f5393b3'
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD icedtea-7.2.5.5-gcc5.diff)
Date: Monday, June 1, 2015 @ 22:58:11
Author: guillaume
Revision: 239998
Add patch to fix build with latest g++5
Added:
java7-openjdk/trunk/icedtea-7.2.5.5-gcc5.diff
Modified:
java7-openjdk/trunk/PKGBUILD
---+
PKGBUILD | 13 ++---
icedtea-7.2.5.5-gcc5.diff | 41 +
2 files changed, 51 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-01 18:56:55 UTC (rev 239997)
+++ PKGBUILD2015-06-01 20:58:11 UTC (rev 239998)
@@ -38,8 +38,11 @@
icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
-openjdk7_nonreparenting-wm.diff)
+openjdk7_nonreparenting-wm.diff
+icedtea-7.2.5.5-gcc5.diff)
+# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
+
sha256sums=('f05b1db06021f4cd3a39647f358a47130136d189431fb55f79855f627b1d6619'
'5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d'
'f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51'
@@ -49,7 +52,8 @@
'71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660'
'd724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
+'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
+'49f8b65e24f6e6c8afa9e48b11f6e1675ef2c5d3bfe31fd7d73c8de1f4150cf2')
noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -69,6 +73,8 @@
lib/${_JARCH}/libsplashscreen.so
lib/${_JARCH}/xawt/libmawt.so)
+
+
build() {
cd ${srcdir}/icedtea-${_icedtea_ver}
@@ -79,7 +85,8 @@
cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES=patches/fontconfig-paths.diff \
- patches/openjdk7_nonreparenting-wm.diff
+ patches/openjdk7_nonreparenting-wm.diff \
+ patches/icedtea-7.2.5.5-gcc5.diff
if [ $_bootstrap = 1 ]; then
BOOTSTRAPOPT=--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar
Added: icedtea-7.2.5.5-gcc5.diff
===
--- icedtea-7.2.5.5-gcc5.diff (rev 0)
+++ icedtea-7.2.5.5-gcc5.diff 2015-06-01 20:58:11 UTC (rev 239998)
@@ -0,0 +1,41 @@
+---
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
Thu Jun 26 10:00:00 2014 +0200
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
Thu Jun 26 13:20:18 2014 +0200
+@@ -66,6 +66,17 @@
+ }
+ }
+
++void G1SATBCardTableModRefBS::write_ref_array_pre(oop* dst, int count, bool
dest_uninitialized) {
++ if (!dest_uninitialized) {
++write_ref_array_pre_work(dst, count);
++ }
++}
++void G1SATBCardTableModRefBS::write_ref_array_pre(narrowOop* dst, int count,
bool dest_uninitialized) {
++ if (!dest_uninitialized) {
++write_ref_array_pre_work(dst, count);
++ }
++}
++
+ bool G1SATBCardTableModRefBS::mark_card_deferred(size_t card_index) {
+ jbyte val = _byte_map[card_index];
+ // It's already processed
+---
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
Thu Jun 26 10:00:00 2014 +0200
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
Thu Jun 26 13:20:18 2014 +0200
+@@ -86,16 +86,8 @@
+ }
+
+ template class T void write_ref_array_pre_work(T* dst, int count);
+- virtual void write_ref_array_pre(oop* dst, int count, bool
dest_uninitialized) {
+-if (!dest_uninitialized) {
+- write_ref_array_pre_work(dst, count);
+-}
+- }
+- virtual void write_ref_array_pre(narrowOop* dst, int count, bool
dest_uninitialized) {
+-if (!dest_uninitialized) {
+- write_ref_array_pre_work(dst, count);
+-}
+- }
++ virtual void write_ref_array_pre(oop* dst, int count, bool
dest_uninitialized);
++ virtual void write_ref_array_pre(narrowOop* dst, int count, bool
dest_uninitialized);
+
+ /*
+Claimed and deferred bits are used together in G1 during the evacuation
[arch-commits] Commit in java8-openjdk/trunk (PKGBUILD)
Date: Saturday, May 30, 2015 @ 19:02:33
Author: guillaume
Revision: 239933
Add optdepends to java-openjfx
Modified:
java8-openjdk/trunk/PKGBUILD
--+
PKGBUILD |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-30 16:26:19 UTC (rev 239932)
+++ PKGBUILD2015-05-30 17:02:33 UTC (rev 239933)
@@ -6,6 +6,7 @@
# pulse
# add policytool desktop files
+# Package 'openjfx' must be updated when this one is
pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src'
'openjdk8-doc')
pkgbase=java8-openjdk
_java_ver=8
@@ -185,7 +186,8 @@
depends=(jre8-openjdk-headless=${pkgver}-${pkgrel} 'xdg-utils'
'hicolor-icon-theme')
optdepends=('icedtea-web: web browser plugin + Java Web Start'
'alsa-lib: for basic sound support'
- 'gtk2: for the Gtk+ look and feel - desktop usage')
+ 'gtk2: for the Gtk+ look and feel - desktop usage'
+ 'java-openjfx: for JavaFX GUI components support')
# TODO when adding IcedTea: 'giflib: for gif format support'
# TODO when adding IcedTea: 'libpulse: for advanced sound support'
provides=('java-runtime=8' 'java-runtime-openjdk=8')
[arch-commits] Commit in swt/trunk (PKGBUILD)
Date: Saturday, May 30, 2015 @ 20:12:56
Author: guillaume
Revision: 239945
Upstream release 4.4.2
Modified:
swt/trunk/PKGBUILD
--+
PKGBUILD | 30 ++
1 file changed, 14 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-30 18:01:22 UTC (rev 239944)
+++ PKGBUILD2015-05-30 18:12:56 UTC (rev 239945)
@@ -1,9 +1,10 @@
# $Id$
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=swt
-pkgver=4.4
+# http://download.eclipse.org/eclipse/downloads/drops4
+pkgver=4.4.2
pkgrel=1
-_date=201406061215
+_date=201502041700
pkgdesc='An open source widget toolkit for Java'
arch=('i686' 'x86_64')
url='http://www.eclipse.org/swt/'
@@ -11,19 +12,16 @@
depends=('java-runtime=6' 'gtk2=2.20.1' 'libxtst')
optdepends=('libgnomeui' 'glu' 'webkitgtk2')
makedepends=('java-environment' 'libxtst' 'glu' 'libgnomeui' 'unzip'
'pkgconfig' 'webkitgtk2' 'apache-ant')
-if [ ${CARCH} = i686 ]; then
- _carch=x86
-
sha256sums=('c11ba885bed2716e22291401001859404c696b3e72dafd87ea44ff99588bbd5b'
-
'6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
-fi
-if [ ${CARCH} = x86_64 ]; then
- _carch=x86_64
-
sha256sums=('90fdbd56c74c1e63aa1fd781f1ca54aa24623aeedf8b5f2e15dff91abf98a7b4'
-
'6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
-fi
-source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
-build-swt.xml)
-# To test this pkg:
+
+source=(build-swt.xml)
+source_i686=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
+source_x86_64=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip)
+
+sha256sums=('6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
+sha256sums_i686=('48f2ff63217d20a2abe3ce083f4e04da75aa6f9fa5675b1dd2a57e3151c6fe53')
+sha256sums_x86_64=('fdfd66d4c2d5c92a2d505961b8e1738bedbdda0e910e45dafc2bd568c146307c')
+
+# These examples don't even run anymore (Try Tux Guitar instead)!
# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
# http://download.eclipse.org/eclipse/downloads/
@@ -33,7 +31,7 @@
cd ${srcdir}
unzip -oq src.zip -d src
- . /etc/profile.d/jdk.sh
+ export JAVA_HOME=/usr/lib/jvm/default
. /etc/profile.d/apache-ant.sh
# Shared objects
[arch-commits] Commit in swt/repos (8 files)
Date: Saturday, May 30, 2015 @ 20:13:30
Author: guillaume
Revision: 239946
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
swt/repos/extra-i686/PKGBUILD
(from rev 239945, swt/trunk/PKGBUILD)
swt/repos/extra-i686/build-swt.xml
(from rev 239945, swt/trunk/build-swt.xml)
swt/repos/extra-x86_64/PKGBUILD
(from rev 239945, swt/trunk/PKGBUILD)
swt/repos/extra-x86_64/build-swt.xml
(from rev 239945, swt/trunk/build-swt.xml)
Deleted:
swt/repos/extra-i686/PKGBUILD
swt/repos/extra-i686/build-swt.xml
swt/repos/extra-x86_64/PKGBUILD
swt/repos/extra-x86_64/build-swt.xml
+
/PKGBUILD | 114 +++
/build-swt.xml | 34
extra-i686/PKGBUILD| 59 --
extra-i686/build-swt.xml | 17 --
extra-x86_64/PKGBUILD | 59 --
extra-x86_64/build-swt.xml | 17 --
6 files changed, 148 insertions(+), 152 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-05-30 18:12:56 UTC (rev 239945)
+++ extra-i686/PKGBUILD 2015-05-30 18:13:30 UTC (rev 239946)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=swt
-pkgver=4.4
-pkgrel=1
-_date=201406061215
-pkgdesc='An open source widget toolkit for Java'
-arch=('i686' 'x86_64')
-url='http://www.eclipse.org/swt/'
-license=('EPL')
-depends=('java-runtime=6' 'gtk2=2.20.1' 'libxtst')
-optdepends=('libgnomeui' 'glu' 'webkitgtk2')
-makedepends=('java-environment' 'libxtst' 'glu' 'libgnomeui' 'unzip'
'pkgconfig' 'webkitgtk2' 'apache-ant')
-if [ ${CARCH} = i686 ]; then
- _carch=x86
-
sha256sums=('c11ba885bed2716e22291401001859404c696b3e72dafd87ea44ff99588bbd5b'
-
'6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
-fi
-if [ ${CARCH} = x86_64 ]; then
- _carch=x86_64
-
sha256sums=('90fdbd56c74c1e63aa1fd781f1ca54aa24623aeedf8b5f2e15dff91abf98a7b4'
-
'6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
-fi
-source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
-build-swt.xml)
-# To test this pkg:
-# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
-# http://download.eclipse.org/eclipse/downloads/
-
-#
http://mirror.ibcp.fr/pub/eclipse/eclipse/downloads/drops4/R-4.4-201406061215/org.eclipse.sdk.examples.source-4.4.zip
-
-build() {
- cd ${srcdir}
- unzip -oq src.zip -d src
-
- . /etc/profile.d/jdk.sh
- . /etc/profile.d/apache-ant.sh
-
- # Shared objects
- cd src
- ./build.sh
-
- # SWT jar
- ant -f ../build-swt.xml compile
-}
-
-package() {
- cd ${srcdir}/src
-
- # Shared objects
- export OUTPUT_DIR=${pkgdir}/usr/lib
- install -dm755 ${OUTPUT_DIR}
- make -f make_linux.mak install
-
- # SWT jar
- ant -f ../build-swt.xml jar
- install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar
- ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar
-}
Copied: swt/repos/extra-i686/PKGBUILD (from rev 239945, swt/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-30 18:13:30 UTC (rev 239946)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=swt
+# http://download.eclipse.org/eclipse/downloads/drops4
+pkgver=4.4.2
+pkgrel=1
+_date=201502041700
+pkgdesc='An open source widget toolkit for Java'
+arch=('i686' 'x86_64')
+url='http://www.eclipse.org/swt/'
+license=('EPL')
+depends=('java-runtime=6' 'gtk2=2.20.1' 'libxtst')
+optdepends=('libgnomeui' 'glu' 'webkitgtk2')
+makedepends=('java-environment' 'libxtst' 'glu' 'libgnomeui' 'unzip'
'pkgconfig' 'webkitgtk2' 'apache-ant')
+
+source=(build-swt.xml)
+source_i686=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
+source_x86_64=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip)
+
+sha256sums=('6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
+sha256sums_i686=('48f2ff63217d20a2abe3ce083f4e04da75aa6f9fa5675b1dd2a57e3151c6fe53')
+sha256sums_x86_64=('fdfd66d4c2d5c92a2d505961b8e1738bedbdda0e910e45dafc2bd568c146307c')
+
+# These examples don't even run anymore (Try Tux Guitar instead)!
+# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
+# http://download.eclipse.org/eclipse/downloads/
+
+#
http://mirror.ibcp.fr/pub/eclipse/eclipse/downloads/drops4/R-4.4-201406061215/org.eclipse.sdk.examples.source-4.4.zip
+
+build() {
+ cd ${srcdir}
+ unzip -oq src.zip -d src
+
+ export JAVA_HOME=/usr/lib/jvm/default
+ . /etc/profile.d/apache-ant.sh
+
+ # Shared objects
+ cd src
+ ./build.sh
+
+ # SWT jar
+ ant -f ../build-swt.xml compile
+}
+
+package
[arch-commits] Commit in (5 files)
Date: Saturday, May 30, 2015 @ 16:27:58
Author: guillaume
Revision: 239926
First push of java-openjfx FS#43653
Added:
java-openjfx/
java-openjfx/repos/
java-openjfx/trunk/
java-openjfx/trunk/PKGBUILD
java-openjfx/trunk/gradle.properties
---+
PKGBUILD | 94
gradle.properties |4 ++
2 files changed, 98 insertions(+)
Added: java-openjfx/trunk/PKGBUILD
===
--- java-openjfx/trunk/PKGBUILD (rev 0)
+++ java-openjfx/trunk/PKGBUILD 2015-05-30 14:27:58 UTC (rev 239926)
@@ -0,0 +1,94 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Emanuel Couto emanuel dot amaral dot couto at gmail dot com
+# Contributor: Richard Jackson rdjack21 at gmail dot com
+# Contributor: Tinx arch at tinx dot eu
+# Contributor: Jens Kapitza j dot kapitza at schwarze-allianz dot de
+# Contributor: Olli olli at coderkun dot de
+
+# To test this package see demos in jdk8 tarball:
jdk1.8.0_45/demo/javafx_samples
+
+_libname=openjfx
+pkgbase=java-${_libname}
+pkgname=('java-openjfx' 'java-openjfx-doc' 'java-openjfx-src')
+pkgver='8u45_b13'
+pkgrel=1
+pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX)'
+arch=('i686' 'x86_64')
+url='https://wiki.openjdk.java.net/display/OpenJFX/Main'
+license=('GPL')
+depends=('java-runtime-openjdk=8' 'gstreamer' 'libxtst' 'webkitgtk2' 'ffmpeg'
'qt5-base')
+makedepends=('java-environment-openjdk=8' 'mercurial' 'bison' 'gperf'
'qtchooser' 'gtk2'
+ 'libxtst' 'ffmpeg' 'python' 'qt5-base' 'webkitgtk2')
+source=(openjfx::hg+http://hg.openjdk.java.net/openjfx/8u-dev/rt#tag=${pkgver/_/-}
+gradle.properties
+https://services.gradle.org/distributions/gradle-1.8-bin.zip)
+sha256sums=('SKIP'
+'1d09385ac23d755aec079954247365de3875507641f5ecd7bd3511ebf3fa9e3c'
+'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703')
+
+_openjdk8dir=/usr/lib/jvm/java-8-openjdk
+
+case $CARCH in
+ 'i686') _CARCH='i386' ;;
+ 'x86_64')_CARCH='amd64' ;;
+esac
+
+build() {
+ cd ${srcdir}/${_libname}
+
+ ln -sf ${srcdir}/gradle.properties .
+ export GRADLE_USER_HOME=${srcdir}/gradle_home
+ mkdir -p ${GRADLE_USER_HOME}
+
+ ${srcdir}/gradle-1.8/bin/gradle
+}
+
+package_java-openjfx() {
+ pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX)'
+ conflicts=('openjfx')
+ replaces=('openjfx')
+
+ local _builddir=${srcdir}/${_libname}/build
+ local _sdkdir=${_builddir}/sdk
+
+ install -d ${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}
+ install -m755 ${_sdkdir}/rt/lib/${_CARCH}/*.*
${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}
+
+ install -d ${pkgdir}${_openjdk8dir}/jre/lib/ext
+ install -m644 ${_sdkdir}/rt/lib/ext/*.*
${pkgdir}${_openjdk8dir}/jre/lib/ext
+ install -m644 ${_sdkdir}/rt/lib/*.* ${pkgdir}${_openjdk8dir}/jre/lib
+
+ install -d ${pkgdir}${_openjdk8dir}/lib
+ install -m644 ${_sdkdir}/lib/*.* ${pkgdir}${_openjdk8dir}/lib
+
+ install -d ${pkgdir}${_openjdk8dir}/bin
+ install -m755 ${_sdkdir}/bin/* ${pkgdir}${_openjdk8dir}/bin
+
+ install -m644 -D ${_sdkdir}/man/man1/javapackager.1
${pkgdir}/usr/share/man/man1/javapackager.1
+}
+
+package_java-openjfx-doc() {
+ pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX) - documentation'
+ conflicts=('openjfx-doc')
+ replaces=('openjfx-doc')
+
+ local _builddir=${srcdir}/${_libname}/build
+ local _sdkdir=${_builddir}/sdk
+ local docdir=/usr/share/doc
+
+ install -d ${pkgdir}${docdir}/openjfx
+ cp -dr --no-preserve=ownership ${_builddir}/javadoc/*
${pkgdir}${docdir}/openjfx
+}
+
+package_java-openjfx-src() {
+ pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX) - sources'
+ conflicts=('openjfx-src')
+ replaces=('openjfx-src')
+
+ local _builddir=${srcdir}/${_libname}/build
+ local _sdkdir=${_builddir}/sdk
+
+ install -d ${pkgdir}${_openjdk8dir}
+ install -m644 ${_builddir}/javafx-src.zip ${pkgdir}${_openjdk8dir}
+}
+
Property changes on: java-openjfx/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: java-openjfx/trunk/gradle.properties
===
--- java-openjfx/trunk/gradle.properties(rev 0)
+++ java-openjfx/trunk/gradle.properties2015-05-30 14:27:58 UTC (rev
239926)
@@ -0,0 +1,4 @@
+COMPILE_WEBKIT = true
+COMPILE_MEDIA = true
+BUILD_JAVADOC = true
+BUILD_SRC_ZIP = true
[arch-commits] Commit in java-openjfx/repos (6 files)
Date: Saturday, May 30, 2015 @ 16:29:22
Author: guillaume
Revision: 239927
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
java-openjfx/repos/extra-i686/
java-openjfx/repos/extra-i686/PKGBUILD
(from rev 239926, java-openjfx/trunk/PKGBUILD)
java-openjfx/repos/extra-i686/gradle.properties
(from rev 239926, java-openjfx/trunk/gradle.properties)
java-openjfx/repos/extra-x86_64/
java-openjfx/repos/extra-x86_64/PKGBUILD
(from rev 239926, java-openjfx/trunk/PKGBUILD)
java-openjfx/repos/extra-x86_64/gradle.properties
(from rev 239926, java-openjfx/trunk/gradle.properties)
+
extra-i686/PKGBUILD| 94 +++
extra-i686/gradle.properties |4 +
extra-x86_64/PKGBUILD | 94 +++
extra-x86_64/gradle.properties |4 +
4 files changed, 196 insertions(+)
Copied: java-openjfx/repos/extra-i686/PKGBUILD (from rev 239926,
java-openjfx/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-30 14:29:22 UTC (rev 239927)
@@ -0,0 +1,94 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Emanuel Couto emanuel dot amaral dot couto at gmail dot com
+# Contributor: Richard Jackson rdjack21 at gmail dot com
+# Contributor: Tinx arch at tinx dot eu
+# Contributor: Jens Kapitza j dot kapitza at schwarze-allianz dot de
+# Contributor: Olli olli at coderkun dot de
+
+# To test this package see demos in jdk8 tarball:
jdk1.8.0_45/demo/javafx_samples
+
+_libname=openjfx
+pkgbase=java-${_libname}
+pkgname=('java-openjfx' 'java-openjfx-doc' 'java-openjfx-src')
+pkgver='8u45_b13'
+pkgrel=1
+pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX)'
+arch=('i686' 'x86_64')
+url='https://wiki.openjdk.java.net/display/OpenJFX/Main'
+license=('GPL')
+depends=('java-runtime-openjdk=8' 'gstreamer' 'libxtst' 'webkitgtk2' 'ffmpeg'
'qt5-base')
+makedepends=('java-environment-openjdk=8' 'mercurial' 'bison' 'gperf'
'qtchooser' 'gtk2'
+ 'libxtst' 'ffmpeg' 'python' 'qt5-base' 'webkitgtk2')
+source=(openjfx::hg+http://hg.openjdk.java.net/openjfx/8u-dev/rt#tag=${pkgver/_/-}
+gradle.properties
+https://services.gradle.org/distributions/gradle-1.8-bin.zip)
+sha256sums=('SKIP'
+'1d09385ac23d755aec079954247365de3875507641f5ecd7bd3511ebf3fa9e3c'
+'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703')
+
+_openjdk8dir=/usr/lib/jvm/java-8-openjdk
+
+case $CARCH in
+ 'i686') _CARCH='i386' ;;
+ 'x86_64')_CARCH='amd64' ;;
+esac
+
+build() {
+ cd ${srcdir}/${_libname}
+
+ ln -sf ${srcdir}/gradle.properties .
+ export GRADLE_USER_HOME=${srcdir}/gradle_home
+ mkdir -p ${GRADLE_USER_HOME}
+
+ ${srcdir}/gradle-1.8/bin/gradle
+}
+
+package_java-openjfx() {
+ pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX)'
+ conflicts=('openjfx')
+ replaces=('openjfx')
+
+ local _builddir=${srcdir}/${_libname}/build
+ local _sdkdir=${_builddir}/sdk
+
+ install -d ${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}
+ install -m755 ${_sdkdir}/rt/lib/${_CARCH}/*.*
${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}
+
+ install -d ${pkgdir}${_openjdk8dir}/jre/lib/ext
+ install -m644 ${_sdkdir}/rt/lib/ext/*.*
${pkgdir}${_openjdk8dir}/jre/lib/ext
+ install -m644 ${_sdkdir}/rt/lib/*.* ${pkgdir}${_openjdk8dir}/jre/lib
+
+ install -d ${pkgdir}${_openjdk8dir}/lib
+ install -m644 ${_sdkdir}/lib/*.* ${pkgdir}${_openjdk8dir}/lib
+
+ install -d ${pkgdir}${_openjdk8dir}/bin
+ install -m755 ${_sdkdir}/bin/* ${pkgdir}${_openjdk8dir}/bin
+
+ install -m644 -D ${_sdkdir}/man/man1/javapackager.1
${pkgdir}/usr/share/man/man1/javapackager.1
+}
+
+package_java-openjfx-doc() {
+ pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX) - documentation'
+ conflicts=('openjfx-doc')
+ replaces=('openjfx-doc')
+
+ local _builddir=${srcdir}/${_libname}/build
+ local _sdkdir=${_builddir}/sdk
+ local docdir=/usr/share/doc
+
+ install -d ${pkgdir}${docdir}/openjfx
+ cp -dr --no-preserve=ownership ${_builddir}/javadoc/*
${pkgdir}${docdir}/openjfx
+}
+
+package_java-openjfx-src() {
+ pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX) - sources'
+ conflicts=('openjfx-src')
+ replaces=('openjfx-src')
+
+ local _builddir=${srcdir}/${_libname}/build
+ local _sdkdir=${_builddir}/sdk
+
+ install -d ${pkgdir}${_openjdk8dir}
+ install -m644 ${_builddir}/javafx-src.zip ${pkgdir}${_openjdk8dir}
+}
+
Copied: java-openjfx/repos/extra-i686/gradle.properties (from rev 239926,
java-openjfx/trunk/gradle.properties)
===
--- extra-i686/gradle.properties(rev 0)
+++ extra-i686/gradle.properties
[arch-commits] Commit in hunspell-fr/trunk (PKGBUILD)
Date: Saturday, May 30, 2015 @ 15:50:27
Author: guillaume
Revision: 239921
Upstream release 5.3
Modified:
hunspell-fr/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-30 13:49:02 UTC (rev 239920)
+++ PKGBUILD2015-05-30 13:50:27 UTC (rev 239921)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=hunspell-fr
-pkgver=5.2
+pkgver=5.3
pkgrel=1
pkgdesc='French (modern) hunspell dictionaries'
arch=(any)
@@ -10,7 +10,7 @@
optdepends=('hunspell: the spell checking libraries and apps')
source=(http://www.dicollecte.org/download/fr/${pkgname/-fr/}-french-dictionaries-v${pkgver}.zip
LICENSE)
-sha256sums=('c5863f7592a8c4defe8b4ed2b3b45f6f10ef265d34ae9881c1f3bbb3b80bdd02'
+sha256sums=('604664c075140b889040a41575e211569eb4eece2ec0cf670ceb9f2a09024731'
'fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85')
package() {
[arch-commits] Commit in hunspell-fr/repos/extra-any (4 files)
+-
+
+ This Source Code Form is Incompatible With Secondary Licenses, as
+ defined by the Mozilla Public License, v. 2.0.
Deleted: PKGBUILD
===
--- PKGBUILD2015-05-30 13:54:16 UTC (rev 239923)
+++ PKGBUILD2015-05-30 13:54:59 UTC (rev 239924)
@@ -1,44 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-
-pkgname=hunspell-fr
-pkgver=5.2
-pkgrel=1
-pkgdesc='French (modern) hunspell dictionaries'
-arch=(any)
-url='http://www.dicollecte.org/home.php?prj=fr'
-license=('custom:MPLv2')
-optdepends=('hunspell: the spell checking libraries and apps')
-source=(http://www.dicollecte.org/download/fr/${pkgname/-fr/}-french-dictionaries-v${pkgver}.zip
-LICENSE)
-sha256sums=('c5863f7592a8c4defe8b4ed2b3b45f6f10ef265d34ae9881c1f3bbb3b80bdd02'
-'fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85')
-
-package() {
- cd ${srcdir}
- install -dm755 ${pkgdir}/usr/share/hunspell
- install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
- install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
-
- pushd ${pkgdir}/usr/share/hunspell/
- fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
- for lang in ${fr_FR_aliases}; do
- ln -s fr_FR.aff ${lang}.aff
- ln -s fr_FR.dic ${lang}.dic
- done
-
- popd
-
- # the symlinks
- install -dm755 ${pkgdir}/usr/share/myspell/dicts
- pushd ${pkgdir}/usr/share/myspell/dicts
-for file in ${pkgdir}/usr/share/hunspell/*; do
- ln -sv /usr/share/hunspell/$(basename ${file}) .
-done
- popd
-
- # docs
- install -Dm644 README_dict_fr.txt
${pkgdir}/usr/share/doc/${pkgname}/README_dict_fr.txt
-
- # license
- install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: hunspell-fr/repos/extra-any/PKGBUILD (from rev 239923,
hunspell-fr/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-05-30 13:54:59 UTC (rev 239924)
@@ -0,0 +1,44 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+
+pkgname=hunspell-fr
+pkgver=5.3
+pkgrel=1
+pkgdesc='French (modern) hunspell dictionaries'
+arch=(any)
+url='http://www.dicollecte.org/home.php?prj=fr'
+license=('custom:MPLv2')
+optdepends=('hunspell: the spell checking libraries and apps')
+source=(http://www.dicollecte.org/download/fr/${pkgname/-fr/}-french-dictionaries-v${pkgver}.zip
+LICENSE)
+sha256sums=('604664c075140b889040a41575e211569eb4eece2ec0cf670ceb9f2a09024731'
+'fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85')
+
+package() {
+ cd ${srcdir}
+ install -dm755 ${pkgdir}/usr/share/hunspell
+ install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
+ install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
+
+ pushd ${pkgdir}/usr/share/hunspell/
+ fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
+ for lang in ${fr_FR_aliases}; do
+ln -s fr_FR.aff ${lang}.aff
+ln -s fr_FR.dic ${lang}.dic
+ done
+
+ popd
+
+ # the symlinks
+ install -dm755 ${pkgdir}/usr/share/myspell/dicts
+ pushd ${pkgdir}/usr/share/myspell/dicts
+for file in ${pkgdir}/usr/share/hunspell/*; do
+ ln -sv /usr/share/hunspell/$(basename ${file}) .
+done
+ popd
+
+ # docs
+ install -Dm644 README_dict_fr.txt
${pkgdir}/usr/share/doc/${pkgname}/README_dict_fr.txt
+
+ # license
+ install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
[arch-commits] Commit in hunspell-fr/trunk (PKGBUILD)
Date: Saturday, May 30, 2015 @ 15:54:16
Author: guillaume
Revision: 239923
Cosmetic fixes of PKGBUILD
Modified:
hunspell-fr/trunk/PKGBUILD
--+
PKGBUILD | 24
1 file changed, 12 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-30 13:51:34 UTC (rev 239922)
+++ PKGBUILD2015-05-30 13:54:16 UTC (rev 239923)
@@ -15,30 +15,30 @@
package() {
cd ${srcdir}
- install -dm755 ${pkgdir}/usr/share/hunspell
- install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
- install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
+ install -dm755 ${pkgdir}/usr/share/hunspell
+ install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
+ install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
- pushd ${pkgdir}/usr/share/hunspell/
+ pushd ${pkgdir}/usr/share/hunspell/
fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
for lang in ${fr_FR_aliases}; do
- ln -s fr_FR.aff ${lang}.aff
- ln -s fr_FR.dic ${lang}.dic
+ln -s fr_FR.aff ${lang}.aff
+ln -s fr_FR.dic ${lang}.dic
done
popd
# the symlinks
- install -dm755 ${pkgdir}/usr/share/myspell/dicts
- pushd ${pkgdir}/usr/share/myspell/dicts
-for file in ${pkgdir}/usr/share/hunspell/*; do
+ install -dm755 ${pkgdir}/usr/share/myspell/dicts
+ pushd ${pkgdir}/usr/share/myspell/dicts
+for file in ${pkgdir}/usr/share/hunspell/*; do
ln -sv /usr/share/hunspell/$(basename ${file}) .
done
popd
-
+
# docs
- install -Dm644 README_dict_fr.txt
${pkgdir}/usr/share/doc/${pkgname}/README_dict_fr.txt
+ install -Dm644 README_dict_fr.txt
${pkgdir}/usr/share/doc/${pkgname}/README_dict_fr.txt
# license
- install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
[arch-commits] Commit in java-openjfx/repos (8 files)
Date: Saturday, May 30, 2015 @ 17:30:48
Author: guillaume
Revision: 239930
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
java-openjfx/repos/extra-i686/PKGBUILD
(from rev 239929, java-openjfx/trunk/PKGBUILD)
java-openjfx/repos/extra-i686/gradle.properties
(from rev 239929, java-openjfx/trunk/gradle.properties)
java-openjfx/repos/extra-x86_64/PKGBUILD
(from rev 239929, java-openjfx/trunk/PKGBUILD)
java-openjfx/repos/extra-x86_64/gradle.properties
(from rev 239929, java-openjfx/trunk/gradle.properties)
Deleted:
java-openjfx/repos/extra-i686/PKGBUILD
java-openjfx/repos/extra-i686/gradle.properties
java-openjfx/repos/extra-x86_64/PKGBUILD
java-openjfx/repos/extra-x86_64/gradle.properties
+
/PKGBUILD | 196 +++
/gradle.properties |8 +
extra-i686/PKGBUILD| 94 --
extra-i686/gradle.properties |4
extra-x86_64/PKGBUILD | 94 --
extra-x86_64/gradle.properties |4
6 files changed, 204 insertions(+), 196 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-05-30 15:29:54 UTC (rev 239929)
+++ extra-i686/PKGBUILD 2015-05-30 15:30:48 UTC (rev 239930)
@@ -1,94 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Emanuel Couto emanuel dot amaral dot couto at gmail dot com
-# Contributor: Richard Jackson rdjack21 at gmail dot com
-# Contributor: Tinx arch at tinx dot eu
-# Contributor: Jens Kapitza j dot kapitza at schwarze-allianz dot de
-# Contributor: Olli olli at coderkun dot de
-
-# To test this package see demos in jdk8 tarball:
jdk1.8.0_45/demo/javafx_samples
-
-_libname=openjfx
-pkgbase=java-${_libname}
-pkgname=('java-openjfx' 'java-openjfx-doc' 'java-openjfx-src')
-pkgver='8u45_b13'
-pkgrel=1
-pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX)'
-arch=('i686' 'x86_64')
-url='https://wiki.openjdk.java.net/display/OpenJFX/Main'
-license=('GPL')
-depends=('java-runtime-openjdk=8' 'gstreamer' 'libxtst' 'webkitgtk2' 'ffmpeg'
'qt5-base')
-makedepends=('java-environment-openjdk=8' 'mercurial' 'bison' 'gperf'
'qtchooser' 'gtk2'
- 'libxtst' 'ffmpeg' 'python' 'qt5-base' 'webkitgtk2')
-source=(openjfx::hg+http://hg.openjdk.java.net/openjfx/8u-dev/rt#tag=${pkgver/_/-}
-gradle.properties
-https://services.gradle.org/distributions/gradle-1.8-bin.zip)
-sha256sums=('SKIP'
-'1d09385ac23d755aec079954247365de3875507641f5ecd7bd3511ebf3fa9e3c'
-'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703')
-
-_openjdk8dir=/usr/lib/jvm/java-8-openjdk
-
-case $CARCH in
- 'i686') _CARCH='i386' ;;
- 'x86_64')_CARCH='amd64' ;;
-esac
-
-build() {
- cd ${srcdir}/${_libname}
-
- ln -sf ${srcdir}/gradle.properties .
- export GRADLE_USER_HOME=${srcdir}/gradle_home
- mkdir -p ${GRADLE_USER_HOME}
-
- ${srcdir}/gradle-1.8/bin/gradle
-}
-
-package_java-openjfx() {
- pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX)'
- conflicts=('openjfx')
- replaces=('openjfx')
-
- local _builddir=${srcdir}/${_libname}/build
- local _sdkdir=${_builddir}/sdk
-
- install -d ${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}
- install -m755 ${_sdkdir}/rt/lib/${_CARCH}/*.*
${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}
-
- install -d ${pkgdir}${_openjdk8dir}/jre/lib/ext
- install -m644 ${_sdkdir}/rt/lib/ext/*.*
${pkgdir}${_openjdk8dir}/jre/lib/ext
- install -m644 ${_sdkdir}/rt/lib/*.* ${pkgdir}${_openjdk8dir}/jre/lib
-
- install -d ${pkgdir}${_openjdk8dir}/lib
- install -m644 ${_sdkdir}/lib/*.* ${pkgdir}${_openjdk8dir}/lib
-
- install -d ${pkgdir}${_openjdk8dir}/bin
- install -m755 ${_sdkdir}/bin/* ${pkgdir}${_openjdk8dir}/bin
-
- install -m644 -D ${_sdkdir}/man/man1/javapackager.1
${pkgdir}/usr/share/man/man1/javapackager.1
-}
-
-package_java-openjfx-doc() {
- pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX) - documentation'
- conflicts=('openjfx-doc')
- replaces=('openjfx-doc')
-
- local _builddir=${srcdir}/${_libname}/build
- local _sdkdir=${_builddir}/sdk
- local docdir=/usr/share/doc
-
- install -d ${pkgdir}${docdir}/openjfx
- cp -dr --no-preserve=ownership ${_builddir}/javadoc/*
${pkgdir}${docdir}/openjfx
-}
-
-package_java-openjfx-src() {
- pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX) - sources'
- conflicts=('openjfx-src')
- replaces=('openjfx-src')
-
- local _builddir=${srcdir}/${_libname}/build
- local _sdkdir=${_builddir}/sdk
-
- install -d ${pkgdir}${_openjdk8dir}
- install -m644 ${_builddir}/javafx-src.zip ${pkgdir}${_openjdk8dir}
-}
-
Copied: java-openjfx/repos/extra-i686/PKGBUILD (from rev 239929,
java-openjfx/trunk/PKGBUILD
[arch-commits] Commit in java-openjfx/trunk (PKGBUILD)
Date: Saturday, May 30, 2015 @ 17:29:54
Author: guillaume
Revision: 239929
Fix package version to match openjdk8
Modified:
java-openjfx/trunk/PKGBUILD
--+
PKGBUILD |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-30 14:31:46 UTC (rev 239928)
+++ PKGBUILD2015-05-30 15:29:54 UTC (rev 239929)
@@ -10,7 +10,11 @@
_libname=openjfx
pkgbase=java-${_libname}
pkgname=('java-openjfx' 'java-openjfx-doc' 'java-openjfx-src')
-pkgver='8u45_b13'
+_java_ver=8
+_jdk_update=45
+_build_ver=13
+_hgtag=${_java_ver}u${_jdk_update}-b${_build_ver}
+pkgver=${_java_ver}.u${_jdk_update}
pkgrel=1
pkgdesc='Java OpenJFX 8 client application platform (open-source
implementation of JavaFX)'
arch=('i686' 'x86_64')
@@ -19,7 +23,7 @@
depends=('java-runtime-openjdk=8' 'gstreamer' 'libxtst' 'webkitgtk2' 'ffmpeg'
'qt5-base')
makedepends=('java-environment-openjdk=8' 'mercurial' 'bison' 'gperf'
'qtchooser' 'gtk2'
'libxtst' 'ffmpeg' 'python' 'qt5-base' 'webkitgtk2')
-source=(openjfx::hg+http://hg.openjdk.java.net/openjfx/8u-dev/rt#tag=${pkgver/_/-}
+source=(openjfx::hg+http://hg.openjdk.java.net/openjfx/8u-dev/rt#tag=${_hgtag}
gradle.properties
https://services.gradle.org/distributions/gradle-1.8-bin.zip)
sha256sums=('SKIP'
[arch-commits] Commit in tomcat7/repos/extra-any (10 files)
Date: Monday, May 18, 2015 @ 12:56:32
Author: guillaume
Revision: 239520
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 239519, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 239519, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 239519, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 239519, tomcat7/trunk/systemd_tomcat7.service)
tomcat7/repos/extra-any/tomcat7.install
(from rev 239519, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tomcat7.service
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat7.conf |2
systemd_tmpfiles.d_tomcat7.conf | 10 +-
systemd_tomcat7.service | 66
tomcat7.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-05-18 10:55:45 UTC (rev 239519)
+++ PKGBUILD2015-05-18 10:56:32 UTC (rev 239520)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.61
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('2528ad7434e44ab1198b5692d5f831ac605051129119fd81a00d4c75abe1c0e0'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in tomcat7/trunk (PKGBUILD)
Date: Monday, May 18, 2015 @ 12:55:45
Author: guillaume
Revision: 239519
Upstream release 7.0.62
Modified:
tomcat7/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-18 10:10:25 UTC (rev 239518)
+++ PKGBUILD2015-05-18 10:55:45 UTC (rev 239519)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
-pkgver=7.0.61
+pkgver=7.0.62
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('2528ad7434e44ab1198b5692d5f831ac605051129119fd81a00d4c75abe1c0e0'
+sha256sums=('a787ea12e163e78ccebbb9662d7da78e707aef051d15af9ab5be20489adf1f6d'
'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
[arch-commits] Commit in tomcat6/repos/extra-any (10 files)
Date: Wednesday, May 13, 2015 @ 12:52:13
Author: guillaume
Revision: 239286
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 239285, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/systemd_sysusers.d_tomcat6.conf
(from rev 239285, tomcat6/trunk/systemd_sysusers.d_tomcat6.conf)
tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 239285, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 239285, tomcat6/trunk/systemd_tomcat6.service)
tomcat6/repos/extra-any/tomcat6.install
(from rev 239285, tomcat6/trunk/tomcat6.install)
Deleted:
tomcat6/repos/extra-any/PKGBUILD
tomcat6/repos/extra-any/systemd_sysusers.d_tomcat6.conf
tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
tomcat6/repos/extra-any/systemd_tomcat6.service
tomcat6/repos/extra-any/tomcat6.install
-+
PKGBUILD| 160 ++
systemd_sysusers.d_tomcat6.conf |2
systemd_tmpfiles.d_tomcat6.conf |6 -
systemd_tomcat6.service | 66 +++
tomcat6.install | 38 -
5 files changed, 134 insertions(+), 138 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-05-13 10:51:32 UTC (rev 239285)
+++ PKGBUILD2015-05-13 10:52:13 UTC (rev 239286)
@@ -1,82 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.43
-pkgrel=2
-pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer
Pages 2.1 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in tomcat6/trunk (PKGBUILD)
Date: Wednesday, May 13, 2015 @ 12:51:32
Author: guillaume
Revision: 239285
Upstream release 6.0.44
Modified:
tomcat6/trunk/PKGBUILD
--+
PKGBUILD | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-13 04:19:53 UTC (rev 239284)
+++ PKGBUILD2015-05-13 10:51:32 UTC (rev 239285)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat6
-pkgver=6.0.43
-pkgrel=2
+pkgver=6.0.44
+pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer
Pages 2.1 technologies'
arch=('any')
url='http://tomcat.apache.org/'
@@ -21,10 +21,10 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
+sha256sums=('aab792322e75c6502675120933cbc519cfb59ac8d192f4fa103371a335708224'
'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
+'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
+'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')
_gid_log=19
_gid_tomcat=66
@@ -76,7 +76,3 @@
install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
}
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')
[arch-commits] Commit in tomcat8/repos/extra-any (10 files)
Date: Saturday, May 9, 2015 @ 17:11:29
Author: guillaume
Revision: 238758
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 238757, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
(from rev 238757, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 238757, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 238757, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 238757, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat8.conf |2
systemd_tmpfiles.d_tomcat8.conf | 10 +-
systemd_tomcat8.service | 66
tomcat8.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-05-09 15:10:52 UTC (rev 238757)
+++ PKGBUILD2015-05-09 15:11:29 UTC (rev 238758)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.21
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('a009f855ac7ac910a51e2259bb24bd8b3fc1be7af75a3a9feb53f883dc6c6a88'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
-'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Saturday, May 9, 2015 @ 17:10:52
Author: guillaume
Revision: 238757
Upstream release 8.0.22
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-09 15:05:39 UTC (rev 238756)
+++ PKGBUILD2015-05-09 15:10:52 UTC (rev 238757)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
-pkgver=8.0.21
+pkgver=8.0.22
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('a009f855ac7ac910a51e2259bb24bd8b3fc1be7af75a3a9feb53f883dc6c6a88'
+sha256sums=('cb163576d03f45981bf025b62b46e71c3c634584daa4662fc721d37d46989eff'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
[arch-commits] Commit in icedtea-web/trunk (PKGBUILD)
Date: Thursday, April 30, 2015 @ 09:51:09
Author: guillaume
Revision: 238282
Upstream release 1.6
Modified:
icedtea-web/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-29 22:40:47 UTC (rev 238281)
+++ PKGBUILD2015-04-30 07:51:09 UTC (rev 238282)
@@ -3,7 +3,7 @@
pkgbase=icedtea-web
pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.5.2
+pkgver=1.6
pkgrel=1
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org/wiki/IcedTea-Web'
@@ -14,7 +14,7 @@
# Due to broken path names in the tarball that fails with LANG=C in our chroot
noextract=${pkgbase}-${pkgver}.tar.gz
source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz)
-sha256sums=('b29e8ff2533cc6521a6509a002001f4c97c80a004460063156d003898da13bf3')
+sha256sums=('169386ad8d43c51b0c23ef128f9ba99040d23d9ceec24d7429514576778e117d')
prepare() {
cd ${srcdir}
[arch-commits] Commit in icedtea-web/repos (8 files)
Date: Thursday, April 30, 2015 @ 09:52:38
Author: guillaume
Revision: 238283
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
icedtea-web/repos/extra-i686/PKGBUILD
(from rev 238282, icedtea-web/trunk/PKGBUILD)
icedtea-web/repos/extra-i686/install_icedtea-web.sh
(from rev 238282, icedtea-web/trunk/install_icedtea-web.sh)
icedtea-web/repos/extra-x86_64/PKGBUILD
(from rev 238282, icedtea-web/trunk/PKGBUILD)
icedtea-web/repos/extra-x86_64/install_icedtea-web.sh
(from rev 238282, icedtea-web/trunk/install_icedtea-web.sh)
Deleted:
icedtea-web/repos/extra-i686/PKGBUILD
icedtea-web/repos/extra-i686/install_icedtea-web.sh
icedtea-web/repos/extra-x86_64/PKGBUILD
icedtea-web/repos/extra-x86_64/install_icedtea-web.sh
-+
/PKGBUILD | 178 ++
/install_icedtea-web.sh | 22
extra-i686/PKGBUILD | 94 -
extra-i686/install_icedtea-web.sh | 11 --
extra-x86_64/PKGBUILD | 94 -
extra-x86_64/install_icedtea-web.sh | 11 --
6 files changed, 200 insertions(+), 210 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-04-30 07:51:09 UTC (rev 238282)
+++ extra-i686/PKGBUILD 2015-04-30 07:52:38 UTC (rev 238283)
@@ -1,94 +0,0 @@
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-
-pkgbase=icedtea-web
-pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.5.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://icedtea.classpath.org/wiki/IcedTea-Web'
-license=('GPL2')
-# TODO do we still need 'chromium' and '--with-chromium'? What does it do?
-#
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-November/030196.html
-# https://www.java.com/en/download/faq/chrome.xml
-# http://blog.chromium.org/2013/09/saying-goodbye-to-our-old-friend-npapi.html
-makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino'
'junit'
- 'firefox' 'chromium' 'epiphany')
-optdepends=('rhino: for using proxy auto config files')
-# Due to broken path names in the tarball that fails with LANG=C in our chroot
-noextract=${pkgbase}-${pkgver}.tar.gz
-source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz)
-sha256sums=('b29e8ff2533cc6521a6509a002001f4c97c80a004460063156d003898da13bf3')
-
-prepare() {
- cd ${srcdir}
- LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase}-${pkgver}.tar.gz
-}
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- ./configure \
- --prefix=/usr/share/${pkgbase} \
- --datarootdir=/usr/share \
- --with-jdk-home=/usr/lib/jvm/default \
- --with-jre-home=/usr/lib/jvm/default-runtime \
- --with-java=/usr/bin/java \
- --with-browser-tests \
- --with-firefox=/usr/bin/firefox \
- --with-chromium=/usr/bin/chromium \
- --with-epiphany=/usr/bin/epiphany
- make
-}
-
-#check() {
-# cd ${srcdir}/${pkgbase}-${pkgver}
-# # as more tests have been added some are expectged to fail
-# # see
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html
-# make -k check
-#}
-
-
-package_icedtea-web() {
-
- pkgdesc='Free web browser plugin to run applets written in Java and an
implementation of Java Web Start'
- depends=('java-runtime-openjdk' 'desktop-file-utils')
- provides=('java-web-start')
- replaces=('icedtea-web-java7')
- install=install_${pkgname}.sh
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- # possible make target (see bottom of Makefile.am: install-exec-local
install-data-local
- make DESTDIR=${pkgdir} install-exec-local install-data-local
-
- # Install desktop files.
- install -m 755 -d ${pkgdir}/usr/share/{applications,pixmaps}
- install -m 644 javaws.png ${pkgdir}/usr/share/pixmaps
- install -m 644 {javaws,itweb-settings}.desktop
${pkgdir}/usr/share/applications
- # remove splitted doc files
- rm -rf ${pkgdir}/usr/share/doc
-
- # link binaries into /usr/bin + jre/bin
- install -m 755 -d ${pkgdir}/usr/bin
- pushd ${pkgdir}/usr/share/${pkgbase}/bin
- for file in *; do
-ln -sf /usr/share/${pkgbase}/bin/${file} ${pkgdir}/usr/bin
- done
- popd
-
- # link the mozilla-plugin - test it here
http://www.java.com/en/download/help/testvm.xml
- install -m 755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf /usr/share/${pkgbase}/lib/IcedTeaPlugin.so
${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-doc() {
-
- pkgdesc='icedtea-web browser plugin + Java WebStart - documentation files'
- replaces=('icedtea-web-java7-doc')
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} install-data-local
- # remove javaws about and man page
- rm -rf ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/share/man
- rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it
seems
-}
Copied: icedtea-web/repos/extra-i686
[arch-commits] Commit in rhino/trunk (PKGBUILD)
Date: Monday, April 27, 2015 @ 21:30:51
Author: guillaume
Revision: 238068
Upstream release 1.7.6
Modified:
rhino/trunk/PKGBUILD
--+
PKGBUILD | 35 ---
1 file changed, 20 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-27 19:03:02 UTC (rev 238067)
+++ PKGBUILD2015-04-27 19:30:51 UTC (rev 238068)
@@ -5,13 +5,14 @@
pkgbase=rhino
pkgname=('java-rhino' 'rhino' 'rhino-javadoc')
-pkgver=1.7R4
-pkgrel=2
+pkgver=1.7.6
+_pkgver=${pkgver//\./_}
+pkgrel=1
arch=('any')
url=http://www.mozilla.org/rhino/;
license=('MPL')
makedepends=('apache-ant')
-source=(https://github.com/downloads/mozilla/rhino/${pkgbase}${pkgver/./_}.zip
+source=(https://github.com/mozilla/${pkgbase}/releases/download/Rhino${_pkgver}_RELEASE/${pkgbase}${pkgver}.zip
http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.5.0.tgz
rhino
rhino.1
@@ -19,17 +20,17 @@
rhino-debugger.1
rhino-jsc
rhino-jsc.1)
-md5sums=('ad67a3dff135e3a70f0c3528a2d6edf2'
- '982e8e3d36aa5f7839f7675adc2b0c53'
- '2006b1ac37d162597b959acd685a4bee'
- '9c6bfda92befa45d484c88f9c7a2403b'
- '08d1ab306f0e07bc9a93afead55d54e8'
- '6c86e6746df7a327b46196a2c4942e0f'
- 'dad268ba00bb4182045507d4017d9815'
- 'af86e6abdf97ee68958ece356a9a7bc1')
+sha256sums=('45f4431699887a72a7f383ef927ef1b2e79d1fe597260af8df11ea93255b10f5'
+'497b0031e6c998f724f4b462185e85a20c441f7d678b99f42030e9f96be315d3'
+'4c8bea243b86dc7b3f186a255fedd5d7c13b2aa9f24b81db4f7dd2ed7582e724'
+'b3ae7bfc673e999d644d277b317a68289c41c650c49e7614b2e14b4094119388'
+'9ce7073e0c40bf5f600ed948d6f6abcded6ebebc5e78bc2bdd35ce70bd7611f5'
+'afad5dd37f0157138077f5e070b0434491f5e0389bb6bccc5a9cfde275e5c4d8'
+'5115144b0c025b4cac09d9a5f3bd5e7aeaba6ce3b2055f2f3b659ea0c13e4f2a'
+'15bb5da739c5d27634aae479ff5c94f685967de0d59cf7dc53b595d94a0b6860')
build() {
- cd ${srcdir}/${pkgbase}${pkgver/./_}
+ cd ${srcdir}/${pkgbase}${pkgver}
ant \
-Dxbean.jar=${srcdir}/xmlbeans-2.5.0/lib/xbean.jar \
-Djsr173.jar=${srcdir}/xmlbeans-2.5.0/lib/jsr173_1.0_api.jar \
@@ -37,13 +38,17 @@
javadoc
}
-# As explained on the build.xml, tests are difficult to run from CLI. We skip
them.
+check() {
+ cd ${srcdir}/${pkgbase}${pkgver}
+ ant \
+junit
+}
package_java-rhino() {
pkgdesc=Open-source implementation of JavaScript written entirely in Java -
JAR
depends=('java-runtime-headless')
- cd ${srcdir}/${pkgbase}${pkgver/./_}/build/${pkgbase}${pkgver/./_}
+ cd ${srcdir}/${pkgbase}${pkgver}/build/${pkgbase}${pkgver}
install -Dm644 js.jar ${pkgdir}/usr/share/java/js-${pkgver}.jar
ln -s js-${pkgver}.jar ${pkgdir}/usr/share/java/js.jar
}
@@ -63,7 +68,7 @@
package_rhino-javadoc() {
pkgdesc=Open-source implementation of JavaScript written entirely in Java -
Javadoc
- cd ${srcdir}/${pkgbase}${pkgver/./_}/build/${pkgbase}${pkgver/./_}
+ cd ${srcdir}/${pkgbase}${pkgver}/build/${pkgbase}${pkgver}
install -m755 -d ${pkgdir}/usr/share/${pkgbase}
cp -r javadoc ${pkgdir}/usr/share/${pkgbase}
}
[arch-commits] Commit in rhino/repos/extra-any (14 files)
Date: Monday, April 27, 2015 @ 21:32:19
Author: guillaume
Revision: 238069
archrelease: copy trunk to extra-any
Added:
rhino/repos/extra-any/PKGBUILD
(from rev 238068, rhino/trunk/PKGBUILD)
rhino/repos/extra-any/rhino
(from rev 238068, rhino/trunk/rhino)
rhino/repos/extra-any/rhino-debugger
(from rev 238068, rhino/trunk/rhino-debugger)
rhino/repos/extra-any/rhino-debugger.1
(from rev 238068, rhino/trunk/rhino-debugger.1)
rhino/repos/extra-any/rhino-jsc
(from rev 238068, rhino/trunk/rhino-jsc)
rhino/repos/extra-any/rhino-jsc.1
(from rev 238068, rhino/trunk/rhino-jsc.1)
rhino/repos/extra-any/rhino.1
(from rev 238068, rhino/trunk/rhino.1)
Deleted:
rhino/repos/extra-any/PKGBUILD
rhino/repos/extra-any/rhino
rhino/repos/extra-any/rhino-debugger
rhino/repos/extra-any/rhino-debugger.1
rhino/repos/extra-any/rhino-jsc
rhino/repos/extra-any/rhino-jsc.1
rhino/repos/extra-any/rhino.1
--+
PKGBUILD | 143 +---
rhino| 16 ++--
rhino-debugger | 16 ++--
rhino-debugger.1 | 120 +-
rhino-jsc| 16 ++--
rhino-jsc.1 | 134 +++---
rhino.1 | 186 ++---
7 files changed, 318 insertions(+), 313 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-04-27 19:30:51 UTC (rev 238068)
+++ PKGBUILD2015-04-27 19:32:19 UTC (rev 238069)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Jan de Groot j...@archlinux.org
-
-pkgbase=rhino
-pkgname=('java-rhino' 'rhino' 'rhino-javadoc')
-pkgver=1.7R4
-pkgrel=2
-arch=('any')
-url=http://www.mozilla.org/rhino/;
-license=('MPL')
-makedepends=('apache-ant')
-source=(https://github.com/downloads/mozilla/rhino/${pkgbase}${pkgver/./_}.zip
-http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.5.0.tgz
-rhino
-rhino.1
-rhino-debugger
-rhino-debugger.1
-rhino-jsc
-rhino-jsc.1)
-md5sums=('ad67a3dff135e3a70f0c3528a2d6edf2'
- '982e8e3d36aa5f7839f7675adc2b0c53'
- '2006b1ac37d162597b959acd685a4bee'
- '9c6bfda92befa45d484c88f9c7a2403b'
- '08d1ab306f0e07bc9a93afead55d54e8'
- '6c86e6746df7a327b46196a2c4942e0f'
- 'dad268ba00bb4182045507d4017d9815'
- 'af86e6abdf97ee68958ece356a9a7bc1')
-
-build() {
- cd ${srcdir}/${pkgbase}${pkgver/./_}
- ant \
--Dxbean.jar=${srcdir}/xmlbeans-2.5.0/lib/xbean.jar \
--Djsr173.jar=${srcdir}/xmlbeans-2.5.0/lib/jsr173_1.0_api.jar \
-jar \
-javadoc
-}
-
-# As explained on the build.xml, tests are difficult to run from CLI. We skip
them.
-
-package_java-rhino() {
- pkgdesc=Open-source implementation of JavaScript written entirely in Java -
JAR
- depends=('java-runtime-headless')
-
- cd ${srcdir}/${pkgbase}${pkgver/./_}/build/${pkgbase}${pkgver/./_}
- install -Dm644 js.jar ${pkgdir}/usr/share/java/js-${pkgver}.jar
- ln -s js-${pkgver}.jar ${pkgdir}/usr/share/java/js.jar
-}
-
-package_rhino() {
- pkgdesc=Open-source implementation of JavaScript written entirely in Java
- depends=('java-rhino' 'java-jline')
-
- cd ${srcdir}
-
- install -dm755 ${pkgdir}/usr/bin
- install -m755 rhino rhino-debugger rhino-jsc ${pkgdir}/usr/bin/
- install -dm755 ${pkgdir}/usr/share/man/man1
- install -m755 rhino.1 rhino-debugger.1 rhino-jsc.1
${pkgdir}/usr/share/man/man1/
-}
-
-package_rhino-javadoc() {
- pkgdesc=Open-source implementation of JavaScript written entirely in Java -
Javadoc
-
- cd ${srcdir}/${pkgbase}${pkgver/./_}/build/${pkgbase}${pkgver/./_}
- install -m755 -d ${pkgdir}/usr/share/${pkgbase}
- cp -r javadoc ${pkgdir}/usr/share/${pkgbase}
-}
Copied: rhino/repos/extra-any/PKGBUILD (from rev 238068, rhino/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-04-27 19:32:19 UTC (rev 238069)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Jan de Groot j...@archlinux.org
+
+pkgbase=rhino
+pkgname=('java-rhino' 'rhino' 'rhino-javadoc')
+pkgver=1.7.6
+_pkgver=${pkgver//\./_}
+pkgrel=1
+arch=('any')
+url=http://www.mozilla.org/rhino/;
+license=('MPL')
+makedepends=('apache-ant')
+source=(https://github.com/mozilla/${pkgbase}/releases/download/Rhino${_pkgver}_RELEASE/${pkgbase}${pkgver}.zip
+http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.5.0.tgz
+rhino
+rhino.1
+rhino-debugger
+rhino-debugger.1
+rhino-jsc
+rhino-jsc.1)
+sha256sums=('45f4431699887a72a7f383ef927ef1b2e79d1fe597260af8df11ea93255b10f5
[arch-commits] Commit in java8-openjdk/trunk (PKGBUILD)
Date: Monday, April 20, 2015 @ 19:45:20
Author: guillaume
Revision: 237792
Upstream release 8.u45
Modified:
java8-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-20 16:23:08 UTC (rev 237791)
+++ PKGBUILD2015-04-20 17:45:20 UTC (rev 237792)
@@ -9,8 +9,8 @@
pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src'
'openjdk8-doc')
pkgbase=java8-openjdk
_java_ver=8
-_jdk_update=40
-_jdk_build=20
+_jdk_update=45
+_jdk_build=14
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
pkgrel=1
@@ -29,14 +29,14 @@
langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
-sha256sums=('1fc7ca0e760af9bab0620049d2e21cde557961101949e54ea74736872295bdde'
-'1363462eff9fa2550c803e823695a3f4086380b106dfcff78c456f10c42beb3e'
-'d61a7a2d4d211e068e469ce0894030a2daf9788d66f3994232d5b82c16c9360d'
-'2c4fab3a8589f3ac9ea531c7e70d4c0a8e15d995345a90bc5b3b8d8291af3f33'
-'6de0d99d6685761c064814855d1e3401e48aadb830a7c68d03b13f0a41e0e950'
-'ad83699c97dec550c532eaf98a8bc049c8fbf80d7211057e76a3c86e5fcc3c0f'
-'2fbe00ef3d4fe2b9f8f5c4a8618e1fb0f58704c6c07246bafd43f39b41d1'
-'39113708d318c070326b5d4543f1bd499bf7e77012f08b67ba0d0313730935ff')
+sha256sums=('b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2'
+'6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de'
+'1dc7c5038f57f77a1e92cf1b48a188a0291805e69f570e1164efb7adb34c5a59'
+'2b125825962a2ff110afadb37784faf276e7146023c4a6cede6a3f923f48c692'
+'e6f6233c26335536436de89ebf741df8b142119d8b41abc34c3287dd155a43bb'
+'c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976'
+'eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9'
+'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9')
case ${CARCH} in
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
[arch-commits] Commit in java8-openjdk/repos (16 files)
Date: Monday, April 20, 2015 @ 19:46:31 Author: guillaume Revision: 237793 archrelease: copy trunk to extra-i686, extra-x86_64 Added: java8-openjdk/repos/extra-i686/PKGBUILD (from rev 237792, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-i686/install_jdk8-openjdk.sh (from rev 237792, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-i686/install_jre8-openjdk-headless.sh (from rev 237792, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-i686/install_jre8-openjdk.sh (from rev 237792, java8-openjdk/trunk/install_jre8-openjdk.sh) java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 237792, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh (from rev 237792, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh (from rev 237792, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 237792, java8-openjdk/trunk/install_jre8-openjdk.sh) Deleted: java8-openjdk/repos/extra-i686/PKGBUILD java8-openjdk/repos/extra-i686/install_jdk8-openjdk.sh java8-openjdk/repos/extra-i686/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-i686/install_jre8-openjdk.sh java8-openjdk/repos/extra-x86_64/PKGBUILD java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh ---+ /PKGBUILD | 560 /install_jdk8-openjdk.sh | 100 /install_jre8-openjdk-headless.sh | 96 /install_jre8-openjdk.sh | 110 extra-i686/PKGBUILD | 280 extra-i686/install_jdk8-openjdk.sh| 50 -- extra-i686/install_jre8-openjdk-headless.sh | 48 -- extra-i686/install_jre8-openjdk.sh| 55 -- extra-x86_64/PKGBUILD | 280 extra-x86_64/install_jdk8-openjdk.sh | 50 -- extra-x86_64/install_jre8-openjdk-headless.sh | 48 -- extra-x86_64/install_jre8-openjdk.sh | 55 -- 12 files changed, 866 insertions(+), 866 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 237792:237793 to see the changes.
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD giflib_5.1.diff)
Date: Thursday, April 16, 2015 @ 12:04:45
Author: guillaume
Revision: 237237
IcedTea upstream release and removed giflib patch
Modified:
java7-openjdk/trunk/PKGBUILD
Deleted:
java7-openjdk/trunk/giflib_5.1.diff
-+
PKGBUILD| 29 +
giflib_5.1.diff | 14 --
2 files changed, 13 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-16 09:32:30 UTC (rev 237236)
+++ PKGBUILD2015-04-16 10:04:45 UTC (rev 237237)
@@ -6,13 +6,13 @@
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src'
'openjdk7-doc')
pkgbase=java7-openjdk
_java_ver=7
-_icedtea_ver=2.5.4
+_icedtea_ver=2.5.5
#pkgver() {
# _updatever=$(grep -E ^JDK_UPDATE_VERSION = (.)+
${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
#| sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
# echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
#}
-_updatever=75
+_updatever=79
pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
pkgrel=1
@@ -38,20 +38,18 @@
icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
-openjdk7_nonreparenting-wm.diff
-giflib_5.1.diff)
+openjdk7_nonreparenting-wm.diff)
-sha256sums=('5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800'
-'88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1'
-'7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b'
-'84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3'
-'4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b'
-'e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09'
-'4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a'
-'4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34'
+sha256sums=('f05b1db06021f4cd3a39647f358a47130136d189431fb55f79855f627b1d6619'
+'5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d'
+'f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51'
+'293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256'
+'76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be'
+'c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483'
+'71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660'
+'d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
-'77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9')
+'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -81,8 +79,7 @@
cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES=patches/fontconfig-paths.diff \
- patches/openjdk7_nonreparenting-wm.diff \
- patches/giflib_5.1.diff
+ patches/openjdk7_nonreparenting-wm.diff
if [ $_bootstrap = 1 ]; then
BOOTSTRAPOPT=--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar
Deleted: giflib_5.1.diff
===
--- giflib_5.1.diff 2015-04-16 09:32:30 UTC (rev 237236)
+++ giflib_5.1.diff 2015-04-16 10:04:45 UTC (rev 237237)
@@ -1,14 +0,0 @@
openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig
2014-05-27 22:17:19.766866065 +0200
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
2014-05-27 22:16:35.452894426 +0200
-@@ -310,7 +310,11 @@
- free(pBitmapBits);
- free(pOldBitmapBits);
-
-+#if GIFLIB_MAJOR = 5
-+DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
-
- return 1;
- }
[arch-commits] Commit in java7-openjdk/repos (26 files)
Date: Thursday, April 16, 2015 @ 12:06:11 Author: guillaume Revision: 237238 archrelease: copy trunk to extra-i686, extra-x86_64 Added: java7-openjdk/repos/extra-i686/PKGBUILD (from rev 237237, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/extra-i686/fontconfig-paths.diff (from rev 237237, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/extra-i686/jdk7-openjdk.install (from rev 237237, java7-openjdk/trunk/jdk7-openjdk.install) java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install (from rev 237237, java7-openjdk/trunk/jre7-openjdk-headless.install) java7-openjdk/repos/extra-i686/jre7-openjdk.install (from rev 237237, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff (from rev 237237, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) java7-openjdk/repos/extra-x86_64/PKGBUILD (from rev 237237, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff (from rev 237237, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install (from rev 237237, java7-openjdk/trunk/jdk7-openjdk.install) java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install (from rev 237237, java7-openjdk/trunk/jre7-openjdk-headless.install) java7-openjdk/repos/extra-x86_64/jre7-openjdk.install (from rev 237237, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff (from rev 237237, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) Deleted: java7-openjdk/repos/extra-i686/PKGBUILD java7-openjdk/repos/extra-i686/fontconfig-paths.diff java7-openjdk/repos/extra-i686/giflib_5.1.diff java7-openjdk/repos/extra-i686/jdk7-openjdk.install java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install java7-openjdk/repos/extra-i686/jre7-openjdk.install java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff java7-openjdk/repos/extra-x86_64/PKGBUILD java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff java7-openjdk/repos/extra-x86_64/giflib_5.1.diff java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install java7-openjdk/repos/extra-x86_64/jre7-openjdk.install java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff --+ /PKGBUILD| 616 + /fontconfig-paths.diff | 268 ++ /jdk7-openjdk.install| 100 /jre7-openjdk-headless.install | 96 +++ /jre7-openjdk.install| 110 /openjdk7_nonreparenting-wm.diff | 116 extra-i686/PKGBUILD | 311 extra-i686/fontconfig-paths.diff | 134 - extra-i686/giflib_5.1.diff | 14 extra-i686/jdk7-openjdk.install | 50 -- extra-i686/jre7-openjdk-headless.install | 48 - extra-i686/jre7-openjdk.install | 55 -- extra-i686/openjdk7_nonreparenting-wm.diff | 58 -- extra-x86_64/PKGBUILD| 311 extra-x86_64/fontconfig-paths.diff | 134 - extra-x86_64/giflib_5.1.diff | 14 extra-x86_64/jdk7-openjdk.install| 50 -- extra-x86_64/jre7-openjdk-headless.install | 48 - extra-x86_64/jre7-openjdk.install| 55 -- extra-x86_64/openjdk7_nonreparenting-wm.diff | 58 -- 20 files changed, 1306 insertions(+), 1340 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 237237:237238 to see the changes.
[arch-commits] Commit in tomcat7/repos/extra-any (10 files)
Date: Monday, April 13, 2015 @ 21:57:26
Author: guillaume
Revision: 236393
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 236392, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 236392, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 236392, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 236392, tomcat7/trunk/systemd_tomcat7.service)
tomcat7/repos/extra-any/tomcat7.install
(from rev 236392, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tomcat7.service
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat7.conf |2
systemd_tmpfiles.d_tomcat7.conf | 10 +-
systemd_tomcat7.service | 66
tomcat7.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-04-13 19:57:09 UTC (rev 236392)
+++ PKGBUILD2015-04-13 19:57:26 UTC (rev 236393)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.59
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('e0fe43d1fa17013bf7b3b2d3f71105d606a0582c153eb16fb210e7d5164941b0'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in tomcat7/trunk (PKGBUILD)
Date: Monday, April 13, 2015 @ 21:56:47
Author: guillaume
Revision: 236390
Upstream release 7.0.61
Modified:
tomcat7/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-13 19:34:49 UTC (rev 236389)
+++ PKGBUILD2015-04-13 19:56:47 UTC (rev 236390)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
-pkgver=7.0.59
+pkgver=7.0.61
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('e0fe43d1fa17013bf7b3b2d3f71105d606a0582c153eb16fb210e7d5164941b0'
+sha256sums=('2528ad7434e44ab1198b5692d5f831ac605051129119fd81a00d4c75abe1c0e0'
'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
[arch-commits] Commit in sbt/repos/community-any (12 files)
${srcdir}/sbt.sh ${pkgdir}/usr/bin/sbt
-
- install -d ${pkgdir}/etc/profile.d
- install -Dm644 ${srcdir}/sbt.conf.sh ${pkgdir}/etc/profile.d/sbt.sh
- install -Dm644 ${srcdir}/sbt.conf.csh ${pkgdir}/etc/profile.d/sbt.csh
-
- install -Dm644 ${srcdir}/LICENSE \
-${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- install -Dm644 ${srcdir}/LICENSE_Scala \
-${pkgdir}/usr/share/licenses/${pkgname}/LICENSE_Scala
-}
Copied: sbt/repos/community-any/PKGBUILD (from rev 130196, sbt/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-03-29 14:11:33 UTC (rev 130197)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Andrea Scarpino and...@archlinux.org
+# Contributor: Leif Warner abimel...@gmail.com
+
+pkgname=sbt
+epoch=1
+pkgver=0.13.8
+pkgrel=1
+pkgdesc=A minimally intrusive build tool for Scala projects
+arch=('any')
+url='http://www.scala-sbt.org/'
+license=('BSD')
+depends=('java-runtime-headless' 'sh')
+IFS='.' read -a _pkgver ${pkgver}
+source=(http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${pkgver}/sbt-launch.jar
+
https://raw.githubusercontent.com/${pkgname}/${pkgname}/${_pkgver[1].${_pkgver[2]}}/LICENSE
+sbt.sh
+sbt.conf.sh
+sbt.conf.csh)
+sha256sums=('6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158'
+'8753689166238271fd8dceb33ff9dbd90fd8620a56b8387bca2b8807ce3209ca'
+'68f25719dde7e7de53e5f42eddd5d36e275a83cbb9f6a28208f245404233a6c7'
+'b90676fc30faa4ad2ec3beb7815491bb58cd6e057ec0593664344d6711482357'
+'b8825593744535787d2c227b61e4ffa2e95a7da071a6488c108ad79abeb9e182')
+
+package() {
+ install -d ${pkgdir}/usr/share/java/${pkgname}
+ install -m755 sbt-launch.jar ${pkgdir}/usr/share/java/${pkgname}
+
+ install -d ${pkgdir}/usr/bin/
+ install -Dm755 ${srcdir}/sbt.sh ${pkgdir}/usr/bin/sbt
+
+ install -d ${pkgdir}/etc/profile.d
+ install -Dm644 ${srcdir}/sbt.conf.sh ${pkgdir}/etc/profile.d/sbt.sh
+ install -Dm644 ${srcdir}/sbt.conf.csh ${pkgdir}/etc/profile.d/sbt.csh
+
+ install -D -m644 ${srcdir}/LICENSE
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: sbt.conf.csh
===
--- sbt.conf.csh2015-03-29 14:10:50 UTC (rev 130196)
+++ sbt.conf.csh2015-03-29 14:11:33 UTC (rev 130197)
@@ -1 +0,0 @@
-setenv SBT_OPTS -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled
-XX:MaxPermSize=256M
Copied: sbt/repos/community-any/sbt.conf.csh (from rev 130196,
sbt/trunk/sbt.conf.csh)
===
--- sbt.conf.csh(rev 0)
+++ sbt.conf.csh2015-03-29 14:11:33 UTC (rev 130197)
@@ -0,0 +1 @@
+setenv SBT_OPTS -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled
-XX:MaxPermSize=256M
Deleted: sbt.conf.sh
===
--- sbt.conf.sh 2015-03-29 14:10:50 UTC (rev 130196)
+++ sbt.conf.sh 2015-03-29 14:11:33 UTC (rev 130197)
@@ -1 +0,0 @@
-export SBT_OPTS=-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled
-XX:MaxPermSize=256M
Copied: sbt/repos/community-any/sbt.conf.sh (from rev 130196,
sbt/trunk/sbt.conf.sh)
===
--- sbt.conf.sh (rev 0)
+++ sbt.conf.sh 2015-03-29 14:11:33 UTC (rev 130197)
@@ -0,0 +1 @@
+export SBT_OPTS=-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled
-XX:MaxPermSize=256M
Deleted: sbt.sh
===
--- sbt.sh 2015-03-29 14:10:50 UTC (rev 130196)
+++ sbt.sh 2015-03-29 14:11:33 UTC (rev 130197)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java $SBT_OPTS -jar /usr/share/java/sbt/sbt-launch.jar $@
Copied: sbt/repos/community-any/sbt.sh (from rev 130196, sbt/trunk/sbt.sh)
===
--- sbt.sh (rev 0)
+++ sbt.sh 2015-03-29 14:11:33 UTC (rev 130197)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java $SBT_OPTS -jar /usr/share/java/sbt/sbt-launch.jar $@
[arch-commits] Commit in sbt/trunk (LICENSE LICENSE_Scala)
Date: Sunday, March 29, 2015 @ 16:13:04 Author: guillaume Revision: 130198 Delete previously discarded license files Deleted: sbt/trunk/LICENSE sbt/trunk/LICENSE_Scala ---+ LICENSE | 25 - LICENSE_Scala | 35 --- 2 files changed, 60 deletions(-) Deleted: LICENSE === --- LICENSE 2015-03-29 14:11:33 UTC (rev 130197) +++ LICENSE 2015-03-29 14:13:04 UTC (rev 130198) @@ -1,25 +0,0 @@ -Copyright (c) 2008, 2009, 2010 Steven Blundy, Josh Cough, Mark Harrah, Stuart Roebuck, Tony Sloane, Vesa Vilhonen, Jason Zaugg -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Deleted: LICENSE_Scala === --- LICENSE_Scala 2015-03-29 14:11:33 UTC (rev 130197) +++ LICENSE_Scala 2015-03-29 14:13:04 UTC (rev 130198) @@ -1,35 +0,0 @@ -SCALA LICENSE - -Copyright (c) 2002-2008 EPFL, Lausanne, unless otherwise specified. -All rights reserved. - -This software was developed by the Programming Methods Laboratory of the -Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland. - -Permission to use, copy, modify, and distribute this software in source -or binary form for any purpose with or without fee is hereby granted, -provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the EPFL nor the names of its contributors - may be used to endorse or promote products derived from this - software without specific prior written permission. - - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. \ No newline at end of file
[arch-commits] Commit in sbt/trunk (PKGBUILD)
Date: Sunday, March 29, 2015 @ 16:10:50
Author: guillaume
Revision: 130196
Upstream relase 0.13.18 and fixed license
Modified:
sbt/trunk/PKGBUILD
--+
PKGBUILD | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-29 12:38:54 UTC (rev 130195)
+++ PKGBUILD2015-03-29 14:10:50 UTC (rev 130196)
@@ -1,24 +1,28 @@
# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Andrea Scarpino and...@archlinux.org
# Contributor: Leif Warner abimel...@gmail.com
pkgname=sbt
epoch=1
-pkgver=0.13.7
+pkgver=0.13.8
pkgrel=1
pkgdesc=A minimally intrusive build tool for Scala projects
arch=('any')
url='http://www.scala-sbt.org/'
-license=('custom' 'APACHE')
+license=('BSD')
depends=('java-runtime-headless' 'sh')
-source=(http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${pkgver}/sbt-launch.jar;
-'LICENSE' 'LICENSE_Scala' 'sbt.sh' 'sbt.conf.sh' 'sbt.conf.csh')
-md5sums=('7341059aa30c953021d6af41c89d2cac'
- '0cc49331142988765ce73782a5839c57'
- '4a09aae439532404ef76d0ba1db3342c'
- 'd7b78b04e20ceb05c6870757bce6d3d9'
- 'd3691d3866b0f4e35d4cdc15fac495ef'
- 'db3701bd6facf736100efa5871847564')
+IFS='.' read -a _pkgver ${pkgver}
+source=(http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${pkgver}/sbt-launch.jar
+
https://raw.githubusercontent.com/${pkgname}/${pkgname}/${_pkgver[1].${_pkgver[2]}}/LICENSE
+sbt.sh
+sbt.conf.sh
+sbt.conf.csh)
+sha256sums=('6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158'
+'8753689166238271fd8dceb33ff9dbd90fd8620a56b8387bca2b8807ce3209ca'
+'68f25719dde7e7de53e5f42eddd5d36e275a83cbb9f6a28208f245404233a6c7'
+'b90676fc30faa4ad2ec3beb7815491bb58cd6e057ec0593664344d6711482357'
+'b8825593744535787d2c227b61e4ffa2e95a7da071a6488c108ad79abeb9e182')
package() {
install -d ${pkgdir}/usr/share/java/${pkgname}
@@ -31,8 +35,5 @@
install -Dm644 ${srcdir}/sbt.conf.sh ${pkgdir}/etc/profile.d/sbt.sh
install -Dm644 ${srcdir}/sbt.conf.csh ${pkgdir}/etc/profile.d/sbt.csh
- install -Dm644 ${srcdir}/LICENSE \
-${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- install -Dm644 ${srcdir}/LICENSE_Scala \
-${pkgdir}/usr/share/licenses/${pkgname}/LICENSE_Scala
+ install -D -m644 ${srcdir}/LICENSE
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
[arch-commits] Commit in tomcat8/repos/extra-any (10 files)
Date: Saturday, March 28, 2015 @ 11:09:35
Author: guillaume
Revision: 235211
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 235210, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
(from rev 235210, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 235210, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 235210, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 235210, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat8.conf |2
systemd_tmpfiles.d_tomcat8.conf | 10 +-
systemd_tomcat8.service | 66
tomcat8.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-03-28 10:08:52 UTC (rev 235210)
+++ PKGBUILD2015-03-28 10:09:35 UTC (rev 235211)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.20
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('74870fea2930c10f39d586dc26b3f488f3c8b51f3030e74561e462188609a390'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
-'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Saturday, March 28, 2015 @ 11:08:52
Author: guillaume
Revision: 235210
Upstream release 8.0.21
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-28 10:03:48 UTC (rev 235209)
+++ PKGBUILD2015-03-28 10:08:52 UTC (rev 235210)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
-pkgver=8.0.20
+pkgver=8.0.21
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('74870fea2930c10f39d586dc26b3f488f3c8b51f3030e74561e462188609a390'
+sha256sums=('a009f855ac7ac910a51e2259bb24bd8b3fc1be7af75a3a9feb53f883dc6c6a88'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
[arch-commits] Commit in tomcat-native/trunk (PKGBUILD)
Date: Saturday, March 28, 2015 @ 11:14:31
Author: guillaume
Revision: 235212
Upstream release 1.1.33
Modified:
tomcat-native/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-28 10:09:35 UTC (rev 235211)
+++ PKGBUILD2015-03-28 10:14:31 UTC (rev 235212)
@@ -2,7 +2,7 @@
# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
pkgname=tomcat-native
-pkgver=1.1.32
+pkgver=1.1.33
pkgrel=1
pkgdesc='Optional component for Tomcat to use certain native resources for
performance, compatibility'
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
makedepends=('java-environment')
options=('!emptydirs')
source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-sha256sums=('26936848f727e162f513bd2b5f7b2300d7d716a5e92e5f4ebcd0e1eff8e09584')
+sha256sums=('523dde7393c57307eedf4972ebbe19a9e9af6f7699e3b1ef6dabd7a11677866e')
build() {
cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
[arch-commits] Commit in tomcat-native/repos (4 files)
Date: Saturday, March 28, 2015 @ 11:15:00
Author: guillaume
Revision: 235213
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
tomcat-native/repos/extra-i686/PKGBUILD
(from rev 235212, tomcat-native/trunk/PKGBUILD)
tomcat-native/repos/extra-x86_64/PKGBUILD
(from rev 235212, tomcat-native/trunk/PKGBUILD)
Deleted:
tomcat-native/repos/extra-i686/PKGBUILD
tomcat-native/repos/extra-x86_64/PKGBUILD
---+
/PKGBUILD | 64
extra-i686/PKGBUILD | 32
extra-x86_64/PKGBUILD | 32
3 files changed, 64 insertions(+), 64 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-03-28 10:14:31 UTC (rev 235212)
+++ extra-i686/PKGBUILD 2015-03-28 10:15:00 UTC (rev 235213)
@@ -1,32 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
-
-pkgname=tomcat-native
-pkgver=1.1.32
-pkgrel=1
-pkgdesc='Optional component for Tomcat to use certain native resources for
performance, compatibility'
-arch=('i686' 'x86_64')
-url='http://tomcat.apache.org/native-doc/'
-license=('APACHE')
-depends=('apr')
-makedepends=('java-environment')
-options=('!emptydirs')
-source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-sha256sums=('26936848f727e162f513bd2b5f7b2300d7d716a5e92e5f4ebcd0e1eff8e09584')
-
-build() {
- cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
-
- ./configure \
---prefix=/usr \
---with-java-home=/usr/lib/jvm/default \
---with-apr=/usr \
---with-ssl=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}-src/jni/native
-
- make DESTDIR=${pkgdir} install
-}
Copied: tomcat-native/repos/extra-i686/PKGBUILD (from rev 235212,
tomcat-native/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-03-28 10:15:00 UTC (rev 235213)
@@ -0,0 +1,32 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
+
+pkgname=tomcat-native
+pkgver=1.1.33
+pkgrel=1
+pkgdesc='Optional component for Tomcat to use certain native resources for
performance, compatibility'
+arch=('i686' 'x86_64')
+url='http://tomcat.apache.org/native-doc/'
+license=('APACHE')
+depends=('apr')
+makedepends=('java-environment')
+options=('!emptydirs')
+source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
+sha256sums=('523dde7393c57307eedf4972ebbe19a9e9af6f7699e3b1ef6dabd7a11677866e')
+
+build() {
+ cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
+
+ ./configure \
+--prefix=/usr \
+--with-java-home=/usr/lib/jvm/default \
+--with-apr=/usr \
+--with-ssl=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}-src/jni/native
+
+ make DESTDIR=${pkgdir} install
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2015-03-28 10:14:31 UTC (rev 235212)
+++ extra-x86_64/PKGBUILD 2015-03-28 10:15:00 UTC (rev 235213)
@@ -1,32 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
-
-pkgname=tomcat-native
-pkgver=1.1.32
-pkgrel=1
-pkgdesc='Optional component for Tomcat to use certain native resources for
performance, compatibility'
-arch=('i686' 'x86_64')
-url='http://tomcat.apache.org/native-doc/'
-license=('APACHE')
-depends=('apr')
-makedepends=('java-environment')
-options=('!emptydirs')
-source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-sha256sums=('26936848f727e162f513bd2b5f7b2300d7d716a5e92e5f4ebcd0e1eff8e09584')
-
-build() {
- cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
-
- ./configure \
---prefix=/usr \
---with-java-home=/usr/lib/jvm/default \
---with-apr=/usr \
---with-ssl=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}-src/jni/native
-
- make DESTDIR=${pkgdir} install
-}
Copied: tomcat-native/repos/extra-x86_64/PKGBUILD (from rev 235212,
tomcat-native/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-03-28 10:15:00 UTC (rev 235213)
@@ -0,0 +1,32 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
+
+pkgname=tomcat-native
+pkgver=1.1.33
+pkgrel=1
+pkgdesc='Optional component for Tomcat to use certain native resources for
performance, compatibility'
+arch=('i686' 'x86_64')
+url='http://tomcat.apache.org/native-doc/'
+license=('APACHE')
+depends=('apr')
+makedepends
[arch-commits] Commit in java8-openjdk/repos (22 files)
Date: Sunday, March 15, 2015 @ 11:01:13 Author: guillaume Revision: 233867 archrelease: copy trunk to extra-i686, extra-x86_64 Added: java8-openjdk/repos/extra-i686/PKGBUILD (from rev 233866, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-i686/install_jdk8-openjdk.sh (from rev 233866, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-i686/install_jre8-openjdk-headless.sh (from rev 233866, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-i686/install_jre8-openjdk.sh (from rev 233866, java8-openjdk/trunk/install_jre8-openjdk.sh) java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 233866, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh (from rev 233866, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh (from rev 233866, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 233866, java8-openjdk/trunk/install_jre8-openjdk.sh) Deleted: java8-openjdk/repos/extra-i686/001_adjust-mflags-for-gmake-4.patch java8-openjdk/repos/extra-i686/002_gcc.make-4.9.patch java8-openjdk/repos/extra-i686/003_nonreparenting-wm.patch java8-openjdk/repos/extra-i686/PKGBUILD java8-openjdk/repos/extra-i686/install_jdk8-openjdk.sh java8-openjdk/repos/extra-i686/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-i686/install_jre8-openjdk.sh java8-openjdk/repos/extra-x86_64/001_adjust-mflags-for-gmake-4.patch java8-openjdk/repos/extra-x86_64/002_gcc.make-4.9.patch java8-openjdk/repos/extra-x86_64/003_nonreparenting-wm.patch java8-openjdk/repos/extra-x86_64/PKGBUILD java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh --+ /PKGBUILD| 560 + /install_jdk8-openjdk.sh | 100 +++ /install_jre8-openjdk-headless.sh| 96 +++ /install_jre8-openjdk.sh | 110 extra-i686/001_adjust-mflags-for-gmake-4.patch | 46 - extra-i686/002_gcc.make-4.9.patch| 12 extra-i686/003_nonreparenting-wm.patch | 39 - extra-i686/PKGBUILD | 292 -- extra-i686/install_jdk8-openjdk.sh | 50 - extra-i686/install_jre8-openjdk-headless.sh | 48 - extra-i686/install_jre8-openjdk.sh | 55 -- extra-x86_64/001_adjust-mflags-for-gmake-4.patch | 46 - extra-x86_64/002_gcc.make-4.9.patch | 12 extra-x86_64/003_nonreparenting-wm.patch | 39 - extra-x86_64/PKGBUILD| 292 -- extra-x86_64/install_jdk8-openjdk.sh | 50 - extra-x86_64/install_jre8-openjdk-headless.sh| 48 - extra-x86_64/install_jre8-openjdk.sh | 55 -- 18 files changed, 866 insertions(+), 1084 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 233866:233867 to see the changes.
[arch-commits] Commit in java8-openjdk/trunk (4 files)
Date: Sunday, March 15, 2015 @ 10:51:40
Author: guillaume
Revision: 233866
Upstream release 8.u40. Removed all patches.
Modified:
java8-openjdk/trunk/PKGBUILD
Deleted:
java8-openjdk/trunk/001_adjust-mflags-for-gmake-4.patch
java8-openjdk/trunk/002_gcc.make-4.9.patch
java8-openjdk/trunk/003_nonreparenting-wm.patch
-+
001_adjust-mflags-for-gmake-4.patch | 46 --
002_gcc.make-4.9.patch | 12
003_nonreparenting-wm.patch | 39
PKGBUILD| 34 -
4 files changed, 11 insertions(+), 120 deletions(-)
Deleted: 001_adjust-mflags-for-gmake-4.patch
===
--- 001_adjust-mflags-for-gmake-4.patch 2015-03-15 09:19:06 UTC (rev 233865)
+++ 001_adjust-mflags-for-gmake-4.patch 2015-03-15 09:51:40 UTC (rev 233866)
@@ -1,46 +0,0 @@
-
-# HG changeset patch
-# User henryjen
-# Date 1390363634 28800
-# Node ID e8d4d0db1f06c26defcbf68e6713afab632f3f30
-# Parent c4b78cbea876aa86112cfda16c0026796848d582
-8028407: adjust-mflags.sh failed build with GNU Make 4.0 with -Ipath contains
j
-Reviewed-by: erikj
-
-diff -r c4b78cbea876 -r e8d4d0db1f06 make/bsd/makefiles/adjust-mflags.sh
a/make/bsd/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800
-+++ b/make/bsd/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800
-@@ -64,7 +64,7 @@
- echo $MFLAGS \
- | sed '
- s/^-/ -/
-- s/ -\([^][^ ]*\)j/ -\1 -j/
-+ s/ -\([^I][^I]*\)j/ -\1 -j/
- s/ -j[0-9][0-9]*/ -j/
- s/ -j\([^ ]\)/ -j -\1/
- s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-diff -r c4b78cbea876 -r e8d4d0db1f06 make/linux/makefiles/adjust-mflags.sh
a/make/linux/makefiles/adjust-mflags.shThu Dec 05 00:36:42 2013 -0800
-+++ b/make/linux/makefiles/adjust-mflags.shTue Jan 21 20:07:14 2014 -0800
-@@ -64,7 +64,7 @@
- echo $MFLAGS \
- | sed '
- s/^-/ -/
-- s/ -\([^][^ ]*\)j/ -\1 -j/
-+ s/ -\([^I][^I]*\)j/ -\1 -j/
- s/ -j[0-9][0-9]*/ -j/
- s/ -j\([^ ]\)/ -j -\1/
- s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-diff -r c4b78cbea876 -r e8d4d0db1f06 make/solaris/makefiles/adjust-mflags.sh
a/make/solaris/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800
-+++ b/make/solaris/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800
-@@ -64,7 +64,7 @@
- echo $MFLAGS \
- | sed '
- s/^-/ -/
-- s/ -\([^][^ ]*\)j/ -\1 -j/
-+ s/ -\([^I][^I]*\)j/ -\1 -j/
- s/ -j[0-9][0-9]*/ -j/
- s/ -j\([^ ]\)/ -j -\1/
- s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-
Deleted: 002_gcc.make-4.9.patch
===
--- 002_gcc.make-4.9.patch 2015-03-15 09:19:06 UTC (rev 233865)
+++ 002_gcc.make-4.9.patch 2015-03-15 09:51:40 UTC (rev 233866)
@@ -1,12 +0,0 @@
old/make/linux/makefiles/gcc.make 2014-04-23 22:07:59.838205838 +0100
-+++ new/make/linux/makefiles/gcc.make 2014-04-23 22:07:59.754204533 +0100
-@@ -266,6 +266,9 @@
- ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \ $(CC_VER_MINOR) = 3), 1)
- OPT_CFLAGS/mulnode.o += $(OPT_CFLAGS/NOOPT)
- endif
-+ ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \ $(CC_VER_MINOR) = 9), 1)
-+OPT_CFLAGS/macroAssembler_x86.o += -fno-devirtualize
-+ endif
- endif
-
- # Flags for generating make dependency flags.
Deleted: 003_nonreparenting-wm.patch
===
--- 003_nonreparenting-wm.patch 2015-03-15 09:19:06 UTC (rev 233865)
+++ 003_nonreparenting-wm.patch 2015-03-15 09:51:40 UTC (rev 233866)
@@ -1,39 +0,0 @@
src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:41:39.018530981
-0400
-+++ src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:46:43.098540372
-0400
-@@ -104,7 +104,8 @@
- COMPIZ_WM = 12,
- LG3D_WM = 13,
- CWM_WM = 14,
--MUTTER_WM = 15;
-+MUTTER_WM = 15,
-+OTHER_NONREPARENTING_WM = 16;
- public String toString() {
- switch (WMID) {
- case NO_WM:
-@@ -596,7 +597,7 @@
- }
-
- static boolean isNonReparentingWM() {
--return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() ==
XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
-+return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() ==
XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() ==
XWM.OTHER_NONREPARENTING_WM);
- }
-
- /*
-@@ -786,6 +787,9 @@
- } else if (doIsIceWM isIceWM()) {
- awt_wmgr = XWM.ICE_WM;
- }
-+else if
[arch-commits] Commit in junit/trunk (Manifest.txt PKGBUILD)
Date: Sunday, March 1, 2015 @ 14:55:35
Author: guillaume
Revision: 232358
Upstream version 1.12 + use binary distribution
Modified:
junit/trunk/PKGBUILD
Deleted:
junit/trunk/Manifest.txt
--+
Manifest.txt |1 -
PKGBUILD | 42 +-
2 files changed, 9 insertions(+), 34 deletions(-)
Deleted: Manifest.txt
===
--- Manifest.txt2015-03-01 13:51:54 UTC (rev 232357)
+++ Manifest.txt2015-03-01 13:55:35 UTC (rev 232358)
@@ -1 +0,0 @@
-Class-Path: hamcrest-core.jar
Modified: PKGBUILD
===
--- PKGBUILD2015-03-01 13:51:54 UTC (rev 232357)
+++ PKGBUILD2015-03-01 13:55:35 UTC (rev 232358)
@@ -1,40 +1,16 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=junit
-pkgver=4.11
-pkgrel=4
-pkgdesc='Automated testing framework for Java'
+pkgver=4.12
+pkgrel=1
+pkgdesc='Simple JVM framework to write repeatable tests'
arch=('any')
-url='http://junit.sourceforge.net/'
-license=('CPL')
+url='http://junit.org/'
+license=('EPL')
depends=('java-environment' 'java-hamcrest')
-makedepends=('git' 'apache-ant')
-source=(Manifest.txt)
-sha256sums=('2b17a21ab3167302df8c41c3fec63e214b0405a760bc2b3e052be7341171fb1f')
+source=(http://search.maven.org/remotecontent?filepath=${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.jar)
+sha256sums=('59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a')
-build() {
- cd ${srcdir}
-
- # No source tarball available:
https://github.com/junit-team/junit/blob/r4.11/BUILDING
- # So building from specific github tag:
https://github.com/junit-team/junit/tags
- git clone https://github.com/junit-team/${pkgname}.git
- cd junit
- git checkout r${pkgver}
-
- ant dist -Dversion-status=''
-
- # FS#34273
- jar ufm ${pkgname}${pkgver}/${pkgname}-dep-${pkgver}.jar
${srcdir}/Manifest.txt
-}
-
-check() {
- cd ${srcdir}/${pkgname}
-
- ant test
-}
-
package() {
- install -Dm644
${srcdir}/${pkgname}/${pkgname}${pkgver}/${pkgname}-dep-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}-${pkgver}.jar
- ln -s ${pkgname}-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}.jar
+ install -D -m 644 ${srcdir}/${pkgname}-${pkgver}.jar
${pkgdir}/usr/share/java/${pkgname}-${pkgver}.jar
+ ln -s ${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}.jar
}
[arch-commits] Commit in java-hamcrest/trunk (PKGBUILD)
Date: Sunday, March 1, 2015 @ 14:51:54
Author: guillaume
Revision: 232357
Fix lib names and links
Modified:
java-hamcrest/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-01 13:26:25 UTC (rev 232356)
+++ PKGBUILD2015-03-01 13:51:54 UTC (rev 232357)
@@ -2,7 +2,7 @@
_libname=hamcrest
pkgname=java-${_libname}
pkgver=1.3
-pkgrel=2
+pkgrel=3
pkgdesc='Java matcher objects library'
arch=('any')
url='https://code.google.com/p/hamcrest'
@@ -28,9 +28,9 @@
install -dm755 ${pkgdir}/usr/share/java/${_libname}
for j in core library generator integration; do
-cp ${_libname}-${j}-${pkgver}.jar ${pkgdir}/usr/share/java/${_libname}
-ln -s ${_libname}/${_libname}-${j}-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${_libname}-${j}.jar
+cp ${_libname}-${j}-${pkgver}.jar
${pkgdir}/usr/share/java/${_libname}/${j}-${pkgver}.jar
+ln -s ${j}-${pkgver}.jar ${pkgdir}/usr/share/java/${_libname}/${j}.jar
+ln -s ${_libname}/${j}-${pkgver}.jar
${pkgdir}/usr/share/java/${_libname}-${j}.jar
done
install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Sunday, March 1, 2015 @ 20:26:41
Author: guillaume
Revision: 232392
Upstream release 8.0.20
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-01 18:58:46 UTC (rev 232391)
+++ PKGBUILD2015-03-01 19:26:41 UTC (rev 232392)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
-pkgver=8.0.18
-pkgrel=3
+pkgver=8.0.20
+pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
url='http://tomcat.apache.org/'
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
+sha256sums=('74870fea2930c10f39d586dc26b3f488f3c8b51f3030e74561e462188609a390'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
[arch-commits] Commit in tomcat8/repos/extra-any (10 files)
Date: Sunday, March 1, 2015 @ 20:27:20
Author: guillaume
Revision: 232393
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 232392, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
(from rev 232392, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 232392, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 232392, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 232392, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat8.conf |2
systemd_tmpfiles.d_tomcat8.conf | 10 +-
systemd_tomcat8.service | 66
tomcat8.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-03-01 19:26:41 UTC (rev 232392)
+++ PKGBUILD2015-03-01 19:27:20 UTC (rev 232393)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.18
-pkgrel=3
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
-'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in java-hamcrest/repos/extra-any (4 files)
Date: Sunday, March 1, 2015 @ 16:28:19
Author: guillaume
Revision: 232359
archrelease: copy trunk to extra-any
Added:
java-hamcrest/repos/extra-any/LICENSE.txt
(from rev 232358, java-hamcrest/trunk/LICENSE.txt)
java-hamcrest/repos/extra-any/PKGBUILD
(from rev 232358, java-hamcrest/trunk/PKGBUILD)
Deleted:
java-hamcrest/repos/extra-any/LICENSE.txt
java-hamcrest/repos/extra-any/PKGBUILD
-+
LICENSE.txt | 54 +-
PKGBUILD| 74 +-
2 files changed, 64 insertions(+), 64 deletions(-)
Deleted: LICENSE.txt
===
--- LICENSE.txt 2015-03-01 13:55:35 UTC (rev 232358)
+++ LICENSE.txt 2015-03-01 15:28:19 UTC (rev 232359)
@@ -1,27 +0,0 @@
-BSD License
-
-Copyright (c) 2000-2006, www.hamcrest.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
list of
-conditions and the following disclaimer. Redistributions in binary form must
reproduce
-the above copyright notice, this list of conditions and the following
disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of Hamcrest nor the names of its contributors may be used to
endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
Copied: java-hamcrest/repos/extra-any/LICENSE.txt (from rev 232358,
java-hamcrest/trunk/LICENSE.txt)
===
--- LICENSE.txt (rev 0)
+++ LICENSE.txt 2015-03-01 15:28:19 UTC (rev 232359)
@@ -0,0 +1,27 @@
+BSD License
+
+Copyright (c) 2000-2006, www.hamcrest.org
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
list of
+conditions and the following disclaimer. Redistributions in binary form must
reproduce
+the above copyright notice, this list of conditions and the following
disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of Hamcrest nor the names of its contributors may be used to
endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
Deleted: PKGBUILD
===
--- PKGBUILD2015-03-01 13:55:35 UTC (rev 232358)
+++ PKGBUILD2015-03-01 15:28:19 UTC (rev 232359)
@@ -1,37 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-_libname=hamcrest
-pkgname=java-${_libname}
-pkgver=1.3
-pkgrel=2
-pkgdesc='Java matcher objects library'
-arch=('any')
-url='https://code.google.com/p/hamcrest'
-license=('BSD')
-depends=('java-runtime-headless')
-source=(https://${_libname}.googlecode.com/files/${_libname}-core-${pkgver}.jar
-
https://${_libname}.googlecode.com/files/${_libname}-library-${pkgver}.jar
-
https://${_libname}.googlecode.com/files/${_libname}-generator-${pkgver}.jar
-
https://${_libname}.googlecode.com/files/${_libname}-integration-${pkgver}.jar
[arch-commits] Commit in java8-openjdk/trunk (install_jdk8-openjdk.sh)
Date: Sunday, March 1, 2015 @ 17:35:57
Author: guillaume
Revision: 232380
Fix FS#43896 Usage of sudo in install script
Modified:
java8-openjdk/trunk/install_jdk8-openjdk.sh
-+
install_jdk8-openjdk.sh |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: install_jdk8-openjdk.sh
===
--- install_jdk8-openjdk.sh 2015-03-01 16:35:12 UTC (rev 232379)
+++ install_jdk8-openjdk.sh 2015-03-01 16:35:57 UTC (rev 232380)
@@ -42,9 +42,9 @@
pre_remove() {
if [ x$(fix_default) = x${THIS_JDK} ]; then
-sudo /usr/bin/archlinux-java unset
+/usr/bin/archlinux-java unset
if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
- sudo /usr/bin/archlinux-java set ${THIS_JDK}/jre
+ /usr/bin/archlinux-java set ${THIS_JDK}/jre
fi
fi
}
[arch-commits] Commit in java7-openjdk/trunk (jdk7-openjdk.install)
Date: Sunday, March 1, 2015 @ 17:35:12
Author: guillaume
Revision: 232379
Fix FS#43896 Usage of sudo in install script
Modified:
java7-openjdk/trunk/jdk7-openjdk.install
--+
jdk7-openjdk.install |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: jdk7-openjdk.install
===
--- jdk7-openjdk.install2015-03-01 16:21:11 UTC (rev 232378)
+++ jdk7-openjdk.install2015-03-01 16:35:12 UTC (rev 232379)
@@ -42,9 +42,9 @@
pre_remove() {
if [ x$(fix_default) = x${THIS_JDK} ]; then
-sudo /usr/bin/archlinux-java unset
+/usr/bin/archlinux-java unset
if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
- sudo /usr/bin/archlinux-java set ${THIS_JDK}/jre
+ /usr/bin/archlinux-java set ${THIS_JDK}/jre
fi
fi
}
[arch-commits] Commit in junit/repos/extra-any (Manifest.txt PKGBUILD PKGBUILD)
Date: Sunday, March 1, 2015 @ 16:28:50
Author: guillaume
Revision: 232360
archrelease: copy trunk to extra-any
Added:
junit/repos/extra-any/PKGBUILD
(from rev 232359, junit/trunk/PKGBUILD)
Deleted:
junit/repos/extra-any/Manifest.txt
junit/repos/extra-any/PKGBUILD
--+
Manifest.txt |1 -
PKGBUILD | 56
2 files changed, 16 insertions(+), 41 deletions(-)
Deleted: Manifest.txt
===
--- Manifest.txt2015-03-01 15:28:19 UTC (rev 232359)
+++ Manifest.txt2015-03-01 15:28:50 UTC (rev 232360)
@@ -1 +0,0 @@
-Class-Path: hamcrest-core.jar
Deleted: PKGBUILD
===
--- PKGBUILD2015-03-01 15:28:19 UTC (rev 232359)
+++ PKGBUILD2015-03-01 15:28:50 UTC (rev 232360)
@@ -1,40 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=junit
-pkgver=4.11
-pkgrel=4
-pkgdesc='Automated testing framework for Java'
-arch=('any')
-url='http://junit.sourceforge.net/'
-license=('CPL')
-depends=('java-environment' 'java-hamcrest')
-makedepends=('git' 'apache-ant')
-source=(Manifest.txt)
-sha256sums=('2b17a21ab3167302df8c41c3fec63e214b0405a760bc2b3e052be7341171fb1f')
-
-build() {
- cd ${srcdir}
-
- # No source tarball available:
https://github.com/junit-team/junit/blob/r4.11/BUILDING
- # So building from specific github tag:
https://github.com/junit-team/junit/tags
- git clone https://github.com/junit-team/${pkgname}.git
- cd junit
- git checkout r${pkgver}
-
- ant dist -Dversion-status=''
-
- # FS#34273
- jar ufm ${pkgname}${pkgver}/${pkgname}-dep-${pkgver}.jar
${srcdir}/Manifest.txt
-}
-
-check() {
- cd ${srcdir}/${pkgname}
-
- ant test
-}
-
-package() {
- install -Dm644
${srcdir}/${pkgname}/${pkgname}${pkgver}/${pkgname}-dep-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}-${pkgver}.jar
- ln -s ${pkgname}-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}.jar
-}
Copied: junit/repos/extra-any/PKGBUILD (from rev 232359, junit/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-03-01 15:28:50 UTC (rev 232360)
@@ -0,0 +1,16 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=junit
+pkgver=4.12
+pkgrel=1
+pkgdesc='Simple JVM framework to write repeatable tests'
+arch=('any')
+url='http://junit.org/'
+license=('EPL')
+depends=('java-environment' 'java-hamcrest')
+source=(http://search.maven.org/remotecontent?filepath=${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.jar)
+sha256sums=('59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a')
+
+package() {
+ install -D -m 644 ${srcdir}/${pkgname}-${pkgver}.jar
${pkgdir}/usr/share/java/${pkgname}-${pkgver}.jar
+ ln -s ${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}.jar
+}
[arch-commits] Commit in tomcat6/trunk (3 files)
Date: Saturday, February 14, 2015 @ 12:19:10
Author: guillaume
Revision: 231389
Report latest changes from tomcat7/8
- Create 'tomcat' user throught systemd
- Do not remove 'tomcat' user after package removal
- Fix /var/tmp/tomcat6 rights
Added:
tomcat6/trunk/systemd_sysusers.d_tomcat6.conf
Modified:
tomcat6/trunk/PKGBUILD
tomcat6/trunk/tomcat6.install
-+
PKGBUILD| 13 ++---
systemd_sysusers.d_tomcat6.conf |1 +
tomcat6.install | 24
3 files changed, 15 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-14 06:06:25 UTC (rev 231388)
+++ PKGBUILD2015-02-14 11:19:10 UTC (rev 231389)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat6
pkgver=6.0.43
-pkgrel=1
+pkgrel=2
pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer
Pages 2.1 technologies'
arch=('any')
url='http://tomcat.apache.org/'
@@ -18,8 +18,8 @@
install=${pkgname}.install
source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
+systemd_sysusers.d_${pkgname}.conf
+systemd_tmpfiles.d_${pkgname}.conf)
sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
@@ -61,6 +61,7 @@
install -dm775 ${pkgdir}/var/lib/${pkgname}
cp -r webapps ${pkgdir}/var/lib/${pkgname}
chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
+ chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
install -dm1777 ${pkgdir}/var/tmp
@@ -70,6 +71,12 @@
install -Dm644 ${srcdir}/systemd_${pkgname}.service \
${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+ install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
+ ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
}
+sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
+'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
+'59307049dab88a7adeb3b0a8e5c77a6e5950b48482be09650d899222c521b589'
+'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80')
Added: systemd_sysusers.d_tomcat6.conf
===
--- systemd_sysusers.d_tomcat6.conf (rev 0)
+++ systemd_sysusers.d_tomcat6.conf 2015-02-14 11:19:10 UTC (rev 231389)
@@ -0,0 +1 @@
+u tomcat 66 Tomcat 6 user /usr/share/tomcat6
Modified: tomcat6.install
===
--- tomcat6.install 2015-02-14 06:06:25 UTC (rev 231388)
+++ tomcat6.install 2015-02-14 11:19:10 UTC (rev 231389)
@@ -1,16 +1,6 @@
-_pkgname='tomcat6'
-_gid_tomcat_name='tomcat'
-_gid_tomcat=66
-_uid_tomcat_name='tomcat'
-_uid_tomcat=66
-
post_install() {
- if ! getent group ${_gid_tomcat_name} /dev/null 21; then
-groupadd -g ${_gid_tomcat} ${_gid_tomcat_name}
- fi
- if ! getent passwd ${_uid_tomcat_name} /dev/null 21; then
-useradd -u ${_uid_tomcat} -g ${_gid_tomcat_name} -d
/usr/share/${_pkgname} -s /bin/false ${_uid_tomcat_name}
- fi
+systemd-sysusers tomcat6.conf
+systemd-tmpfiles --create tomcat6.conf
if [ -f lib/modules/$(uname -r)/kernel/security/capability.ko ]; then
echo 'It appears that your current kernel has linux security'
@@ -24,12 +14,6 @@
}
pre_remove() {
- if getent passwd ${_uid_tomcat_name} /dev/null 21; then
-userdel ${_uid_tomcat_name}
- fi
- if getent group ${_gid_tomcat_name} /dev/null 21; then
-groupdel ${_gid_tomcat_name}
- fi
-
- echo To fully clean Tomcat's file, consider removing directories
/var/{lib,tmp,log}/${_pkgname}
+ echo Leftover files may reside in /var/{lib,tmp,log}/tomcat6
+ echo If you remove them, you may also want to remove user and group
'tomcat'
}
[arch-commits] Commit in tomcat6/repos/extra-any (9 files)
Date: Saturday, February 14, 2015 @ 12:22:12
Author: guillaume
Revision: 231390
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 231389, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/systemd_sysusers.d_tomcat6.conf
(from rev 231389, tomcat6/trunk/systemd_sysusers.d_tomcat6.conf)
tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 231389, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 231389, tomcat6/trunk/systemd_tomcat6.service)
tomcat6/repos/extra-any/tomcat6.install
(from rev 231389, tomcat6/trunk/tomcat6.install)
Deleted:
tomcat6/repos/extra-any/PKGBUILD
tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
tomcat6/repos/extra-any/systemd_tomcat6.service
tomcat6/repos/extra-any/tomcat6.install
-+
PKGBUILD| 157 +++---
systemd_sysusers.d_tomcat6.conf |1
systemd_tmpfiles.d_tomcat6.conf |6 -
systemd_tomcat6.service | 66 +++
tomcat6.install | 54 -
5 files changed, 138 insertions(+), 146 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-02-14 11:19:10 UTC (rev 231389)
+++ PKGBUILD2015-02-14 11:22:12 UTC (rev 231390)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.43
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer
Pages 2.1 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}
Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 231389,
tomcat6/trunk/PKGBUILD
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Monday, February 9, 2015 @ 21:41:08
Author: guillaume
Revision: 231196
Remove install file from source list
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-09 20:22:56 UTC (rev 231195)
+++ PKGBUILD2015-02-09 20:41:08 UTC (rev 231196)
@@ -19,14 +19,12 @@
source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
systemd_${pkgname}.service
systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
+systemd_tmpfiles.d_${pkgname}.conf)
sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'3f69c07659509bd1ae9d94cecbbba7c9072f0ede69e0a69d05b67a66aef9f686'
-'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847'
-'812e658d541f82ec20cf6933816e144e469665ecbf0f65ad0b1864cc3ded129f')
+'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847')
_gid_log=19
_gid_tomcat=57
[arch-commits] Commit in tomcat8/trunk (PKGBUILD systemd_sysusers.d_tomcat8.conf)
Date: Monday, February 9, 2015 @ 22:26:55
Author: guillaume
Revision: 231201
Fix typo in systemd user name
Modified:
tomcat8/trunk/PKGBUILD
tomcat8/trunk/systemd_sysusers.d_tomcat8.conf
-+
PKGBUILD|4 ++--
systemd_sysusers.d_tomcat8.conf |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-09 21:13:30 UTC (rev 231200)
+++ PKGBUILD2015-02-09 21:26:55 UTC (rev 231201)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
pkgver=8.0.18
-pkgrel=2
+pkgrel=3
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
url='http://tomcat.apache.org/'
@@ -23,7 +23,7 @@
sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'3f69c07659509bd1ae9d94cecbbba7c9072f0ede69e0a69d05b67a66aef9f686'
+'02e7a1edb82ed117629189806d40c2c7b70ec994ecbafc11cb7dc7eec35af216'
'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
_gid_log=19
Modified: systemd_sysusers.d_tomcat8.conf
===
--- systemd_sysusers.d_tomcat8.conf 2015-02-09 21:13:30 UTC (rev 231200)
+++ systemd_sysusers.d_tomcat8.conf 2015-02-09 21:26:55 UTC (rev 231201)
@@ -1 +1 @@
-u tomat8 57 Tomcat 8 user /usr/share/tomcat8
+u tomcat8 57 Tomcat 8 user /usr/share/tomcat8
[arch-commits] Commit in tomcat8/repos/extra-any (10 files)
Date: Monday, February 9, 2015 @ 22:27:41
Author: guillaume
Revision: 231202
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 231201, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
(from rev 231201, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 231201, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 231201, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 231201, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 156 +++---
systemd_sysusers.d_tomcat8.conf |2
systemd_tmpfiles.d_tomcat8.conf | 10 +-
systemd_tomcat8.service | 66
tomcat8.install | 38 -
5 files changed, 136 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-02-09 21:26:55 UTC (rev 231201)
+++ PKGBUILD2015-02-09 21:27:41 UTC (rev 231202)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.18
-pkgrel=2
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'3f69c07659509bd1ae9d94cecbbba7c9072f0ede69e0a69d05b67a66aef9f686'
-'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
- install -Dm644
[arch-commits] Commit in tomcat8/trunk (3 files)
Date: Monday, February 9, 2015 @ 22:07:44
Author: guillaume
Revision: 231198
Fix creation of tmp files by systemd
Modified:
tomcat8/trunk/PKGBUILD
tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf
tomcat8/trunk/tomcat8.install
-+
PKGBUILD|3 ++-
systemd_tmpfiles.d_tomcat8.conf |8 +---
tomcat8.install |3 ++-
3 files changed, 9 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-09 20:46:58 UTC (rev 231197)
+++ PKGBUILD2015-02-09 21:07:44 UTC (rev 231198)
@@ -24,7 +24,7 @@
sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'3f69c07659509bd1ae9d94cecbbba7c9072f0ede69e0a69d05b67a66aef9f686'
-'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847')
+'0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
_gid_log=19
_gid_tomcat=57
@@ -61,6 +61,7 @@
install -dm775 ${pkgdir}/var/lib/${pkgname}
cp -r webapps ${pkgdir}/var/lib/${pkgname}
chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
+ chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
install -dm1777 ${pkgdir}/var/tmp
Modified: systemd_tmpfiles.d_tomcat8.conf
===
--- systemd_tmpfiles.d_tomcat8.conf 2015-02-09 20:46:58 UTC (rev 231197)
+++ systemd_tmpfiles.d_tomcat8.conf 2015-02-09 21:07:44 UTC (rev 231198)
@@ -1,3 +1,5 @@
-d /var/tmp/tomcat8
-d /var/tmp/tomcat8/temp 0775tomcat8 tomcat8
-d /var/tmp/tomcat8/work 0775tomcat8 tomcat8
+d /var/tmp/tomcat8/temp 0775 tomcat8 tomcat8
+d /var/tmp/tomcat8/work 0775 tomcat8 tomcat8
+d /var/lib/tomcat8 0775 tomcat8 tomcat8
+d /var/lib/tomcat8/webapps 0775 tomcat8 tomcat8
+d /var/log/tomcat8 0775 tomcat8 log
Modified: tomcat8.install
===
--- tomcat8.install 2015-02-09 20:46:58 UTC (rev 231197)
+++ tomcat8.install 2015-02-09 21:07:44 UTC (rev 231198)
@@ -1,5 +1,6 @@
post_install() {
systemd-sysusers tomcat8.conf
+systemd-tmpfiles --create tomcat8.conf
if [ -f lib/modules/$(uname -r)/kernel/security/capability.ko ]; then
echo 'It appears that your current kernel has linux security'
@@ -13,6 +14,6 @@
}
pre_remove() {
- echo Leftover files may exist in /var/{lib,tmp,log}/tomcat8
+ echo Leftover files may reside in /var/{lib,tmp,log}/tomcat8
echo If you remove them, you may also want to remove user and group
'tomcat8'
}
[arch-commits] Commit in tomcat8/trunk (PKGBUILD systemd_sysusers.d_tomcat8.conf)
Date: Monday, February 9, 2015 @ 22:08:47
Author: guillaume
Revision: 231199
Add sysuser systemd file and pkgrel bump
Added:
tomcat8/trunk/systemd_sysusers.d_tomcat8.conf
Modified:
tomcat8/trunk/PKGBUILD
-+
PKGBUILD|2 +-
systemd_sysusers.d_tomcat8.conf |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-09 21:07:44 UTC (rev 231198)
+++ PKGBUILD2015-02-09 21:08:47 UTC (rev 231199)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
pkgver=8.0.18
-pkgrel=1
+pkgrel=2
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
url='http://tomcat.apache.org/'
Added: systemd_sysusers.d_tomcat8.conf
===
--- systemd_sysusers.d_tomcat8.conf (rev 0)
+++ systemd_sysusers.d_tomcat8.conf 2015-02-09 21:08:47 UTC (rev 231199)
@@ -0,0 +1 @@
+u tomat8 57 Tomcat 8 user /usr/share/tomcat8
[arch-commits] Commit in tomcat8/repos/extra-any (9 files)
Date: Monday, February 9, 2015 @ 22:13:30
Author: guillaume
Revision: 231200
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 231199, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_sysusers.d_tomcat8.conf
(from rev 231199, tomcat8/trunk/systemd_sysusers.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 231199, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 231199, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 231199, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 153 +++---
systemd_sysusers.d_tomcat8.conf |1
systemd_tmpfiles.d_tomcat8.conf |8 +
systemd_tomcat8.service | 66
tomcat8.install | 54 -
5 files changed, 136 insertions(+), 146 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-02-09 21:08:47 UTC (rev 231199)
+++ PKGBUILD2015-02-09 21:13:30 UTC (rev 231200)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.18
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.zip
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('42834da73bdd5e445312d2f6ccaec11ce0b294cb33d2b92c5f1085cc8198c4f7'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847'
-'32fcb0f44e32cd8901e936ebad4942a399efa8b98fdc42f5345dd8929b6c1887')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}
Copied: tomcat8/repos/extra-any/PKGBUILD (from rev 231199,
tomcat8/trunk/PKGBUILD
[arch-commits] Commit in tomcat7/repos/extra-any (9 files)
Date: Monday, February 9, 2015 @ 22:42:39
Author: guillaume
Revision: 231205
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 231204, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 231204, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 231204, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 231204, tomcat7/trunk/systemd_tomcat7.service)
tomcat7/repos/extra-any/tomcat7.install
(from rev 231204, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tomcat7.service
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 153 +++---
systemd_sysusers.d_tomcat7.conf |1
systemd_tmpfiles.d_tomcat7.conf |8 +
systemd_tomcat7.service | 66
tomcat7.install | 54 -
5 files changed, 136 insertions(+), 146 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-02-09 21:40:11 UTC (rev 231204)
+++ PKGBUILD2015-02-09 21:42:39 UTC (rev 231205)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.57
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('1ce390049ed23143e3db0c94781c1e88a4d1b39ceb471c0af088a0c326d637cb'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}
Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 231204,
tomcat7/trunk/PKGBUILD
[arch-commits] Commit in tomcat7/trunk (PKGBUILD systemd_sysusers.d_tomcat7.conf)
Date: Monday, February 9, 2015 @ 22:40:11
Author: guillaume
Revision: 231204
Add systemd sysuser file and upstream release 7.0.59
Added:
tomcat7/trunk/systemd_sysusers.d_tomcat7.conf
Modified:
tomcat7/trunk/PKGBUILD
-+
PKGBUILD|6 +++---
systemd_sysusers.d_tomcat7.conf |1 +
2 files changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-09 21:32:07 UTC (rev 231203)
+++ PKGBUILD2015-02-09 21:40:11 UTC (rev 231204)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
-pkgver=7.0.57
-pkgrel=2
+pkgver=7.0.59
+pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
arch=('any')
url='http://tomcat.apache.org/'
@@ -21,7 +21,7 @@
systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf)
-sha256sums=('1ce390049ed23143e3db0c94781c1e88a4d1b39ceb471c0af088a0c326d637cb'
+sha256sums=('e0fe43d1fa17013bf7b3b2d3f71105d606a0582c153eb16fb210e7d5164941b0'
'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
Added: systemd_sysusers.d_tomcat7.conf
===
--- systemd_sysusers.d_tomcat7.conf (rev 0)
+++ systemd_sysusers.d_tomcat7.conf 2015-02-09 21:40:11 UTC (rev 231204)
@@ -0,0 +1 @@
+u tomcat7 71 Tomcat 7 user /usr/share/tomcat7
[arch-commits] Commit in tomcat7/trunk (3 files)
Date: Monday, February 9, 2015 @ 22:32:07
Author: guillaume
Revision: 231203
User creation by systemd and fixes
Modified:
tomcat7/trunk/PKGBUILD
tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf
tomcat7/trunk/tomcat7.install
-+
PKGBUILD| 13 -
systemd_tmpfiles.d_tomcat7.conf |8 +---
tomcat7.install | 24
3 files changed, 17 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-09 21:27:41 UTC (rev 231202)
+++ PKGBUILD2015-02-09 21:32:07 UTC (rev 231203)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
pkgver=7.0.57
-pkgrel=1
+pkgrel=2
pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer
Pages 2.2 technologies'
arch=('any')
url='http://tomcat.apache.org/'
@@ -18,13 +18,13 @@
install=${pkgname}.install
source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
+systemd_sysusers.d_${pkgname}.conf
+systemd_tmpfiles.d_${pkgname}.conf)
sha256sums=('1ce390049ed23143e3db0c94781c1e88a4d1b39ceb471c0af088a0c326d637cb'
'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
+'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
+'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
_gid_log=19
_gid_tomcat=71
@@ -61,6 +61,7 @@
install -dm775 ${pkgdir}/var/lib/${pkgname}
cp -r webapps ${pkgdir}/var/lib/${pkgname}
chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
+ chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
install -dm1777 ${pkgdir}/var/tmp
@@ -70,6 +71,8 @@
install -Dm644 ${srcdir}/systemd_${pkgname}.service \
${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+ install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
+ ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
}
Modified: systemd_tmpfiles.d_tomcat7.conf
===
--- systemd_tmpfiles.d_tomcat7.conf 2015-02-09 21:27:41 UTC (rev 231202)
+++ systemd_tmpfiles.d_tomcat7.conf 2015-02-09 21:32:07 UTC (rev 231203)
@@ -1,3 +1,5 @@
-d /var/tmp/tomcat7
-d /var/tmp/tomcat7/temp 0775tomcat7 tomcat7
-d /var/tmp/tomcat7/work 0775tomcat7 tomcat7
+d /var/tmp/tomcat7/temp 0775 tomcat7 tomcat7
+d /var/tmp/tomcat7/work 0775 tomcat7 tomcat7
+d /var/lib/tomcat7 0775 tomcat7 tomcat7
+d /var/lib/tomcat7/webapps 0775 tomcat7 tomcat7
+d /var/log/tomcat7 0775 tomcat7 log
Modified: tomcat7.install
===
--- tomcat7.install 2015-02-09 21:27:41 UTC (rev 231202)
+++ tomcat7.install 2015-02-09 21:32:07 UTC (rev 231203)
@@ -1,16 +1,6 @@
-_pkgname='tomcat7'
-_gid_tomcat_name='tomcat7'
-_gid_tomcat=71
-_uid_tomcat_name='tomcat7'
-_uid_tomcat=71
-
post_install() {
- if ! getent group ${_gid_tomcat_name} /dev/null 21; then
-groupadd -g ${_gid_tomcat} ${_gid_tomcat_name}
- fi
- if ! getent passwd ${_uid_tomcat_name} /dev/null 21; then
-useradd -u ${_uid_tomcat} -g ${_gid_tomcat_name} -d
/usr/share/${_pkgname} -s /bin/false ${_uid_tomcat_name}
- fi
+systemd-sysusers tomcat7.conf
+systemd-tmpfiles --create tomcat7.conf
if [ -f lib/modules/$(uname -r)/kernel/security/capability.ko ]; then
echo 'It appears that your current kernel has linux security'
@@ -24,12 +14,6 @@
}
pre_remove() {
- if getent passwd ${_uid_tomcat_name} /dev/null 21; then
-userdel ${_uid_tomcat_name}
- fi
- if getent group ${_gid_tomcat_name} /dev/null 21; then
-groupdel ${_gid_tomcat_name}
- fi
-
- echo To fully clean Tomcat's file, consider removing directories
/var/{lib,tmp,log}/${_pkgname}
+ echo Leftover files may reside in /var/{lib,tmp,log}/tomcat7
+ echo If you remove them, you may also want to remove user and group
'tomcat7'
}
[arch-commits] Commit in easytag/trunk (PKGBUILD)
Date: Sunday, February 8, 2015 @ 19:38:52
Author: guillaume
Revision: 231149
Upstream release 2.2.6
Modified:
easytag/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-08 18:38:19 UTC (rev 231148)
+++ PKGBUILD2015-02-08 18:38:52 UTC (rev 231149)
@@ -5,7 +5,7 @@
# Contributor: dorphell dorph...@archlinux.org
pkgname=easytag
-pkgver=2.2.5
+pkgver=2.2.6
pkgrel=1
pkgdesc='Simple application for viewing and editing tags in audio files'
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
'desktop-file-utils' 'opusfile')
install=${pkgname}.install
source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a6da3a094997fa225d1c01211b282f2d3c2dfd93a74f3bec24017bd5a13f3855')
+sha256sums=('26437f0d698c3b16794336c335b40f53fa26aefeb77322e45e4e2501c4cff14a')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in easytag/repos (8 files)
Date: Sunday, February 8, 2015 @ 19:39:28
Author: guillaume
Revision: 231150
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
easytag/repos/extra-i686/PKGBUILD
(from rev 231149, easytag/trunk/PKGBUILD)
easytag/repos/extra-i686/easytag.install
(from rev 231149, easytag/trunk/easytag.install)
easytag/repos/extra-x86_64/PKGBUILD
(from rev 231149, easytag/trunk/PKGBUILD)
easytag/repos/extra-x86_64/easytag.install
(from rev 231149, easytag/trunk/easytag.install)
Deleted:
easytag/repos/extra-i686/PKGBUILD
easytag/repos/extra-i686/easytag.install
easytag/repos/extra-x86_64/PKGBUILD
easytag/repos/extra-x86_64/easytag.install
--+
/PKGBUILD| 70 +
/easytag.install | 24 ++
extra-i686/PKGBUILD | 35
extra-i686/easytag.install | 12 ---
extra-x86_64/PKGBUILD| 35
extra-x86_64/easytag.install | 12 ---
6 files changed, 94 insertions(+), 94 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-02-08 18:38:52 UTC (rev 231149)
+++ extra-i686/PKGBUILD 2015-02-08 18:39:28 UTC (rev 231150)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Kevin Piche ke...@archlinux.org
-# Contributor: Aaron Griffin aa...@archlinux.org
-# Contributor: dorphell dorph...@archlinux.org
-
-pkgname=easytag
-pkgver=2.2.5
-pkgrel=1
-pkgdesc='Simple application for viewing and editing tags in audio files'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://easytag.sourceforge.net/'
-makedepends=('intltool' 'itstool')
-depends=('id3lib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'wavpack'
'taglib'
- 'desktop-file-utils' 'opusfile')
-install=${pkgname}.install
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a6da3a094997fa225d1c01211b282f2d3c2dfd93a74f3bec24017bd5a13f3855')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make -k check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: easytag/repos/extra-i686/PKGBUILD (from rev 231149,
easytag/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-02-08 18:39:28 UTC (rev 231150)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Kevin Piche ke...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+
+pkgname=easytag
+pkgver=2.2.6
+pkgrel=1
+pkgdesc='Simple application for viewing and editing tags in audio files'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://easytag.sourceforge.net/'
+makedepends=('intltool' 'itstool')
+depends=('id3lib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'wavpack'
'taglib'
+ 'desktop-file-utils' 'opusfile')
+install=${pkgname}.install
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('26437f0d698c3b16794336c335b40f53fa26aefeb77322e45e4e2501c4cff14a')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make -k check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Deleted: extra-i686/easytag.install
===
--- extra-i686/easytag.install 2015-02-08 18:38:52 UTC (rev 231149)
+++ extra-i686/easytag.install 2015-02-08 18:39:28 UTC (rev 231150)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2 /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
Copied: easytag/repos/extra-i686/easytag.install (from rev 231149,
easytag/trunk/easytag.install)
===
--- extra-i686/easytag.install (rev 0)
+++ extra-i686/easytag.install 2015-02-08 18:39:28 UTC (rev 231150)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor 2 /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+post_install
+}
+
+post_remove() {
+post_install
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2015-02-08 18:38:52 UTC (rev 231149)
+++ extra-x86_64/PKGBUILD 2015-02-08 18:39:28 UTC (rev 231150)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Kevin Piche ke
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Thursday, February 5, 2015 @ 22:16:14
Author: guillaume
Revision: 230858
Fix FS#43692
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-05 20:50:17 UTC (rev 230857)
+++ PKGBUILD2015-02-05 21:16:14 UTC (rev 230858)
@@ -16,12 +16,12 @@
etc/${pkgname}/tomcat-users.xml
etc/${pkgname}/web.xml)
install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.zip
+source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
systemd_${pkgname}.service
systemd_tmpfiles.d_${pkgname}.conf
${pkgname}.install)
-sha256sums=('42834da73bdd5e445312d2f6ccaec11ce0b294cb33d2b92c5f1085cc8198c4f7'
+sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847'
'32fcb0f44e32cd8901e936ebad4942a399efa8b98fdc42f5345dd8929b6c1887')
[arch-commits] Commit in tomcat8/trunk (PKGBUILD tomcat8.install)
Date: Thursday, February 5, 2015 @ 23:53:25
Author: guillaume
Revision: 230880
Handle user creation with systemd
Modified:
tomcat8/trunk/PKGBUILD
tomcat8/trunk/tomcat8.install
-+
PKGBUILD|6 +-
tomcat8.install | 23 +++
2 files changed, 8 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-05 22:19:10 UTC (rev 230879)
+++ PKGBUILD2015-02-05 22:53:25 UTC (rev 230880)
@@ -18,13 +18,15 @@
install=${pkgname}.install
source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
systemd_${pkgname}.service
+systemd_sysusers.d_${pkgname}.conf
systemd_tmpfiles.d_${pkgname}.conf
${pkgname}.install)
sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
+'3f69c07659509bd1ae9d94cecbbba7c9072f0ede69e0a69d05b67a66aef9f686'
'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847'
-'32fcb0f44e32cd8901e936ebad4942a399efa8b98fdc42f5345dd8929b6c1887')
+'812e658d541f82ec20cf6933816e144e469665ecbf0f65ad0b1864cc3ded129f')
_gid_log=19
_gid_tomcat=57
@@ -70,6 +72,8 @@
install -Dm644 ${srcdir}/systemd_${pkgname}.service \
${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+ install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
+ ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
}
Modified: tomcat8.install
===
--- tomcat8.install 2015-02-05 22:19:10 UTC (rev 230879)
+++ tomcat8.install 2015-02-05 22:53:25 UTC (rev 230880)
@@ -1,16 +1,5 @@
-_pkgname='tomcat8'
-_gid_tomcat_name='tomcat8'
-_gid_tomcat=57
-_uid_tomcat_name='tomcat8'
-_uid_tomcat=57
-
post_install() {
- if ! getent group ${_gid_tomcat_name} /dev/null 21; then
-groupadd -g ${_gid_tomcat} ${_gid_tomcat_name}
- fi
- if ! getent passwd ${_uid_tomcat_name} /dev/null 21; then
-useradd -u ${_uid_tomcat} -g ${_gid_tomcat_name} -d
/usr/share/${_pkgname} -s /bin/false ${_uid_tomcat_name}
- fi
+systemd-sysusers tomcat8.conf
if [ -f lib/modules/$(uname -r)/kernel/security/capability.ko ]; then
echo 'It appears that your current kernel has linux security'
@@ -24,12 +13,6 @@
}
pre_remove() {
- if getent passwd ${_uid_tomcat_name} /dev/null 21; then
-userdel ${_uid_tomcat_name}
- fi
- if getent group ${_gid_tomcat_name} /dev/null 21; then
-groupdel ${_gid_tomcat_name}
- fi
-
- echo To fully clean Tomcat's file, consider removing directories
/var/{lib,tmp,log}/${_pkgname}
+ echo Leftover files may exist in /var/{lib,tmp,log}/tomcat8
+ echo If you remove them, you may also want to remove user and group
'tomcat8'
}
[arch-commits] Commit in tomcat6/repos/extra-any (8 files)
Date: Wednesday, February 4, 2015 @ 18:12:06
Author: guillaume
Revision: 230771
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 230770, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
(from rev 230770, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
tomcat6/repos/extra-any/systemd_tomcat6.service
(from rev 230770, tomcat6/trunk/systemd_tomcat6.service)
tomcat6/repos/extra-any/tomcat6.install
(from rev 230770, tomcat6/trunk/tomcat6.install)
Deleted:
tomcat6/repos/extra-any/PKGBUILD
tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
tomcat6/repos/extra-any/systemd_tomcat6.service
tomcat6/repos/extra-any/tomcat6.install
-+
PKGBUILD| 150 +++---
systemd_tmpfiles.d_tomcat6.conf |6 -
systemd_tomcat6.service | 66
tomcat6.install | 70 -
4 files changed, 146 insertions(+), 146 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-02-04 17:11:16 UTC (rev 230770)
+++ PKGBUILD2015-02-04 17:12:06 UTC (rev 230771)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.41
-pkgrel=2
-pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer
Pages 2.1 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953'
-'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
-'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
-
-_gid_log=19
-_gid_tomcat=66
-_uid_tomcat=66
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}
Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 230770,
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-02-04 17:12:06 UTC (rev 230771)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume
[arch-commits] Commit in tomcat6/trunk (PKGBUILD)
Date: Wednesday, February 4, 2015 @ 18:11:16
Author: guillaume
Revision: 230770
Upstream release 6.0.43
Modified:
tomcat6/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-04 16:27:56 UTC (rev 230769)
+++ PKGBUILD2015-02-04 17:11:16 UTC (rev 230770)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat6
-pkgver=6.0.41
-pkgrel=2
+pkgver=6.0.43
+pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer
Pages 2.1 technologies'
arch=('any')
url='http://tomcat.apache.org/'
@@ -21,7 +21,7 @@
systemd_tmpfiles.d_${pkgname}.conf
${pkgname}.install)
-sha256sums=('2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953'
+sha256sums=('8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068'
'df31fc3e41164bc7888516eebadb6f38fbbfe5882b8489928f8944237a3942a1'
'07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
'16046fc93a569cb817994ac251bbf464659286c39c2d9a5a2f52030d94a50dd0')
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Tuesday, January 27, 2015 @ 21:48:01
Author: guillaume
Revision: 230141
Upstream release 8.0.18
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-27 20:04:57 UTC (rev 230140)
+++ PKGBUILD2015-01-27 20:48:01 UTC (rev 230141)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
-pkgver=8.0.17
+pkgver=8.0.18
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_tmpfiles.d_${pkgname}.conf
${pkgname}.install)
-sha256sums=('b6a6e2bcf1e46bef666a02a589e7d1030f3adda7b3b3431d492a1ee67c52795c'
+sha256sums=('42834da73bdd5e445312d2f6ccaec11ce0b294cb33d2b92c5f1085cc8198c4f7'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847'
'32fcb0f44e32cd8901e936ebad4942a399efa8b98fdc42f5345dd8929b6c1887')
[arch-commits] Commit in tomcat8/repos/extra-any (8 files)
Date: Tuesday, January 27, 2015 @ 21:48:37
Author: guillaume
Revision: 230143
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 230142, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 230142, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 230142, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 230142, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 150 +++---
systemd_tmpfiles.d_tomcat8.conf |6 -
systemd_tomcat8.service | 66
tomcat8.install | 70 -
4 files changed, 146 insertions(+), 146 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-01-27 20:48:31 UTC (rev 230142)
+++ PKGBUILD2015-01-27 20:48:37 UTC (rev 230143)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.17
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.zip
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('b6a6e2bcf1e46bef666a02a589e7d1030f3adda7b3b3431d492a1ee67c52795c'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847'
-'32fcb0f44e32cd8901e936ebad4942a399efa8b98fdc42f5345dd8929b6c1887')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}
Copied: tomcat8/repos/extra-any/PKGBUILD (from rev 230142,
tomcat8/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-01-27 20:48:37 UTC (rev 230143)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume ALAUX
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Friday, January 23, 2015 @ 14:56:05
Author: guillaume
Revision: 229680
Commented out pkgver()
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-23 10:38:44 UTC (rev 229679)
+++ PKGBUILD2015-01-23 13:56:05 UTC (rev 229680)
@@ -7,12 +7,13 @@
pkgbase=java7-openjdk
_java_ver=7
_icedtea_ver=2.5.4
-pkgver() {
- _updatever=$(grep -E ^JDK_UPDATE_VERSION = (.)+
${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
-| sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
- echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
-}
-pkgver=7.u71_2.5.4
+#pkgver() {
+# _updatever=$(grep -E ^JDK_UPDATE_VERSION = (.)+
${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
+#| sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
+# echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
+#}
+_updatever=75
+pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
pkgrel=1
_bootstrap=0 # 0/1 for quick build or full bootstrap
[arch-commits] Commit in java7-openjdk/repos (28 files)
Date: Friday, January 23, 2015 @ 14:59:44 Author: guillaume Revision: 229681 archrelease: copy trunk to extra-i686, extra-x86_64 Added: java7-openjdk/repos/extra-i686/PKGBUILD (from rev 229680, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/extra-i686/fontconfig-paths.diff (from rev 229680, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/extra-i686/giflib_5.1.diff (from rev 229680, java7-openjdk/trunk/giflib_5.1.diff) java7-openjdk/repos/extra-i686/jdk7-openjdk.install (from rev 229680, java7-openjdk/trunk/jdk7-openjdk.install) java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install (from rev 229680, java7-openjdk/trunk/jre7-openjdk-headless.install) java7-openjdk/repos/extra-i686/jre7-openjdk.install (from rev 229680, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff (from rev 229680, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) java7-openjdk/repos/extra-x86_64/PKGBUILD (from rev 229680, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff (from rev 229680, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/extra-x86_64/giflib_5.1.diff (from rev 229680, java7-openjdk/trunk/giflib_5.1.diff) java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install (from rev 229680, java7-openjdk/trunk/jdk7-openjdk.install) java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install (from rev 229680, java7-openjdk/trunk/jre7-openjdk-headless.install) java7-openjdk/repos/extra-x86_64/jre7-openjdk.install (from rev 229680, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff (from rev 229680, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) Deleted: java7-openjdk/repos/extra-i686/PKGBUILD java7-openjdk/repos/extra-i686/fontconfig-paths.diff java7-openjdk/repos/extra-i686/giflib_5.1.diff java7-openjdk/repos/extra-i686/jdk7-openjdk.install java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install java7-openjdk/repos/extra-i686/jre7-openjdk.install java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff java7-openjdk/repos/extra-x86_64/PKGBUILD java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff java7-openjdk/repos/extra-x86_64/giflib_5.1.diff java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install java7-openjdk/repos/extra-x86_64/jre7-openjdk.install java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff --+ /PKGBUILD| 622 + /fontconfig-paths.diff | 268 ++ /giflib_5.1.diff | 28 + /jdk7-openjdk.install| 100 /jre7-openjdk-headless.install | 96 +++ /jre7-openjdk.install| 110 /openjdk7_nonreparenting-wm.diff | 116 extra-i686/PKGBUILD | 308 extra-i686/fontconfig-paths.diff | 134 - extra-i686/giflib_5.1.diff | 14 extra-i686/jdk7-openjdk.install | 50 -- extra-i686/jre7-openjdk-headless.install | 48 - extra-i686/jre7-openjdk.install | 55 -- extra-i686/openjdk7_nonreparenting-wm.diff | 58 -- extra-x86_64/PKGBUILD| 308 extra-x86_64/fontconfig-paths.diff | 134 - extra-x86_64/giflib_5.1.diff | 14 extra-x86_64/jdk7-openjdk.install| 50 -- extra-x86_64/jre7-openjdk-headless.install | 48 - extra-x86_64/jre7-openjdk.install| 55 -- extra-x86_64/openjdk7_nonreparenting-wm.diff | 58 -- 21 files changed, 1340 insertions(+), 1334 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 229680:229681 to see the changes.
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Thursday, January 22, 2015 @ 22:31:42
Author: guillaume
Revision: 229660
Add missing jar to build tzdata package
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD |2 ++
1 file changed, 2 insertions(+)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-22 18:35:34 UTC (rev 229659)
+++ PKGBUILD2015-01-22 21:31:42 UTC (rev 229660)
@@ -153,6 +153,8 @@
install -d -m755 ${pkgdir}${_jvmdir}/jre
cp -a bin lib ${pkgdir}${_jvmdir}/jre
+ # Used to compile tzdata files
+ cp ../btjars/compilefontconfig.jar ../btjars/javazic.jar lib/
# Set config files
mv
${pkgdir}${_jvmdir}/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
[arch-commits] Commit in java8-openjdk/repos (28 files)
Date: Thursday, January 22, 2015 @ 22:54:35 Author: guillaume Revision: 229662 archrelease: copy trunk to extra-i686, extra-x86_64 Added: java8-openjdk/repos/extra-i686/001_adjust-mflags-for-gmake-4.patch (from rev 229661, java8-openjdk/trunk/001_adjust-mflags-for-gmake-4.patch) java8-openjdk/repos/extra-i686/002_gcc.make-4.9.patch (from rev 229661, java8-openjdk/trunk/002_gcc.make-4.9.patch) java8-openjdk/repos/extra-i686/003_nonreparenting-wm.patch (from rev 229661, java8-openjdk/trunk/003_nonreparenting-wm.patch) java8-openjdk/repos/extra-i686/PKGBUILD (from rev 229661, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-i686/install_jdk8-openjdk.sh (from rev 229661, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-i686/install_jre8-openjdk-headless.sh (from rev 229661, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-i686/install_jre8-openjdk.sh (from rev 229661, java8-openjdk/trunk/install_jre8-openjdk.sh) java8-openjdk/repos/extra-x86_64/001_adjust-mflags-for-gmake-4.patch (from rev 229661, java8-openjdk/trunk/001_adjust-mflags-for-gmake-4.patch) java8-openjdk/repos/extra-x86_64/002_gcc.make-4.9.patch (from rev 229661, java8-openjdk/trunk/002_gcc.make-4.9.patch) java8-openjdk/repos/extra-x86_64/003_nonreparenting-wm.patch (from rev 229661, java8-openjdk/trunk/003_nonreparenting-wm.patch) java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 229661, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh (from rev 229661, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh (from rev 229661, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 229661, java8-openjdk/trunk/install_jre8-openjdk.sh) Deleted: java8-openjdk/repos/extra-i686/001_adjust-mflags-for-gmake-4.patch java8-openjdk/repos/extra-i686/002_gcc.make-4.9.patch java8-openjdk/repos/extra-i686/003_nonreparenting-wm.patch java8-openjdk/repos/extra-i686/PKGBUILD java8-openjdk/repos/extra-i686/install_jdk8-openjdk.sh java8-openjdk/repos/extra-i686/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-i686/install_jre8-openjdk.sh java8-openjdk/repos/extra-x86_64/001_adjust-mflags-for-gmake-4.patch java8-openjdk/repos/extra-x86_64/002_gcc.make-4.9.patch java8-openjdk/repos/extra-x86_64/003_nonreparenting-wm.patch java8-openjdk/repos/extra-x86_64/PKGBUILD java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh --+ /001_adjust-mflags-for-gmake-4.patch | 92 +++ /002_gcc.make-4.9.patch | 24 /003_nonreparenting-wm.patch | 78 ++ /PKGBUILD| 584 + /install_jdk8-openjdk.sh | 100 +++ /install_jre8-openjdk-headless.sh| 96 +++ /install_jre8-openjdk.sh | 110 +++ extra-i686/001_adjust-mflags-for-gmake-4.patch | 46 - extra-i686/002_gcc.make-4.9.patch| 12 extra-i686/003_nonreparenting-wm.patch | 39 - extra-i686/PKGBUILD | 292 -- extra-i686/install_jdk8-openjdk.sh | 50 - extra-i686/install_jre8-openjdk-headless.sh | 48 - extra-i686/install_jre8-openjdk.sh | 55 - extra-x86_64/001_adjust-mflags-for-gmake-4.patch | 46 - extra-x86_64/002_gcc.make-4.9.patch | 12 extra-x86_64/003_nonreparenting-wm.patch | 39 - extra-x86_64/PKGBUILD| 292 -- extra-x86_64/install_jdk8-openjdk.sh | 50 - extra-x86_64/install_jre8-openjdk-headless.sh| 48 - extra-x86_64/install_jre8-openjdk.sh | 55 - 21 files changed, 1084 insertions(+), 1084 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 229661:229662 to see the changes.
[arch-commits] Commit in java8-openjdk/trunk (PKGBUILD)
Date: Thursday, January 22, 2015 @ 22:52:56
Author: guillaume
Revision: 229661
Upstream release 8.u31
Modified:
java8-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-22 21:31:42 UTC (rev 229660)
+++ PKGBUILD2015-01-22 21:52:56 UTC (rev 229661)
@@ -9,11 +9,11 @@
pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src'
'openjdk8-doc')
pkgbase=java8-openjdk
_java_ver=8
-_jdk_update=25
-_jdk_build=18
+_jdk_update=31
+_jdk_build=13
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://openjdk.java.net/'
license=('custom')
@@ -31,14 +31,14 @@
001_adjust-mflags-for-gmake-4.patch
003_nonreparenting-wm.patch)
-sha256sums=('90eb3f3cb7094e609686168ec52ba462ef0f9832a4264bd1575e5896a6dd85c3'
-'61d0bba710d6803b0368c93bc9182b0b40348eed81d578886a03904baf61ba6f'
-'e574567b48f57c5cdeebae6fa22e2482c05446dbf9133e820f2d95e99459ddf2'
-'8ef05535a0e03c4262d55cc67887e884f3fda8e4872cbc2941dcb216ef1460ca'
-'afbdf119af2ffc0f9cd6eb93e6dac8e6a56a4ed4b68c7ff07f9b0c1a6bd56a8f'
-'2e91c958024e6b64f7484b8225e07edce3bd3bcde43081fb73f32e4b73ef7b87'
-'f292afe8540436090489841771259b274e3c36d42f11d0f58ba8082cd24fcc66'
-'98b4fc2d448920b81404ce745d9c00e9a33b58e123176dec4074caf611c3f9c2'
+sha256sums=('824b28c554ce32edbdaa77cc4f21f8ed57542c74c8748b89cd06be43a1537b34'
+'47b07945d3f534e6b87dc273676b8bcb493292e8769667493bb5febfb5c9f347'
+'485b1a88b4b44b468e96211de238a5eed80f7472f91977fc27e2f443a8ab8ed3'
+'b3801935199973cc02df02ac2f2587ff0f1989f98af5bf6fe46520a8108c8d6a'
+'04bb35fd8b071f65014fa1d3b9816886b88e06548eeda27181993b80efb6a0bf'
+'74bb7a376fa706e4283e235caebbcf9736974a6a4cf97b8c8335d389581965e2'
+'3e09a644d2fb38970acf78c72bc201c031d43574b5a3f7e00bec1b11bffec9c4'
+'2fbdcb016506de4e86db5813c78b28382df5b601f0e73ffd5465c12519b75fd3'
'682104f7723c5c543c47b53f51cc5577e273a12343bd04bebd1bcd70dd72ded9'
'c41cec7415ace2f68a5f9529e6df7e87a8c21993ab9d040b0f8b395f6173d478')
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Friday, January 23, 2015 @ 00:41:31
Author: guillaume
Revision: 229664
Fix wrong pkgver output by pkgver()
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-22 23:08:34 UTC (rev 229663)
+++ PKGBUILD2015-01-22 23:41:31 UTC (rev 229664)
@@ -12,7 +12,7 @@
| sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
}
-pkgver=7.u71_2.5.3
+pkgver=7.u71_2.5.4
pkgrel=1
_bootstrap=0 # 0/1 for quick build or full bootstrap
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Friday, January 23, 2015 @ 00:08:34
Author: guillaume
Revision: 229663
Revert adding JAR for tzdata. Upstream release 7.u75_2.5.4-1
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-22 21:54:35 UTC (rev 229662)
+++ PKGBUILD2015-01-22 23:08:34 UTC (rev 229663)
@@ -6,7 +6,7 @@
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src'
'openjdk7-doc')
pkgbase=java7-openjdk
_java_ver=7
-_icedtea_ver=2.5.3
+_icedtea_ver=2.5.4
pkgver() {
_updatever=$(grep -E ^JDK_UPDATE_VERSION = (.)+
${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
| sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
@@ -13,7 +13,7 @@
echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
}
pkgver=7.u71_2.5.3
-pkgrel=3
+pkgrel=1
_bootstrap=0 # 0/1 for quick build or full bootstrap
@@ -40,14 +40,14 @@
openjdk7_nonreparenting-wm.diff
giflib_5.1.diff)
-sha256sums=('44df11ac8e5ace7194e7372ef169909e0dab31d6b2f6bbae9a9c33af2cc54540'
-'3ba1a30762f5d5890e8ee6af11f52213ab9c574c01f07c75a081c42034f5d5c9'
-'8ceb2cd60782b7fc14b88e3d366f273873fa5436cf0e36b86406c0905b7dc43c'
-'2d13a82078f3f2b8831d1e670e5e75719336a56490df64f16ab7647674a272ef'
-'5a63d85307203f1aed1e31459ad5e32687909e0640d424ff6f540d9b1cceeb1e'
-'40c4dda969be0ecd213e79269184e19cfc32100b83777dc529b3cf4b6aa3e12f'
-'516f6c21719f4b5a2092847c147cde7890c5a30d4aed9425ff667c0164ef1dd0'
-'8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28'
+sha256sums=('5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800'
+'88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1'
+'7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b'
+'84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3'
+'4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b'
+'e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09'
+'4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a'
+'4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
'77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9')
@@ -153,8 +153,6 @@
install -d -m755 ${pkgdir}${_jvmdir}/jre
cp -a bin lib ${pkgdir}${_jvmdir}/jre
- # Used to compile tzdata files
- cp ../btjars/compilefontconfig.jar ../btjars/javazic.jar lib/
# Set config files
mv
${pkgdir}${_jvmdir}/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
[arch-commits] Commit in tomcat8/trunk (PKGBUILD)
Date: Wednesday, January 21, 2015 @ 14:30:32
Author: guillaume
Revision: 229625
Upstream release 8.0.17
Modified:
tomcat8/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-21 10:03:09 UTC (rev 229624)
+++ PKGBUILD2015-01-21 13:30:32 UTC (rev 229625)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat8
-pkgver=8.0.15
+pkgver=8.0.17
pkgrel=1
pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
arch=('any')
@@ -21,7 +21,7 @@
systemd_tmpfiles.d_${pkgname}.conf
${pkgname}.install)
-sha256sums=('6f3053a2ecf9ddc7f4fe5874f4597219e900f35b6f01cbce703123ef53e28aef'
+sha256sums=('b6a6e2bcf1e46bef666a02a589e7d1030f3adda7b3b3431d492a1ee67c52795c'
'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847'
'32fcb0f44e32cd8901e936ebad4942a399efa8b98fdc42f5345dd8929b6c1887')
[arch-commits] Commit in tomcat8/repos/extra-any (8 files)
Date: Wednesday, January 21, 2015 @ 14:32:28
Author: guillaume
Revision: 229626
archrelease: copy trunk to extra-any
Added:
tomcat8/repos/extra-any/PKGBUILD
(from rev 229625, tomcat8/trunk/PKGBUILD)
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
(from rev 229625, tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf)
tomcat8/repos/extra-any/systemd_tomcat8.service
(from rev 229625, tomcat8/trunk/systemd_tomcat8.service)
tomcat8/repos/extra-any/tomcat8.install
(from rev 229625, tomcat8/trunk/tomcat8.install)
Deleted:
tomcat8/repos/extra-any/PKGBUILD
tomcat8/repos/extra-any/systemd_tmpfiles.d_tomcat8.conf
tomcat8/repos/extra-any/systemd_tomcat8.service
tomcat8/repos/extra-any/tomcat8.install
-+
PKGBUILD| 150 +++---
systemd_tmpfiles.d_tomcat8.conf |6 -
systemd_tomcat8.service | 66
tomcat8.install | 70 -
4 files changed, 146 insertions(+), 146 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-01-21 13:30:32 UTC (rev 229625)
+++ PKGBUILD2015-01-21 13:32:28 UTC (rev 229626)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat8
-pkgver=8.0.15
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.1 and JavaServer
Pages 2.3 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-8/v${pkgver}/bin/apache-tomcat-${pkgver}.zip
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('6f3053a2ecf9ddc7f4fe5874f4597219e900f35b6f01cbce703123ef53e28aef'
-'d44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
-'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847'
-'32fcb0f44e32cd8901e936ebad4942a399efa8b98fdc42f5345dd8929b6c1887')
-
-_gid_log=19
-_gid_tomcat=57
-_uid_tomcat=57
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- ln -s /usr/share/java/commons-daemon.jar
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
- install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- # eclipse-ecj is packaged on its own
- rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
- ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # We log through systemd but this would still be required for stock Tomcat
logging
- install -dm775 -o ${_uid_tomcat} -g ${_gid_log}
${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g ${_gid_tomcat} -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat}
${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
- install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}
Copied: tomcat8/repos/extra-any/PKGBUILD (from rev 229625,
tomcat8/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-01-21 13:32:28 UTC (rev 229626)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Thursday, December 18, 2014 @ 15:43:28
Author: guillaume
Revision: 227748
Use function for pkgver
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-18 14:42:05 UTC (rev 227747)
+++ PKGBUILD2014-12-18 14:43:28 UTC (rev 227748)
@@ -7,14 +7,16 @@
pkgbase=java7-openjdk
_java_ver=7
_icedtea_ver=2.5.3
+pkgver() {
+ _updatever=$(grep -E ^JDK_UPDATE_VERSION = (.)+
${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
+| sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
+ echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
+}
+pkgver=7.u71_2.5.3
+pkgrel=3
-# check ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am
-_JDK_UPDATE_VERSION=71
-
_bootstrap=0 # 0/1 for quick build or full bootstrap
-pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=3
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org'
license=('custom')
[arch-commits] Commit in icedtea-web/trunk (PKGBUILD)
Date: Thursday, November 27, 2014 @ 13:58:37
Author: guillaume
Revision: 227151
Upstream release 1.5.2
Modified:
icedtea-web/trunk/PKGBUILD
--+
PKGBUILD |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-11-27 09:13:18 UTC (rev 227150)
+++ PKGBUILD2014-11-27 12:58:37 UTC (rev 227151)
@@ -3,13 +3,15 @@
pkgbase=icedtea-web
pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.5.1
-pkgrel=3
+pkgver=1.5.2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org/wiki/IcedTea-Web'
license=('GPL2')
# TODO do we still need 'chromium' and '--with-chromium'? What does it do?
+#
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-November/030196.html
# https://www.java.com/en/download/faq/chrome.xml
+# http://blog.chromium.org/2013/09/saying-goodbye-to-our-old-friend-npapi.html
makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino'
'junit'
'firefox' 'chromium' 'epiphany')
optdepends=('rhino: for using proxy auto config files')
@@ -16,7 +18,7 @@
# Due to broken path names in the tarball that fails with LANG=C in our chroot
noextract=${pkgbase}-${pkgver}.tar.gz
source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz)
-sha256sums=('03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195')
+sha256sums=('b29e8ff2533cc6521a6509a002001f4c97c80a004460063156d003898da13bf3')
prepare() {
cd ${srcdir}
[arch-commits] Commit in icedtea-web/repos (10 files)
Date: Thursday, November 27, 2014 @ 13:59:09
Author: guillaume
Revision: 227152
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
icedtea-web/repos/extra-i686/PKGBUILD
(from rev 227151, icedtea-web/trunk/PKGBUILD)
icedtea-web/repos/extra-i686/install_icedtea-web.sh
(from rev 227151, icedtea-web/trunk/install_icedtea-web.sh)
icedtea-web/repos/extra-x86_64/PKGBUILD
(from rev 227151, icedtea-web/trunk/PKGBUILD)
icedtea-web/repos/extra-x86_64/install_icedtea-web.sh
(from rev 227151, icedtea-web/trunk/install_icedtea-web.sh)
Deleted:
icedtea-web/repos/extra-i686/001_do_not_set_classpath.patch
icedtea-web/repos/extra-i686/PKGBUILD
icedtea-web/repos/extra-i686/install_icedtea-web.sh
icedtea-web/repos/extra-x86_64/001_do_not_set_classpath.patch
icedtea-web/repos/extra-x86_64/PKGBUILD
icedtea-web/repos/extra-x86_64/install_icedtea-web.sh
-+
/PKGBUILD | 188 ++
/install_icedtea-web.sh | 22 +++
extra-i686/001_do_not_set_classpath.patch | 36
extra-i686/PKGBUILD | 92
extra-i686/install_icedtea-web.sh | 11 -
extra-x86_64/001_do_not_set_classpath.patch | 36
extra-x86_64/PKGBUILD | 92
extra-x86_64/install_icedtea-web.sh | 11 -
8 files changed, 210 insertions(+), 278 deletions(-)
Deleted: extra-i686/001_do_not_set_classpath.patch
===
--- extra-i686/001_do_not_set_classpath.patch 2014-11-27 12:58:37 UTC (rev
227151)
+++ extra-i686/001_do_not_set_classpath.patch 2014-11-27 12:59:09 UTC (rev
227152)
@@ -1,36 +0,0 @@
-diff -r 4f76df2f1438 launcher/launchers.in
a/launcher/launchers.inFri Aug 15 09:49:16 2014 +0200
-+++ b/launcher/launchers.inSat Aug 30 18:01:25 2014 +0200
-@@ -7,7 +7,6 @@
- BINARY_LOCATION=@BIN_LOCATION@
- SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@
- PROGRAM_NAME=@PROGRAM_NAME@
--CP=@JRE@/lib/rt.jar
-
- CONFIG_HOME=$XDG_CONFIG_HOME
- if [ x$CONFIG_HOME = x ] ; then
-@@ -25,11 +24,10 @@
- CUSTOM_JRE=`grep $CUSTOM_JRE_REGEX
/etc/.java/.deploy/deployment.properties 2/dev/null | sed
s/$CUSTOM_JRE_REGEX//g`
- fi;
- if [ x$CUSTOM_JRE != x ] ; then
-- if [ -e $CUSTOM_JRE -a -e $CUSTOM_JRE/bin/java -a -e
$CUSTOM_JRE/lib/rt.jar ] ; then
-+ if [ -e $CUSTOM_JRE -a -e $CUSTOM_JRE/bin/java ] ; then
- JAVA=$CUSTOM_JRE/bin/java
--CP=$CUSTOM_JRE/lib/rt.jar
- else
--echo Your custom JRE $CUSTOM_JRE read from deployment.properties under
key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA, $CP) in
attempt to start. Please fix this.
-+echo Your custom JRE $CUSTOM_JRE read from deployment.properties under
key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA) in
attempt to start. Please fix this.
- fi
- fi;
-
-@@ -78,10 +76,6 @@
- i=$((i+1))
- k=$((k+1))
- done
--COMMAND[k]=-classpath
--k=$((k+1))
--COMMAND[k]=${CP}
--k=$((k+1))
- COMMAND[k]=-Dicedtea-web.bin.name=${PROGRAM_NAME}
- k=$((k+1))
- COMMAND[k]=-Dicedtea-web.bin.location=${BINARY_LOCATION}
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2014-11-27 12:58:37 UTC (rev 227151)
+++ extra-i686/PKGBUILD 2014-11-27 12:59:09 UTC (rev 227152)
@@ -1,92 +0,0 @@
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-
-pkgbase=icedtea-web
-pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.5.1
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://icedtea.classpath.org/wiki/IcedTea-Web'
-license=('GPL2')
-# TODO do we still need 'chromium' and '--with-chromium'? What does it do?
-# https://www.java.com/en/download/faq/chrome.xml
-makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino'
'junit'
- 'firefox' 'chromium' 'epiphany')
-optdepends=('rhino: for using proxy auto config files')
-# Due to broken path names in the tarball that fails with LANG=C in our chroot
-noextract=${pkgbase}-${pkgver}.tar.gz
-source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz)
-sha256sums=('03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195')
-
-prepare() {
- cd ${srcdir}
- LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase}-${pkgver}.tar.gz
-}
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- ./configure \
- --prefix=/usr/share/${pkgbase} \
- --datarootdir=/usr/share \
- --with-jdk-home=/usr/lib/jvm/default \
- --with-jre-home=/usr/lib/jvm/default-runtime \
- --with-java=/usr/bin/java \
- --with-browser-tests \
- --with-firefox=/usr/bin/firefox \
- --with-chromium=/usr/bin/chromium \
- --with-epiphany=/usr/bin/epiphany
- make
-}
-
-#check() {
-# cd ${srcdir}/${pkgbase}-${pkgver}
-# # as more tests have been added some
[arch-commits] Commit in icedtea-web/trunk (PKGBUILD)
Date: Thursday, November 27, 2014 @ 14:27:41
Author: guillaume
Revision: 227153
Remove traces of 'chromium'
Modified:
icedtea-web/trunk/PKGBUILD
--+
PKGBUILD |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-11-27 12:59:09 UTC (rev 227152)
+++ PKGBUILD2014-11-27 13:27:41 UTC (rev 227153)
@@ -8,12 +8,8 @@
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org/wiki/IcedTea-Web'
license=('GPL2')
-# TODO do we still need 'chromium' and '--with-chromium'? What does it do?
-#
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-November/030196.html
-# https://www.java.com/en/download/faq/chrome.xml
-# http://blog.chromium.org/2013/09/saying-goodbye-to-our-old-friend-npapi.html
makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino'
'junit'
- 'firefox' 'chromium' 'epiphany')
+ 'firefox' 'epiphany')
optdepends=('rhino: for using proxy auto config files')
# Due to broken path names in the tarball that fails with LANG=C in our chroot
noextract=${pkgbase}-${pkgver}.tar.gz
@@ -35,7 +31,6 @@
--with-java=/usr/bin/java \
--with-browser-tests \
--with-firefox=/usr/bin/firefox \
- --with-chromium=/usr/bin/chromium \
--with-epiphany=/usr/bin/epiphany
make
}
[arch-commits] Commit in easytag/trunk (PKGBUILD)
Date: Tuesday, November 25, 2014 @ 13:43:33
Author: guillaume
Revision: 227087
Upstream release 2.2.5
Modified:
easytag/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-11-25 12:39:13 UTC (rev 227086)
+++ PKGBUILD2014-11-25 12:43:33 UTC (rev 227087)
@@ -5,7 +5,7 @@
# Contributor: dorphell dorph...@archlinux.org
pkgname=easytag
-pkgver=2.2.4
+pkgver=2.2.5
pkgrel=1
pkgdesc='Simple application for viewing and editing tags in audio files'
arch=('i686' 'x86_64')
@@ -13,10 +13,10 @@
url='http://easytag.sourceforge.net/'
makedepends=('intltool' 'itstool')
depends=('id3lib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'wavpack'
'taglib'
- 'desktop-file-utils' 'hicolor-icon-theme' 'opusfile')
+ 'desktop-file-utils' 'opusfile')
install=${pkgname}.install
source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091')
+sha256sums=('a6da3a094997fa225d1c01211b282f2d3c2dfd93a74f3bec24017bd5a13f3855')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in easytag/repos (8 files)
Date: Tuesday, November 25, 2014 @ 13:44:14
Author: guillaume
Revision: 227088
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
easytag/repos/extra-i686/PKGBUILD
(from rev 227087, easytag/trunk/PKGBUILD)
easytag/repos/extra-i686/easytag.install
(from rev 227087, easytag/trunk/easytag.install)
easytag/repos/extra-x86_64/PKGBUILD
(from rev 227087, easytag/trunk/PKGBUILD)
easytag/repos/extra-x86_64/easytag.install
(from rev 227087, easytag/trunk/easytag.install)
Deleted:
easytag/repos/extra-i686/PKGBUILD
easytag/repos/extra-i686/easytag.install
easytag/repos/extra-x86_64/PKGBUILD
easytag/repos/extra-x86_64/easytag.install
--+
/PKGBUILD| 70 +
/easytag.install | 24 ++
extra-i686/PKGBUILD | 35
extra-i686/easytag.install | 12 ---
extra-x86_64/PKGBUILD| 35
extra-x86_64/easytag.install | 12 ---
6 files changed, 94 insertions(+), 94 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2014-11-25 12:43:33 UTC (rev 227087)
+++ extra-i686/PKGBUILD 2014-11-25 12:44:14 UTC (rev 227088)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Kevin Piche ke...@archlinux.org
-# Contributor: Aaron Griffin aa...@archlinux.org
-# Contributor: dorphell dorph...@archlinux.org
-
-pkgname=easytag
-pkgver=2.2.4
-pkgrel=1
-pkgdesc='Simple application for viewing and editing tags in audio files'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://easytag.sourceforge.net/'
-makedepends=('intltool' 'itstool')
-depends=('id3lib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'wavpack'
'taglib'
- 'desktop-file-utils' 'hicolor-icon-theme' 'opusfile')
-install=${pkgname}.install
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make -k check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: easytag/repos/extra-i686/PKGBUILD (from rev 227087,
easytag/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-11-25 12:44:14 UTC (rev 227088)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Kevin Piche ke...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+
+pkgname=easytag
+pkgver=2.2.5
+pkgrel=1
+pkgdesc='Simple application for viewing and editing tags in audio files'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://easytag.sourceforge.net/'
+makedepends=('intltool' 'itstool')
+depends=('id3lib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'wavpack'
'taglib'
+ 'desktop-file-utils' 'opusfile')
+install=${pkgname}.install
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('a6da3a094997fa225d1c01211b282f2d3c2dfd93a74f3bec24017bd5a13f3855')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make -k check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Deleted: extra-i686/easytag.install
===
--- extra-i686/easytag.install 2014-11-25 12:43:33 UTC (rev 227087)
+++ extra-i686/easytag.install 2014-11-25 12:44:14 UTC (rev 227088)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2 /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
Copied: easytag/repos/extra-i686/easytag.install (from rev 227087,
easytag/trunk/easytag.install)
===
--- extra-i686/easytag.install (rev 0)
+++ extra-i686/easytag.install 2014-11-25 12:44:14 UTC (rev 227088)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor 2 /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+post_install
+}
+
+post_remove() {
+post_install
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2014-11-25 12:43:33 UTC (rev 227087)
+++ extra-x86_64/PKGBUILD 2014-11-25 12:44:14 UTC (rev 227088)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-# Contributor: Kevin
