mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 0a1edd15b210 (bug 1634204) for valgrind bustages. CLOSED TREE

This commit is contained in:
Narcis Beleuzu 2020-05-06 17:10:37 +03:00
Родитель 76f37b5114
Коммит 51c3c369dd
39 изменённых файлов: 1395 добавлений и 362 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

31
build/debian-packages/apt-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,31 @@
diff -Nru apt-0.9.7.9+deb7u7/apt-pkg/acquire-method.cc apt-0.9.7.9+deb7u8/apt-pkg/acquire-method.cc
--- apt-0.9.7.9+deb7u7/apt-pkg/acquire-method.cc 2013-03-01 19:51:21.000000000 +0900
+++ apt-0.9.7.9+deb7u8/apt-pkg/acquire-method.cc 2019-01-23 05:51:06.000000000 +0900
@@ -416,6 +416,12 @@
* the worker will enqueue again later on to the right queue */
void pkgAcqMethod::Redirect(const string &NewURI)
{
+ if (NewURI.find_first_not_of(" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~") != std::string::npos)
+ {
+ _error->Error("SECURITY: URL redirect target contains control characters, rejecting.");
+ Fail();
+ return;
+ }
std::cout << "103 Redirect\nURI: " << Queue->Uri << "\n"
<< "New-URI: " << NewURI << "\n"
<< "\n" << std::flush;
diff -Nru apt-0.9.7.9+deb7u7/debian/changelog apt-0.9.7.9+deb7u8/debian/changelog
--- apt-0.9.7.9+deb7u7/debian/changelog 2014-10-17 16:13:17.000000000 +0900
+++ apt-0.9.7.9+deb7u8/debian/changelog 2019-01-23 05:55:19.000000000 +0900
@@ -1,3 +1,11 @@
+apt (0.9.7.9.deb7u8) wheezy-security; urgency=high
+
+ * CVE-2019-3462: Fix a content injection vulnerability that could be
+ exploited to inject arbitrary .deb or other files into a signed
+ repository via injected redirect headers.
+
+ -- Chris Lamb <lamby@debian.org> Tue, 22 Jan 2019 20:51:26 +0000
+
apt (0.9.7.9+deb7u7) stable; urgency=medium
[ David Kalnischkies ]

62
build/debian-packages/cmake-jessie.diff
Просмотреть файл

@ -1,62 +0,0 @@
diff -Nru cmake-3.7.1/debian/changelog cmake-3.7.1/debian/changelog
--- cmake-3.7.1/debian/changelog 2016-12-04 09:01:26.000000000 +0900
+++ cmake-3.7.1/debian/changelog 2019-07-16 18:17:07.000000000 +0900
@@ -1,3 +1,15 @@
+cmake (3.7.1-1.deb8moz1) jessie; 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.
+ - Don't build a dbgsym package through dh_strip, that's not supported on
+ jessie.
+ * debian/control: Remove versioned dependency on debhelper.
+
+ -- Mike Hommey <glandium@mozilla.com> Tue, 16 Jul 2019 18:17:07 +0900
+
cmake (3.7.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru cmake-3.7.1/debian/control cmake-3.7.1/debian/control
--- cmake-3.7.1/debian/control 2016-11-12 19:55:11.000000000 +0900
+++ cmake-3.7.1/debian/control 2019-07-16 18:17:07.000000000 +0900
@@ -4,16 +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 (>= 9.20160114~),
+Build-Depends: debhelper,
dpkg-dev (>= 1.17.14~),
- libarchive-dev (>= 2.8.0),
- libbz2-dev,
libcurl4-openssl-dev | libcurl-ssl-dev,
- libexpat1-dev,
- libjsoncpp-dev,
- liblzma-dev,
libncurses5-dev,
- libuv1-dev,
procps [!hurd-any],
python-sphinx,
qtbase5-dev <!stage1>,
diff -Nru cmake-3.7.1/debian/rules cmake-3.7.1/debian/rules
--- cmake-3.7.1/debian/rules 2016-12-04 07:30:25.000000000 +0900
+++ cmake-3.7.1/debian/rules 2019-07-16 18:17:07.000000000 +0900
@@ -44,7 +44,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) \
--sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \
$(BOOTSTRAP_PARALLEL) --verbose
@@ -68,9 +68,6 @@
override_dh_sphinxdoc:
dh_sphinxdoc -pcmake-doc
-override_dh_strip:
- dh_strip --dbgsym-migration='cmake-dbg (<< 3.5.0-1~)'
-
%:
dh $@ --with=sphinxdoc --parallel --builddirectory=Build

148
build/debian-packages/cmake-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,148 @@
diff -Nru cmake-3.7.1/debian/changelog cmake-3.7.1/debian/changelog
--- cmake-3.7.1/debian/changelog 2016-12-04 09:01:26.000000000 +0900
+++ cmake-3.7.1/debian/changelog 2017-12-21 15:46:11.000000000 +0900
@@ -1,3 +1,22 @@
+cmake (3.7.1-1.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+ * debian/rules, debian/control:
+ - Remove versioned dependencies on dpkg/dpkg-dev/debhelper.
+ - Don't build against system libraries. libuv is missing on wheezy, there
+ are API incompatibilities with libjsoncpp, and it's just simpler to
+ disable the use of system libraries altogether.
+ - Remove Qt GUI. Build profiles are not supported on Wheezy, and Qt5 is
+ not available either. It's not like we need the feature.
+ - Don't build a dbgsym package through dh_strip, that's not supported on
+ Wheezy.
+ * debian/*.maintscript: Remove symlink_to_dir entries, they're not supported
+ on Wheezy. Ideally, we'd replace them with the proper preinst snippet, but
+ it's only needed for upgrades of the package from older versions, and we
+ don't actually care that this works properly.
+
+ -- Mike Hommey <glandium@mozilla.com> Thu, 21 Dec 2017 15:46:11 +0900
+
cmake (3.7.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru cmake-3.7.1/debian/cmake-curses-gui.maintscript cmake-3.7.1/debian/cmake-curses-gui.maintscript
--- cmake-3.7.1/debian/cmake-curses-gui.maintscript 2016-10-31 02:20:34.000000000 +0900
+++ cmake-3.7.1/debian/cmake-curses-gui.maintscript 2017-12-21 15:46:11.000000000 +0900
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/doc/cmake-curses-gui /usr/share/doc/cmake-data 2.8.12.2-2~
diff -Nru cmake-3.7.1/debian/cmake-dbg.maintscript cmake-3.7.1/debian/cmake-dbg.maintscript
--- cmake-3.7.1/debian/cmake-dbg.maintscript 2016-10-31 02:20:34.000000000 +0900
+++ cmake-3.7.1/debian/cmake-dbg.maintscript 2017-12-21 15:46:11.000000000 +0900
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/doc/cmake-dbg /usr/share/doc/cmake-data 2.8.12.2-2~
diff -Nru cmake-3.7.1/debian/cmake-qt-gui.maintscript cmake-3.7.1/debian/cmake-qt-gui.maintscript
--- cmake-3.7.1/debian/cmake-qt-gui.maintscript 2016-10-31 02:20:34.000000000 +0900
+++ cmake-3.7.1/debian/cmake-qt-gui.maintscript 2017-12-21 15:46:11.000000000 +0900
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/doc/cmake-qt-gui /usr/share/doc/cmake-data 2.8.12.2-2~
diff -Nru cmake-3.7.1/debian/cmake.maintscript cmake-3.7.1/debian/cmake.maintscript
--- cmake-3.7.1/debian/cmake.maintscript 2016-10-31 02:20:34.000000000 +0900
+++ cmake-3.7.1/debian/cmake.maintscript 2017-12-21 15:46:11.000000000 +0900
@@ -1,4 +1,3 @@
-symlink_to_dir /usr/share/doc/cmake /usr/share/doc/cmake-data 2.8.12.2-2~
rm_conffile /etc/bash_completion.d/cmake 3.2.2-3~
rm_conffile /etc/bash_completion.d/cpack 3.2.2-3~
rm_conffile /etc/bash_completion.d/ctest 3.2.2-3~
diff -Nru cmake-3.7.1/debian/control cmake-3.7.1/debian/control
--- cmake-3.7.1/debian/control 2016-11-12 19:55:11.000000000 +0900
+++ cmake-3.7.1/debian/control 2017-12-21 15:46:11.000000000 +0900
@@ -4,20 +4,12 @@
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 (>= 9.20160114~),
- dpkg-dev (>= 1.17.14~),
- libarchive-dev (>= 2.8.0),
- libbz2-dev,
+Build-Depends: debhelper,
+ dpkg-dev,
libcurl4-openssl-dev | libcurl-ssl-dev,
- libexpat1-dev,
- libjsoncpp-dev,
- liblzma-dev,
libncurses5-dev,
- libuv1-dev,
procps [!hurd-any],
- python-sphinx,
- qtbase5-dev <!stage1>,
- zlib1g-dev
+ python-sphinx
Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-cmake/cmake.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-cmake/cmake.git/
@@ -26,7 +18,6 @@
Package: cmake
Architecture: any
Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.17.5~)
Depends: cmake-data (= ${source:Version}),
procps [!hurd-any],
${misc:Depends},
@@ -59,7 +50,6 @@
Package: cmake-curses-gui
Architecture: any
-Pre-Depends: dpkg (>= 1.17.5~)
Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: curses based user interface for CMake (ccmake)
CMake is used to control the software compilation process using simple
@@ -72,23 +62,6 @@
are provided at the bottom of the terminal when the program is running. The
main executable file for this GUI is "ccmake".
-Package: cmake-qt-gui
-Architecture: any
-Build-Profiles: <!stage1>
-Pre-Depends: dpkg (>= 1.17.5~)
-Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Provides: cmake-gui
-Description: Qt based user interface for CMake (cmake-gui)
- CMake is used to control the software compilation process using simple
- platform and compiler independent configuration files. CMake generates native
- makefiles and workspaces that can be used in the compiler environment of your
- choice.
- .
- This package provides the CMake Qt based GUI. Project configuration
- settings may be specified interactively. Brief instructions are provided at
- the bottom of the window when the program is running. The main executable
- file for this GUI is "cmake-gui".
-
Package: cmake-doc
Architecture: all
Section: doc
diff -Nru cmake-3.7.1/debian/rules cmake-3.7.1/debian/rules
--- cmake-3.7.1/debian/rules 2016-12-04 07:30:25.000000000 +0900
+++ cmake-3.7.1/debian/rules 2017-12-21 15:46:11.000000000 +0900
@@ -29,9 +29,6 @@
$(call $(flag_action),CMAKE_CXX_FLAGS,"$(CXXFLAGS)","C++ flags")
$(call $(flag_action),CMAKE_SKIP_BOOTSTRAP_TEST,ON,"Skip BootstrapTest")
$(call $(flag_action),BUILD_CursesDialog,ON,"Build curses GUI")
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
- $(call $(flag_action),BUILD_QtDialog,ON,"Build Qt GUI")
-endif
ifeq ($(DEB_HOST_ARCH_OS),hurd)
$(call $(flag_action),CMAKE_USE_LIBUV,0,"Do not use libuv")
endif
@@ -44,7 +41,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) \
--sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \
$(BOOTSTRAP_PARALLEL) --verbose
@@ -68,9 +65,6 @@
override_dh_sphinxdoc:
dh_sphinxdoc -pcmake-doc
-override_dh_strip:
- dh_strip --dbgsym-migration='cmake-dbg (<< 3.5.0-1~)'
-
%:
dh $@ --with=sphinxdoc --parallel --builddirectory=Build

25
build/debian-packages/dpkg-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,25 @@
diff -Nru dpkg-1.17.20/debian/changelog dpkg-1.17.20.deb7moz1/debian/changelog
--- dpkg-1.17.20/debian/changelog 2014-10-23 08:56:30.000000000 +0900
+++ dpkg-1.17.20.deb7moz1/debian/changelog 2018-01-17 18:30:46.000000000 +0900
@@ -1,3 +1,10 @@
+dpkg (1.17.20.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+ * Apply patch from 1.17.23 fixing build against perl 5.14.
+
+ -- Mike Hommey <glandium@mozilla.com> Wed, 17 Jan 2018 18:30:46 +0900
+
dpkg (1.17.20) unstable; urgency=low
[ Guillem Jover ]
diff -Nru dpkg-1.17.20/dselect/mkcurkeys.pl dpkg-1.17.20.deb7moz1/dselect/mkcurkeys.pl
--- dpkg-1.17.20/dselect/mkcurkeys.pl 2014-10-21 09:45:43.000000000 +0900
+++ dpkg-1.17.20.deb7moz1/dselect/mkcurkeys.pl 2018-01-17 18:30:46.000000000 +0900
@@ -140,6 +140,6 @@
sub p {
my ($k, $v) = @_;
- $v =~ s/["\\]/\\${^MATCH}/pg;
+ $v =~ s/(["\\])/\\$1/g;
printf(" { %-15s \"%-20s },\n", $k . ',', $v . '"') or die $!;
}

37
build/debian-packages/gdb-jessie.diff
Просмотреть файл

@ -1,37 +0,0 @@
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

65
build/debian-packages/gdb-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,65 @@
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,16 @@
+gdb (7.12-6.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+ * debian/rules, debian/control: Don't use libbabeltrace, which is not
+ available on wheezy.
+ * debian/rules:
+ - Use DEB_HOST_{ARCH,GNU_TYPE} instead of DEB_TARGET_{ARCH,GNU_TYPE}
+ because the latter is not available on wheezy.
+ - Don't pass --dbgsym-migration to dh_strip, it's not supported on
+ wheezy's debhelper.
+
+ -- Mike Hommey <glandium@mozilla.com> Wed, 07 Feb 2018 15:36:15 +0900
+
gdb (7.12-6) unstable; urgency=medium
* debian/patches: import 7.12 branch fixes
diff -Nru gdb-7.12/debian/control gdb-7.12/debian/control
--- gdb-7.12/debian/control 2017-01-17 20:01:41.000000000 +0900
+++ gdb-7.12/debian/control 2018-02-07 15:36:06.000000000 +0900
@@ -33,8 +33,6 @@
libreadline-dev,
zlib1g-dev,
liblzma-dev,
- libbabeltrace-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64el powerpc s390x],
- libbabeltrace-ctf-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64el powerpc s390x],
python-dev,
# Python3 build
python3-dev,
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
@@ -35,8 +34,8 @@
DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_TARGET_ARCH)
-DEB_TARGET_GNU_TYPE := $(shell dpkg-architecture -qDEB_TARGET_GNU_TYPE)
+DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_TARGET_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
# Cross configuration support. Check for an environment variable
# $GDB_TARGET, or a file debian/target.
@@ -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

26
build/debian-packages/glib-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,26 @@
diff -Nru glib2.0-2.38.2/debian/changelog glib2.0-2.38.2/debian/changelog
--- glib2.0-2.38.2/debian/changelog 2014-02-15 21:47:00.000000000 +0900
+++ glib2.0-2.38.2/debian/changelog 2018-11-02 09:47:49.000000000 +0900
@@ -1,3 +1,10 @@
+glib2.0 (2.38.2-5.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for Wheezy.
+ * debian/control: Remove :any from dependencies because it's not supported.
+
+ -- Mike Hommey <glandium@mozilla.com> Fri, 02 Nov 2018 09:47:49 +0900
+
glib2.0 (2.38.2-5) unstable; urgency=medium
* Upload to unstable.
diff -Nru glib2.0-2.38.2/debian/control glib2.0-2.38.2/debian/control
--- glib2.0-2.38.2/debian/control 2014-02-15 21:50:26.000000000 +0900
+++ glib2.0-2.38.2/debian/control 2018-11-02 09:47:24.000000000 +0900
@@ -24,7 +24,7 @@
dbus-x11,
shared-mime-info,
xterm,
- python:any (>= 2.6.6-3~),
+ python (>= 2.6.6-3~),
python-dbus,
python-gi,
libxml2-utils,

38
build/debian-packages/gtk-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,38 @@
diff -Nru gtk+3.0-3.10.7/debian/changelog gtk+3.0-3.10.7/debian/changelog
--- gtk+3.0-3.10.7/debian/changelog 2014-02-15 22:20:29.000000000 +0900
+++ gtk+3.0-3.10.7/debian/changelog 2018-11-02 12:04:23.000000000 +0900
@@ -1,3 +1,11 @@
+gtk+3.0 (3.10.7-1.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for Wheezy.
+ * gtk/Makefile.am: Filter-out -fvisibility=hidden from the flags passed
+ to g-ir-scanner.
+
+ -- Mike Hommey <glandium@mozilla.com> Fri, 02 Nov 2018 12:04:23 +0900
+
gtk+3.0 (3.10.7-1) unstable; urgency=low
* debian/libgtk-3-bin.install:
diff -Nru gtk+3.0-3.10.7/debian/patches/deb7moz1 gtk+3.0-3.10.7/debian/patches/deb7moz1
--- gtk+3.0-3.10.7/debian/patches/deb7moz1 1970-01-01 09:00:00.000000000 +0900
+++ gtk+3.0-3.10.7/debian/patches/deb7moz1 2018-11-02 12:04:23.000000000 +0900
@@ -0,0 +1,11 @@
+--- gtk+3.0-3.10.7.orig/gtk/Makefile.am
++++ gtk+3.0-3.10.7/gtk/Makefile.am
+@@ -1352,7 +1352,7 @@ Gtk_3_0_gir_INCLUDES += xlib-2.0
+ endif
+ Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
+ Gtk_3_0_gir_CFLAGS = \
+- $(AM_CPPFLAGS) \
++ $(filter-out -fvisibility=hidden,$(AM_CPPFLAGS)) \
+ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
+ Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
+ Gtk_3_0_gir_FILES = $(introspection_files)
diff -Nru gtk+3.0-3.10.7/debian/patches/series gtk+3.0-3.10.7/debian/patches/series
--- gtk+3.0-3.10.7/debian/patches/series 2014-02-15 22:14:46.000000000 +0900
+++ gtk+3.0-3.10.7/debian/patches/series 2018-11-02 12:04:23.000000000 +0900
@@ -12,3 +12,4 @@
061_multiarch_module_fallback.patch
071_fix-installation-of-HTML-images.patch
080_disable-parallel-docs-build.patch
+deb7moz1

13
build/debian-packages/make-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,13 @@
diff -Nru make-dfsg-4.0/debian/changelog make-dfsg-4.0/debian/changelog
--- make-dfsg-4.0/debian/changelog 2015-01-18 03:30:55.000000000 +0900
+++ make-dfsg-4.0/debian/changelog 2018-01-13 14:06:23.000000000 +0900
@@ -1,3 +1,9 @@
+make-dfsg (4.0-8.1.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 13 Jan 2018 14:06:23 +0900
+
make-dfsg (4.0-8.1) unstable; urgency=medium
* Non-maintainer upload.

65
build/debian-packages/python-defaults-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,65 @@
diff -Nru python-defaults-2.7.3/debian/changelog python-defaults-2.7.3/debian/changelog
--- python-defaults-2.7.3/debian/changelog 2013-09-29 04:36:47.000000000 +0900
+++ python-defaults-2.7.3/debian/changelog 2018-11-06 18:06:20.000000000 +0900
@@ -1,3 +1,10 @@
+python-defaults (2.7.3-4.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for Wheezy.
+ * debian/control: Set "Multi-Arch: foreign" on various packages.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 06 Nov 2018 18:06:20 +0900
+
python-defaults (2.7.3-4+deb7u1) stable; urgency=low
* Add symlink for /usr/bin/python2 (Closes: #723182)
diff -Nru python-defaults-2.7.3/debian/control.in python-defaults-2.7.3/debian/control.in
--- python-defaults-2.7.3/debian/control.in 2012-07-01 03:36:04.000000000 +0900
+++ python-defaults-2.7.3/debian/control.in 2018-11-06 18:06:20.000000000 +0900
@@ -12,6 +12,7 @@
Package: python
Architecture: all
+Multi-Arch: foreign
Priority: standard
Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), python-minimal (= ${binary:Version})
Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version})
@@ -29,6 +30,7 @@
Package: python-minimal
Architecture: all
+Multi-Arch: foreign
Priority: standard
Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20)
Recommends: python
@@ -102,6 +104,7 @@
Package: python-dbg
Architecture: all
+Multi-Arch: foreign
Section: debug
Priority: extra
Depends: ${misc:Depends}, python (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
@@ -112,6 +115,7 @@
Package: python-all
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.7-3), python2.7 (>= 2.7.2-3)
Description: package depending on all supported Python runtime versions
The package currently depends on python2.6 and python2.7, in the future,
@@ -123,6 +127,7 @@
Package: python-all-dev
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.6-dev (>= 2.6.5-2), python2.7-dev (>= 2.7-7)
Description: package depending on all supported Python development packages
The package currently depends on python2.6-dev and python2.7-dev, in the
@@ -134,6 +139,7 @@
Package: python-all-dbg
Architecture: all
+Multi-Arch: foreign
Section: debug
Priority: extra
Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.6-dbg (>= 2.6.5-2), python2.7-dbg (>= 2.7-7)

149
build/debian-packages/python-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,149 @@
diff -u python2.7-2.7.9/debian/changelog python2.7-2.7.9/debian/changelog
--- python2.7-2.7.9/debian/changelog
+++ python2.7-2.7.9/debian/changelog
@@ -1,3 +1,17 @@
+python2.7 (2.7.9-2.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+ * debian/control.in:
+ - Remove gcc 4.9 build dependency, wheezy doesn't have it.
+ - Remove libexpat1-dev dependency from python dev packages. It prevents
+ from co-installing some i386 -dev packages.
+ * debian/rules:
+ - Adapt ar, ranlib and objcopy paths to work on wheezy.
+ * debian/control.in, debian/rules: Don't generate the -doc package, sphinx
+ is too old in wheezy.
+
+ -- Mike Hommey <glandium@mozilla.com> Fri, 13 Oct 2017 19:20:21 +0900
+
python2.7 (2.7.9-2+deb8u1) jessie; urgency=medium
* Backport upstream commit b3ce713fb9beebfff9848cefa0acbd59acc68fe9
diff -u python2.7-2.7.9/debian/control.in python2.7-2.7.9/debian/control.in
--- python2.7-2.7.9/debian/control.in
+++ python2.7-2.7.9/debian/control.in
@@ -3,7 +3,6 @@
Priority: optional
Maintainer: Matthias Klose <doko@debian.org>
Build-Depends: debhelper (>= 5), @bd_dpkgdev@
- gcc (>= 4:4.9.2),
quilt, autoconf, autotools-dev,
lsb-release, sharutils,
libreadline-dev, libtinfo-dev, libncursesw5-dev (>= 5.3), @bd_gcc@
@@ -112,7 +111,7 @@
Package: @PVER@-dev
Architecture: any
Multi-Arch: allowed
-Depends: @PVER@ (= ${binary:Version}), lib@PVER@-dev (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: @PVER@ (= ${binary:Version}), lib@PVER@-dev (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: libc6-dev | libc-dev
Replaces: @PVER@ (<< 2.7-3)
Description: Header files and a static library for Python (v@VER@)
@@ -127,7 +126,7 @@
Architecture: any
Multi-Arch: same
Pre-Depends: multiarch-support
-Depends: lib@PVER@-stdlib (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: lib@PVER@-stdlib (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: @PVER@ (<< 2.7-3), @PVER@-dev (<< 2.7.3-10), @PVER@-minimal (<< 2.7.3-10)
Recommends: libc6-dev | libc-dev
Description: Header files and a static library for Python (v@VER@)
@@ -161,27 +160,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
-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 -u python2.7-2.7.9/debian/rules python2.7-2.7.9/debian/rules
--- python2.7-2.7.9/debian/rules
+++ python2.7-2.7.9/debian/rules
@@ -121,8 +121,8 @@
CC = $(DEB_HOST_GNU_TYPE)-gcc
CXX=$(DEB_HOST_GNU_TYPE)-g++
-AR=$(DEB_HOST_GNU_TYPE)-ar
-RANLIB=$(DEB_HOST_GNU_TYPE)-ranlib
+AR=$(DEB_HOST_GNU_TYPE)-gcc-ar-4.7
+RANLIB=$(DEB_HOST_GNU_TYPE)-gcc-ranlib-4.7
DPKG_CFLAGS := $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS)
DPKG_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
@@ -171,8 +171,6 @@
LTO_CFLAGS += -ffat-lto-objects
endif
EXTRA_OPT_CFLAGS += $(LTO_CFLAGS)
- AR=$(DEB_HOST_GNU_TYPE)-gcc-ar
- RANLIB=$(DEB_HOST_GNU_TYPE)-gcc-ranlib
endif
make_build_target = $(if $(with_pgo),profile-opt)
@@ -628,7 +626,6 @@
stamps/stamp-doc-html:
dh_testdir
- $(MAKE) -C Doc html
touch stamps/stamp-doc-html
build-doc: stamps/stamp-patch stamps/stamp-build-doc
@@ -1215,30 +1212,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
- rm -f $(d_doc)/usr/share/doc/$(p_base)/html/_static/underscore.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
- $(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 -9v $(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_lbase) debian/$$i/usr/share/doc/$$i; \
@@ -1298,7 +1271,7 @@
endif
find $(d_ldbg) $(d_ldev) -name '*.a' ! -type l \
- | xargs -n 1 $(DEB_HOST_GNU_TYPE)-objcopy -p --remove-section=.gnu.lto_.*
+ | xargs -n 1 objcopy -p --remove-section=.gnu.lto_.*
dh_strip -a -N$(p_dbg) -N$(p_ldbg) -Xdebug -Xdbg --dbg-package=$(p_dbg)
cp Tools/gdb/libpython.py $(d_dbg)/usr/lib/debug/usr/bin/$(PVER)-gdb.py
ln -sf $(PVER)-gdb.py $(d_dbg)/usr/lib/debug/usr/bin/$(PVER)-dbg-gdb.py

4
build/debian-packages/python-zstandard-jessie.diff → build/debian-packages/python-zstandard-wheezy.diff
Просмотреть файл

@ -3,9 +3,9 @@ index 84028db..d6c86c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-zstandard (0.11.1-1.deb8moz1) jessie; urgency=low
+python-zstandard (0.11.1-1.deb7moz1) wheezy; urgency=low
+
+ * Remove build dependencies so package builds on jessie.
+ * Remove build dependencies so package builds on Wheezy.
+
+ -- Mike Hommey <glandium@mozilla.com> Thu, 25 Jul 2019 14:43:17 +0900
+

31
build/debian-packages/python3-defaults-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,31 @@
diff --git a/debian/changelog b/debian/changelog
index a2948ae..338ed66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python3-defaults (3.5.3-1.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+ * debian/control.in
+ * Remove :any from dependencies because it seems to confuse wheezy
+
+ -- Gregory Szorc <gps@mozilla.com> Tue, 9 May 2018 15:00:00 -0800
+
python3-defaults (3.5.3-1) unstable; urgency=medium
* Bump version to 3.5.3.
diff --git a/debian/control.in b/debian/control.in
index 89e1aa4..e58be76 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,8 +5,8 @@ Maintainer: Matthias Klose <doko@debian.org>
Uploaders: Piotr O<C5><BC>arowski <piotr@debian.org>, Scott Kitterman <scott@kitterman.com>
Build-Depends: debhelper (>= 9), @bd_i586@
lsb-release,
- python3-minimal:any,
- python3.5-minimal:any,
+ python3-minimal,
+ python3.5-minimal,
python3-docutils,
debiandoc-sgml
Standards-Version: 3.9.8

89
build/debian-packages/python3.5-jessie.diff
Просмотреть файл

@ -1,89 +0,0 @@
diff -Nru python3.5-3.5.3/debian/apt_preferences python3.5-3.5.3/debian/apt_preferences
--- python3.5-3.5.3/debian/apt_preferences 1970-01-01 09:00:00.000000000 +0900
+++ python3.5-3.5.3/debian/apt_preferences 2019-07-16 17:55:56.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.5-3.5.3/debian/changelog python3.5-3.5.3/debian/changelog
--- python3.5-3.5.3/debian/changelog 2017-01-19 23:11:04.000000000 +0900
+++ python3.5-3.5.3/debian/changelog 2019-07-16 17:55:56.000000000 +0900
@@ -1,3 +1,17 @@
+python3.5 (3.5.3-1.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.
+
+ -- Mike Hommey <glandium@mozilla.com> Tue, 16 Jul 2019 17:55:56 +0900
+
python3.5 (3.5.3-1) unstable; urgency=medium
* Python 3.5.3 release.
diff -Nru python3.5-3.5.3/debian/control.in python3.5-3.5.3/debian/control.in
--- python3.5-3.5.3/debian/control.in 2016-12-13 23:21:47.000000000 +0900
+++ python3.5-3.5.3/debian/control.in 2019-07-16 17:55:56.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],
@@ -53,7 +53,6 @@
Priority: @PRIO@
Pre-Depends: ${misc:Pre-Depends}
Depends: lib@PVER@-minimal (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends}
-Breaks: libmpdec2 (<< 2.4.2)
Description: Interactive high-level object-oriented language (standard library, version @VER@)
Python is a high-level, interactive, object-oriented language. Its @VER@ version
includes an extensive class library with lots of goodies for
diff -Nru python3.5-3.5.3/debian/rules python3.5-3.5.3/debian/rules
--- python3.5-3.5.3/debian/rules 2017-01-19 23:11:04.000000000 +0900
+++ python3.5-3.5.3/debian/rules 2019-07-16 17:55:56.000000000 +0900
@@ -155,14 +155,6 @@
EXTRA_OPT_FLAGS += -O2
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
@@ -321,8 +313,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
@@ -1292,6 +1283,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.5.pref
+
touch stamps/stamp-install
# Build architecture-independent files here.

192
build/debian-packages/python3.5-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,192 @@
diff --git a/debian/changelog b/debian/changelog
index e19964f..0bc60c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+python3.5 (3.5.3-1.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+ * debian/control.in:
+ - Remove libmpdec-dev dependency; wheezy doesn't have it; Python
+ vendors it.
+ - Remove libexpat1-dev dependency; it prevents co-installing some
+ i386 -dev packages.
+ * debian/rules:
+ - Adapt ar, ranlib, and objcopy paths to work on wheezy.
+ - Remove --with-system-libmpdec because wheezy doesn't have it.
+ - Disable PGO builds because they segfault.
+ - Remove -Og from debug builds because GCC 4.7 doesn't like it.
+ * debian/control.in, debian/rules: Don't generate the -doc package
+ and HTML documentation.
+
+ -- Gregory Szorc <gps@mozilla.com> Thu, 29 Mar 2018 20:00:00 -0700
+
python3.5 (3.5.3-1) unstable; urgency=medium
* Python 3.5.3 release.
diff --git a/debian/control.in b/debian/control.in
index 7d36556..ec1af78 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9), @bd_dpkgdev@
zlib1g-dev, libbz2-dev, liblzma-dev,
libgdbm-dev, libdb-dev,
tk-dev, blt-dev (>= 2.4z), libssl-dev,
- libexpat1-dev, libmpdec-dev (>= 2.4),
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 +26,7 @@ Architecture: any
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
@@ -115,7 +114,7 @@ Description: Examples for the Python language (v@VER@)
Package: @PVER@-dev
Architecture: any
Multi-Arch: allowed
-Depends: @PVER@ (= ${binary:Version}), lib@PVER@-dev (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: @PVER@ (= ${binary:Version}), lib@PVER@-dev (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: libc6-dev | libc-dev
Description: Header files and a static library for Python (v@VER@)
Header files, a static library and development tools for building
@@ -129,7 +128,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: lib@PVER@-stdlib (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: lib@PVER@-stdlib (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: libc6-dev | libc-dev
Description: Header files and a static library for Python (v@VER@)
Header files, a static library and development tools for building
@@ -161,28 +160,6 @@ Description: IDE for Python (v@VER@) using Tkinter
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 --git a/debian/rules b/debian/rules
index 05895da..294d432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,14 +136,14 @@ endif
CC=$(DEB_HOST_GNU_TYPE)-gcc
CXX=$(DEB_HOST_GNU_TYPE)-g++
-AR=$(DEB_HOST_GNU_TYPE)-ar
-RANLIB=$(DEB_HOST_GNU_TYPE)-ranlib
+AR=$(DEB_HOST_GNU_TYPE)-gcc-ar-4.7
+RANLIB=$(DEB_HOST_GNU_TYPE)-gcc-ranlib-4.7
DPKG_CPPFLAGS:= $(shell dpkg-buildflags --get CPPFLAGS)
DPKG_CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
DPKG_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
OPT_CFLAGS := $(filter-out -O%,$(DPKG_CFLAGS)) # default is -O3
-DEBUG_CFLAGS := $(patsubst -O%,-Og,$(DPKG_CFLAGS))
+DEBUG_CFLAGS := $(DPKG_CFLAGS)
# on alpha, use -O2 only, use -mieee
ifeq ($(DEB_HOST_ARCH),alpha)
@@ -155,14 +155,6 @@ ifeq ($(DEB_HOST_ARCH),m68k)
EXTRA_OPT_FLAGS += -O2
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
@@ -187,8 +179,6 @@ ifeq ($(with_lto),yes)
LTO_CFLAGS += -ffat-lto-objects
endif
EXTRA_OPT_CFLAGS += $(LTO_CFLAGS)
- AR=$(DEB_HOST_GNU_TYPE)-gcc-ar
- RANLIB=$(DEB_HOST_GNU_TYPE)-gcc-ranlib
endif
make_build_target = $(if $(with_pgo),profile-opt)
@@ -322,7 +312,6 @@ common_configure_args = \
--with-computed-gotos \
--without-ensurepip \
--with-system-expat \
- --with-system-libmpdec \
ifneq (,$(filter $(DEB_HOST_ARCH), avr32 or1k))
common_configure_args += --without-ffi
@@ -659,7 +648,6 @@ minimal-test:
stamps/stamp-doc-html:
dh_testdir
- $(MAKE) -C Doc html
@mkdir -p stamps
touch stamps/stamp-doc-html
@@ -1299,26 +1287,6 @@ binary-indep: build-indep install stamps/stamp-control
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; \
@@ -1377,7 +1345,7 @@ ifneq ($(with_gdbm),yes)
endif
find $(d_ldbg) $(d_ldev) -name '*.a' ! -type l \
- | xargs -n 1 $(DEB_HOST_GNU_TYPE)-objcopy -p --remove-section=.gnu.lto_.*
+ | xargs -n 1 objcopy -p --remove-section=.gnu.lto_.*
dh_strip -a -N$(p_dbg) -N$(p_ldbg) -Xdebug -Xdbg --dbg-package=$(p_dbg)
mkdir -p $(d_dbg)/usr/share/gdb/auto-load/usr/bin
cp Tools/gdb/libpython.py $(d_dbg)/usr/share/gdb/auto-load/usr/bin/$(PVER)m-gdb.py

58
build/debian-packages/sqlite3-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,58 @@
diff --git a/debian/changelog b/debian/changelog
index ba3d92c..8a122c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sqlite3 (3.16.2-5.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+ * debian/control, debian/rules:
+ - Downgrade tcl version from 8.6 to 8.5.
+ - Update tcl library path to reflect lack of multiarch.
+
+ -- Gregory Szorc <gps@mozilla.com> Tue, 11 Dec 2018 12:13:00 -0700
+
sqlite3 (3.16.2-5) unstable; urgency=medium
* Backport fix for corruption due to REPLACE in an auto-vacuumed database.
diff --git a/debian/control b/debian/control
index af12a8d..e150d02 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: sqlite3
Section: devel
Priority: optional
Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), autoconf (>= 2.59), libtool (>= 1.5.2), automake, autotools-dev, chrpath, libreadline-dev, tcl8.6-dev, dh-autoreconf
-Build-Conflicts: tcl8.4, tcl8.4-dev, tcl8.5, tcl8.5-dev
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), autoconf (>= 2.59), libtool (>= 1.5.2), automake, autotools-dev, chrpath, libreadline-dev, tcl8.5-dev, dh-autoreconf
+Build-Conflicts: tcl8.4, tcl8.4-dev
Homepage: http://www.sqlite.org/
Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index 72333f7..198f716 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,10 +22,10 @@ export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export LDFLAGS += -Wl,--as-needed
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE) --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl8.6
+ confflags += --build $(DEB_HOST_GNU_TYPE) --with-tcl=/usr/lib/tcl8.5
export CROSS_BUILDING=no
else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl8.6
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --with-tcl=/usr/lib/tcl8.5
LDFLAGS += -L/usr/lib/$(DEB_HOST_MULTIARCH)
export CROSS_BUILDING=yes
endif
@@ -115,7 +115,7 @@ install: build
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
echo "pkg_mkIndex -verbose $(DESTDIR)/usr/lib/tcltk/sqlite3" | \
LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH) \
- tclsh8.6
+ tclsh8.5
grep -q 'package ifneeded sqlite3' \
$(DESTDIR)/usr/lib/tcltk/sqlite3/pkgIndex.tcl || \
(echo "pkgIndex.tcl seems to be wrong" && exit 1)

19
build/debian-packages/valgrind-jessie.diff → build/debian-packages/valgrind-wheezy.diff
Просмотреть файл

@ -1,14 +1,15 @@
diff -Nru valgrind-3.15.0/debian/changelog valgrind-3.15.0/debian/changelog
--- valgrind-3.15.0/debian/changelog 2019-07-14 19:23:29.000000000 +0900
+++ valgrind-3.15.0/debian/changelog 2019-07-17 18:19:13.000000000 +0900
@@ -1,3 +1,13 @@
+valgrind (1:3.15.0-1.deb8moz1) jessie; urgency=medium
@@ -1,3 +1,14 @@
+valgrind (1:3.15.0-1.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for jessie.
+ * debian/control, debian/compat: Drop debhelper compat back to 9, which
+ * Mozilla backport for wheezy.
+ * debian/control, debian/compat: Drop debhelper compat back to 7, which
+ requires adding back an explicit dependency on dh-autoreconf.
+ * debian/rules: Debhelper only defaulted to --parallel in compat >= 10, so
+ add --parallel back.
+ * debian/valgrind-mpi.install: Use non-multiarch path.
+
+ -- Mike Hommey <glandium@mozilla.com> Wed, 17 Jul 2019 18:19:13 +0900
+
@ -20,7 +21,7 @@ diff -Nru valgrind-3.15.0/debian/compat valgrind-3.15.0/debian/compat
+++ valgrind-3.15.0/debian/compat 2019-07-17 18:19:13.000000000 +0900
@@ -1 +1 @@
-12
+9
+7
diff -Nru valgrind-3.15.0/debian/control valgrind-3.15.0/debian/control
--- valgrind-3.15.0/debian/control 2019-07-14 19:23:29.000000000 +0900
+++ valgrind-3.15.0/debian/control 2019-07-17 18:19:13.000000000 +0900
@ -29,7 +30,7 @@ diff -Nru valgrind-3.15.0/debian/control valgrind-3.15.0/debian/control
Priority: optional
Maintainer: Alessandro Ghedini <ghedo@debian.org>
-Build-Depends: debhelper (>= 12),
+Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 7.0.50~),
+ dh-autoreconf,
gdb,
gcc-multilib [amd64],
@ -55,3 +56,9 @@ diff -Nru valgrind-3.15.0/debian/rules valgrind-3.15.0/debian/rules
$(MAKE) -C docs FAQ.txt
$(MAKE) -C docs html-docs
$(MAKE) -C docs man-pages
diff -Nru valgrind-3.15.0/debian/valgrind-mpi.install valgrind-3.15.0/debian/valgrind-mpi.install
--- valgrind-3.15.0/debian/valgrind-mpi.install 2019-07-14 19:23:29.000000000 +0900
+++ valgrind-3.15.0/debian/valgrind-mpi.install 2019-07-17 18:19:13.000000000 +0900
@@ -1 +1 @@
-usr/lib/*/valgrind/libmpiwrap*
+usr/lib/valgrind/libmpiwrap*

25
build/debian-packages/xkeyboard-config-wheezy.diff Normal file
Просмотреть файл

@ -0,0 +1,25 @@
diff -u xkeyboard-config-2.5.1/debian/control xkeyboard-config-2.5.1/debian/control
--- xkeyboard-config-2.5.1/debian/control
+++ xkeyboard-config-2.5.1/debian/control
@@ -23,6 +23,7 @@
Depends: ${misc:Depends}
Breaks: libx11-6 (<< 2:1.4.3)
Architecture: all
+Multi-Arch: foreign
Description: X Keyboard Extension (XKB) configuration data
This package contains configuration data used by the X Keyboard
Extension (XKB), which allows selection of keyboard layouts when
diff -u xkeyboard-config-2.5.1/debian/changelog xkeyboard-config-2.5.1/debian/changelog
--- xkeyboard-config-2.5.1/debian/changelog
+++ xkeyboard-config-2.5.1/debian/changelog
@@ -1,3 +1,10 @@
+xkeyboard-config (2.5.1-3.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for Wheezy.
+ * Mark xkb-data as "Multi-Arch: foreign".
+
+ -- Mike Hommey <glandium@mozilla.com> Tue, 06 Nov 2018 17:13:52 +0900
+
xkeyboard-config (2.5.1-3) unstable; urgency=low
* Cherry-picks from upstream:

2
taskcluster/ci/addon/kind.yml
Просмотреть файл

@ -22,7 +22,7 @@ jobs:
run-on-projects: [mozilla-central]
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-amd64-build}
docker-image: {in-tree: debian7-amd64-build}
max-run-time: 1800
artifacts:
- type: file

26
taskcluster/ci/build/linux.yml
Просмотреть файл

@ -273,7 +273,7 @@ linux64-base-toolchains/opt:
symbol: Bb
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-amd64-build-base}
docker-image: {in-tree: debian7-amd64-build-base}
max-run-time: 7200
env:
MOZ_LOW_PARALLELISM_BUILD: '1'
@ -311,7 +311,7 @@ linux64-base-toolchains/debug:
symbol: Bb
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-amd64-build-base}
docker-image: {in-tree: debian7-amd64-build-base}
max-run-time: 7200
env:
MOZ_LOW_PARALLELISM_BUILD: '1'
@ -355,7 +355,7 @@ linux64-base-toolchains-clang/opt:
symbol: Bbc
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-amd64-build-base}
docker-image: {in-tree: debian7-amd64-build-base}
max-run-time: 7200
env:
PERFHERDER_EXTRA_OPTIONS: base-toolchains-clang
@ -391,7 +391,7 @@ linux64-base-toolchains-clang/debug:
symbol: Bbc
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-amd64-build-base}
docker-image: {in-tree: debian7-amd64-build-base}
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: base-toolchains-clang
@ -436,7 +436,7 @@ linux/opt:
symbol: B
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 7200
run:
using: mozharness
@ -474,7 +474,7 @@ linux/debug:
symbol: B
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 5400
run:
using: mozharness
@ -517,7 +517,7 @@ linux-rusttests/opt:
tier: 1
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 2700
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
@ -557,7 +557,7 @@ linux-rusttests/debug:
tier: 1
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 2700
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
@ -603,7 +603,7 @@ linux-devedition/opt:
symbol: N
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 7200
env:
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
@ -651,7 +651,7 @@ linux-shippable/opt:
symbol: Bpgo(B)
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 9000
env:
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
@ -692,7 +692,7 @@ linux-reproduced/opt:
symbol: Bpgo(repr)
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 9000
env:
PERFHERDER_EXTRA_OPTIONS: repr
@ -1382,7 +1382,7 @@ linux-gcp/debug:
tier: 3
worker-type: b-linux-gcp
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: gcp
@ -1429,7 +1429,7 @@ linux-gcp/opt:
tier: 3
worker-type: b-linux-gcp
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
max-run-time: 7200
env:
PERFHERDER_EXTRA_OPTIONS: gcp

