Put Debian source changes into a patchdebian/1.9-3.4archive/debian/1.9-3.4

3 files changed, 31 insertions, 5 deletions

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"
diff --git a/vconfig.8 b/vconfig.8
index 4030373..e9685c2 100644
--- a/vconfig.8
+++ b/vconfig.8
@@ -22,8 +22,8 @@ will be called according to the nameing convention set.
 Removes the named vlan\-device.
 .TP
 .B set_flag [vlan\-device] 0 | 1
-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
+When 1, ethernet header reorders are turned on. Dumping the device
+will appear as a common ethernet device without vlans. When 0(default)
 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.
diff --git a/vconfig.c b/vconfig.c
index c89cfa0..5057cfd 100644
--- a/vconfig.c
+++ b/vconfig.c
@@ -52,11 +52,8 @@ static char* usage =
 "* 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"