Update for 2019.05-rc3

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/gpsd: fix BR2_PACKAGE_GPSD_MAX_{CLIENT, DEV} options
2019-05-25 23:38:05 +02:00 · 2019-05-25 23:13:36 +02:00 · 2019-05-25 15:03:56 +02:00 · 2019-05-25 13:58:42 +02:00 · 2019-05-25 13:56:04 +02:00 · 2019-05-25 13:47:58 +02:00
142 changed files with 1382 additions and 577 deletions
@@ -361,7 +361,6 @@ tests.package.test_atop.TestAtop: { extends: .runtime_test }
 tests.package.test_docker_compose.TestDockerCompose: { extends: .runtime_test }
 tests.package.test_dropbear.TestDropbear: { extends: .runtime_test }
 tests.package.test_glxinfo.TestGlxinfo: { extends: .runtime_test }
-tests.package.test_ipython.TestIPythonPy2: { extends: .runtime_test }
 tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test }
 tests.package.test_lpeg.TestLuaLPeg: { extends: .runtime_test }
 tests.package.test_lpeg.TestLuajitLPeg: { extends: .runtime_test }
@@ -1,3 +1,34 @@
+2019.05-rc3, released May 25th, 2019
+
+	Fixes all over the tree.
+
+	check-bin-arch: Ignore /usr/lib/grub, similar to how /lib/grub
+	is ignored.
+
+	check-package: Warn about utf-8 characters in .mk files
+
+	Linux: Default to 5.1.x series
+
+	Updated/fixed packages: assimp, atop, chocolate-doom, cjson,
+	ddrescue, dhcp, ffmpeg, gerbera, glibmm, gpsd, gst-ffmpeg,
+	intel-microcode, jasper, keepalived, kismet, libcpprestsdk,
+	libcurl, libssh2, libupnp18, luarocks, mono-gtksharp3, opus,
+	postgresql, pcsc-lite, python, tslib, webkitgtk,
+	wpebackend-fdo, wpewebkit
+
+2019.05-rc2, released May 15th, 2019
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: bind, bullet, ca-certificates,
+	collectd, cracklib, dhcp, gdb, libinput, libtorrent-rasterbar,
+	linknx, lynx, mono, netsurf, optee-os, postgresql, qt5enginio,
+	qt5multimedia, rpm, samba4, sqlite, strace, uclibc, woff2
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#11841: grub-efi.cfg not used when building EFI disk image
+
 2019.05-rc1, Released May 8th, 2019

 	Fixes all over the tree and new features.
@@ -939,6 +939,7 @@ F:	package/webp/
 F:	package/xapian/

 N:	Giulio Benetti <giulio.benetti@micronovasrl.com>
+F:	package/minicom/
 F:	package/sunxi-mali-mainline/
 F:	package/sunxi-mali-mainline-driver/

@@ -92,9 +92,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2019.05-rc1
+export BR2_VERSION := 2019.05-rc3
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1557349000
+BR2_VERSION_EPOCH = 1558820000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -44,11 +44,11 @@ Result of the build
 When the build is finished, you will end up with:

    output/images/
-    ├── imx**-apfxxdev.dtb	[1]
-    ├── rootfs.tar
-    ├── rootfs.ubi
-    ├── rootfs.ubifs
-    └── uImage
+    +-- imx**-apfxxdev.dtb	[1]
+    +-- rootfs.tar
+    +-- rootfs.ubi
+    +-- rootfs.ubifs
+    +-- uImage

 [1] Only if the kernel version used uses a Device Tree.

@@ -26,17 +26,17 @@ Result of the build
 After building, you should get a tree like this:

  output/images/
-  ├── am57xx-beagle-x15.dtb
-  ├── am57xx-beagle-x15-revb1.dtb
-  ├── boot.vfat
-  ├── MLO
-  ├── rootfs.ext2
-  ├── rootfs.ext4
-  ├── rootfs.tar
-  ├── sdcard.img
-  ├── u-boot.img
-  ├── u-boot-spl.bin
-  └── zImage
+  +-- am57xx-beagle-x15.dtb
+  +-- am57xx-beagle-x15-revb1.dtb
+  +-- boot.vfat
+  +-- MLO
+  +--rootfs.ext2
+  +-- rootfs.ext4
+  +-- rootfs.tar
+  +-- sdcard.img
+  +-- u-boot.img
+  +-- u-boot-spl.bin
+  +-- zImage

 How to write the microSD card
 =============================
@@ -27,18 +27,18 @@ $ make
 Result of the build
 ===================
 output/images/
-├── am335x-boneblack.dtb
-├── am335x-bone.dtb
-├── am335x-evm.dtb
-├── am335x-evmsk.dtb
-├── boot.vfat
-├── MLO
-├── rootfs.ext2
-├── rootfs.tar
-├── sdcard.img
-├── u-boot.img
-├── uEnv.txt
-└── zImage
+-- am335x-boneblack.dtb
+-- am335x-bone.dtb
+-- am335x-evm.dtb
+-- am335x-evmsk.dtb
+-- boot.vfat
+-- MLO
+-- rootfs.ext2
+-- rootfs.tar
+-- sdcard.img
+-- u-boot.img
+-- uEnv.txt
+-- zImage

 To copy the image file to the sdcard use dd:
 $ dd if=output/images/sdcard.img of=/dev/XXX
@@ -41,9 +41,9 @@ Result of the build
 After building, you should obtain this tree:

    output/images/
-    ├── vmlinux
-    ├── rootfs.ext2
-    └── <board name>.dtb
+    +-- vmlinux
+    +-- rootfs.ext2
+    +-- <board name>.dtb

 How to run it
 =============
@@ -2,6 +2,7 @@
 CONFIG_WIRELESS=y
 CONFIG_CFG80211=y
 CONFIG_CFG80211_WEXT=y
+CONFIG_RFKILL=y

 # Network device support
 CONFIG_WLAN=y
@@ -23,14 +23,14 @@ When you are happy with the setup, run:
 The result of the build with the default settings should be these files:

  output/images
-  ├── MLO
-  ├── omap4-panda-a4.dtb
-  ├── omap4-panda.dtb
-  ├── omap4-panda-es.dtb
-  ├── rootfs.ext4
-  ├── sdcard.img
-  ├── u-boot.img
-  └── zImage
+  +-- MLO
+  +-- omap4-panda-a4.dtb
+  +-- omap4-panda.dtb
+  +-- omap4-panda-es.dtb
+  +-- rootfs.ext4
+  +-- sdcard.img
+  +-- u-boot.img
+  +-- zImage

 How to write the SD card
 ------------------------
@@ -1,6 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /bzImage root=/dev/sda2 rootwait console=tty1
-}
@@ -57,13 +57,7 @@ qemu-system-x86_64 \
 Emulation in qemu (UEFI)
 ========================

-1. Edit grub-efi.cfg
-
-  Since the driver will show up in the virtual machine as /dev/vda,
-  change board/pc/grub-efi.cfg to use root=/dev/vda2 instead of
-  root=/dev/sda2. Then rebuild grub2 and the image.
-
-2. Run the emulation with:
+Run the emulation with:

 qemu-system-x86_64 \
 	-M pc \
@@ -70,16 +70,16 @@ config BR2_TARGET_OPTEE_OS_SDK
 	  installed in the staging directory /lib/optee.

 config BR2_TARGET_OPTEE_OS_SERVICES
-	bool "Build service TAs"
+	bool "Build service TAs and libs"
 	default y
 	select BR2_TARGET_OPTEE_OS_CORE
 	help
-	  This option installs the service trusted applications built
-	  from OP-TEE OS source tree. These are installed in the target
-	  /lib/optee_armtz directory as other trusted applications.
-	  At runtime OP-TEE OS can load trusted applications from this
-	  non-secure filesystem/directory into the secure world for
-	  execution.
+	  This option installs the service trusted applications and
+	  trusted shared libraries built from OP-TEE OS source tree.
+	  These are installed in target /lib/optee_armtz directory
+	  as other trusted applications. At runtime OP-TEE OS can
+	  load these from this non-secure filesystem/directory into
+	  the secure world for execution.

 config BR2_TARGET_OPTEE_OS_PLATFORM
 	string "Target platform (mandatory)"
@@ -75,10 +75,13 @@ endef
 endif # BR2_TARGET_OPTEE_OS_CORE

 ifeq ($(BR2_TARGET_OPTEE_OS_SERVICES),y)
