mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-09 06:10:17 +03:00
Compare commits
91 Commits
2020.02-rc
...
2019.08.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d77f6c1712 | ||
|
|
73dad61740 | ||
|
|
b718ed9fab | ||
|
|
668fe091f8 | ||
|
|
efe9840c2a | ||
|
|
2610ab44be | ||
|
|
30433bc252 | ||
|
|
5381d693ef | ||
|
|
3eadf3ccbd | ||
|
|
b952431bf3 | ||
|
|
e818d80f4d | ||
|
|
e82df41169 | ||
|
|
6271eabb12 | ||
|
|
b1a2ad290a | ||
|
|
c6bf0d01e7 | ||
|
|
8294642b7a | ||
|
|
675b5f3439 | ||
|
|
e047354d09 | ||
|
|
550c5d67ab | ||
|
|
8607d7f7e0 | ||
|
|
82796c2770 | ||
|
|
64f83694c1 | ||
|
|
83d4a70fd2 | ||
|
|
6bab977dc7 | ||
|
|
7056eee606 | ||
|
|
8a4449f869 | ||
|
|
c23b97f11a | ||
|
|
2822c1d200 | ||
|
|
d76e77036d | ||
|
|
579fe1c91b | ||
|
|
bf76ef6c31 | ||
|
|
e03bbada32 | ||
|
|
8ecb9e8154 | ||
|
|
f10dc0c3db | ||
|
|
fc0f575ae9 | ||
|
|
5905fa0d35 | ||
|
|
5edf478e33 | ||
|
|
7429adc5f2 | ||
|
|
b77d290993 | ||
|
|
aeb3e03627 | ||
|
|
75f8b68706 | ||
|
|
9e1b847569 | ||
|
|
865799e4aa | ||
|
|
6bdb30be0c | ||
|
|
d8826a9ee7 | ||
|
|
4f5913e471 | ||
|
|
c0ce55929e | ||
|
|
125dd61444 | ||
|
|
87e80d1bd1 | ||
|
|
dfd7269860 | ||
|
|
fc9125fb16 | ||
|
|
014a25173e | ||
|
|
dde51f1a35 | ||
|
|
d60ba920b2 | ||
|
|
bd86fb8ee3 | ||
|
|
357af4853b | ||
|
|
fbcbbdd0f6 | ||
|
|
4c0f06c08b | ||
|
|
174c5d2dbf | ||
|
|
1f0205ed61 | ||
|
|
03aadc8759 | ||
|
|
fa4b6a45e7 | ||
|
|
52bdfcfd8c | ||
|
|
45eedd82e1 | ||
|
|
633cad6e83 | ||
|
|
a75cf49658 | ||
|
|
dfaac41b4c | ||
|
|
a69392c719 | ||
|
|
ec13a9b598 | ||
|
|
5ef2a1aded | ||
|
|
c29905ae47 | ||
|
|
43623a24b6 | ||
|
|
381176ba3b | ||
|
|
6439831802 | ||
|
|
7fda4097bc | ||
|
|
0408b48116 | ||
|
|
f335581465 | ||
|
|
276ca822e8 | ||
|
|
7c9e7db1ed | ||
|
|
e3082a3035 | ||
|
|
507b18c76c | ||
|
|
209156962a | ||
|
|
eec524032f | ||
|
|
7bd72289f0 | ||
|
|
e68cec4a2b | ||
|
|
f3d3680c50 | ||
|
|
832f4d8ae4 | ||
|
|
7b90e9eabb | ||
|
|
f015857126 | ||
|
|
c62302f5e2 | ||
|
|
171a220c44 |
35
CHANGES
35
CHANGES
@@ -1,3 +1,38 @@
|
||||
2019.08.1, released October 3rd, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Defconfigs: AArch64-efi: Fix grub configuration, Beaglebone:
|
||||
Use default console settings
|
||||
|
||||
Dependencies: Ensure host has JSON::PP perl module installed
|
||||
if webkitgtk/wpewebkit packages are enabled as it is needed
|
||||
during their build process.
|
||||
|
||||
Toolchain: Generate check-headers program under BUILD_DIR
|
||||
rather than /tmp to fix issues with distributions mounting
|
||||
/tmp noexec.
|
||||
|
||||
Updated/fixed packages: asterisk, augeas, axel, bind, bwm-ng,
|
||||
cups, cups-filters, docker-cli, docker-engine, docker-proxy,
|
||||
e2fsprogs, eudev, exim, expat, gcc, go, haveged, ifplugd, joe,
|
||||
kf5-extra-cmake-modules, kf5-modemmanager-qt,
|
||||
kf5-networkmanager-qt, libcamera, libcurl, libgcrypt,
|
||||
libglib2, libgpg-error, libnspr, libnss, libopenssl,
|
||||
logrotate, luksmeta, mariadb, mbedtls, mongodb, mosquitto,
|
||||
ncurses, nfs-utils, nghttp2, nodejs, openvmtools, php,
|
||||
protobuf, putty, qemu, samba4, snort, swupdate,
|
||||
systemd-bootchart, thttpd, uclibc, unzip, util-linux,
|
||||
wireshark
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#10806: Allow nfs-utils to use ipv6
|
||||
#11781: mariadb build error
|
||||
#12031: Build of cups-filters fails while linking, apparently due..
|
||||
#12141: eudev package is missing "render" and "kvm" groups
|
||||
#12241: Permission denied while running "make"
|
||||
|
||||
2019.08, released September 1st, 2019
|
||||
|
||||
Various fixes.
|
||||
|
||||
39
DEVELOPERS
39
DEVELOPERS
@@ -143,7 +143,6 @@ F: package/ktap/
|
||||
N: André Hentschel <nerv@dawncrow.de>
|
||||
F: board/freescale/imx8qxpmek/
|
||||
F: configs/freescale_imx8qxpmek_defconfig
|
||||
F: package/azure-iot-sdk-c/
|
||||
F: package/freescale-imx/imx-sc-firmware/
|
||||
F: package/libkrb5/
|
||||
F: package/openal/
|
||||
@@ -225,6 +224,7 @@ F: package/sqlcipher/
|
||||
F: package/stress/
|
||||
|
||||
N: Asaf Kahlon <asafka7@gmail.com>
|
||||
F: package/collectd/
|
||||
F: package/libuv/
|
||||
F: package/python*
|
||||
F: package/spdlog/
|
||||
@@ -955,7 +955,7 @@ F: package/tesseract-ocr/
|
||||
F: package/webp/
|
||||
F: package/xapian/
|
||||
|
||||
N: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
N: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
F: package/minicom/
|
||||
F: package/sunxi-mali-mainline/
|
||||
F: package/sunxi-mali-mainline-driver/
|
||||
@@ -1045,6 +1045,7 @@ F: board/bananapi/
|
||||
F: board/engicam/
|
||||
F: board/friendlyarm/nanopi-a64/
|
||||
F: board/friendlyarm/nanopi-neo2/
|
||||
F: board/olimex/a33_olinuxino/
|
||||
F: board/olimex/a64-olinuxino/
|
||||
F: board/orangepi/orangepi-lite2/
|
||||
F: board/orangepi/orangepi-one-plus
|
||||
@@ -1065,6 +1066,7 @@ F: configs/engicam_imx6ul_geam_defconfig
|
||||
F: configs/engicam_imx6ul_isiot_defconfig
|
||||
F: configs/friendlyarm_nanopi_a64_defconfig
|
||||
F: configs/friendlyarm_nanopi_neo2_defconfig
|
||||
F: configs/olimex_a33_olinuxino_defconfig
|
||||
F: configs/olimex_a64_olinuxino_defconfig
|
||||
F: configs/orangepi_lite2_defconfig
|
||||
F: configs/orangepi_one_plus_defconfig
|
||||
@@ -1285,9 +1287,6 @@ F: package/python-pygame/
|
||||
N: Julien Corjon <corjon.j@ecagroup.com>
|
||||
F: package/qt5/
|
||||
|
||||
N: Julien Floret <julien.floret@6wind.com>
|
||||
F: package/lldpd/
|
||||
|
||||
N: Julien Grossholtz <julien.grossholtz@openest.io>
|
||||
F: package/paho-mqtt-c
|
||||
|
||||
@@ -1313,9 +1312,6 @@ F: package/cpuload/
|
||||
F: package/bwm-ng/
|
||||
F: package/ramsmp/
|
||||
|
||||
N: Kevin Joly <kevin.joly@sensefly.com>
|
||||
F: package/libgphoto2/
|
||||
|
||||
N: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
||||
F: package/libcamera/
|
||||
|
||||
@@ -1478,7 +1474,7 @@ F: package/tslib/
|
||||
F: package/x11r7/xdriver_xf86-input-tslib/
|
||||
F: package/x11vnc/
|
||||
|
||||
N: Mathieu Audat <mathieu.audat@savoirfairelinux.com>
|
||||
N: Mathieu Audat <mathieuaudat@gmail.com>
|
||||
F: board/technologic/ts4900/
|
||||
F: configs/ts4900_defconfig
|
||||
F: package/ts4900-fpga/
|
||||
@@ -1883,6 +1879,7 @@ F: package/trace-cmd/
|
||||
|
||||
N: Pierre-Jean Texier <pjtexier@koncepto.io>
|
||||
F: package/genimage/
|
||||
F: package/haveged/
|
||||
F: package/libarchive/
|
||||
F: package/libevent/
|
||||
F: package/libubootenv/
|
||||
@@ -1898,9 +1895,6 @@ F: package/libdvbpsi/
|
||||
F: package/mraa/
|
||||
F: package/synergy/
|
||||
|
||||
N: Pranit Sirsat <Pranit.Sirsat@imgtec.com>
|
||||
F: package/paho-mqtt-c/
|
||||
|
||||
N: Rafal Susz <rafal.susz@gmail.com>
|
||||
F: board/avnet/s6lx9_microboard/
|
||||
F: configs/s6lx9_microboard_defconfig
|
||||
@@ -1919,7 +1913,7 @@ N: Rahul Jain <rahul.jain@imgtec.com>
|
||||
F: package/uhttpd/
|
||||
F: package/ustream-ssl/
|
||||
|
||||
N: Refik Tuzakli <refik.tuzakli@savronik.com.tr>
|
||||
N: Refik Tuzakli <tuzakli.refik@gmail.com>
|
||||
F: package/paho-mqtt-cpp/
|
||||
|
||||
N: Rémi Rérolle <remi.rerolle@gmail.com>
|
||||
@@ -1935,7 +1929,14 @@ N: Ricardo Martincoski <ricardo.martincoski@datacom.com.br>
|
||||
F: package/atop/
|
||||
|
||||
N: Ricardo Martincoski <ricardo.martincoski@gmail.com>
|
||||
F: support/testing/
|
||||
F: support/testing/infra/
|
||||
F: support/testing/run-tests
|
||||
F: support/testing/tests/core/test_file_capabilities.py
|
||||
F: support/testing/tests/download/
|
||||
F: support/testing/tests/package/*_python*.py
|
||||
F: support/testing/tests/package/test_atop.py
|
||||
F: support/testing/tests/package/test_syslog_ng.py
|
||||
F: support/testing/tests/utils/test_check_package.py
|
||||
F: utils/check-package
|
||||
F: utils/checkpackagelib/
|
||||
|
||||
@@ -2093,10 +2094,6 @@ F: package/tunctl/
|
||||
F: package/ubus/
|
||||
F: package/wolfssl/
|
||||
|
||||
N: Shyam Saini <shyam.saini@amarulasolutions.com>
|
||||
F: board/olimex/a33_olinuxino/
|
||||
F: configs/olimex_a33_olinuxino_defconfig
|
||||
|
||||
N: Simon Dawson <spdawson@gmail.com>
|
||||
F: boot/at91bootstrap3/
|
||||
F: package/cppzmq/
|
||||
@@ -2319,7 +2316,7 @@ F: package/pixz/
|
||||
N: Vinicius Tinti <viniciustinti@gmail.com>
|
||||
F: package/python-thrift/
|
||||
|
||||
N: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
||||
N: Vivien Didelot <vivien.didelot@gmail.com>
|
||||
F: board/technologic/ts5500/
|
||||
F: configs/ts5500_defconfig
|
||||
|
||||
@@ -2403,6 +2400,8 @@ F: package/zisofs-tools/
|
||||
F: support/download/
|
||||
|
||||
N: Yegor Yefremov <yegorslists@googlemail.com>
|
||||
F: configs/beaglebone_defconfig
|
||||
F: configs/beaglebone_qt5_defconfig
|
||||
F: package/acl/
|
||||
F: package/attr/
|
||||
F: package/bluez_utils/
|
||||
@@ -2411,6 +2410,7 @@ F: package/bootstrap/
|
||||
F: package/cannelloni/
|
||||
F: package/can-utils/
|
||||
F: package/circus/
|
||||
F: package/dhcpcd/
|
||||
F: package/feh/
|
||||
F: package/giblib/
|
||||
F: package/imlib2/
|
||||
@@ -2427,6 +2427,7 @@ F: package/libubox/
|
||||
F: package/libuci/
|
||||
F: package/linux-firmware/
|
||||
F: package/modem-manager/
|
||||
F: package/nftables/
|
||||
F: package/nuttcp/
|
||||
F: package/parted/
|
||||
F: package/phytool/
|
||||
|
||||
4
Makefile
4
Makefile
@@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2019.08
|
||||
export BR2_VERSION := 2019.08.1
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1567371000
|
||||
BR2_VERSION_EPOCH = 1570086600
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -13,7 +13,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
|
||||
# Bootloader
|
||||
BR2_TARGET_GRUB2=y
|
||||
BR2_TARGET_GRUB2_AARCH64_EFI=y
|
||||
BR2_TARGET_GRUB2_ARM64_EFI=y
|
||||
|
||||
# Filesystem / image
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
|
||||
@@ -2,7 +2,6 @@ BR2_arm=y
|
||||
BR2_cortex_a8=y
|
||||
BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
|
||||
@@ -67,9 +67,13 @@ Python build system, but are not Python modules, can freely choose
|
||||
their name (existing examples in Buildroot are +scons+ and
|
||||
+supervisor+).
|
||||
|
||||
In their +Config.in+ file, they should depend on +BR2_PACKAGE_PYTHON+
|
||||
so that when Buildroot will enable Python 3 usage for modules, we will
|
||||
be able to enable Python modules progressively on Python 3.
|
||||
Packages that are only compatible with one version of Python (as in:
|
||||
Python 2 or Python 3) should depend on that version explicitely in
|
||||
their +Config.in+ file (+BR2_PACKAGE_PYTHON+ for Python 2,
|
||||
+BR2_PACKAGE_PYTHON3+ for Python 3). Packages that are compatible
|
||||
with both versions should not explicitely depend on them in their
|
||||
+Config.in+ file, since that condition is already expressed for the
|
||||
whole "External python modules" menu.
|
||||
|
||||
The main macro of the Python package infrastructure is
|
||||
+python-package+. It is similar to the +generic-package+ macro. It is
|
||||
|
||||
@@ -246,6 +246,7 @@ illustration, of course):
|
||||
|
|
||||
|- external.mk
|
||||
| |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk))
|
||||
| |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/toolchain/*/*.mk))
|
||||
| |
|
||||
| |flash-my-board:
|
||||
| | $(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/flash-image \
|
||||
|
||||
@@ -122,7 +122,7 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "5.2.11" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "5.2.18" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "v4.19.65-cip8" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
|
||||
sha256 0c2a831f993dc8a8a8e1ca4186b467de72ff173c6f5855e2aab70f6f7fb033f9 linux-5.2.11.tar.xz
|
||||
sha256 6d090f866c9739403f78b08470209d1e825c44ce5dbaa237a4a2c8c6609dca60 linux-5.2.18.tar.xz
|
||||
sha256 56495f82314f0dfb84a3fe7fad78e17be69c4fd36ef46f2452458b2fa1e341f6 linux-5.1.21.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
|
||||
sha256 c091760b520a4e4a4c7034a8329cc2689a0ea3f81a377b694ed196d623e2d987 linux-4.19.69.tar.xz
|
||||
sha256 0bb9f0812326ec4554de1bea02628840e03b6664b5abfd9d8510049e43203a17 linux-4.14.141.tar.xz
|
||||
sha256 fe8a1ca080a462de6832762ba8b71410b828f0e52c1e11d3c46d83e9ac1e0a16 linux-4.9.190.tar.xz
|
||||
sha256 fec8c8549a3775b922cecad74a6409b33520a669d451dc51ad47d69c2543c2e5 linux-4.4.190.tar.xz
|
||||
sha256 ba4dd29902734b263a5197410363b17f30dc60bc999bd6ce90b6f5910b971e66 linux-4.19.76.tar.xz
|
||||
sha256 a3c54b887ea3e679382bd4c0536e6a281b071dab2258bd3ee8af75baef2023f5 linux-4.14.146.tar.xz
|
||||
sha256 d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3 linux-4.9.194.tar.xz
|
||||
sha256 d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3 linux-4.9.194.tar.xz
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally computed
|
||||
sha256 8cabb7a6ad2c35b7fb5c520977f2b2c18b471e5b825b65dc411744c6bed2b9f8 asterisk-16.4.1.tar.gz
|
||||
sha256 122ecf242e06da373488024e0c76154f2404d024d09eed20b23cae0795033380 asterisk-16.5.1.tar.gz
|
||||
|
||||
# sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
|
||||
# sha256 locally computed
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ASTERISK_VERSION = 16.4.1
|
||||
ASTERISK_VERSION = 16.5.1
|
||||
# Use the github mirror: it's an official mirror maintained by Digium, and
|
||||
# provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
|
||||
ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))
|
||||
|
||||
@@ -11,9 +11,6 @@ AUGEAS_LICENSE = LGPL-2.1+
|
||||
AUGEAS_LICENSE_FILES = COPYING
|
||||
AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2
|
||||
|
||||
# patching examples/Makefile.am, can be removed when updating from version 1.9.0
|
||||
AUGEAS_AUTORECONF = YES
|
||||
|
||||
AUGEAS_CONF_OPTS = --disable-gnulib-tests
|
||||
|
||||
# Remove the test lenses which occupy about 1.4 MB on the target
|
||||
|
||||
@@ -1 +1 @@
|
||||
sha256 5c5c682617d498071ff9083029fcecc2c2fdeeedc366c35d2bdf8663355616cc axel-2.17.5.tar.xz
|
||||
sha256 24ab549021bdfca01ad5e8e95b706869dd30fe9ab1043da4cbb9dff89edc267d axel-2.17.6.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AXEL_VERSION = 2.17.5
|
||||
AXEL_VERSION = 2.17.6
|
||||
AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION)
|
||||
AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz
|
||||
AXEL_LICENSE = GPL-2.0+
|
||||
|
||||
@@ -1,18 +1,23 @@
|
||||
Use host compiler to build 'gen' since it's run when building.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
[Fabrice: updated for 9.11.10]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in
|
||||
--- bind-9.5.1-P1/lib/dns/Makefile.in 2007-09-11 22:09:08.000000000 -0300
|
||||
+++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in 2009-03-04 16:35:23.000000000 -0200
|
||||
@@ -160,8 +160,8 @@
|
||||
./gen -s ${srcdir} > code.h
|
||||
@@ -160,10 +160,8 @@
|
||||
./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
|
||||
|
||||
gen: gen.c
|
||||
- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
|
||||
- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
|
||||
- ${LFS_CFLAGS} ${LFS_LDFLAGS} \
|
||||
- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \
|
||||
- ${BUILD_LIBS} ${LFS_LIBS}
|
||||
+ ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \
|
||||
+ ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c
|
||||
|
||||
rbtdb64.@O@: rbtdb.c
|
||||
timestamp: include libdns.@A@
|
||||
touch timestamp
|
||||
|
||||
|
||||
@@ -1,133 +0,0 @@
|
||||
From ef49780d30d3ddc5735cfc32561b678a634fa72f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
|
||||
Date: Wed, 17 Apr 2019 15:22:27 +0200
|
||||
Subject: [PATCH] Replace atomic operations in bin/named/client.c with
|
||||
isc_refcount reference counting
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
bin/named/client.c | 18 +++++++-----------
|
||||
bin/named/include/named/interfacemgr.h | 5 +++--
|
||||
bin/named/interfacemgr.c | 7 +++++--
|
||||
3 files changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/bin/named/client.c b/bin/named/client.c
|
||||
index 845326abc0..29fecadca8 100644
|
||||
--- a/bin/named/client.c
|
||||
+++ b/bin/named/client.c
|
||||
@@ -402,12 +402,10 @@ tcpconn_detach(ns_client_t *client) {
|
||||
static void
|
||||
mark_tcp_active(ns_client_t *client, bool active) {
|
||||
if (active && !client->tcpactive) {
|
||||
- isc_atomic_xadd(&client->interface->ntcpactive, 1);
|
||||
+ isc_refcount_increment0(&client->interface->ntcpactive, NULL);
|
||||
client->tcpactive = active;
|
||||
} else if (!active && client->tcpactive) {
|
||||
- uint32_t old =
|
||||
- isc_atomic_xadd(&client->interface->ntcpactive, -1);
|
||||
- INSIST(old > 0);
|
||||
+ isc_refcount_decrement(&client->interface->ntcpactive, NULL);
|
||||
client->tcpactive = active;
|
||||
}
|
||||
}
|
||||
@@ -554,7 +552,7 @@ exit_check(ns_client_t *client) {
|
||||
if (client->mortal && TCP_CLIENT(client) &&
|
||||
client->newstate != NS_CLIENTSTATE_FREED &&
|
||||
!ns_g_clienttest &&
|
||||
- isc_atomic_xadd(&client->interface->ntcpaccepting, 0) == 0)
|
||||
+ isc_refcount_current(&client->interface->ntcpaccepting) == 0)
|
||||
{
|
||||
/* Nobody else is accepting */
|
||||
client->mortal = false;
|
||||
@@ -3328,7 +3326,6 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
|
||||
isc_result_t result;
|
||||
ns_client_t *client = event->ev_arg;
|
||||
isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event;
|
||||
- uint32_t old;
|
||||
|
||||
REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN);
|
||||
REQUIRE(NS_CLIENT_VALID(client));
|
||||
@@ -3348,8 +3345,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
|
||||
INSIST(client->naccepts == 1);
|
||||
client->naccepts--;
|
||||
|
||||
- old = isc_atomic_xadd(&client->interface->ntcpaccepting, -1);
|
||||
- INSIST(old > 0);
|
||||
+ isc_refcount_decrement(&client->interface->ntcpaccepting, NULL);
|
||||
|
||||
/*
|
||||
* We must take ownership of the new socket before the exit
|
||||
@@ -3480,8 +3476,8 @@ client_accept(ns_client_t *client) {
|
||||
* quota is tcp-clients plus the number of listening
|
||||
* interfaces plus 1.)
|
||||
*/
|
||||
- exit = (isc_atomic_xadd(&client->interface->ntcpactive, 0) >
|
||||
- (client->tcpactive ? 1 : 0));
|
||||
+ exit = (isc_refcount_current(&client->interface->ntcpactive) >
|
||||
+ (client->tcpactive ? 1U : 0U));
|
||||
if (exit) {
|
||||
client->newstate = NS_CLIENTSTATE_INACTIVE;
|
||||
(void)exit_check(client);
|
||||
@@ -3539,7 +3535,7 @@ client_accept(ns_client_t *client) {
|
||||
* listening for connections itself to prevent the interface
|
||||
* going dead.
|
||||
*/
|
||||
- isc_atomic_xadd(&client->interface->ntcpaccepting, 1);
|
||||
+ isc_refcount_increment0(&client->interface->ntcpaccepting, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
|
||||
index 3535ef22a8..6e10f210fd 100644
|
||||
--- a/bin/named/include/named/interfacemgr.h
|
||||
+++ b/bin/named/include/named/interfacemgr.h
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <isc/magic.h>
|
||||
#include <isc/mem.h>
|
||||
#include <isc/socket.h>
|
||||
+#include <isc/refcount.h>
|
||||
|
||||
#include <dns/result.h>
|
||||
|
||||
@@ -75,11 +76,11 @@ struct ns_interface {
|
||||
/*%< UDP dispatchers. */
|
||||
isc_socket_t * tcpsocket; /*%< TCP socket. */
|
||||
isc_dscp_t dscp; /*%< "listen-on" DSCP value */
|
||||
- int32_t ntcpaccepting; /*%< Number of clients
|
||||
+ isc_refcount_t ntcpaccepting; /*%< Number of clients
|
||||
ready to accept new
|
||||
TCP connections on this
|
||||
interface */
|
||||
- int32_t ntcpactive; /*%< Number of clients
|
||||
+ isc_refcount_t ntcpactive; /*%< Number of clients
|
||||
servicing TCP queries
|
||||
(whether accepting or
|
||||
connected) */
|
||||
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
|
||||
index d9f6df5802..135533be6b 100644
|
||||
--- a/bin/named/interfacemgr.c
|
||||
+++ b/bin/named/interfacemgr.c
|
||||
@@ -386,8 +386,8 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
|
||||
* connections will be handled in parallel even though there is
|
||||
* only one client initially.
|
||||
*/
|
||||
- ifp->ntcpaccepting = 0;
|
||||
- ifp->ntcpactive = 0;
|
||||
+ isc_refcount_init(&ifp->ntcpaccepting, 0);
|
||||
+ isc_refcount_init(&ifp->ntcpactive, 0);
|
||||
|
||||
ifp->nudpdispatch = 0;
|
||||
|
||||
@@ -618,6 +618,9 @@ ns_interface_destroy(ns_interface_t *ifp) {
|
||||
|
||||
ns_interfacemgr_detach(&ifp->mgr);
|
||||
|
||||
+ isc_refcount_destroy(&ifp->ntcpactive);
|
||||
+ isc_refcount_destroy(&ifp->ntcpaccepting);
|
||||
+
|
||||
ifp->magic = 0;
|
||||
isc_mem_put(mctx, ifp, sizeof(*ifp));
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From 92b738a0fe8a7d65346de9e6dd7a8f135ee29765 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 23 Apr 2019 22:45:25 +0200
|
||||
Subject: [PATCH] dlz_open_driver.c: fix build without dlfcn.h
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://gitlab.isc.org/isc-projects/bind9/issues/995]
|
||||
---
|
||||
bin/named/unix/dlz_dlopen_driver.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
|
||||
index 74d29ffa09..ab8a5c9493 100644
|
||||
--- a/bin/named/unix/dlz_dlopen_driver.c
|
||||
+++ b/bin/named/unix/dlz_dlopen_driver.c
|
||||
@@ -14,7 +14,9 @@
|
||||
#include <inttypes.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
+#if HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
+#endif
|
||||
|
||||
#include <dns/log.h>
|
||||
#include <dns/result.h>
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Verified from https://ftp.isc.org/isc/bind9/9.11.6-P1/bind-9.11.6-P1.tar.gz.asc
|
||||
# Verified from https://ftp.isc.org/isc/bind9/9.11.10/bind-9.11.10.tar.gz.asc
|
||||
# with key 156890685EA0DF6A1371EF2017CC5DB1F0088407
|
||||
sha256 58ace2abb4d048b67abcdef0649ecd6cbd3b0652734a41a1d34f942d5500f8ef bind-9.11.6-P1.tar.gz
|
||||
sha256 b2bb840cda20e6771ae8c054007b4ec12e1bb6aa6bfe79102890eb94956a70c3 bind-9.11.10.tar.gz
|
||||
sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BIND_VERSION = 9.11.6-P1
|
||||
BIND_VERSION = 9.11.10
|
||||
BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
|
||||
# bind does not support parallel builds.
|
||||
BIND_MAKE = $(MAKE1)
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
BWM_NG_VERSION = f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef
|
||||
BWM_NG_SITE = $(call github,vgropp,bwm-ng,$(BWM_NG_VERSION))
|
||||
BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
|
||||
BWM_NG_LICENSE = GPL-2.0
|
||||
BWM_NG_LICENSE = GPL-2.0+
|
||||
BWM_NG_LICENSE_FILES = COPYING
|
||||
BWM_NG_AUTORECONF = YES
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
From c26b4c3550557442890f2f790d4f8b61a3734c1f Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
Date: Thu, 8 Mar 2018 12:32:23 +0200
|
||||
Subject: [PATCH] install: don't use ln -r
|
||||
|
||||
Oldish enterprise-class distributions have too old versions of
|
||||
coreutils, with ln not supporting -r.
|
||||
|
||||
So we fake it.
|
||||
|
||||
ln -r would create minimalist relative paths, but they are not
|
||||
trivial to generate. Instead, we always create paths relative to the
|
||||
root, i.e.:
|
||||
|
||||
ln -s -r /usr/bin/foo /usr/sbin/foo
|
||||
|
||||
would create: /usr/sbin/foo -> ../bin/foo
|
||||
while we do : /usr/sbin/foo -> ../../usr/bin/foo
|
||||
|
||||
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
---
|
||||
Makefile.am | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index d959227..b49914a 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -998,11 +998,11 @@ install-exec-hook:
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
|
||||
if ENABLE_FOOMATIC
|
||||
- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
|
||||
+ $(LN_S) -f ../..$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
|
||||
endif
|
||||
if ENABLE_DRIVERLESS
|
||||
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
|
||||
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
|
||||
+ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
|
||||
+ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
|
||||
endif
|
||||
if ENABLE_BRAILLE
|
||||
$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,214 @@
|
||||
From edd44df686b4ec983a327cabc5035106addb274f Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Santos <unixmania@gmail.com>
|
||||
Date: Mon, 16 Sep 2019 22:22:37 -0300
|
||||
Subject: [PATCH] install: support old ln versions without the -r option
|
||||
|
||||
Oldish enterprise-class Linux distributions have outdated versions of
|
||||
coreutils whose ln command do not support the -r option. Also non-Linux
|
||||
systems like FreeBSD don't support that option. Use a shell script that
|
||||
mimics the missing functionality.
|
||||
|
||||
The script creates minimalist relative paths, like ln -r does, but in
|
||||
order to simplify the logic, it requires that the arguments be absolute
|
||||
paths and do not end with '/'. This is enough for our purposes.
|
||||
|
||||
Add configuration logic to detect if ln supports the -r option, based on
|
||||
the logic used by Autoconf to check if ln supports the -s option.
|
||||
|
||||
Signed-off-by: Carlos Santos <unixmania@gmail.com>
|
||||
---
|
||||
Makefile.am | 6 ++--
|
||||
configure.ac | 2 ++
|
||||
ln-srf | 49 ++++++++++++++++++++++++++
|
||||
m4/ac_ln_srf.m4 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 145 insertions(+), 3 deletions(-)
|
||||
create mode 100755 ln-srf
|
||||
create mode 100644 m4/ac_ln_srf.m4
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 76b81de5..beb2882e 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -988,11 +988,11 @@ install-exec-hook:
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
|
||||
if ENABLE_FOOMATIC
|
||||
- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
|
||||
+ $(LN_SRF) $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
|
||||
endif
|
||||
if ENABLE_DRIVERLESS
|
||||
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
|
||||
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
|
||||
+ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
|
||||
+ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
|
||||
endif
|
||||
if ENABLE_BRAILLE
|
||||
$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d5a539b6..fbcf829a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -58,6 +58,8 @@ AM_ICONV
|
||||
AC_PROG_CPP
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
+AS_LN_SRF_PREPARE
|
||||
+AC_PROG_LN_SRF
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_LIBTOOL
|
||||
PKG_PROG_PKG_CONFIG([0.20])
|
||||
diff --git a/ln-srf b/ln-srf
|
||||
new file mode 100755
|
||||
index 00000000..f395a760
|
||||
--- /dev/null
|
||||
+++ b/ln-srf
|
||||
@@ -0,0 +1,49 @@
|
||||
+#!/bin/sh
|
||||
+#
|
||||
+# Author: Carlos Santos <unixmania@gmail.com>
|
||||
+# This file is in public domain.
|
||||
+#
|
||||
+
|
||||
+error() {
|
||||
+ echo "$@" 1>&2
|
||||
+ exit 1
|
||||
+}
|
||||
+
|
||||
+src="$1"
|
||||
+dst="$2"
|
||||
+
|
||||
+check_path() {
|
||||
+ case "$2" in
|
||||
+ */../*|*/./*|*/.|*/..) error "$1 path '$2' must be absolute";;
|
||||
+ */) error "$1 path '$2' must not end with '/'";;
|
||||
+ /?*) ;;
|
||||
+ *) error "$1 path '$2' must start with '/'";;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+check_path "source" "$src"
|
||||
+check_path "destination" "$dst"
|
||||
+
|
||||
+# strip leading '/'
|
||||
+src=${src#/*}
|
||||
+tmp=${dst#/*}
|
||||
+
|
||||
+s_prefix=${src%%/*}
|
||||
+d_prefix=${tmp%%/*}
|
||||
+
|
||||
+# strip leading common
|
||||
+while [ "$s_prefix" = "$d_prefix" ]; do
|
||||
+ src="${src#$s_prefix/}"
|
||||
+ tmp="${tmp#$d_prefix/}"
|
||||
+ s_prefix=${src%%/*}
|
||||
+ d_prefix=${tmp%%/*}
|
||||
+done
|
||||
+
|
||||
+s_prefix="../"
|
||||
+while [ -n "$d_prefix" ] && [ "$tmp" != "$d_prefix" ]; do
|
||||
+ s_prefix="../$s_prefix"
|
||||
+ tmp="${tmp#$d_prefix/}"
|
||||
+ d_prefix=${tmp%%/*}
|
||||
+done
|
||||
+
|
||||
+ln -s -f "$s_prefix$src" "$dst"
|
||||
diff --git a/m4/ac_ln_srf.m4 b/m4/ac_ln_srf.m4
|
||||
new file mode 100644
|
||||
index 00000000..204b3439
|
||||
--- /dev/null
|
||||
+++ b/m4/ac_ln_srf.m4
|
||||
@@ -0,0 +1,91 @@
|
||||
+# Adapted from Autoconf Version 2.63 (GPLv2).
|
||||
+#
|
||||
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
+# Free Software Foundation, Inc.
|
||||
+#
|
||||
+# This program is free software: you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation; either version 2, or (at your option)
|
||||
+# any later version.
|
||||
+#
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program; if not, write to the Free Software
|
||||
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
+# 02110-1301, USA.
|
||||
+#
|
||||
+# As a special exception, the Free Software Foundation gives unlimited
|
||||
+# permission to copy, distribute and modify the configure scripts that
|
||||
+# are the output of Autoconf. You need not follow the terms of the GNU
|
||||
+# General Public License when using or distributing such scripts, even
|
||||
+# though portions of the text of Autoconf appear in them. The GNU
|
||||
+# General Public License (GPL) does govern all other use of the material
|
||||
+# that constitutes the Autoconf program.
|
||||
+#
|
||||
+# Certain portions of the Autoconf source text are designed to be copied
|
||||
+# (in certain cases, depending on the input) into the output of
|
||||
+# Autoconf. We call these the "data" portions. The rest of the Autoconf
|
||||
+# source text consists of comments plus executable code that decides which
|
||||
+# of the data portions to output in any given case. We call these
|
||||
+# comments and executable code the "non-data" portions. Autoconf never
|
||||
+# copies any of the non-data portions into its output.
|
||||
+#
|
||||
+# This special exception to the GPL applies to versions of Autoconf
|
||||
+# released by the Free Software Foundation. When you make and
|
||||
+# distribute a modified version of Autoconf, you may extend this special
|
||||
+# exception to the GPL to apply to your modified version as well, *unless*
|
||||
+# your modified version has the potential to copy into its output some
|
||||
+# of the text that was the non-data portion of the version that you started
|
||||
+# with. (In other words, unless your change moves or copies text from
|
||||
+# the non-data portions to the data portions.) If your modification has
|
||||
+# such potential, you must delete any notice of this special exception
|
||||
+# to the GPL from your modified version.
|
||||
+
|
||||
+# AS_LN_SRF_PREPARE
|
||||
+# ------------------------------------
|
||||
+m4_defun([AS_LN_SRF_PREPARE],
|
||||
+[rm -f conf$$ conf$$.exe conf$$.file
|
||||
+if test -d conf$$.dir; then
|
||||
+ rm -f conf$$.dir/conf$$.file
|
||||
+else
|
||||
+ rm -f conf$$.dir
|
||||
+ mkdir conf$$.dir 2>/dev/null
|
||||
+fi
|
||||
+if (echo >conf$$.file) 2>/dev/null; then
|
||||
+ if ln -s -r conf$$.file conf$$ 2>/dev/null; then
|
||||
+ as_ln_srf='ln -s -r -f'
|
||||
+ elif ln -s conf$$.file conf$$ 2>/dev/null; then
|
||||
+ as_ln_srf='./ln-srf'
|
||||
+ # ... but there are two gotchas:
|
||||
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
||||
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
||||
+ # In both cases, we have to default to `cp -pRf'.
|
||||
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
||||
+ as_ln_srf='cp -pRf'
|
||||
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
||||
+ as_ln_srf=ln
|
||||
+ else
|
||||
+ as_ln_srf='cp -pRf'
|
||||
+ fi
|
||||
+else
|
||||
+ as_ln_srf='cp -pRf'
|
||||
+fi
|
||||
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
||||
+rmdir conf$$.dir 2>/dev/null
|
||||
+])# AS_LN_SRF_PREPARE
|
||||
+
|
||||
+# AC_PROG_LN_SRF
|
||||
+# --------------------------------
|
||||
+AC_DEFUN([AC_PROG_LN_SRF],
|
||||
+[AC_MSG_CHECKING([whether ln -s -r -f works])
|
||||
+AC_SUBST([LN_SRF], [$as_ln_srf])dnl
|
||||
+if test "$LN_SRF" = "ln -s -r -f"; then
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+else
|
||||
+ AC_MSG_RESULT([no, using $LN_SRF])
|
||||
+fi
|
||||
+])# AC_PROG_LN_SRF
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
From 734ef160b428c545d8c6ae16c4bfe3c036173aa4 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Santos <unixmania@gmail.com>
|
||||
Date: Sun, 21 Jul 2019 23:54:29 -0300
|
||||
Subject: [PATCH] filter/texttotext.c: link with libiconv if needed
|
||||
|
||||
texttotext.c uses iconv so it should link with libiconv on platforms
|
||||
where it is a separate library (e.g. uClibc-ng without built-in NLS)
|
||||
otherwise texttotext fails to link:
|
||||
|
||||
CCLD texttotext
|
||||
[...]/ld: texttotext-texttotext.o: in function `main':
|
||||
texttotext.c:(.text.startup+0xde0): undefined reference to `libiconv_open'
|
||||
[...]/ld: texttotext.c:(.text.startup+0xf9d): undefined reference to `libiconv'
|
||||
[...]/ld: texttotext.c:(.text.startup+0xfd6): undefined reference to `libiconv'
|
||||
[...]/ld: texttotext.c:(.text.startup+0x16c3): undefined reference to `libiconv_close'
|
||||
|
||||
Modify autogen.sh to call autopoint, which adds the libiconv discovery.
|
||||
It also creates a "po" skeleton but we can discard it, since it is not
|
||||
really necessary.
|
||||
|
||||
Fixes: https://bugs.busybox.net/show_bug.cgi?id=12031
|
||||
|
||||
Signed-off-by: Carlos Santos <unixmania@gmail.com>
|
||||
---
|
||||
Makefile.am | 4 +++-
|
||||
autogen.sh | 17 +++++++++++++++++
|
||||
configure.ac | 6 +++++-
|
||||
3 files changed, 25 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 72e023ed..76b81de5 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -778,7 +778,7 @@ texttotext_SOURCES = \
|
||||
filter/texttotext.c
|
||||
EXTRA_texttotext_SOURCES = filter/strcasestr.c
|
||||
texttotext_CFLAGS = $(CUPS_CFLAGS)
|
||||
-texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS)
|
||||
+texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS) $(LIBICONV)
|
||||
texttotext_DEPENDENCIES = $(STRCASESTR)
|
||||
|
||||
pdftops_SOURCES = \
|
||||
@@ -1049,3 +1049,5 @@ if ENABLE_BRAILLE
|
||||
$(RM) $(DESTDIR)$(pkgfilterdir)/vectortoubrl
|
||||
$(RM) $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
|
||||
endif
|
||||
+
|
||||
+SUBDIRS =
|
||||
diff --git a/autogen.sh b/autogen.sh
|
||||
index 5462a323..cd7397a9 100755
|
||||
--- a/autogen.sh
|
||||
+++ b/autogen.sh
|
||||
@@ -13,11 +13,22 @@ aclocal --version > /dev/null 2> /dev/null || {
|
||||
echo "error: aclocal not found"
|
||||
exit 1
|
||||
}
|
||||
+
|
||||
automake --version > /dev/null 2> /dev/null || {
|
||||
echo "error: automake not found"
|
||||
exit 1
|
||||
}
|
||||
|
||||
+autopoint --version > /dev/null 2> /dev/null || {
|
||||
+ echo "error: autopoint not found"
|
||||
+ exit 1
|
||||
+}
|
||||
+
|
||||
+gettext --version > /dev/null 2> /dev/null || {
|
||||
+ echo "error: gettext not found"
|
||||
+ exit 1
|
||||
+}
|
||||
+
|
||||
for i in $TESTLIBTOOLIZE; do
|
||||
if which $i > /dev/null 2>&1; then
|
||||
LIBTOOLIZE=$i
|
||||
@@ -39,6 +50,12 @@ fi
|
||||
|
||||
rm -rf autom4te*.cache
|
||||
|
||||
+autopoint --force || {
|
||||
+ echo "error: autopoint failed"
|
||||
+ exit 1
|
||||
+}
|
||||
+# autopoint is for libiconv discovery; we don't want the po directory
|
||||
+rm -rf po
|
||||
$LIBTOOLIZE --force --copy || {
|
||||
echo "error: libtoolize failed"
|
||||
exit 1
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 607dc17a..d5a539b6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
|
||||
m4_include([m4/ac_define_dir.m4])
|
||||
m4_include([m4/ax_compare_version.m4])
|
||||
m4_include([m4/basic-directories.m4])
|
||||
-AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2])
|
||||
+AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2 subdir-objects])
|
||||
AM_SILENT_RULES([yes])
|
||||
AC_LANG([C++])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
@@ -54,6 +54,7 @@ AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
|
||||
AM_PROG_CC_C_O
|
||||
+AM_ICONV
|
||||
AC_PROG_CPP
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
@@ -61,6 +62,9 @@ AC_PROG_MAKE_SET
|
||||
AC_PROG_LIBTOOL
|
||||
PKG_PROG_PKG_CONFIG([0.20])
|
||||
|
||||
+AM_GNU_GETTEXT_VERSION([0.18.3])
|
||||
+AM_GNU_GETTEXT([external])
|
||||
+
|
||||
# ========================================
|
||||
# Specify the fontdir patch if not default
|
||||
# ========================================
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@@ -8,7 +8,7 @@ CUPS_FILTERS_VERSION = 1.23.0
|
||||
CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
|
||||
CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
|
||||
CUPS_FILTERS_LICENSE_FILES = COPYING
|
||||
# 0001-Replace-relative-linking-with-absolute-linking.patch
|
||||
# 0001-install-support-old-ln-versions-without-the-r-option.patch
|
||||
CUPS_FILTERS_AUTORECONF = YES
|
||||
|
||||
CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
|
||||
@@ -16,11 +16,20 @@ CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
|
||||
CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \
|
||||
--disable-mutool \
|
||||
--disable-foomatic \
|
||||
--disable-braille \
|
||||
--with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \
|
||||
--with-sysroot=$(STAGING_DIR) \
|
||||
--with-pdftops=pdftops \
|
||||
--with-jpeg
|
||||
|
||||
# After 0002-filter-texttotext.c-link-with-libiconv-if-needed.patch autoreconf
|
||||
# needs config.rpath and ABOUT-NLS, which are not in v1.25.4 yet. Fake them.
|
||||
define CUPS_FILTERS_ADD_MISSING_FILE
|
||||
touch $(@D)/config.rpath $(@D)/ABOUT-NLS
|
||||
endef
|
||||
|
||||
CUPS_FILTERS_PRE_CONFIGURE_HOOKS = CUPS_FILTERS_ADD_MISSING_FILE
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
||||
CUPS_FILTERS_CONF_OPTS += --with-png
|
||||
CUPS_FILTERS_DEPENDENCIES += libpng
|
||||
|
||||
@@ -1,301 +0,0 @@
|
||||
From f376c469919beeb3e75d40879dcda4288983e897 Mon Sep 17 00:00:00 2001
|
||||
From: Michael R Sweet <michael.r.sweet@gmail.com>
|
||||
Date: Wed, 12 Jun 2019 08:37:06 -0400
|
||||
Subject: [PATCH] Use GZIPPROG instead of GZIP to avoid install issues (Issue
|
||||
#5595)
|
||||
|
||||
(cherry picked from commit 3676fc318a458f71df76620a7e66f5c5807cf9b1)
|
||||
|
||||
Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
|
||||
---
|
||||
Makedefs.in | 4 +--
|
||||
config-scripts/cups-common.m4 | 20 ++++++------
|
||||
configure | 59 ++++++++++++++++++-----------------
|
||||
3 files changed, 42 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/Makedefs.in b/Makedefs.in
|
||||
index f614c0c1d..8541b4976 100644
|
||||
--- a/Makedefs.in
|
||||
+++ b/Makedefs.in
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# Common makefile definitions for CUPS.
|
||||
#
|
||||
-# Copyright 2007-2018 by Apple Inc.
|
||||
+# Copyright 2007-2019 by Apple Inc.
|
||||
# Copyright 1997-2007 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
@@ -29,7 +29,7 @@ CHMOD = @CHMOD@
|
||||
CXX = @LIBTOOL_CXX@ @CXX@
|
||||
DSO = @DSO@
|
||||
DSOXX = @DSOXX@
|
||||
-GZIP = @GZIP@
|
||||
+GZIPPROG = @GZIPPROG@
|
||||
INSTALL = @INSTALL@
|
||||
LD = @LD@
|
||||
LD_CC = @LD_CC@
|
||||
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
|
||||
index a1185bccc..0859efe08 100644
|
||||
--- a/config-scripts/cups-common.m4
|
||||
+++ b/config-scripts/cups-common.m4
|
||||
@@ -1,7 +1,7 @@
|
||||
dnl
|
||||
dnl Common configuration stuff for CUPS.
|
||||
dnl
|
||||
-dnl Copyright 2007-2017 by Apple Inc.
|
||||
+dnl Copyright 2007-2019 by Apple Inc.
|
||||
dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
|
||||
dnl
|
||||
dnl These coded instructions, statements, and computer programs are the
|
||||
@@ -42,7 +42,11 @@ AC_PROG_CXX(clang++ c++ g++)
|
||||
AC_PROG_RANLIB
|
||||
AC_PATH_PROG(AR,ar)
|
||||
AC_PATH_PROG(CHMOD,chmod)
|
||||
-AC_PATH_PROG(GZIP,gzip)
|
||||
+AC_PATH_PROG(GZIPPROG,gzip)
|
||||
+AC_MSG_CHECKING(for install-sh script)
|
||||
+INSTALL="`pwd`/install-sh"
|
||||
+AC_SUBST(INSTALL)
|
||||
+AC_MSG_RESULT(using $INSTALL)
|
||||
AC_PATH_PROG(LD,ld)
|
||||
AC_PATH_PROG(LN,ln)
|
||||
AC_PATH_PROG(MKDIR,mkdir)
|
||||
@@ -51,6 +55,7 @@ AC_PATH_PROG(RM,rm)
|
||||
AC_PATH_PROG(RMDIR,rmdir)
|
||||
AC_PATH_PROG(SED,sed)
|
||||
AC_PATH_PROG(XDGOPEN,xdg-open)
|
||||
+
|
||||
if test "x$XDGOPEN" = x; then
|
||||
CUPS_HTMLVIEW="htmlview"
|
||||
else
|
||||
@@ -58,11 +63,6 @@ else
|
||||
fi
|
||||
AC_SUBST(CUPS_HTMLVIEW)
|
||||
|
||||
-AC_MSG_CHECKING(for install-sh script)
|
||||
-INSTALL="`pwd`/install-sh"
|
||||
-AC_SUBST(INSTALL)
|
||||
-AC_MSG_RESULT(using $INSTALL)
|
||||
-
|
||||
if test "x$AR" = x; then
|
||||
AC_MSG_ERROR([Unable to find required library archive command.])
|
||||
fi
|
||||
@@ -266,14 +266,14 @@ dnl ZLIB
|
||||
INSTALL_GZIP=""
|
||||
LIBZ=""
|
||||
AC_CHECK_HEADER(zlib.h,
|
||||
- AC_CHECK_LIB(z, gzgets,
|
||||
+ AC_CHECK_LIB(z, gzgets,[
|
||||
AC_DEFINE(HAVE_LIBZ)
|
||||
LIBZ="-lz"
|
||||
LIBS="$LIBS -lz"
|
||||
AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_INFLATECOPY))
|
||||
- if test "x$GZIP" != z; then
|
||||
+ if test "x$GZIPPROG" != x; then
|
||||
INSTALL_GZIP="-z"
|
||||
- fi))
|
||||
+ fi]))
|
||||
AC_SUBST(INSTALL_GZIP)
|
||||
AC_SUBST(LIBZ)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 368906141..629fdddba 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
-# Generated by GNU Autoconf 2.69 for CUPS 2.2.11.
|
||||
+# Generated by GNU Autoconf 2.69 for CUPS 2.2.12.
|
||||
#
|
||||
# Report bugs to <https://github.com/apple/cups/issues>.
|
||||
#
|
||||
@@ -580,8 +580,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='CUPS'
|
||||
PACKAGE_TARNAME='cups'
|
||||
-PACKAGE_VERSION='2.2.11'
|
||||
-PACKAGE_STRING='CUPS 2.2.11'
|
||||
+PACKAGE_VERSION='2.2.12'
|
||||
+PACKAGE_STRING='CUPS 2.2.12'
|
||||
PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
|
||||
PACKAGE_URL='https://www.cups.org/'
|
||||
|
||||
@@ -762,7 +762,6 @@ LIBPAPER
|
||||
LIBMALLOC
|
||||
PKGCONFIG
|
||||
INSTALLSTATIC
|
||||
-INSTALL
|
||||
CUPS_HTMLVIEW
|
||||
XDGOPEN
|
||||
SED
|
||||
@@ -772,7 +771,8 @@ MV
|
||||
MKDIR
|
||||
LN
|
||||
LD
|
||||
-GZIP
|
||||
+INSTALL
|
||||
+GZIPPROG
|
||||
CHMOD
|
||||
AR
|
||||
RANLIB
|
||||
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
-\`configure' configures CUPS 2.2.11 to adapt to many kinds of systems.
|
||||
+\`configure' configures CUPS 2.2.12 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1545,7 +1545,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
- short | recursive ) echo "Configuration of CUPS 2.2.11:";;
|
||||
+ short | recursive ) echo "Configuration of CUPS 2.2.12:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1726,7 +1726,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
-CUPS configure 2.2.11
|
||||
+CUPS configure 2.2.12
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -2190,7 +2190,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
-It was created by CUPS $as_me 2.2.11, which was
|
||||
+It was created by CUPS $as_me 2.2.12, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -2711,7 +2711,7 @@ done
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
|
||||
-CUPS_VERSION="2.2.11"
|
||||
+CUPS_VERSION="2.2.12"
|
||||
CUPS_REVISION=""
|
||||
CUPS_BUILD="cups-$CUPS_VERSION"
|
||||
|
||||
@@ -3948,12 +3948,12 @@ fi
|
||||
set dummy gzip; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
-if ${ac_cv_path_GZIP+:} false; then :
|
||||
+if ${ac_cv_path_GZIPPROG+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- case $GZIP in
|
||||
+ case $GZIPPROG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
- ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
|
||||
+ ac_cv_path_GZIPPROG="$GZIPPROG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
@@ -3963,7 +3963,7 @@ do
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
- ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
|
||||
+ ac_cv_path_GZIPPROG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
@@ -3974,16 +3974,22 @@ IFS=$as_save_IFS
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
-GZIP=$ac_cv_path_GZIP
|
||||
-if test -n "$GZIP"; then
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5
|
||||
-$as_echo "$GZIP" >&6; }
|
||||
+GZIPPROG=$ac_cv_path_GZIPPROG
|
||||
+if test -n "$GZIPPROG"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIPPROG" >&5
|
||||
+$as_echo "$GZIPPROG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5
|
||||
+$as_echo_n "checking for install-sh script... " >&6; }
|
||||
+INSTALL="`pwd`/install-sh"
|
||||
+
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5
|
||||
+$as_echo "using $INSTALL" >&6; }
|
||||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
@@ -4304,6 +4310,7 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
+
|
||||
if test "x$XDGOPEN" = x; then
|
||||
CUPS_HTMLVIEW="htmlview"
|
||||
else
|
||||
@@ -4311,13 +4318,6 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5
|
||||
-$as_echo_n "checking for install-sh script... " >&6; }
|
||||
-INSTALL="`pwd`/install-sh"
|
||||
-
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5
|
||||
-$as_echo "using $INSTALL" >&6; }
|
||||
-
|
||||
if test "x$AR" = x; then
|
||||
as_fn_error $? "Unable to find required library archive command." "$LINENO" 5
|
||||
fi
|
||||
@@ -5718,7 +5718,8 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5
|
||||
$as_echo "$ac_cv_lib_z_gzgets" >&6; }
|
||||
if test "x$ac_cv_lib_z_gzgets" = xyes; then :
|
||||
- $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
|
||||
+
|
||||
+ $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
|
||||
|
||||
LIBZ="-lz"
|
||||
LIBS="$LIBS -lz"
|
||||
@@ -5763,7 +5764,7 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
|
||||
|
||||
fi
|
||||
|
||||
- if test "x$GZIP" != z; then
|
||||
+ if test "x$GZIPPROG" != x; then
|
||||
INSTALL_GZIP="-z"
|
||||
fi
|
||||
fi
|
||||
@@ -10832,7 +10833,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
-This file was extended by CUPS $as_me 2.2.11, which was
|
||||
+This file was extended by CUPS $as_me 2.2.12, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -10895,7 +10896,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
-CUPS config.status 2.2.11
|
||||
+CUPS config.status 2.2.12
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated:
|
||||
sha256 f58010813fd6903f690cdb0c0b91e4d1bc9e5b9570c28734229ba3ed2908b76c cups-2.2.11-source.tar.gz
|
||||
sha256 0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8 cups-2.2.12-source.tar.gz
|
||||
sha256 6e0e0ffbde118aae709f7ef65590de9071e8b2cd322f84fd645c6b64f3cc452c LICENSE.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CUPS_VERSION = 2.2.11
|
||||
CUPS_VERSION = 2.2.12
|
||||
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
|
||||
CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
|
||||
CUPS_LICENSE = GPL-2.0, LGPL-2.0
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 62e25a0935bee75f999fb95b224ad982054fc1adc4351ce98d704ec00114ce57 docker-cli-18.09.7.tar.gz
|
||||
sha256 cef3f9e8615cde906619f7ab021655a8b974d1b497ce0e5787b1afccbeabb08d docker-cli-18.09.9.tar.gz
|
||||
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOCKER_CLI_VERSION = 18.09.7
|
||||
DOCKER_CLI_VERSION = 18.09.9
|
||||
DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION))
|
||||
DOCKER_CLI_WORKSPACE = gopath
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 b4f55831f5e7c5a92cd91f77aad1541ccd572eb18df2f44a01c372bceb3f9b6b docker-engine-18.09.7.tar.gz
|
||||
sha256 fa3a9e998627418d648495d06d168c4d26ed07859c9370d5fddbfd29c26d8592 docker-engine-18.09.9.tar.gz
|
||||
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOCKER_ENGINE_VERSION = 18.09.7
|
||||
DOCKER_ENGINE_VERSION = 18.09.9
|
||||
DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION))
|
||||
|
||||
DOCKER_ENGINE_LICENSE = Apache-2.0
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz
|
||||
sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz
|
||||
sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e
|
||||
DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e
|
||||
DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
|
||||
|
||||
DOCKER_PROXY_LICENSE = Apache-2.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.2/sha256sums.asc
|
||||
sha256 4952c9ae91e36d762e13cc5b9e8f7eeb5453e4aee4cd9b7402e73f2d4e65e009 e2fsprogs-1.45.2.tar.xz
|
||||
# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.4/sha256sums.asc
|
||||
sha256 65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02 e2fsprogs-1.45.4.tar.xz
|
||||
# Locally calculated
|
||||
sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE
|
||||
sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
E2FSPROGS_VERSION = 1.45.2
|
||||
E2FSPROGS_VERSION = 1.45.4
|
||||
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
|
||||
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
|
||||
E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
|
||||
|
||||
@@ -51,6 +51,8 @@ endef
|
||||
# Required by default rules for input devices
|
||||
define EUDEV_USERS
|
||||
- - input -1 * - - - Input device group
|
||||
- - render -1 * - - - DRI rendering nodes
|
||||
- - kvm -1 * - - - kvm nodes
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From 478effbfd9c3cc5a627fc671d4bf94d13670d65f Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Harris <jgh146exb@wizmail.org>
|
||||
Date: Fri, 27 Sep 2019 12:21:49 +0100
|
||||
Subject: [PATCH] Fix buffer overflow in string_vformat. Bug 2449
|
||||
|
||||
Fixes CVE-2019-16928:
|
||||
https://lists.exim.org/lurker/message/20190928.003428.2b4c81a7.en.html
|
||||
|
||||
Downloaded from upstream commit
|
||||
https://git.exim.org/exim.git/patch/478effbfd9c3cc5a627fc671d4bf94d13670d65f
|
||||
|
||||
[adjusted patch of string.c and removed patches for test/]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/string.c | 4 ++--
|
||||
scripts/0000-Basic/0214 | 11 +++++++++++
|
||||
stdout/0214 | 7 +++++++
|
||||
3 files changed, 20 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/src/string.c b/src/src/string.c
|
||||
index c6549bf..3445f8a 100644
|
||||
--- a/src/string.c
|
||||
+++ b/src/string.c
|
||||
@@ -1132,7 +1132,7 @@ store_reset(g->s + (g->size = g->ptr + 1));
|
||||
Arguments:
|
||||
g the growable-string
|
||||
p current end of data
|
||||
- count amount to grow by
|
||||
+ count amount to grow by, offset from p
|
||||
*/
|
||||
|
||||
static void
|
||||
@@ -1590,7 +1590,7 @@ while (*fp)
|
||||
}
|
||||
else if (g->ptr >= lim - width)
|
||||
{
|
||||
- gstring_grow(g, g->ptr, width - (lim - g->ptr));
|
||||
+ gstring_grow(g, g->ptr, width);
|
||||
lim = g->size - 1;
|
||||
gp = CS g->s + g->ptr;
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 2c64a871dd7ac464c14df8eb0dcf5cf766b46fff5af0316aaa4bf0268dde24b4 exim-4.92.1.tar.xz
|
||||
sha256 01d7ae481d03ff408f8e54fd9b250324ea5ddabc83b1db32917c7f27a096a654 exim-4.92.2.tar.xz
|
||||
sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EXIM_VERSION = 4.92.1
|
||||
EXIM_VERSION = 4.92.2
|
||||
EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz
|
||||
EXIM_SITE = https://ftp.exim.org/pub/exim/exim4
|
||||
EXIM_LICENSE = GPL-2.0+
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://sourceforge.net/projects/expat/files/expat/2.2.7/
|
||||
md5 72f36b87cdb478aba1e78473393766aa expat-2.2.7.tar.bz2
|
||||
sha1 9c8a268211e3f1ae31c4d550e5be7708973ec6a6 expat-2.2.7.tar.bz2
|
||||
# From https://sourceforge.net/projects/expat/files/expat/2.2.8/
|
||||
md5 cdf54239f892fc7914957f10de1e1c70 expat-2.2.8.tar.xz
|
||||
sha1 500a848d7085df06020a86bf64c5f71c0052a080 expat-2.2.8.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18 expat-2.2.7.tar.bz2
|
||||
sha256 61caa81a49d858afb2031c7b1a25c97174e7f2009aa1ec4e1ffad2316b91779b expat-2.2.8.tar.xz
|
||||
sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 COPYING
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EXPAT_VERSION = 2.2.7
|
||||
EXPAT_VERSION = 2.2.8
|
||||
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
|
||||
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
|
||||
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
|
||||
EXPAT_INSTALL_STAGING = YES
|
||||
EXPAT_DEPENDENCIES = host-pkgconf
|
||||
HOST_EXPAT_DEPENDENCIES = host-pkgconf
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From a592242578e573778241cae6d3928c064dcdfda4 Mon Sep 17 00:00:00 2001
|
||||
From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Tue, 18 Jun 2019 22:19:12 +0000
|
||||
Subject: [PATCH] xtensa: fix for PR target/90922
|
||||
|
||||
Stack pointer adjustment code in prologue missed a case of no
|
||||
callee-saved registers and a stack frame size bigger than 128 bytes.
|
||||
Handle that case.
|
||||
|
||||
This fixes the following gcc tests with call0 ABI:
|
||||
gcc.c-torture/execute/stdarg-2.c
|
||||
gcc.dg/torture/pr55882.c
|
||||
gcc.dg/torture/pr57569.c
|
||||
|
||||
gcc/
|
||||
2019-06-18 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/xtensa.c (xtensa_expand_prologue): Add stack
|
||||
pointer adjustment for the case of no callee-saved registers and
|
||||
stack frame bigger than 128 bytes.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
gcc/config/xtensa/xtensa.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index 19bd616d67f6..ee5612441e25 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -2802,7 +2802,8 @@ xtensa_expand_prologue (void)
|
||||
gen_rtx_SET (mem, reg));
|
||||
}
|
||||
}
|
||||
- if (total_size > 1024)
|
||||
+ if (total_size > 1024
|
||||
+ || (!callee_save_size && total_size > 128))
|
||||
{
|
||||
rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
|
||||
emit_move_insn (tmp_reg, GEN_INT (total_size -
|
||||
--
|
||||
2.11.0
|
||||
|
||||
49
package/gcc/7.4.0/1003-xtensa-fix-PR-target-91880.patch
Normal file
49
package/gcc/7.4.0/1003-xtensa-fix-PR-target-91880.patch
Normal file
@@ -0,0 +1,49 @@
|
||||
From 7c11710230921246156aecc20eb4b6ccaeaaa473 Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Tue, 24 Sep 2019 04:15:17 -0700
|
||||
Subject: [PATCH] xtensa: fix PR target/91880
|
||||
|
||||
Xtensa hwloop_optimize segfaults when zero overhead loop is about to be
|
||||
inserted as the first instruction of the function.
|
||||
Insert zero overhead loop instruction into new basic block before the
|
||||
loop when basic block that precedes the loop is empty.
|
||||
|
||||
2019-09-26 Max Filippov <jcmvbkbc@gmail.com>
|
||||
gcc/
|
||||
* config/xtensa/xtensa.c (hwloop_optimize): Insert zero overhead
|
||||
loop instruction into new basic block before the loop when basic
|
||||
block that precedes the loop is empty.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r276166
|
||||
|
||||
gcc/config/xtensa/xtensa.c | 5 ++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index ee5612441e25..2527468d57db 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -4174,7 +4174,9 @@ hwloop_optimize (hwloop_info loop)
|
||||
|
||||
seq = get_insns ();
|
||||
|
||||
- if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1)
|
||||
+ entry_after = BB_END (entry_bb);
|
||||
+ if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1
|
||||
+ || !entry_after)
|
||||
{
|
||||
basic_block new_bb;
|
||||
edge e;
|
||||
@@ -4195,7 +4197,6 @@ hwloop_optimize (hwloop_info loop)
|
||||
}
|
||||
else
|
||||
{
|
||||
- entry_after = BB_END (entry_bb);
|
||||
while (DEBUG_INSN_P (entry_after)
|
||||
|| (NOTE_P (entry_after)
|
||||
&& NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From a592242578e573778241cae6d3928c064dcdfda4 Mon Sep 17 00:00:00 2001
|
||||
From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Tue, 18 Jun 2019 22:19:12 +0000
|
||||
Subject: [PATCH] xtensa: fix for PR target/90922
|
||||
|
||||
Stack pointer adjustment code in prologue missed a case of no
|
||||
callee-saved registers and a stack frame size bigger than 128 bytes.
|
||||
Handle that case.
|
||||
|
||||
This fixes the following gcc tests with call0 ABI:
|
||||
gcc.c-torture/execute/stdarg-2.c
|
||||
gcc.dg/torture/pr55882.c
|
||||
gcc.dg/torture/pr57569.c
|
||||
|
||||
gcc/
|
||||
2019-06-18 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/xtensa.c (xtensa_expand_prologue): Add stack
|
||||
pointer adjustment for the case of no callee-saved registers and
|
||||
stack frame bigger than 128 bytes.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
gcc/config/xtensa/xtensa.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index 19bd616d67f6..ee5612441e25 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -2862,7 +2862,8 @@ xtensa_expand_prologue (void)
|
||||
gen_rtx_SET (mem, reg));
|
||||
}
|
||||
}
|
||||
- if (total_size > 1024)
|
||||
+ if (total_size > 1024
|
||||
+ || (!callee_save_size && total_size > 128))
|
||||
{
|
||||
rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
|
||||
emit_move_insn (tmp_reg, GEN_INT (total_size -
|
||||
--
|
||||
2.11.0
|
||||
|
||||
49
package/gcc/8.3.0/0002-xtensa-fix-PR-target-91880.patch
Normal file
49
package/gcc/8.3.0/0002-xtensa-fix-PR-target-91880.patch
Normal file
@@ -0,0 +1,49 @@
|
||||
From 7c11710230921246156aecc20eb4b6ccaeaaa473 Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Tue, 24 Sep 2019 04:15:17 -0700
|
||||
Subject: [PATCH] xtensa: fix PR target/91880
|
||||
|
||||
Xtensa hwloop_optimize segfaults when zero overhead loop is about to be
|
||||
inserted as the first instruction of the function.
|
||||
Insert zero overhead loop instruction into new basic block before the
|
||||
loop when basic block that precedes the loop is empty.
|
||||
|
||||
2019-09-26 Max Filippov <jcmvbkbc@gmail.com>
|
||||
gcc/
|
||||
* config/xtensa/xtensa.c (hwloop_optimize): Insert zero overhead
|
||||
loop instruction into new basic block before the loop when basic
|
||||
block that precedes the loop is empty.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r276166
|
||||
|
||||
gcc/config/xtensa/xtensa.c | 5 ++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index ee5612441e25..2527468d57db 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -4232,7 +4232,9 @@ hwloop_optimize (hwloop_info loop)
|
||||
|
||||
seq = get_insns ();
|
||||
|
||||
- if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1)
|
||||
+ entry_after = BB_END (entry_bb);
|
||||
+ if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1
|
||||
+ || !entry_after)
|
||||
{
|
||||
basic_block new_bb;
|
||||
edge e;
|
||||
@@ -4253,7 +4255,6 @@ hwloop_optimize (hwloop_info loop)
|
||||
}
|
||||
else
|
||||
{
|
||||
- entry_after = BB_END (entry_bb);
|
||||
while (DEBUG_INSN_P (entry_after)
|
||||
|| (NOTE_P (entry_after)
|
||||
&& NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From a592242578e573778241cae6d3928c064dcdfda4 Mon Sep 17 00:00:00 2001
|
||||
From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Tue, 18 Jun 2019 22:19:12 +0000
|
||||
Subject: [PATCH] xtensa: fix for PR target/90922
|
||||
|
||||
Stack pointer adjustment code in prologue missed a case of no
|
||||
callee-saved registers and a stack frame size bigger than 128 bytes.
|
||||
Handle that case.
|
||||
|
||||
This fixes the following gcc tests with call0 ABI:
|
||||
gcc.c-torture/execute/stdarg-2.c
|
||||
gcc.dg/torture/pr55882.c
|
||||
gcc.dg/torture/pr57569.c
|
||||
|
||||
gcc/
|
||||
2019-06-18 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/xtensa.c (xtensa_expand_prologue): Add stack
|
||||
pointer adjustment for the case of no callee-saved registers and
|
||||
stack frame bigger than 128 bytes.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
gcc/config/xtensa/xtensa.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index 19bd616d67f6..ee5612441e25 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -2865,7 +2865,8 @@ xtensa_expand_prologue (void)
|
||||
gen_rtx_SET (mem, reg));
|
||||
}
|
||||
}
|
||||
- if (total_size > 1024)
|
||||
+ if (total_size > 1024
|
||||
+ || (!callee_save_size && total_size > 128))
|
||||
{
|
||||
rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
|
||||
emit_move_insn (tmp_reg, GEN_INT (total_size -
|
||||
--
|
||||
2.11.0
|
||||
|
||||
49
package/gcc/9.2.0/0002-xtensa-fix-PR-target-91880.patch
Normal file
49
package/gcc/9.2.0/0002-xtensa-fix-PR-target-91880.patch
Normal file
@@ -0,0 +1,49 @@
|
||||
From 7c11710230921246156aecc20eb4b6ccaeaaa473 Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Tue, 24 Sep 2019 04:15:17 -0700
|
||||
Subject: [PATCH] xtensa: fix PR target/91880
|
||||
|
||||
Xtensa hwloop_optimize segfaults when zero overhead loop is about to be
|
||||
inserted as the first instruction of the function.
|
||||
Insert zero overhead loop instruction into new basic block before the
|
||||
loop when basic block that precedes the loop is empty.
|
||||
|
||||
2019-09-26 Max Filippov <jcmvbkbc@gmail.com>
|
||||
gcc/
|
||||
* config/xtensa/xtensa.c (hwloop_optimize): Insert zero overhead
|
||||
loop instruction into new basic block before the loop when basic
|
||||
block that precedes the loop is empty.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r276166
|
||||
|
||||
gcc/config/xtensa/xtensa.c | 5 ++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index ee5612441e25..2527468d57db 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -4235,7 +4235,9 @@ hwloop_optimize (hwloop_info loop)
|
||||
|
||||
seq = get_insns ();
|
||||
|
||||
- if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1)
|
||||
+ entry_after = BB_END (entry_bb);
|
||||
+ if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1
|
||||
+ || !entry_after)
|
||||
{
|
||||
basic_block new_bb;
|
||||
edge e;
|
||||
@@ -4256,7 +4258,6 @@ hwloop_optimize (hwloop_info loop)
|
||||
}
|
||||
else
|
||||
{
|
||||
- entry_after = BB_END (entry_bb);
|
||||
while (DEBUG_INSN_P (entry_after)
|
||||
|| (NOTE_P (entry_after)
|
||||
&& NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://golang.org/dl/
|
||||
sha256 ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc go1.12.9.src.tar.gz
|
||||
sha256 f56e48fce80646d3c94dcf36d3e3f490f6d541a92070ad409b87b6bbb9da3954 go1.12.10.src.tar.gz
|
||||
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GO_VERSION = 1.12.9
|
||||
GO_VERSION = 1.12.10
|
||||
GO_SITE = https://storage.googleapis.com/golang
|
||||
GO_SOURCE = go$(GO_VERSION).src.tar.gz
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 c4959d3cb1fa6391d16a3aa1ba4d82cd3a0d497206ae4b87d638088c0664e5aa haveged-1.9.4.tar.gz
|
||||
sha256 4d4c046755476d3734ffb78772c242c25913ff0eb7509c143671dae6ec9d1189 haveged-1.9.6.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HAVEGED_VERSION = 1.9.4
|
||||
HAVEGED_SITE = $(call github,jirka-h,haveged,$(HAVEGED_VERSION))
|
||||
HAVEGED_VERSION = 1.9.6
|
||||
HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION))
|
||||
HAVEGED_LICENSE = GPL-3.0+
|
||||
HAVEGED_LICENSE_FILES = COPYING
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
IFPLUGD_VERSION = 0.28
|
||||
IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd
|
||||
IFPLUGD_LICENSE = GPL-2.0
|
||||
IFPLUGD_LICENSE = GPL-2.0+
|
||||
IFPLUGD_LICENSE_FILES = LICENSE
|
||||
IFPLUGD_AUTORECONF = YES
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
JOE_VERSION = 4.4
|
||||
JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION)
|
||||
JOE_LICENSE = GPL-1.0+
|
||||
JOE_LICENSE = GPL-2.0+
|
||||
JOE_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
|
||||
@@ -8,7 +8,7 @@ KF5_EXTRA_CMAKE_MODULES_VERSION = $(KF5_VERSION)
|
||||
KF5_EXTRA_CMAKE_MODULES_SITE = $(KF5_SITE)
|
||||
KF5_EXTRA_CMAKE_MODULES_SOURCE = extra-cmake-modules-$(KF5_EXTRA_CMAKE_MODULES_VERSION).tar.xz
|
||||
KF5_EXTRA_CMAKE_MODULES_LICENSE = BSD-3-Clause
|
||||
KF5_EXTRA_CMAKE_MODULES_LICENSE_FILE = COPYING-CMAKE-SCRIPTS
|
||||
KF5_EXTRA_CMAKE_MODULES_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
|
||||
|
||||
KF5_EXTRA_CMAKE_MODULES_DEPENDENCIES = host-pkgconf
|
||||
KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES
|
||||
|
||||
@@ -8,7 +8,7 @@ KF5_MODEMMANAGER_QT_VERSION = $(KF5_VERSION)
|
||||
KF5_MODEMMANAGER_QT_SITE = $(KF5_SITE)
|
||||
KF5_MODEMMANAGER_QT_SOURCE = modemmanager-qt-$(KF5_MODEMMANAGER_QT_VERSION).tar.xz
|
||||
KF5_MODEMMANAGER_QT_LICENSE = LGPL-2.1+
|
||||
KF5_MODEMMANAGER_QT_LICENSE_FILE = COPYING.LIB
|
||||
KF5_MODEMMANAGER_QT_LICENSE_FILES = COPYING.LIB
|
||||
|
||||
KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base
|
||||
KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES
|
||||
|
||||
@@ -8,7 +8,7 @@ KF5_NETWORKMANAGER_QT_VERSION = $(KF5_VERSION)
|
||||
KF5_NETWORKMANAGER_QT_SITE = $(KF5_SITE)
|
||||
KF5_NETWORKMANAGER_QT_SOURCE = networkmanager-qt-$(KF5_NETWORKMANAGER_QT_VERSION).tar.xz
|
||||
KF5_NETWORKMANAGER_QT_LICENSE = LGPL-2.1+
|
||||
KF5_NETWORKMANAGER_QT_LICENSE_FILE = COPYING.LIB
|
||||
KF5_NETWORKMANAGER_QT_LICENSE_FILES = COPYING.LIB
|
||||
|
||||
KF5_NETWORKMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules network-manager qt5base
|
||||
KF5_NETWORKMANAGER_QT_INSTALL_STAGING = YES
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 85b7aeef3c7765c5ba7e525c63a4c0f807f0bfc8 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 5 Sep 2019 10:24:31 +0200
|
||||
Subject: [PATCH] src/libcamera/meson.build: link with atomic when needed
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1f0b8338f5f39aa86b9d432598dae2f53c5f7c84
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/libcamera/meson.build | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
|
||||
index c5d8f11..0706a08 100644
|
||||
--- a/src/libcamera/meson.build
|
||||
+++ b/src/libcamera/meson.build
|
||||
@@ -99,6 +99,7 @@ version_cpp = vcs_tag(command : [gen_version, meson.build_root()],
|
||||
libcamera_sources += version_cpp
|
||||
|
||||
libcamera_deps = [
|
||||
+ cc.find_library('atomic', required: false),
|
||||
cc.find_library('dl'),
|
||||
libudev,
|
||||
dependency('threads'),
|
||||
--
|
||||
2.23.0.rc1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://curl.haxx.se/download/curl-7.65.3.tar.xz.asc
|
||||
# https://curl.haxx.se/download/curl-7.66.0.tar.xz.asc
|
||||
# with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
|
||||
sha256 f2d98854813948d157f6a91236ae34ca4a1b4cb302617cebad263d79b0235fea curl-7.65.3.tar.xz
|
||||
sha256 dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1 curl-7.66.0.tar.xz
|
||||
sha256 8c8824f50e73a021f5dde1fccbf69685939247399a33a32abab1fa448c9ddabb COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCURL_VERSION = 7.65.3
|
||||
LIBCURL_VERSION = 7.66.0
|
||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
|
||||
LIBCURL_SITE = https://curl.haxx.se/download
|
||||
LIBCURL_DEPENDENCIES = host-pkgconf \
|
||||
|
||||
@@ -1,93 +0,0 @@
|
||||
From c006d8b897229e22f80cd6105fd64d0630f68867 Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Wed, 24 Oct 2018 14:57:53 +0900
|
||||
Subject: [PATCH] build: Provide libgcrypt.pc, generated by configure.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* configure.ac: Generate src/libgcrypt.pc.
|
||||
* src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New.
|
||||
(EXTRA_DIST): Add libgcrypt.pc.in.
|
||||
* src/libgcrypt-config.in: Use @PACKAGE_VERSION@.
|
||||
* src/libgcrypt.pc.in: New.
|
||||
|
||||
Fetched from: 97194b422bc89a6137f4e218d4cdee118c63e96e
|
||||
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
src/Makefile.am | 5 ++++-
|
||||
src/libgcrypt-config.in | 2 +-
|
||||
src/libgcrypt.pc.in | 17 +++++++++++++++++
|
||||
4 files changed, 23 insertions(+), 2 deletions(-)
|
||||
create mode 100644 src/libgcrypt.pc.in
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ce11162d..4e788714 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2613,6 +2613,7 @@ doc/Makefile
|
||||
src/Makefile
|
||||
src/gcrypt.h
|
||||
src/libgcrypt-config
|
||||
+src/libgcrypt.pc
|
||||
src/versioninfo.rc
|
||||
tests/Makefile
|
||||
])
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 3cc4a552..82d6e8a0 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -20,8 +20,11 @@
|
||||
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
+pkgconfigdir = $(libdir)/pkgconfig
|
||||
+pkgconfig_DATA = libgcrypt.pc
|
||||
+
|
||||
EXTRA_DIST = libgcrypt-config.in libgcrypt.m4 libgcrypt.vers \
|
||||
- gcrypt.h.in libgcrypt.def
|
||||
+ gcrypt.h.in libgcrypt.def libgcrypt.pc.in
|
||||
|
||||
bin_SCRIPTS = libgcrypt-config
|
||||
m4datadir = $(datadir)/aclocal
|
||||
diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in
|
||||
index c052638c..f7a13afe 100644
|
||||
--- a/src/libgcrypt-config.in
|
||||
+++ b/src/libgcrypt-config.in
|
||||
@@ -14,7 +14,7 @@
|
||||
# General.
|
||||
prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
-version="@VERSION@"
|
||||
+version="@PACKAGE_VERSION@"
|
||||
includedir="@includedir@"
|
||||
libdir="@libdir@"
|
||||
gpg_error_libs="@GPG_ERROR_LIBS@"
|
||||
diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in
|
||||
new file mode 100644
|
||||
index 00000000..5472da53
|
||||
--- /dev/null
|
||||
+++ b/src/libgcrypt.pc.in
|
||||
@@ -0,0 +1,17 @@
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=@exec_prefix@
|
||||
+includedir=@includedir@
|
||||
+libdir=@libdir@
|
||||
+host=@LIBGCRYPT_CONFIG_HOST@
|
||||
+api_version=@LIBGCRYPT_CONFIG_API_VERSION@
|
||||
+symmetric_ciphers="@LIBGCRYPT_CIPHERS@"
|
||||
+asymmetric_ciphers="@LIBGCRYPT_PUBKEY_CIPHERS@"
|
||||
+digests="@LIBGCRYPT_DIGESTS@"
|
||||
+
|
||||
+Name: libgcrypt
|
||||
+Description: General purpose cryptographic library
|
||||
+Requires: gpg-error
|
||||
+Version: @PACKAGE_VERSION@
|
||||
+Cflags: @LIBGCRYPT_CONFIG_CFLAGS@
|
||||
+Libs: @LIBGCRYPT_CONFIG_LIB@
|
||||
+URL: https://www.gnupg.org/software/libgcrypt/index.html
|
||||
--
|
||||
2.22.0
|
||||
@@ -1,31 +0,0 @@
|
||||
From de0245ddfca3cea31311eae9f7f3e8c0da072252 Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Wed, 24 Oct 2018 15:34:57 +0900
|
||||
Subject: [PATCH] build: Fix libgcrypt.pc.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* src/libgcrypt.pc.in: Fix typo.
|
||||
|
||||
Fetched from: 0e071372fc0e6fed4a449955ed0789803ba5e709
|
||||
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
src/libgcrypt.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in
|
||||
index 5472da53..ec68fa2d 100644
|
||||
--- a/src/libgcrypt.pc.in
|
||||
+++ b/src/libgcrypt.pc.in
|
||||
@@ -13,5 +13,5 @@ Description: General purpose cryptographic library
|
||||
Requires: gpg-error
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: @LIBGCRYPT_CONFIG_CFLAGS@
|
||||
-Libs: @LIBGCRYPT_CONFIG_LIB@
|
||||
+Libs: @LIBGCRYPT_CONFIG_LIBS@
|
||||
URL: https://www.gnupg.org/software/libgcrypt/index.html
|
||||
--
|
||||
2.22.0
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000431.html
|
||||
sha1 4a8ef9db6922f3a31992aca5640b4198a69b58fc libgcrypt-1.8.4.tar.bz2
|
||||
# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000440.html
|
||||
sha1 2d8781e92f88706707a1e76fb628b499ad538a30 libgcrypt-1.8.5.tar.bz2
|
||||
# Locally calculated after checking signature
|
||||
# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.4.tar.bz2.sig
|
||||
# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.5.tar.bz2.sig
|
||||
# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
|
||||
sha256 f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227 libgcrypt-1.8.4.tar.bz2
|
||||
sha256 3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3 libgcrypt-1.8.5.tar.bz2
|
||||
sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGCRYPT_VERSION = 1.8.4
|
||||
LIBGCRYPT_VERSION = 1.8.5
|
||||
LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
|
||||
LIBGCRYPT_LICENSE = LGPL-2.1+
|
||||
LIBGCRYPT_LICENSE_FILES = COPYING.LIB
|
||||
@@ -14,7 +14,7 @@ LIBGCRYPT_DEPENDENCIES = libgpg-error
|
||||
LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config
|
||||
|
||||
# Patching acinclude.m4 in 0001
|
||||
# Patching configure.ac and Makefile.am in 0002 / 0004
|
||||
# Patching configure.ac and Makefile.am in 0002
|
||||
LIBGCRYPT_AUTORECONF = YES
|
||||
LIBGCRYPT_CONF_OPTS = \
|
||||
--disable-tests \
|
||||
|
||||
@@ -35,7 +35,7 @@ index c96289a..b694bb7 100644
|
||||
@@ -1,4 +1,4 @@
|
||||
-project('glib', 'c', 'cpp',
|
||||
+project('glib', 'c',
|
||||
version : '2.60.6',
|
||||
version : '2.60.7',
|
||||
meson_version : '>= 0.48.0',
|
||||
default_options : [
|
||||
@@ -9,7 +9,6 @@ project('glib', 'c', 'cpp',
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# https://download.gnome.org/sources/glib/2.60/glib-2.60.6.sha256sum
|
||||
sha256 ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c glib-2.60.6.tar.xz
|
||||
sha256 8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310 glib-2.60.7.tar.xz
|
||||
# License files, locally calculated
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
LIBGLIB2_VERSION_MAJOR = 2.60
|
||||
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).6
|
||||
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).7
|
||||
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
|
||||
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
|
||||
LIBGLIB2_LICENSE = LGPL-2.1+
|
||||
|
||||
162
package/libgpg-error/0001-gawk5-support.patch
Normal file
162
package/libgpg-error/0001-gawk5-support.patch
Normal file
@@ -0,0 +1,162 @@
|
||||
From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Mon, 15 Apr 2019 15:10:44 +0900
|
||||
Subject: [PATCH] awk: Prepare for Gawk 5.0.
|
||||
|
||||
* src/Makefile.am: Use pkg_namespace (instead of namespace).
|
||||
* src/mkerrnos.awk: Likewise.
|
||||
* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
|
||||
* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
|
||||
|
||||
Downloaded from
|
||||
https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
--
|
||||
|
||||
In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
|
||||
which only allows escaping specific characters.
|
||||
|
||||
GnuPG-bug-id: 4459
|
||||
Reported-by: Marius Schamschula
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
---
|
||||
lang/cl/mkerrcodes.awk | 2 +-
|
||||
src/Makefile.am | 2 +-
|
||||
src/mkerrcodes.awk | 2 +-
|
||||
src/mkerrcodes1.awk | 2 +-
|
||||
src/mkerrcodes2.awk | 2 +-
|
||||
src/mkerrnos.awk | 2 +-
|
||||
src/mkstrtable.awk | 10 +++++-----
|
||||
7 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
|
||||
index ae29043..9a1fc18 100644
|
||||
--- a/lang/cl/mkerrcodes.awk
|
||||
+++ b/lang/cl/mkerrcodes.awk
|
||||
@@ -122,7 +122,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index ce1b882..f2590cb 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
|
||||
|
||||
errnos-sym.h: Makefile mkstrtable.awk errnos.in
|
||||
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
|
||||
- -v prefix=GPG_ERR_ -v namespace=errnos_ \
|
||||
+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
|
||||
$(srcdir)/errnos.in >$@
|
||||
|
||||
|
||||
diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
|
||||
index 46d436c..e9c857c 100644
|
||||
--- a/src/mkerrcodes.awk
|
||||
+++ b/src/mkerrcodes.awk
|
||||
@@ -85,7 +85,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
|
||||
index a771a73..4578e29 100644
|
||||
--- a/src/mkerrcodes1.awk
|
||||
+++ b/src/mkerrcodes1.awk
|
||||
@@ -81,7 +81,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
|
||||
index ea58503..188f7a4 100644
|
||||
--- a/src/mkerrcodes2.awk
|
||||
+++ b/src/mkerrcodes2.awk
|
||||
@@ -91,7 +91,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
|
||||
index f79df66..15b1aad 100644
|
||||
--- a/src/mkerrnos.awk
|
||||
+++ b/src/mkerrnos.awk
|
||||
@@ -83,7 +83,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
|
||||
index c9de9c1..285e45f 100644
|
||||
--- a/src/mkstrtable.awk
|
||||
+++ b/src/mkstrtable.awk
|
||||
@@ -77,7 +77,7 @@
|
||||
#
|
||||
# The variable prefix can be used to prepend a string to each message.
|
||||
#
|
||||
-# The variable namespace can be used to prepend a string to each
|
||||
+# The variable pkg_namespace can be used to prepend a string to each
|
||||
# variable and macro name.
|
||||
|
||||
BEGIN {
|
||||
@@ -102,7 +102,7 @@ header {
|
||||
print "/* The purpose of this complex string table is to produce";
|
||||
print " optimal code with a minimum of relocations. */";
|
||||
print "";
|
||||
- print "static const char " namespace "msgstr[] = ";
|
||||
+ print "static const char " pkg_namespace "msgstr[] = ";
|
||||
header = 0;
|
||||
}
|
||||
else
|
||||
@@ -110,7 +110,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
@@ -150,7 +150,7 @@ END {
|
||||
else
|
||||
print " gettext_noop (\"" last_msgstr "\");";
|
||||
print "";
|
||||
- print "static const int " namespace "msgidx[] =";
|
||||
+ print "static const int " pkg_namespace "msgidx[] =";
|
||||
print " {";
|
||||
for (i = 0; i < coded_msgs; i++)
|
||||
print " " pos[i] ",";
|
||||
@@ -158,7 +158,7 @@ END {
|
||||
print " };";
|
||||
print "";
|
||||
print "static GPG_ERR_INLINE int";
|
||||
- print namespace "msgidxof (int code)";
|
||||
+ print pkg_namespace "msgidxof (int code)";
|
||||
print "{";
|
||||
print " return (0 ? 0";
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -10,6 +10,8 @@ LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
|
||||
LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+
|
||||
LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB
|
||||
LIBGPG_ERROR_INSTALL_STAGING = YES
|
||||
# 0001-gawk5-support.patch
|
||||
LIBGPG_ERROR_AUTORECONF = YES
|
||||
LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
|
||||
LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
|
||||
LIBGPG_ERROR_CONF_OPTS = --disable-tests \
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
Add Nios-II support
|
||||
Bug 1578360 - Add Nios-II support
|
||||
|
||||
[Gustavo: update for nspr 4.10.9]
|
||||
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
|
||||
[Fabrice: update for nspr 4.20]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Giulio: update for nspr 4.22]
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
|
||||
Index: b/nspr/pr/include/md/_linux.cfg
|
||||
===================================================================
|
||||
--- a/nspr/pr/include/md/_linux.cfg
|
||||
+++ b/nspr/pr/include/md/_linux.cfg
|
||||
@@ -1112,6 +1112,51 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 3
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
diff -r 3af4891397ab -r 8487beb203e9 nspr/pr/include/md/_linux.cfg
|
||||
--- a/nspr/pr/include/md/_linux.cfg Mon Aug 19 16:17:52 2019 +0200
|
||||
+++ b/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:25:11 2019 +0200
|
||||
@@ -1157,6 +1157,51 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 2
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
|
||||
+#elif defined(__nios2__)
|
||||
+
|
||||
@@ -61,14 +62,13 @@ Index: b/nspr/pr/include/md/_linux.cfg
|
||||
#else
|
||||
|
||||
#error "Unknown CPU architecture"
|
||||
Index: b/nspr/pr/include/md/_linux.h
|
||||
===================================================================
|
||||
--- a/nspr/pr/include/md/_linux.h
|
||||
+++ b/nspr/pr/include/md/_linux.h
|
||||
@@ -57,6 +57,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "riscv32"
|
||||
#elif defined(__riscv) && (__riscv_xlen == 64)
|
||||
diff -r 3af4891397ab -r 8487beb203e9 nspr/pr/include/md/_linux.h
|
||||
--- a/nspr/pr/include/md/_linux.h Mon Aug 19 16:17:52 2019 +0200
|
||||
+++ b/nspr/pr/include/md/_linux.h Tue Sep 03 11:25:11 2019 +0200
|
||||
@@ -63,6 +63,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "riscv64"
|
||||
#elif defined(__arc__)
|
||||
#define _PR_SI_ARCHITECTURE "arc"
|
||||
+#elif defined(__nios2__)
|
||||
+#define _PR_SI_ARCHITECTURE "nios2"
|
||||
#else
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
Add Microblaze support
|
||||
Bug 1578363 - Add Microblaze support
|
||||
|
||||
[Gustavo: update for nspr 4.10.9]
|
||||
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
|
||||
[Fabrice: update for nspr 4.20]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Giulio: update for nspr 4.22]
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
|
||||
Index: b/nspr/pr/include/md/_linux.cfg
|
||||
===================================================================
|
||||
--- a/nspr/pr/include/md/_linux.cfg
|
||||
+++ b/nspr/pr/include/md/_linux.cfg
|
||||
@@ -1157,6 +1157,56 @@
|
||||
diff -r 8487beb203e9 -r ab7d5c504daf nspr/pr/include/md/_linux.cfg
|
||||
--- a/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:25:11 2019 +0200
|
||||
+++ b/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:33:15 2019 +0200
|
||||
@@ -1202,6 +1202,56 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 2
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
|
||||
@@ -66,16 +67,15 @@ Index: b/nspr/pr/include/md/_linux.cfg
|
||||
#else
|
||||
|
||||
#error "Unknown CPU architecture"
|
||||
Index: b/nspr/pr/include/md/_linux.h
|
||||
===================================================================
|
||||
--- a/nspr/pr/include/md/_linux.h
|
||||
+++ b/nspr/pr/include/md/_linux.h
|
||||
@@ -57,6 +57,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "riscv32"
|
||||
#elif defined(__riscv) && (__riscv_xlen == 64)
|
||||
#define _PR_SI_ARCHITECTURE "riscv64"
|
||||
+#elif defined(__microblaze__)
|
||||
+#define _PR_SI_ARCHITECTURE "microblaze"
|
||||
diff -r 8487beb203e9 -r ab7d5c504daf nspr/pr/include/md/_linux.h
|
||||
--- a/nspr/pr/include/md/_linux.h Tue Sep 03 11:25:11 2019 +0200
|
||||
+++ b/nspr/pr/include/md/_linux.h Tue Sep 03 11:33:15 2019 +0200
|
||||
@@ -65,6 +65,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "arc"
|
||||
#elif defined(__nios2__)
|
||||
#define _PR_SI_ARCHITECTURE "nios2"
|
||||
+#elif defined(__microblaze__)
|
||||
+#define _PR_SI_ARCHITECTURE "microblaze"
|
||||
#else
|
||||
#error "Unknown CPU architecture"
|
||||
#endif
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
Add nds32 support
|
||||
Bug 1578364 - Add Nds32 support
|
||||
|
||||
Signed-off-by:Nylon Chen <nylon7@andestech.com>
|
||||
Signed-off-by: Nylon Chen <nylon7@andestech.com>
|
||||
[Giulio: update for nspr 4.22]
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
|
||||
Index: b/nspr/pr/include/md/_linux.cfg
|
||||
===================================================================
|
||||
--- a/nspr/pr/include/md/_linux.cfg
|
||||
+++ b/nspr/pr/include/md/_linux.cfg
|
||||
@@ -1207,6 +1207,51 @@
|
||||
diff -r ab7d5c504daf -r d212d80704a2 nspr/pr/include/md/_linux.cfg
|
||||
--- a/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:33:15 2019 +0200
|
||||
+++ b/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:36:05 2019 +0200
|
||||
@@ -1252,6 +1252,51 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 2
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
|
||||
|
||||
+#elif defined(__nds32__)
|
||||
+
|
||||
+#define IS_LITTLE_ENDIAN 1
|
||||
@@ -56,17 +57,15 @@ Index: b/nspr/pr/include/md/_linux.cfg
|
||||
+#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
+
|
||||
#else
|
||||
|
||||
|
||||
#error "Unknown CPU architecture"
|
||||
|
||||
Index: b/nspr/pr/include/md/_linux.h
|
||||
===================================================================
|
||||
--- a/nspr/pr/include/md/_linux.h
|
||||
+++ b/nspr/pr/include/md/_linux.h
|
||||
@@ -65,6 +65,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "microblaze"
|
||||
#elif defined(__nios2__)
|
||||
diff -r ab7d5c504daf -r d212d80704a2 nspr/pr/include/md/_linux.h
|
||||
--- a/nspr/pr/include/md/_linux.h Tue Sep 03 11:33:15 2019 +0200
|
||||
+++ b/nspr/pr/include/md/_linux.h Tue Sep 03 11:36:05 2019 +0200
|
||||
@@ -67,6 +67,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "nios2"
|
||||
#elif defined(__microblaze__)
|
||||
#define _PR_SI_ARCHITECTURE "microblaze"
|
||||
+#elif defined(__nds32__)
|
||||
+#define _PR_SI_ARCHITECTURE "nds32"
|
||||
#else
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://ftp.mozilla.org/pub/nspr/releases/v4.20/src/SHA256SUMS
|
||||
sha256 2c8964913da89ffbaf464d49ce44d79e8804e1794ef9a8c52a7bff7224d1556e nspr-4.20.tar.gz
|
||||
sha256 c9e4b6cc24856ec93202fe13704b38b38ba219f0f2aeac93090ce2b6c696d430 nspr-4.22.tar.gz
|
||||
# Locally calculated
|
||||
sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBNSPR_VERSION = 4.20
|
||||
LIBNSPR_VERSION = 4.22
|
||||
LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
|
||||
LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src
|
||||
LIBNSPR_SUBDIR = nspr
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 6b3819159949ed7fc099e588e2e0669407135121 Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
Date: Tue, 10 Sep 2019 11:29:02 +0200
|
||||
Subject: [PATCH] Bug 1580126 - Fix build failure on aarch64_be while building
|
||||
freebl/gcm
|
||||
|
||||
Build failure is caused by different #ifdef conditions in gcm.c and
|
||||
gcm-aarch64.c that leads to double declaration of the same gcm_*
|
||||
functions.
|
||||
|
||||
Fix #ifdef condition in gcm-aarch64.c making it the same as the one in
|
||||
gcm.c.
|
||||
|
||||
[Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1580126]
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
nss/lib/freebl/gcm-aarch64.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nss/lib/freebl/gcm-aarch64.c b/nss/lib/freebl/gcm-aarch64.c
|
||||
index 65ea9fb5f..3f3c046d7 100644
|
||||
--- a/nss/lib/freebl/gcm-aarch64.c
|
||||
+++ b/nss/lib/freebl/gcm-aarch64.c
|
||||
@@ -9,7 +9,8 @@
|
||||
#include "secerr.h"
|
||||
|
||||
/* old gcc doesn't support some poly64x2_t intrinsic */
|
||||
-#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ > 6)
|
||||
+#if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
|
||||
+ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
|
||||
|
||||
#include <arm_neon.h>
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_42_1_RTM/src/SHA256SUMS
|
||||
sha256 087db37d38fd49dfd584dd2a8b5baa7fc88de7c9bd97c0c2d5be4abcafc61fc6 nss-3.42.1.tar.gz
|
||||
sha256 6b699649d285602ba258a4b0957cb841eafc94eff5735a9da8da0adbb9a10cef nss-3.46.tar.gz
|
||||
# Locally calculated
|
||||
sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBNSS_VERSION = 3.42.1
|
||||
LIBNSS_VERSION = 3.46
|
||||
LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
|
||||
LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src
|
||||
LIBNSS_DISTDIR = dist
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.openssl.org/source/openssl-1.1.1b.tar.gz.sha256
|
||||
sha256 f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90 openssl-1.1.1c.tar.gz
|
||||
# From https://www.openssl.org/source/openssl-1.1.1d.tar.gz.sha256
|
||||
sha256 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 openssl-1.1.1d.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBOPENSSL_VERSION = 1.1.1c
|
||||
LIBOPENSSL_VERSION = 1.1.1d
|
||||
LIBOPENSSL_SITE = https://www.openssl.org/source
|
||||
LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
|
||||
LIBOPENSSL_LICENSE = OpenSSL or SSLeay
|
||||
|
||||
@@ -305,12 +305,12 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "4.4.190" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.190" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.141" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.69" if BR2_KERNEL_HEADERS_4_19
|
||||
default "4.4.194" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.194" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.146" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.76" if BR2_KERNEL_HEADERS_4_19
|
||||
default "5.1.21" if BR2_KERNEL_HEADERS_5_1
|
||||
default "5.2.11" if BR2_KERNEL_HEADERS_5_2
|
||||
default "5.2.18" if BR2_KERNEL_HEADERS_5_2
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
|
||||
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
|
||||
|
||||
@@ -133,6 +133,7 @@ endef
|
||||
ifeq ($(BR2_KERNEL_HEADERS_VERSION)$(BR2_KERNEL_HEADERS_AS_KERNEL)$(BR2_KERNEL_HEADERS_CUSTOM_TARBALL)$(BR2_KERNEL_HEADERS_CUSTOM_GIT),y)
|
||||
define LINUX_HEADERS_CHECK_VERSION
|
||||
$(call check_kernel_headers_version,\
|
||||
$(BUILD_DIR),\
|
||||
$(STAGING_DIR),\
|
||||
$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)))
|
||||
endef
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 011b9e2c7dc785f702f960dc15b7871bd46e53a9a6e336299e4f3d22022986fd logrotate-3.15.0.tar.gz
|
||||
sha256 a7b20f5184c9598c36546f9200d3bd616d561478a0423ab8074e97a1cd7b1c25 logrotate-3.15.1.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LOGROTATE_VERSION = 3.15.0
|
||||
LOGROTATE_VERSION = 3.15.1
|
||||
LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION))
|
||||
LOGROTATE_LICENSE = GPL-2.0+
|
||||
LOGROTATE_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 0154af98e7302a172060d83d24b6d87557a822c39ba3e911461bb1a6d3a22d51 luksmeta-8.tar.bz2
|
||||
sha256 2ca0c35b551b331ba1444fc9d36e8c48ff8cae53dd4e6155b028e8904edc202a luksmeta-9.tar.bz2
|
||||
sha256 4b72eb6b5a336cd3ec837cc2d6347c23bf7574168db6b4802267700b93021abf COPYING
|
||||
|
||||
@@ -4,12 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LUKSMETA_VERSION = 8
|
||||
LUKSMETA_VERSION = 9
|
||||
LUKSMETA_SOURCE = luksmeta-$(LUKSMETA_VERSION).tar.bz2
|
||||
LUKSMETA_SITE = https://github.com/latchset/luksmeta/releases/download/v$(LUKSMETA_VERSION)
|
||||
LUKSMETA_LICENSE = LGPL-2.1+
|
||||
LUKSMETA_LICENSE_FILES = COPYING
|
||||
LUKSMETA_DEPENDENCIES = host-pkgconf cryptsetup
|
||||
LUKSMETA_CONF_ENV = ac_cv_prog_A2X=""
|
||||
LUKSMETA_INSTALL_STAGING = YES
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -3,6 +3,8 @@ From: Ryan Coe <bluemrp9@gmail.com>
|
||||
Date: Thu, 27 Oct 2016 20:33:21 -0700
|
||||
Subject: [PATCH] add extra check for librt
|
||||
|
||||
https://jira.mariadb.org/browse/MDEV-10841
|
||||
|
||||
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
|
||||
---
|
||||
configure.cmake | 3 +++
|
||||
|
||||
44
package/mariadb/0002-fix-build-error-with-newer-cmake.patch
Normal file
44
package/mariadb/0002-fix-build-error-with-newer-cmake.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
From c90ae2ca3dff267b9e21595376d22de397f6f78f Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Coe <bluemrp9@gmail.com>
|
||||
Date: Tue, 20 Aug 2019 06:22:43 -0700
|
||||
Subject: [PATCH] Fix build error with newer cmake
|
||||
|
||||
Fixes the following build error:
|
||||
|
||||
CMake Error at cmake/os/Linux.cmake:29 (STRING):
|
||||
STRING sub-command REPLACE requires at least four arguments.
|
||||
Call Stack (most recent call first):
|
||||
CMakeLists.txt:101 (INCLUDE)
|
||||
|
||||
CMake Error at cmake/os/Linux.cmake:29 (STRING):
|
||||
STRING sub-command REPLACE requires at least four arguments.
|
||||
Call Stack (most recent call first):
|
||||
CMakeLists.txt:101 (INCLUDE)
|
||||
|
||||
https://jira.mariadb.org/browse/MDEV-20596
|
||||
|
||||
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
|
||||
---
|
||||
cmake/os/Linux.cmake | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake
|
||||
index 50a2b21c838d8d6ca4cacc0704a9be4da3a57a0a..b871586acc9cfaddc3836cc9afafd85969120420 100644
|
||||
--- a/cmake/os/Linux.cmake
|
||||
+++ b/cmake/os/Linux.cmake
|
||||
@@ -26,9 +26,9 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE=1)
|
||||
|
||||
# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
|
||||
FOREACH(LANG C CXX)
|
||||
- STRING(REPLACE "-rdynamic" ""
|
||||
- CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS
|
||||
- ${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}
|
||||
+ STRING(REPLACE "-rdynamic" ""
|
||||
+ "CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS"
|
||||
+ "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}"
|
||||
)
|
||||
ENDFOREACH()
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# From https://downloads.mariadb.org/mariadb/10.3.16
|
||||
md5 11220d0b94c5c24caa2e1e9eaba38e31 mariadb-10.3.16.tar.gz
|
||||
sha1 6a4ee3be06f38b9aef1cd4f99099abea6a17de69 mariadb-10.3.16.tar.gz
|
||||
sha256 39e9723eaf620afd99b0925b2c2a5a50a89110ba50040adf14cce7cf89e5e21b mariadb-10.3.16.tar.gz
|
||||
sha512 b22a8c8fa0265f88962432ade71c3f0ec554f7d38042def832cfcb50f3aa1dd77a715c76706ffeae679b95438529b06e98b73b7e219f9c645980802027ec022f mariadb-10.3.16.tar.gz
|
||||
# From https://downloads.mariadb.org/mariadb/10.3.17
|
||||
md5 6bcee042bcc393cfcffeccbddbf6fe0e mariadb-10.3.17.tar.gz
|
||||
sha1 16edbd4762c8804118dda10de713cbddc675df5a mariadb-10.3.17.tar.gz
|
||||
sha256 20a1ea4fc59aae89dcc82aff0d4907b036daf9bfbd252f08162399f055097097 mariadb-10.3.17.tar.gz
|
||||
sha512 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e mariadb-10.3.17.tar.gz
|
||||
|
||||
# Hash for license files
|
||||
sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MARIADB_VERSION = 10.3.16
|
||||
MARIADB_VERSION = 10.3.17
|
||||
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
|
||||
MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
|
||||
# Tarball no longer contains LGPL license text
|
||||
@@ -86,7 +86,8 @@ MARIADB_CONF_OPTS += \
|
||||
-DMYSQL_DATADIR=/var/lib/mysql \
|
||||
-DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET)
|
||||
|
||||
HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF
|
||||
HOST_MARIADB_DEPENDENCIES = host-openssl
|
||||
HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system
|
||||
|
||||
# Some helpers must be compiled for host in order to crosscompile mariadb for
|
||||
# the target. They are then included by import_executables.cmake which is
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From 63f5b85e700677270197d176475be609187e9cdb Mon Sep 17 00:00:00 2001
|
||||
From: Aurelien Jarno <aurelien@aurel32.net>
|
||||
Date: Sat, 3 Nov 2018 00:46:06 +0100
|
||||
Subject: [PATCH] bn_mul.h: require at least ARMv6 to enable the ARM DSP code
|
||||
|
||||
Commit 16b1bd89326e "bn_mul.h: add ARM DSP optimized MULADDC code"
|
||||
added some ARM DSP instructions that was assumed to always be available
|
||||
when __ARM_FEATURE_DSP is defined to 1. Unfortunately it appears that
|
||||
the ARMv5TE architecture (GCC flag -march=armv5te) supports the DSP
|
||||
instructions, but only in Thumb mode and not in ARM mode, despite
|
||||
defining __ARM_FEATURE_DSP in both cases.
|
||||
|
||||
This patch fixes the build issue by requiring at least ARMv6 in addition
|
||||
to the DSP feature.
|
||||
|
||||
[Upstream status: https://github.com/ARMmbed/mbedtls/pull/2169]
|
||||
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
|
||||
---
|
||||
include/mbedtls/bn_mul.h | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h
|
||||
index 0af694c..565615f 100644
|
||||
--- a/include/mbedtls/bn_mul.h
|
||||
+++ b/include/mbedtls/bn_mul.h
|
||||
@@ -636,7 +636,8 @@
|
||||
"r6", "r7", "r8", "r9", "cc" \
|
||||
);
|
||||
|
||||
-#elif defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
|
||||
+#elif (__ARM_ARCH >= 6) && \
|
||||
+ defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
|
||||
|
||||
#define MULADDC_INIT \
|
||||
asm(
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.2-and-2.7.11-released
|
||||
sha1 ba809acfd4b41b86895b92e98d936695b5b62b73 mbedtls-2.16.2-apache.tgz
|
||||
sha256 a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4 mbedtls-2.16.2-apache.tgz
|
||||
# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.3-and-2.7.12-released
|
||||
sha1 dce8550f8f9465f3aea44cb7d0f9d0ba8140034a mbedtls-2.16.3-apache.tgz
|
||||
sha256 ec1bee6d82090ed6ea2690784ea4b294ab576a65d428da9fe8750f932d2da661 mbedtls-2.16.3-apache.tgz
|
||||
# Locally calculated
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
MBEDTLS_SITE = https://tls.mbed.org/code/releases
|
||||
MBEDTLS_VERSION = 2.16.2
|
||||
MBEDTLS_VERSION = 2.16.3
|
||||
MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz
|
||||
MBEDTLS_CONF_OPTS = \
|
||||
-DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 5db85f06b2a0b2ae393339a4aed1366928aaef2b46c7c32826fa87c3217dc6f7 mongodb-r4.0.6.tar.gz
|
||||
sha256 b39c5b7bb77a547804ab6f43f9b5f09add47574356b31512fd1cc641a08b4ea5 mongodb-r4.0.12.tar.gz
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt
|
||||
sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MONGODB_VERSION_BASE = 4.0.6
|
||||
MONGODB_VERSION_BASE = 4.0.12
|
||||
MONGODB_VERSION = r$(MONGODB_VERSION_BASE)
|
||||
MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION))
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking gpg signature
|
||||
sha256 a3d5822c249f6a6e13311b1b09eff6807ea01608a5a77934e1769842e9d146ef mosquitto-1.6.4.tar.gz
|
||||
sha256 bcd31a8fbbd053fee328986fadd8666d3058357ded56b9782f7d4f19931d178e mosquitto-1.6.7.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MOSQUITTO_VERSION = 1.6.4
|
||||
MOSQUITTO_VERSION = 1.6.7
|
||||
MOSQUITTO_SITE = https://mosquitto.org/files/source
|
||||
MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
|
||||
MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz
|
||||
# Locally computed
|
||||
sha256 3c7bc1dd475a5e5dcc7bdf13268a0313ff69e3765689444eb95b5893f61b3d1e README
|
||||
sha256 86106f0da1cf5ccfa0f0651665dd1b4515e8edad1c7972780155770548b317d9 COPYING
|
||||
|
||||
@@ -9,7 +9,7 @@ NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
|
||||
NCURSES_INSTALL_STAGING = YES
|
||||
NCURSES_DEPENDENCIES = host-ncurses
|
||||
NCURSES_LICENSE = MIT with advertising clause
|
||||
NCURSES_LICENSE_FILES = README
|
||||
NCURSES_LICENSE_FILES = COPYING
|
||||
NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config
|
||||
|
||||
NCURSES_CONF_OPTS = \
|
||||
|
||||
@@ -6,7 +6,7 @@ config BR2_PACKAGE_NFS_UTILS
|
||||
bool "nfs-utils"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc
|
||||
select BR2_PACKAGE_RPCBIND # runtime
|
||||
help
|
||||
The NFS Linux kernel server.
|
||||
|
||||
@@ -10,7 +10,7 @@ NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VE
|
||||
NFS_UTILS_LICENSE = GPL-2.0+
|
||||
NFS_UTILS_LICENSE_FILES = COPYING
|
||||
NFS_UTILS_AUTORECONF = YES
|
||||
NFS_UTILS_DEPENDENCIES = host-pkgconf
|
||||
NFS_UTILS_DEPENDENCIES = host-pkgconf libtirpc
|
||||
|
||||
NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
|
||||
|
||||
@@ -19,7 +19,8 @@ NFS_UTILS_CONF_OPTS = \
|
||||
--disable-nfsv41 \
|
||||
--disable-gss \
|
||||
--disable-uuid \
|
||||
--disable-ipv6 \
|
||||
--enable-tirpc \
|
||||
--enable-ipv6 \
|
||||
--without-tcp-wrappers \
|
||||
--with-statedir=/run/nfs \
|
||||
--with-rpcgen=internal
|
||||
@@ -51,13 +52,6 @@ else
|
||||
NFS_UTILS_CONF_OPTS += --disable-caps
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-tirpc
|
||||
NFS_UTILS_DEPENDENCIES += libtirpc
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-tirpc
|
||||
endif
|
||||
|
||||
define NFS_UTILS_INSTALL_FIXUP
|
||||
cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_)
|
||||
touch $(TARGET_DIR)/etc/exports
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user