From e1afe273728490fdebbed5a7e4e169f7303c259c Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Jun 2008 17:21:23 -0600 Subject: [PATCH] Imported Debian version 1.1.7 --- debian/changelog | 169 ++++++++++++++++++++++++----------------------- debian/compat | 1 + debian/conffiles | 3 - debian/control | 2 +- debian/init.d | 9 ++- debian/rules | 20 ++---- 6 files changed, 101 insertions(+), 103 deletions(-) create mode 100644 debian/compat delete mode 100644 debian/conffiles diff --git a/debian/changelog b/debian/changelog index d76da85..42f9a72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ipip (1.1.7) unstable; urgency=low + + * add LSB formatted dependency info in init.d script, thanks Petter! + closes: #460055 + * update packaging to reflect over 5 years of Debian policy changes... + + -- Bdale Garbee Thu, 10 Jan 2008 09:26:58 -0700 + ipip (1.1.6) unstable; urgency=low * rebuild to reflect policy changes noted by lintian @@ -58,89 +66,82 @@ ipip (1.0-1) unstable; urgency=low * initial ipip package for Debian * significant cleanup since last pre-Debian release in 1995 + * retain pre-Debian history for posterity: + * + * 0.0.12.bdale.4 + * add code to log pid at invocation, so that log rotation can + * easily include a daemon restart + * + * 0.0.12.bdale.3.3 + * ugly hack to turn off connectivity to all but net-44 if + * AMPRONLY is defined. + * + * 0.0.12.bdale.3.2 + * seems to work fine now on BSDI BSD/386. a couple of tweaks + * to fix crashes lead to the '.2' + * + * 0.0.12.bdale.3 + * working on switching to use of syslog() for error/warning + * outputs. shorten the version string to just be my suffix. + * + * 0.0.12.bdale.2 + * fixed a bunch of BSDI'isms... including modem control on a + * serial port during open. At this point, it routes on the IP + * side just fine, but the slip link still doesn't quite work... + * + * 0.0.12.bdale.1 + * remove a reference to malloc.h in slip.c when compiled under + * BSDI's BSD/386 + * + * 0.0.12.bdale.0 + * disabled the code that prevents packets from going back out + * the same interface. need to use same interface to bounce + * frames to/from other HP closed subnet hosts using my open + * subnet machine as a router... this if BDALE defined. + * + * 0.0.12 added an fflush(stdout) to the run loop. Nice to be able + * to see what trace is putting out! + * + * 0.0.11 progname prefix on messages is optional now; use the "-np" + * (noprefix) flag to turn it off. + * There are time-stamp on certain messages now; the "-nt" + * (notimestamp) flag turns off timestamps on the stats lines. + * The stats are a single line per interface now. + * Moved the NO_STRTOUL ugliness to the ipip.h file. The default + * is to try for strtoul unless the symbol "sun" is defined. + * Fixed zero-length packets from the slip interface problem. + * + * 0.0.10 added the statistics reporting stuff. + * + * 0.0.9 added a very basic martian filter in hopes of catching + * very obvious network problems. Added debug output while + * opening the interfaces. + * + * 0.0.8 fixed the network mask comparison -- gotta make sure we + * convert the mask to network byte order! + * + * 0.0.7 command line is handled better; -d and -t options separated. + * Support for SIGTERM and SIGINT -- print a message upon + * catching these. Re-wrote the Makefile. + * + * 0.0.6 Improved and generalized the error handling code for the + * drivers, and ensured all messages are preceeded by the + * program name (nice when running in the background!) + * + * 0.0.5 Make sure we can deal with the EINTR error code (so we can + * handle a SIGHUP). + * + * 0.0.4 linted, added flag so that we can handle multiple slip + * packets in a single burst. + * + * 0.0.3 Rewrite the config and route readers. Better error handling + * and more flexible. + * + * 0.0.2 Move the routines to open, read, send on an interface into + * the interface structure. This simplifies many loops. + * + * 0.0.1 Initial sort of functional version. (sent to bdale@gag.com) + * + * 0.0.0 Development begins (4 Dec 91) -- Bdale Garbee Wed, 21 Jan 1998 11:16:45 -0700 - - - Pre-Debian History: - - 0.0.12.bdale.4 - add code to log pid at invocation, so that log rotation can - easily include a daemon restart - - 0.0.12.bdale.3.3 - ugly hack to turn off connectivity to all but net-44 if - AMPRONLY is defined. - - 0.0.12.bdale.3.2 - seems to work fine now on BSDI BSD/386. a couple of tweaks - to fix crashes lead to the '.2' - - 0.0.12.bdale.3 - working on switching to use of syslog() for error/warning - outputs. shorten the version string to just be my suffix. - - 0.0.12.bdale.2 - fixed a bunch of BSDI'isms... including modem control on a - serial port during open. At this point, it routes on the IP - side just fine, but the slip link still doesn't quite work... - - 0.0.12.bdale.1 - remove a reference to malloc.h in slip.c when compiled under - BSDI's BSD/386 - - 0.0.12.bdale.0 - disabled the code that prevents packets from going back out - the same interface. need to use same interface to bounce - frames to/from other HP closed subnet hosts using my open - subnet machine as a router... this if BDALE defined. - - 0.0.12 added an fflush(stdout) to the run loop. Nice to be able - to see what trace is putting out! - - 0.0.11 progname prefix on messages is optional now; use the "-np" - (noprefix) flag to turn it off. - There are time-stamp on certain messages now; the "-nt" - (notimestamp) flag turns off timestamps on the stats lines. - The stats are a single line per interface now. - Moved the NO_STRTOUL ugliness to the ipip.h file. The default - is to try for strtoul unless the symbol "sun" is defined. - Fixed zero-length packets from the slip interface problem. - - 0.0.10 added the statistics reporting stuff. - - 0.0.9 added a very basic martian filter in hopes of catching - very obvious network problems. Added debug output while - opening the interfaces. - - 0.0.8 fixed the network mask comparison -- gotta make sure we - convert the mask to network byte order! - - 0.0.7 command line is handled better; -d and -t options separated. - Support for SIGTERM and SIGINT -- print a message upon - catching these. Re-wrote the Makefile. - - 0.0.6 Improved and generalized the error handling code for the - drivers, and ensured all messages are preceeded by the - program name (nice when running in the background!) - - 0.0.5 Make sure we can deal with the EINTR error code (so we can - handle a SIGHUP). - - 0.0.4 linted, added flag so that we can handle multiple slip - packets in a single burst. - - 0.0.3 Rewrite the config and route readers. Better error handling - and more flexible. - - 0.0.2 Move the routines to open, read, send on an interface into - the interface structure. This simplifies many loops. - - 0.0.1 Initial sort of functional version. (sent to bdale@gag.com) - - 0.0.0 Development begins (4 Dec 91) - - -Local variables: -mode: debian-changelog -End: diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index 94de143..0000000 --- a/debian/conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/init.d/ipip -/etc/ipip/config -/etc/ipip/routes diff --git a/debian/control b/debian/control index 40e552f..fe08223 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: extra Maintainer: Bdale Garbee Build-Depends: debhelper -Standards-Version: 3.5.8.0 +Standards-Version: 3.7.3 Package: ipip Architecture: any diff --git a/debian/init.d b/debian/init.d index 399bae3..13e811a 100644 --- a/debian/init.d +++ b/debian/init.d @@ -1,5 +1,12 @@ #! /bin/sh -# +### BEGIN INIT INFO +# Provides: ipip +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: Start and stop IP over IP encapsulation daemon +### END INIT INFO PATH=/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/usr/sbin/ipip diff --git a/debian/rules b/debian/rules index ebfcde6..f8b8e73 100755 --- a/debian/rules +++ b/debian/rules @@ -2,24 +2,19 @@ # rules file for the ipip package, requires debhelper # copyright 1998 by Bdale Garbee, distributed under the terms of the GPL -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 build: build-stamp build-stamp: dh_testdir - $(MAKE) - touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp - - -$(MAKE) clean - + $(MAKE) clean dh_clean # Build architecture-independent files here. @@ -27,23 +22,21 @@ binary-indep: build # Build architecture-dependent files here. binary-arch: build -# dh_testversion dh_testdir dh_testroot dh_clean -k dh_installdirs - cp ipip debian/tmp/usr/sbin - cp debian/ipip.config debian/tmp/etc/ipip/config - cp debian/ipip.routes debian/tmp/etc/ipip/routes + cp ipip debian/ipip/usr/sbin + cp debian/ipip.config debian/ipip/etc/ipip/config + cp debian/ipip.routes debian/ipip/etc/ipip/routes dh_installdocs dh_installexamples samples/* dh_installmenu dh_installinit dh_installcron - dh_installmanpages -# dh_undocumented + dh_installman ipip.1 dh_installchangelogs dh_strip dh_compress @@ -51,7 +44,6 @@ binary-arch: build dh_installdeb dh_shlibdeps dh_gencontrol -# dh_makeshlibs dh_md5sums dh_builddeb -- 2.30.2