-define OPTEE_OS_INSTALL_IMAGES_SERVICES
-	mkdir -p $(TARGET_DIR)/lib/optee_armtz
-	$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
-		$(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta
+define OPTEE_OS_INSTALL_TARGET_CMDS
+	$(if $(wildcard $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta),
+		$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
+			$(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta)
+	$(if $(wildcard $(@D)/$(OPTEE_OS_LOCAL_SDK)/lib/*.ta),
+		$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
+			$(@D)/$(OPTEE_OS_LOCAL_SDK)/lib/*.ta)
 endef
 endif # BR2_TARGET_OPTEE_OS_SERVICES

@@ -20,6 +20,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-nanopi-a64"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y

 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi A64"
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y

 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO2"
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y

 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino"
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y

 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2"
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y

 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Prime"
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y

 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64"
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-sopine-baseboard"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y

 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64 SOPINE"
@@ -28,10 +28,22 @@ clean+.
 Therefore, Buildroot provides a specific mechanism for this use case:
 the +<pkg>_OVERRIDE_SRCDIR+ mechanism. Buildroot reads an _override_
 file, which allows the user to tell Buildroot the location of the
-source for certain packages. By default this _override_ file is named
-+local.mk+ and located in the top directory of the Buildroot source
-tree, but a different location can be specified through the
-+BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
+source for certain packages.
+
+The default location of the override file is +$(CONFIG_DIR)/local.mk+,
+as defined by the +BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
+$(CONFIG_DIR)+ is the location of the Buildroot +.config+ file, so
+local.mk+ by default lives side-by-side with the +.config+ file,
+which means:
+
+* In the top-level Buildroot source directory for in-tree builds
+  (i.e., when +O=+ is not used)
+* In the out-of-tree directory for out-of-tree builds (i.e., when
+  +O=+ is used)
+
+If a different location than these defaults is required, it can be
+specified through the +BR2_PACKAGE_OVERRIDE_FILE+ configuration
+option.

 In this _override_ file, Buildroot expects to find lines of the form:

@@ -76,37 +76,37 @@
 	</div>
      </div>
 -->
-      <h3 style="text-align: center;">Latest release candidate: <b>2019.05-rc1</b></h3>
+      <h3 style="text-align: center;">Latest release candidate: <b>2019.05-rc3</b></h3>
      <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2019.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2019.05-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2019.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2019.05-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>

-	  <h3><a href="/downloads/buildroot-2019.05-rc1.tar.gz">buildroot-2019.05-rc1.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2019.05-rc1.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2019.05-rc3.tar.gz">buildroot-2019.05-rc3.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2019.05-rc3.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2019.05-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2019.05-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2019.05-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2019.05-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>

-	  <h3><a href="/downloads/buildroot-2019.05-rc1.tar.bz2">buildroot-2019.05-rc1.tar.bz2</a></h3>
-	  <p><a href="/downloads/buildroot-2019.05-rc1.tar.bz2.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2019.05-rc3.tar.bz2">buildroot-2019.05-rc3.tar.bz2</a></h3>
+	  <p><a href="/downloads/buildroot-2019.05-rc3.tar.bz2.sign">PGP signature</a></p>
 	</div>
      </div>

@@ -9,6 +9,48 @@
 <h2>News</h2>
 <ul class="timeline">

+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2019.05-rc3 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>25 May 2019</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>Another week, another release candidate with more cleanups and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.05-rc3">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2019.05-rc3.tar.bz2">2019.05-rc3
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2019.05-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>15 May 2019</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>Another week, another release candidate with more cleanups and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.05-rc2">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2019.05-rc2.tar.bz2">2019.05-rc2
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
  <li class="timeline-inverted">
    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
    <div class="timeline-panel">
@@ -20,7 +62,8 @@
 	<p>We have a new release candidate! Lots of changes all over the
 	  tree, see the
 	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.05-rc1">CHANGES</a>
-	  file for details.
+	  file for details, and read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2019-May/249819.html">announcement</a>.
 	</p>

 	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
@@ -31,7 +31,7 @@ choice
 	prompt "Kernel version"

 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (5.0)"
+	bool "Latest version (5.1)"

 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	bool "Latest CIP SLTS version (v4.19.13-cip1)"
@@ -121,7 +121,7 @@ endif

 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.0.13" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "5.1.4" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "v4.19.13-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
@@ -1,8 +1,8 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256 d06a7be6e73f97d1350677ad3bae0ce7daecb79c2c2902aaabe806f7fa94f041  linux-5.1.tar.xz
-sha256 bcfd52bf1faa24f5f712146a873959461e001656ad67717e80b947aa6ad53479  linux-5.0.13.tar.xz
+sha256 5c6d65faba54652b3ab4cfcb2f3be88d53478a2cd24d0f1cdd9344c7aad1e7f9  linux-5.1.4.tar.xz
+sha256 7fbd0b3d90a7a28a013f1e3f006c02235c12b41fd020460722a0b7c9936db0d8  linux-5.0.18.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256 6fd8cd4d8a15d7bfb4a7968fbe104f97f8c5ff557c752aae43fe13a6ca073fb0  linux-4.19.40.tar.xz
-sha256 a05afa95163eab4ec76dabb51f54aea8c40ef63d5ea2d112ac04e6b79a8e8dbd  linux-4.14.116.tar.xz
-sha256 bc579d904f7d7d04adf03ed66dc8ac0a29d6cc74d989d3aa5c6ae2dedaf51168  linux-4.9.173.tar.xz
-sha256 2c6a9d2765ef182f2470afed5af74de6c435ba9aaf422af54db8c5dc2b4f27d1  linux-4.4.179.tar.xz
+sha256 eb31e62fbb30aaeedb892cecdd8ac9746d42cbbef2ef2356f9ca8e13514b9d2b  linux-4.19.45.tar.xz
+sha256 2eecd6825a0998c8b6dd686cd4cd76e9f0d195bbace89f0b82495cc11ddb2884  linux-4.14.121.tar.xz
+sha256 13ffd8b0725d9ce9f9e927f4748ef640b049d7c69f21b28ca0d976cc23072566  linux-4.9.178.tar.xz
+sha256 1a450217d381bb7fd259d026d3b7a57c717e8d1f66754cd6fcc9df3c4a8a6a7a  linux-4.4.180.tar.xz
@@ -64,7 +64,8 @@ LINUX_MAKE_ENV = \
 	BR_BINARIES_DIR=$(BINARIES_DIR)

 LINUX_INSTALL_IMAGES = YES
-LINUX_DEPENDENCIES = host-kmod
+LINUX_DEPENDENCIES = host-kmod \
+	$(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode)

 # Starting with 4.16, the generated kconfig paser code is no longer
 # shipped with the kernel sources, so we need flex and bison, but
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_ASSIMP
 	bool "assimp"
-	# All gcc versions affected by
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
-	# cause an infinite loop in gcc when building this package.
-	depends on !BR2_microblaze
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_ZLIB
 	help
@@ -16,5 +12,4 @@ config BR2_PACKAGE_ASSIMP
 	  http://www.assimp.org

 comment "assimp needs a toolchain w/ C++"
-	depends on !BR2_microblaze
 	depends on !BR2_INSTALL_LIBSTDCPP
@@ -24,6 +24,10 @@ ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
 ASSIMP_CXXFLAGS += -O2
 endif

+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+ASSIMP_CXXFLAGS += -O0
+endif
+
 ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
 	-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"

@@ -10,8 +10,15 @@ ATOP_LICENSE = GPL-2.0+
 ATOP_LICENSE_FILES = COPYING
 ATOP_DEPENDENCIES = ncurses zlib

+ATOP_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+ATOP_CFLAGS += -O0
+endif
+
 define ATOP_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \
+		-C $(@D)
 endef

 define ATOP_INSTALL_TARGET_CMDS
@@ -0,0 +1,28 @@
+From 92b738a0fe8a7d65346de9e6dd7a8f135ee29765 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 23 Apr 2019 22:45:25 +0200
+Subject: [PATCH] dlz_open_driver.c: fix build without dlfcn.h
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://gitlab.isc.org/isc-projects/bind9/issues/995]
+---
+ bin/named/unix/dlz_dlopen_driver.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
+index 74d29ffa09..ab8a5c9493 100644
+--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
+@@ -14,7 +14,9 @@
+ #include <inttypes.h>
+ #include <stdlib.h>
+ #include <string.h>
+#if HAVE_DLFCN_H
+ #include <dlfcn.h>
+#endif
+ 
+ #include <dns/log.h>
+ #include <dns/result.h>
+-- 
+2.20.1
+
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_BIND
 	bool "bind"
 	depends on BR2_USE_MMU # fork()
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_STATIC_LIBS
 	help
 	  BIND (Berkeley Internet Name Domain) is an
 	  implementation of the Domain Name System (DNS) protocols
@@ -30,7 +28,6 @@ if BR2_PACKAGE_BIND

 config BR2_PACKAGE_BIND_SERVER
 	bool "Install server components"
-	default y
 	help
 	  Install server components (named, lwresd)

@@ -40,7 +37,3 @@ config BR2_PACKAGE_BIND_TOOLS
 	  Install tools (dig, host, nslookup, nsupdate)

 endif
-
-comment "bind needs a toolchain w/ threads, dynamic library"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
@@ -24,11 +24,11 @@ BIND_CONF_ENV = \
 	BUILD_CC="$(TARGET_CC)" \
 	BUILD_CFLAGS="$(TARGET_CFLAGS)"
 BIND_CONF_OPTS = \
+	$(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \
 	--without-lmdb \
 	--with-libjson=no \
 	--with-randomdev=/dev/urandom \
 	--enable-epoll \
-	--with-libtool \
 	--with-gssapi=no \
 	--enable-filter-aaaa

@@ -54,12 +54,13 @@ BIND_CONF_OPTS += --with-libxml2=no
 endif

 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-BIND_DEPENDENCIES += openssl
+BIND_DEPENDENCIES += host-pkgconf openssl
 BIND_CONF_OPTS += \
 	--with-openssl=$(STAGING_DIR)/usr \
 	--with-ecdsa=yes \
 	--with-eddsa=no \
 	--with-aes=yes
+BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 # GOST cipher support requires openssl extra engines
 ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
 BIND_CONF_OPTS += --with-gost=yes
@@ -84,6 +85,16 @@ else
 BIND_CONF_OPTS += --with-readline=no
 endif

+ifeq ($(BR2_STATIC_LIBS),y)
+BIND_CONF_OPTS += \
+	--without-dlopen \
+	--without-libtool
+else
+BIND_CONF_OPTS += \
+	--with-dlopen \
+	--with-libtool
+endif
+
 define BIND_TARGET_REMOVE_SERVER
 	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SERVER_SBIN))
 endef
@@ -16,8 +16,8 @@ BULLET_CONF_OPTS = -DBUILD_UNIT_TESTS=OFF \
 	-DBUILD_BULLET2_DEMOS=OFF \
 	-DBUILD_BULLET3=OFF

-# extras needs dlfcn.h and threads
-ifeq ($(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_HAS_THREADS),:y)
+# extras needs dlfcn.h and NPTL (pthread_barrier_init)
+ifeq ($(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),:y)
 BULLET_CONF_OPTS += -DBUILD_EXTRAS=ON
 else
 BULLET_CONF_OPTS += -DBUILD_EXTRAS=OFF
@@ -1,3 +1,6 @@
 # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc :
-sha1   edf0ec04b02fcbc90cc65906ff83fb042894a3b7                         ca-certificates_20180409.tar.xz
-sha256 7af6f5bfc619fd29cbf0258c1d95107c38ce840ad6274e343e1e0d971fc72b51 ca-certificates_20180409.tar.xz
+sha1   47d4584eae85fc905e4994766eb3930a8a84e2e1                         ca-certificates_20190110.tar.xz
+sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz
+
+# Locally computed
+sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright
@@ -4,9 +4,9 @@
 #
 ################################################################################

-CA_CERTIFICATES_VERSION = 20180409
+CA_CERTIFICATES_VERSION = 20190110
 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz
-CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20180411T111033Z/pool/main/c/ca-certificates
+CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates
 CA_CERTIFICATES_DEPENDENCIES = host-openssl
 # ca-certificates can be built with either python 2 or python 3
 # but it must be at least python 2.7
@@ -21,6 +21,14 @@ CHOCOLATE_DOOM_CONF_OPTS = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--with-sdl-exec-prefix=$(STAGING_DIR)/usr

+CHOCOLATE_DOOM_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+CHOCOLATE_DOOM_CFLAGS += -O0
+endif
+
+CHOCOLATE_DOOM_CONF_ENV += CFLAGS="$(CHOCOLATE_DOOM_CFLAGS)"
+
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 CHOCOLATE_DOOM_DEPENDENCIES += libpng
 CHOCOLATE_DOOM_CONF_OPTS += --with-libpng
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 17ace0e31ebd639906983b05fe1d51576b948ca5411c2162f55dd34c122162ca  cjson-v1.7.11.tar.gz
+sha256 760687665ab41a5cff9c40b1053c19572bcdaadef1194e5cba1b5e6f824686e7  cjson-v1.7.12.tar.gz
 sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-CJSON_VERSION = v1.7.11
+CJSON_VERSION = v1.7.12
 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE = MIT
@@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB
 # These require unmet dependencies, are fringe, pointless or deprecated
 COLLECTD_PLUGINS_DISABLE = \
 	amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \
-	gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lvm \
+	gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lua lvm \
 	madwifi mbmon mic multimeter netapp notify_desktop numa \
 	nut onewire oracle perl pf pinba powerdns python redis routeros \
 	rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
@@ -9,7 +9,8 @@ CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKL
 CRACKLIB_LICENSE = LGPL-2.1
 CRACKLIB_LICENSE_FILES = COPYING.LIB
 CRACKLIB_INSTALL_STAGING = YES
-CRACKLIB_DEPENDENCIES = host-cracklib
+CRACKLIB_DEPENDENCIES = host-cracklib $(TARGET_NLS_DEPENDENCIES)
+CRACKLIB_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)

 ifeq ($(BR2_PACKAGE_ZLIB),y)
 CRACKLIB_CONF_OPTS += --with-zlib
@@ -18,8 +18,14 @@ define DDRESCUE_CONFIGURE_CMDS
 	)
 endef

+DDRESCUE_CXXFLAGS = $(TARGET_CXXFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+DDRESCUE_CXXFLAGS += -O0
+endif
+
 define DDRESCUE_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) CXXFLAGS="$(DDRESCUE_CXXFLAGS)" -C $(@D)
 endef

 define DDRESCUE_INSTALL_TARGET_CMDS
@@ -0,0 +1,87 @@
+From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001
+From: Thomas Markwalder <tmark@isc.org>
+Date: Fri, 14 Sep 2018 13:41:41 -0400
+Subject: [PATCH] [master] Added includes of new BIND9 compatibility headers,
+ updated util/bind.sh
+
+    Merges in rt48072.
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved (and updated to remvove bind.sh update) from:
+https://gitlab.isc.org/isc-projects/dhcp/commit/8194daabfd590f17825f0c61e9534bee5c99cc86]
+---
+ includes/omapip/isclib.h |  3 +++
+ includes/omapip/result.h |  1 +
+ server/dhcpv6.c          | 13 +++++++++----
+ 3 files changed, 39 insertions(+), 12 deletions(-)
+
+diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
+index 75a87ff6..538b927f 100644
+--- a/includes/omapip/isclib.h
+++ b/includes/omapip/isclib.h
+@@ -48,6 +48,9 @@
+ #include <string.h>
+ #include <netdb.h>
+ 
+#include <isc/boolean.h>
+#include <isc/int.h>
+
+ #include <isc/buffer.h>
+ #include <isc/lex.h>
+ #include <isc/lib.h>
+diff --git a/includes/omapip/result.h b/includes/omapip/result.h
+index 91243e1b..860298f6 100644
+--- a/includes/omapip/result.h
+++ b/includes/omapip/result.h
+@@ -26,6 +26,7 @@
+ #ifndef DHCP_RESULT_H
+ #define DHCP_RESULT_H 1
+ 
+#include <isc/boolean.h>
+ #include <isc/lang.h>
+ #include <isc/resultclass.h>
+ #include <isc/types.h>
+diff --git a/server/dhcpv6.c b/server/dhcpv6.c
+index a7110f98..cde4f617 100644
+--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
+@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply,
+ 				  shared_name,
+ 				  inet_ntop(AF_INET6, &lease->addr,
+ 					    tmp_addr, sizeof(tmp_addr)),
+-				  used, count);
+				  (long long unsigned)(used),
+				  (long long unsigned)(count));
+ 		}
+ 		return;
+ 	}
+@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply,
+ 		  "address: %s; high threshold %d%% %llu/%llu.",
+ 		  shared_name,
+ 		  inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
+-		  poolhigh, used, count);
+		  poolhigh, (long long unsigned)(used),
+		  (long long unsigned)(count));
+ 
+ 	/* handle the low threshold now, if we don't
+ 	 * have one we default to 0. */
+@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply)
+ 		log_debug("Unable to pick client address: "
+ 			  "no addresses available  - shared network %s: "
+ 			  " 2^64-1 < total, %llu active,  %llu abandoned",
+-			  shared_name, active - abandoned, abandoned);
+			  shared_name, (long long unsigned)(active - abandoned),
+			  (long long unsigned)(abandoned));
+ 	} else {
+ 		log_debug("Unable to pick client address: "
+ 			  "no addresses available  - shared network %s: "
+ 			  "%llu total, %llu active,  %llu abandoned",
+-			  shared_name, total, active - abandoned, abandoned);
+			  shared_name, (long long unsigned)(total),
+			  (long long unsigned)(active - abandoned),
+		          (long long unsigned)(abandoned));
+ 	}
+ 
+ 	return ISC_R_NORESOURCES;
+-- 
+2.18.1
+
@@ -3,10 +3,11 @@ config BR2_PACKAGE_DHCP
 	# fork()
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	select BR2_PACKAGE_BIND
 	help
 	  DHCP relay agent from the ISC DHCP distribution.

