Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6dd0f31d87554572ca3be6d23dd288f48058f825)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6dd0f31d87554572ca3be6d23dd288f48058f825)
  • Date: Sat, 8 Sep 2012 01:59:58 -0500

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

security/fwknop/DETAILS | 3 ++-
security/fwknop/HISTORY | 6 ++++++
security/fwknop/INSTALL | 11 -----------
security/fwknop/PRE_BUILD | 3 +--
security/fwknop/digest.patch | 27 +++++++++++++++++++++++++++
5 files changed, 36 insertions(+), 14 deletions(-)

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

fwknop: => 2.0.3 (security)

diff --git a/security/fwknop/DETAILS b/security/fwknop/DETAILS
index 6f226e9..14eda1c 100755
--- a/security/fwknop/DETAILS
+++ b/security/fwknop/DETAILS
@@ -1,5 +1,6 @@
SPELL=fwknop
- VERSION=2.0
+ VERSION=2.0.3
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.cipherdyne.org/fwknop/download/$SOURCE
diff --git a/security/fwknop/HISTORY b/security/fwknop/HISTORY
index dd7ad08..02944bc 100644
--- a/security/fwknop/HISTORY
+++ b/security/fwknop/HISTORY
@@ -1,3 +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
+ * digest.patch: added, to fix compilation with no file cache
+
2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0; updated short desc
* DEPENDS: perl is no more -- as of version 2, fwknop has been fully
diff --git a/security/fwknop/INSTALL b/security/fwknop/INSTALL
deleted file mode 100755
index 8e6319e..0000000
--- a/security/fwknop/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-default_install &&
-
-if list_find "$FWKNOP_OPTS" "--enable-server"; then
- install -vm 755 -d "$INSTALL_ROOT/etc/fwknop" &&
-
- install_config_file "$SOURCE_DIRECTORY/server/access.conf" \
- "$INSTALL_ROOT/etc/fwknop/access.conf" &&
-
- install_config_file "$SOURCE_DIRECTORY/server/fwknopd.conf" \
- "$INSTALL_ROOT/etc/fwknop/fwknopd.conf"
-fi
diff --git a/security/fwknop/PRE_BUILD b/security/fwknop/PRE_BUILD
index 2f7639a..73e29c4 100755
--- a/security/fwknop/PRE_BUILD
+++ b/security/fwknop/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-# don't trash fwknopd configs (without castfs)
-sed -i "s:install-dist_fwknopdDATA install-man:install-man:"
server/Makefile.in
+patch -p0 < "$SPELL_DIRECTORY/digest.patch"
diff --git a/security/fwknop/digest.patch b/security/fwknop/digest.patch
new file mode 100644
index 0000000..04e1a0c
--- /dev/null
+++ b/security/fwknop/digest.patch
@@ -0,0 +1,27 @@
+--- 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



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6dd0f31d87554572ca3be6d23dd288f48058f825), Vlad Glagolev, 09/08/2012

Archive powered by MHonArc 2.6.24.

Top of Page