[erlang-riak_kv] Ver. 1.1.4 (security bugfix)

Peter Lemenkov peter at fedoraproject.org
Sun Aug 5 07:49:04 UTC 2012


commit 45deed50316f60c31da3ab9c99ae25e270216e39
Author: Fedora Build <lemenkov at gmail.com>
Date:   Sun Aug 5 11:48:56 2012 +0400

    Ver. 1.1.4 (security bugfix)
    
    Signed-off-by: Fedora Build <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 ...Don-t-check-for-deps-Fedora-EPEL-specific.patch |   10 +++++-----
 erlang-riak_kv-0002-Don-t-fail-on-warnings.patch   |    6 +++---
 ...g-riak_kv-0003-Use-system-wide-mochijson2.patch |    6 +++---
 erlang-riak_kv-0004-Fixes-Issue-326.patch          |    6 +++---
 ...-include-to-prevent-automatic-dependency-.patch |    8 ++++----
 ...Drop-check-for-specific-version-of-Erlang.patch |    6 +++---
 erlang-riak_kv.spec                                |   12 +++++++-----
 sources                                            |    2 +-
 9 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c978a2..c900cec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /basho-riak_kv-1.1.2-0-gc732840.tar.gz
+/basho-riak_kv-1.1.4-0-g18643de.tar.gz
diff --git a/erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch b/erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch
index de4a1fe..957ec01 100644
--- a/erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch
+++ b/erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch
@@ -1,15 +1,15 @@
-From 797b4ad190d297b3d770ebc715071d1c50607318 Mon Sep 17 00:00:00 2001
+From cd571a1665c497a577b129c332612abdd63cce24 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Sat, 27 Nov 2010 20:05:09 +0300
 Subject: [PATCH 1/6] Don't check for deps (Fedora/EPEL specific)
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- rebar.config |   20 --------------------
+ rebar.config | 20 --------------------
  1 file changed, 20 deletions(-)
 
 diff --git a/rebar.config b/rebar.config
-index ff98df2..9a009c0 100644
+index 137f228..9a009c0 100644
 --- a/rebar.config
 +++ b/rebar.config
 @@ -7,23 +7,3 @@
@@ -29,7 +29,7 @@ index ff98df2..9a009c0 100644
 -        {ebloom, "1.1.1", {git, "git://github.com/basho/ebloom", {tag, "1.1.1"}}},
 -        {eper, "0.61", {git, "git://github.com/basho/eper.git", {tag, "fdfd63c0"}}},
 -        {eleveldb, "1.1.0", {git, "git://github.com/basho/eleveldb.git",
--                          {tag, "1.1.0"}}},
+-                          {tag, "1.1.1"}}},
 -        {sext, ".*", {git, "git://github.com/esl/sext", {tag, "0.4.1"}}},
 -        {riak_pipe, "1.1.2", {git, "git://github.com/basho/riak_pipe.git",
 -                                {tag, "1.1.2"}}},
@@ -37,5 +37,5 @@ index ff98df2..9a009c0 100644
 -                                {tag, "1.0.0"}}}
 -       ]}.
 -- 
-1.7.10.4
+1.7.11.2
 
