Adding upstream version 86.0.1.upstream/86.0.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 360 insertions, 0 deletions

diff --git a/build/debian-packages/cmake-jessie.diff b/build/debian-packages/cmake-jessie.diff
new file mode 100644
index 0000000000..7fd301f908
--- /dev/null
+++ b/build/debian-packages/cmake-jessie.diff
@@ -0,0 +1,70 @@
+diff -Nru cmake-3.16.3/debian/changelog cmake-3.16.3/debian/changelog
+--- cmake-3.16.3/debian/changelog	2020-03-16 19:09:14.000000000 +0900
++++ cmake-3.16.3/debian/changelog	2020-06-24 14:59:20.000000000 +0900
+@@ -1,3 +1,17 @@
++cmake (3.16.3-1.deb9moz1) jessie-backports; urgency=medium
++
++  * Mozilla backport for jessie.
++  * debian/rules, debian/control:
++    - Don't build against system libraries. libuv is missing on jessie, and
++      it's just simpler to disable the use of system libraries altogether.
++    - But still use system curl.
++    - Don't build a dbgsym package through dh_strip, that's not supported on
++      jessie.
++  * debian/compat: Restore a compat level of 10.
++  * debian/control: Remove versioned dependency on debhelper.
++
++ -- Mike Hommey <glandium@goemon>  Wed, 24 Jun 2020 14:59:20 +0900
++
+ cmake (3.16.3-1~bpo9+1) stretch-backports; urgency=medium
+ 
+   * Rebuild for stretch-backports.
+diff -Nru cmake-3.16.3/debian/compat cmake-3.16.3/debian/compat
+--- cmake-3.16.3/debian/compat	1970-01-01 09:00:00.000000000 +0900
++++ cmake-3.16.3/debian/compat	2020-06-24 14:57:28.000000000 +0900
+@@ -0,0 +1 @@
++10
+diff -Nru cmake-3.16.3/debian/control cmake-3.16.3/debian/control
+--- cmake-3.16.3/debian/control	2020-03-16 19:09:14.000000000 +0900
++++ cmake-3.16.3/debian/control	2020-06-24 14:59:20.000000000 +0900
+@@ -4,17 +4,10 @@
+ Maintainer: Debian CMake Team <pkg-cmake-team@lists.alioth.debian.org>
+ Uploaders: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
+            Felix Geyer <fgeyer@debian.org>
+-Build-Depends: debhelper-compat (= 12),
++Build-Depends: debhelper,
+                freebsd-glue [kfreebsd-any],
+-               libarchive-dev (>= 3.3.3),
+-               libbz2-dev,
+                libcurl4-openssl-dev | libcurl-ssl-dev,
+-               libexpat1-dev,
+-               libjsoncpp-dev,
+-               liblzma-dev,
+                libncurses5-dev,
+-               librhash-dev,
+-               libuv1-dev (>= 1.10),
+                procps [!hurd-any],
+                python3-sphinx,
+                qtbase5-dev <!stage1>,
+diff -Nru cmake-3.16.3/debian/rules cmake-3.16.3/debian/rules
+--- cmake-3.16.3/debian/rules	2020-03-16 19:09:14.000000000 +0900
++++ cmake-3.16.3/debian/rules	2020-06-24 14:59:20.000000000 +0900
+@@ -45,7 +45,7 @@
+ override_dh_auto_configure: $(BUILD_FLAGS_FILE)
+ 	rm -rf Build && mkdir -p Build
+ 	cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \
+-	                         --init=../$(BUILD_FLAGS_FILE) --system-libs \
++	                         --init=../$(BUILD_FLAGS_FILE) --system-curl \
+ 	                         --sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \
+ 	                         $(BOOTSTRAP_PARALLEL) --verbose
+ 
+@@ -71,9 +71,6 @@
+ override_dh_sphinxdoc:
+ 	dh_sphinxdoc -pcmake-doc
+ 
+-override_dh_strip:
+-	dh_strip --dbgsym-migration='cmake-dbg (<< 3.5.0-1~)'
+-
+ %:
+ 	dh $@ --with=sphinxdoc --builddirectory=Build
+ 
diff --git a/build/debian-packages/gdb-jessie.diff b/build/debian-packages/gdb-jessie.diff
new file mode 100644
index 0000000000..a363ab8a1a
--- /dev/null
+++ b/build/debian-packages/gdb-jessie.diff
@@ -0,0 +1,37 @@
+diff -Nru gdb-7.12/debian/changelog gdb-7.12/debian/changelog
+--- gdb-7.12/debian/changelog	2017-01-19 19:28:25.000000000 +0900
++++ gdb-7.12/debian/changelog	2018-02-07 15:36:15.000000000 +0900
+@@ -1,3 +1,11 @@
++gdb (7.12-6.deb8moz1) jessie; urgency=medium
++
++  * Mozilla backport for jessie.
++  * debian/rules: Don't pass --dbgsym-migration to dh_strip, it's not
++    supported on jessie's debhelper.
++
++ -- Mike Hommey <glandium@mozilla.com>  Tue, 16 Jul 2019 18:28:20 +0900
++
+ gdb (7.12-6) unstable; urgency=medium
+ 
+   * debian/patches: import 7.12 branch fixes
+diff -Nru gdb-7.12/debian/rules gdb-7.12/debian/rules
+--- gdb-7.12/debian/rules	2016-12-15 09:31:54.000000000 +0900
++++ gdb-7.12/debian/rules	2018-02-07 15:36:15.000000000 +0900
+@@ -4,7 +4,6 @@
+ 
+ DEB_BUILDDIR := $(ALL_BUILDDIR)/objdir
+ DEB_DH_INSTALL_SOURCEDIR := $(shell pwd)/debian/tmp
+-DEB_DH_STRIP_ARGS_gdb = --dbgsym-migration='gdb-dbg (<< 7.12-1~)'
+ 
+ # Override CDBS's default CFLAGS, which also includes -Wall; gdb
+ # does not handle -Wunused well with -Werror, but defaults to
+@@ -89,10 +88,6 @@
+   arch_config_args := --with-libunwind-ia64
+ endif
+ 
+-ifneq (,$(filter $(DEB_HOST_ARCH),amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x))
+-  arch_config_args += --with-babeltrace
+-endif
+-
+ ifdef GDB_TARGET
+   run_tests := no
+ 
diff --git a/build/debian-packages/python-zstandard-jessie.diff b/build/debian-packages/python-zstandard-jessie.diff
new file mode 100644
index 0000000000..fa38d309b8
--- /dev/null
+++ b/build/debian-packages/python-zstandard-jessie.diff
@@ -0,0 +1,27 @@
+diff --git a/debian/changelog b/debian/changelog
+index 84028db..d6c86c4 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -1,3 +1,9 @@
++python-zstandard (0.11.1-1.deb8moz1) jessie; urgency=low
++
++  * Remove build dependencies so package builds on jessie.
++
++ -- Mike Hommey <glandium@mozilla.com>  Thu, 25 Jul 2019 14:43:17 +0900
++
+ python-zstandard (0.9.1-1) unstable; urgency=low
+
+   * Initial Debian packaging definition.
+diff --git a/debian/control b/debian/control
+index 43bbd46..720082f 100644
+--- a/debian/control
++++ b/debian/control
+@@ -7,8 +7,6 @@ Build-Depends:
+   dh-python,
+   python-all-dev,
+   python3-all-dev,
+-  python-hypothesis,
+-  python3-hypothesis,
+   python-nose,
+   python3-nose,
+   python-setuptools,
diff --git a/build/debian-packages/python3.6-jessie.diff b/build/debian-packages/python3.6-jessie.diff
new file mode 100644
index 0000000000..c95cb7b884
--- /dev/null
+++ b/build/debian-packages/python3.6-jessie.diff
@@ -0,0 +1,165 @@
+diff -Nru python3.6-3.6.3/debian/apt_preferences python3.6-3.6.3/debian/apt_preferences
+--- python3.6-3.6.3/debian/apt_preferences	1970-01-01 09:00:00.000000000 +0900
++++ python3.6-3.6.3/debian/apt_preferences	2020-05-07 11:20:37.000000000 +0900
+@@ -0,0 +1,7 @@
++Package: python3-pkg-resources
++Pin: release n=jessie-backports
++Pin-Priority: 900
++
++Package: python3-setuptools
++Pin: release n=jessie-backports
++Pin-Priority: 900
+diff -Nru python3.6-3.6.3/debian/changelog python3.6-3.6.3/debian/changelog
+--- python3.6-3.6.3/debian/changelog	2017-12-05 19:22:15.000000000 +0900
++++ python3.6-3.6.3/debian/changelog	2020-05-07 11:20:37.000000000 +0900
+@@ -1,3 +1,19 @@
++python3.6 (3.6.3-2.deb8moz1) jessie; urgency=medium
++
++  * Mozilla backport for jessie.
++  * debian/control.in: Remove libmpdec-dev dependency; Jessie has a
++    broken version.
++  * debian/rules:
++    - Remove --with-system-libmpdec because jessie doesn't have it.
++    - Disable PGO builds because they segfault.
++  * debian/rules, debian/apt_preferences: Prefer python3-pkg-resources and
++    python3-setuptools being installed from jessie-backports when this package
++    is installed.
++  * debian/control.in, debian/rules: Don't generate the -doc package, sphinx
++    is too old in jessie.
++
++ -- Mike Hommey <glandium@mozilla.com>  Tue, 7 May 2020 11:20:37 +0900
++
+ python3.6 (3.6.3-2) unstable; urgency=medium
+ 
+   * Update to 20171205 from the 3.6 branch.
+diff -Nru python3.6-3.6.3/debian/control.in python3.6-3.6.3/debian/control.in
+--- python3.6-3.6.3/debian/control.in	2017-12-05 19:22:15.000000000 +0900
++++ python3.6-3.6.3/debian/control.in	2020-05-07 11:20:37.000000000 +0900
+@@ -9,7 +9,7 @@
+   zlib1g-dev, libbz2-dev, liblzma-dev,
+   libgdbm-dev, libdb-dev,
+   tk-dev, blt-dev (>= 2.4z), libssl-dev,
+-  libexpat1-dev, libmpdec-dev (>= 2.4),
++  libexpat1-dev,
+   libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+   locales [!armel !avr32 !hppa !ia64 !mipsel],
+   libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32],
+@@ -27,7 +27,7 @@
+ Multi-Arch: allowed
+ Priority: @PRIO@
+ Depends: @PVER@-minimal (= ${binary:Version}), lib@PVER@-stdlib (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends}
+-Suggests: @PVER@-venv, @PVER@-doc, binutils
++Suggests: @PVER@-venv, binutils
+ Description: Interactive high-level object-oriented language (version @VER@)
+  Python is a high-level, interactive, object-oriented language. Its @VER@ version
+  includes an extensive class library with lots of goodies for
+@@ -53,7 +53,7 @@
+ Priority: @PRIO@
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends: lib@PVER@-minimal (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends}
+-Breaks: libmpdec2 (<< 2.4.2), PYFPE_BREAKS
++Breaks: PYFPE_BREAKS
+ Replaces: lib@PVER@-testsuite (<< 3.6.2-2)
+ Description: Interactive high-level object-oriented language (standard library, version @VER@)
+  Python is a high-level, interactive, object-oriented language. Its @VER@ version
+@@ -164,28 +164,6 @@
+  IDLE is an Integrated Development Environment for Python (v@VER@).
+  IDLE is written using Tkinter and therefore quite platform-independent.
+ 
+-Package: @PVER@-doc
+-Section: doc
+-Architecture: all
+-Multi-Arch: foreign
+-Depends: libjs-jquery, libjs-underscore, ${misc:Depends}
+-Suggests: @PVER@
+-Description: Documentation for the high-level object-oriented language Python (v@VER@)
+- These is the official set of documentation for the interactive high-level
+- object-oriented language Python (v@VER@). All documents are provided
+- in HTML format. The package consists of ten documents:
+- .
+-   * What's New in Python@VER@
+-   * Tutorial
+-   * Python Library Reference
+-   * Macintosh Module Reference
+-   * Python Language Reference
+-   * Extending and Embedding Python
+-   * Python/C API Reference
+-   * Installing Python Modules
+-   * Documenting Python
+-   * Distributing Python Modules
+-
+ Package: @PVER@-dbg
+ Section: debug
+ Architecture: any
+diff -Nru python3.6-3.6.3/debian/rules python3.6-3.6.3/debian/rules
+--- python3.6-3.6.3/debian/rules	2017-12-05 19:22:15.000000000 +0900
++++ python3.6-3.6.3/debian/rules	2020-05-07 11:20:37.000000000 +0900
+@@ -180,14 +180,6 @@
+     DEBUG_CFLAGS += -fexceptions
+ endif
+ 
+-ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+-  ifeq ($(DEB_HOST_ARCH_OS),linux)
+-    ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 powerpc ppc64 ppc64el s390x))
+-      with_pgo := yes
+-    endif
+-  endif
+-endif
+-
+ ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 powerpc ppc64 ppc64el s390x))
+   with_lto := yes
+ endif
+@@ -347,8 +339,7 @@
+ 		--with-dbmliborder=bdb:gdbm \
+ 		--with-computed-gotos \
+ 		--without-ensurepip \
+-		--with-system-expat \
+-		--with-system-libmpdec \
++		--with-system-expat
+ 
+ ifneq (,$(filter $(DEB_HOST_ARCH), avr32 or1k))
+   common_configure_args += --without-ffi
+@@ -684,7 +675,6 @@
+ 
+ stamps/stamp-doc-html:
+ 	dh_testdir
+-	$(MAKE) -C Doc html
+ 	@mkdir -p stamps
+ 	touch stamps/stamp-doc-html
+ 
+@@ -1310,6 +1300,8 @@
+ 	  install -D -m 644 $$i debian/$$b/usr/share/lintian/overrides/$$b; \
+ 	done
+ 
++	install -D -m 644 debian/apt_preferences $(d_min)/etc/apt/preferences.d/python3.6.pref
++
+ 	touch stamps/stamp-install
+ 
+ # Build architecture-independent files here.
+@@ -1317,26 +1309,6 @@
+ 	dh_testdir -i
+ 	dh_testroot -i
+ 
+-	: # $(p_doc) package
+-	dh_installdirs -p$(p_doc) \
+-		usr/share/doc/$(p_base) \
+-		usr/share/doc/$(p_doc)
+-	dh_installdocs -p$(p_doc)
+-	cp -a Doc/build/html $(d_doc)/usr/share/doc/$(p_base)/
+-	rm -f $(d_doc)/usr/share/doc/$(p_base)/html/_static/jquery.js
+-	dh_link -p$(p_doc) \
+-		/usr/share/doc/$(p_base)/html /usr/share/doc/$(p_doc)/html \
+-		/usr/share/javascript/jquery/jquery.js /usr/share/doc/$(p_base)/html/_static/jquery.js \
+-		/usr/share/javascript/underscore/underscore.js /usr/share/doc/$(p_base)/html/_static/underscore.js
+-
+-	: # devhelp docs
+-	cd $(buildd_static) && ./python ../debian/pyhtml2devhelp.py \
+-		../$(d_doc)/usr/share/doc/$(p_base)/html index.html $(VER) \
+-		> ../$(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp
+-	gzip -9nv $(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp
+-	dh_link -p$(p_doc) \
+-		/usr/share/doc/$(p_base)/html /usr/share/devhelp/books/$(PVER)
+-
+ 	for i in $(p_ltst); do \
+ 	  rm -rf debian/$$i/usr/share/doc/$$i; \
+ 	  ln -s $(p_base) debian/$$i/usr/share/doc/$$i; \
diff --git a/build/debian-packages/valgrind-jessie.diff b/build/debian-packages/valgrind-jessie.diff
new file mode 100644
index 0000000000..aae89c02aa
--- /dev/null
+++ b/build/debian-packages/valgrind-jessie.diff
@@ -0,0 +1,61 @@
+diff -Nru valgrind-3.16.1/debian/changelog valgrind-3.16.1/debian/changelog
+--- valgrind-3.16.1/debian/changelog	2020-06-29 02:49:18.000000000 +0900
++++ valgrind-3.16.1/debian/changelog	2020-12-09 09:17:53.000000000 +0900
+@@ -1,3 +1,16 @@
++valgrind (1:3.16.1-1.deb8moz1) jessie; urgency=medium
++
++  * Mozilla backport for jessie.
++  * debian/control, debian/compat: Drop debhelper compat back to 9, which
++    requires adding back an explicit dependency on dh-autoreconf.
++  * debian/rules:
++    - Debhelper only defaulted to --parallel in compat >= 10, so add
++      --parallel back.
++    - Add an explicit --libexecdir to match that of debhelper compat level >=
++      12.
++
++ -- Mike Hommey <glandium@mozilla.com>  Wed, 9 Dec 2020 09:17:53 +0900
++
+ valgrind (1:3.16.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+diff -Nru valgrind-3.16.1/debian/compat valgrind-3.16.1/debian/compat
+--- valgrind-3.16.1/debian/compat	1970-01-01 09:00:00.000000000 +0900
++++ valgrind-3.16.1/debian/compat	2020-12-09 09:15:49.000000000 +0900
+@@ -0,0 +1 @@
++9
+diff -Nru valgrind-3.16.1/debian/control valgrind-3.16.1/debian/control
+--- valgrind-3.16.1/debian/control	2020-06-29 02:49:18.000000000 +0900
++++ valgrind-3.16.1/debian/control	2020-12-09 09:17:53.000000000 +0900
+@@ -2,7 +2,8 @@
+ Section: devel
+ Priority: optional
+ Maintainer: Alessandro Ghedini <ghedo@debian.org>
+-Build-Depends: debhelper-compat (= 13),
++Build-Depends: debhelper (>= 9),
++ dh-autoreconf,
+  gdb,
+  gcc-multilib [amd64],
+  libc6-dev-i386 [amd64],
+diff -Nru valgrind-3.16.1/debian/rules valgrind-3.16.1/debian/rules
+--- valgrind-3.16.1/debian/rules	2020-06-29 02:49:18.000000000 +0900
++++ valgrind-3.16.1/debian/rules	2020-12-09 09:17:53.000000000 +0900
+@@ -11,16 +11,16 @@
+ LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+ 
+ %:
+-	dh $@ --with=autoreconf
++	dh $@ --parallel --with=autoreconf
+ 
+ override_dh_auto_configure:
+-	dh_auto_configure -- --enable-tls CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
++	dh_auto_configure -- --libexecdir=/usr/libexec --enable-tls CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ 
+ override_dh_auto_test:
+ 	: # do nothing for now
+ 
+ override_dh_auto_build:
+-	dh_auto_build
++	dh_auto_build --parallel
+ 	$(MAKE) -C docs FAQ.txt
+ 	$(MAKE) -C docs html-docs
+ 	$(MAKE) -C docs man-pages