[couchdb/el6] Ver. 1.0.4 (security release)
Peter Lemenkov
peter at fedoraproject.org
Wed Jan 23 13:26:47 UTC 2013
commit 82627d4b1d4991fbd881c536e62faf7cb0e3a9cd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed Jan 23 17:26:16 2013 +0400
Ver. 1.0.4 (security release)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...-doc-files-and-do-not-install-installatio.patch | 12 +-
...002-Install-docs-into-versioned-directory.patch | 10 +-
...ories-to-search-for-place-for-init-script.patch | 10 +-
...db-0004-Install-into-erllibdir-by-default.patch | 10 +-
...undled-etap-erlang-oauth-ibrowse-and-moch.patch | 12 +-
couchdb-0006-Fixes-for-system-wide-ibrowse.patch | 12 +-
couchdb-0007-Remove-pid-file-after-stop.patch | 10 +-
...DB-while-it-was-being-opened-would-crash-.patch | 10 +-
couchdb-0009-Change-respawn-timeout-to-0.patch | 10 +-
...0-Relax-curl-dependency-to-7.15-for-RHEL5.patch | 12 +-
...fix-error-when-restarting-replications-in.patch | 10 +-
couchdb-0011-Spidermonkey-1.8.5-patch.patch | 465 -
couchdb-0013-Use-pkg-config.patch | 107 -
couchdb-9999-Autoreconf.patch |17440 --------------------
couchdb.spec | 39 +-
sources | 2 +-
17 files changed, 71 insertions(+), 18101 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f136bd..ced8809 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ apache-couchdb-1.0.1.tar.gz
/apache-couchdb-1.0.2.tar.gz
/apache-couchdb-1.0.3-0-ga5f5eab.tar.gz
/apache-couchdb-1.0.3.tar.gz
+/apache-couchdb-1.0.4.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 3b1d050..dedba64 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,16 +1,16 @@
-From 732f47725cb66c1396944d28d541cf42052d3eb6 Mon Sep 17 00:00:00 2001
+From 76996c58a22b6b2cc8e89ae02fb29eef45c92348 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
+Subject: [PATCH 01/11] Do not gzip doc-files and do not install installation
instructions
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- Makefile.am | 57 +++++++++------------------------------------------------
- 1 files changed, 9 insertions(+), 48 deletions(-)
+ Makefile.am | 57 +++++++++------------------------------------------------
+ 1 file changed, 9 insertions(+), 48 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 6530287..dc4b8ce 100644
+index 2d0bbbe..14d57e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,18 +15,15 @@ SUBDIRS = bin etc src share test var utils
@@ -85,5 +85,5 @@ index 6530287..dc4b8ce 100644
$(top_builddir)/test/etap/run
--
-1.7.6
+1.8.1
diff --git a/couchdb-0002-Install-docs-into-versioned-directory.patch b/couchdb-0002-Install-docs-into-versioned-directory.patch
index 19aa3ca..dfa95d1 100644
--- a/couchdb-0002-Install-docs-into-versioned-directory.patch
+++ b/couchdb-0002-Install-docs-into-versioned-directory.patch
@@ -1,12 +1,12 @@
-From 6f653c94b17f1ce3142afa66983fc7856ccae3b0 Mon Sep 17 00:00:00 2001
+From f0a8ee8d2a94bdbae78f49828d53fbe1566f99a3 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>
---
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index c609a08..999f890 100644
@@ -22,5 +22,5 @@ index c609a08..999f890 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
--
-1.7.6
+1.8.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 4c9ba71..f645334 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,12 +1,12 @@
-From eaea8b05d2f22574939fe977e66d46773c33abae Mon Sep 17 00:00:00 2001
+From dd39d20a494559a99f120253ca0374718ea15a28 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>
---
- configure.ac | 16 +++++++++++-----
- 1 files changed, 11 insertions(+), 5 deletions(-)
+ configure.ac | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 999f890..4ac64f9 100644
@@ -42,5 +42,5 @@ index 999f890..4ac64f9 100644
fi
fi
--
-1.7.6
+1.8.1
diff --git a/couchdb-0004-Install-into-erllibdir-by-default.patch b/couchdb-0004-Install-into-erllibdir-by-default.patch
index f8c63c7..c7c7488 100644
--- a/couchdb-0004-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0004-Install-into-erllibdir-by-default.patch
@@ -1,12 +1,12 @@
-From da5d0c458c6b13db4800be3096b589ae32f384ff Mon Sep 17 00:00:00 2001
+From 5f63332c6551735502bff271353152a8f2e1287a 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>
---
- configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4ac64f9..248bff7 100644
@@ -31,5 +31,5 @@ index 4ac64f9..248bff7 100644
fi
--
-1.7.6
+1.8.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
index 0c29b90..7bc16ea 100644
--- 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
@@ -1,14 +1,14 @@
-From b139293116bc7d9104f89f9e2de7da1c0b121676 Mon Sep 17 00:00:00 2001
+From 83a32cad9a147f700098f844f8b6d16a778bcffe 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/13] Don't use bundled etap, erlang-oauth, ibrowse and
+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 +-
+ 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
@@ -50,5 +50,5 @@ index 460b029..b013d50 100644
code:add_patha(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.7.6
+1.8.1
diff --git a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
index 9b5f0d1..d08ce33 100644
--- a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
+++ b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
@@ -1,13 +1,13 @@
-From cd1260d2b1fd19a5f751226c62594694c71f1062 Mon Sep 17 00:00:00 2001
+From 7aa309c83d924360bec5166ec35671af6b00e074 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 06/13] Fixes for system-wide ibrowse
+Subject: [PATCH 06/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 | 2 +-
+ src/couchdb/couch_rep.erl | 2 +-
+ src/couchdb/couch_rep_changes_feed.erl | 2 +-
+ 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
@@ -50,5 +50,5 @@ index 783ee96..5609289 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]).
--
-1.7.6
+1.8.1
diff --git a/couchdb-0007-Remove-pid-file-after-stop.patch b/couchdb-0007-Remove-pid-file-after-stop.patch
index 90aa6ed..317a8fb 100644
--- a/couchdb-0007-Remove-pid-file-after-stop.patch
+++ b/couchdb-0007-Remove-pid-file-after-stop.patch
@@ -1,11 +1,11 @@
-From c8d6f1ce43cfb4f4f66b1493d3f647e9e156e189 Mon Sep 17 00:00:00 2001
+From d5657fea11f85cb3d3ef9e99468a2cb5b64591eb 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 07/13] Remove pid-file after stop
+Subject: [PATCH 07/11] Remove pid-file after stop
---
- bin/couchdb.tpl.in | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ bin/couchdb.tpl.in | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 94d4743..af5cb01 100644
@@ -24,5 +24,5 @@ index 94d4743..af5cb01 100644
if kill -1 $PID 2> /dev/null; then
if test "$1" = "false"; then
--
-1.7.6
+1.8.1
diff --git a/couchdb-0008-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
index 79c957f..09cb6d9 100644
--- a/couchdb-0008-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,13 +1,13 @@
-From 02c9d4e00b07839e04ebf540f57997250cd5879e Mon Sep 17 00:00:00 2001
+From 50c6e51e72dce8705d81ac90ad46e2418cb5bd80 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 08/13] deleting a DB while it was being opened would crash
+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
---
- src/couchdb/couch_server.erl | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/couchdb/couch_server.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 43fd904..88bd610 100644
@@ -23,5 +23,5 @@ index 43fd904..88bd610 100644
[{_, {opened, Pid, LruTime}}] ->
couch_util:shutdown_sync(Pid),
--
-1.7.6
+1.8.1
diff --git a/couchdb-0009-Change-respawn-timeout-to-0.patch b/couchdb-0009-Change-respawn-timeout-to-0.patch
index bb9d1f7..28519e3 100644
--- a/couchdb-0009-Change-respawn-timeout-to-0.patch
+++ b/couchdb-0009-Change-respawn-timeout-to-0.patch
@@ -1,12 +1,12 @@
-From e6e44926388094d11d4190de4061e02e7c7642d6 Mon Sep 17 00:00:00 2001
+From 8e644e5d1717a171841bfa7456099066d717cc8a 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 09/13] Change respawn timeout to 0.
+Subject: [PATCH 09/11] Change respawn timeout to 0.
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- etc/default/couchdb | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 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
@@ -20,5 +20,5 @@ index c2a3f2a..f589c0a 100644
+COUCHDB_RESPAWN_TIMEOUT=0
COUCHDB_OPTIONS=
--
-1.7.6
+1.8.1
diff --git a/couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch b/couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
index de1991e..9ee751a 100644
--- a/couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
+++ b/couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
@@ -1,13 +1,13 @@
-From a543ce1e1a35df36b1b7620bfb1daf635515a88c Mon Sep 17 00:00:00 2001
+From 11941741a3ef1459a9d25a6f4702d6622cb1f1c5 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 10/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>
---
- configure.ac | 2 +-
- src/couchdb/priv/couch_js/http.c | 14 --------------
- 2 files changed, 1 insertions(+), 15 deletions(-)
+ configure.ac | 2 +-
+ src/couchdb/priv/couch_js/http.c | 14 --------------
+ 2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9c10cf7..79fa8dd 100644
@@ -69,5 +69,5 @@ index 6c2a8a8..a672b66 100644
recv_header(void *ptr, size_t size, size_t nmem, void *data)
{
--
-1.7.6
+1.8.1
diff --git a/couchdb-0012-Replicator-fix-error-when-restarting-replications-in.patch b/couchdb-0011-Replicator-fix-error-when-restarting-replications-in.patch
similarity index 86%
rename from couchdb-0012-Replicator-fix-error-when-restarting-replications-in.patch
rename to couchdb-0011-Replicator-fix-error-when-restarting-replications-in.patch
index efba7c8..01b8cb0 100644
--- a/couchdb-0012-Replicator-fix-error-when-restarting-replications-in.patch
+++ b/couchdb-0011-Replicator-fix-error-when-restarting-replications-in.patch
@@ -1,7 +1,7 @@
-From 032a4e3b167a1dab3d932d9d6713e63709f5ec28 Mon Sep 17 00:00:00 2001
+From 22f424c4b29596eca4a5d456eb68fc9fcfb25f00 Mon Sep 17 00:00:00 2001
From: Filipe David Borba Manana <fdmanana at apache.org>
Date: Mon, 28 Mar 2011 11:08:58 +0000
-Subject: [PATCH 12/13] Replicator: fix error when restarting replications in
+Subject: [PATCH 11/11] Replicator: fix error when restarting replications in
OTP R14B02
This is a workaround for a change introduced in OTP R14B02 to the supervisor
@@ -11,8 +11,8 @@ http://erlang.org/pipermail/erlang-bugs/2011-March/002273.html
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1086185 13f79535-47bb-0310-9956-ffa450edef68
---
- src/couchdb/couch_rep.erl | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ src/couchdb/couch_rep.erl | 7 +++++++
+ 1 file changed, 7 insertions(+)
diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl
index c681425..1b8a23a 100644
@@ -33,5 +33,5 @@ index c681425..1b8a23a 100644
throw({db_not_found, <<"could not open ", DbUrl/binary>>});
{error, {unauthorized, DbUrl}} ->
--
-1.7.6
+1.8.1
diff --git a/couchdb.spec b/couchdb.spec
index 0cd43ba..3de307b 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -3,8 +3,8 @@
%define couchdb_home %{_localstatedir}/lib/couchdb
Name: couchdb
-Version: 1.0.3
-Release: 2%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -22,10 +22,7 @@ Patch7: couchdb-0007-Remove-pid-file-after-stop.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-Spidermonkey-1.8.5-patch.patch
-Patch12: couchdb-0012-Replicator-fix-error-when-restarting-replications-in.patch
-Patch13: couchdb-0013-Use-pkg-config.patch
-Patch99: couchdb-9999-Autoreconf.patch
+Patch11: couchdb-0011-Replicator-fix-error-when-restarting-replications-in.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,12 +85,9 @@ JavaScript acting as the default view definition language.
# Old CURL library
%patch10 -p1 -b .curl_7_15
%endif
-%if 0%{?fc15}%{?fc16}
-# JS 1.8.5
-%patch11 -p1 -b .to_new_js
+%if 0%{?el6}
+%patch11 -p1 -b .fix_R14B02
%endif
-%patch12 -p1 -b .fix_R14B02
-#%patch13 -p1 -b .pkgconfig
# Remove bundled libraries
rm -rf src/erlang-oauth
@@ -101,17 +95,10 @@ rm -rf src/etap
rm -rf src/ibrowse
rm -rf src/mochiweb
-%if 0%{?el5}
-# ugly hack to overcome limitations of outdated autotools in EL-5
-%patch99 -p1 -b .autoreconf
-%endif
+rm -f libtool configure m4/l*
%build
-%if 0%{?el5}
-echo "no need to reconfigure on EL-5, see patch 99"
-%else
autoreconf -ivf
-%endif
%configure
make %{?_smp_mflags}
@@ -126,12 +113,6 @@ install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
# Use /etc/sysconfig instead of /etc/default
mv $RPM_BUILD_ROOT%{_sysconfdir}/{default,sysconfig}
-# create /etc/tmpfiles.d entry
-%if 0%{?fc15}%{?fc16}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-echo "d /var/run/couchdb 0755 %{couchdb_user} root" > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
-
%check
make check || exit 1
@@ -161,7 +142,6 @@ fi
%files
-%defattr(-,root,root,-)
%doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/local.d
@@ -170,9 +150,6 @@ fi
%config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/%{name}/local.ini
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%if 0%{?fc15}%{?fc16}
-%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
%{_initrddir}/%{name}
%{_bindir}/%{name}
%{_bindir}/couchjs
@@ -186,6 +163,10 @@ fi
%changelog
+* Wed Jan 23 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.0.4-1
+- Ver. 1.0.4
+- Fixes CVE-2012-5649, CVE-2012-5650
+
* Mon Aug 15 2011 Kalev Lember <kalevlember at gmail.com> - 1.0.3-2
- Rebuilt for rpm bug #728707
diff --git a/sources b/sources
index b4795b1..6a2a4eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfdc2ab751bf18049c5ef7866602d8ed apache-couchdb-1.0.3.tar.gz
+fc5d0eb5c059f6660d1a856cc0c98cd8 apache-couchdb-1.0.4.tar.gz
More information about the scm-commits
mailing list