sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fde6b7f39a8f9861460b069abdd765de5b8b2409)

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 (fde6b7f39a8f9861460b069abdd765de5b8b2409)
Date: Wed, 28 Aug 2013 02:14:13 -0500

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

security/knock/DEPENDS | 9 ++++++-
security/knock/DETAILS | 5 +---
security/knock/HISTORY | 6 ++++
security/knock/INSTALL | 5 +++-
security/knock/PRE_BUILD | 6 +++-
security/knock/doc.patch | 30 ------------------------
security/knock/performance.patch | 48
---------------------------------------
7 files changed, 24 insertions(+), 85 deletions(-)

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

knockd: => 0.6

diff --git a/security/knock/DEPENDS b/security/knock/DEPENDS
index a8ec60d..4b795cc 100755
--- a/security/knock/DEPENDS
+++ b/security/knock/DEPENDS
@@ -1 +1,8 @@
-depends libpcap
+if [[ $INIT_INSTALLED ]]; then
+ depends libpcap '--enable-knockd'
+else
+ optional_depends libpcap \
+ "--enable-knockd" \
+ "--disable-knockd" \
+ "for building knockd (server-side part)"
+fi
diff --git a/security/knock/DETAILS b/security/knock/DETAILS
index bf31d78..8a749da 100755
--- a/security/knock/DETAILS
+++ b/security/knock/DETAILS
@@ -1,12 +1,11 @@
SPELL=knock
- VERSION=0.5
- PATCHLEVEL=1
+ VERSION=0.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.zeroflux.org/proj/$SPELL/files/$SOURCE
WEB_SITE=http://www.zeroflux.org/projects/knock
ENTERED=20060529
-
SOURCE_HASH=sha512:c5f7f3320d4d9a41847dba0cda4d66852f983db419b23d3bf9c83d44a41ba437379bf6cee47a096c600841e321740849dac26d5c3afff9b3ae0178a2fcb6c35e
+
SOURCE_HASH=sha512:79179fe0358abfeb001b787522154b5045f9dd679e8b6bea0f375a064e56ed5166c20dee094b42d56338afdf19041c94f4c86b8d5d385d1cc02ca525c1b73714
LICENSE[0]=GPL
GATHER_DOCS=off
SHORT="port-knocking server and client"
diff --git a/security/knock/HISTORY b/security/knock/HISTORY
index a98c432..01e1724 100644
--- a/security/knock/HISTORY
+++ b/security/knock/HISTORY
@@ -1,3 +1,9 @@
+2013-08-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.6
+ * DEPENDS: made libpcap optional
+ * PRE_BUILD, INSTALL: rewritten knockd man section change logic
+ * performance.patch, doc.patch: removed, fixed by upstream
+
2011-05-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1; quoting paths; updated descriptions and urls
* INSTALL: added, to install init script
diff --git a/security/knock/INSTALL b/security/knock/INSTALL
index e3021a8..2e30521 100755
--- a/security/knock/INSTALL
+++ b/security/knock/INSTALL
@@ -3,4 +3,7 @@ default_install &&
if [[ $INIT_INSTALLED ]]; then
install_config_file "$SPELL_DIRECTORY/init.d/knock.conf" \
"$INSTALL_ROOT/etc/sysconfig/knock"
-fi
+fi &&
+
+install -vm 755 -d "$INSTALL_ROOT/usr/share/man/man8" &&
+install -vm 644 "doc/knockd.8" "$INSTALL_ROOT/usr/share/man/man8"
diff --git a/security/knock/PRE_BUILD b/security/knock/PRE_BUILD
index 4b1de84..3245823 100755
--- a/security/knock/PRE_BUILD
+++ b/security/knock/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/doc.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/performance.patch"
+# knockd(1) -> knockd(8)
+mv doc/knockd.1 doc/knockd.8 &&
+sedit "s:knockd 1:knockd 8:" doc/knockd.8
+sedit "s:knockd\.1:knockd\.8:" Makefile.in
diff --git a/security/knock/doc.patch b/security/knock/doc.patch
deleted file mode 100644
index f6b1bf7..0000000
--- a/security/knock/doc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig 2005-06-27 09:11:34.000000000 +0400
-+++ Makefile.in 2011-05-03 23:48:18.147684188 +0400
-@@ -28,6 +28,7 @@
- BINDIR = @bindir@
- SBINDIR = @sbindir@
- MANDIR = @mandir@
-+DATADIR = @datadir@
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-@@ -70,9 +71,9 @@
- install: all
- $(INSTALL) -D -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd
- $(INSTALL) -D -m0755 knock $(DESTDIR)$(BINDIR)/knock
-- $(INSTALL) -D -m0644 $(MANSRC)knockd.1
$(DESTDIR)$(MANDIR)/man1/knockd.1
-+ $(INSTALL) -D -m0644 $(MANSRC)knockd.1
$(DESTDIR)$(MANDIR)/man8/knockd.8
- $(INSTALL) -D -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1
-- $(INSTALL) -D -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf
-+ $(INSTALL) -D -m0644 knockd.conf
$(DESTDIR)/$(DATADIR)/knockd/knockd.conf
-
- clean:
- rm -f *~ $(OBJDIR)*.o $(MANSRC)*.1
---- doc/knockd.1.in.orig 2005-06-29 22:45:17.000000000 +0400
-+++ doc/knockd.1.in 2011-05-03 23:49:01.259684649 +0400
-@@ -1,4 +1,4 @@
--.TH knockd 1 "June 26, 2005" "knockd #VERSION#" ""
-+.TH knockd 8 "June 26, 2005" "knockd #VERSION#" ""
- .SH NAME
- knockd \- port-knock server
- .SH SYNOPSIS
diff --git a/security/knock/performance.patch
b/security/knock/performance.patch
deleted file mode 100644
index 010de10..0000000
--- a/security/knock/performance.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/knockd.c.orig 2005-06-27 09:11:34.000000000 +0400
-+++ src/knockd.c 2011-05-03 23:41:20.133684648 +0400
-@@ -46,6 +46,7 @@
- #include <syslog.h>
- #include <pcap.h>
- #include <errno.h>
-+#include <limits.h>
- #include "list.h"
-
- static char version[] = "0.5";
-@@ -193,7 +194,7 @@
- }
- }
-
-- cap = pcap_open_live(o_int, 65535, 0, 0, pcapErr);
-+ cap = pcap_open_live(o_int, 65535, 0, 1000, pcapErr);
- if(strlen(pcapErr)) {
- fprintf(stderr, "could not open %s: %s\n", o_int, pcapErr);
- }
-@@ -371,7 +372,18 @@
- }
- list_free(doors);
-
-+ if(logfd) {
-+ fclose(logfd);
-+ logfd = NULL;
-+ }
- parseconfig(o_cfg);
-+ if(strlen(o_logfile)) {
-+ /* open the log file */
-+ logfd = fopen(o_logfile, "a");
-+ if(logfd == NULL) {
-+ perror("warning: cannot open logfile");
-+ }
-+ }
- return;
- }
-
---- src/knock.c.orig 2005-06-27 09:11:34.000000000 +0400
-+++ src/knock.c 2011-05-03 23:35:39.297684650 +0400
-@@ -128,6 +128,7 @@
- connect(sd, (struct sockaddr*)&addr, sizeof(struct
sockaddr));
- }
- close(sd);
-+ usleep(1);
- }
-
- return(0);

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fde6b7f39a8f9861460b069abdd765de5b8b2409), Vlad Glagolev, 08/28/2013