4
taskcluster/ci/config.yml
Просмотреть файл

@ -101,8 +101,8 @@ treeherder:
'BMcslang': 'Beetmover checksums for language packs'
'BMcss': 'Beetmover checksums for source'
'Aries': 'Aries Device Image'
'Deb8': 'Packages for Debian 8'
'Deb8-32': 'Packages for Debian 8 32-bits'
'Deb7': 'Packages for Debian 7'
'Deb7-32': 'Packages for Debian 7 32-bits'
'Deb9': 'Packages for Debian 9'
'Deb10': 'Packages for Debian 10'
'Nexus 5-L': 'Nexus 5-L Device Image'

129
taskcluster/ci/docker-image/kind.yml
Просмотреть файл

@ -26,49 +26,52 @@ jobs:
symbol: I(deb10-test)
ubuntu1804-test:
symbol: I(ub18-test)
# Neither the debian8-*raw nor the debian8-*packages images can have
# Neither the debian7-*raw nor the debian7-*packages images can have
# packages dependencies.
debian8-raw:
symbol: I(deb8-raw)
debian7-raw:
symbol: I(deb7-raw)
definition: debian-raw
args:
BASE_IMAGE: debian:jessie-20200422
DIST: jessie
SNAPSHOT: '20200422T205110Z'
debian8-packages:
symbol: I(deb8-pkg)
BASE_IMAGE: debian:wheezy-20190228
DIST: wheezy
SNAPSHOT: '20190228T155929Z'
debian7-packages:
symbol: I(deb7-pkg)
definition: debian-packages
parent: debian8-raw
debian8-i386-raw:
symbol: I(deb8-32-raw)
parent: debian7-raw
debian7-i386-raw:
symbol: I(deb7-32-raw)
definition: debian-raw
args:
BASE_IMAGE: i386/debian:jessie-20200422
DIST: jessie
SNAPSHOT: '20200422T205110Z'
debian8-i386-packages:
symbol: I(deb8-32-pkg)
BASE_IMAGE: i386/debian:wheezy-20190228
DIST: wheezy
SNAPSHOT: '20190228T155929Z'
debian7-i386-packages:
symbol: I(deb7-32-pkg)
definition: debian-packages
parent: debian8-i386-raw
debian8-base:
symbol: I(deb8-base)
parent: debian7-i386-raw
debian7-base:
symbol: I(deb7-base)
definition: debian-base
parent: debian8-raw
parent: debian7-raw
packages:
- deb8-gdb
- deb8-git
- deb8-mercurial
- deb8-python3.5
- deb8-python3-defaults
- deb8-python-zstandard
- deb8-xz-utils
deb8-toolchain-build:
- deb7-apt
- deb7-gdb
- deb7-git
- deb7-make
- deb7-mercurial
- deb7-python
- deb7-python3.5
- deb7-python3-defaults
- deb7-python-zstandard
- deb7-sqlite3
- deb7-xz-utils
toolchain-build:
symbol: I(toolchain)
parent: debian8-base
definition: toolchain-build
parent: debian7-base
packages:
- deb8-cmake
- deb8-ninja
- deb7-cmake
- deb7-ninja
deb9-toolchain-build:
symbol: I(deb9-toolchain)
parent: debian9-base
@ -82,37 +85,61 @@ jobs:
custom-v8:
symbol: I(custom-v8)
parent: debian9-base
debian8-amd64-build-base:
symbol: I(deb8-bb)
parent: debian8-base
debian7-amd64-build-base:
symbol: I(deb7-bb)
parent: debian7-base
definition: debian-build
args:
ARCH: amd64
debian8-amd64-build:
symbol: I(deb8)
parent: debian8-base
debian7-amd64-build:
symbol: I(deb7)
parent: debian7-base
definition: debian-build
packages:
- deb8-valgrind
- deb7-atk
- deb7-glib
- deb7-gdk-pixbuf
- deb7-gtk3
- deb7-harfbuzz
- deb7-libxkbcommon
- deb7-pango
- deb7-pcre3
- deb7-valgrind
- deb7-wayland
args:
ARCH: amd64
debian8-i386-build:
symbol: I(deb8-32)
parent: debian8-base
debian7-i386-build:
symbol: I(deb7-32)
parent: debian7-base
definition: debian-build
packages:
- deb8-valgrind
- deb8-32-xz-utils
- deb7-32-atk
- deb7-32-glib
- deb7-32-gdk-pixbuf
- deb7-32-gtk3
- deb7-32-harfbuzz
- deb7-32-libxkbcommon
- deb7-32-pango
- deb7-32-pcre3
- deb7-32-xkeyboard-config
- deb7-32-wayland
- deb7-atk
- deb7-glib
- deb7-gtk3
- deb7-harfbuzz
- deb7-python-defaults
- deb7-pcre3
- deb7-valgrind
args:
ARCH: i386
debian8-mozjs-rust-build:
symbol: I(deb8jsrs)
parent: debian8-amd64-build
debian7-mozjs-rust-build:
symbol: I(deb7jsrs)
parent: debian7-amd64-build
packages:
- deb8-cmake
- deb7-cmake
valgrind-build:
symbol: I(vb)
parent: debian8-amd64-build
parent: debian7-amd64-build
lint:
symbol: I(lnt)
# Neither the debian9-raw nor the debian9-packages images can have
@ -186,7 +213,7 @@ jobs:
symbol: I(agb)
parent: debian9-base
packages:
- deb8-valgrind
- deb7-valgrind
fetch:
symbol: I(fetch)
parent: debian10-raw
@ -197,7 +224,7 @@ jobs:
parent: debian9-base
gdb-test:
symbol: I(gdb)
parent: debian8-amd64-build
parent: debian7-amd64-build
definition: gdb-test
mingw32-build:
symbol: I(mingw)