-	  http://www.isc.org/products/DHCP
+	  https://www.isc.org/downloads/dhcp/

 if BR2_PACKAGE_DHCP

@@ -9,13 +9,14 @@ DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_INSTALL_STAGING = YES
 DHCP_LICENSE = MPL-2.0
 DHCP_LICENSE_FILES = LICENSE
+DHCP_DEPENDENCIES = bind
 DHCP_CONF_ENV = \
 	CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
 		-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
 	CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1'

 DHCP_CONF_OPTS = \
-	--with-bind-extra-config="$(DHCP_BIND_CONF_OPTS)" \
+	--with-libbind=$(STAGING_DIR)/usr \
 	--with-randomdev=/dev/random \
 	--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
 	--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
@@ -28,33 +29,17 @@ DHCP_CONF_OPTS = \
 	--with-relay-pid-file=/var/run/dhcrelay.pid \
 	--with-relay6-pid-file=/var/run/dhcrelay6.pid

-# bind does not support parallel builds.
-DHCP_MAKE = $(MAKE1)
-
-# bind configure is called via dhcp make instead of dhcp configure. The make env
-# needs extra values for bind configure.
-DHCP_MAKE_ENV = \
-	$(TARGET_CONFIGURE_OPTS) \
-	BUILD_CC="$(HOSTCC)" \
-	BUILD_CFLAGS="$(HOST_CFLAGS)" \
-	BUILD_CPPFLAGS="$(HOST_CPPFLAGS)" \
-	BUILD_LDFLAGS="$(HOST_LDFLAGS)"
+ifeq ($(BR2_STATIC_LIBS),y)
+DHCP_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/bind9-config --libs bind9`"
+DHCP_CONF_OPTS += --disable-libtool
+else
+DHCP_CONF_OPTS += --enable-libtool
+endif

 ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
 DHCP_CONF_OPTS += --enable-delayed-ack
 endif

-ifeq ($(BR2_PACKAGE_ZLIB),y)
-DHCP_DEPENDENCIES += zlib
-DHCP_BIND_CONF_OPTS += --with-zlib
-else
-DHCP_BIND_CONF_OPTS += --without-zlib
-endif
-
-ifeq ($(BR2_STATIC_LIBS),y)
-DHCP_BIND_CONF_OPTS += --without-dlopen
-endif
-
 ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
 define DHCP_INSTALL_SERVER
 	mkdir -p $(TARGET_DIR)/var/lib
@@ -7,8 +7,6 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on !BR2_nios2
 	# No support for ARMv7-M in the ARM assembly logic
 	depends on !BR2_ARM_CPU_ARMV7M
-	# Microblaze build affected by gcc PR71124 (infinite loop)
-	depends on !BR2_microblaze
 	# m68k coldfire causes a build failure, because the check for
 	# atomics (atomic_store) succeeds, which causes ffmpeg to
 	# think atomic intrinsics are available, while they are
@@ -523,6 +523,14 @@ else ifneq ($(GCC_TARGET_ARCH),)
 FFMPEG_CONF_OPTS += --cpu="$(GCC_TARGET_ARCH)"
 endif

+FFMPEG_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+FFMPEG_CONF_OPTS += --disable-optimizations
+FFMPEG_CFLAGS += -O0
+endif
+
+FFMPEG_CONF_ENV += CFLAGS="$(FFMPEG_CFLAGS)"
 FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))

 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
@@ -0,0 +1,54 @@
+From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001
+From: James Clarke <jrtc27@jrtc27.com>
+Date: Fri, 19 Jan 2018 17:22:49 +0000
+Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
+ gdb_wait.h
+
+On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
+contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
+define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
+earlier; include it from linux-ptrace.h so it can never come afterwards.
+
+gdb/ChangeLog:
+
+	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
+	gdb_ptrace.h, and move including gdb_wait.h ...
+	* nat/linux-ptrace.h: ... to here.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved (and backported/updated to remove ChangeLog update) from:
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
+---
+ gdb/ChangeLog          | 6 ++++++
+ gdb/nat/linux-ptrace.c | 2 --
+ gdb/nat/linux-ptrace.h | 1 +
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index 5c4ddc9..1f21ef0 100644
+--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
+@@ -21,8 +21,6 @@
+ #include "linux-procfs.h"
+ #include "linux-waitpid.h"
+ #include "buffer.h"
+-#include "gdb_wait.h"
+-#include "gdb_ptrace.h"
+ #include <sys/procfs.h>
+
+ /* Stores the ptrace options supported by the running kernel.
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 60967a3..dc180fb 100644
+--- a/gdb/nat/linux-ptrace.h
+++ b/gdb/nat/linux-ptrace.h
+@@ -21,6 +21,7 @@
+ struct buffer;
+ 
+ #include "nat/gdb_ptrace.h"
+#include "gdb_wait.h"
+ 
+ #ifdef __UCLIBC__
+ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
+-- 
+2.9.3
+
@@ -0,0 +1,54 @@
+From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001
+From: James Clarke <jrtc27@jrtc27.com>
+Date: Fri, 19 Jan 2018 17:22:49 +0000
+Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
+ gdb_wait.h
+
+On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
+contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
+define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
+earlier; include it from linux-ptrace.h so it can never come afterwards.
+
+gdb/ChangeLog:
+
+	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
+	gdb_ptrace.h, and move including gdb_wait.h ...
+	* nat/linux-ptrace.h: ... to here.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved (and updated to remove ChangeLog update) from:
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
+---
+ gdb/ChangeLog          | 6 ++++++
+ gdb/nat/linux-ptrace.c | 2 --
+ gdb/nat/linux-ptrace.h | 1 +
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index 5c4ddc9..1f21ef0 100644
+--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
+@@ -21,8 +21,6 @@
+ #include "linux-procfs.h"
+ #include "linux-waitpid.h"
+ #include "buffer.h"
+-#include "gdb_wait.h"
+-#include "gdb_ptrace.h"
+ #ifdef HAVE_SYS_PROCFS_H
+ #include <sys/procfs.h>
+ #endif
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 60967a3..dc180fb 100644
+--- a/gdb/nat/linux-ptrace.h
+++ b/gdb/nat/linux-ptrace.h
+@@ -21,6 +21,7 @@
+ struct buffer;
+ 
+ #include "nat/gdb_ptrace.h"
+#include "gdb_wait.h"
+ 
+ #ifdef __UCLIBC__
+ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
+-- 
+2.9.3
+
@@ -0,0 +1,54 @@
+From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001
+From: James Clarke <jrtc27@jrtc27.com>
+Date: Fri, 19 Jan 2018 17:22:49 +0000
+Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
+ gdb_wait.h
+
+On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
+contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
+define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
+earlier; include it from linux-ptrace.h so it can never come afterwards.
+
+gdb/ChangeLog:
+
+	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
+	gdb_ptrace.h, and move including gdb_wait.h ...
+	* nat/linux-ptrace.h: ... to here.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved (and updated to remove ChangeLog update) from:
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
+---
+ gdb/ChangeLog          | 6 ++++++
+ gdb/nat/linux-ptrace.c | 2 --
+ gdb/nat/linux-ptrace.h | 1 +
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index 5c4ddc9..1f21ef0 100644
+--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
+@@ -21,8 +21,6 @@
+ #include "linux-procfs.h"
+ #include "linux-waitpid.h"
+ #include "buffer.h"
+-#include "gdb_wait.h"
+-#include "gdb_ptrace.h"
+ #ifdef HAVE_SYS_PROCFS_H
+ #include <sys/procfs.h>
+ #endif
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 60967a3..dc180fb 100644
+--- a/gdb/nat/linux-ptrace.h
+++ b/gdb/nat/linux-ptrace.h
+@@ -21,6 +21,7 @@
+ struct buffer;
+ 
+ #include "nat/gdb_ptrace.h"
+#include "gdb_wait.h"
+ 
+ #ifdef __UCLIBC__
+ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
+-- 
+2.9.3
+
@@ -1,7 +1,7 @@
 #!/bin/sh

 DAEMON="gerbera"
-PIDFILE="/var/run/$NAME.pid"
+PIDFILE="/var/run/$DAEMON.pid"

 GERBERA_ARGS="-c /etc/gerbera/config.xml -l /var/log/gerbera.log"

@@ -13,4 +13,12 @@ GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJ
 GLIBMM_INSTALL_STAGING = YES
 GLIBMM_DEPENDENCIES = libglib2 libsigc host-pkgconf

+GLIBMM_CXXFLAGS = $(TARGET_CXXFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+GLIBMM_CXXFLAGS += -O0
+endif
+
+GLIBMM_CONF_ENV += CXXFLAGS="$(GLIBMM_CXXFLAGS)"
+
 $(eval $(autotools-package))
@@ -195,10 +195,10 @@ ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y)
 GPSD_SCONS_OPTS += fixed_port_speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE)
 endif
 ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y)
-GPSD_SCONS_OPTS += limited_max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
+GPSD_SCONS_OPTS += max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
 endif
 ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y)
-GPSD_SCONS_OPTS += limited_max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
+GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
 endif

 GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)" CFLAGS="$(GPSD_CFLAGS)"
@@ -5,7 +5,6 @@ config BR2_PACKAGE_GST_FFMPEG
 	depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
 	# triggers https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65151 on sh
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	help
 	  GStreamer plugin containing one plugin with a set of
@@ -29,6 +28,3 @@ endif

 comment "gst-ffmpeg needs a toolchain w/ gcc >= 5"
 	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh
-
-comment "gst-ffmpeg needs a toolchain not affected by GCC bug 85180"
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180
@@ -90,6 +90,14 @@ ifeq ($(BR2_STATIC_LIBS),)
 GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic
 endif

+GST_FFMPEG_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-optimizations
+GST_FFMPEG_CFLAGS += -O0
+endif
+
+GST_FFMPEG_CONF_ENV += CFLAGS="$(GST_FFMPEG_CFLAGS)"
 GST_FFMPEG_CONF_OPTS += --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)"

 $(eval $(autotools-package))
@@ -5,3 +5,14 @@ config BR2_PACKAGE_INTEL_MICROCODE
 	  This package provides an Intel microcode data file that can be
 	  used to correct processor errors. The iucode-tool package and
 	  proper kernel support are required to upload the microcode.
+
+	  https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files
+
+config BR2_PACKAGE_INTEL_MICROCODE_INSTALL_TARGET
+	bool "install microcode files to /lib/firmware in target"
+	default y
+	depends on BR2_PACKAGE_INTEL_MICROCODE
+	help
+	  Select this option to have the microcode files installed to
+	  /lib/firmware/intel-ucode in the target root filesystem, in
+	  addition to the images directory.
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 46ab18699ec42eb6cc01ee1846ec4d7ca979766dee2156f92d69e2f6df548137  microcode-20180807a.tgz
-sha256 c4698c6105d59fec11ad0929e77a003445c560c7706c089990030acbf10c9372  license
+sha256 9e67903a5b62b51f5e031b59a8046d3dff226834d79899799943803481a55d20  intel-microcode-microcode-20190514a.tar.gz
+sha256 1f8bf63fc2b1b486c507b98ff7d283c7eb58c7945746b94188a310d6787cbee5  license
@@ -4,18 +4,27 @@
 #
 ################################################################################

-INTEL_MICROCODE_VERSION = 20180807a
-INTEL_MICROCODE_SOURCE = microcode-$(INTEL_MICROCODE_VERSION).tgz
-INTEL_MICROCODE_SITE = https://downloadmirror.intel.com/28087/eng
-INTEL_MICROCODE_STRIP_COMPONENTS = 0
+INTEL_MICROCODE_VERSION = microcode-20190514a
+INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,$(INTEL_MICROCODE_VERSION))
 INTEL_MICROCODE_LICENSE = PROPRIETARY
 INTEL_MICROCODE_LICENSE_FILES = license
 INTEL_MICROCODE_REDISTRIBUTE = NO
+INTEL_MICROCODE_INSTALL_IMAGES = YES

+define INTEL_MICROCODE_INSTALL_IMAGES_CMDS
+	mkdir -p $(BINARIES_DIR)/intel-ucode
+	$(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \
+		$(@D)/intel-ucode/*
+endef
+
+ifeq ($(BR2_PACKAGE_INTEL_MICROCODE_INSTALL_TARGET),y)
 define INTEL_MICROCODE_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode
 	$(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \
 		$(@D)/intel-ucode/*
 endef
+else
+INTEL_MICROCODE_INSTALL_TARGET = NO
+endif

 $(eval $(generic-package))
@@ -2,6 +2,7 @@ config BR2_PACKAGE_IUCODE_TOOL
 	bool "iucode-tool"
 	depends on BR2_x86_64 || BR2_i386
 	select BR2_PACKAGE_INTEL_MICROCODE
+	select BR2_PACKAGE_INTEL_MICROCODE_INSTALL_TARGET
 	select BR2_PACKAGE_ARGP_STANDALONE \
 	       if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	help
@@ -25,4 +25,12 @@ else
 JASPER_CONF_OPTS += -DJAS_ENABLE_LIBJPEG=OFF
 endif

+JASPER_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+JASPER_CFLAGS += -O0
+endif
+
+JASPER_CONF_OPTS += -DCMAKE_C_FLAGS="$(JASPER_CFLAGS)"
+
 $(eval $(cmake-package))
@@ -0,0 +1,62 @@
+From dea6cfba122439b29cdcb833a59868dd51a4eae4 Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+Date: Mon, 13 May 2019 14:25:26 +0100
+Subject: [PATCH] Ensure that -lm linker library flag is always set
+
+configure was testing whether it was necessary to add the -lm option,
+but for some reason gcc adds it itself if -Os is not specified, but
+does not add it if -Os is specified. Consequently if configure was
+run without -Os, and make was run with -Os the link failed.
+
+The commit ensures that -lm is always used.
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/acassen/keepalived/commit/dea6cfba122439b29cdcb833a59868dd51a4eae4]
+---
+ configure.ac | 24 +++---------------------
+ 1 file changed, 3 insertions(+), 21 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5023900f4..ae420d5a6 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -340,6 +340,9 @@ WARNINGS_EXTRA="aggregate-return conversion padded pedantic sign-conversion stri
+ # We want _GNU_SOURCE defined always
+ add_to_var([CFLAGS], [-D_GNU_SOURCE])
+ 
+# fpclassify() needs -lm
+add_to_var([KA_LIBS], [-lm])
+
+ # Some sanity checks on configure options
+ AS_IF([test .$enable_vrrp = .no],
+   [
+@@ -779,27 +782,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
+     LDFLAGS=$SAV_LDFLAGS
+   ])
+ 
+-# Check if fpclassify() requires -lm
+-CFLAGS=
+-LDFLAGS=
+-AC_MSG_CHECKING([whether fpclassify() requires -lm])
+-AC_LINK_IFELSE([AC_LANG_SOURCE([[
+-  # include <math.h>
+-  int main(int argc, char **argv)
+-  {
+-    double zero = 0.0;
+-    if (fpclassify(zero) == FP_ZERO)
+-      return 0;
+-    return 1;
+-  }
+-  ]])],
+-  AC_MSG_RESULT([no]),
+-  AC_MSG_RESULT([yes])
+-    add_to_var([KA_LIBS], [-lm])
+-  )
+-CFLAGS=$SAV_CFLAGS
+-LDFLAGS=$SAV_LDFLAGS
+-
+ # Checks for header files.
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/prctl.h sys/socket.h sys/time.h syslog.h unistd.h],
+   [], [AC_MSG_ERROR([Missing/unusable system header file <$ac_header>])])
@@ -10,6 +10,8 @@ KEEPALIVED_DEPENDENCIES = host-pkgconf openssl
 KEEPALIVED_LICENSE = GPL-2.0+
 KEEPALIVED_LICENSE_FILES = COPYING
 KEEPALIVED_CONF_OPTS = --disable-hardening
+# We're patching configure.ac
+KEEPALIVED_AUTORECONF = YES

 ifeq ($(BR2_PACKAGE_JSON_C),y)
 KEEPALIVED_DEPENDENCIES += json-c
@@ -15,6 +15,14 @@ KISMET_LICENSE_FILES = debian/copyright
 # We touch configure.in:
 KISMET_AUTORECONF = YES

+KISMET_CXXFLAGS = $(TARGET_CXXFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+KISMET_CXXFLAGS += -O0
+endif
+
+KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)"
+
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 KISMET_DEPENDENCIES += libcap
 endif
@@ -18,8 +18,10 @@ LIBCPPRESTSDK_CONF_OPTS += \
 	-DBoost_USE_STATIC_RUNTIME=ON
 endif

+LIBCPPRESTSDK_CXXFLAGS = $(TARGET_CXXFLAGS)
+
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+LIBCPPRESTSDK_CXXFLAGS += -latomic
 endif

 ifeq ($(BR2_PACKAGE_BROTLI),y)
@@ -36,4 +38,10 @@ else
 LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=ON
 endif

+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+LIBCPPRESTSDK_CXXFLAGS += -O0
+endif
+
+LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(LIBCPPRESTSDK_CXXFLAGS)"
+
 $(eval $(cmake-package))
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://curl.haxx.se/download/curl-7.64.1.tar.xz.asc
+# https://curl.haxx.se/download/curl-7.65.0.tar.xz.asc
 # with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
-sha256 9252332a7f871ce37bfa7f78bdd0a0e3924d8187cc27cb57c76c9474a7168fb3  curl-7.64.1.tar.xz
+sha256 7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd  curl-7.65.0.tar.xz
 sha256 8c8824f50e73a021f5dde1fccbf69685939247399a33a32abab1fa448c9ddabb  COPYING
@@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBCURL_VERSION = 7.64.1
+LIBCURL_VERSION = 7.65.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
 LIBCURL_SITE = https://curl.haxx.se/download
 LIBCURL_DEPENDENCIES = host-pkgconf \
@@ -1,8 +1,8 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2019-April/040403.html
-md5 869a7e68c4290d99868500a369645def libinput-1.13.1.tar.xz
-sha1 a0338e5f2ff2cecbb88f91e5bf363f9b66770be2 libinput-1.13.1.tar.xz
-sha256 e1d487d478ee2bb118890a64211c2b7f2348aaed7363b214bed4d642274841ab libinput-1.13.1.tar.xz
-sha512 a19deec802e704038df0901c103a82a3370f56e0299f4cc1b6aa84c1832a66fb638e6f9d0fa708b51df6c3b939cdc1271e4ff547c645c566be03dce0bc9ff7e0 libinput-1.13.1.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2019-May/040548.html
+md5 8b745894f5d1b2e883bfc686aebadcfe libinput-1.13.2.tar.xz
+sha1 7e9d1bb3f5d4f8809c829753791141416a67ab1f libinput-1.13.2.tar.xz
+sha256 1d9fa0698348dea46f75321d98788f8ac7181c069b70c4d10736910a12bb6a6d libinput-1.13.2.tar.xz
+sha512 26f11c5274c26acc38b9b5729195010c0799a9563f1eb0e0cd67e323f8ed73b0fc8db8584ec8fdf1b726417f64c2daeb54832167079832626c8c1190fccf459f libinput-1.13.2.tar.xz

 # License files
 sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING
@@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBINPUT_VERSION = 1.13.1
+LIBINPUT_VERSION = 1.13.2
 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
 LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
 LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev
@@ -26,9 +26,12 @@ LIBSSH2_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
 # linking
 LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`"
 else ifeq ($(BR2_PACKAGE_LIBSSH2_OPENSSL),y)
