diff -Nru trafficserver-8.0.2+ds/debian/changelog trafficserver-8.0.2+ds/debian/changelog --- trafficserver-8.0.2+ds/debian/changelog 2020-06-25 17:58:34.000000000 +0000 +++ trafficserver-8.0.2+ds/debian/changelog 2020-06-28 16:33:35.000000000 +0000 @@ -1,3 +1,10 @@ +trafficserver (8.0.2+ds-1+rpi1+deb10u3) buster-staging; urgency=medium + + [changes brought forward from 8.0.1-4+rpi1 by Peter Michael Green at Sat, 19 Jan 2019 12:42:48 +0000] + * Use -latomic on raspbian too. + + -- Raspbian forward porter Sun, 28 Jun 2020 16:33:35 +0000 + trafficserver (8.0.2+ds-1+deb10u3) buster-security; urgency=high * Add fix from upstream for CVE-2020-9494 (Closes: #963629) diff -Nru trafficserver-8.0.2+ds/debian/rules trafficserver-8.0.2+ds/debian/rules --- trafficserver-8.0.2+ds/debian/rules 2020-06-25 17:58:34.000000000 +0000 +++ trafficserver-8.0.2+ds/debian/rules 2020-06-28 16:33:35.000000000 +0000 @@ -7,8 +7,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -O3 export DEB_CXXFLAGS_MAINT_APPEND = -O3 -# mips & mipsel need explicit libatomic link -ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),mips mipsel)) +# mips & mipsel and raspbian need explicit libatomic link +ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),mips mipsel armhf)) export DEB_LDFLAGS_MAINT_APPEND += -latomic endif