[erlang-mochiweb] Ver. 2.4.1
Peter Lemenkov
peter at fedoraproject.org
Thu Jan 31 19:55:44 UTC 2013
commit b965fe5cd16b2410d629267ed0dfb82907df9942
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Jan 31 23:55:37 2013 +0400
Ver. 2.4.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...hiweb-0001-96-mochifmt_records-regression.patch | 41 --------------------
...ochiweb-acceptor-blocked-in-ssl-handshake.patch | 4 +-
...b-0003-fix-mochiweb_request-regression-97.patch | 40 -------------------
erlang-mochiweb.spec | 21 ++++------
sources | 2 +-
6 files changed, 13 insertions(+), 96 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8554045..1f005d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ erlang-mochiweb-1.3.tar.gz
/mochi-mochiweb-1.4.0-0-g32dc8be.tar.gz
/mochi-mochiweb-1.4.1-0-g80571b9.tar.gz
/mochi-mochiweb-v2.4.0-0-gb02ea50.tar.gz
+/mochi-mochiweb-v2.4.1-0-gc8516e3.tar.gz
diff --git a/erlang-mochiweb-0002-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch b/erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
similarity index 95%
rename from erlang-mochiweb-0002-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
rename to erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
index c05d371..99934d2 100644
--- a/erlang-mochiweb-0002-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
+++ b/erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
@@ -1,7 +1,7 @@
-From a79466f14c6cede7f74c13e7553e5f73353cff74 Mon Sep 17 00:00:00 2001
+From 1ee2c6c88cf2d586480c4ccab974d04ef6bcd7fc Mon Sep 17 00:00:00 2001
From: Wei Cao <cyg.cao at gmail.com>
Date: Thu, 16 Aug 2012 10:53:07 +0800
-Subject: [PATCH 2/3] Fix Mochiweb acceptor blocked in ssl handshake
+Subject: [PATCH 1/1] Fix Mochiweb acceptor blocked in ssl handshake
Acceptor cannot be recycled until ssl handshake is done,
so it's possible and easy for all acceptors be blocked between the point
diff --git a/erlang-mochiweb.spec b/erlang-mochiweb.spec
index b17c97b..2bc5e87 100644
--- a/erlang-mochiweb.spec
+++ b/erlang-mochiweb.spec
@@ -1,25 +1,21 @@
%global realname mochiweb
%global upstream mochi
%global debug_package %{nil}
-%global git_tag b02ea50
+%global git_tag c8516e3
%global patchnumber 0
Name: erlang-%{realname}
-Version: 2.4.0
-Release: 2%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
Summary: An Erlang library for building lightweight HTTP servers
Group: Development/Libraries
License: MIT
URL: http://github.com/mochi/mochiweb
-# wget --content-disposition https://github.com/mochi/mochiweb/tarball/2.4.0
+# wget --content-disposition https://github.com/mochi/mochiweb/tarball/v2.4.1
Source0: %{upstream}-%{realname}-v%{version}-%{patchnumber}-g%{git_tag}.tar.gz
-# Backported from master
-Patch1: erlang-mochiweb-0001-96-mochifmt_records-regression.patch
# used in CouchDB, see https://github.com/mochi/mochiweb/issues/70
-Patch2: erlang-mochiweb-0002-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
-# Backported from master
-Patch3: erlang-mochiweb-0003-fix-mochiweb_request-regression-97.patch
+Patch1: erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
BuildRequires: erlang-rebar
BuildRequires: erlang-xmerl
Requires: erlang-compiler%{?_isa}
@@ -42,9 +38,7 @@ An Erlang library for building lightweight HTTP servers.
%prep
%setup -q -n %{upstream}-%{realname}-%{git_tag}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch1 -p1 -b .couchdb
%build
@@ -109,6 +103,9 @@ rebar eunit -v
%changelog
+* Thu Jan 31 2013 Peter Lemenkov <lemenkov at gmail.com> - 2.4.1-1
+- Ver. 2.4.1
+
* Sat Jan 26 2013 Peter Lemenkov <lemenkov at gmail.com> - 2.4.0-2
- Fixed regression (see https://github.com/mochi/mochiweb/issues/97 )
diff --git a/sources b/sources
index 57548e0..cb92147 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5032120708c0d2db695cf0c2e5fca4b mochi-mochiweb-v2.4.0-0-gb02ea50.tar.gz
+2e23db4b893463fff0c245498706df27 mochi-mochiweb-v2.4.1-0-gc8516e3.tar.gz
More information about the scm-commits
mailing list