-LIBSSH2_DEPENDENCIES += openssl
+LIBSSH2_DEPENDENCIES += host-pkgconf openssl
 LIBSSH2_CONF_OPTS += --with-libssl-prefix=$(STAGING_DIR)/usr \
 	--with-crypto=openssl
+# configure.ac forgets to link to dependent libraries of openssl breaking static
+# linking
+LIBSSH2_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 endif

 # Add zlib support if enabled
@@ -13,7 +13,15 @@ LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES
 LIBTORRENT_RASTERBAR_CONF_OPTS = \
 	--with-boost-libdir=$(STAGING_DIR)/usr/lib \
 	--disable-invariant-checks
-LIBTORRENT_RASTERBAR_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
+LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11
+
+# Internal error, aborting at dwarf2cfi.c:2802 in connect_traces
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864
+ifeq ($(BR2_m68k_cf),y)
+LIBTORRENT_RASTERBAR_CXXFLAGS += -fno-defer-pop
+endif
+
+LIBTORRENT_RASTERBAR_CONF_OPTS += CXXFLAGS="$(LIBTORRENT_RASTERBAR_CXXFLAGS)"

 ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
 LIBTORRENT_RASTERBAR_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
@@ -0,0 +1,39 @@
+From 04b454f693d0c71336252380d08f1d02967e133e Mon Sep 17 00:00:00 2001
+From: Jean-Francois Dockes <jf@dockes.org>
+Date: Sun, 27 Jan 2019 10:44:17 +0100
+Subject: [PATCH] Do not try to detach detached thread, the result is
+ undefined. Fixes issue #102
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes runtime crash with musl 1.1.20+. The problem is that libupnp is
+calling pthread_detach() on a thread which was created in the detached state.
+
+Backported from: 04b454f693d0c71336252380d08f1d02967e133e
+
+(cherry picked from commit 386b7ed79146ecf7a3bba49f48cb8f41a9b49170)
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+---
+ upnp/src/threadutil/ThreadPool.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c
+index d272907..5e590ed 100644
+--- a/upnp/src/threadutil/ThreadPool.c
+++ b/upnp/src/threadutil/ThreadPool.c
+@@ -651,11 +651,6 @@ static int CreateWorker(
+ 	rc = ithread_create(&temp, &attr, WorkerThread, tp);
+ 	ithread_attr_destroy(&attr);
+ 	if (rc == 0) {
+-		rc = ithread_detach(temp);
+-		/* ithread_detach will return EINVAL if thread has been
+-		 successfully detached by ithread_create */
+-		if (rc == EINVAL)
+-			rc = 0;
+ 		tp->pendingWorkerThreadStart = 1;
+ 		/* wait until the new worker thread starts */
+ 		while (tp->pendingWorkerThreadStart) {
+-- 
+2.21.0
+
@@ -11,12 +11,13 @@ LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no
 LIBUPNP18_INSTALL_STAGING = YES
 LIBUPNP18_LICENSE = BSD-3-Clause
 LIBUPNP18_LICENSE_FILES = COPYING
+LIBUPNP18_DEPENDENCIES = host-pkgconf
 # We're patching configure.ac
 LIBUPNP18_AUTORECONF = YES

 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBUPNP18_CONF_OPTS += --enable-open-ssl
-LIBUPNP18_DEPENDENCIES += host-pkgconf openssl
+LIBUPNP18_DEPENDENCIES += openssl
 else
 LIBUPNP18_CONF_OPTS += --disable-open-ssl
 endif
@@ -0,0 +1,39 @@
+From b4595154e84e21abdc0c89f937c410cf8280991c Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 13 May 2019 22:14:43 +0200
+Subject: [PATCH] src/Makefile.am: fix linking with log4cpp
+
+linknx fails to build with log4cpp because LOG4CPP_CFLAGS (which
+contains -pthread) is added to AM_CPPFLAGS (which is not used at link
+time) instead of AM_CXXFLAGS:
+
+/home/buildroot/autobuild/instance-0/output/host/bin/mipsel-linux-g++  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os     -o linknx linknx.o logger.o ruleserver.o objectcontroller.o eibclient.o threads.o timermanager.o persistentstorage.o xmlserver.o smsgateway.o emailgateway.o knxconnection.o services.o suncalc.o luacondition.o ioport.o ../ticpp/libticpp.a  -L/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lpthsem  -L/home/buildroot/autobuild/instance-0/output/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -llog4cpp     -lm
+/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/liblog4cpp.so: undefined reference to `pthread_key_create'
+
+So move LOG4CPP_CFLAGS to AM_CXXFLAGS
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1863f8f27041bc15ca68e786ba3b8e4764c40574
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: not sent yet]
+---
+ src/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6a4f493..92d147c 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -6,6 +6,7 @@ else
+ B64_CFLAGS=
+ B64_LIBS=
+ endif
+-AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LOG4CPP_CFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS)
+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS)
+AM_CXXFLAGS=$(LOG4CPP_CFLAGS)
+ linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm
+ linknx_SOURCES=linknx.cpp logger.cpp ruleserver.cpp objectcontroller.cpp eibclient.c threads.cpp timermanager.cpp  persistentstorage.cpp xmlserver.cpp smsgateway.cpp emailgateway.cpp knxconnection.cpp services.cpp suncalc.cpp  luacondition.cpp ioport.cpp ruleserver.h objectcontroller.h threads.h timermanager.h persistentstorage.h xmlserver.h smsgateway.h emailgateway.h knxconnection.h services.h suncalc.h luacondition.h ioport.h logger.h
+-- 
+2.20.1
+
@@ -297,12 +297,12 @@ endchoice

 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "4.4.179"	if BR2_KERNEL_HEADERS_4_4
-	default "4.9.173"	if BR2_KERNEL_HEADERS_4_9
-	default "4.14.116"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.40"	if BR2_KERNEL_HEADERS_4_19
-	default "5.0.13"	if BR2_KERNEL_HEADERS_5_0
-	default "5.1"		if BR2_KERNEL_HEADERS_5_1
+	default "4.4.180"	if BR2_KERNEL_HEADERS_4_4
+	default "4.9.178"	if BR2_KERNEL_HEADERS_4_9
+	default "4.14.121"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.45"	if BR2_KERNEL_HEADERS_4_19
+	default "5.0.18"	if BR2_KERNEL_HEADERS_5_0
+	default "5.1.4"		if BR2_KERNEL_HEADERS_5_1
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 3c26c102f8e69f81e12ea39037c770a00b6244e115a4c832e7a92feffdfad1aa  luarocks-3.1.1.tar.gz
+sha256 72a3b74f05b7fd011eed894dc34193ee80b3235fe58016ac9ffdbfceecc88950  luarocks-3.1.2.tar.gz
 sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f  COPYING
@@ -4,7 +4,7 @@
 #
 ################################################################################

-LUAROCKS_VERSION = 3.1.1
+LUAROCKS_VERSION = 3.1.2
 LUAROCKS_SITE = http://luarocks.org/releases
 LUAROCKS_LICENSE = MIT
 LUAROCKS_LICENSE_FILES = COPYING
@@ -21,9 +21,9 @@ LYNX_CONF_OPTS += --with-screen=slang
 endif

 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LYNX_DEPENDENCIES += host-pkgconf openssl
+LYNX_DEPENDENCIES += openssl
 LYNX_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
-LYNX_CONF_ENV = LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
+LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 else ifeq ($(BR2_PACKAGE_GNUTLS),y)
 LYNX_DEPENDENCIES += gnutls
 LYNX_CONF_OPTS += --with-gnutls
@@ -36,4 +36,11 @@ else
 LYNX_CONF_OPTS += --without-zlib
 endif

+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+LYNX_DEPENDENCIES += libidn
+LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libidn`
+endif
+
+LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)"
+
 $(eval $(autotools-package))
@@ -0,0 +1,28 @@
+From c1b9bd4214b78dc426bc6e6a07c23a8ab4ab50ea Mon Sep 17 00:00:00 2001
+From: Jordi Mas <jmas@softcatala.org>
+Date: Tue, 12 Mar 2019 12:24:19 +0100
+Subject: [PATCH] Fixes MONO_PROFILE_ENTER_LEAVE undeclared when compiling with
+ newer versions of Mono (#266)
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/mono/gtk-sharp/commit/c1b9bd4214b78dc426bc6e6a07c23a8ab4ab50ea]
+---
+ gtk/gui-thread-check/profiler/gui-thread-check.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gtk/gui-thread-check/profiler/gui-thread-check.c b/gtk/gui-thread-check/profiler/gui-thread-check.c
+index 11838e3b0..9f45fe6b2 100644
+--- a/gtk/gui-thread-check/profiler/gui-thread-check.c
+++ b/gtk/gui-thread-check/profiler/gui-thread-check.c
+@@ -86,6 +86,10 @@ simple_method_enter (MonoProfiler *prof, MonoMethod *method)
+ 	}
+ }
+ 
+#ifndef MONO_PROFILE_ENTER_LEAVE
+#define MONO_PROFILE_ENTER_LEAVE (1 << 12)
+#endif
+
+ void
+ mono_profiler_startup (const char *desc)
+ {
@@ -12,6 +12,7 @@ config BR2_PACKAGE_MONO_ARCH_SUPPORTS
 config BR2_PACKAGE_MONO
 	bool "mono"
 	depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS
+	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	help
@@ -20,6 +21,7 @@ config BR2_PACKAGE_MONO

 	  http://download.mono-project.com/sources/mono/

-comment "mono needs a toolchain w/ threads, dynamic library"
+comment "mono needs a toolchain w/ C++, threads, dynamic library"
 	depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
@@ -1,5 +1,10 @@
+comment "netsurf needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_NETSURF
 	bool "netsurf"
+	# static linking support is broken beyond repair
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
@@ -70,13 +70,18 @@ define NETSURF_CONFIGURE_CMDS
 	$(NETSURF_CURL_CONFIGURE_CMDS)
 endef

+NETSURF_MAKE_ENV = \
+	$(TARGET_MAKE_ENV) \
+	CFLAGS="$(TARGET_CFLAGS) -I$(@D)/tmpusr/include" \
+	LDFLAGS="$(TARGET_LDFLAGS) -L$(@D)/tmpusr/lib"
+
 NETSURF_MAKE_OPTS = \
 	TARGET=$(NETSURF_FRONTEND) \
 	BISON="$(HOST_DIR)/bin/bison" \
 	FLEX="$(HOST_DIR)/bin/flex" \
 	PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 	BUILD_CC="$(HOSTCC)" \
-	CC="$(TARGET_CC) -I$(@D)/tmpusr/include -L$(@D)/tmpusr/lib" \
+	CC="$(TARGET_CC)" \
 	AR="$(TARGET_AR)" \
 	TMP_PREFIX=$(@D)/tmpusr \
 	NETSURF_CONFIG="$(NETSURF_CONFIG)" \
@@ -84,7 +89,7 @@ NETSURF_MAKE_OPTS = \

 define NETSURF_BUILD_CMDS
 	mkdir -p $(@D)/tmpusr
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
+	$(NETSURF_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
 		build
 endef

@@ -10,6 +10,14 @@ OPUS_LICENSE = BSD-3-Clause
 OPUS_LICENSE_FILES = COPYING
 OPUS_INSTALL_STAGING = YES

+OPUS_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+OPUS_CFLAGS += -O0
+endif
+
+OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)"
+
 ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y)
 OPUS_CONF_OPTS += --enable-fixed-point
 endif
