Date: Saturday, April 2, 2016 @ 19:01:54 Author: fyan Revision: 169261
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: couchdb/repos/community-staging-i686/ couchdb/repos/community-staging-i686/PKGBUILD (from rev 169258, couchdb/trunk/PKGBUILD) couchdb/repos/community-staging-i686/couchdb.install (from rev 169258, couchdb/trunk/couchdb.install) couchdb/repos/community-staging-i686/couchdb.service (from rev 169258, couchdb/trunk/couchdb.service) couchdb/repos/community-staging-i686/couchdb.tmpfiles (from rev 169258, couchdb/trunk/couchdb.tmpfiles) couchdb/repos/community-staging-i686/erlang18.patch (from rev 169258, couchdb/trunk/erlang18.patch) couchdb/repos/community-staging-x86_64/ couchdb/repos/community-staging-x86_64/PKGBUILD (from rev 169258, couchdb/trunk/PKGBUILD) couchdb/repos/community-staging-x86_64/couchdb.install (from rev 169258, couchdb/trunk/couchdb.install) couchdb/repos/community-staging-x86_64/couchdb.service (from rev 169258, couchdb/trunk/couchdb.service) couchdb/repos/community-staging-x86_64/couchdb.tmpfiles (from rev 169258, couchdb/trunk/couchdb.tmpfiles) couchdb/repos/community-staging-x86_64/erlang18.patch (from rev 169258, couchdb/trunk/erlang18.patch) -------------------------------------------+ community-staging-i686/PKGBUILD | 57 ++++++++++++++++++++++++++++ community-staging-i686/couchdb.install | 18 ++++++++ community-staging-i686/couchdb.service | 12 +++++ community-staging-i686/couchdb.tmpfiles | 1 community-staging-i686/erlang18.patch | 33 ++++++++++++++++ community-staging-x86_64/PKGBUILD | 57 ++++++++++++++++++++++++++++ community-staging-x86_64/couchdb.install | 18 ++++++++ community-staging-x86_64/couchdb.service | 12 +++++ community-staging-x86_64/couchdb.tmpfiles | 1 community-staging-x86_64/erlang18.patch | 33 ++++++++++++++++ 10 files changed, 242 insertions(+) Copied: couchdb/repos/community-staging-i686/PKGBUILD (from rev 169258, couchdb/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua +# Contributor: Michael Fellinger <m.fellin...@gmail.com> + +pkgname=couchdb +pkgver=1.6.1 +pkgrel=7 +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" +license=('APACHE') +depends=('icu' 'erlang-nox' 'js185' 'openssl' 'curl' 'util-linux') +makedepends=('autoconf-archive' 'git') +install=couchdb.install +backup=('etc/couchdb/local.ini' + 'etc/conf.d/couchdb' + 'etc/logrotate.d/couchdb') +validpgpkeys=('E0AF0A194D55C84E4A19A801CDB0C0F904F4EE9B') +#source=("git://github.com/apache/couchdb.git#commit=8d7ab8b18dd20f8785e69f4420c6f93a2edbfa60" +source=("http://www.eu.apache.org/dist/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} + "erlang18.patch" + "couchdb.service" + "couchdb.tmpfiles") +md5sums=('01a2c8ab4fcde457529428993901a060' + 'SKIP' + '8488bf9f7b07b40a39ff5448e3509905' + '8914a7ffc6745f94106d96206709acb4' + '1e254ebe32eeb061be64193bafa35dbf') + +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 +} + +package() { + cd "$srcdir/apache-couchdb-$pkgver" + make DESTDIR="$pkgdir" install + + 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 + + rm -rf $pkgdir/etc/default/ $pkgdir/var/run $pkgdir/etc/init.d + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf +} Copied: couchdb/repos/community-staging-i686/couchdb.install (from rev 169258, couchdb/trunk/couchdb.install) =================================================================== --- community-staging-i686/couchdb.install (rev 0) +++ community-staging-i686/couchdb.install 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1,18 @@ +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 +} + +pre_upgrade() { + 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 +} Copied: couchdb/repos/community-staging-i686/couchdb.service (from rev 169258, couchdb/trunk/couchdb.service) =================================================================== --- community-staging-i686/couchdb.service (rev 0) +++ community-staging-i686/couchdb.service 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1,12 @@ +[Unit] +Description=CouchDB Server + +[Service] +User=couchdb +Type=forking +PermissionsStartOnly=true +ExecStart=/usr/bin/couchdb -b -o /dev/null -e /dev/null +ExecStop=/usr/bin/couchdb -d + +[Install] +WantedBy=multi-user.target Copied: couchdb/repos/community-staging-i686/couchdb.tmpfiles (from rev 169258, couchdb/trunk/couchdb.tmpfiles) =================================================================== --- community-staging-i686/couchdb.tmpfiles (rev 0) +++ community-staging-i686/couchdb.tmpfiles 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1 @@ +d /run/couchdb 0755 couchdb daemon - Copied: couchdb/repos/community-staging-i686/erlang18.patch (from rev 169258, couchdb/trunk/erlang18.patch) =================================================================== --- community-staging-i686/erlang18.patch (rev 0) +++ community-staging-i686/erlang18.patch 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1,33 @@ +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 "\ Copied: couchdb/repos/community-staging-x86_64/PKGBUILD (from rev 169258, couchdb/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua +# Contributor: Michael Fellinger <m.fellin...@gmail.com> + +pkgname=couchdb +pkgver=1.6.1 +pkgrel=7 +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" +license=('APACHE') +depends=('icu' 'erlang-nox' 'js185' 'openssl' 'curl' 'util-linux') +makedepends=('autoconf-archive' 'git') +install=couchdb.install +backup=('etc/couchdb/local.ini' + 'etc/conf.d/couchdb' + 'etc/logrotate.d/couchdb') +validpgpkeys=('E0AF0A194D55C84E4A19A801CDB0C0F904F4EE9B') +#source=("git://github.com/apache/couchdb.git#commit=8d7ab8b18dd20f8785e69f4420c6f93a2edbfa60" +source=("http://www.eu.apache.org/dist/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} + "erlang18.patch" + "couchdb.service" + "couchdb.tmpfiles") +md5sums=('01a2c8ab4fcde457529428993901a060' + 'SKIP' + '8488bf9f7b07b40a39ff5448e3509905' + '8914a7ffc6745f94106d96206709acb4' + '1e254ebe32eeb061be64193bafa35dbf') + +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 +} + +package() { + cd "$srcdir/apache-couchdb-$pkgver" + make DESTDIR="$pkgdir" install + + 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 + + rm -rf $pkgdir/etc/default/ $pkgdir/var/run $pkgdir/etc/init.d + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf +} Copied: couchdb/repos/community-staging-x86_64/couchdb.install (from rev 169258, couchdb/trunk/couchdb.install) =================================================================== --- community-staging-x86_64/couchdb.install (rev 0) +++ community-staging-x86_64/couchdb.install 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1,18 @@ +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 +} + +pre_upgrade() { + 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 +} Copied: couchdb/repos/community-staging-x86_64/couchdb.service (from rev 169258, couchdb/trunk/couchdb.service) =================================================================== --- community-staging-x86_64/couchdb.service (rev 0) +++ community-staging-x86_64/couchdb.service 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1,12 @@ +[Unit] +Description=CouchDB Server + +[Service] +User=couchdb +Type=forking +PermissionsStartOnly=true +ExecStart=/usr/bin/couchdb -b -o /dev/null -e /dev/null +ExecStop=/usr/bin/couchdb -d + +[Install] +WantedBy=multi-user.target Copied: couchdb/repos/community-staging-x86_64/couchdb.tmpfiles (from rev 169258, couchdb/trunk/couchdb.tmpfiles) =================================================================== --- community-staging-x86_64/couchdb.tmpfiles (rev 0) +++ community-staging-x86_64/couchdb.tmpfiles 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1 @@ +d /run/couchdb 0755 couchdb daemon - Copied: couchdb/repos/community-staging-x86_64/erlang18.patch (from rev 169258, couchdb/trunk/erlang18.patch) =================================================================== --- community-staging-x86_64/erlang18.patch (rev 0) +++ community-staging-x86_64/erlang18.patch 2016-04-02 17:01:54 UTC (rev 169261) @@ -0,0 +1,33 @@ +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 "\