Update to 4.5.1, fix openssl issue

3 files changed, 22 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab4b7f67f53c..e648b30f349a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,26 @@
+# Generated by mksrcinfo v8
+# Mon May 15 08:41:20 UTC 2017
 pkgbase = couchbase-server-community
 	pkgdesc = A document database featuring a powerful query language and unrivaled performance at scale.
-	pkgver = 4.5.0
+	pkgver = 4.5.1
 	pkgrel = 1
 	url = http://www.couchbase.com/
 	install = couchbase-server.install
 	arch = x86_64
+	makedepends = chrpath
 	depends = glibc
 	depends = gcc-libs
 	depends = sqlite
 	depends = openssl
 	depends = ncurses5-compat-libs
 	depends = zlib
-	source = couchbase-server-community-v4.5.0.deb::http://packages.couchbase.com/releases/4.5.0/couchbase-server-community_4.5.0-ubuntu14.04_amd64.deb
+	depends = python2
+	depends = libopenssl-1.0-compat
+	conflicts = couchbase3-server-community
+	source = couchbase-server-community-v4.5.1.deb::http://packages.couchbase.com/releases/4.5.1/couchbase-server-community_4.5.1-ubuntu14.04_amd64.deb
 	source = couchbase-server.service
-	md5sums = 441cd6928b599d5d8e86df25818c10a9
-	md5sums = d6d13dde7d40fb31e786623f3f16c3c2
+	md5sums = b15ba0ebdc14f7ed62b8127cebd582ea
+	md5sums = 5126e004422c1a5b9391602ac9208319
 
 pkgname = couchbase-server-community
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f8deee93bc6..a00282c83abe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christophe Robin <crobin at nekoo a-dot com>
 
 pkgname=couchbase-server-community
-pkgver=4.5.0
+pkgver=4.5.1
 pkgrel=1
 pkgdesc="A document database featuring a powerful query language and unrivaled performance at scale."
 arch=('x86_64')
@@ -11,16 +11,20 @@ source=(
   "couchbase-server.service"
 )
 install=couchbase-server.install
-depends=(glibc gcc-libs sqlite openssl ncurses5-compat-libs zlib)
+makedepends=(chrpath)
+depends=(glibc gcc-libs sqlite openssl ncurses5-compat-libs zlib python2 libopenssl-1.0-compat)
+conflicts=(couchbase3-server-community)
 
 package() {
   msg2 "Extracting the data.tar.gz"
   tar -xf data.tar.xz -C "${pkgdir}/"
 
+  chrpath -r "/usr/lib/openssl-1.0-compat:/usr/lib:/usr/local/lib" "${pkgdir}/opt/couchbase/lib/erlang/lib/crypto-3.2/priv/lib/crypto.so"
+
   # remove init.d and replace by systemd definition
   rm -Rf "${pkgdir}/etc"
   install -D couchbase-server.service "${pkgdir}/usr/lib/systemd/system/couchbase-server.service"
 }
 
-md5sums=('441cd6928b599d5d8e86df25818c10a9'
-         'd6d13dde7d40fb31e786623f3f16c3c2')
+md5sums=('b15ba0ebdc14f7ed62b8127cebd582ea'
+         '5126e004422c1a5b9391602ac9208319')
diff --git a/couchbase-server.service b/couchbase-server.service
index c3f57c629816..3c52165ee24b 100644
--- a/couchbase-server.service
+++ b/couchbase-server.service
@@ -11,10 +11,10 @@ Type = forking
 PIDFile=/opt/couchbase/var/lib/couchbase/couchbase-server.pid
 WorkingDirectory = /opt/couchbase/var/lib/couchbase
 LimitNOFILE = 40960
-LimitCORE = unlimited
-LimitMEMLOCK = unlimited
-ExecStart = /opt/couchbase/bin/couchbase-server -noinput -detached > /opt/couchbase/var/lib/couchbase/logs/start.log 2>&1
-ExecStop = /opt/couchbase/bin/couchbase-server -k
+LimitCORE = infinity
+LimitMEMLOCK = infinity
+ExecStart = /opt/couchbase/bin/couchbase-server -- -noinput -detached > /opt/couchbase/var/lib/couchbase/logs/start.log 2>&1
+ExecStop = /opt/couchbase/bin/couchbase-server -- -k
 
 [Install]
 WantedBy = multi-user.target