2
taskcluster/ci/hazard/kind.yml
Просмотреть файл

@ -22,7 +22,7 @@ job-defaults:
worker-type: b-linux
worker:
max-run-time: 36000
docker-image: {in-tree: debian8-amd64-build}
docker-image: {in-tree: debian7-amd64-build}
jobs:
linux64-shell-haz/debug:

2
taskcluster/ci/instrumented-build/kind.yml
Просмотреть файл

@ -41,7 +41,7 @@ jobs:
platform: linux32-shippable/opt
worker-type: b-linux
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
run:
config:
- builds/releng_base_firefox.py

461
taskcluster/ci/packages/kind.yml
Просмотреть файл

@ -20,58 +20,92 @@ job-defaults:
max-run-time: 1800
run-on-projects: []
run:
dist: jessie
dist: wheezy
snapshot: 20200422T205110Z
jobs:
deb8-python3.5:
description: "Python 3.5 backport for Debian jessie"
deb7-apt:
description: "Updated APT for Debian wheezy"
treeherder:
symbol: Deb8(python3.5)
symbol: Deb7(apt)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20141023T170002Z/pool/main/a/apt/apt_0.9.7.9%2Bdeb7u7.dsc
sha256: 7835d9f97acf8adcad7eee0eca2990eaef72ffe21272302d3c36d8053d6baf82
patch: apt-wheezy.diff
deb7-sqlite3:
description: "SQLite backport for Debian wheezy"
treeherder:
symbol: Deb7(sqlite3)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20171003T220520Z/pool/main/s/sqlite3/sqlite3_3.16.2-5.dsc
sha256: 21a2d432ace9ecf50ca5d64580af78d4414a0cfcc8b8a4f15222e11cf105da09
patch: sqlite3-wheezy.diff
deb7-python:
description: "Python backport for Debian wheezy"
treeherder:
symbol: Deb7(python)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20160813T164221Z/pool/main/p/python2.7/python2.7_2.7.9-2+deb8u1.dsc
sha256: 274c293e7156edf59cb9f0a9d8cedcd94fa801df35adf39b8a9f3d776a250ead
patch: python-wheezy.diff
pre-build-command: debian/rules control-file
deb7-python3.5:
description: "Python 3.5 backport for Debian wheezy"
treeherder:
symbol: Deb7(python3.5)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20170119T211826Z/pool/main/p/python3.5/python3.5_3.5.3-1.dsc
sha256: 5259cbb15bb93f7bdfbe9ce03a972ea47f81c86057d5939ef9ce578414b2f1de
patch: python3.5-jessie.diff
patch: python3.5-wheezy.diff
pre-build-command: debian/rules control-file
deb8-python3-defaults:
description: "python3-defaults backport for Debian jessie"
deb7-python3-defaults:
description: "python3-defaults backport for Debian wheezy"
treeherder:
symbol: Deb8(python3-defaults)
symbol: Deb7(python3-defaults)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20170120T212942Z/pool/main/p/python3-defaults/python3-defaults_3.5.3-1.dsc
sha256: 2bec1dd8a5836d5a19fbbd48d7c49aec40642669036297a34bbfd8b0b2d61439
packages:
- deb8-python3.5
- deb7-python3.5
patch: python3-defaults-wheezy.diff
pre-build-command: debian/rules control-file
deb8-python-setuptools:
description: "python-setuptools backport for Debian jessie"
deb7-python-defaults:
description: "multiarch python-defaults for Debian wheezy"
treeherder:
symbol: Deb8(python-setuptools)
symbol: Deb7(python-defaults)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20170413T152542Z/pool/main/p/python-setuptools/python-setuptools_33.1.1-1%7Ebpo8%2B1.dsc
sha256: e5a152e45151ee2d19959d8266e9bff09f5164ee04a0613aeb8f1d7a304fa073
url: http://snapshot.debian.org/archive/debian/20130930T035642Z/pool/main/p/python-defaults/python-defaults_2.7.3-4+deb7u1.dsc
sha256: e12fa64899a025b7ac3bdccd5611ae6f3d23327b695b2938473b1cf68ecc9ae5
patch: python-defaults-wheezy.diff
pre-build-command: debian/rules control-file
deb8-cmake:
description: "Cmake backport for Debian jessie"
deb7-cmake:
description: "Cmake backport for Debian wheezy"
treeherder:
symbol: Deb8(cmake)
worker:
env:
DEB_BUILD_PROFILES: stage1
symbol: Deb7(cmake)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20161204T034107Z/pool/main/c/cmake/cmake_3.7.1-1.dsc
sha256: 406a12c0d0a2e92d44a8d444fd1b32bcc29a8810e9631427161a7cb411f60172
patch: cmake-jessie.diff
patch: cmake-wheezy.diff
deb10-cmake:
description: "Cmake backport for Debian buster"
@ -85,20 +119,31 @@ jobs:
sha256: ecfa7cbc93dc6a9749022ccd9538843f4a0e2e77a14bb2f87e325aaf3c36b519
pre-build-command: apt-get install debhelper/buster-backports
deb8-ninja:
description: "Ninja backport for Debian jessie"
deb7-make:
description: "Make backport for Debian wheezy"
treeherder:
symbol: Deb8(ninja)
symbol: Deb7(make)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20150121T220334Z/pool/main/m/make-dfsg/make-dfsg_4.0-8.1.dsc
sha256: ae258d9abb68e756d1ff5195dc3060748b3d4b019ccce19a249d4de23039a0ce
patch: make-wheezy.diff
deb7-ninja:
description: "Ninja backport for Debian wheezy"
treeherder:
symbol: Deb7(ninja)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20160209T042121Z/pool/main/n/ninja-build/ninja-build_1.6.0-1.dsc
sha256: 25cd62b011d669c31bcd51d36d454dd826bc50af6a3af8d87bcab8948ec21626
deb8-mercurial:
description: "Modern Mercurial for Debian jessie"
deb7-mercurial:
description: "Modern Mercurial for Debian wheezy"
treeherder:
symbol: Deb8(hg)
symbol: Deb7(hg)
run:
using: debian-package
tarball:
@ -106,9 +151,9 @@ jobs:
sha256: 48a45f5cde9104fbc2daf310d710d4ebf286d879b89fa327d24b005434b0fa21
pre-build-command: >-
cp -r contrib/packaging/debian debian &&
sed -i -e "s/__VERSION__/$(awk -F\" '$2 {print $2}' mercurial/__version__.py)-1.deb8moz1/" \
sed -i -e "s/__VERSION__/$(awk -F\" '$2 {print $2}' mercurial/__version__.py)-1.deb7moz1/" \
-e "s/__DATE__/$(date --rfc-2822)/" \
-e "s/__CODENAME__/jessie/" debian/changelog
-e "s/__CODENAME__/wheezy/" debian/changelog
deb9-mercurial:
description: "Modern Mercurial for Debian stretch"
@ -142,20 +187,20 @@ jobs:
-e "s/__DATE__/$(date --rfc-2822)/" \
-e "s/__CODENAME__/stretch/" debian/changelog
deb8-git:
description: "Modern git for Debian jessie"
deb7-git:
description: "Modern git for Debian wheezy"
treeherder:
symbol: Deb8(git)
symbol: Deb7(git)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20160317T100542Z/pool/main/g/git/git_2.8.0%7Erc3-1.dsc
sha256: 6e81a318fb4eb5cca0333b7b6ff0c70dd0097e9fe711b159d5eac4b9f47c6c27
deb8-valgrind:
description: "Valgrind for Debian jessie"
deb7-valgrind:
description: "Valgrind for Debian Wheezy"
treeherder:
symbol: Deb8(valgrind)
symbol: Deb7(valgrind)
worker:
env:
VERSION: 3.15.99.git20200122
@ -166,8 +211,8 @@ jobs:
url: http://snapshot.debian.org/archive/debian/20190714T155055Z/pool/main/v/valgrind/valgrind_3.15.0-1.dsc
sha256: 2bd467ec486302060ed4e91452231b2c0a09afcd51c25d4ba8d3028218328681
packages:
- deb8-git
patch: valgrind-jessie.diff
- deb7-git
patch: valgrind-wheezy.diff
pre-build-command: >-
git clone -n git://sourceware.org/git/valgrind.git ../valgrind-git &&
git -C ../valgrind-git archive --format=tar --prefix=valgrind-$VERSION/ $COMMIT | bzip2 > ../valgrind_$VERSION.orig.tar.bz2 &&
@ -175,68 +220,105 @@ jobs:
cp -r debian ../valgrind-$VERSION &&
cd ../valgrind-$VERSION &&
sed -i '/08_fix-spelling-in-manpage.patch/d;/11_arm64-cache-flush.patch/d' debian/patches/series &&
debchange -v 1:$VERSION-1.deb8moz1 --distribution jessie "Mozilla backport of git master as of 2020-01-22." < /dev/null
debchange -v 1:$VERSION-1.deb7moz1 --distribution wheezy "Mozilla backport of git master as of 2020-01-22." < /dev/null
deb8-dh-python:
description: "dh-python for Debian jessie"
deb7-dh-python:
description: "dh-python for Debian wheezy"
treeherder:
symbol: Deb8(dh-python)
symbol: Deb7(dh-python)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20170125T211752Z/pool/main/d/dh-python/dh-python_2.20170125.dsc
sha256: ef4f2951cea36ae4aac29126a1017505f98b595432fb5bdac0f21b4b4d72c1b4
packages:
- deb8-python3.5
- deb8-python3-defaults
- deb7-python3.5
- deb7-python3-defaults
deb8-xz-utils:
description: "xz-utils for Debian jessie"
deb7-dpkg-1.17:
description: "dpkg 1.17 for Debian wheezy"
treeherder:
symbol: Deb8(xz)
symbol: Deb7(dpkg)
worker:
env:
# The compiler in wheezy doesn't support the stackprotector flags.
DEB_BUILD_MAINT_OPTIONS: hardening=-stackprotector
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/d/dpkg/dpkg_1.17.20.dsc
sha256: c706ad3f5db11968086ab2e0767f87d6e3522b13ebf136ae46f7722a82f645f6
patch: dpkg-wheezy.diff
deb7-devscripts-2.14:
description: "devscripts 2.14 for Debian wheezy"
treeherder:
symbol: Deb7(devscripts)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20141204T100716Z/pool/main/d/devscripts/devscripts_2.14.11.dsc
sha256: 47009dd76b2e8ce0f64b9f0d1caa4f648e0815ae5f79624bb96e3d06de1cb0d6
resolver: aptitude
deb7-automake-1.14:
description: "automake 1.14 for Debian wheezy"
treeherder:
symbol: Deb7(am)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20141027T102134Z/pool/main/a/automake-1.14/automake-1.14_1.14.1-4.dsc
sha256: d798619c504a686a5ebe46d106fd992971e805916032607e473541182da12167
deb7-xz-utils:
description: "xz-utils for Debian wheezy"
treeherder:
symbol: Deb7(xz)
worker:
env:
# The compiler in wheezy doesn't support the stackprotector flags.
DEB_BUILD_MAINT_OPTIONS: hardening=-stackprotector
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20161010T223637Z/pool/main/x/xz-utils/xz-utils_5.2.2-1.2.dsc
sha256: 13c8d8d0c243af78dc89b6e2cd670c8d8a2522379e1fcd196957c95d988d5961
packages:
- deb7-automake-1.14
# The xz debian source is in a format not supported by dpkg in wheezy,
# so we need a newer version of dpkg, which also needs a newer version
# of devscripts.
- deb7-devscripts-2.14
- deb7-dpkg-1.17
deb8-32-xz-utils:
description: "xz-utils for Debian jessie 32-bits"
deb7-gdb:
description: "gdb for Debian wheezy"
treeherder:
symbol: Deb8-32(xz)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20161010T223637Z/pool/main/x/xz-utils/xz-utils_5.2.2-1.2.dsc
sha256: 13c8d8d0c243af78dc89b6e2cd670c8d8a2522379e1fcd196957c95d988d5961
arch: i386
deb8-gdb:
description: "gdb for Debian jessie"
treeherder:
symbol: Deb8(gdb)
symbol: Deb7(gdb)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20170119T152956Z/pool/main/g/gdb/gdb_7.12-6.dsc
sha256: 9727dcb3d6b655e4f2a92110f5db076a490aa50b739804be239905ecff3aacc8
patch: gdb-jessie.diff
patch: gdb-wheezy.diff
deb8-python-zstandard:
description: "python-zstandard for Debian jessie"
deb7-python-zstandard:
description: "python-zstandard for Debian wheezy"
treeherder:
symbol: Deb8(python-zstandard)
symbol: Deb7(python-zstandard)
run:
using: debian-package
tarball:
url: https://github.com/indygreg/python-zstandard/archive/0.11.1.tar.gz
sha256: 2df90698e22f0da49cdd360438479f363e58eb8c3ac6e8bac84d831cf8e7baf4
name: python-zstandard
patch: python-zstandard-jessie.diff
patch: python-zstandard-wheezy.diff
packages:
- deb8-dh-python
- deb8-python3.5
- deb8-python3-defaults
- deb7-dh-python
- deb7-python
- deb7-python3.5
- deb7-python3-defaults
deb9-python-zstandard:
description: "python-zstandard for Debian stretch"
@ -263,3 +345,246 @@ jobs:
sha256: 2df90698e22f0da49cdd360438479f363e58eb8c3ac6e8bac84d831cf8e7baf4
name: python-zstandard
pre-build-command: debchange -v 0.11.1-1.deb10moz --distribution buster "Mozilla backport for buster"
deb7-pcre3:
description: "pcre3 8.31 for Debian Wheezy"
treeherder:
symbol: Deb7(pcre3)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140424T055217Z/pool/main/p/pcre3/pcre3_8.31-5.dsc
sha256: e6e92af1e9f4b1d286ce9e7fdb6cb2f0972a341a94f5631e0b8c31b9f79633a4
deb7-atk:
description: "atk 2.8 for Debian Wheezy"
treeherder:
symbol: Deb7(atk)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20130510T040301Z/pool/main/a/atk1.0/atk1.0_2.8.0-2.dsc
sha256: cae824b2a5ef47704fb820c04b5b7ee234329d9ddda1086bf487e12d58b9f70c
deb7-glib:
description: "glib 2.38 for Debian Wheezy"
treeherder:
symbol: Deb7(glib)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140215T160944Z/pool/main/g/glib2.0/glib2.0_2.38.2-5.dsc
sha256: 1d81952a9a46a935d35d723f7528bf8d5264ef8a59491bad335d134dbeaa2404
patch: glib-wheezy.diff
packages:
- deb7-pcre3
deb7-harfbuzz:
description: "harfbuzz for Debian Wheezy"
treeherder:
symbol: Deb7(harfbuzz)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20121211T033951Z/pool/main/h/harfbuzz/harfbuzz_0.9.9-1.dsc
sha256: 622677a2757a739fb59c8bcd8cde9c1722fac82808248e19ce1cae46620d92bd
deb7-gdk-pixbuf:
description: "gdk-pixbuf 2.28 for Debian Wheezy"
treeherder:
symbol: Deb7(gdkpixbuf)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20130608T215552Z/pool/main/g/gdk-pixbuf/gdk-pixbuf_2.28.2-1.dsc
sha256: f5057beb54c37293de352c6f253cedd8b144d25289f1fdf1a958f17b51565bcb
packages:
- deb7-glib
- deb7-pcre3
deb7-pango:
description: "pango 1.32 for Debian Wheezy"
treeherder:
symbol: Deb7(pango)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20130224T223605Z/pool/main/p/pango1.0/pango1.0_1.32.5-1.dsc
sha256: d9d9b1f797c5dbe70bfe9c7931d63b28437476aa1a737c424c7f072ca6e22914
packages:
- deb7-glib
- deb7-harfbuzz
- deb7-pcre3
deb7-libxkbcommon:
description: "libxkbcommon for Debian Wheezy"
treeherder:
symbol: Deb7(xkbc)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140723T102555Z/pool/main/libx/libxkbcommon/libxkbcommon_0.4.1-2.dsc
sha256: 9046dbceda207ed7163b7c12c98399e6d119491a480dc908ae451d7fff0fb77c
deb7-wayland:
description: "wayland 1.2 for Debian wheezy"
treeherder:
symbol: Deb7(wayland)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20130908T214400Z/pool/main/w/wayland/wayland_1.2.1-1.dsc
sha256: 964619747c00c697c95f2739c7980a0a360d79d03eaa3d9a342fed81d86e9466
deb7-gtk3:
description: "gtk+ 3.10 for Debian wheezy"
treeherder:
symbol: Deb7(gtk3)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140215T220417Z/pool/main/g/gtk+3.0/gtk+3.0_3.10.7-1.dsc
sha256: 2a6810d44517806940063bb488e49e7177732d8059c798cf0ef94103fefaf0b3
patch: gtk-wheezy.diff
packages:
- deb7-atk
- deb7-glib
- deb7-gdk-pixbuf
- deb7-harfbuzz
- deb7-libxkbcommon
- deb7-make
- deb7-pango
- deb7-pcre3
- deb7-wayland
deb7-32-pcre3:
description: "pcre3 8.31 for Debian Wheezy"
treeherder:
symbol: Deb7-32(pcre3)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140424T055217Z/pool/main/p/pcre3/pcre3_8.31-5.dsc
sha256: e6e92af1e9f4b1d286ce9e7fdb6cb2f0972a341a94f5631e0b8c31b9f79633a4
arch: i386
deb7-32-atk:
description: "atk 2.8 for Debian Wheezy"
treeherder:
symbol: Deb7-32(atk)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20130510T040301Z/pool/main/a/atk1.0/atk1.0_2.8.0-2.dsc
sha256: cae824b2a5ef47704fb820c04b5b7ee234329d9ddda1086bf487e12d58b9f70c
arch: i386
deb7-32-glib:
description: "glib 2.38 for Debian Wheezy"
treeherder:
symbol: Deb7-32(glib)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140215T160944Z/pool/main/g/glib2.0/glib2.0_2.38.2-5.dsc
sha256: 1d81952a9a46a935d35d723f7528bf8d5264ef8a59491bad335d134dbeaa2404
arch: i386
patch: glib-wheezy.diff
packages:
- deb7-32-pcre3
deb7-32-harfbuzz:
description: "harfbuzz for Debian Wheezy"
treeherder:
symbol: Deb7-32(harfbuzz)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20121211T033951Z/pool/main/h/harfbuzz/harfbuzz_0.9.9-1.dsc
sha256: 622677a2757a739fb59c8bcd8cde9c1722fac82808248e19ce1cae46620d92bd
arch: i386
deb7-32-gdk-pixbuf:
description: "gdk-pixbuf 2.28 for Debian Wheezy"
treeherder:
symbol: Deb7-32(gdkpixbuf)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20130608T215552Z/pool/main/g/gdk-pixbuf/gdk-pixbuf_2.28.2-1.dsc
sha256: f5057beb54c37293de352c6f253cedd8b144d25289f1fdf1a958f17b51565bcb
arch: i386
packages:
- deb7-32-glib
- deb7-32-pcre3
deb7-32-pango:
description: "pango 1.32 for Debian Wheezy"
treeherder:
symbol: Deb7-32(pango)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20130224T223605Z/pool/main/p/pango1.0/pango1.0_1.32.5-1.dsc
sha256: d9d9b1f797c5dbe70bfe9c7931d63b28437476aa1a737c424c7f072ca6e22914
arch: i386
packages:
- deb7-32-glib
- deb7-32-harfbuzz
- deb7-32-pcre3
deb7-32-xkeyboard-config:
description: "xkeyboard-config for Debian Wheezy"
treeherder:
symbol: Deb7-32(xkbdconfig)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20121225T153644Z/pool/main/x/xkeyboard-config/xkeyboard-config_2.5.1-3.dsc
sha256: 327d53dfca4288c7f75471bb01e6d1f161811706b1d8daa01bf9abc269016dc1
arch: i386
patch: xkeyboard-config-wheezy.diff
deb7-32-libxkbcommon:
description: "libxkbcommon for Debian Wheezy"
treeherder:
symbol: Deb7-32(xkbc)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140723T102555Z/pool/main/libx/libxkbcommon/libxkbcommon_0.4.1-2.dsc
sha256: 9046dbceda207ed7163b7c12c98399e6d119491a480dc908ae451d7fff0fb77c
arch: i386
deb7-32-wayland:
description: "wayland 1.2 for Debian wheezy"
treeherder:
symbol: Deb7-32(wayland)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20130908T214400Z/pool/main/w/wayland/wayland_1.2.1-1.dsc
sha256: 964619747c00c697c95f2739c7980a0a360d79d03eaa3d9a342fed81d86e9466
arch: i386
deb7-32-gtk3:
description: "gtk+ 3.10 for Debian wheezy"
treeherder:
symbol: Deb7-32(gtk3)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140215T220417Z/pool/main/g/gtk+3.0/gtk+3.0_3.10.7-1.dsc
sha256: 2a6810d44517806940063bb488e49e7177732d8059c798cf0ef94103fefaf0b3
arch: i386
patch: gtk-wheezy.diff
packages:
- deb7-32-atk
- deb7-32-glib
- deb7-32-gdk-pixbuf
- deb7-32-harfbuzz
- deb7-32-libxkbcommon
- deb7-make
- deb7-32-pango
- deb7-32-pcre3
- deb7-32-wayland

