[ Felix Moessbauer ]

  * fix ABI incompatibility that crashes OVS when enabling LLDP
    (Closes: #992406).

diff --git a/debian/changelog b/debian/changelog
index 2f79455e8d23170f243e2363c0e2bf6989fcfc35..2be49d5387ab548d6c6022b40c5763e262f3f120 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ openvswitch (2.15.0+ds1-2+deb11u1) bullseye; urgency=medium
   * CVE-2021-36980: use-after-free in decode_NXAST_RAW_ENCAPAdd. Add upstream
     patch (Closes: #991308).
 
+  [ Felix Moessbauer ]
+  * fix ABI incompatibility that crashes OVS when enabling LLDP
+    (Closes: #992406).
+
  -- Thomas Goirand <zigo@debian.org>  Mon, 03 Jan 2022 13:53:38 +0100
 
 openvswitch (2.15.0+ds1-2) unstable; urgency=medium

diff --git a/debian/openvswitch-common.postinst.in b/debian/openvswitch-common.postinst.in
index 43df5b886058bc83dfc0b4cd9076a751a4eb94b7..b75b2e9ed7e87d4a9d4235a200d0543b9f33d13f 100644 (file)
--- a/debian/openvswitch-common.postinst.in
+++ b/debian/openvswitch-common.postinst.in
@@ -4,7 +4,8 @@ set -e
 
 if [ "${1}" = "configure" ] ; then
        update-alternatives --install /usr/sbin/ovs-vswitchd ovs-vswitchd /usr/lib/openvswitch-common/ovs-vswitchd 100 \
-        --slave /usr/lib/%%MULTIARCH_TRIPLETT%%/libopenvswitch-2.15.so.0.0.0 libopenvswitch.so /usr/lib/openvswitch-common/libopenvswitch-2.15.so.0.0.0
+        --slave /usr/lib/%%MULTIARCH_TRIPLETT%%/libopenvswitch-2.15.so.0.0.0 libopenvswitch.so /usr/lib/openvswitch-common/libopenvswitch-2.15.so.0.0.0 \
+        --slave /usr/lib/%%MULTIARCH_TRIPLETT%%/libofproto-2.15.so.0.0.0 libofproto.so /usr/lib/openvswitch-common/libofproto-2.15.so.0.0.0
 fi
 
 #DEBHELPER#

diff --git a/debian/openvswitch-switch-dpdk.postinst.in b/debian/openvswitch-switch-dpdk.postinst.in
index 4bbc279e33a069df46506f2fba7da596112e088e..85d231d27ede548c4b59ad61147cb647c3fc096a 100644 (file)
--- a/debian/openvswitch-switch-dpdk.postinst.in
+++ b/debian/openvswitch-switch-dpdk.postinst.in
@@ -4,7 +4,8 @@ set -e
 
 if [ "${1}" = "configure" ] ; then
        update-alternatives --install /usr/sbin/ovs-vswitchd ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk 200 \
-        --slave /usr/lib/%%MULTIARCH_TRIPLETT%%/libopenvswitch-2.15.so.0.0.0 libopenvswitch.so /usr/lib/openvswitch-switch-dpdk/libopenvswitch-2.15.so.0.0.0
+        --slave /usr/lib/%%MULTIARCH_TRIPLETT%%/libopenvswitch-2.15.so.0.0.0 libopenvswitch.so /usr/lib/openvswitch-switch-dpdk/libopenvswitch-2.15.so.0.0.0 \
+        --slave /usr/lib/%%MULTIARCH_TRIPLETT%%/libofproto-2.15.so.0.0.0 libofproto.so /usr/lib/openvswitch-switch-dpdk/libofproto-2.15.so.0.0.0
 fi
 
 #DEBHELPER#

diff --git a/debian/rules b/debian/rules
index b6d451c9c448b8c8effa9283ed0f4c279b1749f0..3020b0315e2e733540917e2820af9590d06be089 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -208,6 +208,9 @@ override_dh_auto_install-arch:
                $(CURDIR)/debian/openvswitch-common/usr/lib/openvswitch-common/ovs-vswitchd
        mv $(CURDIR)/debian/tmp/usr/lib/*/libopenvswitch-2.15.so.0.0.0 \
                $(CURDIR)/debian/openvswitch-common/usr/lib/openvswitch-common/libopenvswitch-2.15.so.0.0.0
+       mv $(CURDIR)/debian/tmp/usr/lib/*/libofproto-2.15.so.0.0.0 \
+               $(CURDIR)/debian/openvswitch-common/usr/lib/openvswitch-common/libofproto-2.15.so.0.0.0
+
 
 override_dh_auto_install-indep:
        $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
@@ -219,7 +222,10 @@ override_dh_auto_install-indep:
 
 override_dh_install:
        install -D -m 0644 utilities/ovs-vsctl-bashcomp.bash $(CURDIR)/debian/openvswitch-switch/usr/share/bash-completion/completions/ovs-vsctl
-       dh_install --exclude=usr/sbin/ovs-vswitchd --exclude=usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libopenvswitch-2.15.so.0.0.0
+       dh_install --exclude=usr/sbin/ovs-vswitchd \
+                  --exclude=usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libopenvswitch-2.15.so.0.0.0 \
+                  --exclude=usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libofproto-2.15.so.0.0.0
+
 
        rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la
        dh_installman --language=C
@@ -228,6 +234,7 @@ override_dh_install:
        # remove the files managed via update-alternatives
        rm -f $(CURDIR)/debian/tmp/usr/sbin/ovs-vswitchd
        rm -f $(CURDIR)/debian/tmp/usr/lib/*/libopenvswitch-2.15.so.0.0.0
+       rm -f $(CURDIR)/debian/tmp/usr/lib/*/libofproto-2.15.so.0.0.0
 
        dh_missing --fail-missing
        # openvswitch-switch
@@ -239,6 +246,8 @@ ifneq (,$(filter i386 amd64 ppc64el arm64, $(DEB_HOST_ARCH)))
                $(CURDIR)/debian/openvswitch-switch-dpdk/usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
        install -v -D _dpdk/lib/.libs/libopenvswitch-2.15.so.0.0.0 \
                $(CURDIR)/debian/openvswitch-switch-dpdk/usr/lib/openvswitch-switch-dpdk/libopenvswitch-2.15.so.0.0.0
+       install -v -D _dpdk/ofproto/.libs/libofproto-2.15.so.0.0.0 \
+               $(CURDIR)/debian/openvswitch-switch-dpdk/usr/lib/openvswitch-switch-dpdk/libofproto-2.15.so.0.0.0
 endif
 
 override_dh_installinit:
@@ -255,7 +264,7 @@ override_dh_strip:
        dh_strip --dbg-package=openvswitch-dbg
 
 override_dh_shlibdeps:
-       dh_shlibdeps -l$(CURDIR)/_debian/lib/.libs
+       dh_shlibdeps -l$(CURDIR)/_debian/lib/.libs:$(CURDIR)/_debian/ofproto/.libs
 
 override_dh_installman:
        echo "Do nothing..."