@@ -0,0 +1,63 @@
+From 77ac8fcb78e3085577cd4eb5c4ac7746a5444f13 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 17 May 2019 15:48:35 +0200
+Subject: [PATCH] Add --disable-documentation option
+
+This option allows the user to disable man pages which can be useful if
+podman is not available
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/LudovicRousseau/PCSC/pull/60]
+---
+ configure.ac        | 7 +++++++
+ src/spy/Makefile.am | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0fa5168..7d20c6e 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -144,6 +144,12 @@ esac
+ AC_DEFINE_UNQUOTED(PCSC_ARCH, "$PCSC_ARCH", [PC/SC target architecture])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} $PCSC_ARCH $host"
+ 
+# --disable-documentation
+AC_ARG_ENABLE(documentation,
+	AS_HELP_STRING([--disable-documentation],[do not build documentation]),
+	[ enable_doc="${enableval}" ], [ enable_doc="yes" ] )
+AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
+
+ # See if socket() is found from libsocket
+ AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
+ 
+@@ -446,6 +452,7 @@ use libsystemd:         ${use_libsystemd}
+ systemd unit directory: ${with_systemdsystemunitdir}
+ serial config dir.:     ${confdir_exp}
+ filter:                 ${use_filter}
+documentation:          ${enable_doc}
+ 
+ PCSCLITE_FEATURES:      ${PCSCLITE_FEATURES}
+ 
+diff --git a/src/spy/Makefile.am b/src/spy/Makefile.am
+index 3c3daee..0a83371 100644
+--- a/src/spy/Makefile.am
+++ b/src/spy/Makefile.am
+@@ -6,6 +6,7 @@ dist_bin_SCRIPTS = pcsc-spy
+ libpcscspy_la_SOURCES = \
+ 	libpcscspy.c
+ 
+if ENABLE_DOC
+ man_MANS = pcsc-spy.1
+ 
+ pcsc-spy.1: pcsc-spy.pod
+@@ -13,6 +14,7 @@ pcsc-spy.1: pcsc-spy.pod
+ 		--center="PC/SC lite" \
+ 		--release="$(PACKAGE_NAME) $(PACKAGE_VERSION)" \
+ 		$(srcdir)/pcsc-spy.pod > $@
+endif
+ 
+ EXTRA_DIST = install_spy.sh uninstall_spy.sh pcsc-spy.pod
+ CLEANFILES = pcsc-spy.1
+-- 
+2.20.1
+
@@ -1,29 +0,0 @@
-configure.ac: explicitly add pthread cflags/libs in the libusb test
-
-If libusb-config does not exist, LIBUSB_CFLAGS and PTHREAD_CFLAGS will be
-empty, and the test for libusb will be performed without additional flags.
-However, when libusb needs threads, some extra flags are needed (depending
-on the platform), like -pthreads, -lpthread, etc. Without these flags, the
-test for libusb_init() will fail to link correctly, and pcsc-lite will fail
-detecting libusb.
-
-Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-
-Upstream-status: will be submitted
-
---
-
-diff --git a/configure.ac b/configure.ac
--- a/configure.ac
-+++ b/configure.ac
-@@ -254,8 +254,8 @@ if test "x$use_libusb" != xno ; then
- 	saved_CPPFLAGS="$CPPFLAGS"
- 	saved_LIBS="$LIBS"
- 
-	CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
-	LIBS="$LDFLAGS $LIBUSB_LIBS"
-+	CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS $PTHREAD_CFLAGS"
-+	LIBS="$LDFLAGS $LIBUSB_LIBS $PTHREAD_LIBS"
- 
- 	AC_CHECK_HEADERS(libusb.h, [],
- 		[ AC_MSG_ERROR([libusb.h not found, use ./configure LIBUSB_CFLAGS=...]) ])
@@ -1,3 +1,4 @@
 # Locally calculated