diff --git a/erlang-riak_kv-0002-Don-t-fail-on-warnings.patch b/erlang-riak_kv-0002-Don-t-fail-on-warnings.patch
index dc6d108..d723165 100644
--- a/erlang-riak_kv-0002-Don-t-fail-on-warnings.patch
+++ b/erlang-riak_kv-0002-Don-t-fail-on-warnings.patch
@@ -1,11 +1,11 @@
-From 4a3a9466ff58edc3cadc362506cf4eed01c28d2f Mon Sep 17 00:00:00 2001
+From 3efd0881672153444809d9537f4c37fc0e8df42a Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Sat, 27 Nov 2010 20:09:59 +0300
 Subject: [PATCH 2/6] Don't fail on warnings
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- rebar.config |    2 +-
+ rebar.config | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rebar.config b/rebar.config
@@ -22,5 +22,5 @@ index 9a009c0..ada00f5 100644
  {erl_first_files, [
                     "src/riak_kv_backend.erl",
 -- 
-1.7.10.4
+1.7.11.2
 
diff --git a/erlang-riak_kv-0003-Use-system-wide-mochijson2.patch b/erlang-riak_kv-0003-Use-system-wide-mochijson2.patch
index f56a68e..6ff2e02 100644
--- a/erlang-riak_kv-0003-Use-system-wide-mochijson2.patch
+++ b/erlang-riak_kv-0003-Use-system-wide-mochijson2.patch
@@ -1,11 +1,11 @@
-From fd3750cde428c2ee4f2fa31f648765f11e5c7edd Mon Sep 17 00:00:00 2001
+From 8023836b9511f9704fdb597b588399663537b6ca Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 18 Jul 2012 22:41:10 +0400
 Subject: [PATCH 3/6] Use system-wide mochijson2
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- src/riak_kv_js_vm.erl |    4 ++--
+ src/riak_kv_js_vm.erl | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/riak_kv_js_vm.erl b/src/riak_kv_js_vm.erl
@@ -23,5 +23,5 @@ index 2cf6367..66cb7fa 100644
 +    build_arg_list(T, [[mochijson2:encode(H), ","]|Accum]).
  
 -- 
-1.7.10.4
+1.7.11.2
 
diff --git a/erlang-riak_kv-0004-Fixes-Issue-326.patch b/erlang-riak_kv-0004-Fixes-Issue-326.patch
index 5022558..f1b5db4 100644
--- a/erlang-riak_kv-0004-Fixes-Issue-326.patch
+++ b/erlang-riak_kv-0004-Fixes-Issue-326.patch
@@ -1,10 +1,10 @@
-From 75c78ed9b3235e8d5487f07ec2e66c75f2e23e34 Mon Sep 17 00:00:00 2001
+From 00db115b50a99af09c45f4502864fce2958f2e1d Mon Sep 17 00:00:00 2001
 From: Michajlo Matijkiw <michajlo.matijkiw at gmail.com>
 Date: Tue, 22 May 2012 16:26:33 -0400
 Subject: [PATCH 4/6] Fixes Issue #326
 
 ---
- src/riak_client.erl |    2 +-
+ src/riak_client.erl | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/riak_client.erl b/src/riak_client.erl
@@ -21,5 +21,5 @@ index 0c881c4..357102e 100644
                              {error, _Error};
                          {ok, FilterExprs} ->
 -- 
-1.7.10.4
+1.7.11.2
 
diff --git a/erlang-riak_kv-0005-Guard-eunit-include-to-prevent-automatic-dependency-.patch b/erlang-riak_kv-0005-Guard-eunit-include-to-prevent-automatic-dependency-.patch
index af27a58..96cf32e 100644
--- a/erlang-riak_kv-0005-Guard-eunit-include-to-prevent-automatic-dependency-.patch
+++ b/erlang-riak_kv-0005-Guard-eunit-include-to-prevent-automatic-dependency-.patch
@@ -1,4 +1,4 @@
-From d2bd69a63cbdfa4281d50b8250bcb4635f50c99b Mon Sep 17 00:00:00 2001
+From fc20b1fa201de7659cfdf2e06f45fd218975f9bc Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 18 Jul 2012 22:55:53 +0400
 Subject: [PATCH 5/6] Guard eunit include to prevent automatic dependency
@@ -6,8 +6,8 @@ Subject: [PATCH 5/6] Guard eunit include to prevent automatic dependency
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- src/riak_kv_bucket.erl  |    2 ++
- src/riak_kv_put_fsm.erl |    4 ++--
+ src/riak_kv_bucket.erl  | 2 ++
+ src/riak_kv_put_fsm.erl | 4 ++--
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/riak_kv_bucket.erl b/src/riak_kv_bucket.erl
@@ -41,5 +41,5 @@ index d6a8128..0e2b00b 100644
  -include_lib("riak_kv_js_pools.hrl").
  -include("riak_kv_wm_raw.hrl").
 -- 
-1.7.10.4
+1.7.11.2
 
diff --git a/erlang-riak_kv-0006-Drop-check-for-specific-version-of-Erlang.patch b/erlang-riak_kv-0006-Drop-check-for-specific-version-of-Erlang.patch
index 1481198..7ea65b0 100644
--- a/erlang-riak_kv-0006-Drop-check-for-specific-version-of-Erlang.patch
+++ b/erlang-riak_kv-0006-Drop-check-for-specific-version-of-Erlang.patch
@@ -1,11 +1,11 @@
-From 9b404250665ee49b5c1c520b04301eb6d4eb9a93 Mon Sep 17 00:00:00 2001
+From d2fd4296ccd43c66faaca5b33e57cf1e29c283da Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 18 Jul 2012 23:15:33 +0400
 Subject: [PATCH 6/6] Drop check for specific version of Erlang
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- rebar.config |    1 -
+ rebar.config | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/rebar.config b/rebar.config
@@ -18,5 +18,5 @@ index ada00f5..9df3c65 100644
  {edoc_opts, [{preprocess, true}]}.
  {erl_opts, [{parse_transform, lager_transform}]}.
 -- 
-1.7.10.4
+1.7.11.2
 
diff --git a/erlang-riak_kv.spec b/erlang-riak_kv.spec
index f5c8569..0f764ad 100644
--- a/erlang-riak_kv.spec
+++ b/erlang-riak_kv.spec
@@ -1,17 +1,17 @@
 %global realname riak_kv
 %global upstream basho
 %global debug_package %{nil}
-%global git_tag c732840
+%global git_tag 18643de
 %global patchnumber 0
 
 Name:		erlang-%{realname}
-Version:	1.1.2
+Version:	1.1.4
 Release:	1%{?dist}
 Summary:	Riak Key/Value Store
 Group:		Development/Languages
 License:	ASL 2.0
 URL:		https://github.com/basho/riak_kv
-# wget --content-disposition https://github.com/basho/riak_kv/tarball/1.1.2
+# wget --content-disposition https://github.com/basho/riak_kv/tarball/1.1.4
 Source0:	%{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
 # Fedora/EPEL specific patch
 Patch1:		erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch
@@ -60,7 +60,6 @@ Requires: erlang-sext%{?_isa}
 Requires: erlang-stdlib%{?_isa}
 Requires: erlang-webmachine%{?_isa}
 # Error:erlang(riak_kv_keys_fsm:start_link/6)
-# Error:erlang(riak_kv_mapred_filter:build_filter/1)
 
 
 %description
@@ -68,7 +67,7 @@ Riak Key/Value Store.
 
 
 %prep
-%setup -q -n %{upstream}-%{realname}-79b80f2
+%setup -q -n %{upstream}-%{realname}-6b3f741
 %patch1 -p1 -b .nodeps
 %patch2 -p1 -b .no_fail_on_warn
 %patch3 -p1 -b .systemwide_mochijson2
@@ -111,6 +110,9 @@ epmd -kill
 
 
 %changelog
+* Sun Aug 05 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.4-1
+- Ver. 1.1.4 (security bugfix)
+
 * Tue Jun 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.2-1
 - Ver. 1.1.2
 
diff --git a/sources b/sources
index 5d92248..e746547 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2af11fa2a754b22d897cb7512099edf5  basho-riak_kv-1.1.2-0-gc732840.tar.gz
+ebdbe710610ad3f82892da568357430c  basho-riak_kv-1.1.4-0-g18643de.tar.gz


More information about the scm-commits mailing list