2
taskcluster/ci/repackage-l10n/kind.yml
Просмотреть файл

@ -38,7 +38,7 @@ only-for-build-platforms:
job-template:
worker-type: 'b-linux'
worker:
docker-image: {"in-tree": "debian8-amd64-build"}
docker-image: {"in-tree": "debian7-amd64-build"}
mozharness:
config:
by-build-platform:

2
taskcluster/ci/repackage/kind.yml
Просмотреть файл

@ -48,7 +48,7 @@ only-for-build-platforms:
job-template:
worker-type: 'b-linux'
worker:
docker-image: {"in-tree": "debian8-amd64-build"}
docker-image: {"in-tree": "debian7-amd64-build"}
mozharness:
config:
by-build-platform:

6
taskcluster/ci/source-test/file-metadata.yml
Просмотреть файл

@ -42,7 +42,7 @@ test-info-fission:
product: source
job-name: test-info-fission
worker:
docker-image: {in-tree: debian8-amd64-build}
docker-image: {in-tree: debian7-amd64-build}
run-on-projects: ['mozilla-central']
fetches:
toolchain:
@ -68,7 +68,7 @@ test-info-disabled-by-os:
product: source
job-name: test-info-disabled-by-os
worker:
docker-image: {in-tree: debian8-amd64-build}
docker-image: {in-tree: debian7-amd64-build}
run-on-projects: ['mozilla-central']
fetches:
toolchain:
@ -97,7 +97,7 @@ test-info-all:
product: source
job-name: test-info-all
worker:
docker-image: {in-tree: debian8-amd64-build}
docker-image: {in-tree: debian7-amd64-build}
max-run-time: 5400
run-on-projects: ['mozilla-central']
fetches:

