Bug#770955: wheezy-pu: package openvswitch/1.4.2+git20120612-9.1~deb7u1.1
Control: tags -1 + pending On Sat, 2015-01-17 at 11:48 +, Adam D. Barratt wrote: On 2014-12-14 20:52, Adam D. Barratt wrote: [...] Hmmm, okay. It looks like the package in unstable uses yet another slightly different approach. Please go ahead. Gentle ping. Uploaded and flagged for acceptance. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#770955: wheezy-pu: package openvswitch/1.4.2+git20120612-9.1~deb7u1.1
On 2014-12-14 20:52, Adam D. Barratt wrote: [...] Hmmm, okay. It looks like the package in unstable uses yet another slightly different approach. Please go ahead. Gentle ping. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#770955: wheezy-pu: package openvswitch/1.4.2+git20120612-9.1~deb7u1.1
Control: tags -1 -moreinfo +confirmed Apologies for the delay, I appear to have missed this mail. On Wed, 2014-11-26 at 11:42 +0100, Jonathan Dupart wrote: * Adam D. Barratt a...@adam-barratt.org.uk [141126 00:25]: Control: tags -1 + moreinfo On Tue, 2014-11-25 at 15:03 +0100, Jonathan Dupart wrote: The current openvswitch-datapath-dkms package does not build anymore since the last kernel update in wheezy (3.2.63-2+deb7u1), see bug #768095. I'm slightly confused by the patch. You mention that the upgrade to 3.2.63 caused the issue, In fact the upgrade to 3.2.63 caused the issue for me but the commit changing ip_select_ident was included in 3.2.62. but this: [...] suggests that it has in fact been broken since 3.2.51. Yes, you are right, the patch include a previous fix for another modification of the prototype of ip_select_ident which was included in 3.2.51 (commit 703133de331a7a7df47f31fb9de51dc6f68a9de8). Looking at the relevant bug in Ubuntu (#1262692) it looks like only GRE tunnel where broken by this change and nobody reported this bug, but I can confirm that these changes where included in the kernel shipped by Debian. Hmmm, okay. It looks like the package in unstable uses yet another slightly different approach. Please go ahead. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#770955: wheezy-pu: package openvswitch/1.4.2+git20120612-9.1~deb7u1.1
* Adam D. Barratt a...@adam-barratt.org.uk [141126 00:25]: Control: tags -1 + moreinfo On Tue, 2014-11-25 at 15:03 +0100, Jonathan Dupart wrote: The current openvswitch-datapath-dkms package does not build anymore since the last kernel update in wheezy (3.2.63-2+deb7u1), see bug #768095. I'm slightly confused by the patch. You mention that the upgrade to 3.2.63 caused the issue, In fact the upgrade to 3.2.63 caused the issue for me but the commit changing ip_select_ident was included in 3.2.62. but this: ++#elif LINUX_VERSION_CODE = KERNEL_VERSION(3,2,51)/* commit 703133de */ ++ ip_select_ident(skb, rt_dst(rt), NULL); ++#else + ip_select_ident(iph, rt_dst(rt), NULL); ++#endif suggests that it has in fact been broken since 3.2.51. Yes, you are right, the patch include a previous fix for another modification of the prototype of ip_select_ident which was included in 3.2.51 (commit 703133de331a7a7df47f31fb9de51dc6f68a9de8). Looking at the relevant bug in Ubuntu (#1262692) it looks like only GRE tunnel where broken by this change and nobody reported this bug, but I can confirm that these changes where included in the kernel shipped by Debian. I am affraid all my servers running openvswitch are now upgraded to 3.2.63-2+deb7u1 but I was able to build and load the openswitch module with this patch on a VM running 3.2.60-1+deb7u3. Would you prefer a patch without this modification ? -- Jonathan Dupart -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#770955: wheezy-pu: package openvswitch/1.4.2+git20120612-9.1~deb7u1.1
Package: release.debian.org Severity: normal Tags: wheezy User: release.debian@packages.debian.org Usertags: pu Hi, The current openvswitch-datapath-dkms package does not build anymore since the last kernel update in wheezy (3.2.63-2+deb7u1), see bug #768095. A patch already used by Ubuntu [1] fixes this problem, i use it since some weeks without problem. [1] https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1379201 Ben Pfaff maintainer of the package requested an NMU (see bug #768095) and Thomas Goirand accepted to sponsor the NMU after your approval. Regards, -- Jonathan Dupart diff -Nru openvswitch-1.4.2+git20120612/debian/changelog openvswitch-1.4.2+git20120612/debian/changelog --- openvswitch-1.4.2+git20120612/debian/changelog 2013-06-29 19:35:51.0 +0200 +++ openvswitch-1.4.2+git20120612/debian/changelog 2014-11-25 14:28:14.0 +0100 @@ -1,3 +1,12 @@ +openvswitch (1.4.2+git20120612-9.1~deb7u1.1) wheezy-proposed-updates; urgency=medium + + * Non-maintainer upload. + * Fix openvswitch-datapath-dkms fails to build on Debian 7.7 3.2.0-4- amd64 +(3.2.63-2+deb7u1) import Chris J. Arges' patch for tunnel.c +(Closes: #768095) + + -- Jonathan Dupart jonat...@dupart.org Sun, 23 Nov 2014 14:57:32 +0100 + openvswitch (1.4.2+git20120612-9.1~deb7u1) wheezy-proposed-updates; urgency=low * Rebuild for Wheezy. diff -Nru openvswitch-1.4.2+git20120612/debian/patches/bug-768095-openvswitch-datapath-dkms-fails-to-build-on-Debian-7.7-3.2.0-4-amd64.patch openvswitch-1.4.2+git20120612/debian/patches/bug-768095-openvswitch-datapath-dkms-fails-to-build-on-Debian-7.7-3.2.0-4-amd64.patch --- openvswitch-1.4.2+git20120612/debian/patches/bug-768095-openvswitch-datapath-dkms-fails-to-build-on-Debian-7.7-3.2.0-4-amd64.patch 1970-01-01 01:00:00.0 +0100 +++ openvswitch-1.4.2+git20120612/debian/patches/bug-768095-openvswitch-datapath-dkms-fails-to-build-on-Debian-7.7-3.2.0-4-amd64.patch 2014-11-23 20:33:26.0 +0100 @@ -0,0 +1,31 @@ +Handle ip_select_ident changes, fix for debian bug #768095 + +Patch picked from ubuntu [1] (only the tunnel.c part), author Chris J Arges +chris.j.ar...@ubuntu.com. + + [1]: https://launchpadlibrarian.net/187027526/openvswitch_1.4.6-0ubuntu1.12.04.3_1.4.6-0ubuntu1.12.04.4.diff.gz +--- a/datapath/tunnel.c b/datapath/tunnel.c +@@ -1291,7 +1291,22 @@ + iph-tos = tos; + iph-ttl = ttl; + iph-frag_off = frag_off; ++ ++ /* ++ * linux commits 703133de, 73f156a6 changed this function ++ * affected stable versions are: 3.13.11.7, 3.2.63 ++ */ ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3,13,11) /* commit 73f156a6 */ ++ip_select_ident(skb, rt_dst(rt)); ++#elif LINUX_VERSION_CODE = KERNEL_VERSION(3,13,0) /* commit 703133de */ ++ ip_select_ident(skb, rt_dst(rt), NULL); ++#elif LINUX_VERSION_CODE = KERNEL_VERSION(3,2,63) /* commit 73f156a6 */ ++ ip_select_ident(skb, rt_dst(rt)); ++#elif LINUX_VERSION_CODE = KERNEL_VERSION(3,2,51) /* commit 703133de */ ++ ip_select_ident(skb, rt_dst(rt), NULL); ++#else + ip_select_ident(iph, rt_dst(rt), NULL); ++#endif + + skb = tnl_vport-tnl_ops-update_header(vport, mutable, + rt_dst(rt), skb); diff -Nru openvswitch-1.4.2+git20120612/debian/patches/series openvswitch-1.4.2+git20120612/debian/patches/series --- openvswitch-1.4.2+git20120612/debian/patches/series 2013-06-25 20:28:32.0 +0200 +++ openvswitch-1.4.2+git20120612/debian/patches/series 2014-11-23 14:50:48.0 +0100 @@ -18,3 +18,4 @@ debian-changes-1.4.2+git20120612-9 datapath_Reset_upper_layer_protocol_info_on_internal_devices.patch +bug-768095-openvswitch-datapath-dkms-fails-to-build-on-Debian-7.7-3.2.0-4-amd64.patch
Bug#770955: wheezy-pu: package openvswitch/1.4.2+git20120612-9.1~deb7u1.1
Control: tags -1 + moreinfo On Tue, 2014-11-25 at 15:03 +0100, Jonathan Dupart wrote: The current openvswitch-datapath-dkms package does not build anymore since the last kernel update in wheezy (3.2.63-2+deb7u1), see bug #768095. I'm slightly confused by the patch. You mention that the upgrade to 3.2.63 caused the issue, but this: ++#elif LINUX_VERSION_CODE = KERNEL_VERSION(3,2,51)/* commit 703133de */ ++ ip_select_ident(skb, rt_dst(rt), NULL); ++#else + ip_select_ident(iph, rt_dst(rt), NULL); ++#endif suggests that it has in fact been broken since 3.2.51. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
