From 33cdc183d939000993b3a53e3fad77c2c030e490 Mon Sep 17 00:00:00 2001 From: Daniel Adolfsson Date: Mon, 10 Oct 2011 14:44:42 +0200 Subject: [PATCH] Clean up debian packaging --- debian/control | 14 ++-- debian/copyright | 59 ++++++--------- debian/docs | 3 +- debian/init.d | 184 ++++++++++++++++++++--------------------------- debian/rules | 12 ---- 5 files changed, 108 insertions(+), 164 deletions(-) diff --git a/debian/control b/debian/control index e173a1d..7eb21e0 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,18 @@ Source: ndppd -Section: unknown +Section: net Priority: extra Maintainer: Daniel Adolfsson Build-Depends: debhelper (>= 7.0.50~), libconfuse-dev (>= 2.7) Standards-Version: 3.8.4 Homepage: http://www.tuhox.com/ndppd Vcs-Git: git://github.com/Tuhox/ndppd.git -Vcs-Browser: https://github.com/Tuhox/ndppd +Vcs-Browser: https://github.com/Tuhox/ndppd/tree/debian Package: ndppd -Architecture: amd64 i386 +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: NDP Proxy Daemon - ndppd, or 'NDP Proxy Daemon', is a daemon that proxies NDP (Neighbor Discovery Protocol) - messages between interfaces. +Description: daemon that proxies IPv6 NDP messages + ndppd is a daemon that proxies certain IPv6 NDP messages between two or + more interfaces. It currently supports proxying Neighbor Solicitation + Messages and Neighbor Advertisement messages in order to allow IPv6 + routing without relying on linux "proxy_ndp". diff --git a/debian/copyright b/debian/copyright index dc7d035..75bb644 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,39 +1,22 @@ -This work was packaged for Debian by: +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: ndppd +Source: https://github.com/Tuhox/ndppd - Daniel Adolfsson on Sun, 18 Sep 2011 12:59:13 +0200 - -It was downloaded from: - - http://www.tuhox.com/ndppd - -Upstream Author(s): - - Daniel Adolfsson - -Copyright: - - Copyright (C) 2011 Daniel Adolfsson - -License: - - This program 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 3 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 program. If not, see . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - -The Debian packaging is: - - Copyright (C) 2011 Daniel Adolfsson - -and is licensed under the GPL version 3, see above. +Files: * +Copyright: 2011, Daniel Adolfsson +License: GPL-3+ + This program 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 3 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 program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/docs b/debian/docs index e872f0d..cc8ee7a 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,3 @@ README -ndppd.conf.example +ndppd.conf-dist + diff --git a/debian/init.d b/debian/init.d index f11b31d..e8f4e23 100644 --- a/debian/init.d +++ b/debian/init.d @@ -6,19 +6,18 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: NDP Proxy Daemon -# Description: nppd, or 'NDP Proxy Daemon', is a daemon that proxies NDP +# Description: nppd, or NDP Proxy Daemon, is a daemon that proxies NDP # (Neighbor Discovery Protocol) messages between interfaces. ### END INIT INFO # Author: Daniel Adolfsson -# PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=ndppd # Introduce a short description here -NAME=ndppd # Introduce the short server's name here -DAEMON=/usr/sbin/ndppd # Introduce the server's location here +DESC=ndppd +NAME=ndppd +DAEMON=/usr/sbin/ndppd PIDFILE=/var/run/$NAME.pid -DAEMON_ARGS="-d -p $PIDFILE" # Arguments to run the daemon with +DAEMON_ARGS="-d -p $PIDFILE" SCRIPTNAME=/etc/init.d/$NAME # Exit if the package is not installed @@ -30,8 +29,6 @@ SCRIPTNAME=/etc/init.d/$NAME # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. . /lib/lsb/init-functions # @@ -39,18 +36,14 @@ SCRIPTNAME=/etc/init.d/$NAME # do_start() { - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS || return 2 } # @@ -58,96 +51,73 @@ do_start() # do_stop() { - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" } case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; esac -: +exit 0 diff --git a/debian/rules b/debian/rules index a338e5e..4067ba0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -#override_dh_auto_build: -# dh_auto_build -- PREFIX=$(DESTDIR)/build %: dh $@