6
taskcluster/ci/spidermonkey/linux.yml
Просмотреть файл

@ -5,7 +5,7 @@
job-defaults:
worker:
max-run-time: 36000
docker-image: {in-tree: debian8-amd64-build}
docker-image: {in-tree: debian7-amd64-build}
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/jsshell.manifest"
run:
@ -43,7 +43,7 @@ sm-rust-bindings-linux64/debug:
tier: 2
platform: linux64/debug
worker:
docker-image: {in-tree: debian8-mozjs-rust-build}
docker-image: {in-tree: debian7-mozjs-rust-build}
run:
using: spidermonkey-rust-bindings
spidermonkey-variant: plaindebug
@ -135,7 +135,7 @@ sm-arm-sim-linux32/debug:
platform: linux32/debug
symbol: SM(arm)
worker:
docker-image: {in-tree: debian8-i386-build}
docker-image: {in-tree: debian7-i386-build}
run:
spidermonkey-variant: arm-sim

1
taskcluster/ci/toolchain/clang.yml
Просмотреть файл

@ -44,7 +44,6 @@ linux64-clang-7:
fetch:
- clang-7
toolchain:
- linux64-binutils
- linux64-gcc-7
linux64-clang-9:

13
taskcluster/docker/debian-build/Dockerfile
Просмотреть файл

