[arch-commits] Commit in elasticsearch/trunk (4 files)

[Massimiliano Torromeo]

    Date: Wednesday, October 26, 2016 @ 16:13:02
  Author: mtorromeo
Revision: 193645

upgpkg: elasticsearch 5.0.0-1

Modified:
  elasticsearch/trunk/PKGBUILD
  elasticsearch/trunk/elasticsearch.install
  elasticsearch/trunk/elasticsearch.service
  elasticsearch/trunk/elasticsearch at .service

------------------------+
 PKGBUILD               |   20 +++++++++++---------
 elasticsearch.install  |    4 ++--
 elasticsearch.service  |   10 +++++-----
 elasticsearch at .service |   10 +++++-----
 4 files changed, 23 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-26 16:11:54 UTC (rev 193644)
+++ PKGBUILD	2016-10-26 16:13:02 UTC (rev 193645)
@@ -4,7 +4,7 @@
 # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
 
 pkgname=elasticsearch
-pkgver=2.4.1
+pkgver=5.0.0
 pkgrel=1
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('any')
@@ -13,7 +13,7 @@
 depends=('java-runtime-headless' 'systemd')
 install='elasticsearch.install'
 source=(
-  "http://download.elasticsearch.org/$pkgname/release/org/$pkgname/distribution/tar/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
+  "https://artifacts.elastic.co/downloads/$pkgname/$pkgname-$pkgver.tar.gz"
   elasticsearch.service
   elasticsearch at .service
   elasticsearch-sysctl.conf
@@ -21,9 +21,9 @@
   elasticsearch-tmpfile.conf
   elasticsearch.default
 )
-sha256sums=('23a369ef42955c19aaaf9e34891eea3a055ed217d7fbe76da0998a7a54bbe167'
-            '339a16452c89d55dba3c693e5979fd331981e79decc5eceb2e9be25670d946d9'
-            '5705be6546922d5c0c7aded3b839af25b369ace2af7024ea11e2bce9426ae2f6'
+sha256sums=('a866534f0fa7428e980c985d712024feef1dee04709add6e360fc7b73bb1e7ae'
+            '51154ac04d90c6b534a3d86bb41c8654726a2a7b3a5a767411dfce30e7bb21fe'
+            '22ec53ed1ac5231b501b2311aad4953a8210d9e72b4204c9c2facab100003f8e'
             'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
             '815f6a39db6f54bb40750c382ffbdc298d2c4c187ee8ea7e2f855923e2ff354b'
             '6578cacc9fdbdf4713e9f607710701edcd46b026e99743af0fbb63e177eed9b1'
@@ -30,13 +30,14 @@
             'bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8')
 
 backup=('etc/elasticsearch/elasticsearch.yml'
-        'etc/elasticsearch/logging.yml'
+        'etc/elasticsearch/log4j2.properties'
+        'etc/elasticsearch/jvm.options'
         'etc/default/elasticsearch')
 
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver
 
-  for script in plugin elasticsearch; do
+  for script in elasticsearch{,-plugin,-translog}; do
     sed -e 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
         -e '/^ES_HOME=.*pwd/d' \
         -e 's|$ES_HOME/config|/etc/elasticsearch|' \
@@ -68,7 +69,8 @@
   cp -R lib modules "$pkgdir"/usr/share/elasticsearch/
   cp config/* "$pkgdir"/etc/elasticsearch/
 
-  install -Dm755 bin/elasticsearch "$pkgdir"/usr/bin/elasticsearch
-  install -Dm755 bin/plugin "$pkgdir"/usr/bin/elasticsearch-plugin
+  for script in elasticsearch{,-plugin,-translog}; do
+    install -Dm755 bin/$script "$pkgdir"/usr/bin/$script
+  done
   install -Dm644 bin/elasticsearch.in.sh "$pkgdir"/usr/share/elasticsearch/bin/elasticsearch.in.sh
 }

Modified: elasticsearch.install
===================================================================
--- elasticsearch.install	2016-10-26 16:11:54 UTC (rev 193644)
+++ elasticsearch.install	2016-10-26 16:13:02 UTC (rev 193645)
@@ -6,9 +6,9 @@
 post_upgrade(){
     systemd-tmpfiles --create elasticsearch.conf
 
-    if [ "$(vercmp $2 2.0.0)" -lt 0 ]; then
+    if [ "$(vercmp $2 5.0.0)" -lt 0 ]; then
         echo " >> "
-        echo " >> Major version update. PLease take a look at breaking changes https://www.elastic.co/guide/en/elasticsearch/reference/2.0/breaking-changes-2.0.html and remove incompatible plugins from /usr/share/elasticsearch/plugins"
+        echo " >> Major version update. PLease take a look at breaking changes https://www.elastic.co/guide/en/elasticsearch/reference/5.0/breaking-changes-5.0.html and remove incompatible plugins from /usr/share/elasticsearch/plugins"
         echo " >> "
     fi
 }

Modified: elasticsearch.service
===================================================================
--- elasticsearch.service	2016-10-26 16:11:54 UTC (rev 193644)
+++ elasticsearch.service	2016-10-26 16:13:02 UTC (rev 193645)
@@ -23,14 +23,14 @@
 
 ExecStart=/usr/bin/elasticsearch -d \
             -p /run/elasticsearch/elasticsearch.pid \
-            -Des.default.path.home=${ES_HOME} \
-            -Des.default.path.logs=${LOG_DIR} \
-            -Des.default.path.data=${DATA_DIR} \
-            -Des.default.path.conf=${CONF_DIR}
+            -E default.path.home=${ES_HOME} \
+            -E default.path.logs=${LOG_DIR} \
+            -E default.path.data=${DATA_DIR} \
+            -E default.path.conf=${CONF_DIR}
 
 SuccessExitStatus=143
 
-LimitNOFILE=65535
+LimitNOFILE=65536
 LimitMEMLOCK=infinity
 TimeoutStopSec=120
 Restart=on-failure

Modified: elasticsearch at .service
===================================================================
--- elasticsearch at .service	2016-10-26 16:11:54 UTC (rev 193644)
+++ elasticsearch at .service	2016-10-26 16:13:02 UTC (rev 193645)
@@ -23,14 +23,14 @@
 
 ExecStart=/usr/bin/elasticsearch -d \
             -p /run/elasticsearch/%I.pid \
-            -Des.default.path.home=${ES_HOME} \
-            -Des.default.path.logs=${LOG_DIR} \
-            -Des.default.path.data=${DATA_DIR} \
-            -Des.default.path.conf=${CONF_DIR}
+            -E default.path.home=${ES_HOME} \
+            -E default.path.logs=${LOG_DIR} \
+            -E default.path.data=${DATA_DIR} \
+            -E default.path.conf=${CONF_DIR}
 
 SuccessExitStatus=143
 
-LimitNOFILE=65535
+LimitNOFILE=65536
 LimitMEMLOCK=infinity
 TimeoutStopSec=120
 Restart=on-failure