Merge branch 'master' into debian-wheezy
authorDimitris Aragiorgis <dimara@grnet.gr>
Tue, 18 Feb 2014 13:19:03 +0000 (15:19 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Tue, 18 Feb 2014 13:19:03 +0000 (15:19 +0200)
14 files changed:
debian/README [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/gbp.conf [new file with mode: 0644]
debian/nfdhcpd.default [new file with mode: 0644]
debian/nfdhcpd.dirs [new file with mode: 0644]
debian/nfdhcpd.init [new file with mode: 0644]
debian/nfdhcpd.install [new file with mode: 0644]
debian/postinst [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]

diff --git a/debian/README b/debian/README
new file mode 100644 (file)
index 0000000..081062b
--- /dev/null
@@ -0,0 +1,6 @@
+The Debian Package nfdhcp
+----------------------------
+
+Comments regarding the Package
+
+ -- Apollon Oikonomopoulos <apoikos@gmail.com>  Mon, 15 Nov 2010 12:42:53 +0200
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..3312c91
--- /dev/null
@@ -0,0 +1,101 @@
+nfdhcpd (0.12.1-1~wheezy) wheezy; urgency=low
+
+  * Provide DNS Search List in DHCH6_Reply
+
+ -- Dimitris Aragiorgis <dimara@grnet.gr>  Thu, 06 Feb 2014 17:52:34 +0200
+
+nfdhcpd (0.12.0-1~wheezy) wheezy; urgency=low
+
+  * Support stateless IPv6 autoconfiguration with DHCPv6 for DNS info
+
+ -- Dimitris Aragiorgis <dimara@grnet.gr>  Fri, 17 Jan 2014 19:57:02 +0200
+
+nfdhcpd (0.11.8-1~wheezy) wheezy; urgency=low
+
+  * Support binding files without IP entry
+
+ -- Dimitris Aragiorgis <dimara@grnet.gr>  Mon, 16 Dec 2013 11:17:04 +0200
+
+nfdhcpd (0.11.7-1~wheezy) wheezy; urgency=low
+
+  * New upstream version
+  * Changed nfqueue-bindings-python dependency to python-nfqueue
+
+ -- Dimitris Aragiorgis <dimara@grnet.gr>  Wed, 02 Oct 2013 18:13:32 +0300
+
+nfdhcpd (0.11.6-1~wheezy) wheezy; urgency=low
+
+  * New upstream version
+
+ -- Christos Stavrakakis <cstavr@grnet.gr>  Fri, 30 Aug 2013 17:30:48 +0300
+
+nfdhcpd (0.11.5-2) squeeze; urgency=low
+
+  * Fix two critical bugs (blocking send/capng_update()) and add logging
+
+ -- Dimitris Aragiorgis <dimara@grnet.gr>  Fri, 30 Aug 2013 14:18:54 +0300
+
+nfdhcpd (0.11.0-1) stable; urgency=low
+
+  * Refactor nfdhcpd to support extended binding files and bridged clients
+
+ -- Dimitris Aragiorgis <dimara@grnet.gr>  Tue, 03 Jul 2012 16:41:23 +0300
+
+nfdhcpd (0.6+nmu2) unstable; urgency=low
+
+  * Patches from Vangelis Koukis for pidfile permissions
+
+ -- Costas Drogos <costasd@noc.grnet.gr>  Tue, 03 Apr 2012 16:41:23 +0300
+
+nfdhcpd (0.6+nmu1) unstable; urgency=low
+
+  * Support for serving domain
+  * Fixed a typo
+
+ -- Costas Drogos <costasd@noc.grnet.gr>  Mon, 02 Apr 2012 10:40:08 +0300
+
+nfdhcpd (0.6) unstable; urgency=low
+
+  * Add mac2eui64 utility
+
+ -- Apollon Oikonomopoulos <apollon@noc.grnet.gr>  Wed, 22 Jun 2011 17:06:07 +0300
+
+nfdhcpd (0.5) unstable; urgency=low
+
+  * Enable logging of unhandled exceptions
+  * Do not send periodic RAs on IPv6-less interfaces
+  * Ignore requests on unknown interfaces
+
+ -- Apollon Oikonomopoulos <apollon@noc.grnet.gr>  Wed, 22 Jun 2011 16:08:29 +0300
+
+nfdhcpd (0.4) unstable; urgency=low
+
+  * Ignore IPv6 link-local subnets
+  * Handle invalid binding files in a more robust way 
+
+ -- Apollon Oikonomopoulos <apollon@noc.grnet.gr>  Mon, 28 Mar 2011 12:58:20 +0300
+
+nfdhcpd (0.3) unstable; urgency=low
+
+  * New version
+  * Improved error handling
+  * Refactored code for improved performance 
+
+ -- Apollon Oikonomopoulos <apollon@noc.grnet.gr>  Fri, 11 Mar 2011 14:29:41 +0200
+
+nfdhcpd (0.2) unstable; urgency=low
+
+  * Various improvements, including configuration file support and RDNSS support 
+
+ -- Apollon Oikonomopoulos <apollon@noc.grnet.gr>  Fri, 03 Dec 2010 16:20:17 +0200
+
+nfdhcpd (0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Apollon Oikonomopoulos <apollon@noc.grnet.gr>  Mon, 15 Nov 2010 12:42:53 +0200
+
+
+
+
+
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..b58892b
--- /dev/null
@@ -0,0 +1,19 @@
+Source: nfdhcpd
+Section: net
+Priority: extra
+Maintainer: Dimitris Aragiorgis <dimara@grnet.gr>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.9.1
+
+Package: nfdhcpd
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-scapy(>= 2.0.1-1),
+         python-daemon(>=1.5.2-1), python-pyinotify(>=0.7.1-1),
+         python-ipy(>=1:0.62-1), python-nfqueue(> 0.4-3),
+         python-cap-ng(>=0.6.0-1), python(>=2.4), python-configobj(>= 4.5.2-1),
+         python-setproctitle
+Suggests: ferm
+Description: A small DHCP/NDP proxy for virtual machines
+ nfdhcpd is a small DHCP/NDP/RA proxy for virtual machines. Its intended use is
+ to provide network configuration for routed (not bridged) VM instances. It
+ supports DHCP, IPv6 NDP proxy and ICMPv6 RA RDNSS (RFC 5006).
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..777a3df
--- /dev/null
@@ -0,0 +1,32 @@
+This package was debianized by Apollon Oikonomopoulos <apoikos@gmail.com> on
+Mon, 15 Nov 2010 12:42:53 +0200.
+
+Upstream Author(s):
+
+    Apollon Oikonomopoulos <apollon@noc.grnet.gr>
+
+Copyright:
+
+    Copyright (C) 2010 GRNET SA
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2010, Apollon Oikonomopoulos <apoikos@gmail.com> and
+is licensed under the GPL, see above.
diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..3715fb4
--- /dev/null
@@ -0,0 +1,7 @@
+[DEFAULT]
+sign-tags = False
+pristine-tar = False
+
+[git-buildpackage]
+export-dir = ../build-area/
+tarball-dir = ../tarballs/
diff --git a/debian/nfdhcpd.default b/debian/nfdhcpd.default
new file mode 100644 (file)
index 0000000..67a5272
--- /dev/null
@@ -0,0 +1,12 @@
+# Defaults for nfdhcpd initscript
+# sourced by /etc/init.d/nfdhcpd
+# installed at /etc/default/nfdhcpd by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+RUN="yes"
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS="--debug"
diff --git a/debian/nfdhcpd.dirs b/debian/nfdhcpd.dirs
new file mode 100644 (file)
index 0000000..bbcd269
--- /dev/null
@@ -0,0 +1,2 @@
+var/log/nfdhcpd
+var/lib/nfdhcpd
diff --git a/debian/nfdhcpd.init b/debian/nfdhcpd.init
new file mode 100644 (file)
index 0000000..8df06a4
--- /dev/null
@@ -0,0 +1,234 @@
+#!/bin/sh
+#
+# This is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2,
+# or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License with
+# the Debian operating system, in /usr/share/common-licenses/GPL;  if
+# not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+#
+### BEGIN INIT INFO
+# Provides:          nfdhcpd
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $remote_fs
+# Should-Start:
+# Should-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: NFQueue DHCP/RA server
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/sbin/nfdhcpd
+NAME=nfdhcpd
+DESC="NFQUEUE-based DHCP/RA server" 
+LOGDIR=/var/log/nfdhcpd
+
+PIDFILE=/var/run/$NAME/$NAME.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+# Default options, these can be overriden by the information
+# at /etc/default/$NAME
+DAEMON_OPTS=""          # Additional options given to the server
+
+DIETIME=2              # Time to wait for the server to die, in seconds
+                        # If this value is set too low you might not
+                        # let some servers to die gracefully and
+                        # 'restart' will not work
+
+STARTTIME=1             # Time to wait for the server to start, in seconds
+                        # If this value is set each time the server is
+                        # started (on start or restart) the script will
+                        # stall to try to determine if it is running
+                        # If it is not set and the server takes time
+                        # to setup a pid file the log message might 
+                        # be a false positive (says it did not start
+                        # when it actually did)
+                        
+LOGFILE=$LOGDIR/$NAME.log  # Server logfile
+#DAEMON_USER=nfdhcp     # Users to run the daemons as. If this value
+                        # is set start-stop-daemon will chuid the server
+
+# Include defaults if available
+if [ -f /etc/default/$NAME ] ; then
+       . /etc/default/$NAME
+fi
+
+# Use this if you want the user to explicitly set 'RUN' in
+# /etc/default/
+if [ "x$RUN" != "xyes" ] ; then
+  log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
+  log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
+  exit 1
+fi
+
+# Check that the user exists (if we set a user)
+# Does the user exist?
+set -e
+
+running_pid() {
+  # Check if a given process pid's cmdline matches a given name
+  pid=$1
+  name=$2
+  [ -z "$pid" ] && return 1
+  [ ! -d /proc/$pid ] &&  return 1
+  cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+  # Is this the expected server
+  [ "$cmd" != "$name" ] &&  return 1
+  return 0
+}
+
+running() {
+  # Check if the process is running looking at /proc
+  # (works for all users)
+  # No pidfile, probably no daemon present
+  [ ! -f "$PIDFILE" ] && return 1
+  pid=`cat $PIDFILE`
+  running_pid $pid $DAEMON || return 1
+  return 0
+}
+
+start_server() {
+  # /var/run may be volatile, so we need to ensure that
+  # /var/run/$NAME exists here as well as in postinst
+  if [ ! -d /var/run/$NAME ]; then
+     mkdir /var/run/$NAME || return 1
+     chown nobody:nogroup /var/run/$NAME || return 1
+  fi
+  start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \
+                    --exec $DAEMON -- $DAEMON_OPTS
+       errcode=$?
+       return $errcode
+}
+
+stop_server() {
+  start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+  errcode=$?
+  return $errcode
+}
+
+reload_server() {
+  [ ! -f "$PIDFILE" ] && return 1
+  pid=pidofproc $PIDFILE # This is the daemon's pid
+  # Send a SIGHUP
+  kill -1 $pid
+  return $?
+}
+
+force_stop() {
+# Force the process to die killing it manually
+  [ ! -e "$PIDFILE" ] && return
+  if running ; then
+    kill -15 $pid
+    # Is it really dead?
+    sleep "$DIETIME"s
+    if running ; then
+      kill -9 $pid
+      sleep "$DIETIME"s
+      if running ; then
+        echo "Cannot kill $NAME (pid=$pid)!"
+        exit 1
+      fi
+    fi
+  fi
+}
+
+
+case "$1" in
+  start)
+       log_daemon_msg "Starting $DESC " "$NAME"
+        # Check if it's running first
+        if running ;  then
+            log_progress_msg "apparently already running"
+            log_end_msg 0
+            exit 0
+        fi
+        if start_server ; then
+            # NOTE: Some servers might die some time after they start,
+            # this code will detect this issue if STARTTIME is set
+            # to a reasonable value
+            [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+            if  running ;  then
+                # It's ok, the server started and is running
+                log_end_msg 0
+            else
+                # It is not running after we did start
+                log_end_msg 1
+            fi
+        else
+            # Either we could not start it
+            log_end_msg 1
+        fi
+       ;;
+  stop)
+        log_daemon_msg "Stopping $DESC" "$NAME"
+        if running ; then
+            # Only stop the server if we see it running
+                             errcode=0
+            stop_server || errcode=$?
+            log_end_msg $errcode
+        else
+            # If it's not running don't do anything
+            log_progress_msg "apparently not running"
+            log_end_msg 0
+            exit 0
+        fi
+        ;;
+  force-stop)
+        # First try to stop gracefully the program
+        $0 stop
+        if running; then
+            # If it's still running try to kill it more forcefully
+            log_daemon_msg "Stopping (force) $DESC" "$NAME"
+                             errcode=0
+            force_stop || errcode=$?
+            log_end_msg $errcode
+        fi
+       ;;
+  restart|force-reload)
+        log_daemon_msg "Restarting $DESC" "$NAME"
+               errcode=0
+        stop_server || errcode=$?
+        # Wait some sensible amount, some server need this
+        [ -n "$DIETIME" ] && sleep $DIETIME
+        start_server || errcode=$?
+        [ -n "$STARTTIME" ] && sleep $STARTTIME
+        running || errcode=$?
+        log_end_msg $errcode
+       ;;
+  status)
+
+        log_daemon_msg "Checking status of $DESC" "$NAME"
+        if running ;  then
+            log_progress_msg "running"
+            log_end_msg 0
+        else
+            log_progress_msg "apparently not running"
+            log_end_msg 1
+            exit 1
+        fi
+        ;;
+  reload)
+        log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+        log_warning_msg "cannot re-read the config file (use restart)."
+       ;;
+  *)
+       N=/etc/init.d/$NAME
+       echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+       exit 1
+       ;;
+esac
+
+exit 0
diff --git a/debian/nfdhcpd.install b/debian/nfdhcpd.install
new file mode 100644 (file)
index 0000000..d3c4fec
--- /dev/null
@@ -0,0 +1,4 @@
+nfdhcpd usr/sbin/
+nfdhcpd.ferm etc/ferm/
+nfdhcpd.conf etc/nfdhcpd/
+nfdhcpd.logrotate etc/logrotate.d/
diff --git a/debian/postinst b/debian/postinst
new file mode 100644 (file)
index 0000000..e981a43
--- /dev/null
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postinst script for nfdhcp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    chown nobody /var/log/nfdhcpd
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..b8796e6
--- /dev/null
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+%:
+       dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)