diff options
Diffstat (limited to 'package')
117 files changed, 1243 insertions, 307 deletions
diff --git a/package/Config.in b/package/Config.in index 9cd5d9c087..189909dbdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -775,6 +775,7 @@ menu "External python modules" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" source "package/python-flup/Config.in" + source "package/python-functools32/Config.in" source "package/python-futures/Config.in" source "package/python-gobject/Config.in" source "package/python-gunicorn/Config.in" @@ -1945,6 +1946,7 @@ menu "System tools" source "package/debianutils/Config.in" source "package/docker-containerd/Config.in" source "package/docker-engine/Config.in" + source "package/docker-proxy/Config.in" source "package/dsp-tools/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/Makefile.in b/package/Makefile.in index e387ce67fe..57fb47ea2e 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -409,8 +409,16 @@ else NLS_OPTS = --disable-nls endif +# We need anything that is invalid. Traditionally, we'd have used 'false' (and +# we did so in the past). However, that breaks libtool for packages that have +# optional C++ support (e.g. gnutls), because libtool will *require* a *valid* +# C++ preprocessor as long as CXX is not 'no'. +# Now, whether we use 'no' or 'false' for CXX as the same side effect: it is an +# invalid C++ compiler, and thus will cause detection of C++ to fail (which is +# expected and what we want), while at the same time taming libtool into +# silence. ifneq ($(BR2_INSTALL_LIBSTDCPP),y) -TARGET_CONFIGURE_OPTS += CXX=false CXXCPP=cpp +TARGET_CONFIGURE_OPTS += CXX=no endif ifeq ($(BR2_STATIC_LIBS),y) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 6471c38b62..76c7c766cb 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,2 +1,3 @@ -# From http://www.apache.org/dist/httpd/httpd-2.4.29.tar.bz2.sha256 -sha256 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 httpd-2.4.29.tar.bz2 +# From http://archive.apache.org/dist/httpd/httpd-2.4.33.tar.bz2.sha256 +sha256 de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05 httpd-2.4.33.tar.bz2 +sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index e1b1a209cb..eaf7b9c5bf 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.29 +APACHE_VERSION = 2.4.33 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index d0bbd3fd6e..f17c20bf54 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -248,6 +248,10 @@ define BUSYBOX_LINUX_PAM $(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) endef BUSYBOX_DEPENDENCIES += linux-pam +else +define BUSYBOX_LINUX_PAM + $(call KCONFIG_DISABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) +endef endif # Telnet support diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index 79928ae843..832c4dfcfb 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 03f708f1b14a26ab26c38abd51137640cb444d3ec72380b21b20f1a8d2861da7 c-ares-1.13.0.tar.gz +sha256 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e c-ares-1.14.0.tar.gz diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 72019a0425..67254244a1 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.13.0 +C_ARES_VERSION = 1.14.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 05670a716e..8feb11b48c 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON default y depends on BR2_USE_MMU # docker-containerd select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency + select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_SQLITE # runtime dependency help diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in new file mode 100644 index 0000000000..596e18a3f3 --- /dev/null +++ b/package/docker-proxy/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Libnetwork is a Container Network Model that provides a + consistent programming interface and the required network + abstractions for applications. + + This package provides docker-proxy, a run-time dependency of + Docker. + + https://github.com/docker/libnetwork + +comment "docker-proxy needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash new file mode 100644 index 0000000000..3ec184f54f --- /dev/null +++ b/package/docker-proxy/docker-proxy.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk new file mode 100644 index 0000000000..3bf6546d26 --- /dev/null +++ b/package/docker-proxy/docker-proxy.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# docker-proxy +# +################################################################################ + +DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e +DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) + +DOCKER_PROXY_LICENSE = Apache-2.0 +DOCKER_PROXY_LICENSE_FILES = LICENSE + +DOCKER_PROXY_DEPENDENCIES = host-go host-pkgconf + +DOCKER_PROXY_GOPATH = "$(@D)/gopath" +DOCKER_PROXY_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + CGO_NO_EMULATION=1 \ + GOBIN="$(@D)/bin" \ + GOPATH="$(DOCKER_PROXY_GOPATH)" \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + $(TARGET_MAKE_ENV) + +ifeq ($(BR2_STATIC_LIBS),y) +DOCKER_PROXY_GLDFLAGS += -extldflags '-static' +endif + +define DOCKER_PROXY_CONFIGURE_CMDS + mkdir -p $(DOCKER_PROXY_GOPATH)/src/github.com/docker + ln -fs $(@D) $(DOCKER_PROXY_GOPATH)/src/github.com/docker/libnetwork +endef + +define DOCKER_PROXY_BUILD_CMDS + cd $(@D)/gopath/src/github.com/docker/libnetwork; \ + $(DOCKER_PROXY_MAKE_ENV) \ + $(HOST_DIR)/usr/bin/go build -v \ + -o $(@D)/bin/docker-proxy \ + -ldflags "$(DOCKER_PROXY_GLDFLAGS)" \ + github.com/docker/libnetwork/cmd/proxy +endef + +define DOCKER_PROXY_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy +endef + +$(eval $(generic-package)) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 17309619ad..0d87119bb3 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -22,10 +22,9 @@ ENLIGHTENMENT_MESON_OPTS += \ --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \ -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ - -Deet-eet=$(HOST_DIR)/bin/eet \ - -Deldbus_codegen=$(HOST_DIR)/bin/eldbus-codegen \ - -Dpam=false \ - -Drpath=false + -Deet=$(HOST_DIR)/bin/eet \ + -Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \ + -Dpam=false ifeq ($(BR2_PACKAGE_SYSTEMD),y) ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true diff --git a/package/eudev/S10udev b/package/eudev/S10udev index 640fec625b..47c715c886 100755 --- a/package/eudev/S10udev +++ b/package/eudev/S10udev @@ -28,7 +28,7 @@ test -r $UDEV_CONFIG || exit 6 case "$1" in start) printf "Populating %s using udev: " "${udev_root:-/dev}" - printf '\000\000\000\000' > /proc/sys/kernel/hotplug + [ -e /proc/sys/kernel/hotplug ] && printf '\000\000\000\000' > /proc/sys/kernel/hotplug $UDEV_BIN -d || { echo "FAIL"; exit 1; } udevadm trigger --type=subsystems --action=add udevadm trigger --type=devices --action=add diff --git a/package/fbgrab/0100-fix-pixfmt-report.patch b/package/fbgrab/0100-fix-pixfmt-report.patch new file mode 100644 index 0000000000..8cff7ef8c3 --- /dev/null +++ b/package/fbgrab/0100-fix-pixfmt-report.patch @@ -0,0 +1,24 @@ +Fix pixel format report + +When fbgrab tells about the framebuffer pixel format, blue and green +are accidentally swapped in 'length' and 'msb_right' columns. Let's +order everything as RGB. + +Upstream-Status: Submitted [Gunnar Monell <gmo@linux.nu>] + +Signed-off-by: Timo Ketola <timo.ketola@exertus.fi> + +diff -u a/fbgrab.c b/fbgrab.c +--- a/fbgrab.c 2018-03-07 11:42:04.739250433 +0200 ++++ b/fbgrab.c 2018-03-07 11:43:26.128043877 +0200 +@@ -169,8 +169,8 @@ + fprintf(stderr, "bits_per_pixel: %i\n", fb_varinfo_p->bits_per_pixel); + fprintf(stderr, "grayscale: %s\n", fb_varinfo_p->grayscale ? "true" : "false"); + fprintf(stderr, "red: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->red.offset, fb_varinfo_p->red.length, fb_varinfo_p->red.msb_right); +- fprintf(stderr, "blue: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->blue.offset, fb_varinfo_p->green.length, fb_varinfo_p->green.msb_right); +- fprintf(stderr, "green: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->green.offset, fb_varinfo_p->blue.length, fb_varinfo_p->blue.msb_right); ++ fprintf(stderr, "green: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->green.offset, fb_varinfo_p->green.length, fb_varinfo_p->green.msb_right); ++ fprintf(stderr, "blue: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->blue.offset, fb_varinfo_p->blue.length, fb_varinfo_p->blue.msb_right); + fprintf(stderr, "alpha: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->transp.offset, fb_varinfo_p->transp.length, fb_varinfo_p->transp.msb_right); + fprintf(stderr, "pixel format: %s\n", fb_varinfo_p->nonstd == 0 ? "standard" : "non-standard"); + } diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index b5e5ab23dc..e33a90d912 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -60,8 +60,7 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU bool diff --git a/package/gnupg/Config.in.host b/package/gnupg/Config.in.host index a872ec820f..3686415796 100644 --- a/package/gnupg/Config.in.host +++ b/package/gnupg/Config.in.host @@ -1,5 +1,5 @@ config BR2_PACKAGE_HOST_GNUPG - bool "host-gnupg" + bool "host gnupg" help GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880. GnuPG allows diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index 474008d2cd..0a8d8ba096 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 gtest-release-1.8.0.tar.gz +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 googletest/LICENSE diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 2468bdbc23..170231c4b7 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 924d1161ed2399bcb72f98419072b3130a466e07d9a6fce43d27458ffa907ffa 7.0.7-10.tar.gz +sha256 723a28f9cbc5c6130f496065fc01c839083e97bf3e4930f940a03c0155046170 7.0.7-27.tar.gz +sha256 2318cc05bbd2c25c1b2d13af1aadccc45b9cf6f94757421ae59a3c8ea9064f1c LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index c2171a7564..116543888b 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.7-10 +IMAGEMAGICK_VERSION = 7.0.7-27 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 12e1dfbf8f..999b27299d 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 063f1aa3a546cb49323a5e0b516894e4b040007107b8c8ff017aca8a86204130 microcode-20180108.tgz +sha256 0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779 microcode-20180312.tgz sha256 6d4deb65ca688d930e188bf93f78430f134097b161e6df4a2ef00728e14965e3 license.txt diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index d6c35b21c7..e3134b6408 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,9 +4,9 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20180108 +INTEL_MICROCODE_VERSION = 20180312 INTEL_MICROCODE_SOURCE = microcode-$(INTEL_MICROCODE_VERSION).tgz -INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27431/eng +INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27591/eng INTEL_MICROCODE_STRIP_COMPONENTS = 0 INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license.txt diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index 83dde00352..0f298137ba 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585 irssi-1.0.6.tar.xz +sha256 1b386ca026aa1875c380fd00ef1d24b71fb87cdae39ef5349ecca16c4567feac irssi-1.0.7.tar.xz # Locally calculated sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index d49b5d7e46..611365f88e 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.0.6 +IRSSI_VERSION = 1.0.7 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz # Do not use the github helper here. The generated tarball is *NOT* the # same as the one uploaded by upstream for the release. diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 68c8a914db..389a72ab83 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -44,9 +44,13 @@ endif # pkg-autotools.mk JIMTCL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK +# jimtcl really wants to find a existing $CXX, so feed it false +# when we do not have one. define JIMTCL_CONFIGURE_CMDS (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) CCACHE=none \ + $(TARGET_CONFIGURE_OPTS) \ + CCACHE=none \ + $(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \ ./configure --prefix=/usr \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index bd676108aa..e1149b7b65 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -74,7 +74,7 @@ endif # host. define HOST_KMOD_INSTALL_TOOLS mkdir -p $(HOST_DIR)/sbin/ - ln -sf ../usr/bin/kmod $(HOST_DIR)/sbin/depmod + ln -sf ../bin/kmod $(HOST_DIR)/sbin/depmod endef HOST_KMOD_POST_INSTALL_HOOKS += HOST_KMOD_INSTALL_TOOLS diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 93f4dd4b31..9d3b65ae91 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -71,7 +71,8 @@ KODI_CONF_OPTS += \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \ -DLIBDVDNAV_URL=$(DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \ - -DLIBDVDREAD_URL=$(DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz + -DLIBDVDREAD_URL=$(DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz \ + -DENABLE_IMX=OFF ifeq ($(BR2_ENABLE_LOCALE),) KODI_DEPENDENCIES += libiconv @@ -191,12 +192,6 @@ KODI_DEPENDENCIES += libamcodec else KODI_CONF_OPTS += -DENABLE_AML=OFF endif -ifeq ($(BR2_PACKAGE_IMX_VPUWRAP),y) -KODI_CONF_OPTS += -DENABLE_IMX=ON -KODI_DEPENDENCIES += imx-vpuwrap -else -KODI_CONF_OPTS += -DENABLE_IMX=OFF -endif endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) diff --git a/package/ktap/ktap.hash b/package/ktap/ktap.hash index d58bd85b43..1eff712501 100644 --- a/package/ktap/ktap.hash +++ b/package/ktap/ktap.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 bc8b03a53c430ae4fcf594ffdf31e2b2ed47a8fee25dd8fea60aa34f75441707 ktap-eb66d40310c93dc82bc8eac889744c1ed1f01f7b.tar.gz +sha256 44a0808d57175cf9d15466f720e1e10d5ed1abc3497aedf9ddd6469545552345 ktap-23bc7a4a94bd9e4e1b8b7c06632e61c041d57b5f.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE-GPL diff --git a/package/ktap/ktap.mk b/package/ktap/ktap.mk index b9b3dbcc53..3b9134da65 100644 --- a/package/ktap/ktap.mk +++ b/package/ktap/ktap.mk @@ -4,7 +4,7 @@ # ################################################################################ -KTAP_VERSION = eb66d40310c93dc82bc8eac889744c1ed1f01f7b +KTAP_VERSION = 23bc7a4a94bd9e4e1b8b7c06632e61c041d57b5f KTAP_SITE = $(call github,ktap,ktap,$(KTAP_VERSION)) KTAP_LICENSE = GPL-2.0 KTAP_LICENSE_FILES = LICENSE-GPL diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 708ca1b6e7..deb94ecd6d 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,2 +1,5 @@ # Locally calculated sha256 f7e26dc232c177336474a14487771037a8fb32e311f5ccd076a00dc04b6d7b7a libcoap-v4.1.2.tar.gz +sha256 28b61fbf3c5477611d7f6ead97d15348934496d27dca815b34d45e622730e72e COPYING +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE.GPL +sha256 9d5aeec17bdf82369bbe6e89efb07b7b35abefa044ea1d25cb2feeb70df1c208 LICENSE.BSD diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index b1afe1891d..aec61e3f83 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.58.0.tar.xz.asc -sha256 6a813875243609eb75f37fa72044e4ad618b55ec15a4eafdac2df6a7e800e3e3 curl-7.58.0.tar.xz +# https://curl.haxx.se/download/curl-7.59.0.tar.xz.asc +sha256 e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc curl-7.59.0.tar.xz sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 39ed3e4da5..c6289e05f4 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.58.0 +LIBCURL_VERSION = 7.59.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk index ced850c153..78da772916 100644 --- a/package/libfcgi/libfcgi.mk +++ b/package/libfcgi/libfcgi.mk @@ -7,7 +7,7 @@ LIBFCGI_VERSION = 2.4.0 LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz LIBFCGI_SITE = http://www.fastcgi.com/dist -LIBFCGI_LICENSE = fcgi license +LIBFCGI_LICENSE = OML LIBFCGI_LICENSE_FILES = LICENSE.TERMS LIBFCGI_INSTALL_STAGING = YES LIBFCGI_AUTORECONF = YES diff --git a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch index df166565f9..70f16f662f 100644 --- a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch +++ b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch @@ -8,28 +8,32 @@ This allows "make install; make install" to work properly. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Renaud AUBIN <root@renaud.io> --- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 33c8ba0..b36d95a 100644 +index 6cf63bd..c182e5c 100644 --- a/Makefile +++ b/Makefile -@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c +@@ -133,14 +133,14 @@ tags: http_parser.c http_parser.h test.c install: library - $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h - $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) + $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) +- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) ++ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) install-strip: library - $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h - $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) + $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h + $(INSTALL) -D -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) +- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) ++ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) uninstall: - rm $(INCLUDEDIR)/http_parser.h + rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h -- 2.6.2 diff --git a/package/libhttpparser/libhttpparser.hash b/package/libhttpparser/libhttpparser.hash index a1b772e54c..8ffceb24d9 100644 --- a/package/libhttpparser/libhttpparser.hash +++ b/package/libhttpparser/libhttpparser.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 70409ad324e5de2da6a0f39e859e566d497c1ff0a249c0c38a5012df91b386b3 libhttpparser-v2.7.1.tar.gz +sha256 7277c6f99bf6fc272eb5d8fc3dca01e7cc1d4ae609b5d2c5d5e18added98479d libhttpparser-v2.8.0.tar.gz diff --git a/package/libhttpparser/libhttpparser.mk b/package/libhttpparser/libhttpparser.mk index 1df26017e7..5f50d877d9 100644 --- a/package/libhttpparser/libhttpparser.mk +++ b/package/libhttpparser/libhttpparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTTPPARSER_VERSION = v2.7.1 +LIBHTTPPARSER_VERSION = v2.8.0 LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION)) LIBHTTPPARSER_INSTALL_STAGING = YES LIBHTTPPARSER_LICENSE = MIT diff --git a/package/libminiupnpc/libminiupnpc.hash b/package/libminiupnpc/libminiupnpc.hash index 985d69d45f..c83b38aa60 100644 --- a/package/libminiupnpc/libminiupnpc.hash +++ b/package/libminiupnpc/libminiupnpc.hash @@ -1,2 +1,3 @@ # Locally computed sha256 d434ceb8986efbe199c5ca53f90ed53eab290b1e6d0530b717eb6fa49d61f93b miniupnpc-2.0.tar.gz +sha256 4025f2214fa46ad40c156605b83d66e8faf45823e67eb3337af3869716e6d7dd LICENSE diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index e3d3da757d..48b7471c20 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,8 +1,8 @@ -# From https://www.openssl.org/source/openssl-1.0.2n.tar.gz.sha256 -sha256 370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe openssl-1.0.2n.tar.gz +# From https://www.openssl.org/source/openssl-1.0.2o.tar.gz.sha256 +sha256 ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d openssl-1.0.2o.tar.gz # Locally computed sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 30cb49489de5041841a74da9155cd4fabfbce33237262ba7cd23974314ae2956 openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d -sha256 9ee37d72966bb4a841343f0606ce44d41b3eae4df4285200c5a8ddc2b935992a LICENSE +sha256 c8f60f4842bbad0353f5d81620e72b168b5638ca3a0a999f5da113b22491612e LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 5a78676c64..16a9c2e9d2 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.0.2n +LIBOPENSSL_VERSION = 1.0.2o LIBOPENSSL_SITE = http://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index edac3d578f..36c2ea1289 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,6 +1,6 @@ -# From http://www.pjsip.org/release/2.7.1/MD5SUM.TXT -md5 99a64110fa5c2debff40e0e8d4676380 pjproject-2.7.1.tar.bz2 +# From http://www.pjsip.org/release/2.7.2/MD5SUM.TXT +md5 fa3f0bc098c4bff48ddd92db1c016a7a pjproject-2.7.2.tar.bz2 # Locally computed -sha256 59fabc62a02b2b80857297cfb10e2c68c473f4a0acc6e848cfefe8421f2c3126 pjproject-2.7.1.tar.bz2 +sha256 9c2c828abab7626edf18e04b041ef274bfaa86f99adf2c25ff56f1509e813772 pjproject-2.7.2.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 53b654d072..db9e474be7 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.7.1 +LIBPJSIP_VERSION = 2.7.2 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2 LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION) LIBPJSIP_DEPENDENCIES = libsrtp diff --git a/package/libss7/Config.in b/package/libss7/Config.in index b99c578182..bdf5fbe3a8 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBSS7 bool "libss7" + depends on BR2_USE_MMU # dahdi-tools <- perl depends on BR2_LINUX_KERNEL depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_DAHDI_LINUX diff --git a/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch b/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch new file mode 100644 index 0000000000..76e08c51a9 --- /dev/null +++ b/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch @@ -0,0 +1,31 @@ +From f4846473f0f0ec313f8ed7ff4cd9f59c1741465d Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Tue, 20 Mar 2018 20:21:53 +0200 +Subject: [PATCH] acinclude.m4: add mbedtls to LIBS + +This is useful for static builds so that the Libs.private field in +libssh2.pc contains correct info for the benefit of pkg-config users. +Static link with libssh2 requires this information. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: https://github.com/libssh2/libssh2/pull/242 + + acinclude.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/acinclude.m4 b/acinclude.m4 +index c0e89a1a0c98..02c70845d27c 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -441,6 +441,7 @@ m4_case([$1], + [mbedtls], [ + LIBSSH2_LIB_HAVE_LINKFLAGS([mbedcrypto], [], [#include <mbedtls/version.h>], [ + AC_DEFINE(LIBSSH2_MBEDTLS, 1, [Use $1]) ++ LIBS="$LIBS $LIBMBEDCRYPTO" + found_crypto="$1" + support_clear_memory=yes + ]) +-- +2.16.2 + diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 929e5c42e7..e52b7ea9d7 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7d83d79af3bb4062e5c3a58bf2e90d2da5b8b99e2b2d57c23b5b6f766288cf96 libupnp-1.6.24.tar.bz2 +sha256 c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43 libupnp-1.6.25.tar.bz2 sha256 0375955c8a79d6e8fa0792d45d00fc4e7710d7ac95bcbd27f9225a83f5c946fd LICENSE diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index c7085c2148..8831885ba4 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.6.24 +LIBUPNP_VERSION = 1.6.25 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no diff --git a/package/libupnpp/libupnpp.hash b/package/libupnpp/libupnpp.hash index f19e0b5441..fe67987c4e 100644 --- a/package/libupnpp/libupnpp.hash +++ b/package/libupnpp/libupnpp.hash @@ -1,2 +1,5 @@ # Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.16.0.tar.gz.sha256 sha256 b34b179e69c46993cf360da9e85db646b03c15ab2927b19eb70e27bf3c359017 libupnpp-0.16.0.tar.gz + +# Hash for license file: +sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index 4755b706d6..98cb515fe2 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -6,7 +6,7 @@ LIBUPNPP_VERSION = 0.16.0 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads -LIBUPNPP_LICENSE = GPL-2.0+ +LIBUPNPP_LICENSE = LGPL-2.1+ LIBUPNPP_LICENSE_FILES = COPYING LIBUPNPP_INSTALL_STAGING = YES LIBUPNPP_DEPENDENCIES = expat libcurl libupnp diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index cc5a30ae10..1a2833e786 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8d96a6230af4f9f33d6ec021b599e157279a2af72ed38cf4a8c25e6d58d952ef libuv-v1.19.1.tar.gz +sha256 ccc5f3b43ed171640513786e5e809508cb6308279b4d71a016e4550ad62f1686 libuv-v1.19.2.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 2666c14f93..2e07d3a0fa 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.19.1 +LIBUV_VERSION = v1.19.2 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/libvorbis/0001-CVE-2017-14633-Don-t-allow-for-more-than-256-channel.patch b/package/libvorbis/0001-CVE-2017-14633-Don-t-allow-for-more-than-256-channel.patch deleted file mode 100644 index 416aa66ddf..0000000000 --- a/package/libvorbis/0001-CVE-2017-14633-Don-t-allow-for-more-than-256-channel.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a79ec216cd119069c68b8f3542c6a425a74ab993 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Tue, 31 Oct 2017 18:32:46 +0100 -Subject: [PATCH] CVE-2017-14633: Don't allow for more than 256 channels - -Otherwise - - for(i=0;i<vi->channels;i++){ - /* the encoder setup assumes that all the modes used by any - specific bitrate tweaking use the same floor */ - int submap=info->chmuxlist[i]; - -overreads later in mapping0_forward since chmuxlist is a fixed array of -256 elements max. - -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - lib/info.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/info.c b/lib/info.c -index fe759ed..7bc4ea4 100644 ---- a/lib/info.c -+++ b/lib/info.c -@@ -588,7 +588,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v, - oggpack_buffer opb; - private_state *b=v->backend_state; - -- if(!b||vi->channels<=0){ -+ if(!b||vi->channels<=0||vi->channels>256){ - ret=OV_EFAULT; - goto err_out; - } --- -2.11.0 - diff --git a/package/libvorbis/0002-CVE-2017-14632-vorbis_analysis_header_out-Don-t-clea.patch b/package/libvorbis/0002-CVE-2017-14632-vorbis_analysis_header_out-Don-t-clea.patch deleted file mode 100644 index ffb4cc92f2..0000000000 --- a/package/libvorbis/0002-CVE-2017-14632-vorbis_analysis_header_out-Don-t-clea.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c1c2831fc7306d5fbd7bc800324efd12b28d327f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Wed, 15 Nov 2017 18:22:59 +0100 -Subject: [PATCH] CVE-2017-14632: vorbis_analysis_header_out: Don't clear opb - if not initialized - -If the number of channels is not within the allowed range -we call oggback_writeclear altough it's not initialized yet. - -This fixes - - =23371== Invalid free() / delete / delete[] / realloc() - ==23371== at 0x4C2CE1B: free (vg_replace_malloc.c:530) - ==23371== by 0x829CA31: oggpack_writeclear (in /usr/lib/x86_64-linux-gnu/libogg.so.0.8.2) - ==23371== by 0x84B96EE: vorbis_analysis_headerout (info.c:652) - ==23371== by 0x9FBCBCC: ??? (in /usr/lib/x86_64-linux-gnu/sox/libsox_fmt_vorbis.so) - ==23371== by 0x4E524F1: ??? (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x4E52CCA: sox_open_write (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x10D82A: open_output_file (sox.c:1556) - ==23371== by 0x10D82A: process (sox.c:1753) - ==23371== by 0x10D82A: main (sox.c:3012) - ==23371== Address 0x68768c8 is 488 bytes inside a block of size 880 alloc'd - ==23371== at 0x4C2BB1F: malloc (vg_replace_malloc.c:298) - ==23371== by 0x4C2DE9F: realloc (vg_replace_malloc.c:785) - ==23371== by 0x4E545C2: lsx_realloc (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x9FBC9A0: ??? (in /usr/lib/x86_64-linux-gnu/sox/libsox_fmt_vorbis.so) - ==23371== by 0x4E524F1: ??? (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x4E52CCA: sox_open_write (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x10D82A: open_output_file (sox.c:1556) - ==23371== by 0x10D82A: process (sox.c:1753) - ==23371== by 0x10D82A: main (sox.c:3012) - -as seen when using the testcase from CVE-2017-11333 with -008d23b782be09c8d75ba8190b1794abd66c7121 applied. However the error was -there before. - -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - lib/info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/info.c b/lib/info.c -index 7bc4ea4..8d0b2ed 100644 ---- a/lib/info.c -+++ b/lib/info.c -@@ -589,6 +589,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v, - private_state *b=v->backend_state; - - if(!b||vi->channels<=0||vi->channels>256){ -+ b = NULL; - ret=OV_EFAULT; - goto err_out; - } --- -2.11.0 - diff --git a/package/libvorbis/libvorbis.hash b/package/libvorbis/libvorbis.hash index e990f4d74f..15bd01f22a 100644 --- a/package/libvorbis/libvorbis.hash +++ b/package/libvorbis/libvorbis.hash @@ -1,2 +1,4 @@ # From http://www.xiph.org/downloads/ -sha256 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 libvorbis-1.3.5.tar.xz +sha256 af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415 libvorbis-1.3.6.tar.xz +# License files, locally calculated +sha256 29e9914e6173b7061b7d48c25e6159fc1438326738bc047cc7248abc01b271f6 COPYING diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk index 98ec97bfd6..ae2c1efffe 100644 --- a/package/libvorbis/libvorbis.mk +++ b/package/libvorbis/libvorbis.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVORBIS_VERSION = 1.3.5 +LIBVORBIS_VERSION = 1.3.6 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis LIBVORBIS_INSTALL_STAGING = YES diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f999d61cbf..40faef2281 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -248,10 +248,10 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.99" if BR2_KERNEL_HEADERS_3_2 - default "4.1.49" if BR2_KERNEL_HEADERS_4_1 - default "4.4.119" if BR2_KERNEL_HEADERS_4_4 - default "4.9.86" if BR2_KERNEL_HEADERS_4_9 + default "3.2.101" if BR2_KERNEL_HEADERS_3_2 + default "4.1.51" if BR2_KERNEL_HEADERS_4_1 + default "4.4.127" if BR2_KERNEL_HEADERS_4_4 + default "4.9.93" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 204590d27c..8278933827 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,3 @@ -# From http://www.memcached.org/files/memcached-1.5.0.tar.gz.sha1 -sha1 e12af93e63c05ab7e89398e4cfd0bfc7b7bff1c5 memcached-1.5.0.tar.gz -# Calculated based on the hash above -sha256 c001f812024bb461b5e4d7d0506daab63dff9614eea26f46536c3b7e1e601c32 memcached-1.5.0.tar.gz +# From http://www.memcached.org/files/memcached-1.5.6.tar.gz.sha1 +sha1 ca35929e74b132c2495a6957cfdc80556337fb90 memcached-1.5.6.tar.gz +sha256 9675ee859d7d81f7a950f190a6812720b26f08228d356044ec517d4d5af25f03 memcached-1.5.6.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index d0e3bc01d9..c15abc79bf 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.5.0 +MEMCACHED_VERSION = 1.5.6 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 2ba16fc837..0f4898674b 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -59,7 +59,7 @@ endif # directories: docs, examples and init scripts define MOTION_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/motion-dist.conf \ - $(TARGET_DIR)/etc/motion.conf + $(TARGET_DIR)/etc/motion/motion.conf $(INSTALL) -D -m 0755 $(@D)/motion $(TARGET_DIR)/usr/bin/motion endef diff --git a/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch b/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch new file mode 100644 index 0000000000..cbfc9b668f --- /dev/null +++ b/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch @@ -0,0 +1,69 @@ +From b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Sat, 6 Jan 2018 23:32:52 +0100 +Subject: [PATCH] add additional uapi guards for Linux kernel header files + +With Linux kernel 4.16 it will be possible to guard more parts of the +Linux header files from a libc. Make use of this in musl to guard all +the structures and other definitions from the Linux header files which +are also defined by the header files provided by musl. This will make +it possible to compile source files which include both the libc +headers and the kernel userspace headers. + +This extends the definitions done in commit 04983f227238 ("make +netinet/in.h suppress clashing definitions from kernel headers") + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Patch status: upstream commit b583c5d3b4cc + + include/net/if.h | 7 +++++++ + include/netinet/if_ether.h | 1 + + include/sys/xattr.h | 2 ++ + 3 files changed, 10 insertions(+) + +diff --git a/include/net/if.h b/include/net/if.h +index 2f2fcc10e484..774cbff0b506 100644 +--- a/include/net/if.h ++++ b/include/net/if.h +@@ -125,6 +125,13 @@ struct ifconf { + #define ifc_req ifc_ifcu.ifcu_req + #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) + ++#define __UAPI_DEF_IF_IFCONF 0 ++#define __UAPI_DEF_IF_IFMAP 0 ++#define __UAPI_DEF_IF_IFNAMSIZ 0 ++#define __UAPI_DEF_IF_IFREQ 0 ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #endif + + #ifdef __cplusplus +diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h +index d9a131aa2d1d..97134d75b480 100644 +--- a/include/netinet/if_ether.h ++++ b/include/netinet/if_ether.h +@@ -133,5 +133,6 @@ do { \ + (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \ + } while(0) + ++#define __UAPI_DEF_ETHHDR 0 + + #endif +diff --git a/include/sys/xattr.h b/include/sys/xattr.h +index 6479fcc62e5f..eeeaafc44f09 100644 +--- a/include/sys/xattr.h ++++ b/include/sys/xattr.h +@@ -24,6 +24,8 @@ int removexattr(const char *, const char *); + int lremovexattr(const char *, const char *); + int fremovexattr(int, const char *); + ++#define __UAPI_DEF_XATTR 0 ++ + #ifdef __cplusplus + } + #endif +-- +2.15.1 + diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 107a24f7bf..b3900f6a7d 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,2 +1,5 @@ -# From http://nodejs.org/dist/v8.9.4/SHASUMS256.txt -sha256 6cdcde9c9c1ca9f450a0b24eafa229ca759e576daa0fae892ce74d541ecdc86f node-v8.9.4.tar.xz +# From http://nodejs.org/dist/v8.11.1/SHASUMS256.txt +sha256 40a6eb51ea37fafcf0cfb58786b15b99152bec672cccf861c14d1cca0ad4758a node-v8.11.1.tar.xz + +# Hash for license file +sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index a72b9a704f..2642525c47 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 8.9.4 +NODEJS_VERSION = 8.11.1 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ diff --git a/package/ntp/0003-ntpq-fpic.patch b/package/ntp/0003-ntpq-fpic.patch deleted file mode 100644 index 6e05a677c5..0000000000 --- a/package/ntp/0003-ntpq-fpic.patch +++ /dev/null @@ -1,23 +0,0 @@ -ntpq/Makefile.am: add NTP_HARD_CFLAGS - -Pass NTP_HARD_CFLAGS when building ntpq, like in all other ntp -modules, to make sure -fPIC is passed. - -Originally taken from -https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494143c3b4921a5c8b8596d58f2c8b98296bf688. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -Index: b/ntpq/Makefile.am -=================================================================== ---- a/ntpq/Makefile.am -+++ b/ntpq/Makefile.am -@@ -23,7 +23,7 @@ - ntpq_LDADD += $(LDADD_NTP) - noinst_HEADERS= ntpq.h - noinst_LIBRARIES= libntpq.a --libntpq_a_CFLAGS= -DNO_MAIN_ALLOWED -DBUILD_AS_LIB -+libntpq_a_CFLAGS= $(NTP_HARD_CFLAGS) -DNO_MAIN_ALLOWED -DBUILD_AS_LIB - CLEANFILES= - DISTCLEANFILES= .version version.c config.log $(man_MANS) - ETAGS_ARGS= Makefile.am diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index d8b7083c47..ea86c1586f 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,4 +1,5 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p10.tar.gz.md5 -md5 745384ed0dedb3f66b33fe84d66466f9 ntp-4.2.8p10.tar.gz +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p11.tar.gz.md5 +md5 00950ca2855579541896513e78295361 ntp-4.2.8p11.tar.gz # Calculated based on the hash above -sha256 ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f ntp-4.2.8p10.tar.gz +sha256 f14a39f753688252d683ff907035ffff106ba8d3db21309b742e09b5c3cd278e ntp-4.2.8p11.tar.gz +sha256 62c87b269365b38b55359b16dfde7ec28c683c722ef489db90afd0f2e478e4a1 COPYRIGHT diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index cc363269c3..b5e2c1e026 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -5,7 +5,7 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p10 +NTP_VERSION = $(NTP_VERSION_MAJOR).8p11 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox) NTP_LICENSE = NTP @@ -20,7 +20,6 @@ NTP_CONF_OPTS = \ --disable-local-libevent # 0002-ntp-syscalls-fallback.patch -# 0003-ntpq-fpic.patch NTP_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) @@ -31,9 +30,9 @@ NTP_CONF_OPTS += --without-crypto --disable-openssl-random endif ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) -NTP_CONF_OPTS += --with-locfile=linux +NTP_CONF_OPTS += --with-hardenfile=linux else -NTP_CONF_OPTS += --with-locfile=default +NTP_CONF_OPTS += --with-hardenfile=default endif ifeq ($(BR2_PACKAGE_LIBCAP),y) diff --git a/package/openblas/Config.in b/package/openblas/Config.in index eb93e319e4..8e71a43f98 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "P2" if BR2_x86_pentium2 default "KATMAI" if BR2_x86_pentium3 default "NORTHWOOD" if BR2_x86_pentium4 - default "PRESCOTT" if BR2_x86_prescott + default "PRESCOTT" if BR2_x86_prescott || BR2_x86_nocona default "BANIAS" if BR2_x86_pentium_m default "CORE2" if BR2_x86_core2 default "NEHALEM" if BR2_x86_corei7 || BR2_x86_silvermont @@ -14,9 +14,9 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "OPTERON" if BR2_x86_opteron default "OPTERON_SSE3" if BR2_x86_opteron_sse3 default "BARCELONA" if BR2_x86_barcelona + default "JAGUAR" if BR2_x86_jaguar default "STEAMROLLER" if BR2_x86_steamroller default "VIAC3" if BR2_x86_c3 || BR2_x86_c32 - default "SSE_GENERIC" if BR2_X86_CPU_HAS_SSE default "POWER4" if BR2_powerpc_power4 default "POWER5" if BR2_powerpc_power5 default "POWER6" if BR2_powerpc_power6 diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index cffe66b892..15e4eadfe3 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -327,6 +327,7 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 endif +OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) OPENCV3_DEPENDENCIES += python-numpy else OPENCV3_CONF_OPTS += \ diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 9d2576ceeb..548d8b81a0 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -11,7 +11,12 @@ OPENOCD_LICENSE = GPL-2.0+ OPENOCD_LICENSE_FILES = COPYING # 0002-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES -OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" + +# The bundled jimtcl really wants to find a existing $CXX, so feed it +# false when we do not have one. +OPENOCD_CONF_ENV = \ + $(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" OPENOCD_CONF_OPTS = \ --oldincludedir=$(STAGING_DIR)/usr/include \ diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk index a81e75eb0e..ab00ced705 100644 --- a/package/opus-tools/opus-tools.mk +++ b/package/opus-tools/opus-tools.mk @@ -6,7 +6,7 @@ OPUS_TOOLS_VERSION = 0.1.10 OPUS_TOOLS_SITE = https://downloads.xiph.org/releases/opus -OPUS_TOOLS_LICENSE = BSD-2-Clause +OPUS_TOOLS_LICENSE = BSD-2-Clause, GPL-2.0 (opusinfo) OPUS_TOOLS_LICENSE_FILES = COPYING OPUS_TOOLS_CONF_OPTS = --disable-oggtest --disable-opustest OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf diff --git a/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch b/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch new file mode 100644 index 0000000000..7d5757d1af --- /dev/null +++ b/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch @@ -0,0 +1,37 @@ +From b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@gnu.org> +Date: Fri, 6 Apr 2018 11:34:51 +0200 +Subject: [PATCH] Allow input files to be missing for ed-style patches + +* src/pch.c (do_ed_script): Allow input files to be missing so that new +files will be created as with non-ed-style patches. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: commit b5a91a01e5d0 + + src/pch.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/pch.c b/src/pch.c +index bc6278c4032c..0c5cc2623079 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -2394,9 +2394,11 @@ do_ed_script (char const *inname, char const *outname, + + if (! dry_run && ! skip_rest_of_patch) { + int exclusive = *outname_needs_removal ? 0 : O_EXCL; +- assert (! inerrno); +- *outname_needs_removal = true; +- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); ++ if (inerrno != ENOENT) ++ { ++ *outname_needs_removal = true; ++ copy_file (inname, outname, 0, exclusive, instat.st_mode, true); ++ } + sprintf (buf, "%s %s%s", editor_program, + verbosity == VERBOSE ? "" : "- ", + outname); +-- +2.16.3 + diff --git a/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch b/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch new file mode 100644 index 0000000000..b44bdd0fac --- /dev/null +++ b/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch @@ -0,0 +1,157 @@ +From 123eaff0d5d1aebe128295959435b9ca5909c26d Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@gnu.org> +Date: Fri, 6 Apr 2018 12:14:49 +0200 +Subject: [PATCH] Fix arbitrary command execution in ed-style patches + (CVE-2018-1000156) + +* src/pch.c (do_ed_script): Write ed script to a temporary file instead +of piping it to ed: this will cause ed to abort on invalid commands +instead of rejecting them and carrying on. +* tests/ed-style: New test case. +* tests/Makefile.am (TESTS): Add test case. + +[baruch: drop test hunks to avoid autoreconf] +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: commit 123eaff0d5d1 + + src/pch.c | 91 ++++++++++++++++++++++++++++++++++++++++--------------- + tests/Makefile.am | 1 + + tests/ed-style | 41 +++++++++++++++++++++++++ + 3 files changed, 108 insertions(+), 25 deletions(-) + create mode 100644 tests/ed-style + +diff --git a/src/pch.c b/src/pch.c +index 0c5cc2623079..4fd5a05a6f5c 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -33,6 +33,7 @@ + # include <io.h> + #endif + #include <safe.h> ++#include <sys/wait.h> + + #define INITHUNKMAX 125 /* initial dynamic allocation size */ + +@@ -2389,24 +2390,28 @@ do_ed_script (char const *inname, char const *outname, + static char const editor_program[] = EDITOR_PROGRAM; + + file_offset beginning_of_this_line; +- FILE *pipefp = 0; + size_t chars_read; ++ FILE *tmpfp = 0; ++ char const *tmpname; ++ int tmpfd; ++ pid_t pid; ++ ++ if (! dry_run && ! skip_rest_of_patch) ++ { ++ /* Write ed script to a temporary file. This causes ed to abort on ++ invalid commands such as when line numbers or ranges exceed the ++ number of available lines. When ed reads from a pipe, it rejects ++ invalid commands and treats the next line as a new command, which ++ can lead to arbitrary command execution. */ ++ ++ tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0); ++ if (tmpfd == -1) ++ pfatal ("Can't create temporary file %s", quotearg (tmpname)); ++ tmpfp = fdopen (tmpfd, "w+b"); ++ if (! tmpfp) ++ pfatal ("Can't open stream for file %s", quotearg (tmpname)); ++ } + +- if (! dry_run && ! skip_rest_of_patch) { +- int exclusive = *outname_needs_removal ? 0 : O_EXCL; +- if (inerrno != ENOENT) +- { +- *outname_needs_removal = true; +- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); +- } +- sprintf (buf, "%s %s%s", editor_program, +- verbosity == VERBOSE ? "" : "- ", +- outname); +- fflush (stdout); +- pipefp = popen(buf, binary_transput ? "wb" : "w"); +- if (!pipefp) +- pfatal ("Can't open pipe to %s", quotearg (buf)); +- } + for (;;) { + char ed_command_letter; + beginning_of_this_line = file_tell (pfp); +@@ -2417,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname, + } + ed_command_letter = get_ed_command_letter (buf); + if (ed_command_letter) { +- if (pipefp) +- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) ++ if (tmpfp) ++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) + write_fatal (); + if (ed_command_letter != 'd' && ed_command_letter != 's') { + p_pass_comments_through = true; + while ((chars_read = get_line ()) != 0) { +- if (pipefp) +- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) ++ if (tmpfp) ++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) + write_fatal (); + if (chars_read == 2 && strEQ (buf, ".\n")) + break; +@@ -2437,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname, + break; + } + } +- if (!pipefp) ++ if (!tmpfp) + return; +- if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0 +- || fflush (pipefp) != 0) ++ if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, tmpfp) == 0 ++ || fflush (tmpfp) != 0) + write_fatal (); +- if (pclose (pipefp) != 0) +- fatal ("%s FAILED", editor_program); ++ ++ if (lseek (tmpfd, 0, SEEK_SET) == -1) ++ pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname)); ++ ++ if (! dry_run && ! skip_rest_of_patch) { ++ int exclusive = *outname_needs_removal ? 0 : O_EXCL; ++ *outname_needs_removal = true; ++ if (inerrno != ENOENT) ++ { ++ *outname_needs_removal = true; ++ copy_file (inname, outname, 0, exclusive, instat.st_mode, true); ++ } ++ sprintf (buf, "%s %s%s", editor_program, ++ verbosity == VERBOSE ? "" : "- ", ++ outname); ++ fflush (stdout); ++ ++ pid = fork(); ++ if (pid == -1) ++ pfatal ("Can't fork"); ++ else if (pid == 0) ++ { ++ dup2 (tmpfd, 0); ++ execl ("/bin/sh", "sh", "-c", buf, (char *) 0); ++ _exit (2); ++ } ++ else ++ { ++ int wstatus; ++ if (waitpid (pid, &wstatus, 0) == -1 ++ || ! WIFEXITED (wstatus) ++ || WEXITSTATUS (wstatus) != 0) ++ fatal ("%s FAILED", editor_program); ++ } ++ } ++ ++ fclose (tmpfp); ++ safe_unlink (tmpname); + + if (ofp) + { +-- +2.16.3 + diff --git a/package/patch/Config.in b/package/patch/Config.in index 0c2425823a..13fa7bfc52 100644 --- a/package/patch/Config.in +++ b/package/patch/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PATCH bool "patch" + depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help @@ -10,4 +11,5 @@ config BR2_PACKAGE_PATCH comment "patch needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR + depends on BR2_USE_MMU depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package/php/0008-ext-sockets-make-AI_IDN-usage-optional.patch b/package/php/0008-ext-sockets-make-AI_IDN-usage-optional.patch deleted file mode 100644 index 7ab086865e..0000000000 --- a/package/php/0008-ext-sockets-make-AI_IDN-usage-optional.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 923cab3a5ee112d3de44b5571e73402f1fa3d619 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> -Date: Mon, 26 Feb 2018 19:06:40 +0100 -Subject: [PATCH] ext/sockets: make AI_IDN usage optional - -AI_IDN is not supported by all C libraries (uClibc, musl), so make it -optional, like AI_ALL. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> -Upstream-status: https://github.com/php/php-src/pull/3160 ---- - ext/sockets/config.m4 | 13 +++++++++++++ - ext/sockets/sockets.c | 2 +- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4 -index fe7d22a10a..2bf6a2bd11 100644 ---- a/ext/sockets/config.m4 -+++ b/ext/sockets/config.m4 -@@ -69,6 +69,19 @@ if test "$PHP_SOCKETS" != "no"; then - AC_DEFINE(HAVE_AI_ALL,1,[Whether you have AI_ALL]) - fi - -+ dnl Check for AI_IDN flag -+ AC_CACHE_CHECK([if getaddrinfo supports AI_IDN],[ac_cv_gai_ai_idn], -+ [ -+ AC_TRY_COMPILE([ -+#include <netdb.h> -+ ], [int flag = AI_IDN;], -+ ac_cv_gai_ai_idn=yes, ac_cv_gai_ai_idn=no) -+ ]) -+ -+ if test "$ac_cv_gai_ai_idn" = yes; then -+ AC_DEFINE(HAVE_AI_IDN,1,[Whether you have AI_IDN]) -+ fi -+ - PHP_NEW_EXTENSION([sockets], [sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c], [$ext_shared],, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) - PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h]) - fi -diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c -index 6db56c2816..ee9651ce09 100644 ---- a/ext/sockets/sockets.c -+++ b/ext/sockets/sockets.c -@@ -796,7 +796,7 @@ static PHP_MINIT_FUNCTION(sockets) - REGISTER_LONG_CONSTANT("AI_ALL", AI_ALL, CONST_CS | CONST_PERSISTENT); - #endif - REGISTER_LONG_CONSTANT("AI_ADDRCONFIG", AI_ADDRCONFIG, CONST_CS | CONST_PERSISTENT); --#ifdef __USE_GNU -+#if defined(HAVE_AI_IDN) && defined(__USE_GNU) - REGISTER_LONG_CONSTANT("AI_IDN", AI_IDN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("AI_CANONIDN", AI_CANONIDN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("AI_IDN_ALLOW_UNASSIGNED", AI_IDN_ALLOW_UNASSIGNED, CONST_CS | CONST_PERSISTENT); --- -2.14.3 - diff --git a/package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch b/package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch index bc5149d1d6..bc5149d1d6 100644 --- a/package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch +++ b/package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch diff --git a/package/php/0009-ext-xml-expat_compat.h-add-missing-php.h-include.patch b/package/php/0009-ext-xml-expat_compat.h-add-missing-php.h-include.patch new file mode 100644 index 0000000000..daf004dcf7 --- /dev/null +++ b/package/php/0009-ext-xml-expat_compat.h-add-missing-php.h-include.patch @@ -0,0 +1,71 @@ +From fb1f0e17eed729204a6d5caf590715d6257dceb3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +Date: Thu, 5 Apr 2018 22:50:00 +0200 +Subject: [PATCH] ext/xml/expat_compat.h: add missing php.h include + +When expat support is disabled and libxml support is enabled, the +following part of the code in expat_compat.h gets used: + +and therefore "php".h" is included. However, when libexpat support is +enabled, HAVE_LIBEXPAT is defined, and therefore the following part of +the code is used: + +In this case, "php.h" is not included. Due to this, zend_alloc.h is +never included when building the ext/xmlrpc/libxmlrpc/xml_element.c +file, and therefore the estrdup -> _estrdup macros are never defined, +causing the following link time failure: + +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_element_serialize': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:462: undefined reference to `efree' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_entity_escape': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:347: undefined reference to `emalloc' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `_xmlrpc_charHandler': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:646: undefined reference to `efree' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_free_non_recurse': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:198: undefined reference to `efree' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:199: undefined reference to `efree' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:200: undefined reference to `efree' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:207: undefined reference to `efree' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_new': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:263: undefined reference to `ecalloc' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `_xmlrpc_startElement': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:602: undefined reference to `estrdup' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:607: undefined reference to `emalloc' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:609: undefined reference to `estrdup' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:610: undefined reference to `estrdup' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_free_non_recurse': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:211: undefined reference to `efree' +collect2: error: ld returned 1 exit status +make: *** [Makefile:248: sapi/cgi/php-cgi] Error 1 + +This link time failure can be produced with: + +./configure --prefix=/usr --with-libdir=/usr/lib64 --disable-all \ + --without-pear --with-config-file-path=/etc --disable-phpdbg \ + --disable-cli --enable-cgi --disable-fpm --enable-xmlreader \ + --enable-xmlwriter --enable-libxml --enable-wddx --with-xmlrpc \ + --with-libexpat-dir=/ + +We fix it by including "php.h" in the HAVE_LIBEXPAT case. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +Upstream-status: https://github.com/php/php-src/pull/3212 +--- + ext/xml/expat_compat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h +index ed621ab53d..29fe48a7dd 100644 +--- a/ext/xml/expat_compat.h ++++ b/ext/xml/expat_compat.h +@@ -154,6 +154,7 @@ PHP_XML_API const XML_Char *XML_ExpatVersion(void); + PHP_XML_API void XML_ParserFree(XML_Parser); + + #elif defined(HAVE_LIBEXPAT) ++#include "php.h" + #include <expat.h> + #endif /* HAVE_LIBEXPAT */ + +-- +2.14.3 + diff --git a/package/php/php.hash b/package/php/php.hash index 34230df874..4cd5acaef9 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From http://php.net/downloads.php -sha256 b3a94f1b562f413c0b96f54bc309706d83b29ac65d9b172bc7ed9fb40a5e651f php-7.2.3.tar.xz +sha256 7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88 php-7.2.4.tar.xz # License file sha256 00e567a8d50359d93ee1f9afdd9511277660c1e70a0cbf3229f84403aa9aebb1 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index dcb89b03d3..91756794ee 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.2.3 +PHP_VERSION = 7.2.4 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -228,10 +228,6 @@ ifneq ($(BR2_PACKAGE_PHP_EXT_MYSQLI)$(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),) PHP_CONF_OPTS += --with-mysql-sock=$(MYSQL_SOCKET) endif -define PHP_DISABLE_PCRE_JIT - $(SED) '/^#define SUPPORT_JIT/d' $(@D)/ext/pcre/pcrelib/config.h -endef - define PHP_DISABLE_VALGRIND $(SED) '/^#define HAVE_VALGRIND/d' $(@D)/main/php_config.h endef @@ -249,8 +245,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) PHP_CFLAGS += -DSLJIT_SINGLE_THREADED=1 endif # check ext/pcre/pcrelib/sljit/sljitConfigInternal.h for supported archs -ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),) -PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_PCRE_JIT +ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y) +PHP_CONF_OPTS += --with-pcre-jit +else +PHP_CONF_OPTS += --without-pcre-jit endif endif diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 14ffe4a88f..9b07798a1e 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -132,6 +132,7 @@ define $(2)_CONFIGURE_CMDS -DCMAKE_C_FLAGS="$$(HOST_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$$(HOST_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ + -DCMAKE_SHARED_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ -DCMAKE_ASM_COMPILER="$$(HOSTAS)" \ -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER)" \ -DCMAKE_CXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER)" \ diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 3712b9ccc6..6f15deba28 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -79,7 +79,7 @@ define DOWNLOAD_GIT -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -90,7 +90,7 @@ define DOWNLOAD_BZR -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -102,7 +102,7 @@ define DOWNLOAD_CVS $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ $($(PKG)_DL_VERSION) \ $($(PKG)_RAWNAME) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -113,7 +113,7 @@ define DOWNLOAD_SVN -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -137,7 +137,7 @@ define DOWNLOAD_HG -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index e2996682c5..a6988b8893 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -85,6 +85,7 @@ define check_bin_arch $(if $(filter end-install-target,$(1)-$(2)),\ support/scripts/check-bin-arch -p $(3) \ -l $(BUILD_DIR)/packages-file-list.txt \ + $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \ -r $(TARGET_READELF) \ -a $(BR2_READELF_ARCH_NAME)) endef @@ -425,10 +426,10 @@ ifdef $(3)_OVERRIDE_SRCDIR $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) endif -$(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) -$(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) +$(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) +$(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) $(2)_DL_DIR = $$(DL_DIR) -$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) +$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME) ifndef $(2)_SUBDIR ifdef $(3)_SUBDIR @@ -457,7 +458,7 @@ ifndef $(2)_SOURCE ifdef $(3)_SOURCE $(2)_SOURCE = $$($(3)_SOURCE) else ifdef $(2)_VERSION - $(2)_SOURCE ?= $$($(2)_RAW_BASE_NAME).tar.gz + $(2)_SOURCE ?= $$($(2)_BASENAME_RAW).tar.gz endif endif @@ -531,7 +532,7 @@ endif $(2)_REDISTRIBUTE ?= YES -$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_RAW_BASE_NAME) +$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW) # When a target package is a toolchain dependency set this variable to # 'NO' so the 'toolchain' dependency is not added to prevent a circular @@ -837,9 +838,9 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),) # is that the license still applies to the files distributed as part # of the rootfs, even if the sources are not themselves redistributed. ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) - $(Q)$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined)) + $(Q)$$(call legal-warning-pkg,$$($(2)_BASENAME_RAW),cannot save license ($(2)_LICENSE_FILES not defined)) else - $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_RAW_BASE_NAME),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) + $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files ifeq ($$($(2)_SITE_METHOD),local) diff --git a/package/pkg-virtual.mk b/package/pkg-virtual.mk index 0de79d49be..05bd63eb18 100644 --- a/package/pkg-virtual.mk +++ b/package/pkg-virtual.mk @@ -41,6 +41,11 @@ $$(error No implementation selected for virtual package $(1). Configuration erro endif endif +# explicitly set these so we do not get confused by environment +# variables with the same names. +$(2)_VERSION = +$(2)_SOURCE = + $(2)_IS_VIRTUAL = YES # Add dependency against the provider diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in index b9ce0935cc..99c0add8fb 100644 --- a/package/pkgconf/pkg-config.in +++ b/package/pkgconf/pkg-config.in @@ -2,4 +2,4 @@ PKGCONFDIR=$(dirname $0) DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib/pkgconfig:${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/share/pkgconfig DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../@STAGING_SUBDIR@ -PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} ${PKGCONFDIR}/pkgconf @STATIC@ $@ +PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} exec ${PKGCONFDIR}/pkgconf @STATIC@ "$@" diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in index e9b8f48d4a..9dda54bf9f 100644 --- a/package/postgresql/Config.in +++ b/package/postgresql/Config.in @@ -19,4 +19,5 @@ config BR2_PACKAGE_POSTGRESQL http://www.postgresql.org comment "postgresql needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU depends on BR2_STATIC_LIBS diff --git a/package/powerpc-utils/Config.in b/package/powerpc-utils/Config.in index b0ca84789e..d04d81c08a 100644 --- a/package/powerpc-utils/Config.in +++ b/package/powerpc-utils/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POWERPC_UTILS help System utilities for PowerPC machines. - https://github.com/nfont/powerpc-utils + https://github.com/ibm-power-utilities/powerpc-utils.git if BR2_PACKAGE_POWERPC_UTILS diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in new file mode 100644 index 0000000000..cc12557edc --- /dev/null +++ b/package/python-functools32/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_FUNCTOOLS32 + bool "python-functools32" + depends on BR2_PACKAGE_PYTHON + help + Backport of the functools module from Python 3.2.3 for use on 2.7 + and PyPy. + + https://github.com/MiCHiLU/python-functools32 diff --git a/package/python-functools32/python-functools32.hash b/package/python-functools32/python-functools32.hash new file mode 100644 index 0000000000..606de81774 --- /dev/null +++ b/package/python-functools32/python-functools32.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/functools32/json, sha256 locally computed +md5 09f24ffd9af9f6cd0f63cb9f4e23d4b2 functools32-3.2.3-2.tar.gz +sha256 f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d functools32-3.2.3-2.tar.gz +sha256 3f9ea6b89abe1556b72aff67b987d64c8272564815cd6a2832e6c4f6abdfe3b1 LICENSE diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk new file mode 100644 index 0000000000..8a88bb2a7f --- /dev/null +++ b/package/python-functools32/python-functools32.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-functools32 +# +################################################################################ + +PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 +PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz +PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db +PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils +PYTHON_FUNCTOOLS32_LICENSE = Python-2.0 +PYTHON_FUNCTOOLS32_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-jsonschema/Config.in b/package/python-jsonschema/Config.in index 7002653722..b547f4ae1a 100644 --- a/package/python-jsonschema/Config.in +++ b/package/python-jsonschema/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JSONSCHEMA bool "python-jsonschema" + select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime help An implementation of JSON Schema validation for Python. diff --git a/package/python-webpy/Config.in b/package/python-webpy/Config.in index 12dbe61723..5f4df7832b 100644 --- a/package/python-webpy/Config.in +++ b/package/python-webpy/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_WEBPY bool "python-webpy" depends on BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_HASHLIB help web.py is a web framework for Python that is as simple as it is powerful. diff --git a/package/python-webpy/python-webpy.hash b/package/python-webpy/python-webpy.hash index 0e0a8d0fb8..70981e0cb4 100644 --- a/package/python-webpy/python-webpy.hash +++ b/package/python-webpy/python-webpy.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 c3cb8930739294103b1ad109e5fd1d0efae67c06d5b6d59fce5b5a2ee6b21624 python-webpy-webpy-0.37.tar.gz +sha256 f074241a0b839408a0b9840ade1198e16fbd6aa6393a48a0e84f73b545baab9a python-webpy-webpy-0.39.tar.gz +sha256 3826fd531a9b904841f5e3560fcda7e93f2ab8d11ef124ec65e10625efa26c34 LICENSE.txt +sha256 7347fd17bfd33c4093c31dc77076733e1e0150ce8c13296c56dc042bbecede84 web/wsgiserver/LICENSE.txt diff --git a/package/python-webpy/python-webpy.mk b/package/python-webpy/python-webpy.mk index 8bcc8ec37f..192ba5727f 100644 --- a/package/python-webpy/python-webpy.mk +++ b/package/python-webpy/python-webpy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBPY_VERSION = webpy-0.37 +PYTHON_WEBPY_VERSION = webpy-0.39 PYTHON_WEBPY_SITE = $(call github,webpy,webpy,$(PYTHON_WEBPY_VERSION)) -PYTHON_WEBPY_SETUP_TYPE = distutils +PYTHON_WEBPY_SETUP_TYPE = setuptools PYTHON_WEBPY_LICENSE = Public Domain, CherryPy License PYTHON_WEBPY_LICENSE_FILES = LICENSE.txt web/wsgiserver/LICENSE.txt diff --git a/package/qemu/0002-memfd-fix-configure-test.patch b/package/qemu/0002-memfd-fix-configure-test.patch new file mode 100644 index 0000000000..3e06c0e932 --- /dev/null +++ b/package/qemu/0002-memfd-fix-configure-test.patch @@ -0,0 +1,58 @@ +From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini <pbonzini@redhat.com> +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recent glibc added memfd_create in sys/mman.h. This conflicts with +the definition in util/memfd.c: + + /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration + +Fix the configure test, and remove the sys/memfd.h inclusion since the +file actually does not exist---it is a typo in the memfd_create(2) man +page. + +Cc: Marc-André Lureau <marcandre.lureau@redhat.com> +Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: commit 75e5b70e6b5 + + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 9c8aa5a98bd4..99ccc1725ace 100755 +--- a/configure ++++ b/configure +@@ -3923,7 +3923,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include <sys/memfd.h> ++#include <sys/mman.h> + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba866..412e94a405fc 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include <sys/memfd.h> +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include <sys/syscall.h> + #include <asm/unistd.h> + +-- +2.16.2 + diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 345ef52668..c3a7e7738e 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -212,6 +212,13 @@ else QEMU_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_LIBSSH2),y) +QEMU_OPTS += --enable-libssh2 +QEMU_DEPENDENCIES += libssh2 +else +QEMU_OPTS += --disable-libssh2 +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf.in index 8b6debe583..d62ee7cebe 100644 --- a/package/qt5/qt5base/qmake.conf +++ b/package/qt5/qt5base/qmake.conf.in @@ -24,5 +24,7 @@ QMAKE_CFLAGS_ISYSTEM = # Architecturespecific configuration include(arch.conf) +@EGLFS_DEVICE@ + include(../common/linux_device_post.conf) load(qt_config) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index b3f9c799cb..957cdf57b7 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -242,10 +242,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy) # use vivante backend -define QT5BASE_CONFIGURE_QMAKE_CONFIG - echo "EGLFS_DEVICE_INTEGRATION = eglfs_viv" >> \ - $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf -endef +QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv endif ifneq ($(QT5BASE_CONFIG_FILE),) @@ -263,7 +260,9 @@ endef endif define QT5BASE_CONFIGURE_CMDS - $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ + mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ + sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \ + $(QT5BASE_PKGDIR)/qmake.conf.in > \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf $(QT5BASE_CONFIGURE_QMAKE_CONFIG) $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index bcb37801a8..9b43e5fd65 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -10,3 +10,5 @@ sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE. sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB +sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index b6c02d0d1c..9539f56df6 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -10,8 +10,21 @@ QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz QT5SCRIPT_DEPENDENCIES = qt5base QT5SCRIPT_INSTALL_STAGING = YES -QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +# JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. +# This is linked into libQt5Script, which also contains Qt sources under +# LGPL-2.1 (only). Therefore, the library is LGPL-2.1 and BSD-3-Clause. +# libQt5ScriptTools is under the normal Qt opensource license. +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-3.0 or GPL-2.0+ (libQt5ScriptTools), GFDL-1.3 (docs) +QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv3 LICENSE.FDL +else +QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-2.1 with exception or LGPL-3.0 with exception (libQt5ScriptTools), GFDL-1.3 (docs) +QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL +endif +# License files from JavaScriptCore +QT5SCRIPT_LICENSE_FILES += \ + src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB \ + src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING define QT5SCRIPT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) diff --git a/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch new file mode 100644 index 0000000000..9c2205dd94 --- /dev/null +++ b/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch @@ -0,0 +1,48 @@ +From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com> +Date: Tue, 15 Aug 2017 18:28:49 -0400 +Subject: [PATCH] Detect 32-bits armv8-a architecture +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Adds WTF platform support for the 32-bits armv8-a architectures. + +Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) +and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). + +This commit catches this new architecture (armv8a) within a #ifdef/#endif +inside the if statement dedicated for 32-bits ARM detection. + +Fixes: + + In file included from ./config.h:30:0, + from ... + ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" + # error "Not supported ARM architecture" + ^~~~~ + +Upstream-Status: Backport [with adaptations] +Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> +--- + Source/WTF/wtf/Platform.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 562840cf7..9cf656845 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -243,6 +243,10 @@ + || defined(__ARM_ARCH_7S__) + #define WTF_ARM_ARCH_VERSION 7 + ++#elif defined(__ARM_ARCH_8__) \ ++ || defined(__ARM_ARCH_8A__) ++#define WTF_ARM_ARCH_VERSION 8 ++ + /* MSVC sets _M_ARM */ + #elif defined(_M_ARM) + #define WTF_ARM_ARCH_VERSION _M_ARM +-- +2.16.1 + diff --git a/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch new file mode 100644 index 0000000000..9c2205dd94 --- /dev/null +++ b/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch @@ -0,0 +1,48 @@ +From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com> +Date: Tue, 15 Aug 2017 18:28:49 -0400 +Subject: [PATCH] Detect 32-bits armv8-a architecture +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Adds WTF platform support for the 32-bits armv8-a architectures. + +Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) +and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). + +This commit catches this new architecture (armv8a) within a #ifdef/#endif +inside the if statement dedicated for 32-bits ARM detection. + +Fixes: + + In file included from ./config.h:30:0, + from ... + ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" + # error "Not supported ARM architecture" + ^~~~~ + +Upstream-Status: Backport [with adaptations] +Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> +--- + Source/WTF/wtf/Platform.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 562840cf7..9cf656845 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -243,6 +243,10 @@ + || defined(__ARM_ARCH_7S__) + #define WTF_ARM_ARCH_VERSION 7 + ++#elif defined(__ARM_ARCH_8__) \ ++ || defined(__ARM_ARCH_8A__) ++#define WTF_ARM_ARCH_VERSION 8 ++ + /* MSVC sets _M_ARM */ + #elif defined(_M_ARM) + #define WTF_ARM_ARCH_VERSION _M_ARM +-- +2.16.1 + diff --git a/package/rapidjson/rapidjson.hash b/package/rapidjson/rapidjson.hash index bde8319cd8..a4b02cffb9 100644 --- a/package/rapidjson/rapidjson.hash +++ b/package/rapidjson/rapidjson.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-v1.1.0.tar.gz +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 license.txt diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 649d19571e..91d7c1d62e 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v0.2/rauc-0.2.tar.xz.asc -sha256 83aa3ac3716e1c29315162e3cbf5d4db79f26dd95efe1bc634bbce364b95491a rauc-0.2.tar.xz +# https://github.com/rauc/rauc/releases/download/v0.3/rauc-0.3.tar.xz.asc +sha256 dc01bfb08b1830376782f9a51cfec290171519267ab97cc909435da9ac6d6d98 rauc-0.3.tar.xz diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 4909062cf5..63fbc53022 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 0.2 +RAUC_VERSION = 0.3 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk index 244ede3ef1..a7941459c7 100644 --- a/package/sam-ba/sam-ba.mk +++ b/package/sam-ba/sam-ba.mk @@ -23,10 +23,16 @@ endef # then create a symbolic link from $(HOST_DIR)/bin to the # application binary, for easier usage. +ifeq ($(HOSTARCH),x86_64) +SAM_BA_BIN_NAME = sam-ba_64 +else +SAM_BA_BIN_NAME = sam-ba +endif + define HOST_SAM_BA_INSTALL_CMDS mkdir -p $(HOST_DIR)/opt/sam-ba/ cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/ - ln -sf ../../opt/sam-ba/sam-ba $(HOST_DIR)/bin/sam-ba + ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba endef $(eval $(host-generic-package)) diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index 4a6471dd7a..0485f0dbb1 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -38,3 +38,4 @@ Checking value of _NSIG: "65" Checking value of SIGRTMAX: "64" Checking value of SIGRTMIN: "34" Checking errno of iconv for illegal multibyte sequence: "0" +checking for clnt_create(): OK diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 28765440d1..dddd132d24 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,3 +1,4 @@ -# Locally calculated -sha256 fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247 samba-4.7.4.tar.gz +# Locally calculated after checking pgp signature +# https://download.samba.org/pub/samba/stable/samba-4.7.6.tar.asc +sha256 1eede30fc8ef6504e24602fb72b00baa0a7b73b59f16d25cb0771dc8c7c57d6e samba-4.7.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 6f3207fb64..ada03c024f 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.7.4 +SAMBA4_VERSION = 4.7.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 7442cef529..93a0c3f13e 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -22,7 +22,8 @@ SNGREP_DEPENDENCIES += openssl SNGREP_CONF_OPTS += --with-openssl --without-gnutls # gnutls support also requires libgcrypt else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) -SNGREP_DEPENDENCIES += gnutls +SNGREP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config +SNGREP_DEPENDENCIES += gnutls libgcrypt SNGREP_CONF_OPTS += --with-gnutls --without-openssl else SNGREP_CONF_OPTS += --without-gnutls --without-openssl diff --git a/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch b/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch new file mode 100644 index 0000000000..b91d09722b --- /dev/null +++ b/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch @@ -0,0 +1,75 @@ +From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001 +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 26 Mar 2018 17:34:53 +0200 +Subject: [PATCH] core: don't include libmount.h in a header file (#8580) + +linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_* +definitions. + +To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h +should be included. And missing.h must be included last. + +Without this, building systemd may fail with: + +In file included from [...]/libmount/libmount.h:31:0, + from ../systemd-238/src/core/manager.h:23, + from ../systemd-238/src/core/emergency-action.h:37, + from ../systemd-238/src/core/unit.h:34, + from ../systemd-238/src/core/dbus-timer.h:25, + from ../systemd-238/src/core/timer.c:26: +[...]/sys/mount.h:57:2: error: expected identifier before numeric constant + +Upstream: https://github.com/systemd/systemd/pull/8580 +Signed-off-by: Stefan Becker <chemobejk@gmail.com> +--- + src/core/dbus-execute.c | 1 + + src/core/manager.h | 3 ++- + src/core/mount.c | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 7344623ebf6..c342093bca4 100644 +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -18,6 +18,7 @@ + along with systemd; If not, see <http://www.gnu.org/licenses/>. + ***/ + ++#include <sys/mount.h> + #include <sys/prctl.h> + #include <stdio_ext.h> + +diff --git a/src/core/manager.h b/src/core/manager.h +index 28c5da225b1..e09e0cdf5e9 100644 +--- a/src/core/manager.h ++++ b/src/core/manager.h +@@ -20,7 +20,6 @@ + along with systemd; If not, see <http://www.gnu.org/licenses/>. + ***/ + +-#include <libmount.h> + #include <stdbool.h> + #include <stdio.h> + +@@ -34,6 +33,8 @@ + #include "list.h" + #include "ratelimit.h" + ++struct libmnt_monitor; ++ + /* Enforce upper limit how many names we allow */ + #define MANAGER_MAX_NAMES 131072 /* 128K */ + +diff --git a/src/core/mount.c b/src/core/mount.c +index 0e755da5c02..0154ebda5d6 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -23,6 +23,8 @@ + #include <stdio.h> + #include <sys/epoll.h> + ++#include <libmount.h> ++ + #include "sd-messages.h" + + #include "alloc-util.h" diff --git a/package/systemd/0005-basic-macros-rename-noreturn.patch b/package/systemd/0005-basic-macros-rename-noreturn.patch new file mode 100644 index 0000000000..6cd847098e --- /dev/null +++ b/package/systemd/0005-basic-macros-rename-noreturn.patch @@ -0,0 +1,201 @@ +From 848e863acc51ecfb0f3955c498874588201d9130 Mon Sep 17 00:00:00 2001 +From: Franck Bui <fbui@suse.com> +Date: Thu, 15 Mar 2018 06:23:46 +0100 +Subject: [PATCH] basic/macros: rename noreturn into _noreturn_ (#8456) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +"noreturn" is reserved and can be used in other header files we include: + + [ 16s] In file included from /usr/include/gcrypt.h:30:0, + [ 16s] from ../src/journal/journal-file.h:26, + [ 16s] from ../src/journal/journal-vacuum.c:31: + [ 16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token + [ 16s] void gpgrt_log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2); + +Here we include grcrypt.h (which in turns include gpg-error.h) *after* we +"noreturn" was defined in macro.h. + +Upstream: https://github.com/systemd/systemd/pull/8456 +Signed-off-by: Stefan Becker <chemobejk@gmail.com> +--- + src/basic/log.c | 4 ++-- + src/basic/log.h | 4 ++-- + src/basic/macro.h | 19 +++++++++---------- + src/basic/process-util.c | 2 +- + src/basic/process-util.h | 2 +- + src/core/main.c | 4 ++-- + src/journal/test-journal-interleaving.c | 2 +- + src/shared/pager.c | 2 +- + src/udev/collect/collect.c | 2 +- + 9 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/src/basic/log.c b/src/basic/log.c +index 7a7f2cbec13..16a2431c548 100644 +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -814,7 +814,7 @@ static void log_assert( + log_dispatch_internal(level, 0, file, line, func, NULL, NULL, NULL, NULL, buffer); + } + +-noreturn void log_assert_failed_realm( ++_noreturn_ void log_assert_failed_realm( + LogRealm realm, + const char *text, + const char *file, +@@ -826,7 +826,7 @@ noreturn void log_assert_failed_realm( + abort(); + } + +-noreturn void log_assert_failed_unreachable_realm( ++_noreturn_ void log_assert_failed_unreachable_realm( + LogRealm realm, + const char *text, + const char *file, +diff --git a/src/basic/log.h b/src/basic/log.h +index efcf0f1bfc1..314be128a23 100644 +--- a/src/basic/log.h ++++ b/src/basic/log.h +@@ -186,7 +186,7 @@ int log_dump_internal( + char *buffer); + + /* Logging for various assertions */ +-noreturn void log_assert_failed_realm( ++_noreturn_ void log_assert_failed_realm( + LogRealm realm, + const char *text, + const char *file, +@@ -195,7 +195,7 @@ noreturn void log_assert_failed_realm( + #define log_assert_failed(text, ...) \ + log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__) + +-noreturn void log_assert_failed_unreachable_realm( ++_noreturn_ void log_assert_failed_unreachable_realm( + LogRealm realm, + const char *text, + const char *file, +diff --git a/src/basic/macro.h b/src/basic/macro.h +index 95be63a2040..8911edfc4be 100644 +--- a/src/basic/macro.h ++++ b/src/basic/macro.h +@@ -53,6 +53,15 @@ + #else + #define _fallthrough_ + #endif ++/* Define C11 noreturn without <stdnoreturn.h> and even on older gcc ++ * compiler versions */ ++#ifndef _noreturn_ ++#if __STDC_VERSION__ >= 201112L ++#define _noreturn_ _Noreturn ++#else ++#define _noreturn_ __attribute__((noreturn)) ++#endif ++#endif + + /* Temporarily disable some warnings */ + #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ +@@ -414,16 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { + #endif + #endif + +-/* Define C11 noreturn without <stdnoreturn.h> and even on older gcc +- * compiler versions */ +-#ifndef noreturn +-#if __STDC_VERSION__ >= 201112L +-#define noreturn _Noreturn +-#else +-#define noreturn __attribute__((noreturn)) +-#endif +-#endif +- + #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \ + static inline void func##p(type *p) { \ + if (*p) \ +diff --git a/src/basic/process-util.c b/src/basic/process-util.c +index aa9846db5dc..e6120af5b68 100644 +--- a/src/basic/process-util.c ++++ b/src/basic/process-util.c +@@ -987,7 +987,7 @@ bool is_main_thread(void) { + return cached > 0; + } + +-noreturn void freeze(void) { ++_noreturn_ void freeze(void) { + + log_close(); + +diff --git a/src/basic/process-util.h b/src/basic/process-util.h +index 93029e36e5f..5170adec7bb 100644 +--- a/src/basic/process-util.h ++++ b/src/basic/process-util.h +@@ -91,7 +91,7 @@ int pid_from_same_root_fs(pid_t pid); + + bool is_main_thread(void); + +-noreturn void freeze(void); ++_noreturn_ void freeze(void); + + bool oom_score_adjust_is_valid(int oa); + +diff --git a/src/core/main.c b/src/core/main.c +index 076846a41c0..4b2d1492373 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -141,7 +141,7 @@ static uint64_t arg_default_tasks_max = UINT64_MAX; + static sd_id128_t arg_machine_id = {}; + static EmergencyAction arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE; + +-noreturn static void freeze_or_reboot(void) { ++_noreturn_ static void freeze_or_reboot(void) { + + if (arg_crash_reboot) { + log_notice("Rebooting in 10s..."); +@@ -156,7 +156,7 @@ noreturn static void freeze_or_reboot(void) { + freeze(); + } + +-noreturn static void crash(int sig) { ++_noreturn_ static void crash(int sig) { + struct sigaction sa; + pid_t pid; + +diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c +index 5a88b2774fa..d87bdbdd32a 100644 +--- a/src/journal/test-journal-interleaving.c ++++ b/src/journal/test-journal-interleaving.c +@@ -37,7 +37,7 @@ + + static bool arg_keep = false; + +-noreturn static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { ++_noreturn_ static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { + log_internal(LOG_CRIT, error, file, line, func, + "'%s' failed at %s:%u (%s): %m", text, file, line, func); + abort(); +diff --git a/src/shared/pager.c b/src/shared/pager.c +index 75db3c985bd..681af9c40e3 100644 +--- a/src/shared/pager.c ++++ b/src/shared/pager.c +@@ -47,7 +47,7 @@ static int stored_stderr = -1; + static bool stdout_redirected = false; + static bool stderr_redirected = false; + +-noreturn static void pager_fallback(void) { ++_noreturn_ static void pager_fallback(void) { + int r; + + r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (uint64_t) -1, 0); +diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c +index 2821640e93b..c8fa47b3d7d 100644 +--- a/src/udev/collect/collect.c ++++ b/src/udev/collect/collect.c +@@ -58,7 +58,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node) + return container_of(node, struct _mate, node); + } + +-noreturn static void sig_alrm(int signo) ++_noreturn_ static void sig_alrm(int signo) + { + exit(4); + } diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 8c22c08dd1..3bc322cd51 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -40,6 +40,8 @@ SYSTEMD_CONF_OPTS += \ -Dldconfig=false \ -Ddefault-dnssec=no \ -Dtests=false \ + -Dsystem-uid-max=999 \ + -Dsystem-gid-max=999 \ -Dtelinit-path=$(TARGET_DIR)/sbin/telinit \ -Dkill-path=/usr/bin/kill \ -Dkmod-path=/usr/bin/kmod \ diff --git a/package/tremor/tremor.hash b/package/tremor/tremor.hash new file mode 100644 index 0000000000..89661a64cd --- /dev/null +++ b/package/tremor/tremor.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ba94cfdf886399c550f76908285bfa9e322f24085de6f1810c2abea565c13a15 tremor-7c30a66346199f3f09017a09567c6c8a3a0eedc8.tar.gz +sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk index 05996e2a8a..835fe36172 100644 --- a/package/tremor/tremor.mk +++ b/package/tremor/tremor.mk @@ -4,9 +4,9 @@ # ################################################################################ -TREMOR_SITE = http://svn.xiph.org/trunk/Tremor -TREMOR_SITE_METHOD = svn -TREMOR_VERSION = 19427 +TREMOR_VERSION = 7c30a66346199f3f09017a09567c6c8a3a0eedc8 +TREMOR_SITE = https://git.xiph.org/tremor.git +TREMOR_SITE_METHOD = git TREMOR_LICENSE = BSD-3-Clause TREMOR_LICENSE_FILES = COPYING diff --git a/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch b/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch new file mode 100644 index 0000000000..9f18342868 --- /dev/null +++ b/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch @@ -0,0 +1,33 @@ +From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 +From: Paul Kocialkowski <contact@paulk.fr> +Date: Fri, 2 Mar 2018 23:13:42 +0100 +Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path + +There are no headers for libfdt in lib/libfdt, as they are instead +located in scripts/dtc/libfdt. Specifying lib/libfdt for headers +inclusion in host tools results in using the system libfdt headers, +which is not what we want. Change this to the proper path. + +Signed-off-by: Paul Kocialkowski <contact@paulk.fr> +[Backport from upstream commit e0d20dc1521e74b82dbd69be53a048847798a90a] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index d3387fad69..f38f68ee47 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -244,7 +244,7 @@ endif # !LOGO_BMP + # + HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +- -I$(srctree)/lib/libfdt \ ++ -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ + -D__KERNEL_STRICT_NAMES \ +-- +2.14.3 + diff --git a/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch b/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch new file mode 100644 index 0000000000..ca433261ba --- /dev/null +++ b/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch @@ -0,0 +1,45 @@ +From 9a09c89fdd0e0cebec48d1bb7bc187bf92ae361c Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Tue, 13 Mar 2018 12:58:59 +0200 +Subject: [PATCH] misc/tst-syscall6: fix build with musl and older kenrel + headers + +The RWF_DSYNC and RWF_HIPRI macros were introduced in kernel version 4.6 +with the preadv2/pwritev2 system calls. musl libc provides its own +syscall definitions, even when the kernel headers are older. This leads +to the following build failure: + +tst-syscall6.c: In function 'main': +tst-syscall6.c:32:48: error: 'RWF_DSYNC' undeclared (first use in this function) + nio = syscall(SYS_pwritev2, fd, iov, 2, 0, 0, RWF_DSYNC); + ^~~~~~~~~ +tst-syscall6.c:32:48: note: each undeclared identifier is reported only once for each function it appears in +tst-syscall6.c:42:58: error: 'RWF_HIPRI' undeclared (first use in this function) + nio = syscall(SYS_preadv2, fd, iov, 1, strlen(str0), 0, RWF_HIPRI); + ^~~~~~~~~ + +Make the code depend also on RWF_HIPRI to fix this failure. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: patch sent to Waldemar Brodkorb <wbx@openadk.org> + + test/misc/tst-syscall6.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/misc/tst-syscall6.c b/test/misc/tst-syscall6.c +index fa51c275e4a5..9ad2ddac2b8f 100644 +--- a/test/misc/tst-syscall6.c ++++ b/test/misc/tst-syscall6.c +@@ -9,7 +9,7 @@ + + int main() + { +-#if defined SYS_preadv2 && defined SYS_pwritev2 ++#if defined SYS_preadv2 && defined SYS_pwritev2 && defined RWF_HIPRI + char tmp[] = "/tmp/tst-preadv2-XXXXXX"; + int fd; + struct iovec iov[2]; +-- +2.16.1 + diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index 364fa914e9..e497352682 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,5 @@ # From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.15.tar.gz.sha256: sha256 93d2b9cfd6cb8643c5a23d4115b44622d76c71abe15db9bb8d5b4d83f4d9b49c upmpdcli-1.2.15.tar.gz + +# Hash for license file: +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 93421c6498..2b44cc0757 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,4 +1,4 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.12.txt -sha256 3274458d1bb1658a5001465ecb07c7cbfc709571ef36bd062897570d4bab3ebc wireshark-2.2.12.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.14.txt +sha256 e7a3d4f9bbde20ea5ee09103f9f6dba38e3666dfe1d6a6a1c004602b5fac378b wireshark-2.2.14.tar.bz2 # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 93c6da0398..ad475803b7 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.12 +WIRESHARK_VERSION = 2.2.14 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license diff --git a/package/xerces/0001-fix-CVE-2017-12627.patch b/package/xerces/0001-fix-CVE-2017-12627.patch new file mode 100644 index 0000000000..010be7e3d5 --- /dev/null +++ b/package/xerces/0001-fix-CVE-2017-12627.patch @@ -0,0 +1,22 @@ +XMLString: Don't call catString if relativePath is null + +https://xerces.apache.org/xerces-c/secadv/CVE-2017-12627.txt + +Upstream status: svn revision 1819998 + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> + +--- trunk/src/xercesc/util/PlatformUtils.cpp 2018/01/03 18:58:30 1819997 ++++ trunk/src/xercesc/util/PlatformUtils.cpp 2018/01/03 18:59:30 1819998 +@@ -920,7 +920,10 @@ + + XMLString::subString(tmpBuf, basePath, 0, (basePtr - basePath + 1), manager); + tmpBuf[basePtr - basePath + 1] = 0; +- XMLString::catString(tmpBuf, relativePath); ++ if (relativePath) ++ { ++ XMLString::catString(tmpBuf, relativePath); ++ } + + removeDotSlash(tmpBuf, manager); + diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 645de92e22..201280fd46 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -14,6 +14,9 @@ XTERM_CONF_OPTS = --enable-256-color \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib +# Avoid freetype2 path poisoning by imake +XTERM_CONF_ENV = ac_cv_path_IMAKE="" + ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) XTERM_DEPENDENCIES += xlib_libXft XTERM_CONF_OPTS += --enable-freetype \ diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index d5459f99dd..c0fa88026c 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -6,7 +6,7 @@ ZSTD_VERSION = v1.3.3 ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION)) -ZSTD_LICENSE = BSD-3-Clause, GPL-2.0 +ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 ZSTD_LICENSE_FILES = LICENSE COPYING ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) |
