[couchdb] Ver. 1.0.3-pre
Peter Lemenkov
peter at fedoraproject.org
Tue May 17 09:29:03 UTC 2011
commit 71da7b569988acad07e9c263b22a7692fc0886db
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue May 17 13:28:40 2011 +0400
Ver. 1.0.3-pre
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...-doc-files-and-do-not-install-installatio.patch | 7 +-
...002-Install-docs-into-versioned-directory.patch | 6 +-
...ories-to-search-for-place-for-init-script.patch | 6 +-
...db-0004-Install-into-erllibdir-by-default.patch | 6 +-
...undled-etap-erlang-oauth-ibrowse-and-moch.patch | 54 +
...-0005-Remove-bundled-erlang-oauth-library.patch | 476 --
couchdb-0006-Remove-bundled-etap-library.patch | 1393 ----
...> couchdb-0006-Remove-pid-file-after-stop.patch | 6 +-
...ouchdb-0007-Fixes-for-system-wide-ibrowse.patch | 37 +-
couchdb-0007-Remove-bundled-ibrowse-library.patch | 4110 -----------
couchdb-0008-Remove-bundled-mochiweb-library.patch | 7208 --------------------
...DB-while-it-was-being-opened-would-crash-.patch | 7 +-
... couchdb-0009-Change-respawn-timeout-to-0.patch | 6 +-
...0-Relax-curl-dependency-to-7.15-for-RHEL5.patch | 6 +-
...uchdb-0011-Added-Spidermonkey-1.8.5-patch.patch | 69 +-
couchdb.spec | 62 +-
sources | 2 +-
18 files changed, 182 insertions(+), 13280 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 388e708..7ce4a36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ apache-couchdb-1.0.0.tar.gz
apache-couchdb-1.0.1.tar.gz
/apache-couchdb-1.0.1.tar.gz
/apache-couchdb-1.0.2.tar.gz
+/apache-couchdb-1.0.3-0-ga5f5eab.tar.gz
diff --git a/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch b/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
index eee73be..07e397c 100644
--- a/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
+++ b/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
@@ -1,7 +1,8 @@
-From 0f86f6e868dbdcbf832f28639bdc4c23e3304799 Mon Sep 17 00:00:00 2001
+From 29c872dd483a971d2fa86c4ef6779ed060a473d5 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 13:52:38 +0300
-Subject: [PATCH 01/13] Do not gzip doc-files and do not install installation instructions
+Subject: [PATCH 01/11] Do not gzip doc-files and do not install installation
+ instructions
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -84,5 +85,5 @@ index 6530287..dc4b8ce 100644
$(top_builddir)/test/etap/run
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0002-Install-docs-into-versioned-directory.patch b/couchdb-0002-Install-docs-into-versioned-directory.patch
index 4c3da00..a5ee7a1 100644
--- a/couchdb-0002-Install-docs-into-versioned-directory.patch
+++ b/couchdb-0002-Install-docs-into-versioned-directory.patch
@@ -1,7 +1,7 @@
-From 71ba13a7fb4a06571152da599dae9fe7bcb18807 Mon Sep 17 00:00:00 2001
+From bf15d3fde748ffbb92c11842cae3f8e1dd195790 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:06:12 +0300
-Subject: [PATCH 02/13] Install docs into versioned directory
+Subject: [PATCH 02/11] Install docs into versioned directory
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index c609a08..999f890 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch b/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
index 3143220..812cedc 100644
--- a/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
+++ b/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
@@ -1,7 +1,7 @@
-From 80fea41e3912f06e76e487531533e6b77e25ad93 Mon Sep 17 00:00:00 2001
+From 3b0d28d3ad41a992d171e94d103cec98ac94fda5 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:21:20 +0300
-Subject: [PATCH 03/13] More directories to search for place for init-script
+Subject: [PATCH 03/11] More directories to search for place for init-script
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -42,5 +42,5 @@ index 999f890..4ac64f9 100644
fi
fi
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0004-Install-into-erllibdir-by-default.patch b/couchdb-0004-Install-into-erllibdir-by-default.patch
index 7bc61fd..dbdbbd6 100644
--- a/couchdb-0004-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0004-Install-into-erllibdir-by-default.patch
@@ -1,7 +1,7 @@
-From e25c39956757cd457737ae8cba60a488b259e582 Mon Sep 17 00:00:00 2001
+From d4d95b8414646a4173a6280bc5484f5a334c7e5e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:36:36 +0300
-Subject: [PATCH 04/13] Install into erllibdir by default
+Subject: [PATCH 04/11] Install into erllibdir by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -31,5 +31,5 @@ index 4ac64f9..248bff7 100644
fi
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch b/couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
new file mode 100644
index 0000000..d500fbc
--- /dev/null
+++ b/couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
@@ -0,0 +1,54 @@
+From f45cb16471acd4a57c491e31dda9dad1d1d87bdc Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 15 May 2011 18:47:41 +0400
+Subject: [PATCH 05/11] Don't use bundled etap, erlang-oauth, ibrowse and
+ mochiweb
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ configure.ac | 4 ----
+ src/Makefile.am | 2 +-
+ test/etap/test_util.erl.in | 2 +-
+ 3 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 248bff7..9c10cf7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -404,10 +404,6 @@ AC_CONFIG_FILES([src/Makefile])
+ AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
+ AC_CONFIG_FILES([src/couchdb/Makefile])
+ AC_CONFIG_FILES([src/couchdb/priv/Makefile])
+-AC_CONFIG_FILES([src/erlang-oauth/Makefile])
+-AC_CONFIG_FILES([src/etap/Makefile])
+-AC_CONFIG_FILES([src/ibrowse/Makefile])
+-AC_CONFIG_FILES([src/mochiweb/Makefile])
+ AC_CONFIG_FILES([test/Makefile])
+ AC_CONFIG_FILES([test/bench/Makefile])
+ AC_CONFIG_FILES([test/etap/Makefile])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b9529f9..753b177 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,4 +10,4 @@
+ ## License for the specific language governing permissions and limitations under
+ ## the License.
+
+-SUBDIRS = couchdb erlang-oauth etap ibrowse mochiweb
++SUBDIRS = couchdb
+diff --git a/test/etap/test_util.erl.in b/test/etap/test_util.erl.in
+index 460b029..b013d50 100644
+--- a/test/etap/test_util.erl.in
++++ b/test/etap/test_util.erl.in
+@@ -22,7 +22,7 @@ builddir() ->
+ "@abs_top_builddir@".
+
+ init_code_path() ->
+- Paths = ["etap", "couchdb", "erlang-oauth", "ibrowse", "mochiweb"],
++ Paths = ["couchdb"],
+ lists:foreach(fun(Name) ->
+ code:add_patha(filename:join([builddir(), "src", Name]))
+ end, Paths).
+--
+1.7.5.1
+
diff --git a/couchdb-0010-Remove-pid-file-after-stop.patch b/couchdb-0006-Remove-pid-file-after-stop.patch
similarity index 84%
rename from couchdb-0010-Remove-pid-file-after-stop.patch
rename to couchdb-0006-Remove-pid-file-after-stop.patch
index b0fb9e6..d1d8cbf 100644
--- a/couchdb-0010-Remove-pid-file-after-stop.patch
+++ b/couchdb-0006-Remove-pid-file-after-stop.patch
@@ -1,7 +1,7 @@
-From ca6d9bd34d5231ad285caa5e3ae175cc10d0d36d Mon Sep 17 00:00:00 2001
+From 489b0334a7f9d8df2a313faba6c31ea70c989de6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 7 Jun 2010 15:08:42 +0400
-Subject: [PATCH 10/13] Remove pid-file after stop
+Subject: [PATCH 06/11] Remove pid-file after stop
---
bin/couchdb.tpl.in | 4 +---
@@ -24,5 +24,5 @@ index 94d4743..af5cb01 100644
if kill -1 $PID 2> /dev/null; then
if test "$1" = "false"; then
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0009-Fixes-for-system-wide-ibrowse.patch b/couchdb-0007-Fixes-for-system-wide-ibrowse.patch
similarity index 60%
rename from couchdb-0009-Fixes-for-system-wide-ibrowse.patch
rename to couchdb-0007-Fixes-for-system-wide-ibrowse.patch
index 3007cf7..5181f9f 100644
--- a/couchdb-0009-Fixes-for-system-wide-ibrowse.patch
+++ b/couchdb-0007-Fixes-for-system-wide-ibrowse.patch
@@ -1,16 +1,30 @@
-From 8741c02edcd6251a01774471d51325ac7bf055f5 Mon Sep 17 00:00:00 2001
+From 594a98c98f3216f696a85396653e196ade531b14 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:52:57 +0300
-Subject: [PATCH 09/13] Fixes for system-wide ibrowse
+Subject: [PATCH 07/11] Fixes for system-wide ibrowse
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
+ src/couchdb/couch_rep.erl | 2 +-
src/couchdb/couch_rep_changes_feed.erl | 2 +-
- src/couchdb/couch_rep_httpc.erl | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ src/couchdb/couch_rep_httpc.erl | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl
+index 7a2fd51..4788383 100644
+--- a/src/couchdb/couch_rep.erl
++++ b/src/couchdb/couch_rep.erl
+@@ -18,7 +18,7 @@
+ -export([replicate/2, checkpoint/1]).
+
+ -include("couch_db.hrl").
+--include("../ibrowse/ibrowse.hrl").
++-include_lib("ibrowse/include/ibrowse.hrl").
+
+ -record(state, {
+ changes_feed,
diff --git a/src/couchdb/couch_rep_changes_feed.erl b/src/couchdb/couch_rep_changes_feed.erl
-index 4d1afcb..032f62a 100644
+index 2339c2f..496ccf3 100644
--- a/src/couchdb/couch_rep_changes_feed.erl
+++ b/src/couchdb/couch_rep_changes_feed.erl
@@ -20,7 +20,7 @@
@@ -23,7 +37,7 @@ index 4d1afcb..032f62a 100644
-record (state, {
changes_from = nil,
diff --git a/src/couchdb/couch_rep_httpc.erl b/src/couchdb/couch_rep_httpc.erl
-index e535c0d..e13b00c 100644
+index 783ee96..5609289 100644
--- a/src/couchdb/couch_rep_httpc.erl
+++ b/src/couchdb/couch_rep_httpc.erl
@@ -12,7 +12,7 @@
@@ -35,15 +49,6 @@ index e535c0d..e13b00c 100644
-export([db_exists/1, db_exists/2, full_url/1, request/1, redirected_request/2,
redirect_url/2, spawn_worker_process/1, spawn_link_worker_process/1]).
-@@ -218,7 +218,7 @@ redirected_request(Req, RedirectUrl) ->
-
- spawn_worker_process(Req) ->
- Url = ibrowse_lib:parse_url(Req#http_db.url),
-- {ok, Pid} = ibrowse_http_client:start(Url),
-+ {ok, Pid} = ibrowse_http_client:start({undefined, Url, {[{ssl_imp, new}], (Url#url.protocol == https)}}),
- Pid.
-
- spawn_link_worker_process(Req) ->
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0011-deleting-a-DB-while-it-was-being-opened-would-crash-.patch b/couchdb-0008-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
similarity index 85%
rename from couchdb-0011-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
rename to couchdb-0008-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
index 4bde1dd..2a06dc2 100644
--- a/couchdb-0011-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
+++ b/couchdb-0008-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
@@ -1,7 +1,8 @@
-From 7caf464c8d320ef9da4a019e883c5d50609737ce Mon Sep 17 00:00:00 2001
+From 17984b4e7ef61b8a45efc968762f1be975f3d2f4 Mon Sep 17 00:00:00 2001
From: Adam Kocoloski <kocolosk at apache.org>
Date: Sun, 11 Jul 2010 01:00:50 +0000
-Subject: [PATCH 11/13] deleting a DB while it was being opened would crash couch_server
+Subject: [PATCH 08/11] deleting a DB while it was being opened would crash
+ couch_server
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@962964 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -22,5 +23,5 @@ index 43fd904..88bd610 100644
[{_, {opened, Pid, LruTime}}] ->
couch_util:shutdown_sync(Pid),
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0012-Change-respawn-timeout-to-0.patch b/couchdb-0009-Change-respawn-timeout-to-0.patch
similarity index 81%
rename from couchdb-0012-Change-respawn-timeout-to-0.patch
rename to couchdb-0009-Change-respawn-timeout-to-0.patch
index 2ea035d..110b0e8 100644
--- a/couchdb-0012-Change-respawn-timeout-to-0.patch
+++ b/couchdb-0009-Change-respawn-timeout-to-0.patch
@@ -1,7 +1,7 @@
-From 4184735eefe5be1e756233db17cb77aaa328a740 Mon Sep 17 00:00:00 2001
+From 5a8884db7f3b031ea8e54d86c95f7c51b629b57d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 26 Aug 2010 13:22:56 +0400
-Subject: [PATCH 12/13] Change respawn timeout to 0.
+Subject: [PATCH 09/11] Change respawn timeout to 0.
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -20,5 +20,5 @@ index c2a3f2a..f589c0a 100644
+COUCHDB_RESPAWN_TIMEOUT=0
COUCHDB_OPTIONS=
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0013-Relax-curl-dependency-to-7.15-for-RHEL5.patch b/couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
similarity index 95%
rename from couchdb-0013-Relax-curl-dependency-to-7.15-for-RHEL5.patch
rename to couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
index ab0c105..0e6ef38 100644
--- a/couchdb-0013-Relax-curl-dependency-to-7.15-for-RHEL5.patch
+++ b/couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
@@ -1,7 +1,7 @@
-From e95924d09f0c747e454c69dfcfb3a65ccd9fe49f Mon Sep 17 00:00:00 2001
+From 1bb431db658e45a8afc41fb1ef229b60ca0fb7a8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:59:16 +0300
-Subject: [PATCH 13/13] Relax curl dependency to 7.15 (for RHEL5)
+Subject: [PATCH 10/11] Relax curl dependency to 7.15 (for RHEL5)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -69,5 +69,5 @@ index 6c2a8a8..a672b66 100644
recv_header(void *ptr, size_t size, size_t nmem, void *data)
{
--
-1.7.4
+1.7.5.1
diff --git a/couchdb-0014-Port-to-Spidermonkey-1.8.patch b/couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch
similarity index 83%
rename from couchdb-0014-Port-to-Spidermonkey-1.8.patch
rename to couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch
index 27fa42e..56f4309 100644
--- a/couchdb-0014-Port-to-Spidermonkey-1.8.patch
+++ b/couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch
@@ -1,7 +1,19 @@
-diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c.to_new_js apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c
---- apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c.to_new_js 2010-06-15 18:27:22.000000000 +0200
-+++ apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c 2011-05-03 16:09:18.347552983 +0200
-@@ -49,12 +49,25 @@ go(JSContext* cx, JSObject* obj, HTTPDat
+From 2b4acbcc36df1ef2271e4e6cc82c958757a8bc5c Mon Sep 17 00:00:00 2001
+From: Jan Horak <jhorak at redhat.com>
+Date: Thu, 5 May 2011 16:24:08 +0200
+Subject: [PATCH 11/11] Added Spidermonkey 1.8.5 patch
+
+---
+ src/couchdb/priv/couch_js/http.c | 66 ++++++++++++--------
+ src/couchdb/priv/couch_js/main.c | 125 +++++++++++++++++---------------------
+ src/couchdb/priv/couch_js/utf8.c | 4 +-
+ 3 files changed, 97 insertions(+), 98 deletions(-)
+
+diff --git a/src/couchdb/priv/couch_js/http.c b/src/couchdb/priv/couch_js/http.c
+index a672b66..8bd3cb6 100644
+--- a/src/couchdb/priv/couch_js/http.c
++++ b/src/couchdb/priv/couch_js/http.c
+@@ -49,12 +49,25 @@ go(JSContext* cx, JSObject* obj, HTTPData* http, char* body, size_t blen);
static JSString*
str_from_binary(JSContext* cx, char* data, size_t length);
@@ -13,6 +25,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c.to_new_js apache-
{
HTTPData* http = NULL;
JSBool ret = JS_FALSE;
+-
+ jsval* argv = JS_ARGV(cx, vp);
+ JSObject *obj = NULL;
+ //if (JS_IsConstructing(cx, vp)) {
@@ -23,12 +36,12 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c.to_new_js apache-
+ // obj = JS_THIS_OBJECT(cx, vp);
+ //}
+ //printf("con %x\n", obj);
-
++
+ JSBool *con = JS_IsConstructing(cx, vp);
http = (HTTPData*) malloc(sizeof(HTTPData));
if(!http)
{
-@@ -67,6 +80,7 @@ constructor(JSContext* cx, JSObject* obj
+@@ -67,6 +80,7 @@ constructor(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval)
http->req_headers = NULL;
http->last_status = -1;
@@ -99,7 +112,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c.to_new_js apache-
if(!http)
{
-@@ -268,7 +290,7 @@ sendreq(JSContext* cx, JSObject* obj, ui
+@@ -268,7 +290,7 @@ sendreq(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval)
}
}
@@ -117,7 +130,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c.to_new_js apache-
{
HTTPData* http = (HTTPData*) JS_GetPrivate(cx, obj);
-@@ -286,16 +308,8 @@ status(JSContext* cx, JSObject* obj, jsv
+@@ -286,16 +308,8 @@ status(JSContext* cx, JSObject* obj, jsval idval, jsval* vp)
return JS_FALSE;
}
@@ -160,9 +173,10 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/http.c.to_new_js apache-
};
JSObject*
-diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c
---- apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js 2009-11-27 23:43:59.000000000 +0100
-+++ apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c 2011-05-03 16:15:56.825571272 +0200
+diff --git a/src/couchdb/priv/couch_js/main.c b/src/couchdb/priv/couch_js/main.c
+index 376aa15..243e971 100644
+--- a/src/couchdb/priv/couch_js/main.c
++++ b/src/couchdb/priv/couch_js/main.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <jsapi.h>
@@ -195,7 +209,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
{
JSString *str;
JSObject *sandbox;
-@@ -45,11 +58,12 @@ evalcx(JSContext *cx, JSObject *obj, uin
+@@ -45,11 +58,12 @@ evalcx(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
jsval v;
sandbox = NULL;
@@ -209,7 +223,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
subcx = JS_NewContext(JS_GetRuntime(cx), 8L * 1024L);
if(!subcx)
{
-@@ -57,24 +71,30 @@ evalcx(JSContext *cx, JSObject *obj, uin
+@@ -57,24 +71,30 @@ evalcx(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
return JS_FALSE;
}
@@ -269,7 +283,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
if(!bytes) return JS_FALSE;
fprintf(stdout, "%s%s", i ? " " : "", bytes);
-@@ -113,9 +132,9 @@ print(JSContext *cx, JSObject *obj, uint
+@@ -113,9 +132,9 @@ print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
}
static JSBool
@@ -313,14 +327,13 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
- return NULL;
- }
- bytes = tmp;
-- }
--
-- *buflen = used;
+ readlen = getline(&bytes, &byteslen, fp);
+ if (readlen <= 0) {
+ *buflen = 0;
+ return bytes;
-+ }
+ }
+-
+- *buflen = used;
+ if (bytes[readlen-1] == '\n')
+ bytes[readlen-1] = '\0';
+ *buflen = readlen;
@@ -333,7 +346,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
jschar *chars;
JSString *str;
char* bytes;
-@@ -173,7 +174,7 @@ readline(JSContext *cx, JSObject *obj, u
+@@ -173,7 +174,7 @@ readline(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
/* Treat the empty string specially */
if(byteslen == 0)
{
@@ -342,7 +355,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
JS_free(cx, bytes);
return JS_TRUE;
}
-@@ -191,28 +192,27 @@ readline(JSContext *cx, JSObject *obj, u
+@@ -191,28 +192,27 @@ readline(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
JS_free(cx, bytes);
if(!str) return JS_FALSE;
@@ -376,7 +389,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
jsval result;
if(!filename || strcmp(filename, "-") == 0)
-@@ -234,7 +234,6 @@ execute_script(JSContext *cx, JSObject *
+@@ -234,7 +234,6 @@ execute_script(JSContext *cx, JSObject *obj, const char *filename) {
if(script)
{
JS_ExecuteScript(cx, obj, script, &result);
@@ -384,7 +397,7 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
}
}
-@@ -248,27 +247,13 @@ printerror(JSContext *cx, const char *me
+@@ -248,27 +247,13 @@ printerror(JSContext *cx, const char *mesg, JSErrorReport *report)
}
static JSFunctionSpec global_functions[] = {
@@ -428,10 +441,11 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/main.c.to_new_js apache-
if (!global) return 1;
if (!JS_InitStandardClasses(cx, global)) return 1;
-diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/utf8.c.to_new_js apache-couchdb-1.0.2/src/couchdb/priv/couch_js/utf8.c
---- apache-couchdb-1.0.2/src/couchdb/priv/couch_js/utf8.c.to_new_js 2009-11-27 07:41:39.000000000 +0100
-+++ apache-couchdb-1.0.2/src/couchdb/priv/couch_js/utf8.c 2011-05-03 16:14:16.946819926 +0200
-@@ -129,7 +129,7 @@ enc_string(JSContext* cx, jsval arg, siz
+diff --git a/src/couchdb/priv/couch_js/utf8.c b/src/couchdb/priv/couch_js/utf8.c
+index 699a6fe..9ccc256 100644
+--- a/src/couchdb/priv/couch_js/utf8.c
++++ b/src/couchdb/priv/couch_js/utf8.c
+@@ -129,7 +129,7 @@ enc_string(JSContext* cx, jsval arg, size_t* buflen)
str = JS_ValueToString(cx, arg);
if(!str) goto error;
@@ -447,3 +461,6 @@ diff -up apache-couchdb-1.0.2/src/couchdb/priv/couch_js/utf8.c.to_new_js apache-
-}
\ No newline at end of file
+}
+--
+1.7.5.1
+
diff --git a/couchdb.spec b/couchdb.spec
index 6e8edf4..63aeffd 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -3,29 +3,29 @@
%define couchdb_home %{_localstatedir}/lib/couchdb
Name: couchdb
-Version: 1.0.2
-Release: 3%{?dist}
+Version: 1.0.3
+Release: 0.1%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
License: ASL 2.0
URL: http://couchdb.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{version}/apache-%{name}-%{version}.tar.gz
+#Source0: http://www.apache.org/dist/%{name}/%{version}/apache-%{name}-%{version}.tar.gz
+# wget --no-check-certificate https://github.com/apache/couchdb/tarball/1.0.3
+Source0: apache-couchdb-1.0.3-0-ga5f5eab.tar.gz
Source1: %{name}.init
Patch1: couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
Patch2: couchdb-0002-Install-docs-into-versioned-directory.patch
Patch3: couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
Patch4: couchdb-0004-Install-into-erllibdir-by-default.patch
-Patch5: couchdb-0005-Remove-bundled-erlang-oauth-library.patch
-Patch6: couchdb-0006-Remove-bundled-etap-library.patch
-Patch7: couchdb-0007-Remove-bundled-ibrowse-library.patch
-Patch8: couchdb-0008-Remove-bundled-mochiweb-library.patch
-Patch9: couchdb-0009-Fixes-for-system-wide-ibrowse.patch
-Patch10: couchdb-0010-Remove-pid-file-after-stop.patch
-Patch11: couchdb-0011-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
-Patch12: couchdb-0012-Change-respawn-timeout-to-0.patch
-Patch13: couchdb-0013-Relax-curl-dependency-to-7.15-for-RHEL5.patch
-Patch14: couchdb-0014-Port-to-Spidermonkey-1.8.patch
+Patch5: couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
+Patch6: couchdb-0006-Remove-pid-file-after-stop.patch
+Patch7: couchdb-0007-Fixes-for-system-wide-ibrowse.patch
+Patch8: couchdb-0008-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
+Patch9: couchdb-0009-Change-respawn-timeout-to-0.patch
+Patch10: couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
+Patch11: couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +46,7 @@ BuildRequires: perl(Test::Harness)
Requires: erlang-crypto
Requires: erlang-erts
-Requires: erlang-ibrowse >= 2.1.0
+Requires: erlang-ibrowse >= 2.2.0
Requires: erlang-inets
Requires: erlang-kernel
Requires: erlang-mochiweb
@@ -73,27 +73,34 @@ JavaScript acting as the default view definition language.
%prep
-%setup -q -n apache-%{name}-%{version}
+#%setup -q -n apache-%{name}-%{version}
+%setup -q -n apache-couchdb-9570ce8
%patch1 -p1 -b .dont_gzip
%patch2 -p1 -b .use_versioned_docdir
%patch3 -p1 -b .more_init_dirs
%patch4 -p1 -b .install_into_erldir
-%patch5 -p1 -b .remove_bundled_oauth
-%patch6 -p1 -b .remove_bundled_etap
-%patch7 -p1 -b .remove_bundled_ibrowse
-%patch8 -p1 -b .remove_bundled_mochiweb
-%patch9 -p1 -b .workaround_for_system_wide_ibrowse
-%patch10 -p1 -b .remove_pid_file
-%patch11 -p1 -b .fix_crash
-%patch12 -p1 -b .fix_respawn
+%patch5 -p1 -b .remove_bundled_libs
+%patch6 -p1 -b .remove_pid_file
+%patch7 -p1 -b .workaround_for_system_wide_ibrowse
+%patch8 -p1 -b .fix_crash
+%patch9 -p1 -b .fix_respawn
%if 0%{?el5}
# Erlang/OTP R12B5
-%patch13 -p1 -b .curl_7_15
+%patch10 -p1 -b .curl_7_15
+%endif
+%if 0%{?fc15}%{?fc16}
+%patch11 -p1 -b .to_new_js
%endif
-%patch14 -p1 -b .to_new_js
+
+# Remove bundled libraries
+rm -rf src/erlang-oauth
+rm -rf src/etap
+rm -rf src/ibrowse
+rm -rf src/mochiweb
%build
-autoreconf -ivf
+./bootstrap
+#autoreconf -ivf
%configure
make %{?_smp_mflags}
@@ -159,6 +166,9 @@ fi
%changelog
+* Mon May 16 2011 Peter Lemenkov <lemenkov at gmail.com> - 1.0.3-0.1
+- Pre-release of ver. 1.0.3
+
* Thu May 5 2011 Jan Horak <jhorak at redhat.com> - 1.0.2-3
- Added Spidermonkey 1.8.5 patch
diff --git a/sources b/sources
index 9417261..6c812f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ffbbe0f23f672181c89923c9f7a1de1 apache-couchdb-1.0.2.tar.gz
+5bcace75c3d28b3003e758138c1774f9 apache-couchdb-1.0.3-0-ga5f5eab.tar.gz
More information about the scm-commits
mailing list