-sha256 5a27262586eff39cfd5c19aadc8891dd71c0818d3d629539bd631b958be689c9  pcsc-lite-1.8.23.tar.bz2
-sha256 2ce8f52bc5afa74f223121955e4e6328c432b16044ea535acd550435dda2b5db  COPYING
+sha256 d76d79edc31cf76e782b9f697420d3defbcc91778c3c650658086a1b748e8792  pcsc-lite-1.8.25.tar.bz2
+sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1  COPYING
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  GPL-3.0.txt
@@ -4,13 +4,13 @@
 #
 ################################################################################

-PCSC_LITE_VERSION = 1.8.23
+PCSC_LITE_VERSION = 1.8.25
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf
-PCSC_LITE_LICENSE = BSD-3-Clause
-PCSC_LITE_LICENSE_FILES = COPYING
+PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist)
+PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt
 PCSC_LITE_AUTORECONF = YES

 # - libudev and libusb are optional
@@ -1,7 +1,7 @@
-# From https://ftp.postgresql.org/pub/source/v11.2/postgresql-11.2.tar.bz2.md5
-md5 19d43be679cb0d55363feb8926af3a0f  postgresql-11.2.tar.bz2
-# From https://ftp.postgresql.org/pub/source/v11.2/postgresql-11.2.tar.bz2.sha256
-sha256 2676b9ce09c21978032070b6794696e0aa5a476e3d21d60afc036dc0a9c09405  postgresql-11.2.tar.bz2
+# From https://ftp.postgresql.org/pub/source/v11.3/postgresql-11.3.tar.bz2.md5
+md5 c2a729b754b8de86a969c86ec25db076  postgresql-11.3.tar.bz2
+# From https://ftp.postgresql.org/pub/source/v11.3/postgresql-11.3.tar.bz2.sha256
+sha256 2a85e082fc225944821dfd23990e32dfcd2284c19060864b0ad4ca537d30522d  postgresql-11.3.tar.bz2

 # License file, Locally calculated
 sha256	c4c86d683970b22b9fab53320ee1b3a30ef4e8223122b4fb6be53ea62ecee8b3  COPYRIGHT
@@ -4,7 +4,7 @@
 #
 ################################################################################

-POSTGRESQL_VERSION = 11.2
+POSTGRESQL_VERSION = 11.3
 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
 POSTGRESQL_LICENSE = PostgreSQL
@@ -93,6 +93,14 @@ else
 POSTGRESQL_CONF_OPTS += --without-systemd
 endif

+POSTGRESQL_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+POSTGRESQL_CFLAGS += -O0
+endif
+
+POSTGRESQL_CONF_ENV += CFLAGS="$(POSTGRESQL_CFLAGS)"
+
 define POSTGRESQL_USERS
 	postgres -1 postgres -1 * /var/lib/pgsql /bin/sh - PostgreSQL Server
 endef
@@ -1,4 +1,4 @@
-From 0ef0d4ddd3f2261e381f22061a9a451dfbb1dc9e Mon Sep 17 00:00:00 2001
+From e3f3c454ec4992a2283640cef0a35da5a05fb399 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:17:59 +0100
 Subject: [PATCH] Change the install location of _sysconfigdata.py
@@ -19,16 +19,18 @@ this directory gets added to the PYTHONPATH of the host Python
 interpreter when building Python modules for the target.

 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in | 12 ++++++++++--
 configure.ac    |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index e288964..5367df7 100644
+index 9297e7fc89..49d3c0926f 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -529,6 +529,9 @@ pybuilddir.txt: $(BUILDPYTHON)
+@@ -509,6 +509,9 @@ pybuilddir.txt: $(BUILDPYTHON)
 		rm -f ./pybuilddir.txt ; \
 		exit 1 ; \
 	fi
@@ -38,7 +40,7 @@ index e288964..5367df7 100644
 
 # This is shared by the math and cmath modules
 Modules/_math.o: Modules/_math.c Modules/_math.h
-@@ -1080,7 +1083,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+@@ -1091,7 +1094,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
 		else	true; \
 		fi; \
 	done
@@ -47,7 +49,7 @@ index e288964..5367df7 100644
 	do \
 		if test -x $$i; then \
 			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1090,6 +1093,11 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+@@ -1101,6 +1104,11 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
 			echo $(INSTALL_DATA) $$i $(LIBDEST); \
 		fi; \
 	done
@@ -59,7 +61,7 @@ index e288964..5367df7 100644
 	@for d in $(LIBSUBDIRS); \
 	do \
 		a=$(srcdir)/Lib/$$d; \
-@@ -1418,7 +1426,7 @@ distclean: clobber
+@@ -1426,7 +1434,7 @@ distclean: clobber
 		Modules/Setup Modules/Setup.local Modules/Setup.config \
 		Modules/ld_so_aix Modules/python.exp Misc/python.pc
 	-rm -f python*-gdb.py
@@ -69,18 +71,18 @@ index e288964..5367df7 100644
 	# Expansion is performed here by shell (spawned by make) itself before
 	# arguments are passed to find. So LC_ALL=C must be set as a separate
 diff --git a/configure.ac b/configure.ac
-index 1273465..5f89797 100644
+index aecf6066e8..7143172b98 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
+@@ -36,7 +36,7 @@ if test "$cross_compiling" = yes; then
 	    AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
 	fi
         AC_MSG_RESULT($interp)
 -	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
 +	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
     fi
