[couchdb] Ver. 1.0.1
Peter Lemenkov
peter at fedoraproject.org
Tue Aug 17 06:03:11 UTC 2010
commit 0cbed4e0cf1e298bfd5762b08cd9862231f48fc5
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Aug 17 10:02:56 2010 +0400
Ver. 1.0.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...uchdb-0001-Force-init-script-installation.patch | 6 +-
...db-0002-Install-into-erllibdir-by-default.patch | 6 +-
...-0003-Remove-bundled-erlang-oauth-library.patch | 80 +++++++++++++++-----
...b-0004-Remove-bundled-erlang-etap-library.patch | 14 ++--
...chdb-0005-Remove-bundled-mochiweb-library.patch | 14 ++--
...uchdb-0006-Remove-bundled-ibrowse-library.patch | 21 +++---
...b-0007-Workaround-for-system-wide-ibrowse.patch | 10 +-
...> couchdb-0008-Remove-pid-file-after-stop.patch | 4 +-
...DB-while-it-was-being-opened-would-crash-.patch | 4 +-
couchdb.spec | 23 +++---
sources | 2 +-
12 files changed, 115 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d643bed..674fd00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
apache-couchdb-0.11.1.tar.gz
apache-couchdb-1.0.0.tar.gz
+apache-couchdb-1.0.1.tar.gz
diff --git a/couchdb-1.0.0-0001-Force-init-script-installation.patch b/couchdb-0001-Force-init-script-installation.patch
similarity index 90%
rename from couchdb-1.0.0-0001-Force-init-script-installation.patch
rename to couchdb-0001-Force-init-script-installation.patch
index 4f046c1..11688a3 100644
--- a/couchdb-1.0.0-0001-Force-init-script-installation.patch
+++ b/couchdb-0001-Force-init-script-installation.patch
@@ -1,4 +1,4 @@
-From eeeeb10f4a99786046262c1d28e70a69768f0710 Mon Sep 17 00:00:00 2001
+From b8662ca68f25693371f446cab5e8f0e31a89d6f6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 27 May 2010 15:17:20 +0400
Subject: [PATCH 1/9] Force init script installation
@@ -8,7 +8,7 @@ Subject: [PATCH 1/9] Force init script installation
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 0c08952..08a1c1c 100644
+index c609a08..cd8c807 100644
--- a/configure.ac
+++ b/configure.ac
@@ -294,19 +294,9 @@ launchd_enabled=false
@@ -35,5 +35,5 @@ index 0c08952..08a1c1c 100644
if test "$use_launchd" = "yes"; then
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb-1.0.0-0002-Install-into-erllibdir-by-default.patch b/couchdb-0002-Install-into-erllibdir-by-default.patch
similarity index 88%
rename from couchdb-1.0.0-0002-Install-into-erllibdir-by-default.patch
rename to couchdb-0002-Install-into-erllibdir-by-default.patch
index 0ab87a7..a9c6290 100644
--- a/couchdb-1.0.0-0002-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0002-Install-into-erllibdir-by-default.patch
@@ -1,4 +1,4 @@
-From 22a6d6b33d32141bd4e64fd602010c31fa11e4ed Mon Sep 17 00:00:00 2001
+From 6ef6880ef3bc48d95fb23752e63bbff84d737cdd Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 27 May 2010 15:18:29 +0400
Subject: [PATCH 2/9] Install into erllibdir by default
@@ -8,7 +8,7 @@ Subject: [PATCH 2/9] Install into erllibdir by default
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
-index ce82d90..28caf74 100755
+index 8d47467..239eff7 100755
--- a/configure
+++ b/configure
@@ -12193,7 +12193,7 @@ localdatadir=${datadir}/${package_identifier}
@@ -30,5 +30,5 @@ index ce82d90..28caf74 100755
localerlanglibdir=${locallibdir}/erlang/lib
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb-1.0.0-0003-Remove-bundled-erlang-oauth-library.patch b/couchdb-0003-Remove-bundled-erlang-oauth-library.patch
similarity index 93%
rename from couchdb-1.0.0-0003-Remove-bundled-erlang-oauth-library.patch
rename to couchdb-0003-Remove-bundled-erlang-oauth-library.patch
index b7f6a35..e5e3fc4 100644
--- a/couchdb-1.0.0-0003-Remove-bundled-erlang-oauth-library.patch
+++ b/couchdb-0003-Remove-bundled-erlang-oauth-library.patch
@@ -1,4 +1,4 @@
-From def82e3226932c188c29b29d8cd792a33ba5599e Mon Sep 17 00:00:00 2001
+From 2aae1a873cec7abe85cac3785c1c595df9dbf0bb Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 14 Jul 2010 17:57:54 +0400
Subject: [PATCH 3/9] Remove bundled erlang-oauth library
@@ -8,17 +8,18 @@ Subject: [PATCH 3/9] Remove bundled erlang-oauth library
configure.ac | 1 -
src/Makefile.am | 2 +-
src/Makefile.in | 2 +-
- src/erlang-oauth/Makefile.am | 49 ----
- src/erlang-oauth/Makefile.in | 484 ----------------------------------
+ src/erlang-oauth/Makefile.am | 50 ----
+ src/erlang-oauth/Makefile.in | 485 ----------------------------------
src/erlang-oauth/oauth.app.in | 20 --
src/erlang-oauth/oauth.erl | 107 --------
src/erlang-oauth/oauth_hmac_sha1.erl | 11 -
src/erlang-oauth/oauth_http.erl | 22 --
src/erlang-oauth/oauth_plaintext.erl | 10 -
+ src/erlang-oauth/oauth_rsa_sha1.erl | 30 --
src/erlang-oauth/oauth_unix.erl | 16 --
src/erlang-oauth/oauth_uri.erl | 88 ------
test/etap/test_util.erl.in | 2 +-
- 14 files changed, 3 insertions(+), 814 deletions(-)
+ 15 files changed, 3 insertions(+), 846 deletions(-)
delete mode 100644 src/erlang-oauth/Makefile.am
delete mode 100644 src/erlang-oauth/Makefile.in
delete mode 100644 src/erlang-oauth/oauth.app.in
@@ -26,14 +27,15 @@ Subject: [PATCH 3/9] Remove bundled erlang-oauth library
delete mode 100644 src/erlang-oauth/oauth_hmac_sha1.erl
delete mode 100644 src/erlang-oauth/oauth_http.erl
delete mode 100644 src/erlang-oauth/oauth_plaintext.erl
+ delete mode 100644 src/erlang-oauth/oauth_rsa_sha1.erl
delete mode 100644 src/erlang-oauth/oauth_unix.erl
delete mode 100644 src/erlang-oauth/oauth_uri.erl
diff --git a/configure b/configure
-index 28caf74..b3040cf 100755
+index 239eff7..5a205d2 100755
--- a/configure
+++ b/configure
-@@ -12261,8 +12261,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
+@@ -12263,8 +12263,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
ac_config_files="$ac_config_files src/couchdb/priv/Makefile"
@@ -42,7 +44,7 @@ index 28caf74..b3040cf 100755
ac_config_files="$ac_config_files src/etap/Makefile"
ac_config_files="$ac_config_files src/ibrowse/Makefile"
-@@ -13290,7 +13288,6 @@ do
+@@ -13293,7 +13291,6 @@ do
"src/couchdb/couch.app.tpl") CONFIG_FILES="$CONFIG_FILES src/couchdb/couch.app.tpl" ;;
"src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;
"src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;
@@ -51,10 +53,10 @@ index 28caf74..b3040cf 100755
"src/ibrowse/Makefile") CONFIG_FILES="$CONFIG_FILES src/ibrowse/Makefile" ;;
"src/mochiweb/Makefile") CONFIG_FILES="$CONFIG_FILES src/mochiweb/Makefile" ;;
diff --git a/configure.ac b/configure.ac
-index 08a1c1c..84a38d3 100644
+index cd8c807..8b31f54 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -387,7 +387,6 @@ AC_CONFIG_FILES([src/Makefile])
+@@ -388,7 +388,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])
@@ -87,10 +89,10 @@ index daff9c3..3fec89c 100644
.SUFFIXES:
diff --git a/src/erlang-oauth/Makefile.am b/src/erlang-oauth/Makefile.am
deleted file mode 100644
-index 1d12339..0000000
+index 48b7648..0000000
--- a/src/erlang-oauth/Makefile.am
+++ /dev/null
-@@ -1,49 +0,0 @@
+@@ -1,50 +0,0 @@
-## 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 the License at
@@ -105,18 +107,19 @@ index 1d12339..0000000
-
-oauthebindir = $(localerlanglibdir)/erlang-oauth/ebin
-
--# Removed oauth_rsa_sha1.erl until we require R12B5 or
--# we add a ./configure option to enable it.
--
-oauth_file_collection = \
- oauth.app.in \
- oauth.erl \
- oauth_hmac_sha1.erl \
- oauth_http.erl \
- oauth_plaintext.erl \
+- oauth_rsa_sha1.erl \
- oauth_unix.erl \
- oauth_uri.erl
-
+-# Removed oauth_rsa_sha1.beam until we require R12B5 or
+-# we add a ./configure option to enable it.
+-
-oauthebin_make_generated_file_list = \
- oauth.app \
- oauth.beam \
@@ -142,10 +145,10 @@ index 1d12339..0000000
- $(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/erlang-oauth/Makefile.in b/src/erlang-oauth/Makefile.in
deleted file mode 100644
-index 282883b..0000000
+index f8c3e34..0000000
--- a/src/erlang-oauth/Makefile.in
+++ /dev/null
-@@ -1,484 +0,0 @@
+@@ -1,485 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
@@ -381,18 +384,19 @@ index 282883b..0000000
-version_revision = @version_revision@
-version_stage = @version_stage@
-oauthebindir = $(localerlanglibdir)/erlang-oauth/ebin
--
--# Removed oauth_rsa_sha1.erl until we require R12B5 or
--# we add a ./configure option to enable it.
-oauth_file_collection = \
- oauth.app.in \
- oauth.erl \
- oauth_hmac_sha1.erl \
- oauth_http.erl \
- oauth_plaintext.erl \
+- oauth_rsa_sha1.erl \
- oauth_unix.erl \
- oauth_uri.erl
-
+-
+-# Removed oauth_rsa_sha1.beam until we require R12B5 or
+-# we add a ./configure option to enable it.
-oauthebin_make_generated_file_list = \
- oauth.app \
- oauth.beam \
@@ -830,6 +834,42 @@ index 41a1e9b..0000000
-
-verify(Signature, CS, TS) ->
- couch_util:verify(signature(CS, TS), Signature).
+diff --git a/src/erlang-oauth/oauth_rsa_sha1.erl b/src/erlang-oauth/oauth_rsa_sha1.erl
+deleted file mode 100644
+index 6f4828e..0000000
+--- a/src/erlang-oauth/oauth_rsa_sha1.erl
++++ /dev/null
+@@ -1,30 +0,0 @@
+--module(oauth_rsa_sha1).
+-
+--export([signature/2, verify/3]).
+-
+--include_lib("public_key/include/public_key.hrl").
+-
+-
+-signature(BaseString, PrivateKeyPath) ->
+- {ok, [Info]} = public_key:pem_to_der(PrivateKeyPath),
+- {ok, PrivateKey} = public_key:decode_private_key(Info),
+- base64:encode_to_string(public_key:sign(list_to_binary(BaseString), PrivateKey)).
+-
+-verify(Signature, BaseString, PublicKey) ->
+- public_key:verify_signature(to_binary(BaseString), sha, base64:decode(Signature), public_key(PublicKey)).
+-
+-to_binary(Term) when is_list(Term) ->
+- list_to_binary(Term);
+-to_binary(Term) when is_binary(Term) ->
+- Term.
+-
+-public_key(Path) when is_list(Path) ->
+- {ok, [{cert, DerCert, not_encrypted}]} = public_key:pem_to_der(Path),
+- {ok, Cert} = public_key:pkix_decode_cert(DerCert, otp),
+- public_key(Cert);
+-public_key(#'OTPCertificate'{tbsCertificate=Cert}) ->
+- public_key(Cert);
+-public_key(#'OTPTBSCertificate'{subjectPublicKeyInfo=Info}) ->
+- public_key(Info);
+-public_key(#'OTPSubjectPublicKeyInfo'{subjectPublicKey=Key}) ->
+- Key.
diff --git a/src/erlang-oauth/oauth_unix.erl b/src/erlang-oauth/oauth_unix.erl
deleted file mode 100644
index 73ca314..0000000
@@ -960,5 +1000,5 @@ index 4c42edb..79b0417 100644
code:add_pathz(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb-1.0.0-0004-Remove-bundled-erlang-etap-library.patch b/couchdb-0004-Remove-bundled-erlang-etap-library.patch
similarity index 99%
rename from couchdb-1.0.0-0004-Remove-bundled-erlang-etap-library.patch
rename to couchdb-0004-Remove-bundled-erlang-etap-library.patch
index 0cd4a28..4177f65 100644
--- a/couchdb-1.0.0-0004-Remove-bundled-erlang-etap-library.patch
+++ b/couchdb-0004-Remove-bundled-erlang-etap-library.patch
@@ -1,4 +1,4 @@
-From f028c14174d3bfb5e1a54a8ab5b28653a084364c Mon Sep 17 00:00:00 2001
+From 81177309895f5b3dd096a936231eabd42c8d15e5 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 14 Jul 2010 18:00:03 +0400
Subject: [PATCH 4/9] Remove bundled erlang-etap library
@@ -34,10 +34,10 @@ Subject: [PATCH 4/9] Remove bundled erlang-etap library
delete mode 100644 src/etap/etap_web.erl
diff --git a/configure b/configure
-index b3040cf..26e0459 100755
+index 5a205d2..a8d077e 100755
--- a/configure
+++ b/configure
-@@ -12261,8 +12261,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
+@@ -12263,8 +12263,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
ac_config_files="$ac_config_files src/couchdb/priv/Makefile"
@@ -46,7 +46,7 @@ index b3040cf..26e0459 100755
ac_config_files="$ac_config_files src/ibrowse/Makefile"
ac_config_files="$ac_config_files src/mochiweb/Makefile"
-@@ -13288,7 +13286,6 @@ do
+@@ -13291,7 +13289,6 @@ do
"src/couchdb/couch.app.tpl") CONFIG_FILES="$CONFIG_FILES src/couchdb/couch.app.tpl" ;;
"src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;
"src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;
@@ -55,10 +55,10 @@ index b3040cf..26e0459 100755
"src/mochiweb/Makefile") CONFIG_FILES="$CONFIG_FILES src/mochiweb/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
diff --git a/configure.ac b/configure.ac
-index 84a38d3..e9375be 100644
+index 8b31f54..7e25bc2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -387,7 +387,6 @@ AC_CONFIG_FILES([src/Makefile])
+@@ -388,7 +388,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])
@@ -1908,5 +1908,5 @@ index 79b0417..c57d7a8 100644
code:add_pathz(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb-1.0.0-0005-Remove-bundled-mochiweb-library.patch b/couchdb-0005-Remove-bundled-mochiweb-library.patch
similarity index 99%
rename from couchdb-1.0.0-0005-Remove-bundled-mochiweb-library.patch
rename to couchdb-0005-Remove-bundled-mochiweb-library.patch
index 1967f8a..d10c187 100644
--- a/couchdb-1.0.0-0005-Remove-bundled-mochiweb-library.patch
+++ b/couchdb-0005-Remove-bundled-mochiweb-library.patch
@@ -1,4 +1,4 @@
-From 8314b0e28845e12118e08a86b1a54581f3fcefea Mon Sep 17 00:00:00 2001
+From 7f55a86e3907e11058fdf13b7014c3ae9019ab57 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 14 Jul 2010 18:01:45 +0400
Subject: [PATCH 5/9] Remove bundled mochiweb library
@@ -64,10 +64,10 @@ Subject: [PATCH 5/9] Remove bundled mochiweb library
delete mode 100644 src/mochiweb/reloader.erl
diff --git a/configure b/configure
-index 26e0459..6a9c731 100755
+index a8d077e..e82813c 100755
--- a/configure
+++ b/configure
-@@ -12263,8 +12263,6 @@ ac_config_files="$ac_config_files src/couchdb/priv/Makefile"
+@@ -12265,8 +12265,6 @@ ac_config_files="$ac_config_files src/couchdb/priv/Makefile"
ac_config_files="$ac_config_files src/ibrowse/Makefile"
@@ -76,7 +76,7 @@ index 26e0459..6a9c731 100755
ac_config_files="$ac_config_files test/Makefile"
ac_config_files="$ac_config_files test/bench/Makefile"
-@@ -13287,7 +13285,6 @@ do
+@@ -13290,7 +13288,6 @@ do
"src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;
"src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;
"src/ibrowse/Makefile") CONFIG_FILES="$CONFIG_FILES src/ibrowse/Makefile" ;;
@@ -85,10 +85,10 @@ index 26e0459..6a9c731 100755
"test/bench/Makefile") CONFIG_FILES="$CONFIG_FILES test/bench/Makefile" ;;
"test/etap/Makefile") CONFIG_FILES="$CONFIG_FILES test/etap/Makefile" ;;
diff --git a/configure.ac b/configure.ac
-index e9375be..b5a19ef 100644
+index 7e25bc2..157d8c0 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -388,7 +388,6 @@ AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
+@@ -389,7 +389,6 @@ 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/ibrowse/Makefile])
@@ -7746,5 +7746,5 @@ index c57d7a8..948958c 100644
code:add_pathz(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb-1.0.0-0006-Remove-bundled-ibrowse-library.patch b/couchdb-0006-Remove-bundled-ibrowse-library.patch
similarity index 99%
rename from couchdb-1.0.0-0006-Remove-bundled-ibrowse-library.patch
rename to couchdb-0006-Remove-bundled-ibrowse-library.patch
index d59a690..b1bea3e 100644
--- a/couchdb-1.0.0-0006-Remove-bundled-ibrowse-library.patch
+++ b/couchdb-0006-Remove-bundled-ibrowse-library.patch
@@ -1,8 +1,9 @@
-From 2b7c6d5c4a3ee803ec39a6f6a1cffbbca4b4b95a Mon Sep 17 00:00:00 2001
+From ea69134fb0a3efd6db259e32f4a08b1d28f8e6fd Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
-Date: Wed, 14 Jul 2010 18:03:33 +0400
+Date: Fri, 6 Aug 2010 16:05:02 +0400
Subject: [PATCH 6/9] Remove bundled ibrowse library
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
configure | 3 -
configure.ac | 1 -
@@ -34,10 +35,10 @@ Subject: [PATCH 6/9] Remove bundled ibrowse library
delete mode 100644 src/ibrowse/ibrowse_test.erl
diff --git a/configure b/configure
-index 6a9c731..c369391 100755
+index e82813c..3fbc92b 100755
--- a/configure
+++ b/configure
-@@ -12261,8 +12261,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
+@@ -12263,8 +12263,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
ac_config_files="$ac_config_files src/couchdb/priv/Makefile"
@@ -46,7 +47,7 @@ index 6a9c731..c369391 100755
ac_config_files="$ac_config_files test/Makefile"
ac_config_files="$ac_config_files test/bench/Makefile"
-@@ -13284,7 +13282,6 @@ do
+@@ -13287,7 +13285,6 @@ do
"src/couchdb/couch.app.tpl") CONFIG_FILES="$CONFIG_FILES src/couchdb/couch.app.tpl" ;;
"src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;
"src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;
@@ -55,10 +56,10 @@ index 6a9c731..c369391 100755
"test/bench/Makefile") CONFIG_FILES="$CONFIG_FILES test/bench/Makefile" ;;
"test/etap/Makefile") CONFIG_FILES="$CONFIG_FILES test/etap/Makefile" ;;
diff --git a/configure.ac b/configure.ac
-index b5a19ef..f867060 100644
+index 157d8c0..905f6d1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -387,7 +387,6 @@ AC_CONFIG_FILES([src/Makefile])
+@@ -388,7 +388,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])
@@ -1509,7 +1510,7 @@ index 8c83e8f..0000000
-%%====================================================================
diff --git a/src/ibrowse/ibrowse_http_client.erl b/src/ibrowse/ibrowse_http_client.erl
deleted file mode 100644
-index a767b84..0000000
+index 65d9cb9..0000000
--- a/src/ibrowse/ibrowse_http_client.erl
+++ /dev/null
@@ -1,1476 +0,0 @@
@@ -1634,7 +1635,7 @@ index a767b84..0000000
- host = Host,
- port = Port,
- is_ssl = (Protocol == https),
-- ssl_options = [{ssl_imp, new}]
+- ssl_options = [{ssl_imp, new}, {depth, 9}]
- },
- put(ibrowse_trace_token, [Host, $:, integer_to_list(Port)]),
- put(my_trace_flag, ibrowse_lib:get_trace_status(Host, Port)),
@@ -4084,5 +4085,5 @@ index 948958c..2650fbb 100644
code:add_pathz(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb-1.0.0-0007-Workaround-for-system-wide-ibrowse.patch b/couchdb-0007-Workaround-for-system-wide-ibrowse.patch
similarity index 91%
rename from couchdb-1.0.0-0007-Workaround-for-system-wide-ibrowse.patch
rename to couchdb-0007-Workaround-for-system-wide-ibrowse.patch
index 8bc2965..082253b 100644
--- a/couchdb-1.0.0-0007-Workaround-for-system-wide-ibrowse.patch
+++ b/couchdb-0007-Workaround-for-system-wide-ibrowse.patch
@@ -1,4 +1,4 @@
-From 96e4e5057365e642fa983c7bac4eec0177b386f9 Mon Sep 17 00:00:00 2001
+From 7051f964acf2fd831b2ad67617f0d67125284460 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 8 Jun 2010 17:30:49 +0400
Subject: [PATCH 7/9] Workaround for system-wide ibrowse
@@ -10,7 +10,7 @@ Subject: [PATCH 7/9] Workaround for system-wide ibrowse
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/couchdb/couch_rep_changes_feed.erl b/src/couchdb/couch_rep_changes_feed.erl
-index b1d3960..be7bd4c 100644
+index 4c7dc35..6669691 100644
--- a/src/couchdb/couch_rep_changes_feed.erl
+++ b/src/couchdb/couch_rep_changes_feed.erl
@@ -20,7 +20,7 @@
@@ -23,7 +23,7 @@ index b1d3960..be7bd4c 100644
-record (state, {
changes_from = nil,
diff --git a/src/couchdb/couch_rep_httpc.erl b/src/couchdb/couch_rep_httpc.erl
-index 53e318d..3ac62ed 100644
+index 768d88a..b5a7ed8 100644
--- a/src/couchdb/couch_rep_httpc.erl
+++ b/src/couchdb/couch_rep_httpc.erl
@@ -12,7 +12,7 @@
@@ -35,7 +35,7 @@ index 53e318d..3ac62ed 100644
-export([db_exists/1, db_exists/2, full_url/1, request/1, redirected_request/2,
spawn_worker_process/1, spawn_link_worker_process/1]).
-@@ -188,12 +188,12 @@ redirected_request(Req, RedirectUrl) ->
+@@ -199,12 +199,12 @@ redirected_request(Req, RedirectUrl) ->
spawn_worker_process(Req) ->
Url = ibrowse_lib:parse_url(Req#http_db.url),
@@ -64,5 +64,5 @@ index 3edc1f3..8722f3f 100644
-record (state, {
parent,
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb-1.0.0-0008-Remove-pid-file-after-stop.patch b/couchdb-0008-Remove-pid-file-after-stop.patch
similarity index 90%
rename from couchdb-1.0.0-0008-Remove-pid-file-after-stop.patch
rename to couchdb-0008-Remove-pid-file-after-stop.patch
index efda3cf..95ea72a 100644
--- a/couchdb-1.0.0-0008-Remove-pid-file-after-stop.patch
+++ b/couchdb-0008-Remove-pid-file-after-stop.patch
@@ -1,4 +1,4 @@
-From e45565ae2fb6a4074c45ddf45b0c7f7a630de490 Mon Sep 17 00:00:00 2001
+From 6362962685a23e9442bac2dd5f27ef6ffda626d4 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 8/9] Remove pid-file after stop
@@ -24,5 +24,5 @@ index 94d4743..af5cb01 100644
if kill -1 $PID 2> /dev/null; then
if test "$1" = "false"; then
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb-1.0.0-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch b/couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
similarity index 93%
rename from couchdb-1.0.0-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
rename to couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
index ba70b20..e204698 100644
--- a/couchdb-1.0.0-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
+++ b/couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
@@ -1,4 +1,4 @@
-From 4a51eaedeacc36127444db2dac1a37901cd34691 Mon Sep 17 00:00:00 2001
+From fb6a51831c51a21cb76be78921a24e99d3b55347 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 9/9] deleting a DB while it was being opened would crash couch_server
@@ -22,5 +22,5 @@ index 43fd904..88bd610 100644
[{_, {opened, Pid, LruTime}}] ->
couch_util:shutdown_sync(Pid),
--
-1.7.1.1
+1.7.2.1
diff --git a/couchdb.spec b/couchdb.spec
index 58e5699..43f8b03 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -3,7 +3,7 @@
%define couchdb_home %{_localstatedir}/lib/couchdb
Name: couchdb
-Version: 1.0.0
+Version: 1.0.1
Release: 1%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
@@ -12,15 +12,15 @@ License: ASL 2.0
URL: http://couchdb.apache.org/
Source0: http://www.apache.org/dist/%{name}/%{version}/apache-%{name}-%{version}.tar.gz
Source1: %{name}.init
-Patch1: couchdb-1.0.0-0001-Force-init-script-installation.patch
-Patch2: couchdb-1.0.0-0002-Install-into-erllibdir-by-default.patch
-Patch3: couchdb-1.0.0-0003-Remove-bundled-erlang-oauth-library.patch
-Patch4: couchdb-1.0.0-0004-Remove-bundled-erlang-etap-library.patch
-Patch5: couchdb-1.0.0-0005-Remove-bundled-mochiweb-library.patch
-Patch6: couchdb-1.0.0-0006-Remove-bundled-ibrowse-library.patch
-Patch7: couchdb-1.0.0-0007-Workaround-for-system-wide-ibrowse.patch
-Patch8: couchdb-1.0.0-0008-Remove-pid-file-after-stop.patch
-Patch9: couchdb-1.0.0-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
+Patch1: couchdb-0001-Force-init-script-installation.patch
+Patch2: couchdb-0002-Install-into-erllibdir-by-default.patch
+Patch3: couchdb-0003-Remove-bundled-erlang-oauth-library.patch
+Patch4: couchdb-0004-Remove-bundled-erlang-etap-library.patch
+Patch5: couchdb-0005-Remove-bundled-mochiweb-library.patch
+Patch6: couchdb-0006-Remove-bundled-ibrowse-library.patch
+Patch7: couchdb-0007-Workaround-for-system-wide-ibrowse.patch
+Patch8: couchdb-0008-Remove-pid-file-after-stop.patch
+Patch9: couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: curl-devel
@@ -154,6 +154,9 @@ fi
%changelog
+* Fri Aug 6 2010 Peter Lemenkov <lemenkov at gmail.com> 1.0.1-1
+- Ver. 1.0.1
+
* Thu Jul 15 2010 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-1
- Ver. 1.0.0
diff --git a/sources b/sources
index 83691b4..c48a050 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71e89c4b21c62417f2f413d74a38f079 apache-couchdb-1.0.0.tar.gz
+001cf286b72492617e9ffba271702a00 apache-couchdb-1.0.1.tar.gz
More information about the scm-commits
mailing list