Skip to Content.
Sympa Menu

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

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 (9bcc92f9b7a6d631a9861a90d6cac183c1dd729a)
  • Date: Fri, 27 Apr 2012 15:14:50 -0500

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

security/fwknop/BUILD | 1 -
security/fwknop/CONFIGURE | 19 +++++++++++--------
security/fwknop/DEPENDS | 21 ++++++++++++++-------
security/fwknop/DETAILS | 8 ++++----
security/fwknop/HISTORY | 10 ++++++++++
security/fwknop/INSTALL | 12 +++++++++++-
security/fwknop/PRE_BUILD | 20 ++++----------------
security/fwknop/homedir_hack.diff | 18 ------------------
security/fwknop/init.d/fwknopd | 25 +++++++++++++++++--------
security/fwknop/init_hack.diff | 20 --------------------
10 files changed, 71 insertions(+), 83 deletions(-)

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

fwknop: => 2.0

diff --git a/security/fwknop/BUILD b/security/fwknop/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/security/fwknop/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/security/fwknop/CONFIGURE b/security/fwknop/CONFIGURE
index 9688856..bb96534 100755
--- a/security/fwknop/CONFIGURE
+++ b/security/fwknop/CONFIGURE
@@ -1,10 +1,13 @@
-config_query_option FWKNOP_SERVER \
- "Install server component?" y \
- "" \
- "--client-only" &&
+config_query_option FWKNOP_OPTS "Build the fwknop client?" y \
+ "--enable-client" \
+ "--disable-client" &&

-if [[ $FWKNOP_SERVER == '--client-only' ]]
-then
- message "${MESSAGE_COLOR}The init script is useful only" \
- "with the server component.$DEFAULT_COLOR"
+config_query_option FWKNOP_OPTS "Build the fwknop server?" y \
+ "--enable-server" \
+ "--disable-server" &&
+
+if list_find "$FWKNOP_OPTS" "--enable-server"; then
+ config_query_option FWKNOP_OPTS "Enable the fwknopd digest-cache?" y \
+ "--enable-digest-cache" \
+ "--disable-digest-cache"
fi
diff --git a/security/fwknop/DEPENDS b/security/fwknop/DEPENDS
index 387478a..79a76fe 100755
--- a/security/fwknop/DEPENDS
+++ b/security/fwknop/DEPENDS
@@ -1,8 +1,15 @@
-depends perl &&
-depends psmisc &&
+if list_find "$FWKNOP_OPTS" "--enable-server"; then
+ depends libpcap &&