-     # Used to comment out stuff for rebuilding generated files
-     GENERATED_COMMENT='#'
+ elif test "$cross_compiling" = maybe; then
+     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
 -- 
-2.7.4
+2.11.0

@@ -1,4 +1,4 @@
-From 168e6c594e80395583de5ab0d082be119b2061fc Mon Sep 17 00:00:00 2001
+From 57ab41fa019d3ce276decd488938e5a00049cb9d Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:18:57 +0100
 Subject: [PATCH] Make the compilation of .pyc and .pyo conditional
@@ -7,16 +7,18 @@ This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable
 the compilation of pyc/pyo files.

 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in |  8 ++++++++
 configure.ac    | 11 +++++++++++
 2 files changed, 19 insertions(+)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 5367df7..96fc718 100644
+index 49d3c0926f..247d3c2902 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1128,24 +1128,32 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+@@ -1139,24 +1139,32 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
 	fi
@@ -50,10 +52,10 @@ index 5367df7..96fc718 100644
 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 diff --git a/configure.ac b/configure.ac
-index 5f89797..4aafc82 100644
+index 7143172b98..6bd8369105 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -759,6 +759,17 @@ SunOS*)
+@@ -773,6 +773,17 @@ SunOS*)
     ;;
 esac
 
@@ -72,5 +74,5 @@ index 5f89797..4aafc82 100644
 AC_SUBST(LIBRARY)
 AC_MSG_CHECKING(LIBRARY)
 -- 
-2.7.4
+2.11.0

@@ -1,4 +1,4 @@
-From 2d971c3cdca9ecc55f2da8aba12ca89e1a66519a Mon Sep 17 00:00:00 2001
+From e674e29ceba34e55c9149ce99489e543aa4ebb01 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:19:47 +0100
 Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation
@@ -7,15 +7,17 @@ The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't
 cross-compilation friendly.

 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.ac b/configure.ac
-index 4aafc82..63e6918 100644
+index 6bd8369105..77ca6d86ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3527,7 +3527,7 @@ fi
+@@ -3563,7 +3563,7 @@ fi
 
 AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
 
@@ -25,5 +27,5 @@ index 4aafc82..63e6918 100644
 	if test $ipv6 = yes
 	then
 -- 
-2.7.4
+2.11.0

@@ -1,4 +1,4 @@
-From 977de9474c1fb46359ab6a487e153fbd91a2b568 Mon Sep 17 00:00:00 2001
+From 94ec96dd8827adfb5e272d28a4d76510e28657b3 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:21:28 +0100
 Subject: [PATCH] Add minimal infrastructure to be able to disable extensions
@@ -8,6 +8,8 @@ disable Python extensions. Follow-up commits actually add options to
 disable specific extensions.

 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in | 6 +++++-
 configure.ac    | 2 ++
@@ -15,10 +17,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 3 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 96fc718..33b994d 100644
+index 247d3c2902..c1c98ecc5a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -161,6 +161,8 @@ FILEMODE=	644
+@@ -160,6 +160,8 @@ FILEMODE=	644
 # configure script arguments
 CONFIG_ARGS=	@CONFIG_ARGS@
 
@@ -27,7 +29,7 @@ index 96fc718..33b994d 100644
 
 # Subdirectories with code
 SRCDIRS= 	@SRCDIRS@
-@@ -548,6 +550,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -528,6 +530,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
 	esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -35,7 +37,7 @@ index 96fc718..33b994d 100644
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
 
 # Build static library
-@@ -1269,7 +1272,8 @@ libainstall:	all python-config
+@@ -1280,7 +1283,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
 # Install the dynamically loadable modules
 # This goes into $(exec_prefix)
 sharedinstall: sharedmods
@@ -46,10 +48,10 @@ index 96fc718..33b994d 100644
 		--install-scripts=$(BINDIR) \
 		--install-platlib=$(DESTSHARED) \
 diff --git a/configure.ac b/configure.ac
-index 63e6918..5d4232f 100644
+index 77ca6d86ca..13f90b3ddd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2462,6 +2462,8 @@ LIBS="$withval $LIBS"
+@@ -2491,6 +2491,8 @@ LIBS="$withval $LIBS"
 
 PKG_PROG_PKG_CONFIG
 
@@ -59,7 +61,7 @@ index 63e6918..5d4232f 100644
 AC_MSG_CHECKING(for --with-system-expat)
 AC_ARG_WITH(system_expat,
 diff --git a/setup.py b/setup.py
-index 64001e2..3b51c0a 100644
+index 812d53d560..d426dd02ea 100644
 --- a/setup.py
 +++ b/setup.py
@@ -33,7 +33,10 @@ host_platform = get_platform()
@@ -75,5 +77,5 @@ index 64001e2..3b51c0a 100644
 def add_dir_to_list(dirlist, dir):
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
 -- 
-2.7.4
+2.11.0

@@ -1,4 +1,4 @@
-From e5b0d225f4343e82791cb80e4e0c01a9b49eeff4 Mon Sep 17 00:00:00 2001
+From 1522c6c00ee88eb1148d3b2021d32d819b416375 Mon Sep 17 00:00:00 2001
 From: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Date: Tue, 7 Mar 2017 22:23:14 +0100
 Subject: [PATCH] Fix python-config for cross-builds
@@ -14,6 +14,8 @@ data/results.
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 [Bernd: rebased for Python 2.7.15]
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in          |  13 +++---
 Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,10 +24,10 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 create mode 100644 Misc/python-config.sh.in

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 33b994d..beb0837 100644
+index c1c98ecc5a..727a92af42 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -171,7 +171,7 @@ SRCDIRS= 	@SRCDIRS@
+@@ -170,7 +170,7 @@ SRCDIRS= 	@SRCDIRS@
 SUBDIRSTOO=	Include Lib Misc Demo
 
 # Files and directories to be distributed
@@ -34,16 +36,16 @@ index 33b994d..beb0837 100644
 DISTFILES=	README ChangeLog $(CONFIGFILES)
 DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
 DIST=		$(DISTFILES) $(DISTDIRS)
-@@ -431,7 +431,7 @@ LIBRARY_OBJS=	\
+@@ -403,7 +403,7 @@ LIBRARY_OBJS=	\
 
 # Default target
 all:		@DEF_MAKE_ALL_RULE@
 -build_all:	check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
 +build_all:	check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
 
- # Compile a binary with profile guided optimization.
- profile-opt:
-@@ -1179,10 +1179,12 @@ $(srcdir)/Lib/$(PLATDIR):
+ # Check that the source is clean when building out of source.
+ check-clean-src:
+@@ -1190,10 +1190,12 @@ $(srcdir)/Lib/$(PLATDIR):
 	fi; \
 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
 
@@ -58,7 +60,7 @@ index 33b994d..beb0837 100644
 
 # Install the include files
 INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1241,7 +1243,7 @@ libainstall:	all python-config
+@@ -1252,7 +1254,7 @@ libainstall:	@DEF_MAKE_RULE@ python-config
 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -67,7 +69,7 @@ index 33b994d..beb0837 100644
 	@if [ -s Modules/python.exp -a \
 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
 		echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1426,6 +1428,7 @@ clobber: clean profile-removal
+@@ -1434,6 +1436,7 @@ clobber: clean profile-removal
 		config.cache config.log pyconfig.h Modules/config.c
 	-rm -rf build platform
 	-rm -rf $(PYTHONFRAMEWORKDIR)
@@ -77,7 +79,7 @@ index 33b994d..beb0837 100644
 # remove all generated files, even Makefile[.pre]
 diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
 new file mode 100644
-index 0000000..10db4c1
+index 0000000000..10db4c12eb
 --- /dev/null
 +++ b/Misc/python-config.sh.in
@@ -0,0 +1,102 @@
@@ -184,10 +186,10 @@ index 0000000..10db4c1
 +esac
 +done
 diff --git a/configure.ac b/configure.ac
-index 5d4232f..183a903 100644
+index 13f90b3ddd..3f28ef1371 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -905,6 +905,7 @@ fi
+@@ -919,6 +919,7 @@ fi
 
 # Other platforms follow
 if test $enable_shared = "yes"; then
@@ -195,7 +197,7 @@ index 5d4232f..183a903 100644
   AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
   case $ac_sys_system in
     BeOS*)
-@@ -965,6 +966,7 @@ if test $enable_shared = "yes"; then
+@@ -979,6 +980,7 @@ if test $enable_shared = "yes"; then
 
   esac
 else # shared is disabled
@@ -203,7 +205,7 @@ index 5d4232f..183a903 100644
   case $ac_sys_system in
     CYGWIN*)
           BLDLIBRARY='$(LIBRARY)'
-@@ -2096,6 +2098,9 @@ AC_SUBST(LDCXXSHARED)
+@@ -2128,6 +2130,9 @@ AC_SUBST(LDCXXSHARED)
 AC_SUBST(BLDSHARED)
 AC_SUBST(CCSHARED)
 AC_SUBST(LINKFORSHARED)
@@ -213,7 +215,7 @@ index 5d4232f..183a903 100644
 # SO is the extension of shared libraries `(including the dot!)
 # -- usually .so, .sl on HP-UX, .dll on Cygwin
 AC_MSG_CHECKING(SO)
-@@ -4818,7 +4823,7 @@ AC_MSG_RESULT($ENSUREPIP)
+@@ -4944,7 +4949,7 @@ AC_MSG_RESULT($ENSUREPIP)
 AC_SUBST(ENSUREPIP)
 
 # generate output files
@@ -223,5 +225,5 @@ index 5d4232f..183a903 100644
 AC_OUTPUT
 
 -- 
-2.7.4
+2.11.0

@@ -1,4 +1,4 @@
-From bddfcbb8a4c011ca2fe471f7a4124cd64b5b0f00 Mon Sep 17 00:00:00 2001
+From 706d62599fb3c3cb9b9941364aaf4a1ef4ebd276 Mon Sep 17 00:00:00 2001
 From: Samuel Martin <s.martin49@gmail.com>
 Date: Tue, 7 Mar 2017 22:23:58 +0100
 Subject: [PATCH] Remove the python symlink install rules
@@ -10,15 +10,17 @@ or python3) the python symlink points to.
 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 [Bernd: rebased against version 2.7.12.]
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in | 7 -------
 1 file changed, 7 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index beb0837..dedcf61 100644
+index 727a92af42..37b2ff3a5f 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -968,17 +968,10 @@ bininstall:	altbininstall
+@@ -978,17 +978,10 @@ bininstall:	altbininstall
 		echo "Creating directory $(LIBPC)"; \
 		$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
 	fi
@@ -37,5 +39,5 @@ index beb0837..dedcf61 100644
 	-rm -f $(DESTDIR)$(LIBPC)/python2.pc
 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
 -- 
-2.7.4
+2.11.0

@@ -1,4 +1,4 @@
-From 0eac7789c0dd4aebe9e69d3c73d0c95e96922ea3 Mon Sep 17 00:00:00 2001
+From 2c1810fb002128a6d33cc3a391a157e316479d15 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:27:16 +0100
 Subject: [PATCH] Add an option to disable installation of test modules
