summaryrefslogtreecommitdiff
path: root/community/couchdb
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-02-10 11:32:41 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-02-10 11:32:41 +0100
commitbdf817c3549ba377334deb1161de703579670d62 (patch)
treec1b80c05c917cda2619e267049978f971bdad169 /community/couchdb
parentdf609724f30aaccfb05d9fb73f68e7a37118f2f8 (diff)
parent1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/cdemu-client/PKGBUILD community/dcron/PKGBUILD community/freevo/PKGBUILD community/gmerlin-avdecoder/PKGBUILD community/hacburn/PKGBUILD community/htmldoc/PKGBUILD community/ibus-table/PKGBUILD community/iksemel/PKGBUILD community/isomaster/PKGBUILD community/libmatio/PKGBUILD community/libtlen/PKGBUILD community/luarocks/PKGBUILD community/lxde-common/PKGBUILD community/multipath-tools/PKGBUILD community/nvclock/PKGBUILD community/pam-krb5/PKGBUILD community/pidgin-musictracker/PKGBUILD community/pkgfile/PKGBUILD community/pkgtools/PKGBUILD community/print-manager/PKGBUILD community/python-pyro/PKGBUILD community/python-pyxmpp/PKGBUILD community/python2-simplejson/PKGBUILD community/rsnapshot/PKGBUILD community/setconf/PKGBUILD community/tagpy/PKGBUILD community/terminator/PKGBUILD community/udunits/PKGBUILD community/vlock/PKGBUILD community/winefish/PKGBUILD core/nss-myhostname/PKGBUILD extra/avfs/PKGBUILD extra/bmp-musepack/PKGBUILD extra/bmp-wma/PKGBUILD extra/bochs/PKGBUILD extra/botan/PKGBUILD extra/cdargs/PKGBUILD extra/cx_freeze/PKGBUILD extra/dcfldd/PKGBUILD extra/devilspie/PKGBUILD extra/emelfm2/PKGBUILD extra/evilwm/PKGBUILD extra/fssos-nsvs/PKGBUILD extra/gimp-dbp/PKGBUILD extra/gimp-gap/PKGBUILD extra/gimp-ufraw/PKGBUILD extra/gmpc/PKGBUILD extra/gtkpod/PKGBUILD extra/hercules/PKGBUILD extra/herqq/PKGBUILD extra/hydrogen/PKGBUILD extra/kdegames/PKGBUILD extra/kradio/PKGBUILD extra/kshutdown/PKGBUILD extra/libmusicbrainz4/PKGBUILD extra/mahjong/PKGBUILD extra/mcrypt/PKGBUILD extra/monica/PKGBUILD extra/mpck/PKGBUILD extra/mrtg/PKGBUILD extra/nicotine/PKGBUILD extra/normalize/PKGBUILD extra/oprofile/PKGBUILD extra/perl-event/PKGBUILD extra/perl-unicode-string/PKGBUILD extra/pidgin-encryption/PKGBUILD extra/proftpd/PKGBUILD extra/pymad/PKGBUILD extra/qiv/PKGBUILD extra/quodlibet/PKGBUILD extra/ratpoison/PKGBUILD extra/rox/PKGBUILD extra/scrot/PKGBUILD extra/stardict/PKGBUILD extra/terminal/PKGBUILD extra/usbview/PKGBUILD extra/xdelta/PKGBUILD extra/xdelta3/PKGBUILD extra/xorg-xlsfonts/PKGBUILD extra/zile/PKGBUILD mozilla-testing/iceweasel-libre/mozconfig mozilla-testing/iceweasel-libre/vendor.js social/tokyocabinet/PKGBUILD ~fauno/notmuch/PKGBUILD ~mtjm/thinkfan/PKGBUILD ~mtjm/zbar/PKGBUILD
Diffstat (limited to 'community/couchdb')
-rw-r--r--community/couchdb/configure-fix.patch21
-rw-r--r--community/couchdb/rc-script.patch57
2 files changed, 0 insertions, 78 deletions
diff --git a/community/couchdb/configure-fix.patch b/community/couchdb/configure-fix.patch
deleted file mode 100644
index 0bb68ecfe..000000000
--- a/community/couchdb/configure-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rup apache-couchdb-1.2.0/configure apache-couchdb-1.2.0.new/configure
---- apache-couchdb-1.2.0/configure 2012-03-29 23:05:41.000000000 +0200
-+++ apache-couchdb-1.2.0.new/configure 2012-04-08 13:50:14.923693056 +0200
-@@ -18234,7 +18234,7 @@ echo "$as_me: error: $erlang_version_err
- fi
- fi
-
--otp_release="`${ERL} -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`"
-+otp_release="`${ERL} -smp disable -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`"
-
- if test x$otp_release \> xR13B03; then
- USE_OTP_NIFS_TRUE=
-@@ -18253,7 +18253,7 @@ else
- fi
-
-
--has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
-+has_crypto=`${ERL} -smp disable -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
-
- if test -n "$has_crypto"; then
- { { echo "$as_me:$LINENO: error: Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" >&5
diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch
deleted file mode 100644
index 1dd723ffc..000000000
--- a/community/couchdb/rc-script.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- couchdb 2011-12-27 01:21:59.000000000 +0400
-+++ couchdb.my 2011-12-27 01:21:18.000000000 +0400
-@@ -1,6 +1,4 @@
--#!/bin/bash
--. /etc/rc.conf
--. /etc/rc.d/functions
-+#!/bin/sh -e
-
- # Licensed under the Apache License, Version 2.0 (the "License"); you may not
- # use this file except in compliance with the License. You may obtain a copy of
-@@ -31,7 +29,7 @@
- NAME=couchdb
- SCRIPT_NAME=`basename $0`
- COUCHDB=/usr/bin/couchdb
--CONFIGURATION_FILE=/etc/conf.d/couchdb
-+CONFIGURATION_FILE=/etc/default/couchdb
- RUN_DIR=/var/run/couchdb
- LSB_LIBRARY=/lib/lsb/init-functions
-
-@@ -44,14 +42,16 @@
- fi
-
- log_daemon_msg () {
-- stat_busy $@
-+ # Dummy function to be replaced by LSB library.
-+
-+ echo $@
- }
-
- log_end_msg () {
-+ # Dummy function to be replaced by LSB library.
-+
- if test "$1" != "0"; then
-- stat_fail
-- else
-- stat_done
-+ echo "Error with $DESCRIPTION: $NAME"
- fi
- return $1
- }
-@@ -66,7 +66,7 @@
- command="$command $COUCHDB_OPTIONS"
- fi
- if test -n "$COUCHDB_USER"; then
-- if su $COUCHDB_USER -s /bin/bash -c "$command"; then
-+ if su $COUCHDB_USER -c "$command"; then
- return $SCRIPT_OK
- else
- return $SCRIPT_ERROR
-@@ -84,7 +84,6 @@
- # Start Apache CouchDB as a background process.
-
- mkdir -p "$RUN_DIR"
-- chown -R $COUCHDB_USER "$RUN_DIR"
- command="$COUCHDB -b"
- if test -n "$COUCHDB_STDOUT_FILE"; then
- command="$command -o $COUCHDB_STDOUT_FILE"