Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 security/fwknop/HISTORY       |    4 +++-
 security/fwknop/PRE_BUILD     |    1 +
 security/fwknop/command.patch |   14 ++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

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

    fwknop: fixed a bug for command type access message (introduced in 2.0.1)

diff --git a/security/fwknop/HISTORY b/security/fwknop/HISTORY
index 02944bc..4305df7 100644
--- a/security/fwknop/HISTORY
+++ b/security/fwknop/HISTORY
@@ -1,7 +1,9 @@
 2012-09-08 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.0.3; SECURITY_PATCH++
        * INSTALL: dropped, fixed by upstream
-       * PRE_BUILD: apply the patch
+       * PRE_BUILD: apply the patches
+       * command.patch: added, to fix a bug for command type access message
+         (introduced in 2.0.1)
        * digest.patch: added, to fix compilation with no file cache
 
 2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/security/fwknop/PRE_BUILD b/security/fwknop/PRE_BUILD
index 73e29c4..a2c62d7 100755
--- a/security/fwknop/PRE_BUILD
+++ b/security/fwknop/PRE_BUILD
@@ -1,4 +1,5 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+patch -p0 < "$SPELL_DIRECTORY/command.patch" &&
 patch -p0 < "$SPELL_DIRECTORY/digest.patch"
diff --git a/security/fwknop/command.patch b/security/fwknop/command.patch
new file mode 100644
index 0000000..640a7fe
--- /dev/null
+++ b/security/fwknop/command.patch
@@ -0,0 +1,14 @@
+--- lib/fko_decode.c.orig      Wed Sep  5 06:04:48 2012
++++ lib/fko_decode.c   Sat Sep  8 15:11:00 2012
+@@ -285,9 +285,9 @@ fko_decode_spa_data(fko_ctx_t ctx)
+ 
+     b64_decode(tbuf, (unsigned char*)ctx->message);
+ 
+-    /* Require a message similar to: 1.2.3.4,tcp/22
++    /* Require a message similar to: 1.2.3.4,tcp/22 (if it's not command 
message)
+     */
+-    if(validate_access_msg(ctx->message) != FKO_SUCCESS)
++    if(ctx->message_type != FKO_COMMAND_MSG && 
validate_access_msg(ctx->message) != FKO_SUCCESS)
+     {
+         free(tbuf);
+         return(FKO_ERROR_INVALID_DATA);