@@ -10,16 +10,18 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 [Bernd: rebased against version 2.7.14]
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
- Makefile.pre.in | 48 ++++++++++++++++++++++++++++++++----------------
+ Makefile.pre.in | 50 +++++++++++++++++++++++++++++++++-----------------
 configure.ac    |  6 ++++++
- 2 files changed, 38 insertions(+), 16 deletions(-)
+ 2 files changed, 39 insertions(+), 17 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index dedcf61..280cc4e 100644
+index 37b2ff3a5f..2a5e8adc61 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1032,28 +1032,44 @@
+@@ -1048,28 +1048,44 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
 	plat-mac/lib-scriptpackages/SystemEvents \
 	plat-mac/lib-scriptpackages/Terminal
 PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -82,10 +84,10 @@ index dedcf61..280cc4e 100644
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 diff --git a/configure.ac b/configure.ac
-index 183a903..a1a35f6 100644
+index 3f28ef1371..f257a25620 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2806,6 +2806,12 @@ if test "$posix_threads" = "yes"; then
+@@ -2835,6 +2835,12 @@ if test "$posix_threads" = "yes"; then
 fi
 
 
@@ -99,5 +101,5 @@ index 183a903..a1a35f6 100644
 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
 AC_MSG_CHECKING([if --enable-ipv6 is specified])
 -- 
-2.7.4
+2.11.0

@@ -1,4 +1,4 @@
-From 52463745b6c46a46a6f2e2bc17983bb3f7bdac6e Mon Sep 17 00:00:00 2001
+From f98c3f981643411449aba6f93178b2ca14f9a68c Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:27:34 +0100
 Subject: [PATCH] Add an option to disable pydoc
@@ -8,6 +8,8 @@ itself.

 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in |  6 +++++-
 configure.ac    |  5 +++++
@@ -15,10 +17,10 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 3 files changed, 17 insertions(+), 4 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 280cc4e..84d5fc6 100644
+index 2a5e8adc61..d3ba1aeb4e 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1052,7 +1052,7 @@ LIBSUBDIRS=	lib-tk site-packages \
+@@ -1062,7 +1062,7 @@ LIBSUBDIRS=	lib-tk site-packages \
 		multiprocessing multiprocessing/dummy \
 		unittest \
 		lib-old \
@@ -27,7 +29,7 @@ index 280cc4e..84d5fc6 100644
 
 TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
 	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-@@ -1075,6 +1075,10 @@ ifeq (@TEST_MODULES@,yes)
+@@ -1086,6 +1086,10 @@ ifeq (@TEST_MODULES@,yes)
 LIBSUBDIRS += $(TESTSUBDIRS)
 endif
 
@@ -39,10 +41,10 @@ index 280cc4e..84d5fc6 100644
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 diff --git a/configure.ac b/configure.ac
-index a1a35f6..8bab160 100644
+index f257a25620..2ed4119478 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2805,6 +2805,11 @@ if test "$posix_threads" = "yes"; then
+@@ -2834,6 +2834,11 @@ if test "$posix_threads" = "yes"; then
       AC_CHECK_FUNCS(pthread_atfork)
 fi
 
@@ -55,10 +57,10 @@ index a1a35f6..8bab160 100644
 AC_SUBST(TEST_MODULES)
 
 diff --git a/setup.py b/setup.py
-index 9a5c2b8..69771e2 100644
+index 2ef5b07189..49f810f72e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2233,6 +2233,12 @@ def main():
+@@ -2277,6 +2277,12 @@ def main():
     # turn off warnings when deprecated modules are imported
     import warnings
     warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -71,7 +73,7 @@ index 9a5c2b8..69771e2 100644
     setup(# PyPI Metadata (PEP 301)
           name = "Python",
           version = sys.version.split()[0],
-@@ -2253,9 +2259,7 @@ def main():
+@@ -2297,9 +2303,7 @@ def main():
           ext_modules=[Extension('_struct', ['_struct.c'])],
 
           # Scripts to install
@@ -83,5 +85,5 @@ index 9a5c2b8..69771e2 100644
 
 # --install-platlib
 -- 
-2.7.4
+2.11.0

@@ -1,4 +1,4 @@
-From d0cf9ebed6d34d820cf594578cf513797fb52772 Mon Sep 17 00:00:00 2001
+From d7f419246681e12f05e2eefc79286959c6aa18ab Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:27:49 +0100
 Subject: [PATCH] Add an option to disable lib2to3
@@ -8,6 +8,8 @@ such, it is probably not very useful on embedded system targets.

 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in | 11 ++++++++---
 configure.ac    |  6 ++++++
@@ -15,10 +17,10 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 3 files changed, 17 insertions(+), 5 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 84d5fc6..b2a0490 100644
+index d3ba1aeb4e..0e15b6d6f4 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1045,7 +1045,6 @@ LIBSUBDIRS=	lib-tk site-packages \
+@@ -1055,7 +1055,6 @@ LIBSUBDIRS=	lib-tk site-packages \
 		json \
 		sqlite3  \
 		logging bsddb csv importlib wsgiref \
@@ -26,7 +28,7 @@ index 84d5fc6..b2a0490 100644
 		ctypes ctypes/macholib \
 		idlelib idlelib/Icons \
 		distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1064,8 +1063,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+@@ -1075,8 +1074,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
 	json/tests \
 	sqlite3/test \
 	bsddb/test \
@@ -35,7 +37,7 @@ index 84d5fc6..b2a0490 100644
 	ctypes/test \
 	idlelib/idle_test \
 	distutils/tests \
-@@ -1079,6 +1076,14 @@ ifeq (@PYDOC@,yes)
+@@ -1090,6 +1087,14 @@ ifeq (@PYDOC@,yes)
 LIBSUBDIRS += pydoc_data
 endif
 
@@ -51,10 +53,10 @@ index 84d5fc6..b2a0490 100644
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 diff --git a/configure.ac b/configure.ac
-index 8bab160..270f337 100644
+index 2ed4119478..a2810ab8ed 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2817,6 +2817,12 @@ AC_ARG_ENABLE(test-modules,
+@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(test-modules,
 	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
 	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
 
@@ -68,10 +70,10 @@ index 8bab160..270f337 100644
 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
 AC_MSG_CHECKING([if --enable-ipv6 is specified])
 diff --git a/setup.py b/setup.py
-index 69771e2..f51ef8c 100644
+index 49f810f72e..9130819454 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2234,10 +2234,11 @@ def main():
+@@ -2278,10 +2278,11 @@ def main():
     import warnings
     warnings.filterwarnings("ignore",category=DeprecationWarning)
 
@@ -86,5 +88,5 @@ index 69771e2..f51ef8c 100644
     setup(# PyPI Metadata (PEP 301)
           name = "Python",
 -- 
-2.7.4
+2.11.0

@@ -1,20 +1,22 @@
-From 570e1e81484d9bcbd30a7719b07d02785a5cab24 Mon Sep 17 00:00:00 2001
+From 123ecc50932e3ad3f7a2d90d430b74822c9695d4 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:28:06 +0100
 Subject: [PATCH] Add option to disable the sqlite3 module

 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in | 7 +++++--
 configure.ac    | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index b2a0490..974a052 100644
+index 0e15b6d6f4..a2e5ac6d41 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1043,7 +1043,6 @@ LIBSUBDIRS=	lib-tk site-packages \
+@@ -1053,7 +1053,6 @@ LIBSUBDIRS=	lib-tk site-packages \
 		email email/mime \
 		ensurepip ensurepip/_bundled \
 		json \
@@ -22,7 +24,7 @@ index b2a0490..974a052 100644
 		logging bsddb csv importlib wsgiref \
 		ctypes ctypes/macholib \
 		idlelib idlelib/Icons \
-@@ -1061,7 +1060,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+@@ -1072,7 +1071,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
 	test/tracedmodules \
 	email/test email/test/data \
 	json/tests \
@@ -30,7 +32,7 @@ index b2a0490..974a052 100644
 	bsddb/test \
 	ctypes/test \
 	idlelib/idle_test \
-@@ -1084,6 +1082,11 @@ TESTSUBDIRS += 	lib2to3/tests				\
+@@ -1095,6 +1093,11 @@ TESTSUBDIRS += 	lib2to3/tests				\
 		lib2to3/tests/data/fixers/myfixes
 endif
 
@@ -43,10 +45,10 @@ index b2a0490..974a052 100644
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 diff --git a/configure.ac b/configure.ac
-index 270f337..e9e1897 100644
+index a2810ab8ed..4ee3c60501 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2805,6 +2805,15 @@ if test "$posix_threads" = "yes"; then
+@@ -2834,6 +2834,15 @@ if test "$posix_threads" = "yes"; then
       AC_CHECK_FUNCS(pthread_atfork)
 fi
 
@@ -63,5 +65,5 @@ index 270f337..e9e1897 100644
 
 AC_ARG_ENABLE(pydoc,
 -- 
-2.7.4
+2.11.0

@@ -1,20 +1,22 @@
-From 05fbe2527b6f87edeef11f288c36bcbaa378ca02 Mon Sep 17 00:00:00 2001
+From f0dc1198360c6875ed846a961e85dc41e239aa29 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Tue, 7 Mar 2017 22:28:57 +0100
 Subject: [PATCH] Add an option to disable the tk module

 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 Makefile.pre.in | 11 ++++++++---
 configure.ac    |  9 +++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 974a052..f7f025f 100644
+index a2e5ac6d41..37ed70ab1d 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1038,7 +1038,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
+@@ -1048,7 +1048,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
 	plat-mac/lib-scriptpackages/SystemEvents \
 	plat-mac/lib-scriptpackages/Terminal
 PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -23,7 +25,7 @@ index 974a052..f7f025f 100644
 		encodings compiler hotshot \
 		email email/mime \
 		ensurepip ensurepip/_bundled \
-@@ -1052,8 +1052,7 @@ LIBSUBDIRS=	lib-tk site-packages \
+@@ -1062,8 +1062,7 @@ LIBSUBDIRS=	lib-tk site-packages \
 		lib-old \
 		curses $(MACHDEPS)
 
@@ -33,7 +35,7 @@ index 974a052..f7f025f 100644
 	test/cjkencodings test/decimaltestdata test/xmltestdata \
 	test/imghdrdata \
 	test/subprocessdata \
-@@ -1087,6 +1086,12 @@ LIBSUBDIRS += sqlite3
+@@ -1098,6 +1097,12 @@ LIBSUBDIRS += sqlite3
 TESTSUBDIRS += sqlite3/test
 endif
 
@@ -47,10 +49,10 @@ index 974a052..f7f025f 100644
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 diff --git a/configure.ac b/configure.ac
-index e9e1897..d0f032c 100644
+index 4ee3c60501..2c20f826c5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2814,6 +2814,15 @@ if test "$SQLITE3" = "no" ; then
+@@ -2843,6 +2843,15 @@ if test "$SQLITE3" = "no" ; then
    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
 fi
 
@@ -67,5 +69,5 @@ index e9e1897..d0f032c 100644
 
 AC_ARG_ENABLE(pydoc,
 -- 
-2.7.4
+2.11.0

--- a/Show More
+++ b/Show More