diff -Nru xinetd-2.3.14/debian/bzr-builder.manifest xinetd-2.3.14/debian/bzr-builder.manifest --- xinetd-2.3.14/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ xinetd-2.3.14/debian/bzr-builder.manifest 2011-01-19 12:09:49.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version 1:2.3.14-7ubuntu4 +lp:~brightbox/ubuntu/lucid/xinetd/natty-backport revid:kees@outflux.net-20101206210703-ly1gsaeczyst3mcb diff -Nru xinetd-2.3.14/debian/changelog xinetd-2.3.14/debian/changelog --- xinetd-2.3.14/debian/changelog 2011-01-19 12:53:29.000000000 +0000 +++ xinetd-2.3.14/debian/changelog 2011-01-19 12:09:49.000000000 +0000 @@ -1,3 +1,15 @@ +xinetd (1:2.3.14-7ubuntu4~maverick1) natty; urgency=low + + * Auto build. + + -- Neil Wilson Wed, 19 Jan 2011 12:09:49 +0000 + +xinetd (1:2.3.14-7ubuntu4) natty; urgency=low + + * add xinetd upstart job (LP: #43574) + + -- Scott Moser Tue, 13 Jul 2010 09:24:49 -0400 + xinetd (1:2.3.14-7ubuntu3) lucid; urgency=low * rebuild rest of main for armel armv7/thumb2 optimization; @@ -277,369 +289,3 @@ -- Thomas Seyrat Sun, 28 Jul 2002 16:51:39 +0200 -xinetd (1:2.3.4-2) unstable; urgency=high - - * The "aarrgghh, why can't upstream test their release?" release - * Three small address parsing fixes -- these are being punted upstream... - xinetd/addr.c:explicit_addr: Set /32 to still be a masked addr - closes: #144672 - xinetd/addr.c:factorized_addr: Restart the parse at the right point - after the syntax check pass. - closes: #141453 - xinetd/addr.c:addrlist_match: Altered the "mask" check to remember to - apply the mask to /both/ halves of the - expression - closes: #145704 - * Small change since I forgot to read the changelog carefully enough... - debian/init: Send HUP to reload config - - -- Daniel Silverstone Fri, 3 May 2002 21:47:35 +0100 - -xinetd (1:2.3.4-1.1) unstable; urgency=low - - * Non-maintainer upload. - * Update config.guess and config.sub (closes: #141653). - - -- Colin Watson Sun, 7 Apr 2002 23:51:53 +0100 - -xinetd (1:2.3.4-1) unstable; urgency=low - - * New upstream version: - Lots and lots. Unsure exactly which bugs - in the debian bts it closes -- I'll need to look - more closely - * Give configure the --with-loadavg parameter. closes: #140619 - - -- Daniel Silverstone Thu, 4 Apr 2002 23:53:54 +0100 - -xinetd (1:2.3.3-4) unstable; urgency=low - - * Corrected reload issue in /etc/init.d/xinetd by making reload - and force-reload the same signal. (follows from removal of - soft reload in 2.3.1) closes: #127676 - - -- Daniel Silverstone Sun, 6 Jan 2002 17:25:45 +0000 - -xinetd (1:2.3.3-3) unstable; urgency=low - - * Integrated fixes to pt_BR template. closes: #120846 - * Integrated fixes to de template - (thanks to Stephan Baeckert of Pyramid Computer GmBH) - * Fixed implicit declaration of malloc() -- This sorts out an ia64 - issue and therefore closes: #124399 - * Fixed spelling mistake in control file (raised by mdz) closes: #125544 - - -- Daniel Silverstone Tue, 18 Dec 2001 08:38:04 +0000 - -xinetd (1:2.3.3-2) unstable; urgency=low - - * Re-introduced debconf independance at the cost - of needing a lintian override. - * Cleared an issue with building on potato WRT pod2man - - -- Daniel Silverstone Tue, 25 Sep 2001 18:52:58 +0100 - -xinetd (1:2.3.3-1) unstable; urgency=high - - * New upstream version - Changes of particular interest include: - o 2.3.1 - Applied Solar Designer's AUDIT patches - - Removed soft-reconfigure. reload is always hard. - o 2.3.2 - Fix a heap overrun issue. - o 2.3.3 - RPC parser works again. - * New Maintainer - * Fixed issue where xinetd.conf stomped on your configs by - making a backup somehow. closes: #110596 - * Removed support for systems without debconf. This introduces - a dependency on debconf - sorry. closes: #90008 - * Introduced a build dependency on perl-doc in order to build the - manpage for xconv.pl - * Provided POD documentation for xconv.pl - * Corrected a dodgy comment in xconv.pl closes: #108754, #108751 - * Included brazilian debconf template translations courtesy of - Andre Luis Lopes closes: #108548 - - -- Daniel Silverstone Fri, 31 Aug 2001 14:49:57 +0100 - -xinetd (1:2.3.0-1) unstable; urgency=high - - * New upstream version (with a sane number, whee!). - * Included the German translation to the templates, closes: #95505. - * Use -reuse by default in the init script, closes: #97732. - * Includes the security fixes that wiggy applied to the stable version, - closes: #101201. - * Now recommends the proper syslogd virtual package, closes: #101629. - * Included the Spanish translation to the templates, closes: #103166. - * Polishing in the packaging. - * Orphaning the package. - - -- Josip Rodin Sun, 15 Jul 2001 02:55:56 +0200 - -xinetd (1:2.1.8.8.p3-2) unstable; urgency=low - - * Added -x checks around lines that kill inetd, portmap, and xinetd init - script, because it can happen that those programs aren't there, - closes: #74759. - * Updated the template message about inetd.conf->xinetd.conf conversion, - closes: #78622. - * Standards-Version: 3.5.2: added DEB_BUILD_OPTIONS handling. - * Added version 2.0.54 to debhelper build-dependency because that's when - dh_installdebconf was introduced. - * Added logrotate among the recommended packages. - - -- Josip Rodin Sat, 17 Mar 2001 16:52:20 +0100 - -xinetd (1:2.1.8.8.p3-1) frozen unstable; urgency=low - - * New upstream version, which includes just a few bugfixes, most of them - that aren't even related to Linux, but there is one which is rather - important: - Fixed a bug in the access lists. If you specified a host by - name in only_from, any connection from a host without - a reverse dns entry would be accepted. - This means that security policies (e.g. denial of access) for such hosts - wouldn't be enforced, which is a very ugly security problem, - closes: #65757. - * Added a clear warning to the postrm in the case when you don't have - an init script for the original inetd anymore, saying you may need - to reinstall netbase package to fix it. As this may happen due to - severe breakage in an old xinetd package, it needs to be said, - closes: #60836. - * Clarified convert-inetd-conf template text to explicitely say that the - config file will get overwritten on every upgrade if you say "Yes" to - the question, and add two lines in postinst to explain how to make it - not regenerate anymore. - * Synced portmapper check with inetd's init script and enhanced the regexp - match to catch " # foo" comments, otherwise it may produce false warning. - * Moved the message about terminating all services to prerm, where it's - actually being done. - * Made update-rc.d run only on initial installs. - * Added debhelper to Build-Depends: and shortened the long description. - - -- Josip Rodin Fri, 16 Jun 2000 20:13:03 +0200 - -xinetd (1:2.1.8.8pre8-1) frozen unstable; urgency=low - - * New upstream version, including only two bug fixes, one of which is a - Y2K fix in the date service (changed TIMEOFFSET macro), closes: #54795. - The second change is minor, a fix for problem when length of banner - name % 32 = 0, and banners fail to work. - - -- Josip Rodin Sun, 16 Jan 2000 17:09:48 +0100 - -xinetd (1:2.1.8.8pre6-1) unstable; urgency=low - - * New upstream version, packaged only to fix the Y2K glitch in the - log file, closes: #53865. - * Adopted/tookover the package :) I hear Norbert is around, but he - hasn't contacted anyone regarding the package yet. - * Introducing debconf support, to ask about converting the config file, - and to warn about update-inetd malfunctioning. However, I didn't remove - the old method of asking the questions yet, just in case debconf - doesn't exist. Only Recommends: debconf. Plus, I had to re-route all - the messages to &2, because of debconf. - * Added the missing `k' in `syslogd' recommendation (doh!). Added - Build-Depends: libwrap0-dev. - * Moved the whole contents of preinst to postinst (that is, stopping of - inetd and portmap, and creating the diversion of inetd init file), - no need to abuse preinst for that. - * Use --background option for start-stop-daemon, to speed up loading, - thus having to depend on dpkg >= 1.4.1.17. - * Fixed some details in postinst, init.d, config, and copyright files. - - -- Josip Rodin Tue, 4 Jan 2000 23:54:08 +0100 - -xinetd (1:2.1.8.7-1) unstable; urgency=low - - * Non-maintainer upload. - * Admitting the sad truth, i.e. marking the package as orphaned. Norbert - hasn't done an upload in some eleven months, and hasn't responded…to - our NMUs and several e-mails in more than two months. :( - * New upstream version. It's from a completely different development - branch, versioned differently, so I had to introduce an epoch. :| - Note that we *have to* use this version because the previous one breaks - its own original license! Closes: #38361 #41386 #41568. - * Updated packaging files for the new autoconf stuff, patched configure.in - and Makefile.in to support install in custom non-existant directories, - included example xinetd.conf file in examples directory. - * Updated docs regarding the new xconv.pl script. Not using it in - postinst, at least not yet. - * Skipped all old patches, except the one for src/itox.c, which is now - forwarded/included in upstream package, with some others. - * Added --with-libwrap to configure flags, to link with libwrap0, as - suggested by the upstream author. From the README file: - When xinetd does access checking, it will first ask libwrap to check - /etc/hosts.allow and /etc/hosts.deny, then if libwrap accepts the - connection, xinetd will consult its own access control mechanism. - * Fixed postrm script to work on purge, and to remove /etc/init.d/inetd - (created in postinst) prior to un-diverting it (otherwise dpkg-divert - would bomb out, overwriting not allowed). - * Moved making the dummy /etc/init.d/inetd script to postinst, to - avoid the lintian error. - * Fixed s/daemon-dir/daemon_dir/ in README.update-inetd file. - * Updated itox.1 manual page, moved it to section 8 and to xinetd/ - directory, and integrated it (and itox) in the Makefile install: rule. - * Updated the init script, made checkportmap() check in /etc/xinetd.conf - file (don't know whether the check is ultimately correct, though). - * Upgraded netbase dependency to 3.16-4, because the fixed update-inetd - script is included since that version. - * Doesn't recommend netstd anymore, apparently it no longer exists, - that closes: #49398 #49438. - - -- Josip Rodin Sat, 16 Oct 1999 19:14:14 +0200 - -xinetd (2.2.1-8.SD1.2) unstable; urgency=low - - * Non-maintainer upload. (diff posted to Bug#45602) - - * Add a dummy /etc/init.d/inetd script so netbase doesn't have to - worry about its files disappearing. (Fixes: Bug#45602) - - -- Anthony Towns Fri, 15 Oct 1999 11:56:03 +1000 - -xinetd (2.2.1-8.SD1.1) unstable; urgency=medium - - * Non-maintainer upload (is Norber Veber MIA?). - * Updated for the new netbase/inetd stuff. - Fixes: #43161 #44537 #44529 #31500 - * Depend on an appropriate netbase version because of the switch to - diverting /etc/init.d/inetd, and not diverting /usr/sbin/update-inetd. - * Un-diverting is done in a sane way, I think. Postinst checks whether the - exact diversion still exists, and preserves the obsolete scripts, with - suffix ".xinetd.old", and then removes the diversion. The obsolete files - made this way are "rm -f"ed in postrm. - * Updated for Policy 3.x. Converted to debhelper for full Policy - compliance. Fixes: #44099 - * Added rm -f /etc/xinetd.conf under purging in postrm, fixes: #36809 - * Included Solar Designer 's SD1 patch from: - ftp://ftp.dataforce.net/pub/solar/xinetd-2.2.1-SD1.diff , fixes: #35166 - * Reworked most of the maintainer scripts. - * The checkportmap() function, from the inetd's init script ought to - be changed to check in /etc/xinetd.conf file. - * Beautified debian/README* files, fixed some oddities in "SEE ALSO" - sections of the man pages. - * If this release doesn't break anything, I'll probably upload the newest - upstream version, from the alive branch. - - -- Josip Rodin Wed, 15 Sep 1999 20:27:55 +0200 - -xinetd (2.2.1-8) frozen unstable; urgency=high - - * Bug #29951, Applied itox patch by Alain Nissen , - it fixes two problems with itox. It now understands user.group - notation, and ignores (no)wait.max. - * Bug #29650, changed a /* */ comment in preinst to a bash # comment :) - * Bug #29945, typo in the itox man page. - * Bug 29648, slattach is no longer killed when xinetd is stopped. - * Fixed a /tmp security problem which occured when xinetd was sent the - HUP signal (patch from Bugtraq by Marc Heuse slightly - modified by me). - - -- Norbert Veber Sat, 5 Dec 1998 02:27:54 -0500 - -xinetd (2.2.1-7) unstable; urgency=low - - * Fixed a spelling mistake in the change log :) - * Fixed #26546, a problem with postinst and the file-rc package - - -- Norbert Veber Sat, 10 Oct 1998 00:46:13 -0400 - -xinetd (2.2.1-6) unstable; urgency=low - - * Fixed #24246, debian/files and debian/substvars is no longer included - with the deb. - * Fixed #24245. This closes a security hole and policy violation in the - build process, also changed to -O2 while compiling. - * Fixes bug 23866 by diverting on both upgrade and install. - - -- Norbert Veber Sat, 25 Jul 1998 14:18:39 -0400 - -xinetd (2.2.1-5) frozen unstable; urgency=low - - * Changed all scripts that stop xinetd so that they use SIGQUIT to kill the - server. SIGTERM is the default, and this causes xinetd to kill all - child processes, which makes remote installation/maintenance impossible. - * Changed postrm so that it calls update-rc.d with the -f option (in case - /etc/init.d/xinetd is still present. - * changed prerm so that it stops /sbin/portmap instead of - /usr/sbin/rpc.portmap (which doesnt exist) - * Wrote a man page for itox - * Fixed /etc/init.d/xinetd reload/restart - * Added /etc/init.d/xinetd to list of conffiles - - -- Norbert Veber Sat, 13 Jun 1998 20:54:58 -0400 - -xinetd (2.2.1-4) frozen unstable; urgency=medium - - * New developer - * Diverted /etc/init.d/netbase, fixes bug #19125 - * /etc/init.d/xinetd now refers to itself by $0, bug #6860 - * /etc/init.d/xinetd now looks for /sbin/portmap, bug #12021, #12047, - #14159, #17247, #18691, #20701, #22161 - * Diverted /usr/sbin/update-inetd, the new update-inetd now tells the user - to manually edit /etc/xinetd.conf. A new update-inetd that changes - the xinetd.conf will eventually be created. - * Created /usr/doc/xinetd/README-update.inetd which describes the above, - and gives pointers on what to put into xinetd.conf. - * Moved back to main (xinetd is free) - * Included ORIGINAL copyright, as is required by the license. - It is in /usr/doc/xinetd/copyright. - * Created /usr/doc/README.samba which describes a fix/workaround to the - xinetd/nmdb bug (#20705 and #17907). - * No longer provides a default xinetd.conf. It is nearly impossible to - generate one that will work on all systems, and still provides - useful services. The user now has the choice of keeping the current - configuration, or converting inetd.conf. - This fixes half of bug #10059. :) - - -- Norbert Veber Tue, 9 June 1998 22:18:25 -0500 - -xinetd (2.2.1-3.1) non-free; urgency=low - - * Developer back to Boris. - - -- Adam Heath Sun, 15 Mar 1998 15:33:59 -0500 - -xinetd (2.2.1-3) non-free; urgency=low - - * Changed distribution. - * Bug#16310 fixed previously. - - -- Adam Heath Sat, 14 Mar 1998 03:31:50 -0500 - -xinetd (2.2.1-2) unstable; urgency=low - - * Fixes lintian bugs. - - -- Adam Heath Mon, 9 Mar 1998 19:33:00 -0500 - -xinetd (2.2.1-1) unstable; urgency=low - - * New upstream version - - -- Adam Heath Wed, 31 Dec 1997 02:53:10 -0500 - -xinetd (2.1.7-3.1) unstable; urgency=low - - * Compiled for libc6 - - -- Adam Heath Tue, 30 Dec 1997 17:50:01 -0500 - -xinetd (2.1.7-3) unstable; urgency=low - - Changed preinst to ask if xinetd will be - set up to load at boot time. - - -- "Boris D. Beletsky" Tue, 31 Oct 1996 23:13:34 +0200 - -xinetd (2.1.7-2) unstable; urgency=low - - fixed bug #5022 (thks to llucius@millcomm.com) - - -- "Boris D. Beletsky" Tue, 29 Oct 1996 03:23:24 +0200 - -xinetd (2.1.7-1) unstable; urgency=low - - * first release - - -- "Boris D. Beletsky" Sun, 23 Oct 1996 07:45:14 +0200 diff -Nru xinetd-2.3.14/debian/xinetd.upstart xinetd-2.3.14/debian/xinetd.upstart --- xinetd-2.3.14/debian/xinetd.upstart 1970-01-01 00:00:00.000000000 +0000 +++ xinetd-2.3.14/debian/xinetd.upstart 2011-01-19 12:09:49.000000000 +0000 @@ -0,0 +1,53 @@ +# xinetd - the extended Internet services daemon +description "xinetd daemon" + +start on runlevel [2345] +stop on runlevel [!2345] + +## because signal QUIT is sent in pre-stop, respawn cannot be used. +## (LP: #605007) +#respawn + +pre-start script + test -x /usr/sbin/xinetd || { stop; exit 0; } +end script + +env PIDFILE=/var/run/xinetd.pid +script + INETD_COMPAT=Yes + XINETD_OPTS="-stayalive" + + # per upstart convention, options should be set in the upstart job itself. + # However, to be friendly, source and respect old defaults file. + [ ! -f /etc/default/xinetd ] || . /etc/default/xinetd + + case "$INETD_COMPAT" in + [Yy]*) + XINETD_OPTS="$XINETD_OPTS -inetd_compat" + if perl -MSocket -e 'exit (!socket($sock, AF_INET6, SOCK_STREAM, 0))'; then + XINETD_OPTS="$XINETD_OPTS -inetd_ipv6" + fi + ;; + esac + + checkportmap () { + if grep "^[^ *#]" /etc/xinetd.conf | grep -q 'rpc/'; then + if ! rpcinfo -u localhost portmapper >/dev/null 2>&1; then + echo + echo "WARNING: portmapper inactive - RPC services unavailable!" + echo " Commenting out or removing the RPC services from" + echo " the /etc/xinetd.conf file will remove this message." + echo + fi + fi + } + + checkportmap + exec /usr/sbin/xinetd -dontfork -pidfile "$PIDFILE" $XINETD_OPTS +end script + +pre-stop script + xinetd_pid=$(status | awk '/stop\/pre-stop/ { print $NF }') + [ -n "${xinetd_pid}" ] || exit 0 + kill -QUIT "${xinetd_pid}" +end script