[erlang-webmachine] Ver. 1.9.3
Peter Lemenkov
peter at fedoraproject.org
Sun Mar 3 09:58:16 UTC 2013
commit 1ca62ab6cd8d6f39d69bba27a0461b73748ea28c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Mar 3 13:58:03 2013 +0400
Ver. 1.9.3
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
erlang-webmachine-0001-Fix-rebar-builddeps.patch | 27 ++++++++++
...ne-0001-Report-proper-version-1.9.0-1.9.2.patch | 29 -----------
...02-Decode-Content-MD5-with-base64-not-hex.patch | 38 ++++++++++++++
...002-Don-t-allow-rebar-to-manage-builddeps.patch | 28 ----------
erlang-webmachine-0003-Kill-wrong-doc-info.patch | 36 -------------
erlang-webmachine.spec | 53 +++++++++----------
sources | 2 +-
8 files changed, 92 insertions(+), 122 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a31bbf2..564be02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/basho-webmachine-webmachine-1.8.0-0-g15d815e.tar.gz
/basho-webmachine-1.9.1-0-g97acb28.tar.gz
/basho-webmachine-1.9.2-0-gf05a195.tar.gz
+/basho-webmachine-1.9.3-0-g33cd5f3.tar.gz
diff --git a/erlang-webmachine-0001-Fix-rebar-builddeps.patch b/erlang-webmachine-0001-Fix-rebar-builddeps.patch
new file mode 100644
index 0000000..cb82139
--- /dev/null
+++ b/erlang-webmachine-0001-Fix-rebar-builddeps.patch
@@ -0,0 +1,27 @@
+From 48953e6282b7dc32413810d953ca09783e3e1b3d Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Fri, 18 May 2012 17:08:29 +0400
+Subject: [PATCH 1/2] Fix rebar builddeps
+
+This patch is Fedora-specific.
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rebar.config | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rebar.config b/rebar.config
+index 25f43d5..660bdaa 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -4,6 +4,6 @@
+ {edoc_opts, [{preprocess, true}]}.
+
+ {deps, [
+- {mochiweb, "1.5.1*", {git, "git://github.com/basho/mochiweb",
++ {mochiweb, ".*", {git, "git://github.com/basho/mochiweb",
+ {tag, "1.5.1p3"}}}
+ ]}.
+--
+1.8.1.4
+
diff --git a/erlang-webmachine-0002-Decode-Content-MD5-with-base64-not-hex.patch b/erlang-webmachine-0002-Decode-Content-MD5-with-base64-not-hex.patch
new file mode 100644
index 0000000..ac716ed
--- /dev/null
+++ b/erlang-webmachine-0002-Decode-Content-MD5-with-base64-not-hex.patch
@@ -0,0 +1,38 @@
+From 46a7fcb7068e358a61c8ca7c79ba93265cced8db Mon Sep 17 00:00:00 2001
+From: Reid Draper <reiddraper at gmail.com>
+Date: Tue, 29 Jan 2013 15:59:21 -0500
+Subject: [PATCH 2/2] Decode Content-MD5 with base64, not hex
+
+Also fix crypto fun names, though I haven't yet
+seen a situation where that function is called.
+More discussion of the issues can be seen
+[here](https://github.com/basho/webmachine/issues/116).
+---
+ src/webmachine_decision_core.erl | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/webmachine_decision_core.erl b/src/webmachine_decision_core.erl
+index 0989110..b7ec370 100644
+--- a/src/webmachine_decision_core.erl
++++ b/src/webmachine_decision_core.erl
+@@ -190,7 +190,7 @@ decision(v3b9a) ->
+ {halt, Code} ->
+ respond(Code);
+ not_validated ->
+- Checksum = mochihex:to_bin(get_header_val("content-md5")),
++ Checksum = base64:decode(get_header_val("content-md5")),
+ BodyHash = compute_body_md5(),
+ case BodyHash =:= Checksum of
+ true -> d(v3b9b);
+@@ -718,6 +718,6 @@ compute_body_md5_stream() ->
+ compute_body_md5_stream(MD5, {Hunk, done}, Body) ->
+ %% Save the body so it can be retrieved later
+ put(reqstate, wrq:set_resp_body(Body, get(reqstate))),
+- crypto:md5final(crypto:md5update(MD5, Hunk));
++ crypto:md5_final(crypto:md5_update(MD5, Hunk));
+ compute_body_md5_stream(MD5, {Hunk, Next}, Body) ->
+- compute_body_md5_stream(crypto:md5update(MD5, Hunk), Next(), <<Body/binary, Hunk/binary>>).
++ compute_body_md5_stream(crypto:md5_update(MD5, Hunk), Next(), <<Body/binary, Hunk/binary>>).
+--
+1.8.1.4
+
diff --git a/erlang-webmachine.spec b/erlang-webmachine.spec
index dd548ff..74d870d 100644
--- a/erlang-webmachine.spec
+++ b/erlang-webmachine.spec
@@ -1,23 +1,23 @@
%global realname webmachine
%global upstream basho
%global debug_package %{nil}
-%global git_tag f05a195
+%global git_tag 33cd5f3
%global patchnumber 0
Name: erlang-%{realname}
-Version: 1.9.2
-Release: 2%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
Summary: A REST-based system for building web applications
Group: Development/Languages
License: ASL 2.0
URL: http://webmachine.basho.com/
-# wget --content-disposition https://github.com/basho/webmachine/tarball/1.9.2
+# wget --content-disposition https://github.com/basho/webmachine/tarball/1.9.3
Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
-Patch1: erlang-webmachine-0001-Report-proper-version-1.9.0-1.9.2.patch
-Patch2: erlang-webmachine-0002-Don-t-allow-rebar-to-manage-builddeps.patch
-Patch3: erlang-webmachine-0003-Kill-wrong-doc-info.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+# Fedora/EPEL-specific
+Patch1: erlang-webmachine-0001-Fix-rebar-builddeps.patch
+# Backported from upstream
+Patch2: erlang-webmachine-0002-Decode-Content-MD5-with-base64-not-hex.patch
BuildRequires: erlang-mochiweb
BuildRequires: erlang-rebar
Requires: erlang-crypto%{?_isa}
@@ -35,11 +35,10 @@ A REST-based system for building web applications.
%prep
-%setup -q -n %{upstream}-%{realname}-cccd12d
+%setup -q -n %{upstream}-%{realname}-ddf03e3
chmod 644 src/wmtrace_resource.erl
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch1 -p1 -b .fixdep
+%patch2 -p1 -b .fix_fun_call
chmod -x demo/start.sh
chmod -x priv/trace/wmtrace.css
chmod -x priv/trace/wmtrace.js
@@ -54,25 +53,20 @@ rebar compile -v
%install
-rm -rf $RPM_BUILD_ROOT
-install -D -m 644 ebin/%{realname}.app $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
-install -m 644 ebin/%{realname}.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
-install -m 644 ebin/%{realname}_*.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
-install -m 644 ebin/%{realname}_sup.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
-install -m 644 ebin/wmtrace_resource.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
-install -m 644 ebin/wrq.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
-install -d $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/include
-install -m 644 include/*.hrl $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/include
-cp -r priv $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}
-cp -r www $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -D -m 644 ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
+install -m 644 ebin/%{realname}.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -m 644 ebin/%{realname}_*.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -m 644 ebin/%{realname}_sup.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -m 644 ebin/wmtrace_resource.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -m 644 ebin/wrq.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -d %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/include
+install -m 644 include/*.hrl %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/include
+cp -r priv %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}
+cp -r www %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}
%check
-rebar eunit -v
+rebar eunit skip_deps=true -v
%files
@@ -90,6 +84,9 @@ rebar eunit -v
%changelog
+* Sun Mar 03 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.9.3-1
+- Ver. 1.9.3
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index db1f796..d332763 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f52dbdebe2b344471c6a305742a55c39 basho-webmachine-1.9.2-0-gf05a195.tar.gz
+eae79d13e81f26a5dc75425783c4c9a8 basho-webmachine-1.9.3-0-g33cd5f3.tar.gz
More information about the scm-commits
mailing list