-if [[ $FWKNOP_SERVER != '--client-only' ]]
-then
- depends iptables &&
- depends libcap
-fi
+ runtime_depends iptables &&
+
+ optional_depends gdbm \
+ "--disable-file-cache" \
+ "--enable-file-cache" \
+ "to replace file cache with gdbm"
+fi &&
+
+optional_depends gpgme \
+ "--with-gpgme" \
+ "--without-gpgme" \
+ "for gpg encryption support"
diff --git a/security/fwknop/DETAILS b/security/fwknop/DETAILS
index 6ed6bdc..6f226e9 100755
--- a/security/fwknop/DETAILS
+++ b/security/fwknop/DETAILS
@@ -1,17 +1,17 @@
SPELL=fwknop
- VERSION=1.8.1
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.cipherdyne.org/fwknop/download/$SOURCE
- SOURCE2_URL[0]=http://www.cipherdyne.org/fwknop/download/$SOURCE2
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=fwknop.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.cipherdyne.org/fwknop/
ENTERED=20070821
LICENSE[0]=GPL
KEYWORDS="security"
- SHORT="A Single Packet Authorization (SPA) implementation."
+ SHORT="Single Packet Authorization and Port Knocking"
cat << EOF
fwknop stands for the "FireWall KNock OPerator", and implements an
authorization scheme called Single Packet Authorization (SPA) that is
diff --git a/security/fwknop/HISTORY b/security/fwknop/HISTORY
index d218369..dd7ad08 100644
--- a/security/fwknop/HISTORY
+++ b/security/fwknop/HISTORY
@@ -1,3 +1,13 @@
+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
+ re-written in C
+ * CONFIGURE: use FWKNOP_OPTS
+ * INSTALL: carefully install config files even without castfs
+ * PRE_BUILD: removed dirty hacks; fixed config files trashing
+ * BUILD, homedir_hack.diff, init_hack.diff: dropped
+ * init.d/fwknopd: unified; added reload/restart functions
+
2011-09-23 Bor Kraljič <pyrobor AT ver.si>
* fwknop.gpg: added gpg key 0D3E7410 to keyring (fixes #104)
public key from Michael Rash (Signing key for cipherdyne.org
projects) <mbr AT cipherdyne.org>
diff --git a/security/fwknop/INSTALL b/security/fwknop/INSTALL
index 765d39e..8e6319e 100755
--- a/security/fwknop/INSTALL
+++ b/security/fwknop/INSTALL
@@ -1 +1,11 @@
-./install.pl --Defaults $FWKNOP_SERVER
+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 7870077..2f7639a 100755
--- a/security/fwknop/PRE_BUILD
+++ b/security/fwknop/PRE_BUILD
@@ -1,17 +1,5 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&

-#
-# Prevent client-only installation from putting files under /root
-#
-patch -p0 < "$SCRIPT_DIRECTORY/homedir_hack.diff" &&
-
-#
-# Prevent init script installation
-#
-patch -p0 < "$SCRIPT_DIRECTORY/init_hack.diff" &&
-
-#
-# Change client-only installation's lib path from /lib to /usr/lib
-#
-sed -i "s|\$homedir/lib|\$homedir/usr/lib|g" install.pl
+# don't trash fwknopd configs (without castfs)
+sed -i "s:install-dist_fwknopdDATA install-man:install-man:"
server/Makefile.in
diff --git a/security/fwknop/homedir_hack.diff
b/security/fwknop/homedir_hack.diff
deleted file mode 100644
index 7abaf95..0000000
--- a/security/fwknop/homedir_hack.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- install.pl~ 2007-06-04 02:13:34.000000000 +0000
-+++ install.pl 2007-08-21 11:57:27.000000000 +0000
-@@ -224,15 +224,7 @@
-
- if ($client_install) {
-
-- ### we are installing as a normal user instead of root, so see
-- ### if it is ok to install within the user's home directory
- $homedir = '';
-- if ($config_homedir) {
-- $homedir = $config_homedir;
-- } else {
-- $homedir = $ENV{'HOME'} or die '[*] Could not get home ',
-- "directory, set the $config_homedir var.";
-- }
-
- print
- " The fwknop client will be installed at $homedir/bin/fwknop, and a
few\n",
diff --git a/security/fwknop/init.d/fwknopd b/security/fwknop/init.d/fwknopd
old mode 100644
new mode 100755
index 3b135ad..00731a1
--- a/security/fwknop/init.d/fwknopd
+++ b/security/fwknop/init.d/fwknopd
@@ -1,24 +1,33 @@
+#!/bin/bash
+
PROGRAM=/usr/sbin/fwknopd
RUNLEVEL=3
NEEDS="+network"

. /etc/init.d/smgl_init

-start()
+stop()
{
- echo "Starting the fwknop daemons..."
- /usr/sbin/fwknopd
+ echo "Stopping $NAME..."
+ $PROGRAM --kill
evaluate_retval
}

-stop()
+restart()
{
- echo "Stopping the fwknop daemons..."
- /usr/sbin/fwknopd --Kill
- evaluate_retval
+ echo "Restarting $NAME..."
+ stop
+ sleep 2
+ _start
+}
+
+reload()
+{
+ $PROGRAM --restart
+ evaluate_retval
}

status()
{
- /usr/sbin/fwknopd --Status
+ $PROGRAM --status
}
diff --git a/security/fwknop/init_hack.diff b/security/fwknop/init_hack.diff
deleted file mode 100644
index 5246cfb..0000000
--- a/security/fwknop/init_hack.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- install.pl~ 2007-06-04 02:13:34.000000000 +0000
-+++ install.pl 2007-08-21 13:27:36.000000000 +0000
-@@ -640,16 +640,12 @@
- }
- }
-
-- if (-d $INIT_DIR) {
-- &enable_fwknop_at_boot($distro) unless $data_method =~
/client/i;
-- }
--
- if ($data_method =~ /client/i) {
- print "\n[+] fwknop has been installed!\n\n";
- } else {
- print
- "\n[+] fwknop has been installed! To start in server mode, run\n\n",
--" \"/etc/init.d/fwknop start\"\n\n",
-+" \"telinit run fwknopd start\"\n\n",
- " Note: You will need to edit $config{'FWKNOP_CONF_DIR'}/access.conf for
fwknop to\n",
- " function properly in server mode. More information can be found in\n",
- " the fwknop manpage.\n\n";



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9bcc92f9b7a6d631a9861a90d6cac183c1dd729a), Vlad Glagolev, 04/27/2012

Archive powered by MHonArc 2.6.24.

Top of Page