@ -32,13 +32,14 @@ RUN dpkg --add-architecture $ARCH
RUN apt-get update && \
apt-get dist-upgrade && \
echo path-exclude=/usr/share/doc/*/changelog.Debian* > /etc/dpkg/dpkg.cfg.d/excludes && \
if grep -q ^8\\. /etc/debian_version; then \
if grep -q ^7\\. /etc/debian_version; then \
BACKPORT=/wheezy-backports; \
PKG_CONFIG=pkg-config:$ARCH; \
else \
PKG_CONFIG="pkg-config dpkg-dev"; \
fi && \
if grep -q ^8\\. /etc/debian_version; then \
LIBSTDCXX=libstdc++-4.9-dev; \
if grep -q ^7\\. /etc/debian_version; then \
LIBSTDCXX=libstdc++6-4.4-dev; \
elif grep -q ^9\\. /etc/debian_version; then \
LIBSTDCXX=libstdc++-6-dev; \
elif grep -q ^10\\. /etc/debian_version; then \
@ -71,10 +72,10 @@ RUN apt-get update && \
wget \
x11-utils \
xvfb \
yasm \
yasm$BACKPORT \
zip \
linux-libc-dev \
linux-libc-dev:$ARCH \
linux-libc-dev$BACKPORT \
linux-libc-dev:$ARCH$BACKPORT \
$PKG_CONFIG \
$LIBSTDCXX \
libdbus-glib-1-dev:$ARCH \

3
taskcluster/docker/debian-packages/Dockerfile
Просмотреть файл

@ -7,5 +7,4 @@ RUN apt-get install --install-recommends \
aptitude \
build-essential \
devscripts \
fakeroot \
git
fakeroot

6
taskcluster/docker/debian-raw/Dockerfile
Просмотреть файл

@ -13,11 +13,7 @@ COPY setup_packages.sh /usr/local/sbin/
# %ARG SNAPSHOT
# Set apt sources list to a snapshot.
RUN for s in debian_$DIST debian_$DIST-updates debian_$DIST-backports debian-security_$DIST/updates; do \
if [ $s = "debian_jessie-backports" ]; then \
echo "deb http://snapshot.debian.org/archive/debian-archive/20190328T105444Z/debian/ ${s#*_} main"; \
else \
echo "deb http://snapshot.debian.org/archive/${s%_*}/$SNAPSHOT/ ${s#*_} main"; \
fi; \
echo "deb http://snapshot.debian.org/archive/${s%_*}/$SNAPSHOT/ ${s#*_} main"; \
done > /etc/apt/sources.list && \
( echo 'quiet "true";'; \
echo 'APT::Get::Assume-Yes "true";'; \

0
taskcluster/docker/debian8-mozjs-rust-build/Dockerfile → taskcluster/docker/debian7-mozjs-rust-build/Dockerfile
Просмотреть файл

5
taskcluster/docker/valgrind-build/Dockerfile
Просмотреть файл

@ -18,7 +18,7 @@ RUN apt-get install \
libcairo2-dbg \
libdbus-glib-1-2-dbg \
libdrm2-dbg \
libffi6-dbg \
libffi5-dbg \
libfontconfig1-dbg \
libgl1-mesa-glx-dbg \
libglapi-mesa-dbg \
@ -26,7 +26,8 @@ RUN apt-get install \
libgdk-pixbuf2.0-0-dbg \
libgtk-3-0-dbg \
libice6-dbg \
libicu52-dbg \
libicu48-dbg \
libjson0-dbg \
libpango1.0-0-dbg \
libpcre3-dbg \
libpixman-1-0-dbg \

2
taskcluster/taskgraph/transforms/build.py
Просмотреть файл

@ -31,7 +31,7 @@ def set_defaults(config, jobs):
worker = job.setdefault('worker', {})
worker.setdefault('env', {})
if worker_os == "linux":
worker.setdefault('docker-image', {'in-tree': 'debian8-amd64-build'})
worker.setdefault('docker-image', {'in-tree': 'debian7-amd64-build'})
worker['chain-of-trust'] = True
elif worker_os == "windows":
worker['chain-of-trust'] = True

4
taskcluster/taskgraph/transforms/job/mozharness.py
Просмотреть файл

@ -148,9 +148,9 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
"'use-magic-mh-args' on docker-workers")
# Running via mozharness assumes an image that contains build.sh:
# by default, debian8-amd64-build, but it could be another image (like
# by default, debian7-amd64-build, but it could be another image (like
# android-build).
worker.setdefault('docker-image', {'in-tree': 'debian8-amd64-build'})
worker.setdefault('docker-image', {'in-tree': 'debian7-amd64-build'})
worker.setdefault('artifacts', []).append({
'name': 'public/logs',

2
taskcluster/taskgraph/transforms/job/toolchain.py
Просмотреть файл

@ -119,7 +119,7 @@ def docker_worker_toolchain(config, job, taskdesc):
worker['chain-of-trust'] = True
# If the task doesn't have a docker-image, set a default
worker.setdefault('docker-image', {'in-tree': 'deb8-toolchain-build'})
worker.setdefault('docker-image', {'in-tree': 'toolchain-build'})
# Allow the job to specify where artifacts come from, but add
# public/build if it's not there already.

2
taskcluster/taskgraph/transforms/repackage_partner.py
Просмотреть файл

@ -182,7 +182,7 @@ def make_job_description(config, jobs):
}
worker_type = 'b-linux'
worker['docker-image'] = {"in-tree": "debian8-amd64-build"}
worker['docker-image'] = {"in-tree": "debian7-amd64-build"}
worker['artifacts'] = _generate_task_output_files(
dep_job, worker_type_implementation(config.graph_config, worker_type),