[arch-commits] Commit in couchdb/trunk (5 files)
Sergej Pupykin
spupykin at archlinux.org
Mon Sep 26 15:53:02 UTC 2016
Date: Monday, September 26, 2016 @ 15:53:01
Author: spupykin
Revision: 190620
upgpkg: couchdb 2.0.0-1
upd
Added:
couchdb/trunk/datadirs.ini
Modified:
couchdb/trunk/PKGBUILD
couchdb/trunk/couchdb.install
couchdb/trunk/couchdb.service
Deleted:
couchdb/trunk/erlang18.patch
-----------------+
PKGBUILD | 49 ++++++++++++++++++++++---------------------------
couchdb.install | 18 ++++++++----------
couchdb.service | 11 +++++++----
datadirs.ini | 3 +++
erlang18.patch | 33 ---------------------------------
5 files changed, 40 insertions(+), 74 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-09-26 15:51:52 UTC (rev 190619)
+++ PKGBUILD 2016-09-26 15:53:01 UTC (rev 190620)
@@ -4,8 +4,8 @@
# Contributor: Michael Fellinger <m.fellinger at gmail.com>
pkgname=couchdb
-pkgver=1.6.1
-pkgrel=7
+pkgver=2.0.0
+pkgrel=1
pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
arch=('i686' 'x86_64')
url="http://couchdb.apache.org"
@@ -16,42 +16,37 @@
backup=('etc/couchdb/local.ini'
'etc/conf.d/couchdb'
'etc/logrotate.d/couchdb')
-validpgpkeys=('E0AF0A194D55C84E4A19A801CDB0C0F904F4EE9B')
-#source=("git://github.com/apache/couchdb.git#commit=8d7ab8b18dd20f8785e69f4420c6f93a2edbfa60"
+validpgpkeys=('E0AF0A194D55C84E4A19A801CDB0C0F904F4EE9B'
+ 'D2B17F9DA23C0A10991AF2E3D9EE01E47852AEE4')
source=("http://www.eu.apache.org/dist/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
- "erlang18.patch"
"couchdb.service"
- "couchdb.tmpfiles")
-md5sums=('01a2c8ab4fcde457529428993901a060'
+ "couchdb.tmpfiles"
+ "datadirs.ini")
+md5sums=('402fc02df28a5297a56cedebbae42524'
'SKIP'
- '8488bf9f7b07b40a39ff5448e3509905'
- '8914a7ffc6745f94106d96206709acb4'
- '1e254ebe32eeb061be64193bafa35dbf')
+ '38cea6d9b533a22dadc22538a921c282'
+ '1e254ebe32eeb061be64193bafa35dbf'
+ 'cd649a705805e6193ae72aea33a2e4bd')
-prepare() {
- cd "$srcdir/apache-couchdb-$pkgver"
- sed -i 's|-Werror||g' src/couchdb/priv/Makefile.*
- patch -Np1 -i ../erlang18.patch
- autoreconf -vi
-}
-
build() {
cd "$srcdir/apache-couchdb-$pkgver"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var
- make
+ ./configure
+ make release
}
package() {
cd "$srcdir/apache-couchdb-$pkgver"
- make DESTDIR="$pkgdir" install
+ install -dm0755 "$pkgdir"/usr/lib/
+ install -dm0755 "$pkgdir"/etc/couchdb/
+ install -dm0755 "$pkgdir"/var/lib/couchdb/
- install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb
- sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb
+ cp -r rel/couchdb "$pkgdir"/usr/lib/couchdb
+ mv "$pkgdir"/usr/lib/couchdb/etc/local.ini "$pkgdir"/etc/couchdb/local.ini
- rm -rf $pkgdir/etc/default/ $pkgdir/var/run $pkgdir/etc/init.d
+ # use system erts
+ rm -rf $pkgdir/usr/lib/couchdb/erts-8.1
+ ln -s /usr/lib/erlang/erts-8.1 $pkgdir/usr/lib/couchdb/erts-8.1
- install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
- install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
+ install -Dm0644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
+ install -Dm0644 "$srcdir"/datadirs.ini "$pkgdir"/usr/lib/couchdb/etc/datadirs.ini
}
Modified: couchdb.install
===================================================================
--- couchdb.install 2016-09-26 15:51:52 UTC (rev 190619)
+++ couchdb.install 2016-09-26 15:53:01 UTC (rev 190620)
@@ -1,18 +1,16 @@
post_install() {
- id couchdb &>/dev/null || \
- useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
- mkdir -p /var/run/couchdb
- chown -R couchdb.daemon /etc/couchdb
- chown -R couchdb.daemon /var/{lib,log,run}/couchdb
+ id couchdb &>/dev/null || \
+ useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
+ chown couchdb.daemon /etc/couchdb/local.ini
+ chown -R couchdb.daemon /var/lib/couchdb
}
pre_upgrade() {
- id couchdb &>/dev/null || \
- useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
+ id couchdb &>/dev/null || \
+ useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
}
post_upgrade() {
- mkdir -p $pkgdir/var/run/couchdb
- chown -R couchdb.daemon /etc/couchdb
- chown -R couchdb.daemon /var/{lib,log,run}/couchdb
+ chown couchdb.daemon /etc/couchdb/local.ini
+ chown -R couchdb.daemon /var/lib/couchdb
}
Modified: couchdb.service
===================================================================
--- couchdb.service 2016-09-26 15:51:52 UTC (rev 190619)
+++ couchdb.service 2016-09-26 15:53:01 UTC (rev 190620)
@@ -3,10 +3,13 @@
[Service]
User=couchdb
-Type=forking
-PermissionsStartOnly=true
-ExecStart=/usr/bin/couchdb -b -o /dev/null -e /dev/null
-ExecStop=/usr/bin/couchdb -d
+Type=simple
+Environment="ERL_FLAGS=-couch_ini /usr/lib/couchdb/etc/default.ini /usr/lib/couchdb/etc/datadirs.ini /etc/couchdb/local.ini"
+ExecStart=/usr/lib/couchdb/bin/couchdb
+ProtectSystem=true
+ProtectHome=true
+NoNewPrivileges=true
+PrivateTmp=true
[Install]
WantedBy=multi-user.target
Added: datadirs.ini
===================================================================
--- datadirs.ini (rev 0)
+++ datadirs.ini 2016-09-26 15:53:01 UTC (rev 190620)
@@ -0,0 +1,3 @@
+[couchdb]
+database_dir = /var/lib/couchdb
+view_index_dir = /var/lib/couchdb
Deleted: erlang18.patch
===================================================================
--- erlang18.patch 2016-09-26 15:51:52 UTC (rev 190619)
+++ erlang18.patch 2016-09-26 15:53:01 UTC (rev 190620)
@@ -1,33 +0,0 @@
-diff -uprb apache-couchdb-1.6.1.orig/configure.ac apache-couchdb-1.6.1/configure.ac
---- apache-couchdb-1.6.1.orig/configure.ac 2014-08-22 02:15:33.000000000 +0300
-+++ apache-couchdb-1.6.1/configure.ac 2015-11-01 12:54:40.661544158 +0200
-@@ -411,7 +411,7 @@ esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
- $as_echo_n "checking Erlang version compatibility... " >&6; }
--erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18.x (erts-7.x)"
-
- version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
- major_version=`echo $version | ${AWK} "{print \\$1}"`
-@@ -419,7 +419,7 @@ minor_version=`echo $version | ${AWK} "{
- patch_version=`echo $version | ${AWK} "{print \\$3}"`
- echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
-
--if test $major_version -lt 5 -o $major_version -gt 6; then
-+if test $major_version -lt 5 -o $major_version -gt 7; then
- as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
- fi
-
-@@ -438,9 +438,9 @@ otp_release="`\
- AC_SUBST(otp_release)
-
- AM_CONDITIONAL([USE_OTP_NIFS],
-- [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")])
-+ [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")])
- AM_CONDITIONAL([USE_EJSON_COMPARE_NIF],
-- [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")])
-+ [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")])
-
- has_crypto=`\
- ${ERL} -eval "\
More information about the arch-commits
mailing list