commit a81d5c86c0c9bf96897952c3d0838210efdc2555 Author: Peter Lemenkov lemenkov@gmail.com Date: Tue Jan 14 10:47:22 2014 +0400
Ver. 1.5.0
Signed-off-by: Peter Lemenkov lemenkov@gmail.com
.gitignore | 1 + apache-couchdb-1.3.1.tar.gz.asc | 17 -------- apache-couchdb-1.5.0.tar.gz.asc | 17 ++++++++ ...-doc-files-and-do-not-install-installatio.patch | 28 +++---------- ...ories-to-search-for-place-for-init-script.patch | 13 +----- ...db-0003-Install-into-erllibdir-by-default.patch | 15 ++----- couchdb-0004-Don-t-use-bundled-libraries.patch | 30 +++++--------- couchdb-0005-Fixes-for-system-wide-ibrowse.patch | 13 +----- couchdb-0006-Remove-pid-file-after-stop.patch | 13 +----- couchdb-0007-Change-respawn-timeout-to-0.patch | 9 +---- ...tch => couchdb-0008-Fix-for-Erlang-R16B01.patch | 13 +----- ...Mostly-cosmetic-proplist-ordering-in-R16B.patch | 33 --------------- ...uchdb-0009-Don-t-check-for-Erlang-version.patch | 19 ++------- ...art-necessary-application-before-mochiweb.patch | 26 ------------ ....patch => couchdb-0010-README-was-renamed.patch | 15 ++----- ...missing-function-couch_httpd-send_error-2.patch | 19 +++++++++ ...0012-Adopt-to-the-recent-erlang-oauth-1.3.patch | 27 ++++++++++++ ...h-function-couch_httpd-send_method_not_al.patch | 27 ------------ couchdb-0014-Expose-get_compactor_pid-1.patch | 35 ---------------- couchdb.spec | 43 ++++++++++--------- sources | 2 +- 21 files changed, 130 insertions(+), 285 deletions(-) --- diff --git a/.gitignore b/.gitignore index 133fe15..79a8e17 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ apache-couchdb-1.0.1.tar.gz /apache-couchdb-1.2.1.tar.gz /apache-couchdb-1.2.2.tar.gz /apache-couchdb-1.3.1.tar.gz +/apache-couchdb-1.5.0.tar.gz diff --git a/apache-couchdb-1.5.0.tar.gz.asc b/apache-couchdb-1.5.0.tar.gz.asc new file mode 100644 index 0000000..6dbc8ab --- /dev/null +++ b/apache-couchdb-1.5.0.tar.gz.asc @@ -0,0 +1,17 @@
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 2291c4c..f05a493 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,47 +1,42 @@ -From ecb89a85b6849f1ee7d5df09dfb40fdac87194c2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Sun, 13 Feb 2011 13:52:38 +0300 -Subject: [PATCH 01/14] Do not gzip doc-files and do not install installation +Subject: [PATCH] Do not gzip doc-files and do not install installation instructions
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - Makefile.am | 57 +++++++++------------------------------------------------ - 1 file changed, 9 insertions(+), 48 deletions(-)
diff --git a/Makefile.am b/Makefile.am -index 8703a30..75b9d35 100644 +index 527cf18..ebe56b7 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -15,18 +15,15 @@ SUBDIRS = bin etc src share test var utils +@@ -15,16 +15,16 @@ SUBDIRS = bin etc src share test var utils ACLOCAL_AMFLAGS = -I m4
localdoc_DATA = \ - AUTHORS.gz \ - BUGS.gz \ -- CHANGES.gz \ - DEVELOPERS.gz \ - INSTALL.gz \ - INSTALL.Unix.gz \ - INSTALL.Windows.gz \ - LICENSE.gz \ -- NEWS.gz \ - NOTICE.gz \ - README.gz \ - THANKS.gz + AUTHORS \ + BUGS \ -+ CHANGES \ + DEVELOPERS \ ++ INSTALL \ ++ INSTALL.Unix \ ++ INSTALL.Windows \ + LICENSE \ -+ NEWS \ + NOTICE \ + README \ + THANKS
DISTCLEANFILES = $(localdoc_DATA)
-@@ -48,42 +45,6 @@ EXTRA_DIST = \ +@@ -44,36 +44,6 @@ EXTRA_DIST = \ build-aux/sphinx-touch \ license.skip
@@ -51,9 +46,6 @@ index 8703a30..75b9d35 100644 -BUGS.gz: BUGS - gzip -9 < $< > $@ - --CHANGES.gz: CHANGES -- gzip -9 < $< > $@ -- -DEVELOPERS.gz: DEVELOPERS - gzip -9 < $< > $@ - @@ -69,9 +61,6 @@ index 8703a30..75b9d35 100644 -LICENSE.gz: LICENSE - gzip -9 < $< > $@ - --NEWS.gz: NEWS -- gzip -9 < $< > $@ -- -NOTICE.gz: NOTICE - gzip -9 < $< > $@ - @@ -84,6 +73,3 @@ index 8703a30..75b9d35 100644 check: dev check-js if TESTS $(top_builddir)/test/etap/run $(top_srcdir)/test/etap --- -1.8.3.1 - diff --git a/couchdb-0002-More-directories-to-search-for-place-for-init-script.patch b/couchdb-0002-More-directories-to-search-for-place-for-init-script.patch index 900c6d4..82fd9b6 100644 --- a/couchdb-0002-More-directories-to-search-for-place-for-init-script.patch +++ b/couchdb-0002-More-directories-to-search-for-place-for-init-script.patch @@ -1,18 +1,14 @@ -From 97073d1852f8b8045288fefba0b7229e51a4ab1e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Sun, 13 Feb 2011 14:21:20 +0300 -Subject: [PATCH 02/14] More directories to search for place for init-script +Subject: [PATCH] More directories to search for place for init-script
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - configure.ac | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac -index 53e23f1..b6e6962 100644 +index 6c5ef5b..0f56ee2 100644 --- a/configure.ac +++ b/configure.ac -@@ -526,17 +526,23 @@ launchd_enabled=false +@@ -524,17 +524,23 @@ launchd_enabled=false
if test "$use_init" = "yes"; then AC_MSG_CHECKING(location of init directory) @@ -41,6 +37,3 @@ index 53e23f1..b6e6962 100644 fi fi fi --- -1.8.3.1 - diff --git a/couchdb-0003-Install-into-erllibdir-by-default.patch b/couchdb-0003-Install-into-erllibdir-by-default.patch index 127dcca..0ab8a00 100644 --- a/couchdb-0003-Install-into-erllibdir-by-default.patch +++ b/couchdb-0003-Install-into-erllibdir-by-default.patch @@ -1,18 +1,14 @@ -From d0cbc965a9c851a1ccf6876d755472e6cd84be66 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Sun, 13 Feb 2011 14:36:36 +0300 -Subject: [PATCH 03/14] Install into erllibdir by default +Subject: [PATCH] Install into erllibdir by default
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac -index b6e6962..58327f3 100644 +index 0f56ee2..5c121c0 100644 --- a/configure.ac +++ b/configure.ac -@@ -693,7 +693,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"]) +@@ -694,7 +694,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"]) AC_SUBST([localconfdir], [${sysconfdir}/${package_identifier}]) AC_SUBST([localdatadir], [${datadir}/${package_identifier}]) AC_SUBST([localdocdir], [${datadir}/doc/${package_identifier}]) @@ -21,7 +17,7 @@ index b6e6962..58327f3 100644 AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}]) AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}]) AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}]) -@@ -703,7 +703,7 @@ if test x${IS_WINDOWS} = xTRUE; then +@@ -707,7 +707,7 @@ if test x${IS_WINDOWS} = xTRUE; then AC_SUBST([locallibbindir], [${prefix}/bin]) AC_SUBST([localerlanglibdir], [${libdir}]) else @@ -30,6 +26,3 @@ index b6e6962..58327f3 100644 AC_SUBST([localerlanglibdir], [${locallibdir}/erlang/lib]) fi
--- -1.8.3.1 - diff --git a/couchdb-0004-Don-t-use-bundled-libraries.patch b/couchdb-0004-Don-t-use-bundled-libraries.patch index fc47549..db4a29f 100644 --- a/couchdb-0004-Don-t-use-bundled-libraries.patch +++ b/couchdb-0004-Don-t-use-bundled-libraries.patch @@ -1,21 +1,14 @@ -From fcfa7cbfb81fdb43026f0ae1d9e20bc6ee9a5c48 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Sun, 15 May 2011 18:47:41 +0400 -Subject: [PATCH 04/14] Don't use bundled libraries +Subject: [PATCH] Don't use bundled libraries
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - configure.ac | 6 ------ - src/Makefile.am | 6 +----- - src/ejson/Makefile.am | 8 ++------ - test/etap/test_util.erl.in | 8 ++------ - 4 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac -index 58327f3..0eee6b5 100644 +index 5c121c0..fe4f79a 100644 --- a/configure.ac +++ b/configure.ac -@@ -23,7 +23,6 @@ AC_CONFIG_AUX_DIR([build-aux]) +@@ -22,7 +22,6 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h]) @@ -23,7 +16,7 @@ index 58327f3..0eee6b5 100644
AM_INIT_AUTOMAKE([1.6.3 foreign])
-@@ -739,12 +738,7 @@ AC_CONFIG_FILES([src/couch_replicator/Makefile]) +@@ -746,12 +745,7 @@ AC_CONFIG_FILES([src/couchjs-node/Makefile]) AC_CONFIG_FILES([src/couchdb/couch.app.tpl]) AC_CONFIG_FILES([src/couchdb/Makefile]) AC_CONFIG_FILES([src/couchdb/priv/Makefile]) @@ -37,19 +30,21 @@ index 58327f3..0eee6b5 100644 AC_CONFIG_FILES([test/Makefile]) AC_CONFIG_FILES([test/bench/Makefile]) diff --git a/src/Makefile.am b/src/Makefile.am -index fbd514c..893e5f3 100644 +index e74637e..2b27673 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -16,8 +16,4 @@ SUBDIRS = \ +@@ -18,11 +18,7 @@ SUBDIRS = \ couch_replicator \ couchdb \ ejson \ - erlang-oauth \ -- etap \ + etap \ - ibrowse \ - mochiweb \ -- snappy -+ etap +- snappy \ + couchjs-node + + EXTRA_DIST = \ diff --git a/src/ejson/Makefile.am b/src/ejson/Makefile.am index c1e07db..6f2dfaa 100644 --- a/src/ejson/Makefile.am @@ -92,6 +87,3 @@ index 352714e..c0292a7 100644 ], lists:foreach(fun(Name) -> code:add_patha(filename:join([builddir(), "src", Name])) --- -1.8.3.1 - diff --git a/couchdb-0005-Fixes-for-system-wide-ibrowse.patch b/couchdb-0005-Fixes-for-system-wide-ibrowse.patch index e315e9a..392b92d 100644 --- a/couchdb-0005-Fixes-for-system-wide-ibrowse.patch +++ b/couchdb-0005-Fixes-for-system-wide-ibrowse.patch @@ -1,17 +1,11 @@ -From 89da6bf1575770e28c4c52494042e73c4e392b02 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Sun, 13 Feb 2011 14:52:57 +0300 -Subject: [PATCH 05/14] Fixes for system-wide ibrowse +Subject: [PATCH] Fixes for system-wide ibrowse
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - src/couch_replicator/src/couch_replicator_httpc.erl | 2 +- - src/couch_replicator/src/couch_replicator_utils.erl | 2 +- - src/couchdb/couch_httpd_proxy.erl | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/couch_replicator/src/couch_replicator_httpc.erl b/src/couch_replicator/src/couch_replicator_httpc.erl -index 9c23595..67801d4 100644 +index b8fb31b..44f308b 100644 --- a/src/couch_replicator/src/couch_replicator_httpc.erl +++ b/src/couch_replicator/src/couch_replicator_httpc.erl @@ -14,7 +14,7 @@ @@ -49,6 +43,3 @@ index dec3f55..eb037b4 100644
-define(TIMEOUT, infinity). -define(PKT_SIZE, 4096). --- -1.8.3.1 - diff --git a/couchdb-0006-Remove-pid-file-after-stop.patch b/couchdb-0006-Remove-pid-file-after-stop.patch index ca70308..0e8cab0 100644 --- a/couchdb-0006-Remove-pid-file-after-stop.patch +++ b/couchdb-0006-Remove-pid-file-after-stop.patch @@ -1,17 +1,13 @@ -From 00908b121edfbaf9b840355d1394ce31a21d9ce2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Mon, 7 Jun 2010 15:08:42 +0400 -Subject: [PATCH 06/14] Remove pid-file after stop +Subject: [PATCH] Remove pid-file after stop
---- - bin/couchdb.tpl.in | 1 + - 1 file changed, 1 insertion(+)
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in -index 6223b76..82afa60 100644 +index 6ebacf4..1e1a6cf 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in -@@ -271,6 +271,7 @@ EOF +@@ -302,6 +302,7 @@ EOF
stop_couchdb () { PID=`_get_pid` @@ -19,6 +15,3 @@ index 6223b76..82afa60 100644 STOP_TIMEOUT=60 if test -n "$PID"; then if kill -0 $PID 2> /dev/null; then --- -1.8.3.1 - diff --git a/couchdb-0007-Change-respawn-timeout-to-0.patch b/couchdb-0007-Change-respawn-timeout-to-0.patch index 17ebc85..d499c12 100644 --- a/couchdb-0007-Change-respawn-timeout-to-0.patch +++ b/couchdb-0007-Change-respawn-timeout-to-0.patch @@ -1,12 +1,8 @@ -From b7f3ee59db3efcceb407e6c267fb1c8b93426a39 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Thu, 26 Aug 2010 13:22:56 +0400 -Subject: [PATCH 07/14] Change respawn timeout to 0. +Subject: [PATCH] Change respawn timeout to 0.
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - etc/default/couchdb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/default/couchdb b/etc/default/couchdb index c2a3f2a..f589c0a 100644 @@ -19,6 +15,3 @@ index c2a3f2a..f589c0a 100644 -COUCHDB_RESPAWN_TIMEOUT=5 +COUCHDB_RESPAWN_TIMEOUT=0 COUCHDB_OPTIONS= --- -1.8.3.1 - diff --git a/couchdb-0010-Fix-for-Erlang-R16B01.patch b/couchdb-0008-Fix-for-Erlang-R16B01.patch similarity index 61% rename from couchdb-0010-Fix-for-Erlang-R16B01.patch rename to couchdb-0008-Fix-for-Erlang-R16B01.patch index 2e01617..b60c859 100644 --- a/couchdb-0010-Fix-for-Erlang-R16B01.patch +++ b/couchdb-0008-Fix-for-Erlang-R16B01.patch @@ -1,26 +1,19 @@ -From ade7d16e8ebd2f5af6cc7b82ed6e6644bc978789 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Fri, 21 Jun 2013 11:56:54 +0400 -Subject: [PATCH 10/14] Fix for Erlang R16B01 +Subject: [PATCH] Fix for Erlang R16B01
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - src/couchdb/couch_app.erl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couchdb/couch_app.erl b/src/couchdb/couch_app.erl -index 4cf4862..42411a8 100644 +index 9644877..42411a8 100644 --- a/src/couchdb/couch_app.erl +++ b/src/couchdb/couch_app.erl @@ -20,7 +20,7 @@
start(_Type, DefaultIniFiles) -> IniFiles = get_ini_files(DefaultIniFiles), -- case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, xmerl, compiler, syntax_tools, mochiweb, os_mon]) of +- case start_apps([crypto, asn1, public_key, sasl, inets, oauth, ssl, ibrowse, syntax_tools, compiler, xmerl, mochiweb, os_mon]) of + case start_apps([crypto, asn1, public_key, sasl, inets, oauth, ssl, ibrowse, xmerl, compiler, syntax_tools, mochiweb, os_mon]) of ok -> couch_server_sup:start_link(IniFiles); {error, Reason} -> --- -1.8.3.1 - diff --git a/couchdb-0011-Don-t-check-for-Erlang-version.patch b/couchdb-0009-Don-t-check-for-Erlang-version.patch similarity index 52% rename from couchdb-0011-Don-t-check-for-Erlang-version.patch rename to couchdb-0009-Don-t-check-for-Erlang-version.patch index 14b6bbb..8335ea5 100644 --- a/couchdb-0011-Don-t-check-for-Erlang-version.patch +++ b/couchdb-0009-Don-t-check-for-Erlang-version.patch @@ -1,18 +1,14 @@ -From d80a9dde5c9e8513a6a138cb37890ca55e787250 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Thu, 15 Aug 2013 18:58:25 +0400 -Subject: [PATCH 11/14] Don't check for Erlang version +Subject: [PATCH] Don't check for Erlang version
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - configure.ac | 12 ------------ - 1 file changed, 12 deletions(-)
diff --git a/configure.ac b/configure.ac -index 0eee6b5..e0d1d17 100644 +index fe4f79a..08b8c42 100644 --- a/configure.ac +++ b/configure.ac -@@ -415,18 +415,6 @@ major_version=`echo $version | ${AWK} "{print \$1}"` +@@ -417,14 +417,6 @@ major_version=`echo $version | ${AWK} "{print \$1}"` minor_version=`echo $version | ${AWK} "{print \$2}"` patch_version=`echo $version | ${AWK} "{print \$3}"`
@@ -20,17 +16,10 @@ index 0eee6b5..e0d1d17 100644 - as_fn_error $? "$erlang_version_error" "$LINENO" 5 -fi - --if test $minor_version -lt 7 -o $minor_version -gt 9; then -- as_fn_error $? "$erlang_version_error" "$LINENO" 5 --fi -- --if test $minor_version -eq 7 -a $patch_version -lt 4; then +-if test $minor_version -lt 8 -o $minor_version -gt 10; then - as_fn_error $? "$erlang_version_error" "$LINENO" 5 -fi - AC_MSG_RESULT(compatible)
otp_release="`\ --- -1.8.3.1 - diff --git a/couchdb-0012-README-was-renamed.patch b/couchdb-0010-README-was-renamed.patch similarity index 53% rename from couchdb-0012-README-was-renamed.patch rename to couchdb-0010-README-was-renamed.patch index ce54b9c..dd30327 100644 --- a/couchdb-0012-README-was-renamed.patch +++ b/couchdb-0010-README-was-renamed.patch @@ -1,26 +1,19 @@ -From 7b4a63300c817a4eef708f97c09d36fd9d46fab9 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Thu, 15 Aug 2013 19:06:31 +0400 -Subject: [PATCH 12/14] README was renamed +Subject: [PATCH] README was renamed
Signed-off-by: Peter Lemenkov lemenkov@gmail.com ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am -index 75b9d35..448892b 100644 +index ebe56b7..4400bd1 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -22,7 +22,7 @@ localdoc_DATA = \ +@@ -23,7 +23,7 @@ localdoc_DATA = \ + INSTALL.Windows \ LICENSE \ - NEWS \ NOTICE \ - README \ + README.rst \ THANKS
DISTCLEANFILES = $(localdoc_DATA) --- -1.8.3.1 - diff --git a/couchdb-0011-Export-missing-function-couch_httpd-send_error-2.patch b/couchdb-0011-Export-missing-function-couch_httpd-send_error-2.patch new file mode 100644 index 0000000..704bc1b --- /dev/null +++ b/couchdb-0011-Export-missing-function-couch_httpd-send_error-2.patch @@ -0,0 +1,19 @@ +From: Peter Lemenkov lemenkov@gmail.com +Date: Fri, 10 Jan 2014 15:30:54 +0400 +Subject: [PATCH] Export missing function - couch_httpd:send_error/2 + +Signed-off-by: Peter Lemenkov lemenkov@gmail.com + +diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl +index 28932ba..465bc7a 100644 +--- a/src/couchdb/couch_httpd.erl ++++ b/src/couchdb/couch_httpd.erl +@@ -27,7 +27,7 @@ + -export([start_chunked_response/3,send_chunk/2,log_request/2]). + -export([start_response_length/4, start_response/3, send/2]). + -export([start_json_response/2, start_json_response/3, end_json_response/1]). +--export([send_response/4,send_method_not_allowed/2,send_error/4, send_redirect/2,send_chunked_error/2]). ++-export([send_response/4,send_method_not_allowed/2,send_error/2,send_error/4, send_redirect/2,send_chunked_error/2]). + -export([send_json/2,send_json/3,send_json/4,last_chunk/1,parse_multipart_request/3]). + -export([accepted_encodings/1,handle_request_int/5,validate_referer/1,validate_ctype/2]). + -export([http_1_0_keep_alive/2]). diff --git a/couchdb-0012-Adopt-to-the-recent-erlang-oauth-1.3.patch b/couchdb-0012-Adopt-to-the-recent-erlang-oauth-1.3.patch new file mode 100644 index 0000000..d3a3015 --- /dev/null +++ b/couchdb-0012-Adopt-to-the-recent-erlang-oauth-1.3.patch @@ -0,0 +1,27 @@ +From: Peter Lemenkov lemenkov@gmail.com +Date: Fri, 10 Jan 2014 16:30:25 +0400 +Subject: [PATCH] Adopt to the recent erlang-oauth (1.3+) + +Signed-off-by: Peter Lemenkov lemenkov@gmail.com + +diff --git a/src/couchdb/couch_httpd_oauth.erl b/src/couchdb/couch_httpd_oauth.erl +index 2094c08..60a937c 100644 +--- a/src/couchdb/couch_httpd_oauth.erl ++++ b/src/couchdb/couch_httpd_oauth.erl +@@ -43,6 +43,7 @@ oauth_auth_callback(#httpd{mochi_req = MochiReq} = Req, CbParams) -> + Method = atom_to_list(MochiReq:get(method)), + #callback_params{ + consumer = Consumer, ++ token = Token, + token_secret = TokenSecret, + url = Url, + signature = Sig, +@@ -61,7 +62,7 @@ oauth_auth_callback(#httpd{mochi_req = MochiReq} = Req, CbParams) -> + "Consumer is `~p`, token secret is `~p`~n" + "Expected signature was `~p`~n", + [User, Sig, Method, Url, Params, Consumer, TokenSecret, +- oauth:signature(Method, Url, Params, Consumer, TokenSecret)]), ++ oauth:sign(Method, Url, Params, Consumer, Token, TokenSecret)]), + Req + end. + diff --git a/couchdb.spec b/couchdb.spec index 867f1c2..1e48b18 100644 --- a/couchdb.spec +++ b/couchdb.spec @@ -7,15 +7,15 @@
Name: couchdb -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.5.0 +Release: 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/%%7Bname%7D/%%7Bversion%7D/apache-%%7Bname%7D-%%7... -Source1: http://www.apache.org/dist/%%7Bname%7D/%%7Bversion%7D/apache-%%7Bname%7D-%%7... +Source0: http://www.apache.org/dist/%%7Bname%7D/source/%%7Bversion%7D/apache-%%7Bname... +Source1: http://www.apache.org/dist/%%7Bname%7D/source/%%7Bversion%7D/apache-%%7Bname... Source2: %{name}.init Source3: %{name}.service Source4: %{name}.tmpfiles.conf @@ -26,13 +26,13 @@ Patch4: couchdb-0004-Don-t-use-bundled-libraries.patch Patch5: couchdb-0005-Fixes-for-system-wide-ibrowse.patch Patch6: couchdb-0006-Remove-pid-file-after-stop.patch Patch7: couchdb-0007-Change-respawn-timeout-to-0.patch -Patch8: couchdb-0008-Mostly-cosmetic-proplist-ordering-in-R16B.patch -Patch9: couchdb-0009-Start-necessary-application-before-mochiweb.patch -Patch10: couchdb-0010-Fix-for-Erlang-R16B01.patch -Patch11: couchdb-0011-Don-t-check-for-Erlang-version.patch -Patch12: couchdb-0012-README-was-renamed.patch -Patch13: couchdb-0013-Typo-no-such-function-couch_httpd-send_method_not_al.patch -Patch14: couchdb-0014-Expose-get_compactor_pid-1.patch +Patch8: couchdb-0008-Fix-for-Erlang-R16B01.patch +Patch9: couchdb-0009-Don-t-check-for-Erlang-version.patch +Patch10: couchdb-0010-README-was-renamed.patch +# Sent upstream - https://github.com/apache/couchdb/pull/128 (and applied already) +Patch11: couchdb-0011-Export-missing-function-couch_httpd-send_error-2.patch +# Sent upstream - https://github.com/apache/couchdb/pull/129 +Patch12: couchdb-0012-Adopt-to-the-recent-erlang-oauth-1.3.patch
BuildRequires: autoconf BuildRequires: autoconf-archive @@ -45,7 +45,7 @@ BuildRequires: erlang-erts >= R13B #BuildRequires: erlang-etap BuildRequires: erlang-ibrowse >= 2.2.0 BuildRequires: erlang-mochiweb -BuildRequires: erlang-oauth +BuildRequires: erlang-oauth >= 1.3.0 BuildRequires: erlang-os_mon BuildRequires: erlang-snappy BuildRequires: help2man @@ -106,14 +106,12 @@ JavaScript acting as the default view definition language. %patch6 -p1 -b .remove_pid_file %patch7 -p1 -b .fix_respawn %if 0%{?fedora} > 18 -%patch8 -p1 -b .fix_proplist_ordering_r16b -%patch9 -p1 -b .start_necessary_apps_before_mochiweb -%patch10 -p1 -b .r16b01 -%patch11 -p1 -b .dontcheck +%patch8 -p1 -b .r16b01 +%patch9 -p1 -b .dontcheck %endif -%patch12 -p1 -b .renamed -%patch13 -p1 -b .typo1 -%patch14 -p1 -b .typo2 +%patch10 -p1 -b .renamed +%patch11 -p1 -b .export_missing_fun +%patch12 -p1 -b .oauth_1_3_0 #gzip -d -k ./share/doc/build/latex/CouchDB.pdf.gz
# Remove bundled libraries @@ -204,7 +202,7 @@ fi
%files -%doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README.rst THANKS +%doc AUTHORS BUGS LICENSE NOTICE README.rst THANKS %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/local.d %dir %{_sysconfdir}/%{name}/default.d @@ -222,8 +220,10 @@ fi %{_bindir}/couch-config %{_bindir}/couchjs %{_libdir}/erlang/lib/couch-%{version}/ +%{_libdir}/erlang/lib/couch_dbupdates-0.1/ %{_libdir}/erlang/lib/couch_index-0.1/ %{_libdir}/erlang/lib/couch_mrview-0.1/ +%{_libdir}/erlang/lib/couch_plugins-0.1/ %{_libdir}/erlang/lib/couch_replicator-0.1/ %{_libdir}/erlang/lib/ejson-0.1.0/ %{_datadir}/%{name} @@ -235,6 +235,9 @@ fi
%changelog +* Fri Jan 10 2014 Peter Lemenkov lemenkov@gmail.com - 1.5.0-1 +- Ver. 1.5.0 + * Fri Oct 25 2013 Peter Lemenkov lemenkov@gmail.com - 1.3.1-3 - Rebuild with new requires - __erlang_nif_version, __erlang_drv_version
diff --git a/sources b/sources index 624da91..69f4bdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ff71e7c55634bb52eca293368183b40 apache-couchdb-1.3.1.tar.gz +55a2f86469e0697817da8defee730f04 apache-couchdb-1.5.0.tar.gz
erlang@lists.fedoraproject.org
-
Peter Lemenkov