diff -Nru webkit2gtk-2.12.4/debian/changelog webkit2gtk-2.12.4/debian/changelog --- webkit2gtk-2.12.4/debian/changelog 2016-08-24 12:41:58.000000000 +0000 +++ webkit2gtk-2.12.4/debian/changelog 2016-09-03 03:50:42.000000000 +0000 @@ -1,3 +1,17 @@ +webkit2gtk (2.12.4-2ubuntu1~ppa1) yakkety; urgency=medium + + * Build with -fno-delete-null-pointer-checks + + -- Jeremy Bicha Fri, 02 Sep 2016 23:50:42 -0400 + +webkit2gtk (2.12.4-2) unstable; urgency=high + + * debian/rules: + + Don't use the gold linker in mips/mipsel, see #834147. + * Set urgency=high to get the CVE fixes into testing quickly. + + -- Alberto Garcia Tue, 30 Aug 2016 10:53:50 +0300 + webkit2gtk (2.12.4-1) unstable; urgency=medium * New upstream release. diff -Nru webkit2gtk-2.12.4/debian/control webkit2gtk-2.12.4/debian/control --- webkit2gtk-2.12.4/debian/control 2016-08-24 12:41:58.000000000 +0000 +++ webkit2gtk-2.12.4/debian/control 2016-09-03 03:50:42.000000000 +0000 @@ -1,7 +1,8 @@ Source: webkit2gtk Priority: optional Section: web -Maintainer: Debian WebKit Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian WebKit Maintainers Uploaders: Gustavo Noronha Silva , Emilio Pozuelo Monfort , Alberto Garcia diff -Nru webkit2gtk-2.12.4/debian/rules webkit2gtk-2.12.4/debian/rules --- webkit2gtk-2.12.4/debian/rules 2016-08-24 12:41:58.000000000 +0000 +++ webkit2gtk-2.12.4/debian/rules 2016-09-03 03:50:42.000000000 +0000 @@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -Wall -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -fno-delete-null-pointer-checks LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed DEBHELPER_VERSION = $(shell dpkg-query -W -f='$${source:Version}' debhelper) @@ -24,7 +24,7 @@ LDFLAGS += -Wl,--no-relax endif -ifeq ($(DEB_BUILD_ARCH),arm64) +ifneq (,$(filter $(DEB_BUILD_ARCH),arm64 mips mipsel)) EXTRA_CMAKE_ARGUMENTS += -DUSE_LD_GOLD=OFF endif