diff -Nru netbase-4.45/debian/changelog netbase-4.45ubuntu1/debian/changelog --- netbase-4.45/debian/changelog 2011-01-19 23:15:47.000000000 +0100 +++ netbase-4.45ubuntu1/debian/changelog 2011-02-18 11:13:57.000000000 +0100 @@ -1,3 +1,19 @@ +netbase (4.45ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #721164) Remaining changes: + - debian/netbase.init: + + silence ifup/ifdown if VERBOSE == no + + silence debuging output if VERBOSE == no + + Temporarily increase usplash timeout to 120 seconds + to cope with slop DHCP server responses. LP: #21617 + + Replace the "start" command with a call to upstart-job + - debian/control: Depend on upstart-job + - debian/netbase.postinst: + + Remove old start symlinks on upgrade + + Only install symlinks for runlevel 0 and 6 + + -- Angel Abad Fri, 18 Feb 2011 10:40:03 +0100 + netbase (4.45) unstable; urgency=high * etc-services: added 4691 (mtn). (Closes: #607858) @@ -5,6 +21,23 @@ -- Marco d'Itri Wed, 19 Jan 2011 23:14:59 +0100 +netbase (4.44ubuntu1) natty; urgency=low + + [Kay Roepke] + * Merge from debian unstable (LP: #681012), remaining changes: + - debian/netbase.init: + + silence ifup/ifdown if VERBOSE == no + + silence debuging output if VERBOSE == no + + Temporarily increase usplash timeout to 120 seconds + to cope with slop DHCP server responses. LP: #21617 + + Replace the "start" command with a call to upstart-job + - debian/control: Depend on upstart-job + - debian/netbase.postinst: + + Remove old start symlinks on upgrade + + Only install symlinks for runlevel 0 and 6 + + -- Scott Moser Tue, 14 Dec 2010 17:24:33 +0100 + netbase (4.44) unstable; urgency=medium * etc-services: added 5666 (nrpe/tcp), mysql-proxy (6446). @@ -12,6 +45,26 @@ -- Marco d'Itri Sun, 05 Dec 2010 19:59:54 +0100 +netbase (4.43ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #671193), remaining changes: + - debian/netbase.init: + + silence ifup/ifdown if VERBOSE == no + + silence debuging output if VERBOSE == no + + Temporarily increase usplash timeout to 120 seconds + to cope with slop DHCP server responses. LP: #21617 + + Replace the "start" command with a call to upstart-job + - debian/control: Depend on upstart-job + - debian/netbase.postinst: + + Remove old start symlinks on upgrade + + Only install symlinks for runlevel 0 and 6 + * Dropped changes: + - Don't deconfigure network interfaces if /etc/iscsi/iscsi.initramfs + exists, since that probably indicates root on iSCSI (LP: #447377): fixed + in debian + + -- Lorenzo De Liso Mon, 08 Nov 2010 12:25:31 +0100 + netbase (4.43) unstable; urgency=medium * etc-services: added nbd (10809/tcp), epmd (4369). @@ -87,6 +140,38 @@ -- Marco d'Itri Sat, 04 Jul 2009 16:26:30 +0200 +netbase (4.35ubuntu3) lucid; urgency=low + + * debian/netbase.init: + - Don't deconfigure network interfaces if /etc/iscsi/iscsi.initramfs + exists, since that probably indicates root on iSCSI (LP: #447377). + + -- Colin Watson Thu, 03 Dec 2009 16:05:30 +0000 + +netbase (4.35ubuntu2) karmic; urgency=low + + FFE LP: #427356. + + * debian/netbase.init: + - Replace the "start" command with a call to upstart-job + * debian/control: + - Depend on upstart-job + * debian/netbase.postinst: + - Remove old start symlinks on upgrade + - Only install symlinks for runlevel 0 and 6 + + -- Scott James Remnant Tue, 15 Sep 2009 03:27:40 +0100 + +netbase (4.35ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #391214), remaining changes: + - debian/netbase.init: silence ifup/ifdown if VERBOSE == no + - debian/netbase.init: silence debuging output if VERBOSE == no + - debian/netbase.init: Temporarily increase usplash timeout to 120 seconds + to cope with slop DHCP server responses. LP: #21617 + + -- Muharem Hrnjadovic Tue, 23 Jun 2009 18:36:11 +0200 + netbase (4.35) unstable; urgency=low * Do not add ff02::3 to /etc/hosts because it is not actually assigned. @@ -98,6 +183,25 @@ -- Marco d'Itri Wed, 17 Jun 2009 02:34:11 +0200 +netbase (4.34ubuntu2) jaunty; urgency=low + + * Drop the net flag nonsense. + + -- Scott James Remnant Thu, 05 Mar 2009 15:02:06 +0000 + +netbase (4.34ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - introduce flag file for indicating the network has been + configured. This is needed so that ifupdown udev rules does not 'ifup' + the interface too early. Related to LP: #44194 + - debian/netbase.init: silence ifup/ifdown if VERBOSE == no + - debian/netbase.init: silence debuging output if VERBOSE == no + - debian/netbase.init: Temporarily increase usplash timeout to 120 seconds + to cope with slop DHCP server responses. LP: #21617 + + -- Scott James Remnant Tue, 11 Nov 2008 17:15:28 +0000 + netbase (4.34) unstable; urgency=medium * etc-services: added gnunet (2086). (Closes: #495732) @@ -114,6 +218,24 @@ -- Marco d'Itri Sat, 26 Jul 2008 00:59:20 +0200 +netbase (4.32ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - introduce flag file for indicating the network has been + configured. This is needed so that ifupdown udev rules does not 'ifup' + the interface too early. Related to LP: 44194 + - debian/netbase.init: silence ifup/ifdown if VERBOSE == no + - debian/netbase.init: silence debuging output if VERBOSE == no + - debian/netbase.init: Temporarily increase usplash timeout to 120 seconds + to cope with slop DHCP server responses. (LP: 21617) + * netbase.preinst: removed. It would only affect pre-dapper upgrades which we don't + support anyways. + * netbase.postinst: dropped all ubuntu modifications. It would only + affect pre-dapper upgrades which we don't support anyways. + * debian/control: drop dependency on update-inetd. + + -- Reinhard Tartler Mon, 23 Jun 2008 16:22:45 +0200 + netbase (4.32) unstable; urgency=low * etc-services: renamed suucp from 4013 to 4031 which is the correct @@ -137,6 +259,26 @@ -- Marco d'Itri Sun, 23 Mar 2008 23:19:18 +0100 +netbase (4.30ubuntu2) intrepid; urgency=low + + * introduce flag file for indicating the network has been + configured. This is needed so that ifupdown udev rules does not 'ifup' + the interface too early. Related to LP: #44194 + + -- Reinhard Tartler Sat, 21 Jun 2008 23:22:40 +0200 + +netbase (4.30ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add transitional dependency on update-inetd, to be retained until + after 8.04. + - Drop /etc/network/options and migrate it to sysctl.conf. + - Start networking only once. + * Fix preinst to use dpkg-query rather than looking in + /var/lib/dpkg/status directly. + + -- Colin Watson Mon, 03 Dec 2007 21:09:55 +0000 + netbase (4.30) unstable; urgency=low * On new installs add localhost as an alias for ::1. (Closes: #427067) @@ -151,6 +293,25 @@ -- Marco d'Itri Sun, 29 Jul 2007 00:25:17 +0200 +netbase (4.29ubuntu2) gutsy; urgency=low + + * Restore dependency on tcpd so that we get /etc/hosts.allow and + /etc/hosts.deny by default (LP: #108379). + * Fix duplicate Maintainer in debian/control. + + -- Colin Watson Fri, 18 May 2007 10:10:34 +0100 + +netbase (4.29ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - added dependency to update-inetd to ensure smooth upgrade for + packages that use update-inetd in their maintainer scripts (LP#96286) + - drop dependency on inet superserver + - drop /etc/network/options, migrate to sysctl + - start networking only once + + -- Michael Vogt Mon, 14 May 2007 11:24:39 +0200 + netbase (4.29) unstable; urgency=high * Make /etc/networks a regular file created by postinst because nowadays @@ -170,6 +331,22 @@ -- Marco d'Itri Sat, 6 Jan 2007 16:54:34 +0100 +netbase (4.27ubuntu2) feisty; urgency=low + + * added dependency to update-inetd to ensure smooth upgrade for + packages that use update-inetd in their maintainer scripts (LP#96286) + + -- Michael Vogt Fri, 30 Mar 2007 10:30:21 +0200 + +netbase (4.27ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - drop dependency on inet superserver + - drop /etc/network/options, migrate to sysctl + - start networking only once + + -- Scott James Remnant Mon, 27 Nov 2006 13:33:44 +0000 + netbase (4.27) unstable; urgency=medium * Depend on inet-superserver instead of openbsd-inetd and tcpd. @@ -189,6 +366,22 @@ -- Marco d'Itri Sat, 19 Aug 2006 23:46:17 +0200 +netbase (4.25ubuntu2) edgy; urgency=low + + * Remove stop links from rc0 and rc6 + + -- Scott James Remnant Fri, 21 Jul 2006 00:09:57 +0100 + +netbase (4.25ubuntu1) edgy; urgency=low + + * Merge from debian unstable, changes remaining: + - removal of dependency on inetd server, + - removal of options parsing, + - options to sysctl.conf migration, + - init script output changes. + + -- Scott James Remnant Thu, 6 Jul 2006 10:26:20 +0100 + netbase (4.25) unstable; urgency=medium * etc-services: added msnp (1863), mmcc (5050), aol (5190), @@ -199,6 +392,27 @@ -- Marco d'Itri Fri, 24 Mar 2006 20:34:54 +0100 +netbase (4.24ubuntu3) dapper; urgency=low + + * Give an [ok] when bringing down the network interfaces works and we're + not in verbose mode. + + -- Scott James Remnant Thu, 11 May 2006 07:53:57 +0100 + +netbase (4.24ubuntu2) dapper; urgency=low + + * Move networking script back to S40. + + -- Scott James Remnant Thu, 23 Feb 2006 15:26:58 +0000 + +netbase (4.24ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + - Manually fix up init script again. + * Migrate /etc/network/options to /etc/sysctl.conf settings. + + -- Scott James Remnant Wed, 25 Jan 2006 17:16:36 +0000 + netbase (4.24) unstable; urgency=medium * etc-services: added nfs (2049). (Closes: #345836) @@ -208,6 +422,35 @@ -- Marco d'Itri Tue, 3 Jan 2006 23:09:34 +0100 +netbase (4.23ubuntu4) dapper; urgency=low + + * Move networking script from S40 to S50 + + -- Scott James Remnant Tue, 24 Jan 2006 18:12:37 +0000 + +netbase (4.23ubuntu3) dapper; urgency=low + + * Remove missed call to process_options. + + -- Scott James Remnant Mon, 28 Nov 2005 10:15:38 +0000 + +netbase (4.23ubuntu2) dapper; urgency=low + + * If /etc/network/options is deprecated, then let's deprecate it! See + README.Debian for details on what to do instead. + + -- Scott James Remnant Tue, 22 Nov 2005 15:30:47 +0000 + +netbase (4.23ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + - Yes, really me. + - Preserve as much of the intent of both sets of init script changes + as possible. + - Still don't depend on netkit-inetd. + + -- Scott James Remnant Tue, 08 Nov 2005 08:58:46 +0000 + netbase (4.23) unstable; urgency=medium * Added the LSB data to the init script. @@ -228,6 +471,25 @@ -- Marco d'Itri Sat, 24 Sep 2005 18:20:29 +0200 +netbase (4.21ubuntu3) breezy; urgency=low + + * debian/netbase.init: Temporarily increase usplash timeout to 120 seconds + to cope with slop DHCP server responses. (Ubuntu #15394) + + -- Martin Pitt Mon, 19 Sep 2005 13:05:12 +0200 + +netbase (4.21ubuntu2) breezy; urgency=low + + * Remove dependency on netkit-inetd + + -- Matt Zimmerman Tue, 19 Apr 2005 21:46:30 -0700 + +netbase (4.21ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, resolving merge conflicts. + + -- Adam Conrad Thu, 14 Apr 2005 23:36:07 -0600 + netbase (4.21) unstable; urgency=medium * etc-rpc: renamed ypxfrd (600100069) to fypxfrd. (Closes: #280546) @@ -253,6 +515,32 @@ -- Marco d'Itri Thu, 27 Jan 2005 01:16:00 +0100 +netbase (4.19ubuntu4) hoary; urgency=low + + * Display a more useful error message when failing to open + a device to redirect stdin/stdout/stderr + + -- Matt Zimmerman Thu, 3 Mar 2005 16:35:49 -0800 + +netbase (4.19ubuntu3) hoary; urgency=low + + * removed 'echo "rp_filter"' and replaced it with a proper + lsb-init-function (closes: #5401) + + -- Michael Vogt Wed, 19 Jan 2005 09:31:13 +0100 + +netbase (4.19ubuntu2) hoary; urgency=low + + * Fix bashism in init script (closes: #4491). + + -- Matthias Klose Sun, 2 Jan 2005 23:43:07 +0100 + +netbase (4.19ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- LaMont Jones Thu, 11 Nov 2004 14:04:45 -0700 + netbase (4.19) unstable; urgency=medium * etc-services: added rtsp (554), hkp (11371), ospfapi (2607/tcp) and @@ -262,6 +550,12 @@ -- Marco d'Itri Sun, 31 Oct 2004 16:51:02 +0100 +netbase (4.18ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Wed, 27 Oct 2004 13:53:41 +0100 + netbase (4.18) unstable; urgency=high * etc-services: added snmp (161/tcp) and snmp-trap (162/tcp). @@ -270,6 +564,25 @@ -- Marco d'Itri Wed, 28 Jul 2004 00:46:53 +0200 +netbase (4.17ubuntu3) warty; urgency=low + + * debian/netbase.init: silence ifup/ifdown if VERBOSE == no + * debian/netbase.init: silence debuging output if VERBOSE == no + + -- Nathaniel McCallum Tue, 7 Sep 2004 16:03:20 -0400 + +netbase (4.17ubuntu2) warty; urgency=low + + * Added versioned depend on lsb-base + + -- Nathaniel McCallum Fri, 3 Sep 2004 15:07:08 -0400 + +netbase (4.17ubuntu1) warty; urgency=low + + * debian/netbase.init: pretty initscript + + -- Nathaniel McCallum Fri, 3 Sep 2004 11:33:59 -0400 + netbase (4.17) unstable; urgency=medium * etc-services: added enbd-cstatd (5051/tcp), enbd-sstatd (5052/tcp), diff -Nru netbase-4.45/debian/control netbase-4.45ubuntu1/debian/control --- netbase-4.45/debian/control 2010-10-23 01:46:04.000000000 +0200 +++ netbase-4.45ubuntu1/debian/control 2011-01-20 06:20:37.000000000 +0100 @@ -1,13 +1,14 @@ Source: netbase Section: admin Priority: important -Maintainer: Marco d'Itri +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Marco d'Itri Standards-Version: 3.9.1 Build-Depends: debhelper (>= 7) Package: netbase Architecture: all -Depends: lsb-base (>= 3.0-6), initscripts, ${misc:Depends} +Depends: lsb-base (>= 3.0-6), initscripts, ${misc:Depends}, upstart-job Conflicts: openbsd-inetd (<< 0.20050402-3), inetutils-inetd (<< 2:1.4.3+20060719-3) Recommends: ifupdown Description: Basic TCP/IP networking system diff -Nru netbase-4.45/debian/netbase.init netbase-4.45ubuntu1/debian/netbase.init --- netbase-4.45/debian/netbase.init 2010-04-19 00:52:13.000000000 +0200 +++ netbase-4.45ubuntu1/debian/netbase.init 2011-01-20 06:20:37.000000000 +0100 @@ -1,11 +1,11 @@ #!/bin/sh -e ### BEGIN INIT INFO # Provides: networking -# Required-Start: mountkernfs $local_fs +# Required-Start: # Required-Stop: $local_fs # Should-Start: ifupdown # Should-Stop: ifupdown -# Default-Start: S +# Default-Start: # Default-Stop: 0 6 # Short-Description: Raise network interfaces. ### END INIT INFO @@ -16,6 +16,14 @@ . /lib/lsb/init-functions +# helper function to set the usplash timeout. https://launchpad.net/bugs/21617 +usplash_timeout () { + TIMEOUT=$1 + if [ -x /sbin/usplash_write ]; then + /sbin/usplash_write "TIMEOUT $TIMEOUT" || true + fi +} + process_options() { [ -e /etc/network/options ] || return 0 log_warning_msg "/etc/network/options still exists and it will be IGNORED! Read README.Debian of netbase." @@ -64,14 +72,7 @@ case "$1" in start) - process_options - - log_action_begin_msg "Configuring network interfaces" - if ifup -a; then - log_action_end_msg $? - else - log_action_end_msg $? - fi + /lib/init/upstart-job networking start ;; stop) @@ -79,10 +80,18 @@ check_network_swap log_action_begin_msg "Deconfiguring network interfaces" - if ifdown -a --exclude=lo; then - log_action_end_msg $? + if [ "$VERBOSE" != no ]; then + if ifdown -a --exclude=lo; then + log_action_end_msg $? + else + log_action_end_msg $? + fi else - log_action_end_msg $? + if ifdown -a --exclude=lo >/dev/null 2>/dev/null; then + log_action_end_msg $? + else + log_action_end_msg $? + fi fi ;; diff -Nru netbase-4.45/debian/netbase.postinst netbase-4.45ubuntu1/debian/netbase.postinst --- netbase-4.45/debian/netbase.postinst 2010-06-25 23:08:19.000000000 +0200 +++ netbase-4.45ubuntu1/debian/netbase.postinst 2011-01-20 06:20:37.000000000 +0100 @@ -26,9 +26,10 @@ } update_rc() { - if [ -x /etc/init.d/networking ]; then - update-rc.d networking start 40 S . start 35 0 6 . > /dev/null + if dpkg --compare-versions "$2" lt "4.35ubuntu2~boot1"; then + update-rc.d -f networking remove >/dev/null fi + update-rc.d networking start 35 0 6 . > /dev/null } # create bindv6only.conf on new installs and upgrades from << 4.38