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/BUILD         |    3 +++
 security/fwknop/DETAILS       |    2 +-
 security/fwknop/HISTORY       |    5 +++++
 security/fwknop/PRE_BUILD     |    5 -----
 security/fwknop/command.patch |   14 --------------
 security/fwknop/digest.patch  |   27 ---------------------------
 6 files changed, 9 insertions(+), 47 deletions(-)

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

    fwknop: => 2.0.4

diff --git a/security/fwknop/BUILD b/security/fwknop/BUILD
new file mode 100755
index 0000000..d22e99f
--- /dev/null
+++ b/security/fwknop/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/security/fwknop/DETAILS b/security/fwknop/DETAILS
index 14eda1c..002e3a5 100755
--- a/security/fwknop/DETAILS
+++ b/security/fwknop/DETAILS
@@ -1,5 +1,5 @@
            SPELL=fwknop
-         VERSION=2.0.3
+         VERSION=2.0.4
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
diff --git a/security/fwknop/HISTORY b/security/fwknop/HISTORY
index 4305df7..5c820c1 100644
--- a/security/fwknop/HISTORY
+++ b/security/fwknop/HISTORY
@@ -1,3 +1,8 @@
+2012-12-10 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.0.4
+       * BUILD: added, to fix multijob build
+       * PRE_BUILD, command.patch, digest.patch: dropped, fixed by upstream
+
 2012-09-08 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.0.3; SECURITY_PATCH++
        * INSTALL: dropped, fixed by upstream
diff --git a/security/fwknop/PRE_BUILD b/security/fwknop/PRE_BUILD
deleted file mode 100755
index a2c62d7..0000000
--- a/security/fwknop/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 640a7fe..0000000
--- a/security/fwknop/command.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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);
diff --git a/security/fwknop/digest.patch b/security/fwknop/digest.patch
deleted file mode 100644
index 04e1a0c..0000000
--- a/security/fwknop/digest.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- server/replay_cache.c.orig Wed Sep  5 06:04:48 2012
-+++ server/replay_cache.c      Sat Sep  8 09:46:56 2012
-@@ -565,7 +565,6 @@ is_replay_dbm_cache(fko_srv_options_t *opts, char *dig
- #endif
-     datum       db_key, db_ent;
- 
--    char       *digest = NULL;
-     int         digest_len, res = SPA_MSG_SUCCESS;
- 
-     digest_cache_info_t dc_info;
-@@ -638,7 +637,6 @@ add_replay_dbm_cache(fko_srv_options_t *opts, char *di
- #endif
-     datum       db_key, db_ent;
- 
--    char       *digest = NULL;
-     int         digest_len, res = SPA_MSG_SUCCESS;
- 
-     digest_cache_info_t dc_info;
-@@ -705,7 +703,7 @@ add_replay_dbm_cache(fko_srv_options_t *opts, char *di
- 
-     return(res);
- #endif /* NO_DIGEST_CACHE */
--
-+}
- #endif /* USE_FILE_CACHE */
- 
- #if USE_FILE_CACHE