Hi, I am looking for a sponsor for the package openvswitch to correct bug #768095.
This bug prevents building the openvswitch kernel module with the last stable kernel. As openvswitch maintainer requested an NMU, i built a package [1] with the patch already used by Ubuntu to fix the same bug [2] (i use this fix since 10 days on live servers). I attached a full debdiff of the changes. [1]: http://mentors.debian.net/package/openvswitch http://mentors.debian.net/debian/pool/main/o/openvswitch/openvswitch_1.4.2+git20120612-9.1~deb7u1.1.dsc [2]: https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1379201 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.000000000 +0200 +++ openvswitch-1.4.2+git20120612/debian/changelog 2014-11-23 20:28:26.000000000 +0100 @@ -1,3 +1,12 @@ +openvswitch (1.4.2+git20120612-9.1~deb7u1.1) stable; 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.000000000 +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.000000000 +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.000000000 +0200 +++ openvswitch-1.4.2+git20120612/debian/patches/series 2014-11-23 14:50:48.000000000 +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
