16 Commits

Author SHA1 Message Date
Leo Antunes
26e4c5ae8c add changelog entry for 0.7-1
Gbp-Dch: ignore
2016-10-08 16:08:04 +02:00
Leo Antunes
14a9bb3f09 add watch file 2016-10-08 16:03:25 +02:00
Leo Antunes
805dec719b debian/control: add VCS URL 2016-10-08 16:03:25 +02:00
Leo Antunes
5c686b87a6 remove knock client docs from installation
otherwise we end up with multiple documentation copies in the single
binary package
2016-10-08 15:19:17 +02:00
Leo Antunes
848daeab94 add hardening flags 2016-10-08 14:32:05 +02:00
Leo Antunes
197eb24d24 init: add dependency on $remote_fs 2016-10-08 14:32:05 +02:00
Leo Antunes
bfc99c1f23 add systemd support (closes: #729663) 2016-10-08 14:31:50 +02:00
Leo Antunes
733d82a7cb switch to source/format 3.0 (quilt) 2016-09-28 21:44:14 +02:00
Leo Antunes
802af55953 remove debian/docs (README deleted upstream)
Gbp-Dch: ignore
2016-09-28 21:38:27 +02:00
Leo Antunes
42ec748116 drop patches/manpage_cmd_timeout: fixed upstream 2016-09-28 21:34:43 +02:00
Leo Antunes
4a38db8d9a drop patches/include_limits_h: fixed upstream 2016-09-28 21:33:15 +02:00
Leo Antunes
86381cd502 migrate to dh short notation 2016-09-28 21:27:32 +02:00
Leo Antunes
0b63eacbe6 update homepage url 2016-09-28 19:50:23 +02:00
Leo Antunes
48f78ca518 bump policy to 3.9.8 (no changes) 2016-09-28 19:49:52 +02:00
Leo Antunes
3ad5f21391 Merge tag 'upstream/0.7'
Upstream version 0.7
2016-09-28 19:41:01 +02:00
Leo Costela
fdf599501e Import Debian patch 0.5-3 2016-09-28 19:40:56 +02:00
16 changed files with 342 additions and 0 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.pc

2
debian/README.Debian vendored Normal file
View File

@@ -0,0 +1,2 @@
To enable knockd edit /etc/knockd.conf and /etc/default/knockd first.

135
debian/changelog vendored Normal file
View File

@@ -0,0 +1,135 @@
knockd (0.7-1) unstable; urgency=medium
* [b2567e28] New upstream version 0.7 (closes: #761853)
- adds timeout to pcap_open_live (closes: #816388, #308078)
* [48f78ca5] bump policy to 3.9.8 (no changes)
* [0b63eacb] update homepage url
* [86381cd5] migrate to dh short notation
* [4a38db8d] drop patches/include_limits_h: fixed upstream
* [42ec7481] drop patches/manpage_cmd_timeout: fixed upstream
* [733d82a7] switch to source/format 3.0 (quilt)
* [bfc99c1f] add systemd support (closes: #729663)
* [197eb24d] init: add dependency on $remote_fs
* [848daeab] add hardening flags
* [5c686b87] remove knock client docs from installation
* [805dec71] debian/control: add VCS URL
* [14a9bb3f] add watch file
-- Leo Antunes <costela@debian.org> Sat, 08 Oct 2016 16:05:00 +0200
knockd (0.5-3) unstable; urgency=low
* debian/patches/include_limits_h.patch: add explicit include for
limits.h (closes: #518882)
* debian/control:
- bump policy to 3.8.0 (no changes)
- bump debhelper build-dep to 7
* debian/compat: bump to 7
* debian/copyright: add version to common-licences reference
-- Leo Costela <costela@debian.org> Tue, 10 Mar 2009 00:27:42 +0100
knockd (0.5-2) unstable; urgency=low
* acknoledge NMU (thanks Francesco!)
* debian/patches:
- add manpage_cmd_timeout.patch (closes: #418842) (thanks Bernd Zeimetz)
- add syslog_facility_daemon.patch to log to facility DAEMON
- change default_config.patch to use SysLog by default (closes: #299789)
* debian/logrotate: removed (see above)
* debian/control:
- add Homepage field and correct address (closes:#435568)
- update to policy 3.7.3 (no changes)
- bump dependency on debhelper to >=5
- add build-dep on autotools-dev to update config.{sub,guess}
- remove unused misc:Depends
* debian/compat: bump to 5
* debian/init:
- include LSB session
- overhaul and 'LSB-zation'
- fail to start gracefully, enabling upgrades in case of failure
(closes: #399662)
-- Leo Costela <costela@debian.org> Sun, 09 Dec 2007 01:54:11 +0100
knockd (0.5-1.1) unstable; urgency=high
* NMU
* Fixing wrong SIGCHLD reaper with knockd.patch. It causes a lot of zombies around due to use of a simple wait().
This patch should go upstream, too.
(closes: #373009)
-- Francesco Paolo Lovergine <frankie@debian.org> Tue, 7 Nov 2006 21:16:30 +0100
knockd (0.5-1) unstable; urgency=low
* New upstream release
* Fixed typo in changelog
* Included logrotate script (sorry for the stupid delay) (closes: #299789)
* Changed build system to CDBS
* Changed default permissions of config file to 640 root.root
-- Leo Costela <costela@debian.org> Wed, 06 Jul 2005 17:53:24 -0300
knockd (0.4-1) unstable; urgency=low
* New upstream release
-- Leo Costela <costela@debian.org> Tue, 18 Jan 2005 09:19:20 -0300
knockd (0.3.1-1) unstable; urgency=low
* New upstream release
-- Leo Costela <costela@debian.org> Fri, 17 Sep 2004 10:08:42 -0300
knockd (0.3-2) unstable; urgency=low
* debian/control: add a few infos (closes: #271719)
* debian/init, debian/default: made option handling in default file more
generic (closes: #271718)
* debian/rules: corrected unpatch logic (closes: #271720)
* all of the above are thanks: Javier Fernández-Sanguino Peña
<jfs@computer.org>
* corrected the time zone in the changelog
-- Leo Costela <costela@debian.org> Tue, 14 Sep 2004 17:21:35 -0300
knockd (0.3-1) unstable; urgency=low
* New upstream release
* Corrected config and example files to point to /sbin/iptables (closes: #247519)
* Corrected debian/rules to make propper use of CFLAGS (I could have sworn
it was working here)
* Added an INTERFACE directive to /etc/default/knockd (closes: #248022)
* Changed build-dep from libpcap-dev to libpcap0.8-dev to reflect source
changes
-- Leo Costela <costela@debian.org> Fri, 07 May 2004 17:35:46 -0300
knockd (0.2.1-2) unstable; urgency=low
* Corrected init-script logic and removed extra lines
-- Leo Costela <costela@debian.org> Mon, 26 Apr 2004 08:48:06 -0300
knockd (0.2.1-1) unstable; urgency=low
* New uptream version
* First Debian release (closes: #243838)
-- Leo Costela <costela@debian.org> Thu, 15 Apr 2004 22:52:05 -0300
knockd (0.2-1) unstable; urgency=low
* New upstream version
* Patch incorporated into upstream
-- Leo Costela <costela@debian.org> Thu, 15 Apr 2004 22:52:05 -0300
knockd (0.1-1) unstable; urgency=low
* First Debian package
-- Leo Costela <costela@debian.org> Wed, 14 Apr 2004 22:52:05 -0300

1
debian/compat vendored Normal file
View File

@@ -0,0 +1 @@
7

20
debian/control vendored Normal file
View File

@@ -0,0 +1,20 @@
Source: knockd
Section: net
Priority: optional
Maintainer: Leo Antunes <costela@debian.org>
Build-Depends: debhelper (>= 9.20160709~), autotools-dev, libpcap0.8-dev
Standards-Version: 3.9.8
Homepage: http://www.zeroflux.org/projects/knock
VCS-Git: git://anonscm.debian.org/collab-maint/knockd.git
Package: knockd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate, lsb-base (>= 3.0-6)
Description: small port-knock daemon
A port-knock server that listens to all traffic on a given network
interface (only Ethernet and PPP are currently supported), looking for
a special "knock" sequences of port-hits. A remote system
makes these port-hits by sending a TCP (or UDP) packet to a port on the
server. When the server detects a specific sequence of port-hits, it
runs a command defined in its configuration file. This can be used to
open up holes in a firewall for quick access.

10
debian/copyright vendored Normal file
View File

@@ -0,0 +1,10 @@
This package was originally debianized by Leo Costela <costela@debian.org> on Wed, 14 Apr 2004 22:52:04 +0300.
Original source has been downloaded from
http://www.zeroflux.org/knock/
Copyright:
Copyright (C) 2004 Judd Vinet <jvinet@zeroflux.org>
A copy of the GNU General Public License, version 2, can be found in
/usr/share/common-licenses/GPL-2.

8
debian/default vendored Normal file
View File

@@ -0,0 +1,8 @@
# control if we start knockd at init or not
# 1 = start
# anything else = don't start
# PLEASE EDIT /etc/knockd.conf BEFORE ENABLING
START_KNOCKD=0
# command line options
#KNOCKD_OPTS="-i eth1"

71
debian/knockd.init vendored Normal file
View File

@@ -0,0 +1,71 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: knockd
# Required-Start: $network $syslog $remote_fs
# Required-Stop: $network $syslog $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: port-knock daemon
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/knockd
NAME=knockd
PIDFILE=/var/run/$NAME.pid
DEFAULTS_FILE=/etc/default/knockd
DESC="Port-knock daemon"
OPTIONS=" -d"
umask 0037
test -f $DAEMON || exit 0
set -e
[ -f $DEFAULTS_FILE ] && . $DEFAULTS_FILE
. /lib/lsb/init-functions
[ "$KNOCKD_OPTS" ] && OPTIONS="$OPTIONS $KNOCKD_OPTS"
start_if_configured() {
if [ $START_KNOCKD -ne 1 ]; then
log_warning_msg "$NAME disabled: not starting. To enable it edit $DEFAULTS_FILE"
exit 0
else
log_daemon_msg "Starting $DESC" "$NAME"
if ! START_ERROR=`start-stop-daemon --start --oknodo --quiet --exec $DAEMON -- $OPTIONS 2>&1`; then
# don't fail the upgrade if it fails to start
echo -n " "
log_action_end_msg 1 "$START_ERROR"
exit 0
else
log_end_msg 0
fi
fi
}
case "$1" in
start)
start_if_configured
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
start-stop-daemon --stop --oknodo --quiet --exec $DAEMON
log_end_msg 0
;;
restart|reload|force-reload)
log_daemon_msg "Stopping $DESC" "$NAME"
start-stop-daemon --stop --oknodo --quiet --exec $DAEMON
log_end_msg 0
sleep 1
start_if_configured
;;
*)
log_warning_msg "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
exit 1
;;
esac
exit 0

13
debian/knockd.service vendored Normal file
View File

@@ -0,0 +1,13 @@
[Unit]
Description=Port-Knock Daemon
After=network.target
Documentation=man:knockd(1)
[Service]
EnvironmentFile=-/etc/default/knockd
ExecStart=/usr/sbin/knockd $KNOCKD_OPTS
ExecReload=/bin/kill -HUP $MAINPID
KillMode=mixed
SuccessExitStatus=0 2 15
ProtectSystem=full
CapabilityBoundingSet=CAP_NET_RAW CAP_NET_ADMIN

21
debian/patches/default_config.patch vendored Normal file
View File

@@ -0,0 +1,21 @@
--- knockd-0.5/knockd.conf 2004-05-07 00:56:03.000000000 +0200
+++ knockd-0.5.new/knockd.conf 2007-12-09 20:50:39.000000000 +0100
@@ -1,15 +1,15 @@
[options]
- logfile = /var/log/knockd.log
+ UseSyslog
[openSSH]
sequence = 7000,8000,9000
seq_timeout = 5
- command = /usr/sbin/iptables -A INPUT -s %IP% -p tcp --dport 22 -j ACCEPT
+ command = /sbin/iptables -A INPUT -s %IP% -p tcp --dport 22 -j ACCEPT
tcpflags = syn
[closeSSH]
sequence = 9000,8000,7000
seq_timeout = 5
- command = /usr/sbin/iptables -D INPUT -s %IP% -p tcp --dport 22 -j ACCEPT
+ command = /sbin/iptables -D INPUT -s %IP% -p tcp --dport 22 -j ACCEPT
tcpflags = syn

16
debian/patches/reap_child_procs.patch vendored Normal file
View File

@@ -0,0 +1,16 @@
Index: repo/src/knockd.c
===================================================================
--- repo.orig/src/knockd.c 2016-09-28 21:42:58.417421069 +0200
+++ repo/src/knockd.c 2016-09-28 21:42:58.413421096 +0200
@@ -366,8 +366,9 @@
void child_exit(int signum)
{
- /* child wants to exit, let em die */
- wait(NULL);
+ int status;
+
+ while ( waitpid( (pid_t)-1, &status, WNOHANG ) > 0 ) continue;
return;
}

3
debian/patches/series vendored Normal file
View File

@@ -0,0 +1,3 @@
default_config.patch
reap_child_procs.patch
syslog_facility_daemon.patch

View File

@@ -0,0 +1,13 @@
Index: repo/src/knockd.c
===================================================================
--- repo.orig/src/knockd.c 2016-09-28 21:43:16.741293903 +0200
+++ repo/src/knockd.c 2016-09-28 21:43:16.741293903 +0200
@@ -195,7 +195,7 @@
strncpy(o_int, "eth0", sizeof(o_int)); /* no explicit termination needed */
}
if(o_usesyslog) {
- openlog("knockd", 0, LOG_USER);
+ openlog("knockd", 0, LOG_DAEMON);
}
if(strlen(o_logfile)) {
/* open the log file */

24
debian/rules vendored Executable file
View File

@@ -0,0 +1,24 @@
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed,--no-undefined,--no-add-needed
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
%:
dh $@ --with autotools-dev --with systemd
override_dh_install:
dh_install
# original installation has duplicate docs for knock and knockd
rm -rf debian/knockd/usr/share/doc/knock
# the standard config is unsafe
override_dh_systemd_enable:
dh_systemd_enable --no-enable
override_dh_systemd_start:
dh_systemd_start --no-start
override_dh_installinit:
dh_installinit --no-start

1
debian/source/format vendored Normal file
View File

@@ -0,0 +1 @@
3.0 (quilt)

3
debian/watch vendored Normal file
View File

@@ -0,0 +1,3 @@
version=4
http://www.zeroflux.org/proj/knock/ files/knock@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate