From fe6b05b2a69aa5abbc4b615b39259606e9717b18 Mon Sep 17 00:00:00 2001 From: Mathias Gug Date: Mon, 1 Mar 2010 18:20:18 -0500 Subject: Import Debian changes 1.9-3ubuntu1 vlan (1.9-3ubuntu1) lucid; urgency=low * debian/control, debian/vlan-udeb.install: Create vlan-udeb package to be able to install the vconfig command line in the installer. (LP: #530468) vlan (1.9-3build1) karmic; urgency=low * No-change rebuild to gain FORTIFY defaults. --- debian/changelog | 14 ++++++++++++++ debian/control | 22 +++++++++++++++++++++- debian/vlan-udeb.install | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 debian/vlan-udeb.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8927805..7429f29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +vlan (1.9-3ubuntu1) lucid; urgency=low + + * debian/control, debian/vlan-udeb.install: Create vlan-udeb package to + be able to install the vconfig command line in the installer. + (LP: #530468) + + -- Mathias Gug Mon, 01 Mar 2010 18:20:18 -0500 + +vlan (1.9-3build1) karmic; urgency=low + + * No-change rebuild to gain FORTIFY defaults. + + -- Kees Cook Mon, 11 May 2009 12:07:56 -0700 + vlan (1.9-3) unstable; urgency=low * Add XS-Vcs-Git and XS-Vcs-Browser fields to control. diff --git a/debian/control b/debian/control index 41fcbce..470636b 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: vlan Section: misc Priority: extra -Maintainer: Ard van Breemen +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ard van Breemen Uploaders: Loic Minier Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 @@ -22,3 +23,22 @@ Description: user mode programs to enable VLANs on your ethernet devices You need a VLAN Linux kernel for this. Linux kernel versions >= 2.4.14 have VLAN support. +Package: vlan-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: optional +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +XB-Installer-Menu-Item: 99999 +Description: user mode programs to enable VLANs on your ethernet devices + This package contains the user mode programs you need to add and remove + VLAN devices from your ethernet devices. + . + A typical application for a VLAN enabled box is a single wire firewall, + router or load balancer. + . + You need a VLAN Linux kernel for this. Linux kernel versions >= 2.4.14 + have VLAN support. + . + This package provides the vconfig client for use in debian-installer. + diff --git a/debian/vlan-udeb.install b/debian/vlan-udeb.install new file mode 100644 index 0000000..12642f7 --- /dev/null +++ b/debian/vlan-udeb.install @@ -0,0 +1 @@ +vconfig sbin -- cgit v1.2.3 From a03b572355eaca410e743a61fbf5b6d10ff5e0ca Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Sun, 7 Mar 2010 01:10:59 +0100 Subject: Import Debian changes 1.9-3ubuntu2 vlan (1.9-3ubuntu2) lucid; urgency=low * rebuild rest of main for armel armv7/thumb2 optimization; UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7429f29..f2b556f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vlan (1.9-3ubuntu2) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Sun, 07 Mar 2010 01:10:59 +0100 + vlan (1.9-3ubuntu1) lucid; urgency=low * debian/control, debian/vlan-udeb.install: Create vlan-udeb package to -- cgit v1.2.3 From d11ebf91f9086fb540461345e314f9ec7464645d Mon Sep 17 00:00:00 2001 From: Mathias Gug Date: Wed, 10 Mar 2010 16:37:41 -0500 Subject: Import Debian changes 1.9-3ubuntu3 vlan (1.9-3ubuntu3) lucid; urgency=low * debian/control: Make vlan-udeb depend on vlan-modules (kernel modules). --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f2b556f..aadc04f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vlan (1.9-3ubuntu3) lucid; urgency=low + + * debian/control: Make vlan-udeb depend on vlan-modules (kernel modules). + + -- Mathias Gug Wed, 10 Mar 2010 16:37:41 -0500 + vlan (1.9-3ubuntu2) lucid; urgency=low * rebuild rest of main for armel armv7/thumb2 optimization; diff --git a/debian/control b/debian/control index 470636b..fe6272b 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ XC-Package-Type: udeb Section: debian-installer Priority: optional Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, vlan-modules XB-Installer-Menu-Item: 99999 Description: user mode programs to enable VLANs on your ethernet devices This package contains the user mode programs you need to add and remove -- cgit v1.2.3 From f254efaaa7540e83f6d17b6699c3ceff903c4bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Tue, 20 Dec 2011 12:00:44 +0100 Subject: Import Debian changes 1.9-3ubuntu4 vlan (1.9-3ubuntu4) precise; urgency=low * Add a udev trigger similar to bridge-utils' so vlan interfaces are created when the parent appears (this will then trigger upstart and ifupdown to configure the newly created vlan interface) --- debian/changelog | 8 ++++++++ debian/rules | 2 ++ debian/vlan-network-interface | 29 +++++++++++++++++++++++++++++ debian/vlan.install | 1 + debian/vlan.vlan-network-interface.udev | 1 + 5 files changed, 41 insertions(+) create mode 100644 debian/vlan-network-interface create mode 100644 debian/vlan.vlan-network-interface.udev (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aadc04f..b8f8f19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3ubuntu4) precise; urgency=low + + * Add a udev trigger similar to bridge-utils' so vlan interfaces are + created when the parent appears (this will then trigger upstart and + ifupdown to configure the newly created vlan interface) + + -- Stéphane Graber Tue, 20 Dec 2011 12:00:44 +0100 + vlan (1.9-3ubuntu3) lucid; urgency=low * debian/control: Make vlan-udeb depend on vlan-modules (kernel modules). diff --git a/debian/rules b/debian/rules index 735776c..c2e9dd8 100755 --- a/debian/rules +++ b/debian/rules @@ -5,11 +5,13 @@ CCFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) binary-arch: dh_testdir dh_testroot + dh_installudev --name vlan-network-interface dh_installdocs -s dh_installman -s dh_installchangelogs -s CHANGELOG dh_install -s chmod -R 755 debian/vlan/etc/network + chmod 755 debian/vlan/lib/udev/vlan-network-interface dh_strip -s dh_fixperms -s dh_compress -s diff --git a/debian/vlan-network-interface b/debian/vlan-network-interface new file mode 100644 index 0000000..5ded09f --- /dev/null +++ b/debian/vlan-network-interface @@ -0,0 +1,29 @@ +#!/bin/sh + +# vlan-network-interface - configure a network bridge +# +# This service checks whether a physical network device that has been added +# has VLAN defined in /etc/network/interfaces that should be brought up +set -e + +if [ -z "$INTERFACE" ]; then + echo "missing \$INTERFACE" >&2 + exit 1 +fi + +if ! which ifquery >/dev/null; then + exit 0 +fi + +if [ ! -x /etc/network/if-pre-up.d/vlan ]; then + exit 0 +fi + +mkdir -p /run/network +for IFACE in $(ifquery --list --allow auto); do + IF_VLAN_RAW_DEVICE=$(ifquery $IFACE | sed -n -e's/^vlan[_-]raw[_-]device: //p') + + # Now that the environment is ready, call the pre-up script to create the vlan + export IFACE IF_VLAN_RAW_DEVICE + /etc/network/if-pre-up.d/vlan +done diff --git a/debian/vlan.install b/debian/vlan.install index c29eacf..6bf49c0 100644 --- a/debian/vlan.install +++ b/debian/vlan.install @@ -1,3 +1,4 @@ debian/network etc +debian/vlan-network-interface lib/udev/ vconfig sbin #macvlan_config sbin diff --git a/debian/vlan.vlan-network-interface.udev b/debian/vlan.vlan-network-interface.udev new file mode 100644 index 0000000..9c293a9 --- /dev/null +++ b/debian/vlan.vlan-network-interface.udev @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="net", RUN+="vlan-network-interface" -- cgit v1.2.3 From 8a90b082c9be09b51ae36acd6ecb512972bf054b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 20 Jan 2012 19:13:23 -0500 Subject: Import Debian changes 1.9-3ubuntu5 vlan (1.9-3ubuntu5) precise; urgency=low * Now that a vlan interface can be created by a udev hook and ifupdown checks return codes from the scripts, make sure to properly deal with an already existing interface. --- debian/changelog | 8 ++++++++ debian/network/if-pre-up.d/vlan | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b8f8f19..c241e93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3ubuntu5) precise; urgency=low + + * Now that a vlan interface can be created by a udev hook and + ifupdown checks return codes from the scripts, + make sure to properly deal with an already existing interface. + + -- Stéphane Graber Fri, 20 Jan 2012 19:13:23 -0500 + vlan (1.9-3ubuntu4) precise; urgency=low * Add a udev trigger similar to bridge-utils' so vlan interfaces are diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index b977be8..b762af8 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -43,7 +43,7 @@ case "$IFACE" in ;; esac -if [ -n "$IF_VLAN_RAW_DEVICE" ]; then +if [ -n "$IF_VLAN_RAW_DEVICE" ] && [ ! -d /sys/class/net/$IFACE ]; then if [ ! -x /sbin/vconfig ]; then exit 0 fi -- cgit v1.2.3 From 3475ed5e4f6bea42f97386e0d039a0a2afbc419f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 7 Mar 2012 12:11:55 +0000 Subject: Import Debian changes 1.9-3ubuntu6 vlan (1.9-3ubuntu6) precise; urgency=low * Support biosdevname interface names out of the box (LP: #948559). --- debian/changelog | 6 ++++++ debian/network/if-post-down.d/vlan | 8 ++++---- debian/network/if-pre-up.d/vlan | 12 ++++++------ 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c241e93..99db2bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vlan (1.9-3ubuntu6) precise; urgency=low + + * Support biosdevname interface names out of the box (LP: #948559). + + -- Colin Watson Wed, 07 Mar 2012 12:11:55 +0000 + vlan (1.9-3ubuntu5) precise; urgency=low * Now that a vlan interface can be created by a udev hook and diff --git a/debian/network/if-post-down.d/vlan b/debian/network/if-post-down.d/vlan index 89b16fb..4d5afe7 100644 --- a/debian/network/if-post-down.d/vlan +++ b/debian/network/if-post-down.d/vlan @@ -9,11 +9,11 @@ case "$IFACE" in *:*) exit 0 ;; - eth*.0*|bond*.0*|wlan*.0*) - IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/"` + eth*.0*|bond*.0*|wlan*.0*|em*.0*|p[0-9]*.0*) + IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/;s/\(em[0-9][0-9]*\)\..*/\1/;s/\(p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\)\..*/\1/"` ;; - eth*.*|bond*.*|wlan*.*) - IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/"` + eth*.*|bond*.*|wlan*.*|em*.*|p[0-9]*.*) + IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/;s/\(em[0-9][0-9]*\)\..*/\1/;s/\(p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\)\..*/\1/"` ;; # Test for vlan raw device (#196890, #292648) *) diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index b762af8..15bb746 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -15,15 +15,15 @@ case "$IFACE" in vconfig set_name_type VLAN_PLUS_VID_NO_PAD VLANID=`echo $IFACE|sed "s/vlan0*//"` ;; - eth*.0*|bond*.0*|wlan*.0*) + eth*.0*|bond*.0*|wlan*.0*|em*.0*|p[0-9]*.0*) vconfig set_name_type DEV_PLUS_VID - VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.0*//g;s/bond[0-9][0-9]*\.0*//;s/wlan[0-9][0-9]*\.0*//"` - IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/"` + VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.0*//g;s/bond[0-9][0-9]*\.0*//g;s/wlan[0-9][0-9]*\.0*//g;s/em[0-9][0-9]*\.0*//g;s/p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\.0*//g"` + IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/;s/\(em[0-9][0-9]*\)\..*/\1/;s/\(p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\)\..*/\1/"` ;; - eth*.*|bond*.*|wlan*.*) + eth*.*|bond*.*|wlan*.*|em*.*|p[0-9]*.*) vconfig set_name_type DEV_PLUS_VID_NO_PAD - VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.0*//g;s/bond[0-9][0-9]*\.0*//g;s/wlan[0-9][0-9]*\.0*//g"` - IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/"` + VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.0*//g;s/bond[0-9][0-9]*\.0*//g;s/wlan[0-9][0-9]*\.0*//g;s/em[0-9][0-9]*\.0*//g;s/p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\.0*//g"` + IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/;s/\(em[0-9][0-9]*\)\..*/\1/;s/\(p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\)\..*/\1/"` ;; *.0*) # Silently ignore interfaces which we do not (know how to) support -- cgit v1.2.3 From a6e2f64d9288882eff071d29630c288144aa43c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 7 Sep 2012 17:24:32 -0400 Subject: Import Debian changes 1.9-3ubuntu7 vlan (1.9-3ubuntu7) quantal; urgency=low * Start vlan-network-interface in the background to avoid blocking the rest of the udev events (most importantly the upstart one). (LP: #1003656) --- debian/changelog | 8 ++++++++ debian/vlan.vlan-network-interface.udev | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 99db2bc..81ff64e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3ubuntu7) quantal; urgency=low + + * Start vlan-network-interface in the background to avoid blocking the + rest of the udev events (most importantly the upstart one). + (LP: #1003656) + + -- Stéphane Graber Fri, 07 Sep 2012 17:24:32 -0400 + vlan (1.9-3ubuntu6) precise; urgency=low * Support biosdevname interface names out of the box (LP: #948559). diff --git a/debian/vlan.vlan-network-interface.udev b/debian/vlan.vlan-network-interface.udev index 9c293a9..c285112 100644 --- a/debian/vlan.vlan-network-interface.udev +++ b/debian/vlan.vlan-network-interface.udev @@ -1 +1 @@ -ACTION=="add", SUBSYSTEM=="net", RUN+="vlan-network-interface" +ACTION=="add", SUBSYSTEM=="net", RUN+="vlan-network-interface&" -- cgit v1.2.3 From 6f68f25aad5c577d0eefe0f776d910851c41fb56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 10 Sep 2012 11:41:09 -0400 Subject: Import Debian changes 1.9-3ubuntu8 vlan (1.9-3ubuntu8) quantal; urgency=low * Revert last chance as udev doesn't accept that syntax. * Upon closer review of the scripts in the vlan package, I don't actually believe that the race/deadlock situation found in bridge-utils applies to vlan as it never waits for an interface to show up or call a script that would. --- debian/changelog | 10 ++++++++++ debian/vlan.vlan-network-interface.udev | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 81ff64e..75d7422 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +vlan (1.9-3ubuntu8) quantal; urgency=low + + * Revert last chance as udev doesn't accept that syntax. + * Upon closer review of the scripts in the vlan package, I don't actually + believe that the race/deadlock situation found in bridge-utils applies to + vlan as it never waits for an interface to show up or call a script that + would. + + -- Stéphane Graber Mon, 10 Sep 2012 11:41:09 -0400 + vlan (1.9-3ubuntu7) quantal; urgency=low * Start vlan-network-interface in the background to avoid blocking the diff --git a/debian/vlan.vlan-network-interface.udev b/debian/vlan.vlan-network-interface.udev index c285112..9c293a9 100644 --- a/debian/vlan.vlan-network-interface.udev +++ b/debian/vlan.vlan-network-interface.udev @@ -1 +1 @@ -ACTION=="add", SUBSYSTEM=="net", RUN+="vlan-network-interface&" +ACTION=="add", SUBSYSTEM=="net", RUN+="vlan-network-interface" -- cgit v1.2.3 From 0ad25d9a7d7a595a622cc86d1edae2bd21511cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 26 Aug 2013 18:35:02 -0400 Subject: Import Debian changes 1.9-3ubuntu9 vlan (1.9-3ubuntu9) saucy; urgency=low * Transition from iproute to iproute2. --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 75d7422..34d2c0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vlan (1.9-3ubuntu9) saucy; urgency=low + + * Transition from iproute to iproute2. + + -- Stéphane Graber Mon, 26 Aug 2013 18:35:02 -0400 + vlan (1.9-3ubuntu8) quantal; urgency=low * Revert last chance as udev doesn't accept that syntax. diff --git a/debian/control b/debian/control index fe6272b..124ddb4 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ XS-Vcs-Browser: http://git.debian.org/?p=collab-maint/vlan.git Package: vlan Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, iproute +Depends: ${misc:Depends}, ${shlibs:Depends}, iproute2 Section: misc Description: user mode programs to enable VLANs on your ethernet devices This package contains the user mode programs you need to add and remove -- cgit v1.2.3 From c8a07d63a49fda0f763e8a7888d85c0728b8a850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 20 Mar 2014 17:48:43 -0400 Subject: Import Debian changes 1.9-3ubuntu10 vlan (1.9-3ubuntu10) trusty; urgency=medium * Only create VLANs for the interface we are processing. (LP: #1295371) --- debian/changelog | 6 ++++++ debian/vlan-network-interface | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 34d2c0a..4c8e812 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vlan (1.9-3ubuntu10) trusty; urgency=medium + + * Only create VLANs for the interface we are processing. (LP: #1295371) + + -- Stéphane Graber Thu, 20 Mar 2014 17:48:43 -0400 + vlan (1.9-3ubuntu9) saucy; urgency=low * Transition from iproute to iproute2. diff --git a/debian/vlan-network-interface b/debian/vlan-network-interface index 5ded09f..836b707 100644 --- a/debian/vlan-network-interface +++ b/debian/vlan-network-interface @@ -25,5 +25,10 @@ for IFACE in $(ifquery --list --allow auto); do # Now that the environment is ready, call the pre-up script to create the vlan export IFACE IF_VLAN_RAW_DEVICE - /etc/network/if-pre-up.d/vlan + + # Create the VLANs related to the interface + if [ "$IF_VLAN_RAW_DEVICE" = "$INTERFACE" ] || \ + echo $IFACE | grep -q $INTERFACE; then + /etc/network/if-pre-up.d/vlan + fi done -- cgit v1.2.3 From 6152215fd415fe09a54483bdf0582b2f17532ea7 Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Thu, 8 Sep 2016 12:47:31 -0400 Subject: Import Debian changes 1.9-3.2ubuntu2 vlan (1.9-3.2ubuntu2) yakkety; urgency=medium * If VLAN is configured with higher MTU than raw device MTU, which can happen if VLAN is ifup'ed before raw device, then increase raw device MTU first so the VLAN ifup does not fail. (LP: #1224007) --- debian/changelog | 8 ++++++++ debian/network/if-pre-up.d/vlan | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7a22d66..706a89c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3.2ubuntu2) yakkety; urgency=medium + + * If VLAN is configured with higher MTU than raw device MTU, which can + happen if VLAN is ifup'ed before raw device, then increase raw device + MTU first so the VLAN ifup does not fail. (LP: #1224007) + + -- Dan Streetman Thu, 08 Sep 2016 12:47:31 -0400 + vlan (1.9-3.2ubuntu1) utopic; urgency=medium * Merge from Debian unstable. Remaining changes: diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index e61566c..f4d1877 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -43,6 +43,14 @@ case "$IFACE" in ;; esac +if [ -n "$IF_MTU" -a -n "$IF_VLAN_RAW_DEVICE" ]; then + CUR_DEV_MTU=`cat /sys/class/net/$IF_VLAN_RAW_DEVICE/mtu` + # increase the vlan raw device mtu if needed + if [ -n "$CUR_DEV_MTU" ] && [ $CUR_DEV_MTU -lt $IF_MTU ]; then + ip link set dev $IF_VLAN_RAW_DEVICE mtu $IF_MTU + fi +fi + if [ -n "$IF_VLAN_RAW_DEVICE" ] && [ ! -d /sys/class/net/$IFACE ]; then if [ ! -x /sbin/vconfig ]; then exit 0 -- cgit v1.2.3 From 216ae002ceb7335e008921a1e3b8b49153950a5a Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Thu, 30 Mar 2017 09:16:10 -0400 Subject: Import Debian changes 1.9-3.2ubuntu3 vlan (1.9-3.2ubuntu3) artful; urgency=medium * In vlan ifupdown pre-up script, instead of calling ip link up for raw device before creating vlan interface, do a full ifup for raw device. Otherwise, if raw device processes ifup after vlan device, the raw device may be taken down and back up, which removes all vlan routes and other configuration. (LP: #1573272) --- debian/changelog | 10 ++++++++++ debian/network/if-pre-up.d/vlan | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 706a89c..df7abc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +vlan (1.9-3.2ubuntu3) artful; urgency=medium + + * In vlan ifupdown pre-up script, instead of calling ip link up for + raw device before creating vlan interface, do a full ifup for raw + device. Otherwise, if raw device processes ifup after vlan device, + the raw device may be taken down and back up, which removes all vlan + routes and other configuration. (LP: #1573272) + + -- Dan Streetman Thu, 30 Mar 2017 09:16:10 -0400 + vlan (1.9-3.2ubuntu2) yakkety; urgency=medium * If VLAN is configured with higher MTU than raw device MTU, which can diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index f4d1877..2262e6c 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -60,7 +60,7 @@ if [ -n "$IF_VLAN_RAW_DEVICE" ] && [ ! -d /sys/class/net/$IFACE ]; then exit 1 fi if [ ! -e "/sys/class/net/$IFACE" ]; then - ip link set up dev $IF_VLAN_RAW_DEVICE + ifup $IF_VLAN_RAW_DEVICE vconfig add $IF_VLAN_RAW_DEVICE $VLANID fi fi -- cgit v1.2.3 From 11e02c1c3f7c246a8e6ded4d22e8e2ce42a1b214 Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Mon, 29 May 2017 18:13:27 -0400 Subject: Import Debian changes 1.9-3.2ubuntu4 vlan (1.9-3.2ubuntu4) artful; urgency=medium * Correct previous patch, to work for ifupdown configuration where a vlan is configured but the vlan's raw device has no ifupdown config. (LP: #1573272) --- debian/changelog | 8 ++++++++ debian/network/if-pre-up.d/vlan | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index df7abc9..393b76e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3.2ubuntu4) artful; urgency=medium + + * Correct previous patch, to work for ifupdown configuration where a + vlan is configured but the vlan's raw device has no ifupdown config. + (LP: #1573272) + + -- Dan Streetman Mon, 29 May 2017 18:13:27 -0400 + vlan (1.9-3.2ubuntu3) artful; urgency=medium * In vlan ifupdown pre-up script, instead of calling ip link up for diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index 2262e6c..c266e5b 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -60,7 +60,9 @@ if [ -n "$IF_VLAN_RAW_DEVICE" ] && [ ! -d /sys/class/net/$IFACE ]; then exit 1 fi if [ ! -e "/sys/class/net/$IFACE" ]; then - ifup $IF_VLAN_RAW_DEVICE + # Try ifup for the raw device, if it fails then bring it up directly + # this is required e.g. there is no configuration for the raw device + ifup $IF_VLAN_RAW_DEVICE || ip link set up dev $IF_VLAN_RAW_DEVICE vconfig add $IF_VLAN_RAW_DEVICE $VLANID fi fi -- cgit v1.2.3 From f2f33a15b1b4b5d09dcdbdbced0b20507a7fb07f Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Wed, 20 Sep 2017 09:30:21 -0400 Subject: Import Debian changes 1.9-3.2ubuntu5 vlan (1.9-3.2ubuntu5) artful; urgency=medium * Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 (LP: #1716964) --- debian/changelog | 7 +++++++ debian/network/if-up.d/ip | 2 ++ 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 393b76e..2adb287 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vlan (1.9-3.2ubuntu5) artful; urgency=medium + + * Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 + (LP: #1716964) + + -- Dan Streetman Wed, 20 Sep 2017 09:30:21 -0400 + vlan (1.9-3.2ubuntu4) artful; urgency=medium * Correct previous patch, to work for ifupdown configuration where a diff --git a/debian/network/if-up.d/ip b/debian/network/if-up.d/ip index d7de05c..c155a7a 100644 --- a/debian/network/if-up.d/ip +++ b/debian/network/if-up.d/ip @@ -13,6 +13,8 @@ then if [ -n "$IF_IP_RP_FILTER" ]; then if [ "$IF_IP_RP_FILTER" -eq "0" ]; then echo 0 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" + elif [ "$IF_IP_RP_FILTER" -eq "2" ]; then + echo 2 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" else echo 1 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" fi -- cgit v1.2.3 From 3307aa6f852cd13f9f50a704099b2bf19b6b9439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 20 Jan 2012 19:13:23 -0500 Subject: Run vconfig only when the interface doesn't already exist. Now that a vlan interface can be created by a udev hook and ifupdown checks return codes from the scripts, make sure to properly deal with an already existing interface. --- debian/changelog | 8 ++++++++ debian/network/if-pre-up.d/vlan | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f7437f0..fc1c301 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3.3) UNRELEASED; urgency=low + + * Now that a vlan interface can be created by a udev hook and + ifupdown checks return codes from the scripts, + make sure to properly deal with an already existing interface. + + -- Stéphane Graber Fri, 20 Jan 2012 19:13:23 -0500 + vlan (1.9-3.2) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index 1580fc2..1796988 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -49,7 +49,7 @@ case "$IFACE" in ;; esac -if [ -n "$IF_VLAN_RAW_DEVICE" ]; then +if [ -n "$IF_VLAN_RAW_DEVICE" ] && [ ! -d /sys/class/net/$IFACE ]; then if [ ! -x /sbin/vconfig ]; then exit 0 fi -- cgit v1.2.3 From b4c7eb84e369d2a56cd3f444d8cc450dc67f04b4 Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Thu, 8 Sep 2016 12:47:31 -0400 Subject: Increase raw device MTU when needed. If VLAN is configured with higher MTU than raw device MTU, which can happen if VLAN is ifup'ed before raw device, then increase raw device MTU first so the VLAN ifup does not fail. (LP: #1224007) --- debian/changelog | 10 ++++++++-- debian/network/if-pre-up.d/vlan | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fc1c301..e2d0b4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ -vlan (1.9-3.3) UNRELEASED; urgency=low +vlan (1.9-3.3) UNRELEASED; urgency=medium + [ Stéphane Graber ] * Now that a vlan interface can be created by a udev hook and ifupdown checks return codes from the scripts, make sure to properly deal with an already existing interface. - -- Stéphane Graber Fri, 20 Jan 2012 19:13:23 -0500 + [ Dan Streetman ] + * If VLAN is configured with higher MTU than raw device MTU, which can + happen if VLAN is ifup'ed before raw device, then increase raw device + MTU first so the VLAN ifup does not fail. (LP: #1224007) + + -- Dan Streetman Thu, 08 Sep 2016 12:47:31 -0400 vlan (1.9-3.2) unstable; urgency=medium diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index 1796988..675d01b 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -49,6 +49,14 @@ case "$IFACE" in ;; esac +if [ -n "$IF_MTU" -a -n "$IF_VLAN_RAW_DEVICE" ]; then + CUR_DEV_MTU=`cat /sys/class/net/$IF_VLAN_RAW_DEVICE/mtu` + # increase the vlan raw device mtu if needed + if [ -n "$CUR_DEV_MTU" ] && [ $CUR_DEV_MTU -lt $IF_MTU ]; then + ip link set dev $IF_VLAN_RAW_DEVICE mtu $IF_MTU + fi +fi + if [ -n "$IF_VLAN_RAW_DEVICE" ] && [ ! -d /sys/class/net/$IFACE ]; then if [ ! -x /sbin/vconfig ]; then exit 0 -- cgit v1.2.3 From 089eb2188b3ddcf1c5d01d257ec75e4afe4bc1e0 Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Wed, 20 Sep 2017 09:30:21 -0400 Subject: Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 LP: #1716964 --- debian/changelog | 4 +++- debian/network/if-up.d/ip | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e2d0b4c..720b033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ vlan (1.9-3.3) UNRELEASED; urgency=medium * If VLAN is configured with higher MTU than raw device MTU, which can happen if VLAN is ifup'ed before raw device, then increase raw device MTU first so the VLAN ifup does not fail. (LP: #1224007) + * Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 + (LP: #1716964) - -- Dan Streetman Thu, 08 Sep 2016 12:47:31 -0400 + -- Dan Streetman Thu, 30 Mar 2017 09:16:10 -0400 vlan (1.9-3.2) unstable; urgency=medium diff --git a/debian/network/if-up.d/ip b/debian/network/if-up.d/ip index d7de05c..c155a7a 100644 --- a/debian/network/if-up.d/ip +++ b/debian/network/if-up.d/ip @@ -13,6 +13,8 @@ then if [ -n "$IF_IP_RP_FILTER" ]; then if [ "$IF_IP_RP_FILTER" -eq "0" ]; then echo 0 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" + elif [ "$IF_IP_RP_FILTER" -eq "2" ]; then + echo 2 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" else echo 1 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" fi -- cgit v1.2.3 From 4f46208e18b7fa96ce0e38894c15616e1dd949de Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sun, 26 Nov 2017 10:58:49 +0000 Subject: Update the changelog. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 720b033..862b1e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vlan (1.9-3.3) UNRELEASED; urgency=medium +vlan (1.9-3.3) unstable; urgency=medium [ Stéphane Graber ] * Now that a vlan interface can be created by a udev hook and @@ -12,7 +12,7 @@ vlan (1.9-3.3) UNRELEASED; urgency=medium * Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 (LP: #1716964) - -- Dan Streetman Thu, 30 Mar 2017 09:16:10 -0400 + -- Andrew Shadura Sun, 26 Nov 2017 10:58:34 +0000 vlan (1.9-3.2) unstable; urgency=medium -- cgit v1.2.3 From 3cc56cd2d64b3514ac46683cfb08024fc472d057 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 2 Aug 2018 14:10:44 +0200 Subject: Update Vcs-* --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 4fd484c..d91c54c 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Ard van Breemen Uploaders: Loic Minier Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 -XS-Vcs-Git: git://git.debian.org/git/collab-maint/vlan.git -XS-Vcs-Browser: http://git.debian.org/?p=collab-maint/vlan.git +Vcs-Git: https://salsa.debian.org/debian/vlan.git +Vcs-Browser: https://salsa.debian.org/debian/vlan Package: vlan Architecture: any -- cgit v1.2.3 From f1826f7ced887d816082a935aaa1000d51c3d913 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 2 Aug 2018 14:11:11 +0200 Subject: Update the changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 862b1e1..23ba567 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3.4) unstable; urgency=medium + + * Merge a change from Ubuntu: + - Support biosdevname interface names out of the box (LP: #948559). + * Update Vcs-*. + + -- Andrej Shadura Thu, 02 Aug 2018 14:10:52 +0200 + vlan (1.9-3.3) unstable; urgency=medium [ Stéphane Graber ] -- cgit v1.2.3 From 94591239ad91f866ec46313217b1f4da574978c1 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 2 Aug 2018 14:12:36 +0200 Subject: Use 3.0 (quilt) format --- debian/source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/source/format (limited to 'debian') diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit v1.2.3 From 0b500d6dd17eea3d16cd580fe54a5c6ae2faa9cf Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 2 Aug 2018 14:15:21 +0200 Subject: Put Debian source changes into a patch --- debian/patches/fix-docco.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 debian/patches/fix-docco.patch (limited to 'debian') diff --git a/debian/patches/fix-docco.patch b/debian/patches/fix-docco.patch new file mode 100644 index 0000000..3596a45 --- /dev/null +++ b/debian/patches/fix-docco.patch @@ -0,0 +1,29 @@ +Fix the documentation + +--- a/vconfig.8 ++++ b/vconfig.8 +@@ -22,8 +22,8 @@ + Removes the named vlan\-device. + .TP + .B set_flag [vlan\-device] 0 | 1 +-When 1, ethernet header reorders are turned on. Dumping the device +-will appear as a common ethernet device without vlans. When 0(default) ++When 1 (the default since 2.6.18), ethernet header reorders are turned on. ++Dumping the device will appear as a common ethernet device without vlans. When 0 + however, ethernet headers are not reordered, which results in vlan tagged + packets when dumping the device. Usually the default gives no problems, + but some packet filtering programs might have problems with it. +--- a/vconfig.c ++++ b/vconfig.c +@@ -52,8 +52,11 @@ + "* vlan_qos is the 3 bit priority in the VLAN header\n" + "* name-type: VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5),\n" + " DEV_PLUS_VID (eth0.0005), DEV_PLUS_VID_NO_PAD (eth0.5)\n" ++// Debian: this option appears nowhere else in the source, see Debian #398807 ++#if 0 + "* bind-type: PER_DEVICE # Allows vlan 5 on eth0 and eth1 to be unique.\n" + " PER_KERNEL # Forces vlan 5 to be unique across all devices.\n" ++#endif + "* FLAGS: 1 REORDER_HDR When this is set, the VLAN device will move the\n" + " ethernet header around to make it look exactly like a real\n" + " ethernet device. This may help programs such as DHCPd which\n" -- cgit v1.2.3 From e89c9b2e009d5442e98b69e08de60a4b3f8930ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Mon, 1 Oct 2018 09:37:48 +0200 Subject: d/control: Deprecating priority extra as per policy 4.0.1 --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 23ba567..2350612 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vlan (1.9-4) UNRELEASED; urgency=medium + + * d/control: Deprecating priority extra as per policy 4.0.1 + + -- Ondřej Nový Mon, 01 Oct 2018 09:37:47 +0200 + vlan (1.9-3.4) unstable; urgency=medium * Merge a change from Ubuntu: diff --git a/debian/control b/debian/control index d91c54c..d9d05b2 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: vlan Section: misc -Priority: extra +Priority: optional Maintainer: Ard van Breemen Uploaders: Loic Minier Build-Depends: debhelper (>= 5) -- cgit v1.2.3