Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 http/nginx/DETAILS        |    7 ++++---
 http/nginx/HISTORY        |    5 +++++
 http/nginx/PRE_BUILD      |    2 ++
 http/nginx/space.patch    |   18 ++++++++++++++++++
 shell-term-fm/xfe/DETAILS |    4 ++--
 shell-term-fm/xfe/HISTORY |    3 +++
 6 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit eb9f027e6de73dc5e442c9d6d4fe1569159abe6b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    xfe: => 1.37

commit 71b2aa8a657aa24fd23994541110fb3a5d24c3ed
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    nginx: security update

diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index 118383d..153cec6 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -7,18 +7,19 @@ fi
 case "$NGINX_RELEASE" in
   stable)
          VERSION=1.0.15
-  SECURITY_PATCH=3
+  SECURITY_PATCH=4
   ;;
   legacy)
          VERSION=0.8.55
+  SECURITY_PATCH=1
   ;;
   old)
          VERSION=0.7.69
-  SECURITY_PATCH=2
+  SECURITY_PATCH=3
   ;;
   devel)
          VERSION=1.1.19
-  SECURITY_PATCH=3
+  SECURITY_PATCH=4
   ;;
 esac
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index f412678..ec0a8ff 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,8 @@
+2013-11-21 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: SECURITY_PATCH++
+       * PRE_BUILD: apply patch
+       * space.patch: added, to fix CVE-2013-4547
+
 2012-08-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, BUILD, PRE{PARE,_BUILD}: added dav_ext module
        * CONFIGURE: generic dav module is required for dav_ext module
diff --git a/http/nginx/PRE_BUILD b/http/nginx/PRE_BUILD
index fb5c9fa..1491440 100755
--- a/http/nginx/PRE_BUILD
+++ b/http/nginx/PRE_BUILD
@@ -3,6 +3,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+patch -p0 < "$SPELL_DIRECTORY/space.patch" &&
+
 if [[ $NGINX_SYSLOG == y ]]; then
   if is_version_less $VERSION 0.8; then
      patch -p0 < "$SPELL_DIRECTORY/syslog-0.7.patch"
diff --git a/http/nginx/space.patch b/http/nginx/space.patch
new file mode 100644
index 0000000..e6bda84
--- /dev/null
+++ b/http/nginx/space.patch
@@ -0,0 +1,18 @@
+--- src/http/ngx_http_parse.c
++++ src/http/ngx_http_parse.c
+@@ -617,6 +617,7 @@ ngx_http_parse_request_line(ngx_http_req
+             default:
+                 r->space_in_uri = 1;
+                 state = sw_check_uri;
++                p--;
+                 break;
+             }
+             break;
+@@ -670,6 +671,7 @@ ngx_http_parse_request_line(ngx_http_req
+             default:
+                 r->space_in_uri = 1;
+                 state = sw_uri;
++                p--;
+                 break;
+             }
+             break;
diff --git a/shell-term-fm/xfe/DETAILS b/shell-term-fm/xfe/DETAILS
index 3c761e8..641bf85 100755
--- a/shell-term-fm/xfe/DETAILS
+++ b/shell-term-fm/xfe/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xfe
-         VERSION=1.35
-     
SOURCE_HASH=sha512:92d764a266e3f2e44ab1a8c1f6a8869ba8d32180520c40205829e0a46cc2dd553917efa385c61b9e10d53ffb7435dd635d62e238c9c89c054dbfd60741fc0623
+         VERSION=1.37
+     
SOURCE_HASH=sha512:32b4c7a4cba09504915735802a3adb1f4508920effb140e710911c5ae4663d1dcacfbedfc78f35473a2f40478c1a85f79865c1b6e3ede88ed193c1092d3e09e2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/shell-term-fm/xfe/HISTORY b/shell-term-fm/xfe/HISTORY
index 866de55..09e464b 100644
--- a/shell-term-fm/xfe/HISTORY
+++ b/shell-term-fm/xfe/HISTORY
@@ -1,3 +1,6 @@
+2013-11-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.37
+
 2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.35