diff --git a/Config.in.legacy b/Config.in.legacy index 0bacac2caf..a5f7288c4f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -142,6 +142,16 @@ comment "build, or run, in unpredictable ways. " comment "----------------------------------------------------" endif +############################################################################### +comment "Legacy options removed in 2017.08" + +config BR2_GCC_VERSION_4_8_X + bool "gcc 4.8.x support removed" + select BR2_LEGACY + help + Support for gcc version 4.8.x has been removed. The current + default version (5.x or later) has been selected instead. + ############################################################################### comment "Legacy options removed in 2017.05" diff --git a/DEVELOPERS b/DEVELOPERS index 4936b81bd6..303743c2a4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -365,6 +365,9 @@ F: package/policycoreutils/ F: package/sepolgen/ F: package/ustr/ +N: Corentin Guillevic +F: package/libloki/ + N: Cédric Chépied F: package/znc/ @@ -574,11 +577,14 @@ F: package/perl* F: package/pkg-perl.mk F: package/pkg-luarocks.mk F: package/qemu/ +F: package/sdl2_mixer/ +F: package/sdl2_net/ F: package/tekui/ F: support/scripts/scancpan N: Frank Hunleth F: package/am335x-pru-package/ +F: package/libconfuse/ F: package/libdmtx/ F: package/libsodium/ F: package/php-amqp/ @@ -858,6 +864,7 @@ F: package/python-libconfig/ N: Johan Oudinet F: package/ejabberd/ F: package/erlang-goldrush/ +F: package/erlang-jiffy/ F: package/erlang-lager/ F: package/erlang-p1-cache-tab/ F: package/erlang-p1-iconv/ @@ -867,6 +874,7 @@ F: package/erlang-p1-stun/ F: package/erlang-p1-tls/ F: package/erlang-p1-utils/ F: package/erlang-p1-xml/ +F: package/erlang-p1-xmpp/ F: package/erlang-p1-yaml/ F: package/erlang-p1-zlib/ F: package/nginx-dav-ext/ @@ -1034,6 +1042,7 @@ F: board/grinn/ F: configs/grinn_* F: package/argparse/ F: package/easydbus/ +F: package/luaossl/ F: package/rs485conf/ F: package/turbolua/ @@ -1503,6 +1512,8 @@ F: package/proxychains-ng/ F: package/yasm/ N: Stefan Sørensen +F: package/cracklib/ +F: package/libpwquality/ F: package/libscrypt/ N: Stephan Hoffmann diff --git a/board/lego/ev3/busybox.fragment b/board/lego/ev3/busybox.fragment new file mode 100644 index 0000000000..901274d316 --- /dev/null +++ b/board/lego/ev3/busybox.fragment @@ -0,0 +1,3 @@ +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=440 +CONFIG_FEATURE_BEEP_LENGTH_MS=250 diff --git a/board/lego/ev3/genimage.cfg b/board/lego/ev3/genimage.cfg index 6b8546cc7c..0ec580ca13 100644 --- a/board/lego/ev3/genimage.cfg +++ b/board/lego/ev3/genimage.cfg @@ -19,7 +19,7 @@ image flash.bin { size = 320K } partition uimage { - image = "uImage" + image = "uImage.da850-lego-ev3" size = 3M offset = 0x50000 } @@ -34,8 +34,8 @@ image flash.bin { image boot.vfat { vfat { - files = { - "uImage" + file uImage { + image = "uImage.da850-lego-ev3" } } size = 16M diff --git a/board/lego/ev3/linux.fragment b/board/lego/ev3/linux.fragment index 5593636798..439cccf78d 100644 --- a/board/lego/ev3/linux.fragment +++ b/board/lego/ev3/linux.fragment @@ -1,6 +1,55 @@ +CONFIG_ARCH_DAVINCI_DM644x=n +CONFIG_ARCH_DAVINCI_DM355=n +CONFIG_ARCH_DAVINCI_DM646x=n +CONFIG_ARCH_DAVINCI_DA830=n +CONFIG_ARCH_DAVINCI_DM365=n +CONFIG_MACH_SFFSDR=n +CONFIG_MACH_NEUROS_OSD2=n +CONFIG_MACH_DM355_LEOPARD=n +CONFIG_MACH_MITYOMAPL138=n +CONFIG_MACH_OMAPL138_HAWKBOARD=n +CONFIG_MACH_DAVINCI_DA850_EVM=n +CONFIG_ATA=n +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_UBI=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 CONFIG_BLK_DEV_RAM_SIZE=32768 +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_PWM_BEEPER=y +CONFIG_SPI_DAVINCI=y +CONFIG_PINCTRL_DA850_PUPD=y +CONFIG_V4L_PLATFORM_DRIVERS=n +CONFIG_SOUND=n +CONFIG_SND=n +CONFIG_SND_SOC=n +CONFIG_SND_EDMA_SOC=n +CONFIG_SND_DAVINCI_SOC_MCASP=n +CONFIG_SND_SOC_TLV320AIC3X=n +CONFIG_SND_SIMPLE_CARD=n +CONFIG_DAVINCI_WATCHDOG=y +CONFIG_USB=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_DAVINCI=y +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_DA8XX=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_GADGET=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGER_MTD=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_DRV_OMAP=y +CONFIG_IIO=y +CONFIG_TI_ADS7950=y +CONFIG_PWM_TIECAP=y +CONFIG_PWM_TIEHRPWM=y CONFIG_SQUASHFS=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y diff --git a/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch b/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch new file mode 100644 index 0000000000..dabda1e962 --- /dev/null +++ b/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch @@ -0,0 +1,56 @@ +From 8a81ff173c5c9a0ab1df84fab17971dbcce8490a Mon Sep 17 00:00:00 2001 +From: David Lechner +Date: Tue, 7 Feb 2017 13:22:07 -0600 +Subject: ARM: da850-lego-ev3: Add device tree node for A/DC + +This adds a node for the TI ADS7957 analog/digital converter on LEGO +MINDSTORMS EV3 as well as a regulator node that is used by the A/DC node. + +Signed-off-by: David Lechner +Signed-off-by: Sekhar Nori +--- + arch/arm/boot/dts/da850-lego-ev3.dts | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts +index 112ec92..0309537 100644 +--- a/arch/arm/boot/dts/da850-lego-ev3.dts ++++ b/arch/arm/boot/dts/da850-lego-ev3.dts +@@ -139,6 +139,19 @@ + enable-active-high; + regulator-boot-on; + }; ++ ++ /* ++ * This is a simple voltage divider on VCC5V to provide a 2.5V ++ * reference signal to the ADC. ++ */ ++ adc_ref: regulator2 { ++ compatible = "regulator-fixed"; ++ regulator-name = "adc ref"; ++ regulator-min-microvolt = <2500000>; ++ regulator-max-microvolt = <2500000>; ++ regulator-boot-on; ++ vin-supply = <&vcc5v>; ++ }; + }; + + &pmx_core { +@@ -293,6 +306,14 @@ + }; + }; + }; ++ ++ adc: adc@3 { ++ compatible = "ti,ads7957"; ++ reg = <3>; ++ #io-channel-cells = <1>; ++ spi-max-frequency = <10000000>; ++ vref-supply = <&adc_ref>; ++ }; + }; + + &gpio { +-- +cgit v1.1 + diff --git a/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch b/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch new file mode 100644 index 0000000000..a095222c2f --- /dev/null +++ b/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch @@ -0,0 +1,85 @@ +From 7723d70bebd749ef24fef19db52d827c7fd7f858 Mon Sep 17 00:00:00 2001 +From: David Lechner +Date: Tue, 7 Feb 2017 13:22:09 -0600 +Subject: ARM: da850-lego-ev3: Add device tree node for sound + +This adds a device tree node for sound on LEGO MINDSTORMS EV3. The EV3 +uses one of the SoC PWMs connected to an amplifier to create sound from +a speaker. + +The PWM is passed through a low-pass filter, so it is actually possible +to do PCM playback, but there is no existing driver, so just using +pwm-beeper for now, since it is also a compatible mode of operation. + +Signed-off-by: David Lechner +Signed-off-by: Sekhar Nori +--- + arch/arm/boot/dts/da850-lego-ev3.dts | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts +index 0309537..c20580a 100644 +--- a/arch/arm/boot/dts/da850-lego-ev3.dts ++++ b/arch/arm/boot/dts/da850-lego-ev3.dts +@@ -123,6 +123,14 @@ + pinctrl-0 = <&system_power_pin>; + }; + ++ sound { ++ compatible = "pwm-beeper"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ehrpwm0b_pins>; ++ pwms = <&ehrpwm0 1 1000000 0>; ++ amp-supply = <&>; ++ }; ++ + /* + * This is a 5V current limiting regulator that is shared by USB, + * the sensor (input) ports, the motor (output) ports and the A/DC. +@@ -152,6 +160,18 @@ + regulator-boot-on; + vin-supply = <&vcc5v>; + }; ++ ++ /* ++ * This is the amplifier for the speaker. ++ */ ++ amp: regulator3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&_pins>; ++ compatible = "regulator-fixed"; ++ regulator-name = "amp"; ++ gpio = <&gpio 111 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; + }; + + &pmx_core { +@@ -208,6 +228,13 @@ + 0x4c 0x00008000 0x0000f000 + >; + }; ++ ++ amp_pins: pinmux_amp_pins { ++ pinctrl-single,bits = < ++ /* GP6[15] */ ++ 0x34 0x00000008 0x0000000f ++ >; ++ }; + }; + + &pinconf { +@@ -316,6 +343,10 @@ + }; + }; + ++&ehrpwm0 { ++ status = "okay"; ++}; ++ + &gpio { + status = "okay"; + }; +-- +cgit v1.1 + diff --git a/board/lego/ev3/readme.txt b/board/lego/ev3/readme.txt index c40907c69d..8df91ac111 100644 --- a/board/lego/ev3/readme.txt +++ b/board/lego/ev3/readme.txt @@ -13,12 +13,6 @@ See: - http://www.lego.com/en-us/mindstorms/products/ev3/31313-mindstorms-ev3/ - http://www.ti.com/product/am1808 -The buildroot configuration uses the Linux kernel of the ev3dev project. -See: -- https://github.com/ev3dev/ev3-kernel/ -- https://github.com/ev3dev/lego-linux-drivers/ -- http://www.ev3dev.org/ - How it works ============ @@ -65,7 +59,8 @@ After building, you should obtain this tree: ├── rootfs.squashfs ├── sdcard.img ├── u-boot.bin - └── uImage + ├── uImage -> uImage.da850-lego-ev3 + └── uImage.da850-lego-ev3 Installation ============ diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 004f9c0ff0..547822d0a9 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -38,7 +38,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2017.03" + bool "2017.05" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -86,7 +86,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2017.03" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2017.05" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 9606d9f41e..e11d92ff15 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f u-boot-2017.03.tar.bz2 +sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2 diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index b74ffbce5c..611b694137 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="adde2ca9f86797071f6e7b2b9e779fa5e4a8f3cd" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f9f6f0db2d5e4f9d2ff46eb31a5a05276a92ed7d" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk" diff --git a/configs/imx6q-sabresd_defconfig b/configs/imx6q-sabresd_defconfig index cc37ecf2ae..b26dc2a028 100644 --- a/configs/imx6q-sabresd_defconfig +++ b/configs/imx6q-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index 543a227493..dea84d90d0 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -2,26 +2,32 @@ BR2_arm=y BR2_arm926t=y +# Build options +BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches" + # system BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh" -# Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +# Linux headers same as kernel, a 4.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ev3dev/ev3dev-kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.4.19-15-ev3dev-ev3_1" -BR2_LINUX_KERNEL_DEFCONFIG="ev3dev" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" +BR2_LINUX_KERNEL_DEFCONFIG="davinci_all" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xc0008000" +BR2_LINUX_KERNEL_APPENDED_UIMAGE=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="da850-lego-ev3" + +# Target packages +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/lego/ev3/busybox.fragment" # filesystem BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_3=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y # BR2_TARGET_ROOTFS_TAR is not set @@ -30,7 +36,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3" # host diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index fb82714e9b..e736e48068 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -17,13 +17,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -37,7 +37,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.03" BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 925ba9c451..bc3216389c 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -1,14 +1,14 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-one/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index a3a5700f46..104c2f66f6 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -1,14 +1,14 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-pc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/package/Config.in b/package/Config.in index 43d75a9c78..497cac8b74 100644 --- a/package/Config.in +++ b/package/Config.in @@ -281,6 +281,8 @@ comment "Graphic libraries" source "package/sdl2/Config.in" source "package/sdl2_gfx/Config.in" source "package/sdl2_image/Config.in" + source "package/sdl2_mixer/Config.in" + source "package/sdl2_net/Config.in" source "package/sdl2_ttf/Config.in" comment "Other GUIs" @@ -509,6 +511,7 @@ menu "Interpreter languages and scripting" if BR2_PACKAGE_ERLANG menu "Erlang libraries/modules" source "package/erlang-goldrush/Config.in" + source "package/erlang-jiffy/Config.in" source "package/erlang-lager/Config.in" source "package/erlang-p1-cache-tab/Config.in" source "package/erlang-p1-iconv/Config.in" @@ -518,6 +521,7 @@ menu "Erlang libraries/modules" source "package/erlang-p1-tls/Config.in" source "package/erlang-p1-utils/Config.in" source "package/erlang-p1-xml/Config.in" + source "package/erlang-p1-xmpp/Config.in" source "package/erlang-p1-yaml/Config.in" source "package/erlang-p1-zlib/Config.in" endmenu @@ -562,6 +566,7 @@ menu "Lua libraries/modules" source "package/lua-messagepack/Config.in" source "package/lua-msgpack-native/Config.in" source "package/lua-periphery/Config.in" + source "package/lua-sdl2/Config.in" source "package/lua-testmore/Config.in" source "package/luabitop/Config.in" source "package/luacrypto/Config.in" @@ -570,6 +575,7 @@ menu "Lua libraries/modules" source "package/luafilesystem/Config.in" source "package/luajson/Config.in" source "package/lualogging/Config.in" + source "package/luaossl/Config.in" source "package/luaposix/Config.in" source "package/lua-resty-http/Config.in" source "package/luasec/Config.in" @@ -1348,6 +1354,7 @@ menu "Other" source "package/clapack/Config.in" source "package/classpath/Config.in" source "package/cppcms/Config.in" + source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" source "package/eigen/Config.in" @@ -1384,6 +1391,7 @@ menu "Other" source "package/libical/Config.in" source "package/libite/Config.in" source "package/liblinear/Config.in" + source "package/libloki/Config.in" source "package/libnpth/Config.in" source "package/libnspr/Config.in" source "package/libpfm4/Config.in" @@ -1391,6 +1399,7 @@ menu "Other" source "package/libplist/Config.in" source "package/libpthread-stubs/Config.in" source "package/libpthsem/Config.in" + source "package/libpwquality/Config.in" source "package/libseccomp/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" diff --git a/package/a10disp/Config.in b/package/a10disp/Config.in index 18e2d8fcf0..99ae0aad6f 100644 --- a/package/a10disp/Config.in +++ b/package/a10disp/Config.in @@ -3,8 +3,8 @@ config BR2_PACKAGE_A10DISP depends on BR2_arm depends on BR2_LINUX_KERNEL help - Program to change the display mode of Allwinner ARM SOCs running - the linux-sunxi kernel (and not the mainline kernel.) + Program to change the display mode of Allwinner ARM SOCs + running the linux-sunxi kernel (and not the mainline kernel.) http://github.com/hglm/a10disp diff --git a/package/acpid/Config.in b/package/acpid/Config.in index 5aec7f13c8..2bd83ea8b9 100644 --- a/package/acpid/Config.in +++ b/package/acpid/Config.in @@ -4,7 +4,8 @@ config BR2_PACKAGE_ACPID help Advanced Configuration and Power Interface event daemon. - Acpid is designed to notify user-space programs of ACPI events, - and allows you to configure specific actions for specific events. + Acpid is designed to notify user-space programs of ACPI + events, and allows you to configure specific actions for + specific events. http://sourceforge.net/projects/acpid2/ diff --git a/package/aespipe/Config.in b/package/aespipe/Config.in index df99523be2..2c2ff5cd8c 100644 --- a/package/aespipe/Config.in +++ b/package/aespipe/Config.in @@ -2,9 +2,10 @@ config BR2_PACKAGE_AESPIPE bool "aespipe" depends on BR2_USE_MMU # fork() help - aespipe program is AES encrypting or decrypting pipe. It reads from - standard input and writes to standard output. It can be used to - create and restore encrypted tar or cpio archives. It can be used to - encrypt and decrypt loop-AES compatible encrypted disk images. + aespipe program is AES encrypting or decrypting pipe. It reads + from standard input and writes to standard output. It can be + used to create and restore encrypted tar or cpio archives. + It can be used to encrypt and decrypt loop-AES compatible + encrypted disk images. http://koti.tnnet.fi/jari.ruusu/linux/ diff --git a/package/alsa-lib/0005-remove-powerpc64-workaround.patch b/package/alsa-lib/0005-remove-powerpc64-workaround.patch deleted file mode 100644 index 57a369e0e3..0000000000 --- a/package/alsa-lib/0005-remove-powerpc64-workaround.patch +++ /dev/null @@ -1,67 +0,0 @@ -Linking currently fails on powerpc64 and powerpc64le when configured -with --without-versioned, as follows: -../src/.libs/libasound.so: undefined reference to `.__snd_pcm_hw_params_set_format_first' -(And many similar messages.) - -This appears to be due to a very old (2003) workaround for powerpc64, -(introduced by commit 06221f86) in include/alsa-symbols.h which alters -symbol names. While it was probably necessary at the time, it does not -appear to be necessary now and removing it fixes the build. - -Signed-off-by: Sam Bobroff ---- - include/alsa-symbols.h | 25 ++++--------------------- - 1 file changed, 4 insertions(+), 21 deletions(-) - -diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h -index 51cb982..0cb0b9f 100644 ---- a/include/alsa-symbols.h -+++ b/include/alsa-symbols.h -@@ -29,19 +29,10 @@ - #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post - #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name) - --#ifdef __powerpc64__ --# define symbol_version(real, name, version) \ -- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version); \ -- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version) --# define default_symbol_version(real, name, version) \ -- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version); \ -- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version) --#else --# define symbol_version(real, name, version) \ -- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version) --# define default_symbol_version(real, name, version) \ -- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version) --#endif -+#define symbol_version(real, name, version) \ -+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version) -+#define default_symbol_version(real, name, version) \ -+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version) - - #ifdef USE_VERSIONED_SYMBOLS - #define use_symbol_version(real, name, version) \ -@@ -50,13 +41,6 @@ - default_symbol_version(real, name, version) - #else - #define use_symbol_version(real, name, version) /* nothing */ --#ifdef __powerpc64__ --#define use_default_symbol_version(real, name, version) \ -- __asm__ (".weak " ASM_NAME(#name)); \ -- __asm__ (".weak ." ASM_NAME(#name)); \ -- __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)); \ -- __asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real)) --#else - #if defined(__alpha__) || defined(__mips__) - #define use_default_symbol_version(real, name, version) \ - __asm__ (".weak " ASM_NAME(#name)); \ -@@ -67,6 +51,5 @@ - __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)) - #endif - #endif --#endif - - #endif /* __ALSA_SYMBOLS_H */ --- -2.10.0.297.gf6727b0 - diff --git a/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch b/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch deleted file mode 100644 index b47dedb3a9..0000000000 --- a/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 13a796b4bd00defa9f9297fd23d508b430682aed Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 21 Dec 2016 19:41:26 -0300 -Subject: [PATCH] ucm: parser needs limits.h - -It's using PATH_MAX which is defined there, otherwise the build fails on -musl libc. - -Signed-off-by: Gustavo Zacarias ---- -Patch status: sent to alsa-devel ML. - - src/ucm/parser.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ucm/parser.c b/src/ucm/parser.c -index c98373a..f520abc 100644 ---- a/src/ucm/parser.c -+++ b/src/ucm/parser.c -@@ -32,6 +32,7 @@ - - #include "ucm_local.h" - #include -+#include - - /** The name of the environment variable containing the UCM directory */ - #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" --- -2.10.2 - diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index c355b2c023..995d379167 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -13,8 +13,8 @@ menuconfig BR2_PACKAGE_ALSA_LIB # is fixed select BR2_PACKAGE_ALSA_LIB_PCM help - The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI - functionality to the Linux operating system. + The Advanced Linux Sound Architecture (ALSA) provides audio + and MIDI functionality to the Linux operating system. http://www.alsa-project.org/ diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 6f56a76796..bcfadce202 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c alsa-lib-1.1.3.tar.bz2 +sha256 82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515 alsa-lib-1.1.4.tar.bz2 diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 8651653577..049c28fc41 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.1.3 +ALSA_LIB_VERSION = 1.1.4 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 1add17e08b..538990bded 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c alsa-utils-1.1.3.tar.bz2 +sha256 a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d alsa-utils-1.1.4.tar.bz2 diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 847a97f649..f0b964aff7 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.1.3 +ALSA_UTILS_VERSION = 1.1.4 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 diff --git a/package/apache/Config.in b/package/apache/Config.in index 5916d307a8..693ee20a1b 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -6,11 +6,12 @@ config BR2_PACKAGE_APACHE select BR2_PACKAGE_APR_UTIL select BR2_PACKAGE_PCRE help - The Apache HTTP Server Project is an effort to develop and maintain an - open-source HTTP server for modern operating systems including UNIX - and Windows NT. The goal of this project is to provide a secure, - efficient and extensible server that provides HTTP services in sync - with the current HTTP standards. + The Apache HTTP Server Project is an effort to develop and + maintain an open-source HTTP server for modern operating + systems including UNIX and Windows NT. The goal of this + project is to provide a secure, efficient and extensible + server that provides HTTP services in sync with the current + HTTP standards. http://httpd.apache.org diff --git a/package/apitrace/Config.in b/package/apitrace/Config.in index 7fdd35af3e..b622823c29 100644 --- a/package/apitrace/Config.in +++ b/package/apitrace/Config.in @@ -1,13 +1,13 @@ -comment "apitrace needs a glibc toolchain w/ C++, gcc >= 4.6" +comment "apitrace needs a glibc toolchain w/ C++, gcc >= 4.9" depends on BR2_PACKAGE_XORG7 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_APITRACE bool "apitrace" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC # uses glibc specific __libc_dlsym - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_LIBPNG diff --git a/package/apitrace/apitrace.hash b/package/apitrace/apitrace.hash index eac470b03d..1daaa46e84 100644 --- a/package/apitrace/apitrace.hash +++ b/package/apitrace/apitrace.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 21d0cc765b84e537c5a3a117073818942653b85685b9633d364836ccfe0b9fd5 apitrace-7.0.tar.gz +sha256 0aae8902696ad23ba91d61c57007861a3f6e3c2d4f0f43b783b4b7a58e3f9172 apitrace-15d7f975f9688372467ebd63d2a57d3957823f93.tar.gz diff --git a/package/apitrace/apitrace.mk b/package/apitrace/apitrace.mk index fbd957c617..c66f6b3e38 100644 --- a/package/apitrace/apitrace.mk +++ b/package/apitrace/apitrace.mk @@ -4,7 +4,7 @@ # ################################################################################ -APITRACE_VERSION = 7.0 +APITRACE_VERSION = 15d7f975f9688372467ebd63d2a57d3957823f93 APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION)) APITRACE_LICENSE = MIT APITRACE_LICENSE_FILES = LICENSE diff --git a/package/apr/0001-cross-compile.patch b/package/apr/0001-cross-compile.patch index 5b596fb20f..559ebb74ba 100644 --- a/package/apr/0001-cross-compile.patch +++ b/package/apr/0001-cross-compile.patch @@ -42,10 +42,10 @@ diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in # get substituted into some targets APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ -@@ -134,8 +136,13 @@ +@@ -134,8 +134,13 @@ + $(APR_MKDIR) tools + $(LT_COMPILE) - OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) - tools/gen_test_char.lo: make_tools_dir +ifdef CC_FOR_BUILD +tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS) + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< diff --git a/package/apr/Config.in b/package/apr/Config.in index 5757272450..67de925474 100644 --- a/package/apr/Config.in +++ b/package/apr/Config.in @@ -4,9 +4,10 @@ config BR2_PACKAGE_APR depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() in apr_proc_fork() help - The mission of the Apache Portable Runtime (APR) project is to create - and maintain software libraries that provide a predictable and - consistent interface to underlying platform-specific implementations + The mission of the Apache Portable Runtime (APR) project is to + create and maintain software libraries that provide a + predictable and consistent interface to underlying + platform-specific implementations http://apr.apache.org/ diff --git a/package/apr/apr.hash b/package/apr/apr.hash index 50d657a8cb..917ce56272 100644 --- a/package/apr/apr.hash +++ b/package/apr/apr.hash @@ -1,2 +1,2 @@ -# From http://archive.apache.org/dist/apr/apr-1.5.1.tar.gz.sha1 -sha1 9caa83e3f50f3abc9fab7c4a3f2739a12b14c3a3 apr-1.5.1.tar.gz +# From http://archive.apache.org/dist/apr/apr-1.5.2.tar.bz2.sha1 +sha1 6d757fcf7c687fc300c1066076f2e8380ff8cbc0 apr-1.5.2.tar.bz2 diff --git a/package/apr/apr.mk b/package/apr/apr.mk index f09f94368c..4a97f7e65e 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -4,7 +4,8 @@ # ################################################################################ -APR_VERSION = 1.5.1 +APR_VERSION = 1.5.2 +APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = http://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0 APR_LICENSE_FILES = LICENSE diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 93020f7238..41c1bb348b 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -8,9 +8,10 @@ config BR2_PACKAGE_ASSIMP select BR2_PACKAGE_ZLIB help Open Asset Import Library (assimp) is a portable Open Source - library to import various well-known 3D model formats in a uniform - manner. The most recent version also knows how to export 3d files - and is therefore suitable as a general-purpose 3D model converter. + library to import various well-known 3D model formats in a + uniform manner. The most recent version also knows how to + export 3d files and is therefore suitable as a general-purpose + 3D model converter. http://www.assimp.org diff --git a/package/aubio/Config.in b/package/aubio/Config.in index c4c60db2f3..18e7c4cc22 100644 --- a/package/aubio/Config.in +++ b/package/aubio/Config.in @@ -3,10 +3,10 @@ config BR2_PACKAGE_AUBIO depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS help - aubio is a tool designed for the extraction of annotations from - audio signals. Its features include segmenting a sound file - before each of its attacks, performing pitch detection, tapping - the beat and producing midi streams from live audio. + aubio is a tool designed for the extraction of annotations + from audio signals. Its features include segmenting a sound + file before each of its attacks, performing pitch detection, + tapping the beat and producing midi streams from live audio. Because these tasks are difficult, we thought it was important to gather them in a dedicated library. To increase the fun, we diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 2ae8f99bb7..7dd3e55aa7 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,2 +1,2 @@ #Locally computed -sha256 0441790794fd9375dbca598fa0ffb46c57ff37b3a24b94ffec0bbee3215cca09 audit-2.7.1.tar.gz +sha256 fa65289cffdc95a25bfbdba541f43ee1b12c707090a38fd027dcf9354b9014e7 audit-2.7.6.tar.gz diff --git a/package/audit/audit.mk b/package/audit/audit.mk index b94d0bf244..95b60780ae 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 2.7.1 +AUDIT_VERSION = 2.7.6 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), unclear (libraries) AUDIT_LICENSE_FILES = COPYING diff --git a/package/aufs-util/Config.in b/package/aufs-util/Config.in index 93999fb606..89b1f422e0 100644 --- a/package/aufs-util/Config.in +++ b/package/aufs-util/Config.in @@ -28,7 +28,8 @@ config BR2_PACKAGE_AUFS_UTIL_VERSION Usually, the sha1 of the cset you want to use; avoid using a branch name as this yields non-reproducible builds. - See the following resources to see what versions are available: + See the following resources to see what versions are + available: https://sourceforge.net/p/aufs/aufs-util/ci/master/tree/ diff --git a/package/augeas/augeas.hash b/package/augeas/augeas.hash index 04fbcba3ed..797bddbb6b 100644 --- a/package/augeas/augeas.hash +++ b/package/augeas/augeas.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763 augeas-1.7.0.tar.gz -sha256 12a987e78166032b59d816aced96c97813cb109108e7c2336cb8ae369c32e2bf 05a27f4e374e9f0dc2cda6301b52d2a6b109b2e8.patch +sha256 515ce904138d99ff51d45ba7ed0d809bdee6c42d3bc538c8c820e010392d4cc5 augeas-1.8.0.tar.gz diff --git a/package/augeas/augeas.mk b/package/augeas/augeas.mk index 4c855a3561..1c1461e369 100644 --- a/package/augeas/augeas.mk +++ b/package/augeas/augeas.mk @@ -4,16 +4,13 @@ # ################################################################################ -AUGEAS_VERSION = 1.7.0 +AUGEAS_VERSION = 1.8.0 AUGEAS_SITE = http://download.augeas.net AUGEAS_INSTALL_STAGING = YES AUGEAS_LICENSE = LGPL-2.1+ AUGEAS_LICENSE_FILES = COPYING AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2 -# Fetch upstream patch to fix static linking -AUGEAS_PATCH = https://github.com/hercules-team/augeas/commit/05a27f4e374e9f0dc2cda6301b52d2a6b109b2e8.patch - AUGEAS_CONF_OPTS = --disable-gnulib-tests # Remove the test lenses which occupy about 1.4 MB on the target diff --git a/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch b/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch index 6d345d3468..c0efeb3359 100644 --- a/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch +++ b/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch @@ -17,6 +17,8 @@ fi Remove the [] on the third part of AS_IF. Signed-off-by: Romain Naour +(rebased against version 2017.03.21) +Signed-off-by: Bernd Kuhls --- m4/ax_tls.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -29,8 +31,8 @@ index 809b761..2135dd2 100644 # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. --#serial 11 -+#serial 12 +-#serial 13 ++#serial 14 AC_DEFUN([AX_TLS], [ AC_MSG_CHECKING([for thread local storage (TLS) class]) diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash index 6982a4dd67..2c537b33a2 100644 --- a/package/autoconf-archive/autoconf-archive.hash +++ b/package/autoconf-archive/autoconf-archive.hash @@ -1,2 +1,2 @@ # Computed locally -sha256 88fb2efff640eddd28a52ae550ff5561bca3bd2bba09e1d7b0580e719875e437 autoconf-archive-2016.03.20.tar.xz +sha256 386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765 autoconf-archive-2017.03.21.tar.xz diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk index 053ea33fa9..6a7ac4da38 100644 --- a/package/autoconf-archive/autoconf-archive.mk +++ b/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2016.03.20 +AUTOCONF_ARCHIVE_VERSION = 2017.03.21 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception diff --git a/package/autossh/Config.in b/package/autossh/Config.in index 6d1a0853ed..351e23ff09 100644 --- a/package/autossh/Config.in +++ b/package/autossh/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_AUTOSSH depends on BR2_PACKAGE_DROPBEAR || BR2_PACKAGE_OPENSSH help autossh is a program to start a copy of ssh and monitor it, - restarting it as necessary should it die or stop passing traffic. + restarting it as necessary should it die or stop passing + traffic. http://www.harding.motd.ca/autossh/ diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index b2c6125908..b203d4d100 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b32128f4812d5e852cfba2e863d950ec30e0f72f09bc14fb41c02528bbc5dd18 avrdude-ad04c429a90f4c34f000ea4ae11db2705915a31f.tar.gz +sha256 cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index f914ed7e56..0e34076e38 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,7 +4,7 @@ # ################################################################################ -AVRDUDE_VERSION = ad04c429a90f4c34f000ea4ae11db2705915a31f +AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ AVRDUDE_LICENSE_FILES = avrdude/COPYING @@ -12,6 +12,7 @@ AVRDUDE_SUBDIR = avrdude # Sources coming from git, without generated configure and Makefile.in # files. AVRDUDE_AUTORECONF = YES +AVRDUDE_CONF_OPTS = --enable-linuxgpio AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ host-flex host-bison AVRDUDE_LICENSE = GPL-2.0+ diff --git a/package/babeld/Config.in b/package/babeld/Config.in index 5d08c0842a..c7010e1fb1 100644 --- a/package/babeld/Config.in +++ b/package/babeld/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_BABELD bool "babeld" depends on BR2_USE_MMU # fork() help - Babel is a loop-avoiding distance-vector routing protocol for IPv6 - and IPv4 with fast convergence properties. + Babel is a loop-avoiding distance-vector routing protocol for + IPv6 and IPv4 with fast convergence properties. http://www.pps.univ-paris-diderot.fr/~jch/software/babel/ diff --git a/package/batctl/batctl.hash b/package/batctl/batctl.hash index 5920ff09db..257e1ff207 100644 --- a/package/batctl/batctl.hash +++ b/package/batctl/batctl.hash @@ -1,4 +1,4 @@ -# http://downloads.open-mesh.org/batman/releases/batman-adv-2016.1/batctl-2016.1.tar.gz.sha1 -sha1 72b974bde707594e2cf0cc122d7d7da0f1f65160 batctl-2016.1.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2017.0/batctl-2017.0.tar.gz.sha1 +sha1 0fbc329b56b465fa4f674cfecd7348144609f8e5 batctl-2017.0.tar.gz # Locally calculated -sha256 c854397b2ddd2cb8d15d1e65839819380648ccb37507d0303e133011fe6f03c9 batctl-2016.1.tar.gz +sha256 c0bb1127d6070b46abeb8d6a63d1150d71fa85f87f9a846873b649a21934c686 batctl-2017.0.tar.gz diff --git a/package/batctl/batctl.mk b/package/batctl/batctl.mk index 73d4598df1..122263e460 100644 --- a/package/batctl/batctl.mk +++ b/package/batctl/batctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATCTL_VERSION = 2016.1 +BATCTL_VERSION = 2017.0 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_LICENSE = GPL-2.0 BATCTL_DEPENDENCIES = libnl host-pkgconf diff --git a/package/batman-adv/Config.in b/package/batman-adv/Config.in index fbef0d8d6b..9d3d7967b9 100644 --- a/package/batman-adv/Config.in +++ b/package/batman-adv/Config.in @@ -28,7 +28,8 @@ config BR2_PACKAGE_BATMAN_ADV_BATMAN_V bool "enable B.A.T.M.A.N. V protocol (experimental)" help Enables B.A.T.M.A.N. V network protocol. - This is the next-gen protocol and is experimental at this time. + This is the next-gen protocol and is experimental at this + time. https://www.open-mesh.org/projects/batman-adv/wiki/BATMAN_V diff --git a/package/bc/Config.in b/package/bc/Config.in index a28978d2e5..54c4422f7c 100644 --- a/package/bc/Config.in +++ b/package/bc/Config.in @@ -6,9 +6,10 @@ config BR2_PACKAGE_BC areas. It supports interactive execution of statements. 'Bc' is a utility included in the POSIX P1003.2/D11 draft standard. This version does not use the historical method of having bc - be a compiler for the dc calculator (the POSIX document doesn't - specify how bc must be implemented). This version has a single - executable that both compiles the language and runs the resulting - 'byte code.' The byte code is not the dc language. + be a compiler for the dc calculator (the POSIX document + doesn't specify how bc must be implemented). + This version has a single executable that both compiles the + language and runs the resulting 'byte code.' The byte code is + not the dc language. http://www.gnu.org/software/bc diff --git a/package/bcache-tools/Config.in b/package/bcache-tools/Config.in index 7e6319bce7..c8e3f6d1bf 100644 --- a/package/bcache-tools/Config.in +++ b/package/bcache-tools/Config.in @@ -7,13 +7,14 @@ config BR2_PACKAGE_BCACHE_TOOLS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID help Bcache is a Linux kernel block layer cache. It allows one or - more fast disk drives such as flash-based solid state drives (SSDs) - to act as a cache for one or more slower hard disk drives. + more fast disk drives such as flash-based solid state drives + (SSDs) to act as a cache for one or more slower hard disk + drives. http://bcache.evilpiepirate.org/ - This is the user space bcache tools, required to setup the linux - bcache feature of the Linux kernel. + This is the user space bcache tools, required to setup the + linux bcache feature of the Linux kernel. comment "bcache-tools needs udev /dev management" depends on BR2_USE_MMU diff --git a/package/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch b/package/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch deleted file mode 100644 index 40c9063103..0000000000 --- a/package/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c887470e0e3310c81ecdb7e736bc5d2ead45db2a Mon Sep 17 00:00:00 2001 -From: Ivan Maidanski -Date: Mon, 6 Apr 2015 20:06:47 +0300 -Subject: [PATCH 1/1] Do not include sigcontext.h and asm/sigcontext.h (these - Linux headers define sigcontext which is no longer used as replaced with - ucontext_t in GC 7.0alpha1) - -* os_dep.c: Do not include linux/version.h (do not test -LINUX_VERSION_CODE), asm/signal.h, sigcontext.h, asm/sigcontext.h -since struct sigcontext not used in GC v7+. - -Signed-off-by: Brendan Heading -Upstream-status: backport ---- - os_dep.c | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -diff --git a/os_dep.c b/os_dep.c -index f62d4ed..a1bafbd 100644 ---- a/os_dep.c -+++ b/os_dep.c -@@ -16,36 +16,6 @@ - - #include "private/gc_priv.h" - --#if defined(LINUX) && !defined(POWERPC) && !defined(NO_SIGCONTEXT_H) --# include --# if (LINUX_VERSION_CODE <= 0x10400) -- /* Ugly hack to get struct sigcontext_struct definition. Required */ -- /* for some early 1.3.X releases. Will hopefully go away soon. */ -- /* in some later Linux releases, asm/sigcontext.h may have to */ -- /* be included instead. */ --# define __KERNEL__ --# include --# undef __KERNEL__ --# else -- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ -- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ -- /* prototypes, so we have to include the top-level sigcontext.h to */ -- /* make sure the former gets defined to be the latter if appropriate. */ --# include --# if 2 <= __GLIBC__ --# if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ -- /* glibc 2.1 no longer has sigcontext.h. But signal.h */ -- /* has the right declaration for glibc 2.1. */ --# include --# endif /* 0 == __GLIBC_MINOR__ */ --# else /* __GLIBC__ < 2 */ -- /* libc5 doesn't have : go directly with the kernel */ -- /* one. Check LINUX_VERSION_CODE to see which we should reference. */ --# include --# endif /* __GLIBC__ < 2 */ --# endif --#endif /* LINUX && !POWERPC */ -- - #if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) \ - && !defined(MSWINCE) && !defined(__CC_ARM) - # include --- -2.4.3 - diff --git a/package/bdwgc/0002-Fix-uClibc-build.patch b/package/bdwgc/0002-Fix-uClibc-build.patch new file mode 100644 index 0000000000..55896eb199 --- /dev/null +++ b/package/bdwgc/0002-Fix-uClibc-build.patch @@ -0,0 +1,42 @@ +From 8d3caf00db5d71ec19f03fbf96cecf6f70b4e868 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 28 May 2017 20:21:09 +0200 +Subject: [PATCH] Fix uClibc build + +uClibc defines __GLIBC__ but does not contain libc-version.h leading to +a build error: + +./include/private/gcconfig.h:1426:72: fatal error: gnu/libc-version.h: No such file or directory + +Patch sent upstream: https://github.com/ivmai/bdwgc/pull/164 + +Signed-off-by: Bernd Kuhls +--- + include/private/gcconfig.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h +index d7912e9e..bf17dd63 100644 +--- a/include/private/gcconfig.h ++++ b/include/private/gcconfig.h +@@ -1442,7 +1442,7 @@ + # define GC_PREFETCH_FOR_WRITE(x) \ + __asm__ __volatile__ ("prefetchw %0" : : "m"(*(char *)(x))) + # endif +-# if defined(__GLIBC__) ++# if defined(__GLIBC__) && !defined(__UCLIBC__) + /* Workaround lock elision implementation for some glibc. */ + # define GLIBC_2_19_TSX_BUG + # include /* for gnu_get_libc_version() */ +@@ -2455,7 +2455,7 @@ + /* FIXME: This seems to be fixed in GLibc v2.14. */ + # define GETCONTEXT_FPU_EXCMASK_BUG + # endif +-# if defined(__GLIBC__) ++# if defined(__GLIBC__) && !defined(__UCLIBC__) + /* Workaround lock elision implementation for some glibc. */ + # define GLIBC_2_19_TSX_BUG + # include /* for gnu_get_libc_version() */ +-- +2.11.0 + diff --git a/package/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch b/package/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch deleted file mode 100644 index 03af6a3990..0000000000 --- a/package/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch +++ /dev/null @@ -1,424 +0,0 @@ -Signed-off-by: Waldemar Brodkorb - -From 5e756d4d8df2949cb3b6e51532d3016cbb276fd7 Mon Sep 17 00:00:00 2001 -From: Ivan Maidanski -Date: Fri, 27 Feb 2015 21:32:22 +0300 -Subject: [PATCH 004/135] Revert "Move asm machine-dependent files to 'src' - folder" (partly) - -Asm files moved back to base folder to avoid build issues (reported -for NetBSD and Solaris on Sparc). Alternative way is to adjust -configure.ac and Makefile.am properly but it requires more efforts -(including testing). - -* Makefile.am (EXTRA_libgc_la_SOURCES): Remove "src/" prefix. -* Makefile.direct (SRCS, mach_dep.o): Likewise. -* src/ia64_save_regs_in_stack.s: Move to base folder. -* src/sparc_mach_dep.S: Likewise. -* src/sparc_netbsd_mach_dep.s: Likewise. -* src/sparc_sunos4_mach_dep.s: Likewise. - ---- - Makefile.am | 4 +-- - Makefile.direct | 20 +++++++------- - ia64_save_regs_in_stack.s | 11 ++++++++ - sparc_mach_dep.S | 61 +++++++++++++++++++++++++++++++++++++++++ - sparc_netbsd_mach_dep.s | 34 +++++++++++++++++++++++ - sparc_sunos4_mach_dep.s | 32 +++++++++++++++++++++ - src/ia64_save_regs_in_stack.s | 11 -------- - src/sparc_mach_dep.S | 61 ----------------------------------------- - src/sparc_netbsd_mach_dep.s | 34 ----------------------- - src/sparc_sunos4_mach_dep.s | 32 --------------------- - 11 files changed, 151 insertions(+), 151 deletions(-) - create mode 100644 ia64_save_regs_in_stack.s - create mode 100644 sparc_mach_dep.S - create mode 100644 sparc_netbsd_mach_dep.s - create mode 100644 sparc_sunos4_mach_dep.s - delete mode 100644 src/ia64_save_regs_in_stack.s - delete mode 100644 src/sparc_mach_dep.S - delete mode 100644 src/sparc_netbsd_mach_dep.s - delete mode 100644 src/sparc_sunos4_mach_dep.s - -diff --git a/Makefile.am b/Makefile.am -index f8057db..1688be2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -100,8 +100,8 @@ libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS) - libgc_la_DEPENDENCIES = @addobjs@ - libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined - --EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \ -- src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s -+EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \ -+ sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s - - - # C++ Interface -diff --git a/Makefile.direct b/Makefile.direct -index d64598b..8ab80e8 100644 ---- a/Makefile.direct -+++ b/Makefile.direct -@@ -108,8 +108,8 @@ SRCS= $(CSRCS) \ - include/gc_config_macros.h include/private/pthread_support.h \ - include/private/pthread_stop_world.h include/private/darwin_semaphore.h \ - include/private/darwin_stop_world.h include/private/thread_local_alloc.h \ -- src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \ -- src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s $(CORD_SRCS) -+ ia64_save_regs_in_stack.s sparc_mach_dep.S \ -+ sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s $(CORD_SRCS) - - DOC_FILES= README.QUICK TODO doc/README.Mac doc/README.OS2 \ - doc/README.amiga doc/README.cords doc/debugging.html \ -@@ -309,17 +309,17 @@ dyn_test: - # gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo - # touch liblinuxgc.so - --mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/src/sparc_mach_dep.S \ -- $(srcdir)/src/sparc_sunos4_mach_dep.s \ -- $(srcdir)/src/ia64_save_regs_in_stack.s \ -- $(srcdir)/src/sparc_netbsd_mach_dep.s $(UTILS) -+mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/sparc_mach_dep.S \ -+ $(srcdir)/sparc_sunos4_mach_dep.s \ -+ $(srcdir)/ia64_save_regs_in_stack.s \ -+ $(srcdir)/sparc_netbsd_mach_dep.s $(UTILS) - rm -f mach_dep.o -- ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/src/sparc_mach_dep.S -- ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_sunos4_mach_dep.s -- ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_netbsd_mach_dep.s -+ ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S -+ ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s -+ ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s - ./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c - ./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o -- ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/src/ia64_save_regs_in_stack.s -+ ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s - ./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c - ./if_mach IA64 "" ld -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o - ./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c -diff --git a/ia64_save_regs_in_stack.s b/ia64_save_regs_in_stack.s -new file mode 100644 -index 0000000..2b81edf ---- /dev/null -+++ b/ia64_save_regs_in_stack.s -@@ -0,0 +1,11 @@ -+ .text -+ .align 16 -+ .global GC_save_regs_in_stack -+ .proc GC_save_regs_in_stack -+GC_save_regs_in_stack: -+ .body -+ flushrs -+ ;; -+ mov r8=ar.bsp -+ br.ret.sptk.few rp -+ .endp GC_save_regs_in_stack -diff --git a/sparc_mach_dep.S b/sparc_mach_dep.S -new file mode 100644 -index 0000000..d204dc4 ---- /dev/null -+++ b/sparc_mach_dep.S -@@ -0,0 +1,61 @@ -+! SPARCompiler 3.0 and later apparently no longer handles -+! asm outside functions. So we need a separate .s file -+! This is only set up for SunOS 5, not SunOS 4. -+! Assumes this is called before the stack contents are -+! examined. -+ -+ .seg "text" -+ .globl GC_save_regs_in_stack -+GC_save_regs_in_stack: -+#if defined(__arch64__) || defined(__sparcv9) -+ save %sp,-128,%sp -+ flushw -+ ret -+ restore %sp,2047+128,%o0 -+#else /* 32 bit SPARC */ -+ ta 0x3 ! ST_FLUSH_WINDOWS -+ mov %sp,%o0 -+ retl -+ nop -+#endif /* 32 bit SPARC */ -+.GC_save_regs_in_stack_end: -+ .size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack -+ -+! GC_clear_stack_inner(arg, limit) clears stack area up to limit and -+! returns arg. Stack clearing is crucial on SPARC, so we supply -+! an assembly version that s more careful. Assumes limit is hotter -+! than sp, and limit is 8 byte aligned. -+ .globl GC_clear_stack_inner -+GC_clear_stack_inner: -+#if defined(__arch64__) || defined(__sparcv9) -+ mov %sp,%o2 ! Save sp -+ add %sp,2047-8,%o3 ! p = sp+bias-8 -+ add %o1,-2047-192,%sp ! Move sp out of the way, -+ ! so that traps still work. -+ ! Includes some extra words -+ ! so we can be sloppy below. -+loop: -+ stx %g0,[%o3] ! *(long *)p = 0 -+ cmp %o3,%o1 -+ bgu,pt %xcc, loop ! if (p > limit) goto loop -+ add %o3,-8,%o3 ! p -= 8 (delay slot) -+ retl -+ mov %o2,%sp ! Restore sp., delay slot -+#else /* 32 bit SPARC */ -+ mov %sp,%o2 ! Save sp -+ add %sp,-8,%o3 ! p = sp-8 -+ clr %g1 ! [g0,g1] = 0 -+ add %o1,-0x60,%sp ! Move sp out of the way, -+ ! so that traps still work. -+ ! Includes some extra words -+ ! so we can be sloppy below. -+loop: -+ std %g0,[%o3] ! *(long long *)p = 0 -+ cmp %o3,%o1 -+ bgu loop ! if (p > limit) goto loop -+ add %o3,-8,%o3 ! p -= 8 (delay slot) -+ retl -+ mov %o2,%sp ! Restore sp., delay slot -+#endif /* 32 bit SPARC */ -+.GC_clear_stack_inner_end: -+ .size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner -diff --git a/sparc_netbsd_mach_dep.s b/sparc_netbsd_mach_dep.s -new file mode 100644 -index 0000000..14feb15 ---- /dev/null -+++ b/sparc_netbsd_mach_dep.s -@@ -0,0 +1,34 @@ -+! SPARCompiler 3.0 and later apparently no longer handles -+! asm outside functions. So we need a separate .s file -+! This is only set up for SunOS 4. -+! Assumes this is called before the stack contents are -+! examined. -+ -+#include "machine/asm.h" -+ -+ .seg "text" -+ .globl _C_LABEL(GC_save_regs_in_stack) -+ .globl _C_LABEL(GC_push_regs) -+_C_LABEL(GC_save_regs_in_stack): -+_C_LABEL(GC_push_regs): -+ ta 0x3 ! ST_FLUSH_WINDOWS -+ mov %sp,%o0 -+ retl -+ nop -+ -+ .globl _C_LABEL(GC_clear_stack_inner) -+_C_LABEL(GC_clear_stack_inner): -+ mov %sp,%o2 ! Save sp -+ add %sp,-8,%o3 ! p = sp-8 -+ clr %g1 ! [g0,g1] = 0 -+ add %o1,-0x60,%sp ! Move sp out of the way, -+ ! so that traps still work. -+ ! Includes some extra words -+ ! so we can be sloppy below. -+loop: -+ std %g0,[%o3] ! *(long long *)p = 0 -+ cmp %o3,%o1 -+ bgu loop ! if (p > limit) goto loop -+ add %o3,-8,%o3 ! p -= 8 (delay slot) -+ retl -+ mov %o2,%sp ! Restore sp., delay slot -diff --git a/sparc_sunos4_mach_dep.s b/sparc_sunos4_mach_dep.s -new file mode 100644 -index 0000000..923f5ea ---- /dev/null -+++ b/sparc_sunos4_mach_dep.s -@@ -0,0 +1,32 @@ -+! SPARCompiler 3.0 and later apparently no longer handles -+! asm outside functions. So we need a separate .s file -+! This is only set up for SunOS 4. -+! Assumes this is called before the stack contents are -+! examined. -+ -+ .seg "text" -+ .globl _GC_save_regs_in_stack -+ .globl _GC_push_regs -+_GC_save_regs_in_stack: -+_GC_push_regs: -+ ta 0x3 ! ST_FLUSH_WINDOWS -+ mov %sp,%o0 -+ retl -+ nop -+ -+ .globl _GC_clear_stack_inner -+_GC_clear_stack_inner: -+ mov %sp,%o2 ! Save sp -+ add %sp,-8,%o3 ! p = sp-8 -+ clr %g1 ! [g0,g1] = 0 -+ add %o1,-0x60,%sp ! Move sp out of the way, -+ ! so that traps still work. -+ ! Includes some extra words -+ ! so we can be sloppy below. -+loop: -+ std %g0,[%o3] ! *(long long *)p = 0 -+ cmp %o3,%o1 -+ bgu loop ! if (p > limit) goto loop -+ add %o3,-8,%o3 ! p -= 8 (delay slot) -+ retl -+ mov %o2,%sp ! Restore sp., delay slot -diff --git a/src/ia64_save_regs_in_stack.s b/src/ia64_save_regs_in_stack.s -deleted file mode 100644 -index 2b81edf..0000000 ---- a/src/ia64_save_regs_in_stack.s -+++ /dev/null -@@ -1,11 +0,0 @@ -- .text -- .align 16 -- .global GC_save_regs_in_stack -- .proc GC_save_regs_in_stack --GC_save_regs_in_stack: -- .body -- flushrs -- ;; -- mov r8=ar.bsp -- br.ret.sptk.few rp -- .endp GC_save_regs_in_stack -diff --git a/src/sparc_mach_dep.S b/src/sparc_mach_dep.S -deleted file mode 100644 -index d204dc4..0000000 ---- a/src/sparc_mach_dep.S -+++ /dev/null -@@ -1,61 +0,0 @@ --! SPARCompiler 3.0 and later apparently no longer handles --! asm outside functions. So we need a separate .s file --! This is only set up for SunOS 5, not SunOS 4. --! Assumes this is called before the stack contents are --! examined. -- -- .seg "text" -- .globl GC_save_regs_in_stack --GC_save_regs_in_stack: --#if defined(__arch64__) || defined(__sparcv9) -- save %sp,-128,%sp -- flushw -- ret -- restore %sp,2047+128,%o0 --#else /* 32 bit SPARC */ -- ta 0x3 ! ST_FLUSH_WINDOWS -- mov %sp,%o0 -- retl -- nop --#endif /* 32 bit SPARC */ --.GC_save_regs_in_stack_end: -- .size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack -- --! GC_clear_stack_inner(arg, limit) clears stack area up to limit and --! returns arg. Stack clearing is crucial on SPARC, so we supply --! an assembly version that s more careful. Assumes limit is hotter --! than sp, and limit is 8 byte aligned. -- .globl GC_clear_stack_inner --GC_clear_stack_inner: --#if defined(__arch64__) || defined(__sparcv9) -- mov %sp,%o2 ! Save sp -- add %sp,2047-8,%o3 ! p = sp+bias-8 -- add %o1,-2047-192,%sp ! Move sp out of the way, -- ! so that traps still work. -- ! Includes some extra words -- ! so we can be sloppy below. --loop: -- stx %g0,[%o3] ! *(long *)p = 0 -- cmp %o3,%o1 -- bgu,pt %xcc, loop ! if (p > limit) goto loop -- add %o3,-8,%o3 ! p -= 8 (delay slot) -- retl -- mov %o2,%sp ! Restore sp., delay slot --#else /* 32 bit SPARC */ -- mov %sp,%o2 ! Save sp -- add %sp,-8,%o3 ! p = sp-8 -- clr %g1 ! [g0,g1] = 0 -- add %o1,-0x60,%sp ! Move sp out of the way, -- ! so that traps still work. -- ! Includes some extra words -- ! so we can be sloppy below. --loop: -- std %g0,[%o3] ! *(long long *)p = 0 -- cmp %o3,%o1 -- bgu loop ! if (p > limit) goto loop -- add %o3,-8,%o3 ! p -= 8 (delay slot) -- retl -- mov %o2,%sp ! Restore sp., delay slot --#endif /* 32 bit SPARC */ --.GC_clear_stack_inner_end: -- .size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner -diff --git a/src/sparc_netbsd_mach_dep.s b/src/sparc_netbsd_mach_dep.s -deleted file mode 100644 -index 14feb15..0000000 ---- a/src/sparc_netbsd_mach_dep.s -+++ /dev/null -@@ -1,34 +0,0 @@ --! SPARCompiler 3.0 and later apparently no longer handles --! asm outside functions. So we need a separate .s file --! This is only set up for SunOS 4. --! Assumes this is called before the stack contents are --! examined. -- --#include "machine/asm.h" -- -- .seg "text" -- .globl _C_LABEL(GC_save_regs_in_stack) -- .globl _C_LABEL(GC_push_regs) --_C_LABEL(GC_save_regs_in_stack): --_C_LABEL(GC_push_regs): -- ta 0x3 ! ST_FLUSH_WINDOWS -- mov %sp,%o0 -- retl -- nop -- -- .globl _C_LABEL(GC_clear_stack_inner) --_C_LABEL(GC_clear_stack_inner): -- mov %sp,%o2 ! Save sp -- add %sp,-8,%o3 ! p = sp-8 -- clr %g1 ! [g0,g1] = 0 -- add %o1,-0x60,%sp ! Move sp out of the way, -- ! so that traps still work. -- ! Includes some extra words -- ! so we can be sloppy below. --loop: -- std %g0,[%o3] ! *(long long *)p = 0 -- cmp %o3,%o1 -- bgu loop ! if (p > limit) goto loop -- add %o3,-8,%o3 ! p -= 8 (delay slot) -- retl -- mov %o2,%sp ! Restore sp., delay slot -diff --git a/src/sparc_sunos4_mach_dep.s b/src/sparc_sunos4_mach_dep.s -deleted file mode 100644 -index 923f5ea..0000000 ---- a/src/sparc_sunos4_mach_dep.s -+++ /dev/null -@@ -1,32 +0,0 @@ --! SPARCompiler 3.0 and later apparently no longer handles --! asm outside functions. So we need a separate .s file --! This is only set up for SunOS 4. --! Assumes this is called before the stack contents are --! examined. -- -- .seg "text" -- .globl _GC_save_regs_in_stack -- .globl _GC_push_regs --_GC_save_regs_in_stack: --_GC_push_regs: -- ta 0x3 ! ST_FLUSH_WINDOWS -- mov %sp,%o0 -- retl -- nop -- -- .globl _GC_clear_stack_inner --_GC_clear_stack_inner: -- mov %sp,%o2 ! Save sp -- add %sp,-8,%o3 ! p = sp-8 -- clr %g1 ! [g0,g1] = 0 -- add %o1,-0x60,%sp ! Move sp out of the way, -- ! so that traps still work. -- ! Includes some extra words -- ! so we can be sloppy below. --loop: -- std %g0,[%o3] ! *(long long *)p = 0 -- cmp %o3,%o1 -- bgu loop ! if (p > limit) goto loop -- add %o3,-8,%o3 ! p -= 8 (delay slot) -- retl -- mov %o2,%sp ! Restore sp., delay slot --- -1.7.10.4 - diff --git a/package/bdwgc/0004-configure-match-uclinux-pattern.patch b/package/bdwgc/0004-configure-match-uclinux-pattern.patch deleted file mode 100644 index 78bad1c595..0000000000 --- a/package/bdwgc/0004-configure-match-uclinux-pattern.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f8ecc7fb09adf34a23d324f373e667c81311fc1c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 6 Aug 2016 23:24:35 +0200 -Subject: [PATCH] configure: match uclinux pattern - -bdwgc does not recognize "uclinux" as a valid OS part of the target -tuple which is used by some arm cortex-M toolchains. - -Fixes: -http://autobuild.buildroot.net/results/94f/94fbc1e5afe183e5b071d1e869b2d780025389e2 - -Signed-off-by: Romain Naour ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b1ce2b2..a69d101 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ case "$THREADS" in - AC_DEFINE(THREAD_LOCAL_ALLOC) - AC_MSG_WARN("Explicit GC_INIT() calls may be required."); - ;; -- *-*-linux*) -+ *-*-*linux*) - AC_DEFINE(GC_LINUX_THREADS) - AC_DEFINE(_REENTRANT) - ;; --- -2.5.5 - diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash index 44414e4efa..4b41e1d85b 100644 --- a/package/bdwgc/bdwgc.hash +++ b/package/bdwgc/bdwgc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2 gc-7.4.2.tar.gz +sha256 a14a28b1129be90e55cd6f71127ffc5594e1091d5d54131528c24cd0c03b7d90 gc-7.6.0.tar.gz diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index 0e9054df3c..e148f7223b 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -4,7 +4,7 @@ # ################################################################################ -BDWGC_VERSION = 7.4.2 +BDWGC_VERSION = 7.6.0 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz BDWGC_SITE = http://www.hboehm.info/gc/gc_source BDWGC_INSTALL_STAGING = YES diff --git a/package/benejson/benejson.hash b/package/benejson/benejson.hash index 1dfda90d3f..696dc4f3f6 100644 --- a/package/benejson/benejson.hash +++ b/package/benejson/benejson.hash @@ -1,2 +1,2 @@ -# Localy computed +# Locally computed sha256 2ce5f3c2323500bdf651e7fcaecbd1011997141e6067567b8d2caa4cf7182f4a benejson-0.9.7.tar.gz diff --git a/package/berkeleydb/Config.in b/package/berkeleydb/Config.in index 5531b04463..f32d13ab17 100644 --- a/package/berkeleydb/Config.in +++ b/package/berkeleydb/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_BERKELEYDB bool "berkeleydb" help - The Berkeley database. A very common library for database - applications. + The Berkeley database. A very common library for + database applications. http://www.sleepycat.com/products/db.shtml @@ -16,6 +16,7 @@ config BR2_PACKAGE_BERKELEYDB_COMPAT185 config BR2_PACKAGE_BERKELEYDB_TOOLS bool "install tools" help - Install berkeleydb tools, mostly useful for debugging purposes. + Install berkeleydb tools, mostly useful for debugging + purposes. endif diff --git a/package/bind/Config.in b/package/bind/Config.in index a580f0ee66..049a90cbaf 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -4,14 +4,16 @@ config BR2_PACKAGE_BIND depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS help - BIND (Berkeley Internet Name Domain) is an implementation of - the Domain Name System (DNS) protocols and provides an openly - redistributable reference implementation of the major - components of the Domain Name System, including: + BIND (Berkeley Internet Name Domain) is an + implementation of the Domain Name System (DNS) protocols + and provides an openly redistributable reference + implementation of the major components of the Domain + Name System, including: * a Domain Name System server (named) * a Domain Name System resolver library - * tools for verifying the proper operation of the DNS server + * tools for verifying the proper operation of the DNS + server The BIND DNS Server is used on the vast majority of name serving machines on the Internet, providing a robust and @@ -19,7 +21,8 @@ config BR2_PACKAGE_BIND architecture can be built. The resolver library included in the BIND distribution provides the standard APIs for translation between domain names and Internet addresses and is - intended to be linked with applications requiring name service. + intended to be linked with applications requiring name + service. http://www.isc.org/sw/bind/ diff --git a/package/biosdevname/Config.in b/package/biosdevname/Config.in index f9202ac4b8..704716791a 100644 --- a/package/biosdevname/Config.in +++ b/package/biosdevname/Config.in @@ -5,11 +5,11 @@ config BR2_PACKAGE_BIOSDEVNAME select BR2_PACKAGE_PCIUTILS select BR2_PACKAGE_ZLIB help - Biosdevname is a udev helper that looks at various BIOS tables to - figure out what the actual hardware names are for Ethernet ports - and renames the ports accordingly. This has the advantage of - always referring to the same port regardless of system or - hardware changes that might otherwise alter the typical ethX - naming. + Biosdevname is a udev helper that looks at various BIOS tables + to figure out what the actual hardware names are for Ethernet + ports and renames the ports accordingly. This has the + advantage of always referring to the same port regardless of + system or hardware changes that might otherwise alter the + typical ethX naming. http://linux.dell.com/biosdevname/ diff --git a/package/biosdevname/biosdevname.hash b/package/biosdevname/biosdevname.hash index a00077711e..57946ea085 100644 --- a/package/biosdevname/biosdevname.hash +++ b/package/biosdevname/biosdevname.hash @@ -1,3 +1,2 @@ # Locally computed hashes, not provided by upstream -sha1 a926961d6adb673aed062683ab8b80e6418523ea biosdevname-0.6.0.tar.gz -sha256 c75bf92d3184f7dd1973af002de152498145021efdd5de46d6bf796acef43914 biosdevname-0.6.0.tar.gz +sha256 954575f482ff5de2d49c335b563990859a3eb3506e8fa976f6915eba870d71f6 biosdevname-0.7.2.tar.gz diff --git a/package/biosdevname/biosdevname.mk b/package/biosdevname/biosdevname.mk index 82f3338a95..e0de8ef623 100644 --- a/package/biosdevname/biosdevname.mk +++ b/package/biosdevname/biosdevname.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIOSDEVNAME_VERSION = 0.6.0 +BIOSDEVNAME_VERSION = 0.7.2 BIOSDEVNAME_SITE = http://linux.dell.com/biosdevname/biosdevname-$(BIOSDEVNAME_VERSION) BIOSDEVNAME_LICENSE = GPL BIOSDEVNAME_LICENSE_FILES = COPYING diff --git a/package/bitstream/bitstream.hash b/package/bitstream/bitstream.hash index 7a3b7f8633..a62f733d86 100644 --- a/package/bitstream/bitstream.hash +++ b/package/bitstream/bitstream.hash @@ -1,4 +1,4 @@ -# from https://get.videolan.org/bitstream/1.1/bitstream-1.1.tar.bz2.md5 -md5 88e6e786242196b4d73a5b6075aeb1a2 bitstream-1.1.tar.bz2 -# locally calculated -sha256 90b65f619895d31e652386d5d7d2d2d62cccd44383c1fac9145d659013a2de9e bitstream-1.1.tar.bz2 +# From https://get.videolan.org/bitstream/1.2/bitstream-1.2.tar.bz2 +sha256 ccfbb438711606de1fad881b58c8f134e2d82b4d53a88ea48f2d1bcb49ca5ad2 bitstream-1.2.tar.bz2 +# From https://get.videolan.org/bitstream/1.2/bitstream-1.2.tar.bz2.md5 +md5 c4b2dbd84eb5799f1525eb9a4e01dc56 bitstream-1.2.tar.bz2 diff --git a/package/bitstream/bitstream.mk b/package/bitstream/bitstream.mk index 9c8c6f5ca2..0b28ffe756 100644 --- a/package/bitstream/bitstream.mk +++ b/package/bitstream/bitstream.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITSTREAM_VERSION = 1.1 +BITSTREAM_VERSION = 1.2 BITSTREAM_SOURCE = bitstream-$(BITSTREAM_VERSION).tar.bz2 BITSTREAM_SITE = https://get.videolan.org/bitstream/$(BITSTREAM_VERSION) BITSTREAM_LICENSE = MIT diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index bdb6682c16..55831e9b61 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -39,15 +39,10 @@ comment "OBEX support needs a toolchain w/ C++" config BR2_PACKAGE_BLUEZ5_UTILS_CLIENT bool "build CLI client" - # wordexp support not in our uClibc configuration - depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_READLINE help Enable the Bluez 5.x command line client. -comment "bluez5-utils client needs a glibc or musl toolchain" - depends on BR2_TOOLCHAIN_USES_UCLIBC - config BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED bool "install deprecated tool" depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT @@ -87,7 +82,8 @@ config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV help - Build BlueZ 5.x sixaxis plugin (support Sony Dualshock controller) + Build BlueZ 5.x sixaxis plugin (support Sony Dualshock + controller) comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 75fb5d5559..e7a6a8911c 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85 bluez-5.44.tar.xz +sha256 4cacb00703a6bc149cb09502257d321597d43952374a16f3558766ffa85364e9 bluez-5.45.tar.xz diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 4a03234881..c69e58bffc 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ5_UTILS_VERSION = 5.44 +BLUEZ5_UTILS_VERSION = 5.45 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in index 86c9085ec4..327d26bce3 100644 --- a/package/bluez_utils/Config.in +++ b/package/bluez_utils/Config.in @@ -37,8 +37,9 @@ config BR2_PACKAGE_BLUEZ_UTILS_GATT bool "GATT support" select BR2_PACKAGE_READLINE help - Generic Attribute Profile (GATT) support. This provides profile - discovery and description services for Bluetooth Low Energy. + Generic Attribute Profile (GATT) support. This provides + profile discovery and description services for Bluetooth Low + Energy. This will install the gatttool utility. endif diff --git a/package/bmon/Config.in b/package/bmon/Config.in index bb796936cc..cb83cc28ac 100644 --- a/package/bmon/Config.in +++ b/package/bmon/Config.in @@ -5,8 +5,8 @@ config BR2_PACKAGE_BMON select BR2_PACKAGE_LIBNL select BR2_PACKAGE_NCURSES help - bmon is a bandwidth monitor capable of retrieving statistics from - various input modules. It provides various output methods + bmon is a bandwidth monitor capable of retrieving statistics + from various input modules. It provides various output methods including a curses based interface. https://github.com/tgraf/bmon/ diff --git a/package/bootstrap/bootstrap.hash b/package/bootstrap/bootstrap.hash index acb06b4246..abc09da213 100644 --- a/package/bootstrap/bootstrap.hash +++ b/package/bootstrap/bootstrap.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 95ca4a02aff37570660c81a87065b53ebc281c33fa86b91a6a7a650eee10678f bootstrap-3.3.1-dist.zip +sha256 f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b bootstrap-3.3.7-dist.zip diff --git a/package/bootstrap/bootstrap.mk b/package/bootstrap/bootstrap.mk index 17752ce068..33161f53ae 100644 --- a/package/bootstrap/bootstrap.mk +++ b/package/bootstrap/bootstrap.mk @@ -4,23 +4,25 @@ # ################################################################################ -BOOTSTRAP_VERSION = 3.3.1 +BOOTSTRAP_VERSION = 3.3.7 BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRAP_VERSION) BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip BOOTSTRAP_LICENSE = MIT define BOOTSTRAP_EXTRACT_CMDS $(UNZIP) $(DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D) + mv $(@D)/bootstrap-$(BOOTSTRAP_VERSION)-dist/* $(@D)/ + rmdir $(@D)/bootstrap-$(BOOTSTRAP_VERSION)-dist endef define BOOTSTRAP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/dist/css/bootstrap-theme.min.css \ + $(INSTALL) -m 0644 -D $(@D)/css/bootstrap-theme.min.css \ $(TARGET_DIR)/var/www/bootstrap/css/bootstrap-theme.min.css - $(INSTALL) -m 0644 -D $(@D)/dist/css/bootstrap.min.css \ + $(INSTALL) -m 0644 -D $(@D)/css/bootstrap.min.css \ $(TARGET_DIR)/var/www/bootstrap/css/bootstrap.min.css - $(INSTALL) -m 0644 -D $(@D)/dist/js/bootstrap.min.js \ + $(INSTALL) -m 0644 -D $(@D)/js/bootstrap.min.js \ $(TARGET_DIR)/var/www/bootstrap/js/bootstrap.min.js - cp -r $(@D)/dist/fonts $(TARGET_DIR)/var/www/bootstrap/ + cp -r $(@D)/fonts $(TARGET_DIR)/var/www/bootstrap/ endef $(eval $(generic-package)) diff --git a/package/bootutils/Config.in b/package/bootutils/Config.in index af4a170ca3..30d647ab11 100644 --- a/package/bootutils/Config.in +++ b/package/bootutils/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_BOOTUTILS bool "bootutils" depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help - BootUtils is a collection of utilities to facilitate booting of - Linux 2.6-based systems. The process of finding the root volume - either by label or explicit label= on the kernel command line, - mounting it, and 'switchroot'ing is automated. + BootUtils is a collection of utilities to facilitate booting + of Linux 2.6-based systems. The process of finding the root + volume either by label or explicit label= on the kernel + command line, mounting it, and 'switchroot'ing is automated. http://bootutils.sourceforge.net/ diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 3da5f690ce..3d46a13584 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 Botan-1.10.13.tgz +sha256 6c5472401d06527e87adcb53dd270f3c9b1fb688703b04dd7a7cfb86289efe52 Botan-1.10.16.tgz diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 7694b8dbc8..2f2415170c 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 1.10.13 +BOTAN_VERSION = 1.10.16 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in index fb9c7df427..bc614b0758 100644 --- a/package/bridge-utils/Config.in +++ b/package/bridge-utils/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_BRIDGE_UTILS bool "bridge-utils" help - Manage ethernet bridging; a way to connect networks together to - form a larger network. + Manage ethernet bridging; a way to connect networks together + to form a larger network. https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/ diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 17dedba45e..0b213eec35 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 ed09df670338562a52d9e7d76a362cc932737e2a67adca4c09395374be1de60a btrfs-progs-v4.10.2.tar.xz +sha256 e17a68cc52a27d905b715445e91ddbaa4d42de4847d54836d6ed21e012dabf0e btrfs-progs-v4.11.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 6594e51f2d..2ea2f72fb4 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.10.2 +BTRFS_PROGS_VERSION = 4.11 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib diff --git a/package/bustle/bustle.hash b/package/bustle/bustle.hash index 9c6df56718..49890f74ff 100644 --- a/package/bustle/bustle.hash +++ b/package/bustle/bustle.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6c76cb5182c20b8ce7d6911f8aebc4fae43f919e747a003f1a66698628b27682 bustle-0.4.3.tar.gz +sha256 921c2cbbb957dcb02c3aa8fd1eeff3534cb437fa9eeca1c25206ad1e741a3f14 bustle-0.5.4.tar.gz diff --git a/package/bustle/bustle.mk b/package/bustle/bustle.mk index 4cd446065f..ffbfbe40f7 100644 --- a/package/bustle/bustle.mk +++ b/package/bustle/bustle.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSTLE_VERSION = 0.4.3 +BUSTLE_VERSION = 0.5.4 BUSTLE_SITE = http://www.willthompson.co.uk/bustle/releases/$(BUSTLE_VERSION) BUSTLE_LICENSE = LGPL-2.1+ BUSTLE_LICENSE_FILES = LICENSE diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 7eb7eb9639..116a72e945 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_BUSYBOX bool "BusyBox" default y help - The Swiss Army Knife of embedded Linux. It slices, it dices, it - makes Julian Fries. + The Swiss Army Knife of embedded Linux. It slices, it dices, + it makes Julian Fries. http://busybox.net/ @@ -15,10 +15,12 @@ config BR2_PACKAGE_BUSYBOX_CONFIG string "BusyBox configuration file to use?" default "package/busybox/busybox.config" help - Some people may wish to use their own modified BusyBox configuration - file, and will specify their config file location with this option. + Some people may wish to use their own modified BusyBox + configuration file, and will specify their config file + location with this option. - Most people will just use the default BusyBox configuration file. + Most people will just use the default BusyBox configuration + file. config BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES string "Additional BusyBox configuration fragment files" diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash index 5df1449871..a9fee87e43 100644 --- a/package/c-icap-modules/c-icap-modules.hash +++ b/package/c-icap-modules/c-icap-modules.hash @@ -1,3 +1,3 @@ # From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.4.x/ -md5 5acd9487679ed47fbee00270d436718d c_icap_modules-0.4.2.tar.gz -sha1 e5f4203980b732b9de165c1e83c4703734c3e0e2 c_icap_modules-0.4.2.tar.gz +md5 1a7eaa7a34ff35c2440cf303f7b45f22 c_icap_modules-0.4.5.tar.gz +sha1 515145e6d29413aff8543937504dc5c419043fd5 c_icap_modules-0.4.5.tar.gz diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk index 9daee58cde..d75437898c 100644 --- a/package/c-icap-modules/c-icap-modules.mk +++ b/package/c-icap-modules/c-icap-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_MODULES_VERSION = 0.4.2 +C_ICAP_MODULES_VERSION = 0.4.5 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_MODULES_LICENSE = GPL-2.0+ diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index 7925f5bc3e..c722098c59 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -12,8 +12,6 @@ C_ICAP_LICENSE_FILES = COPYING C_ICAP_INSTALL_STAGING = YES C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config C_ICAP_CONF_OPTS = \ - --with-process-mutexes=posix \ - --without-ldap \ --without-perl \ --enable-large-files \ --enable-ipv6 @@ -42,6 +40,34 @@ else C_ICAP_CONF_OPTS += --without-bzlib endif +ifeq ($(BR2_PACKAGE_LIBMEMCACHED),y) +C_ICAP_CONF_OPTS += --with-memcached +C_ICAP_DEPENDENCIES += libmemcached +else +C_ICAP_CONF_OPTS += --without-memcached +endif + +ifeq ($(BR2_PACKAGE_OPENLDAP),y) +C_ICAP_CONF_OPTS += --with-ldap +C_ICAP_DEPENDENCIES += openldap +else +C_ICAP_CONF_OPTS += --without-ldap +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +C_ICAP_CONF_OPTS += --with-openssl +C_ICAP_DEPENDENCIES += openssl +else +C_ICAP_CONF_OPTS += --without-openssl +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +C_ICAP_CONF_OPTS += --with-pcre +C_ICAP_DEPENDENCIES += pcre +else +C_ICAP_CONF_OPTS += --without-pcre +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) C_ICAP_CONF_OPTS += --with-zlib C_ICAP_DEPENDENCIES += zlib diff --git a/package/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch b/package/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch deleted file mode 100644 index 108297c9c2..0000000000 --- a/package/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1d8cb0ad54099c3d7261aaa19a2c0786f16736d0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 8 Aug 2015 22:42:39 +0200 -Subject: [PATCH] Add missing header for musl compatibility - - is needed to get the definition of _IOC_SIZEBITS and -solve the following build failure: - -src/spi.c: In function 'spi_transfer': -src/spi.c:100:24: error: '_IOC_SIZEBITS' undeclared (first use in this function) - if (ioctl(spi->fd, SPI_IOC_MESSAGE(1), &spi_xfer) < 1) - -Signed-off-by: Thomas Petazzoni ---- - src/spi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/spi.c b/src/spi.c -index 52a8d3d..1a6b17c 100644 ---- a/src/spi.c -+++ b/src/spi.c -@@ -16,6 +16,7 @@ - #include - - #include -+#include - #include - - #include "spi.h" --- -2.5.0 - diff --git a/package/c-periphery/0002-Fix-build-on-SPARC.patch b/package/c-periphery/0002-Fix-build-on-SPARC.patch deleted file mode 100644 index e491f6f728..0000000000 --- a/package/c-periphery/0002-Fix-build-on-SPARC.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 295316c3f44c3e779e85d7453424496a3bb4bc48 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 8 Aug 2015 22:56:09 +0200 -Subject: [PATCH] Fix build on SPARC - -On SPARC, the definitions of B2500000, B3000000, B3500000 and B4000000 -are not necessarily available, so use those values only if defined in -the kernel headers. - -It fixes SPARC build failures such as: - -src/serial.c: In function '_serial_baudrate_to_bits': -src/serial.c:73:30: error: 'B2500000' undeclared (first use in this function) - case 2500000: return B2500000; - ^ -src/serial.c:73:30: note: each undeclared identifier is reported only once for each function it appears in -src/serial.c:74:30: error: 'B3000000' undeclared (first use in this function) - case 3000000: return B3000000; - ^ - -Signed-off-by: Thomas Petazzoni ---- - src/serial.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/serial.c b/src/serial.c -index e385309..efd425e 100644 ---- a/src/serial.c -+++ b/src/serial.c -@@ -70,10 +70,18 @@ static int _serial_baudrate_to_bits(uint32_t baudrate) { - case 1152000: return B1152000; - case 1500000: return B1500000; - case 2000000: return B2000000; -+#ifdef B2500000 - case 2500000: return B2500000; -+#endif -+#ifdef B3000000 - case 3000000: return B3000000; -+#endif -+#ifdef B3500000 - case 3500000: return B3500000; -+#endif -+#ifdef B4000000 - case 4000000: return B4000000; -+#endif - default: return -1; - } - } -@@ -107,10 +115,18 @@ static int _serial_bits_to_baudrate(uint32_t bits) { - case B1152000: return 1152000; - case B1500000: return 1500000; - case B2000000: return 2000000; -+#ifdef B2500000 - case B2500000: return 2500000; -+#endif -+#ifdef B3000000 - case B3000000: return 3000000; -+#endif -+#ifdef B3500000 - case B3500000: return 3500000; -+#endif -+#ifdef B4000000 - case B4000000: return 4000000; -+#endif - default: return -1; - } - } --- -2.5.0 - diff --git a/package/c-periphery/c-periphery.hash b/package/c-periphery/c-periphery.hash index 516d340d96..524925ff97 100644 --- a/package/c-periphery/c-periphery.hash +++ b/package/c-periphery/c-periphery.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5ae4c3f9de0e64d8153ee58b85c4a5defb9f755c6ae215f11b46719bbbac1335 c-periphery-v1.0.3.tar.gz +sha256 c6cfaae7496ff6500b747106571de6b4ca7d80a383297e592ffcfa3413b66321 c-periphery-v1.1.1.tar.gz diff --git a/package/c-periphery/c-periphery.mk b/package/c-periphery/c-periphery.mk index 730b3bc30b..359c860e89 100644 --- a/package/c-periphery/c-periphery.mk +++ b/package/c-periphery/c-periphery.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_PERIPHERY_VERSION = v1.0.3 +C_PERIPHERY_VERSION = v1.1.1 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES # only a static library diff --git a/package/ca-certificates/Config.in b/package/ca-certificates/Config.in index a278a620c7..6bb71820d2 100644 --- a/package/ca-certificates/Config.in +++ b/package/ca-certificates/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_CA_CERTIFICATES connections. It includes, among others, certificate authorities used by the - Debian infrastructure and those shipped with Mozilla's browsers. + Debian infrastructure and those shipped with Mozilla's + browsers. http://anonscm.debian.org/gitweb/?p=collab-maint/ca-certificates.git diff --git a/package/canfestival/Config.in b/package/canfestival/Config.in index ca949565f5..8300e26582 100644 --- a/package/canfestival/Config.in +++ b/package/canfestival/Config.in @@ -16,8 +16,8 @@ config BR2_PACKAGE_CANFESTIVAL depends on !BR2_STATIC_LIBS help CanFestival is an OpenSource CANOpen framework, licensed under - LGPLv2.1 and GPLv2 for some drivers (virtual_kernel, lincan and - copcican_comedi). + LGPLv2.1 and GPLv2 for some drivers (virtual_kernel, lincan + and copcican_comedi). http://www.canfestival.org @@ -78,9 +78,9 @@ config BR2_PACKAGE_CANFESTIVAL_DRIVER config BR2_PACKAGE_CANFESTIVAL_ADDITIONAL_OPTIONS string "additional configure options" help - Additional options can be passed directly to the configure script - (e.g.: --MAX_CAN_BUS_ID=..., --SDO_MAX_LENGTH_TRANSFER=..., - --SDO_BLOCK_SIZE=...). + Additional options can be passed directly to the configure + script (e.g.: --MAX_CAN_BUS_ID=..., + --SDO_MAX_LENGTH_TRANSFER=..., --SDO_BLOCK_SIZE=...). config BR2_PACKAGE_CANFESTIVAL_INSTALL_EXAMPLES bool "install examples" diff --git a/package/ccid/ccid.hash b/package/ccid/ccid.hash index 3e1e962a57..a7d4875c0d 100644 --- a/package/ccid/ccid.hash +++ b/package/ccid/ccid.hash @@ -1,3 +1,3 @@ -# From http://cdn-fastly.deb.debian.org/debian/pool/main/c/ccid/ccid_1.4.26-1.dsc -sha1 20e22c23b8458548a6b572b044e5dbe4ecdc42e5 ccid_1.4.26.tar.bz2 -sha256 3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f ccid_1.4.26.tar.bz2 +# From http://cdn-fastly.deb.debian.org/debian/pool/main/c/ccid/ccid_1.4.27-1.dsc +sha1 d72ee816422183a86006e0083ccd643236b4e12a ccid_1.4.27.tar.bz2 +sha256 a660e269606986cb94840ad5ba802ffb0cd23dd12b98f69a35035e0deb9dd137 ccid_1.4.27.tar.bz2 diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk index 7fbf025a65..e566afe07e 100644 --- a/package/ccid/ccid.mk +++ b/package/ccid/ccid.mk @@ -4,9 +4,9 @@ # ################################################################################ -CCID_VERSION = 1.4.26 +CCID_VERSION = 1.4.27 CCID_SOURCE = ccid_$(CCID_VERSION).tar.bz2 -CCID_SITE = https://alioth.debian.org/frs/download.php/file/4205 +CCID_SITE = https://alioth.debian.org/frs/download.php/file/4218 CCID_LICENSE = LGPL-2.1+ CCID_LICENSE_FILES = COPYING CCID_INSTALL_STAGING = YES diff --git a/package/ccrypt/Config.in b/package/ccrypt/Config.in index ef5a7eef65..109271ae70 100644 --- a/package/ccrypt/Config.in +++ b/package/ccrypt/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CCRYPT bool "ccrypt" help - ccrypt is a utility for encrypting and decrypting files and streams. + ccrypt is a utility for encrypting and decrypting files and + streams. http://ccrypt.sourceforge.net/ diff --git a/package/cegui06/Config.in b/package/cegui06/Config.in index e6a024a399..0139d32422 100644 --- a/package/cegui06/Config.in +++ b/package/cegui06/Config.in @@ -10,11 +10,11 @@ config BR2_PACKAGE_CEGUI06 select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_PCRE help - Crazy Eddie's GUI System is a free library providing windowing and - widgets for graphics APIs / engines where such functionality is not - natively available, or severely lacking. The library is object - orientated, written in C++, and targeted at games developers who - should be spending their time creating great games, not building - GUI sub-systems! + Crazy Eddie's GUI System is a free library providing windowing + and widgets for graphics APIs / engines where such + functionality is not natively available, or severely lacking. + The library is object orientated, written in C++, and targeted + at games developers who should be spending their time creating + great games, not building GUI sub-systems! http://www.cegui.org.uk/ diff --git a/package/celt051/Config.in b/package/celt051/Config.in index 035e262d74..e1513190db 100644 --- a/package/celt051/Config.in +++ b/package/celt051/Config.in @@ -5,10 +5,10 @@ config BR2_PACKAGE_CELT051 The CELT ultra-low delay audio codec The CELT codec is a compression algorithm for audio. Like MP3, - Vorbis, and AAC it is suitable for transmitting music with high - quality. Unlike these formats CELT imposes very little delay on - the signal, even less than is typical for speech centric formats - like Speex, GSM, or G.729. + Vorbis, and AAC it is suitable for transmitting music with + high quality. Unlike these formats CELT imposes very little + delay on the signal, even less than is typical for speech + centric formats like Speex, GSM, or G.729. Note: this is version 0.5.1.3 of celt. diff --git a/package/cgic/cgic.hash b/package/cgic/cgic.hash index 6c0fee6124..fa1d0bc95c 100644 --- a/package/cgic/cgic.hash +++ b/package/cgic/cgic.hash @@ -1,2 +1,2 @@ -# Localy computed -sha256 9562e0b6af59ebc2090107eab5946ce0788a1de36146ad181970cf53e9be7a33 cgic206.tar.gz +# Locally computed +sha256 1e8834642a4b89528bb7bde2f287e133c6b07e210e68681a34137c436d59d320 cgic207.tar.gz diff --git a/package/cgic/cgic.mk b/package/cgic/cgic.mk index f07c62e97e..cd0841302d 100644 --- a/package/cgic/cgic.mk +++ b/package/cgic/cgic.mk @@ -4,8 +4,8 @@ # ################################################################################ -CGIC_VERSION = 2.06 -CGIC_SOURCE = cgic206.tar.gz +CGIC_VERSION = 2.07 +CGIC_SOURCE = cgic207.tar.gz CGIC_SITE = http://boutell.com/cgic CGIC_LICENSE = Custom CGIC_LICENSE_FILES = license.txt diff --git a/package/cgroupfs-mount/cgroupfs-mount.hash b/package/cgroupfs-mount/cgroupfs-mount.hash index 34f516764c..926a031d75 100644 --- a/package/cgroupfs-mount/cgroupfs-mount.hash +++ b/package/cgroupfs-mount/cgroupfs-mount.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 fb32a8d9de491358d28f56ab76a56e1a611b90d5b6326910d3a69395fa539027 cgroupfs-mount-7285bf44402029394808339f69f4f293730fc2c6.tar.gz +sha256 d6c8aff7af59c7d0082ee3018c97f73b0421e81a49bb28ad9f66a36da5cd6ec7 cgroupfs-mount-1.4.tar.gz diff --git a/package/cgroupfs-mount/cgroupfs-mount.mk b/package/cgroupfs-mount/cgroupfs-mount.mk index 096c728e3b..9a76799952 100644 --- a/package/cgroupfs-mount/cgroupfs-mount.mk +++ b/package/cgroupfs-mount/cgroupfs-mount.mk @@ -4,7 +4,7 @@ # ################################################################################ -CGROUPFS_MOUNT_VERSION = 7285bf44402029394808339f69f4f293730fc2c6 +CGROUPFS_MOUNT_VERSION = 1.4 CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION)) CGROUPFS_MOUNT_LICENSE = GPL-3.0+ CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright @@ -17,7 +17,6 @@ endef define CGROUPFS_MOUNT_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D $(CGROUPFS_MOUNT_PKGDIR)/S30cgroupfs \ $(TARGET_DIR)/etc/init.d/S30cgroupfs - endef $(eval $(generic-package)) diff --git a/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch b/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch new file mode 100644 index 0000000000..c0b6de8a5a --- /dev/null +++ b/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch @@ -0,0 +1,58 @@ +From 4d215a1e8111e14f6074f7abe2559800b6f4838c Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Sat, 20 May 2017 11:01:08 -0400 +Subject: [PATCH] checkpolicy: remove -lfl from LDLIBSlogin + +When building checkpolicy/test, the linker reports the following error: +cc dispol.o -lfl /usr/src/selinux/DESTDIR/usr/lib/libsepol.a +-L/usr/src/selinux/DESTDIR/usr/lib -o dispol +/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/../../../../lib/libfl.so: +undefined reference to `yylex' +collect2: error: ld returned 1 exit status + +According to flex documentation +(https://github.com/westes/flex/blob/master/doc/flex.texi), -lfl is used +to provide an implementation for yywrap(). However every flex file now +uses "%option noyywrap", which makes -lfl no longer mandatory. Remove +this option from checkpolicy Makefiles. + + +Backported from: +https://patchwork.kernel.org/patch/9450549/ + +Original author: Nicolas Iooss +Signed-off-by: Adam Duskett +--- + Makefile | 2 +- + test/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 53a3074..875cf00 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,7 @@ CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \ + CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o + CHECKMODOBJS = $(CHECKOBJS) checkmodule.o + +-LDLIBS=$(LIBDIR)/libsepol.a -lfl ++LDLIBS=$(LIBDIR)/libsepol.a + + GENERATED=lex.yy.c y.tab.c y.tab.h + +diff --git a/test/Makefile b/test/Makefile +index c2367e1..e7bd717 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -9,7 +9,7 @@ INCLUDEDIR ?= $(PREFIX)/include + CFLAGS ?= -g -Wall -W -Werror -O2 -pipe + override CFLAGS += -I$(INCLUDEDIR) + +-LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR) ++LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR) + + all: dispol dismod + +-- +2.9.3 + diff --git a/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch b/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch new file mode 100644 index 0000000000..6536076577 --- /dev/null +++ b/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch @@ -0,0 +1,32 @@ +From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001 +From: Thomas Witt +Date: Wed, 15 Mar 2017 20:20:44 +0000 +Subject: [PATCH] mount.cifs: Remove data_blob.h include + +data_blob.h includes talloc.h from libtalloc, but that is only marked as +a dependency for cifs.upcall. No symbols from that header are used by +cifs.mount, so remove it to avoid the libtalloc dependency + +Signed-off-by: Thomas Witt +Signed-off-by: Baruch Siach +--- +Patch status: upstream commit 272d523a57a4 + + mount.cifs.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/mount.cifs.c b/mount.cifs.c +index 13b71ef50303..2612feb4d591 100644 +--- a/mount.cifs.c ++++ b/mount.cifs.c +@@ -61,7 +61,6 @@ + #include "mount.h" + #include "util.h" + #include "resolve_host.h" +-#include "data_blob.h" + + #ifndef MS_MOVE + #define MS_MOVE 8192 +-- +2.11.0 + diff --git a/package/cifs-utils/cifs-utils.hash b/package/cifs-utils/cifs-utils.hash index 61ffbd9efb..ebc9c43e72 100644 --- a/package/cifs-utils/cifs-utils.hash +++ b/package/cifs-utils/cifs-utils.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 d07152a807de6840566bbcc69a97ff6fa17fca4e09ceb4641d74882a83e67125 cifs-utils-6.6.tar.bz2 +sha256 b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab cifs-utils-6.7.tar.bz2 diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk index 152a3eeccf..9044fdf83c 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -4,11 +4,14 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.6 +CIFS_UTILS_VERSION = 6.7 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPL-3.0+ CIFS_UTILS_LICENSE_FILES = COPYING +# Missing install-sh in release tarball +CIFS_UTILS_AUTORECONF = YES +CIFS_UTILS_DEPENDENCIES = host-pkgconf ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) CIFS_UTILS_CONF_OPTS += --disable-pie diff --git a/package/cjson/Config.in b/package/cjson/Config.in index 04eff4ca88..ee18fced5c 100644 --- a/package/cjson/Config.in +++ b/package/cjson/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_CJSON bool "cJSON" help - An ultra-lightweight, portable, single-file, simple-as-can-be ANSI-C - compliant JSON parser, under MIT license. + An ultra-lightweight, portable, single-file, simple-as-can-be + ANSI-C compliant JSON parser, under MIT license. https://github.com/DaveGamble/cJSON diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index da6a8fc36d..bc5fe213a2 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 d320a180be80726d13b399b17dcaf226484dc362a8d7a1c6a9a9e3bd8eb184fd cjson-v1.4.7.tar.gz +sha256 0fcf35ce2f28d8696f9cd92a0845d6210d981e2be4c6c6d55692fe3714e5b79b cjson-v1.5.3.tar.gz diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 779cd3bb13..a562eb2a34 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.4.7 +CJSON_VERSION = v1.5.3 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT diff --git a/package/clamav/Config.in b/package/clamav/Config.in index 051df0d40e..a962103208 100644 --- a/package/clamav/Config.in +++ b/package/clamav/Config.in @@ -7,8 +7,8 @@ config BR2_PACKAGE_CLAMAV select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help - ClamAV is an open source antivirus engine for detecting trojans, - viruses, malware & other malicious threats. + ClamAV is an open source antivirus engine for detecting + trojans, viruses, malware & other malicious threats. http://www.clamav.net diff --git a/package/clapack/Config.in b/package/clapack/Config.in index 7d1f9401ae..e5be0b6441 100644 --- a/package/clapack/Config.in +++ b/package/clapack/Config.in @@ -23,10 +23,11 @@ config BR2_PACKAGE_CLAPACK_ARITH_H string "Custom BLAS arith.h" depends on BR2_PACKAGE_CLAPACK help - To optimize BLAS library for the hardware, an 'arith.h' header should - be provided. + To optimize BLAS library for the hardware, an 'arith.h' header + should be provided. If empty, the library will not be optimized by the compiler. - In any case an 'arithchk' program is built (but not installed), to be run - on the target to generate this arith.h header. + In any case an 'arithchk' program is built + (but not installed), to be run on the target to generate this + arith.h header. diff --git a/package/collectd/Config.in b/package/collectd/Config.in index d270494a07..ccd3fbe13f 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -89,8 +89,8 @@ config BR2_PACKAGE_COLLECTD_SYSLOG config BR2_PACKAGE_COLLECTD_THRESHOLD bool "threshold" help - Checks values against configured thresholds and creates notifications - if values are out of bounds. + Checks values against configured thresholds and creates + notifications if values are out of bounds. endmenu @@ -140,17 +140,20 @@ config BR2_PACKAGE_COLLECTD_CGROUPS config BR2_PACKAGE_COLLECTD_CONNTRACK bool "conntrack" help - Collects the number of entries in Linux's connection tracking table. + Collects the number of entries in Linux's connection tracking + table. config BR2_PACKAGE_COLLECTD_CONTEXTSWITCH bool "contextswitch" help - Collects the number of context switches done by the operating system. + Collects the number of context switches done by the operating + system. config BR2_PACKAGE_COLLECTD_CPU bool "cpu" help - Collects the amount of time spent by the CPU in various states. + Collects the amount of time spent by the CPU in various + states. config BR2_PACKAGE_COLLECTD_CPUFREQ bool "cpufreq" @@ -229,7 +232,8 @@ config BR2_PACKAGE_COLLECTD_FHCOUNT config BR2_PACKAGE_COLLECTD_FILECOUNT bool "filecount" help - Counts the number of files in a directory and all its subdirectories. + Counts the number of files in a directory and all its + subdirectories. config BR2_PACKAGE_COLLECTD_FSCACHE bool "fscache" @@ -323,7 +327,8 @@ config BR2_PACKAGE_COLLECTD_MYSQL depends on BR2_TOOLCHAIN_HAS_THREADS # mysql select BR2_PACKAGE_MYSQL help - Connects to a MySQL database and issues a "show status" command. + Connects to a MySQL database and issues a "show status" + command. config BR2_PACKAGE_COLLECTD_NETLINK bool "netlink" @@ -334,7 +339,8 @@ config BR2_PACKAGE_COLLECTD_NETLINK config BR2_PACKAGE_COLLECTD_NFS bool "nfs" help - Collects information about the usage of the Network File System. + Collects information about the usage of the Network File + System. config BR2_PACKAGE_COLLECTD_NGINX bool "nginx" @@ -358,7 +364,8 @@ config BR2_PACKAGE_COLLECTD_OPENLDAP depends on BR2_USE_WCHAR select BR2_PACKAGE_OPENLDAP help - Read monitoring information from OpenLDAP's cn=Monitor subtree. + Read monitoring information from OpenLDAP's cn=Monitor + subtree. comment "openldap support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR @@ -409,8 +416,8 @@ config BR2_PACKAGE_COLLECTD_SMART depends on BR2_PACKAGE_HAS_UDEV # libatasmart select BR2_PACKAGE_LIBATASMART help - Collect SMART statistics, notably load cycle count, temperature - and bad sectors. + Collect SMART statistics, notably load cycle count, + temperature and bad sectors. comment "SMART requires udev to be enabled" depends on !BR2_PACKAGE_HAS_UDEV @@ -445,8 +452,8 @@ config BR2_PACKAGE_COLLECTD_TAIL config BR2_PACKAGE_COLLECTD_TAIL_CSV bool "tail csv" help - Follows (tails) files in CSV format, parses each line and submits - extracted values. + Follows (tails) files in CSV format, parses each line and + submits extracted values. config BR2_PACKAGE_COLLECTD_TCPCONNS bool "tcpconns" @@ -516,7 +523,8 @@ comment "Select at least one for collectd to be useful" config BR2_PACKAGE_COLLECTD_CSV bool "csv" help - Writes values to a plain-text file in Comma Separated Values format. + Writes values to a plain-text file in Comma Separated Values + format. config BR2_PACKAGE_COLLECTD_GRAPHITE bool "graphite" @@ -555,7 +563,8 @@ config BR2_PACKAGE_COLLECTD_RIEMANN select BR2_PACKAGE_RIEMANN_C_CLIENT select BR2_PACKAGE_LIBTOOL help - Sends data to Riemann, a stream processing and monitoring system. + Sends data to Riemann, a stream processing and monitoring + system. config BR2_PACKAGE_COLLECTD_UNIXSOCK bool "unixsock" @@ -567,7 +576,8 @@ config BR2_PACKAGE_COLLECTD_WRITEHTTP bool "write_http" select BR2_PACKAGE_LIBCURL help - Sends values collected to a web-server using HTTP POST and PUTVAL. + Sends values collected to a web-server using HTTP POST and + PUTVAL. config BR2_PACKAGE_COLLECTD_WRITELOG bool "write_log" @@ -592,14 +602,14 @@ comment "write_prometheus needs a toolchain w/ C++, host gcc >= 4.5" config BR2_PACKAGE_COLLECTD_WRITESENSU bool "write_sensu" help - Sends data to Sensu, a stream processing and monitoring system, - via the Sensu client local TCP socket. + Sends data to Sensu, a stream processing and monitoring + system, via the Sensu client local TCP socket. config BR2_PACKAGE_COLLECTD_WRITETSDB bool "write_tsdb" help - Sends data OpenTSDB, a scalable no master, no shared state time - series database. + Sends data OpenTSDB, a scalable no master, no shared state + time series database. endmenu diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash index 37d630bba9..472cab55f5 100644 --- a/package/coreutils/coreutils.hash +++ b/package/coreutils/coreutils.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e coreutils-8.26.tar.xz +sha256 8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b coreutils-8.27.tar.xz diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 0769bca0d6..14b952f5a1 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -COREUTILS_VERSION = 8.26 +COREUTILS_VERSION = 8.27 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ diff --git a/package/cppdb/Config.in b/package/cppdb/Config.in index 9037a7a0c6..ceff0ab76f 100644 --- a/package/cppdb/Config.in +++ b/package/cppdb/Config.in @@ -7,9 +7,10 @@ config BR2_PACKAGE_CPPDB # Can be built without them but it's useless depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE help - CppDB is an SQL connectivity library that is designed to provide - platform and Database independent connectivity API similarly - to what JDBC, ODBC and other connectivity libraries do. + CppDB is an SQL connectivity library that is designed to + provide platform and Database independent connectivity API + similarly to what JDBC, ODBC and other connectivity libraries + do. http://cppcms.com/sql/cppdb/ diff --git a/package/cpuload/Config.in b/package/cpuload/Config.in index 82bc450afa..9a7b4e9f42 100644 --- a/package/cpuload/Config.in +++ b/package/cpuload/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_CPULOAD bool "cpuload" help - cpuload is a simple tool to obtain intuitive vision of CPU load - (including total, user, system, irq and softirq) within a certain - time, which is especially useful for embedded system without GUI. + cpuload is a simple tool to obtain intuitive vision of CPU + load (including total, user, system, irq and softirq) within a + certain time, which is especially useful for embedded system + without GUI. https://github.com/kelvincheung/cpuload diff --git a/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch b/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch new file mode 100644 index 0000000000..6180c4ba55 --- /dev/null +++ b/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch @@ -0,0 +1,106 @@ +From 47e5dec521ab6243c9b249dd65b93d232d90d6b1 Mon Sep 17 00:00:00 2001 +From: Jan Dittberner +Date: Thu, 25 Aug 2016 17:13:49 +0200 +Subject: [PATCH] Apply patch to fix CVE-2016-6318 + +This patch fixes an issue with a stack-based buffer overflow whne +parsing large GECOS field. See +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 and +https://security-tracker.debian.org/tracker/CVE-2016-6318 for more +information. + +Signed-off-by: Stefan Sørensen +--- + +Status: upstream, not yet released. + + lib/fascist.c | 57 ++++++++++++++++++++++++++++++++----------------------- + 2 files changed, 34 insertions(+), 24 deletions(-) + +diff --git a/lib/fascist.c b/lib/fascist.c +index a996509..d4deb15 100644 +--- a/lib/fascist.c ++++ b/lib/fascist.c +@@ -502,7 +502,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos) + char gbuffer[STRINGSIZE]; + char tbuffer[STRINGSIZE]; + char *uwords[STRINGSIZE]; +- char longbuffer[STRINGSIZE * 2]; ++ char longbuffer[STRINGSIZE]; + + if (gecos == NULL) + gecos = ""; +@@ -583,38 +583,47 @@ FascistGecosUser(char *password, const char *user, const char *gecos) + { + for (i = 0; i < j; i++) + { +- strcpy(longbuffer, uwords[i]); +- strcat(longbuffer, uwords[j]); +- +- if (GTry(longbuffer, password)) ++ if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE) + { +- return _("it is derived from your password entry"); +- } ++ strcpy(longbuffer, uwords[i]); ++ strcat(longbuffer, uwords[j]); + +- strcpy(longbuffer, uwords[j]); +- strcat(longbuffer, uwords[i]); ++ if (GTry(longbuffer, password)) ++ { ++ return _("it is derived from your password entry"); ++ } + +- if (GTry(longbuffer, password)) +- { +- return _("it's derived from your password entry"); +- } ++ strcpy(longbuffer, uwords[j]); ++ strcat(longbuffer, uwords[i]); + +- longbuffer[0] = uwords[i][0]; +- longbuffer[1] = '\0'; +- strcat(longbuffer, uwords[j]); ++ if (GTry(longbuffer, password)) ++ { ++ return _("it's derived from your password entry"); ++ } ++ } + +- if (GTry(longbuffer, password)) ++ if (strlen(uwords[j]) < STRINGSIZE - 1) + { +- return _("it is derivable from your password entry"); ++ longbuffer[0] = uwords[i][0]; ++ longbuffer[1] = '\0'; ++ strcat(longbuffer, uwords[j]); ++ ++ if (GTry(longbuffer, password)) ++ { ++ return _("it is derivable from your password entry"); ++ } + } + +- longbuffer[0] = uwords[j][0]; +- longbuffer[1] = '\0'; +- strcat(longbuffer, uwords[i]); +- +- if (GTry(longbuffer, password)) ++ if (strlen(uwords[i]) < STRINGSIZE - 1) + { +- return _("it's derivable from your password entry"); ++ longbuffer[0] = uwords[j][0]; ++ longbuffer[1] = '\0'; ++ strcat(longbuffer, uwords[i]); ++ ++ if (GTry(longbuffer, password)) ++ { ++ return _("it's derivable from your password entry"); ++ } + } + } + } +-- +2.9.3 + diff --git a/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch b/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch new file mode 100644 index 0000000000..63525cc73d --- /dev/null +++ b/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch @@ -0,0 +1,40 @@ +From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001 +From: Jan Dittberner +Date: Thu, 25 Aug 2016 17:17:53 +0200 +Subject: [PATCH] Fix a buffer overflow processing long words + +A buffer overflow processing long words has been discovered. This commit +applies the patch from +https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch +by Howard Guo. + +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and +http://www.openwall.com/lists/oss-security/2016/08/23/8 + +Signed-off-by: Stefan Sørensen +--- + +Status: upstream, not yet released. + + lib/rules.c | 5 ++--- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/rules.c b/lib/rules.c +index d193cc0..3a2aa46 100644 +--- a/lib/rules.c ++++ b/lib/rules.c +@@ -434,9 +434,8 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ + { + int limit; + register char *ptr; +- static char area[STRINGSIZE]; +- char area2[STRINGSIZE]; +- area[0] = '\0'; ++ static char area[STRINGSIZE * 2] = {0}; ++ char area2[STRINGSIZE * 2] = {0}; + strcpy(area, input); + + for (ptr = control; *ptr; ptr++) +-- +2.9.3 + diff --git a/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch b/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch new file mode 100644 index 0000000000..b05a69caa2 --- /dev/null +++ b/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch @@ -0,0 +1,30 @@ +From d27062fe7a520d5791f7a56d175a5cb6a39bae61 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= +Date: Tue, 18 Apr 2017 12:00:39 +0200 +Subject: [PATCH] Force grep to treat the input as text when formatting word + files. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Stefan Sørensen +--- + util/cracklib-format | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/cracklib-format b/util/cracklib-format +index 1d7be5b..b1de8e8 100644 +--- a/util/cracklib-format ++++ b/util/cracklib-format +@@ -4,7 +4,7 @@ + # into cracklib-packer + # + gzip -cdf "$@" | +- grep -v '^\(#\|$\)' | ++ grep -a -v '^\(#\|$\)' | + tr '[A-Z]' '[a-z]' | + tr -cd '\012[a-z][0-9]' | + env LC_ALL=C sort -u +-- +2.9.3 + diff --git a/package/cracklib/Config.in b/package/cracklib/Config.in new file mode 100644 index 0000000000..4a0f43f46a --- /dev/null +++ b/package/cracklib/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_CRACKLIB + bool "cracklib" + help + CrackLib tests passwords to determine whether they match + certain security-oriented characteristics, with the purpose + of stopping users from choosing passwords that are easy to + guess. CrackLib performs several tests on passwords: it + tries to generate words from a username and gecos entry and + checks those words against the password; it checks for + simplistic patterns in passwords; and it checks for the + password in a dictionary. + + https://github.com/cracklib/cracklib + +if BR2_PACKAGE_CRACKLIB + +config BR2_PACKAGE_CRACKLIB_TOOLS + bool "install tools" + help + Install cracklib command line tools for creating dicts. + +config BR2_PACKAGE_CRACKLIB_FULL_DICT + bool "full dict" + help + Install the full cracklib dict (requires about 8Mb extra + target space). + +endif diff --git a/package/cracklib/cracklib.hash b/package/cracklib/cracklib.hash new file mode 100644 index 0000000000..3038a47a36 --- /dev/null +++ b/package/cracklib/cracklib.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 17cf76943de272fd579ed831a1fd85339b393f8d00bf9e0d17c91e972f583343 cracklib-2.9.6.tar.gz +sha256 27973245225eeb9d0090e97f3dea4197dec99b64d9d3a791a60298f3b021824c cracklib-words-2.9.6.gz diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk new file mode 100644 index 0000000000..2fa3d3b4ea --- /dev/null +++ b/package/cracklib/cracklib.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# cracklib +# +################################################################################ + +CRACKLIB_VERSION = 2.9.6 +CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/cracklib-$(CRACKLIB_VERSION) +CRACKLIB_LICENSE = LGPL-2.1 +CRACKLIB_LICENSE_FILES = COPYING.LIB +CRACKLIB_INSTALL_STAGING = YES +CRACKLIB_DEPENDENCIES = host-cracklib + +ifeq ($(BR2_PACKAGE_ZLIB),y) +CRACKLIB_CONF_OPTS += --with-zlib +CRACKLIB_DEPENDENCIES += zlib +else +CRACKLIB_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_PYTHON),y) +CRACKLIB_CONF_OPTS += --with-python +CRACKLIB_DEPENDENCIES += python +else +CRACKLIB_CONF_OPTS += --without-python +endif + +HOST_CRACKLIB_CONF_OPTS += --without-python --without-zlib + +ifeq ($(BR2_PACKAGE_CRACKLIB_FULL_DICT),y) +CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).gz +CRACKLIB_DICT_SOURCE = $(DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).gz +else +CRACKLIB_DICT_SOURCE = $(@D)/dicts/cracklib-small +endif + +ifeq ($(BR2_PACKAGE_CRACKLIB_TOOLS),) +define CRACKLIB_REMOVE_TOOLS + rm -f $(TARGET_DIR)/usr/sbin/*cracklib* +endef +CRACKLIB_POST_INSTALL_TARGET_HOOKS += CRACKLIB_REMOVE_TOOLS +endif + +define CRACKLIB_BUILD_DICT + $(HOST_MAKE_ENV) cracklib-format $(CRACKLIB_DICT_SOURCE) | \ + $(HOST_MAKE_ENV) cracklib-packer $(TARGET_DIR)/usr/share/cracklib/pw_dict + rm $(TARGET_DIR)/usr/share/cracklib/cracklib-small +endef +CRACKLIB_POST_INSTALL_TARGET_HOOKS += CRACKLIB_BUILD_DICT + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/crda/Config.in b/package/crda/Config.in index 2cb040372f..b9a2613f04 100644 --- a/package/crda/Config.in +++ b/package/crda/Config.in @@ -12,8 +12,8 @@ config BR2_PACKAGE_CRDA This package provides a Central Regulatory Domain Agent (CRDA) to be used by the Linux kernel cf80211 wireless subsystem to - query and apply the regulatory domain settings wireless devices - may operate within for a given location. + query and apply the regulatory domain settings wireless + devices may operate within for a given location. http://linuxwireless.org/en/developers/Regulatory/CRDA diff --git a/package/cryptodev/Config.in b/package/cryptodev/Config.in index 9f9df02fc3..d1e64498a8 100644 --- a/package/cryptodev/Config.in +++ b/package/cryptodev/Config.in @@ -31,8 +31,8 @@ config BR2_PACKAGE_OCF_LINUX select BR2_PACKAGE_HAS_CRYPTODEV help OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic - Framework (OCF). This port aims to bring full asynchronous HW/SW - crypto acceleration to the Linux kernel and applications + Framework (OCF). This port aims to bring full asynchronous + HW/SW crypto acceleration to the Linux kernel and applications running under Linux. http://ocf-linux.sourceforge.net/ diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index f328bc3d8a..6d0fb58945 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/sha256sums.asc -sha256 7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016 cryptsetup-1.7.4.tar.xz +sha256 2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd cryptsetup-1.7.5.tar.xz diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index a3358a9202..787331c14a 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 1.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).5 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \ diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in index c2d591a9a0..986faf157c 100644 --- a/package/curlftpfs/Config.in +++ b/package/curlftpfs/Config.in @@ -11,8 +11,8 @@ config BR2_PACKAGE_CURLFTPFS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBCURL help - CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE - and libcurl. + CurlFtpFS is a filesystem for accessing FTP hosts based on + FUSE and libcurl. http://curlftpfs.sourceforge.net/ diff --git a/package/cvs/Config.in b/package/cvs/Config.in index 0036961601..e8f0606ecc 100644 --- a/package/cvs/Config.in +++ b/package/cvs/Config.in @@ -5,7 +5,8 @@ config BR2_PACKAGE_CVS depends on BR2_USE_MMU select BR2_PACKAGE_NCURSES help - Concurrent Versions System - source code revision control tools. + Concurrent Versions System - source code revision control + tools. http://www.nongnu.org/cvs/ diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 03b7dbbcdb..50c05ebd91 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -6,8 +6,8 @@ config BR2_PACKAGE_CWIID depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2 select BR2_PACKAGE_BLUEZ_UTILS help - A collection of Linux tools written in C for interfacing to the - Nintendo Wiimote. + A collection of Linux tools written in C for interfacing to + the Nintendo Wiimote. http://abstrakraft.org/cwiid/ diff --git a/package/dbus-triggerd/Config.in b/package/dbus-triggerd/Config.in index a39f911fdb..331c414704 100644 --- a/package/dbus-triggerd/Config.in +++ b/package/dbus-triggerd/Config.in @@ -4,8 +4,8 @@ config BR2_PACKAGE_DBUS_TRIGGERD depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_PACKAGE_DBUS help - dbus-triggerd is a tool to trigger shell-commands upon receiving - a given dbus-signal. + dbus-triggerd is a tool to trigger shell-commands upon + receiving a given dbus-signal. http://gareus.org/oss/dbustriggerd/start diff --git a/package/ddrescue/Config.in b/package/ddrescue/Config.in index 2ec3e7e303..a58561cb9b 100644 --- a/package/ddrescue/Config.in +++ b/package/ddrescue/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_DDRESCUE bool "ddrescue" depends on BR2_INSTALL_LIBSTDCPP help - GNU ddrescue is a data recovery tool. It copies data from one file - or block device (hard disc, cdrom, etc) to another, trying to - rescue the good parts first in case of read errors. + GNU ddrescue is a data recovery tool. It copies data from one + file or block device (hard disc, cdrom, etc) to another, + trying to rescue the good parts first in case of read errors. http://www.gnu.org/software/ddrescue/ddrescue.html diff --git a/package/dejavu/dejavu.hash b/package/dejavu/dejavu.hash index 37868c13d8..db7365a1c3 100644 --- a/package/dejavu/dejavu.hash +++ b/package/dejavu/dejavu.hash @@ -1,2 +1,2 @@ -# From http://dejavu-fonts.org/wiki/Download -sha256 f6d7965586101ff3a8a5c3ec503e082bb6a9604ff53413e10702e5917c194d88 dejavu-fonts-ttf-2.35.tar.bz2 +# From https://dejavu-fonts.github.io/Download.html +sha256 fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7 dejavu-fonts-ttf-2.37.tar.bz2 diff --git a/package/dejavu/dejavu.mk b/package/dejavu/dejavu.mk index 3dbcc94e16..9b57f0992e 100644 --- a/package/dejavu/dejavu.mk +++ b/package/dejavu/dejavu.mk @@ -4,8 +4,8 @@ # ################################################################################ -DEJAVU_VERSION = 2.35 -DEJAVU_SITE = http://sourceforge.net/projects/dejavu/files/dejavu/$(DEJAVU_VERSION) +DEJAVU_VERSION = 2.37 +DEJAVU_SITE = https://sourceforge.net/projects/dejavu/files/dejavu/$(DEJAVU_VERSION) DEJAVU_SOURCE = dejavu-fonts-ttf-$(DEJAVU_VERSION).tar.bz2 DEJAVU_LICENSE_FILES = LICENSE diff --git a/package/dialog/Config.in b/package/dialog/Config.in index 73b71766e7..830427e53d 100644 --- a/package/dialog/Config.in +++ b/package/dialog/Config.in @@ -6,8 +6,9 @@ config BR2_PACKAGE_DIALOG help dialog - display dialog boxes from shell scripts - This application provides a method of displaying several different - types of dialog boxes from shell scripts. This allows a developer - of a script to interact with the user in a much friendlier manner. + This application provides a method of displaying several + different types of dialog boxes from shell scripts. This + allows a developer of a script to interact with the user in a + much friendlier manner. http://invisible-island.net/dialog/dialog.html diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 75a79189c8..ac42784690 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 1d98ec7cc81f11f9019fa0b90f1afdaa86579cae1ce8869a6fd61deb9d4b887a dialog-1.2-20150125.tgz +sha256 2ff1ba74c632b9d13a0d0d2c942295dd4e8909694eeeded7908a467d0bcd4756 dialog-1.3-20170509.tgz diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index f1c0e4c06e..61ec2659a2 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.2-20150125 +DIALOG_VERSION = 1.3-20170509 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = ftp://invisible-island.net/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash index 7e99f1fc65..5506ab275a 100644 --- a/package/diffutils/diffutils.hash +++ b/package/diffutils/diffutils.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 diffutils-3.5.tar.xz +sha256 d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6 diffutils-3.6.tar.xz diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index dee3faca18..4662e2bc3a 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.5 +DIFFUTILS_VERSION = 3.6 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index eef9f5c041..216e036577 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES bool "directfb examples" depends on BR2_PACKAGE_DIRECTFB help - The DirectFB-examples package contains a set of simple DirectFB - applications that can be used to test and demonstrate various - DirectFB features. + The DirectFB-examples package contains a set of simple + DirectFB applications that can be used to test and demonstrate + various DirectFB features. http://directfb.org/downloads/Extras/README.DirectFB-examples diff --git a/package/directfb/Config.in b/package/directfb/Config.in index e3b53e0a87..554abe2896 100644 --- a/package/directfb/Config.in +++ b/package/directfb/Config.in @@ -9,11 +9,13 @@ config BR2_PACKAGE_DIRECTFB select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_ZLIB help - DirectFB (Direct Frame Buffer) is a set of graphics APIs implemented - on top of the Linux Frame Buffer (fbdev) abstraction layer. It is an - alternative to X11 with a smaller memory footprint that still has an - integrated windowing system. As of 4 October 2015, DirectFB's website - http://www.directfb.org/ is down. See alternative site listed below. + DirectFB (Direct Frame Buffer) is a set of graphics APIs + implemented on top of the Linux Frame Buffer (fbdev) + abstraction layer. It is an alternative to X11 with a smaller + memory footprint that still has an integrated windowing + system. As of 4 October 2015, DirectFB's website + http://www.directfb.org/ is down. See alternative site listed + below. http://elinux.org/DirectFB diff --git a/package/dmalloc/Config.in b/package/dmalloc/Config.in index 03d9f975f3..e5be109332 100644 --- a/package/dmalloc/Config.in +++ b/package/dmalloc/Config.in @@ -5,9 +5,9 @@ config BR2_PACKAGE_DMALLOC # different segments". depends on !(BR2_microblaze && BR2_ENABLE_DEBUG) help - A debug memory allocation library which is a drop in replacement for - the system's malloc, realloc, calloc, free and other memory management - routines while providing powerful debugging facilities configurable at - runtime. + A debug memory allocation library which is a drop in + replacement for the system's malloc, realloc, calloc, free and + other memory management routines while providing powerful + debugging facilities configurable at runtime. http://dmalloc.com/ diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index 307c306ad7..1e8154b37d 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,2 +1,2 @@ -# http://http.debian.net/debian/pool/main/d/dmidecode/dmidecode_3.0-2.dsc -sha256 7ec35bb193729c1d593a1460b59d82d24b89102ab23fd0416e6cf4325d077e45 dmidecode-3.0.tar.xz +# Locally computed +sha256 d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0 dmidecode-3.1.tar.xz diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index b6c59db702..b6f96b6df8 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.0 +DMIDECODE_VERSION = 3.1 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in index 583f3f272c..d0acc4fd29 100644 --- a/package/dmraid/Config.in +++ b/package/dmraid/Config.in @@ -6,8 +6,9 @@ config BR2_PACKAGE_DMRAID depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 select BR2_PACKAGE_LVM2 help - dmraid discovers, activates, deactivates and displays properties - of software RAID sets (eg, ATARAID) and contained DOS partitions. + dmraid discovers, activates, deactivates and displays + properties of software RAID sets (eg, ATARAID) and contained + DOS partitions. dmraid uses the Linux device-mapper to create devices with respective mappings for the ATARAID sets discovered. diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in index b4f34b8d2b..936b1de509 100644 --- a/package/dnsmasq/Config.in +++ b/package/dnsmasq/Config.in @@ -34,7 +34,8 @@ config BR2_PACKAGE_DNSMASQ_IDN select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Enable IDN support in dnsmasq. - This option is a big space taker since it pulls in many libraries. + This option is a big space taker since it pulls in many + libraries. config BR2_PACKAGE_DNSMASQ_LUA bool "Lua scripting support" diff --git a/package/doom-wad/Config.in b/package/doom-wad/Config.in index edd299b5e8..6f51cfb936 100644 --- a/package/doom-wad/Config.in +++ b/package/doom-wad/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_DOOM_WAD bool "shareware Doom WAD file" depends on BR2_PACKAGE_CHOCOLATE_DOOM || BR2_PACKAGE_PRBOOM help - This will install the shareware wad data file for the doom game. + This will install the shareware wad data file for the doom + game. - The wad file will be placed in the /usr/share/games/doom directory. + The wad file will be placed in the /usr/share/games/doom + directory. diff --git a/package/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch b/package/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch deleted file mode 100644 index ff3c3ffa44..0000000000 --- a/package/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1e76e5778a1885452939a79d9145b80634a5b023 Mon Sep 17 00:00:00 2001 -From: Andreas Bombe -Date: Wed, 11 May 2016 03:44:58 +0200 -Subject: [PATCH] mkfs: Default to 64/32 heads/sectors for targets smaller than - 512 MB - -This may put defaults in certain use cases a little bit more in line -with the old defaults in versions up to 3.0.28. It has mostly aesthetic -value in most cases. - -Signed-off-by: Andreas Bombe -Signed-off-by: Gustavo Zacarias ---- -Patch status: upstream - - src/mkfs.fat.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c -index 8a320fd..bad492b 100644 ---- a/src/mkfs.fat.c -+++ b/src/mkfs.fat.c -@@ -519,6 +519,16 @@ static void establish_params(struct device_info *info) - unsigned int cluster_size = 4; /* starting point for FAT12 and FAT16 */ - int def_root_dir_entries = 512; - -+ if (info->size < 512 * 1024 * 1024) { -+ /* -+ * These values are more or less meaningless, but we can at least -+ * use less extreme values for smaller filesystems where the large -+ * dummy values signifying LBA only access are not needed. -+ */ -+ sec_per_track = 32; -+ heads = 64; -+ } -+ - if (info->type != TYPE_FIXED) { - /* enter default parameters for floppy disks if the size matches */ - switch (info->size / 1024) { --- -2.7.3 - diff --git a/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch b/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch deleted file mode 100644 index 9740304603..0000000000 --- a/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 06ce096dabd8a29c72dc0bc5110d2c4867baa490 Mon Sep 17 00:00:00 2001 -From: Alessio Sergi -Date: Fri, 6 May 2016 18:18:18 +0200 -Subject: [PATCH] src/device_info.c: Fix undefined PATH_MAX under musl - -In musl libc, PATH_MAX is defined in . - -Status: pending -https://github.com/dosfstools/dosfstools/pull/27 - -[Romain: add patch status] -Signed-off-by: Romain Naour ---- - src/device_info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/device_info.c b/src/device_info.c -index f5d11ac..cd57388 100644 ---- a/src/device_info.c -+++ b/src/device_info.c -@@ -17,6 +17,7 @@ - */ - - -+#include - #include - #include - #include --- -2.5.5 - diff --git a/package/dosfstools/dosfstools.hash b/package/dosfstools/dosfstools.hash index 777b8d9e3f..2515ea68c3 100644 --- a/package/dosfstools/dosfstools.hash +++ b/package/dosfstools/dosfstools.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf dosfstools-4.0.tar.xz +sha256 e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173 dosfstools-4.1.tar.xz diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index c2e16906e6..6eb0851d0e 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOSFSTOOLS_VERSION = 4.0 +DOSFSTOOLS_VERSION = 4.1 DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) DOSFSTOOLS_LICENSE = GPL-3.0+ diff --git a/package/dovecot-pigeonhole/Config.in b/package/dovecot-pigeonhole/Config.in index 83f528766a..bd6826b412 100644 --- a/package/dovecot-pigeonhole/Config.in +++ b/package/dovecot-pigeonhole/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_DOVECOT_PIGEONHOLE bool "dovecot-pigeonhole" help - Pigeonhole is the name of the project that adds support for the Sieve - language (RFC 5228) and the ManageSieve protocol (RFC 5804) to the - Dovecot Secure IMAP Server. + Pigeonhole is the name of the project that adds support for + the Sieve language (RFC 5228) and the ManageSieve protocol + (RFC 5804) to the Dovecot Secure IMAP Server. http://pigeonhole.dovecot.org diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index b93e09fcec..377fd4dbb8 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -5,11 +5,11 @@ config BR2_PACKAGE_DOVECOT select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help - Dovecot is an open source IMAP and POP3 email server for Linux/UNIX- - like systems, written with security primarily in mind. Dovecot is an - excellent choice for both small and large installations. It's fast, - simple to set up, requires no special administration and it uses very - little memory. + Dovecot is an open source IMAP and POP3 email server for + Linux/UNIX- like systems, written with security primarily in + mind. Dovecot is an excellent choice for both small and large + installations. It's fast, simple to set up, requires no + special administration and it uses very little memory. http://www.dovecot.org diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 46e7c5aa8a..8c6e14ea38 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,2 +1,2 @@ # Locally computed after checking signature -sha256 ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 dovecot-2.2.29.1.tar.gz +sha256 126b07cbf4c313e8fc6df273282f60710b453a7a678f502fd45c2fa7192127f3 dovecot-2.2.30.tar.gz diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 3f71f68989..ace8cf041b 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).29.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).30 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1 diff --git a/package/drbd-utils/drbd-utils.hash b/package/drbd-utils/drbd-utils.hash index ebd13ef09e..0a38fdd396 100644 --- a/package/drbd-utils/drbd-utils.hash +++ b/package/drbd-utils/drbd-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 38929279d1bf549fd1ade4ce6773a6fe209db51bbb0efe7bf6d2b7871ba0afbc drbd-utils-8.9.4.tar.gz +sha256 297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913 drbd-utils-8.9.6.tar.gz diff --git a/package/drbd-utils/drbd-utils.mk b/package/drbd-utils/drbd-utils.mk index f71a4aeca6..7bac28bc89 100644 --- a/package/drbd-utils/drbd-utils.mk +++ b/package/drbd-utils/drbd-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DRBD_UTILS_VERSION = 8.9.4 +DRBD_UTILS_VERSION = 8.9.6 DRBD_UTILS_SITE = http://oss.linbit.com/drbd DRBD_UTILS_LICENSE = GPL-2.0+ DRBD_UTILS_LICENSE_FILES = COPYING diff --git a/package/dstat/Config.in b/package/dstat/Config.in index 6536a5e544..110aee844b 100644 --- a/package/dstat/Config.in +++ b/package/dstat/Config.in @@ -6,19 +6,20 @@ config BR2_PACKAGE_DSTAT depends on !BR2_STATIC_LIBS # python select BR2_PACKAGE_PYTHON help - Dstat, written in Python, is a versatile replacement for vmstat, - iostat, netstat and ifstat. Dstat overcomes some of their limitations - and adds some extra features, more counters and flexibility. Dstat is - handy for monitoring systems during performance tuning tests, - benchmarks or troubleshooting. - Dstat allows you to view all of your system resources in real-time, - you can e.g. compare disk utilization in combination with interrupts - from your IDE controller, or compare the network bandwidth numbers - directly with the disk throughput (in the same interval). + Dstat, written in Python, is a versatile replacement for + vmstat, iostat, netstat and ifstat. Dstat overcomes some of + their limitations and adds some extra features, more counters + and flexibility. Dstat is handy for monitoring systems during + performance tuning tests, benchmarks or troubleshooting. + Dstat allows you to view all of your system resources in + real-time, you can e.g. compare disk utilization in + combination with interrupts from your IDE controller, or + compare the network bandwidth numbers directly with the disk + throughput (in the same interval). - Note that to get proper output, your terminal size should be known by - the termios subsystem. This can be done by running the 'resize' - utility of busybox. + Note that to get proper output, your terminal size should be + known by the termios subsystem. This can be done by running + the 'resize' utility of busybox. http://dag.wieers.com/home-made/dstat/ diff --git a/package/dstat/dstat.hash b/package/dstat/dstat.hash index f701561747..a4dbcc9819 100644 --- a/package/dstat/dstat.hash +++ b/package/dstat/dstat.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 34a986d9d7c028bd9dcb6b2ef1c740f7220de5c9cf976870a2b62aca23b33bae dstat-0.7.2.tar.bz2 +sha256 46e63821857b69fbc60cb2c7d893ccdd6f31cd9ef24b8bb0b68951e1c7374898 dstat-0.7.3.tar.gz diff --git a/package/dstat/dstat.mk b/package/dstat/dstat.mk index b535328972..9c4b44576b 100644 --- a/package/dstat/dstat.mk +++ b/package/dstat/dstat.mk @@ -4,9 +4,8 @@ # ################################################################################ -DSTAT_VERSION = 0.7.2 -DSTAT_SOURCE = dstat-$(DSTAT_VERSION).tar.bz2 -DSTAT_SITE = http://dag.wieers.com/home-made/dstat +DSTAT_VERSION = 0.7.3 +DSTAT_SITE = $(call github,dagwieers,dstat,$(DSTAT_VERSION)) DSTAT_LICENSE = GPL-2.0 DSTAT_LICENSE_FILES = COPYING diff --git a/package/dtach/Config.in b/package/dtach/Config.in index bea112b36d..3e6e4934cf 100644 --- a/package/dtach/Config.in +++ b/package/dtach/Config.in @@ -2,8 +2,9 @@ config BR2_PACKAGE_DTACH bool "dtach" depends on BR2_USE_MMU # fork() help - dtach is a tiny program that emulates the detach feature of screen, - allowing you to run a program in an environment that is protected - from the controlling terminal and attach to it later. + dtach is a tiny program that emulates the detach feature of + screen, allowing you to run a program in an environment that + is protected from the controlling terminal and attach to it + later. http://dtach.sourceforge.net/ diff --git a/package/dtc/Config.in b/package/dtc/Config.in index 39223f7226..73bd36883b 100644 --- a/package/dtc/Config.in +++ b/package/dtc/Config.in @@ -6,7 +6,8 @@ config BR2_PACKAGE_DTC a given format and outputs a device-tree in another format. Note that only the library is installed. - If you want the programs, say 'y' here, and to "dtc programs", below. + If you want the programs, say 'y' here, and to "dtc programs", + below. https://git.kernel.org/cgit/utils/dtc/dtc.git @@ -19,13 +20,14 @@ config BR2_PACKAGE_DTC_PROGRAMS - convert-dtsv0 convert from version 0 to version 1 - dtc the device tree compiler - dtdiff compare two device trees (needs bash) - - fdtdump print a readable version of a flat device tree + - fdtdump print a readable version of a + flat device tree - fdtget read values from device tree - fdtput write a property value to a device tree - Note: dtdiff requires bash, so if bash is not selected, dtdiff will - be removed from the target file system. Enable bash if you - need dtdiff on the target. + Note: dtdiff requires bash, so if bash is not selected, dtdiff + will be removed from the target file system. Enable bash if + you need dtdiff on the target. comment "dtdiff will not be installed: it requires bash" depends on BR2_PACKAGE_DTC_PROGRAMS diff --git a/package/dtc/Config.in.host b/package/dtc/Config.in.host index cbabf0a240..f80a49bb95 100644 --- a/package/dtc/Config.in.host +++ b/package/dtc/Config.in.host @@ -4,6 +4,7 @@ config BR2_PACKAGE_HOST_DTC The Device Tree Compiler, dtc, takes as input a device-tree in a given format and outputs a device-tree in another format. - Install host tools: dtc, convert-dtsv0, fdtdump, fdtget and fdtput. + Install host tools: dtc, convert-dtsv0, fdtdump, fdtget and + fdtput. https://git.kernel.org/cgit/utils/dtc/dtc.git diff --git a/package/dvblast/dvblast.hash b/package/dvblast/dvblast.hash index 198549f4c0..d6ec4cb036 100644 --- a/package/dvblast/dvblast.hash +++ b/package/dvblast/dvblast.hash @@ -1,4 +1,2 @@ -# from https://get.videolan.org/dvblast/3.0/dvblast-3.0.tar.bz2.md5 -md5 89ea9ffb16476d47b8853e52a8a3ee63 dvblast-3.0.tar.bz2 -# locally calculated -sha256 4fc3eb2a3d3545cb76a5c515a16671d1c34fe2f5dad57b71e89bd54c14c3045e dvblast-3.0.tar.bz2 +# From https://get.videolan.org/dvblast/3.1/dvblast-3.1.tar.bz2 +sha256 3159e8666a3b1822aeccd01684bdcad712a0da88d758bef6b7e2c396f27fd3e0 dvblast-3.1.tar.bz2 diff --git a/package/dvblast/dvblast.mk b/package/dvblast/dvblast.mk index 1247276b88..3cf24df248 100644 --- a/package/dvblast/dvblast.mk +++ b/package/dvblast/dvblast.mk @@ -4,7 +4,7 @@ # ################################################################################ -DVBLAST_VERSION = 3.0 +DVBLAST_VERSION = 3.1 DVBLAST_SOURCE = dvblast-$(DVBLAST_VERSION).tar.bz2 DVBLAST_SITE = https://get.videolan.org/dvblast/$(DVBLAST_VERSION) DVBLAST_LICENSE = GPL-2.0+, WTFPL diff --git a/package/dvbsnoop/Config.in b/package/dvbsnoop/Config.in index fc34c349f1..fb63fa4e8b 100644 --- a/package/dvbsnoop/Config.in +++ b/package/dvbsnoop/Config.in @@ -1,21 +1,21 @@ config BR2_PACKAGE_DVBSNOOP bool "dvbsnoop" help - Dvbsnoop is just a simple tool to analyze, view or debug a transport - stream (TS), program elementary stream (PES) or even a program stream - (PS). Dvbsnoop is trying to get input mostly direct from a frontend - (satellite or cable tuner inside a set-top box for example) via DVB - APIv3 to view into a TS, or a demux to view PES or PS (also mostly - inside the set-top box or even PCI Card or USB Plug) but also from a - file (recorded TS). - Dvbsnoop is working well on SD transport streams but may have some - limited functionality on HD transport streams (DVB-{C,S,T}2 because - of missing knowledge how to handle it. + Dvbsnoop is just a simple tool to analyze, view or debug a + transport stream (TS), program elementary stream (PES) or even + a program stream (PS). Dvbsnoop is trying to get input mostly + direct from a frontend (satellite or cable tuner inside a + set-top box for example) via DVB APIv3 to view into a TS, or a + demux to view PES or PS (also mostly inside the set-top box or + even PCI Card or USB Plug) but also from a file (recorded TS). + Dvbsnoop is working well on SD transport streams but may have + some limited functionality on HD transport streams + (DVB-{C,S,T}2 because of missing knowledge how to handle it. - Dvbsnoop itself doesn't do the tuning on the frontend, this has to be - done by external helpers or manually driver call. - The dvbsnoop tool was written while developing the software Neutrino - on the set-top box DBox2. + Dvbsnoop itself doesn't do the tuning on the frontend, this + has to be done by external helpers or manually driver call. + The dvbsnoop tool was written while developing the software + Neutrino on the set-top box DBox2. http://dvbsnoop.sourceforge.net http://en.wikipedia.org/wiki/DBox2 diff --git a/package/dvdauthor/0001-configure.ac-fix-static-build.patch b/package/dvdauthor/0001-configure.ac-fix-static-build.patch deleted file mode 100644 index 0e016b8cb4..0000000000 --- a/package/dvdauthor/0001-configure.ac-fix-static-build.patch +++ /dev/null @@ -1,55 +0,0 @@ -From da77704c575f0583fa871ff02bd52906a7979576 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 15 Feb 2015 11:05:43 +0100 -Subject: [PATCH] configure.ac: fix static build - -Add LT_INIT macro to handle --enable-shared option. - -If enable-shared=no then add --static flag to resolve FREETYPE_LIBS. - -Otherwise, dvdauthor forget to link witk -lbz2 when linking with freetype2. - -Fixes: -http://autobuild.buildroot.net/results/1d8/1d83390a3dd9f6bb595e9fc7b321500b4dc533a8/ - -Signed-off-by: Romain Naour ---- - configure.ac | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c43df92..d78d56a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,6 +4,7 @@ AM_CONFIG_HEADER(src/config.h) - AC_CONFIG_AUX_DIR(autotools) - - AM_INIT_AUTOMAKE -+LT_INIT - - AC_PROG_INSTALL - -@@ -39,6 +40,11 @@ PKG_CHECK_MODULES(LIBPNG, [libpng]) - AC_SUBST(LIBPNG_CFLAGS) - AC_SUBST(LIBPNG_LIBS) - -+config_static='' -+if test "$enable_shared" = 'no'; then -+ config_static='--static' -+fi -+ - usemagick=0 - - AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config]) -@@ -95,7 +101,7 @@ AC_SUBST(FRIBIDI_LIBS) - AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config]) - if test -n "$FREETYPECONFIG"; then - FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`" -- FREETYPE_LIBS="`$FREETYPECONFIG --libs`" -+ FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`" - AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available]) - - ac_save_CPPFLAGS="$CPPFLAGS" --- -1.9.3 - diff --git a/package/dvdauthor/Config.in b/package/dvdauthor/Config.in index 8b2bcb3d6f..9ba5411d6b 100644 --- a/package/dvdauthor/Config.in +++ b/package/dvdauthor/Config.in @@ -4,11 +4,12 @@ config BR2_PACKAGE_DVDAUTHOR select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBPNG help - DVDAuthor is a set of tools to help you author the file and directory - structure of a DVD-Video disc, including programmatic commands for - implementing interactive behaviour. It is driven by command lines and - XML control files, though there are other programs that provide - GUI-based front ends if you prefer + DVDAuthor is a set of tools to help you author the file and + directory structure of a DVD-Video disc, including + programmatic commands for implementing interactive behaviour. + It is driven by command lines and XML control files, though + there are other programs that provide GUI-based front ends + if you prefer http://dvdauthor.sourceforge.net diff --git a/package/dvdauthor/dvdauthor.hash b/package/dvdauthor/dvdauthor.hash index fe92b29c55..36d5d0e686 100644 --- a/package/dvdauthor/dvdauthor.hash +++ b/package/dvdauthor/dvdauthor.hash @@ -1,2 +1,5 @@ +# From https://sourceforge.net/projects/dvdauthor/files +md5 1173dcb8d40e74fc90c0f3a25dbd642d dvdauthor-0.7.2.tar.gz +sha1 0e605642140576bfb3e963414d77630d1c073a51 dvdauthor-0.7.2.tar.gz # Locally computed -sha256 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 dvdauthor-0.7.1.tar.gz +sha256 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7 dvdauthor-0.7.2.tar.gz diff --git a/package/dvdauthor/dvdauthor.mk b/package/dvdauthor/dvdauthor.mk index 689367d3fe..3f9c2186c1 100644 --- a/package/dvdauthor/dvdauthor.mk +++ b/package/dvdauthor/dvdauthor.mk @@ -4,8 +4,8 @@ # ################################################################################ -DVDAUTHOR_VERSION = 0.7.1 -DVDAUTHOR_SITE = http://sourceforge.net/projects/dvdauthor/files/dvdauthor/$(DVDAUTHOR_VERSION) +DVDAUTHOR_VERSION = 0.7.2 +DVDAUTHOR_SITE = https://sourceforge.net/projects/dvdauthor/files DVDAUTHOR_DEPENDENCIES = host-pkgconf libxml2 freetype libpng DVDAUTHOR_LICENSE = GPL-2.0+ DVDAUTHOR_LICENSE_FILES = COPYING @@ -14,11 +14,6 @@ DVDAUTHOR_CONF_ENV = \ ac_cv_path_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config \ ac_cv_prog_GMAGICKCONFIG= -# configure.ac patched by 0001-configure.ac-fix-static-build.patch -DVDAUTHOR_AUTORECONF = YES -# add host-gettext for AM_ICONV macro -DVDAUTHOR_DEPENDENCIES += host-gettext - ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) DVDAUTHOR_DEPENDENCIES += imagemagick DVDAUTHOR_CONF_ENV += \ diff --git a/package/ecryptfs-utils/ecryptfs-utils.hash b/package/ecryptfs-utils/ecryptfs-utils.hash index 40cc17cdd6..1e08661e25 100644 --- a/package/ecryptfs-utils/ecryptfs-utils.hash +++ b/package/ecryptfs-utils/ecryptfs-utils.hash @@ -1,2 +1,4 @@ -# From https://launchpad.net/ecryptfs/trunk/109/+download/ecryptfs-utils_109.orig.tar.gz/+md5 -md5 8e33f096c8cb8288f9c29a9936cd0d28 ecryptfs-utils_109.orig.tar.gz +# From https://launchpad.net/ecryptfs/trunk/111/+download/ecryptfs-utils_111.orig.tar.gz/+md5 +md5 83513228984f671930752c3518cac6fd ecryptfs-utils_111.orig.tar.gz +# Locally computed +sha256 112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f ecryptfs-utils_111.orig.tar.gz diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk index 334e1151c5..eb3194b6d0 100644 --- a/package/ecryptfs-utils/ecryptfs-utils.mk +++ b/package/ecryptfs-utils/ecryptfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ECRYPTFS_UTILS_VERSION = 109 +ECRYPTFS_UTILS_VERSION = 111 ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download ECRYPTFS_UTILS_LICENSE = GPL-2.0+ diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 39e0f9332c..eefcbefbbd 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,2 +1,2 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.19.0.tar.xz.sha256 -sha256 a4e0341081778007db414f8cd4e3b77b9d5398870292cab67e6b40cc1445eadf efl-1.19.0.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.19.1.tar.xz.sha256 +sha256 8c69eaf5f3489245dff6112394bf3685fb9d6fd3915035fe022f27c554e6cd3a efl-1.19.1.tar.xz diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 04e15f5092..766b3590e3 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.19.0 +EFL_VERSION = 1.19.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+ diff --git a/package/eigen/eigen.hash b/package/eigen/eigen.hash new file mode 100644 index 0000000000..6320a6ec30 --- /dev/null +++ b/package/eigen/eigen.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 a4143fc45e4454b4b98fcea3516b3a79b8cdb3bc7fadf996d088c6a0d805fea1 3.3.3.tar.bz2 diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk index 6ae29118b3..79f02e42a6 100644 --- a/package/eigen/eigen.mk +++ b/package/eigen/eigen.mk @@ -4,9 +4,9 @@ # ################################################################################ -EIGEN_VERSION = 3.2.5 -EIGEN_SITE = https://bitbucket.org/eigen/eigen -EIGEN_SITE_METHOD = hg +EIGEN_VERSION = 3.3.3 +EIGEN_SOURCE = $(EIGEN_VERSION).tar.bz2 +EIGEN_SITE = https://bitbucket.org/eigen/eigen/get EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1 EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README EIGEN_INSTALL_STAGING = YES diff --git a/package/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch b/package/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch deleted file mode 100644 index b9615ab34e..0000000000 --- a/package/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dedce8765d203c1c162a57e6259375e0b457173f Mon Sep 17 00:00:00 2001 -From: Greg Ungerer -Date: Fri, 19 Aug 2016 23:49:51 +1000 -Subject: [PATCH] elf2flt: fix relocation support for R_ARM_TARGET types - -R_ARM_TARGET1 (and I think R_ARM_TARGET2) relocation types should be -treated in the same way as R_ARM_ABS32. Fix them to write out the addend -to the flat binary in network byte order. - -Signed-off-by: Greg Ungerer -Tested-by: Waldemar Brodkorb - ---- - elf2flt.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/elf2flt.c b/elf2flt.c -index 5ae7dd9..3f31569 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -1505,7 +1505,9 @@ DIS29_RELOCATION: - (((*p)->howto->type != R_ARM_PC24) && - ((*p)->howto->type != R_ARM_PLT32))) - tmp.c[i3] = (hl >> 24) & 0xff; -- if ((*p)->howto->type == R_ARM_ABS32) -+ if (((*p)->howto->type == R_ARM_ABS32) || -+ ((*p)->howto->type == R_ARM_TARGET1) || -+ ((*p)->howto->type == R_ARM_TARGET2)) - *(uint32_t *)r_mem = htonl(hl); - else - *(uint32_t *)r_mem = tmp.l; --- -1.9.1 - diff --git a/package/elf2flt/elf2flt.hash b/package/elf2flt/elf2flt.hash index 9c18ba5d3e..40df62c8c0 100644 --- a/package/elf2flt/elf2flt.hash +++ b/package/elf2flt/elf2flt.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6a45a787a08da64f0f3036d3ae1865bc13f8f40d13f07511a2bf1b736acc4808 elf2flt-9dbc458c6122c495bbdec8dc975a15c9d39e5ff2.tar.gz +sha256 7713bd1debd24a94b795b7fc698dc97e306e7cbcc1d0580856c79fe70aac9c45 elf2flt-6d80ab6c93409e796f85da404bde84b841231531.tar.gz diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 1829b10349..995dfedebd 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELF2FLT_VERSION = 9dbc458c6122c495bbdec8dc975a15c9d39e5ff2 +ELF2FLT_VERSION = 6d80ab6c93409e796f85da404bde84b841231531 ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION)) ELF2FLT_LICENSE = GPL-2.0+ ELF2FLT_LICENSE_FILES = LICENSE.TXT diff --git a/package/emlog/emlog.hash b/package/emlog/emlog.hash index e94691758a..9d81d47ec2 100644 --- a/package/emlog/emlog.hash +++ b/package/emlog/emlog.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0d82f06301b8486c54e5e36f304d5a83c2347c23b93c1344eacb0b5b3044485a emlog-576a6c0fcf76dfeff48124b2f5fc0b4207d88ca1.tar.gz +sha256 9f791a00c86215306597b761ef5c5ad267efee5f01efbe23cfcc04e583aa402d emlog-emlog-0.60.tar.gz diff --git a/package/emlog/emlog.mk b/package/emlog/emlog.mk index 70d133a4ec..e0926e6cbd 100644 --- a/package/emlog/emlog.mk +++ b/package/emlog/emlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -EMLOG_VERSION = 576a6c0fcf76dfeff48124b2f5fc0b4207d88ca1 +EMLOG_VERSION = emlog-0.60 EMLOG_SITE = $(call github,nicupavel,emlog,$(EMLOG_VERSION)) EMLOG_LICENSE = GPL-2.0 EMLOG_LICENSE_FILES = COPYING diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index e69c7ff778..0cb433f9f4 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,2 +1,2 @@ -# From https://www.enlightenment.org/news/e-0.21.7-release -sha256 7643f7fd4aadaca44c886f21063987624c50d4c50266e87600e902a59b7c76f7 enlightenment-0.21.7.tar.xz +# From https://www.enlightenment.org/news/e0.21.8_release +sha256 fac21c5fb9cab89fb717b3577f7980fd0644ff1e94b144a55ba841116e8c5232 enlightenment-0.21.8.tar.xz diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 7bfc25b3a2..b0c261a199 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.21.7 +ENLIGHTENMENT_VERSION = 0.21.8 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause diff --git a/package/erlang-goldrush/erlang-goldrush.hash b/package/erlang-goldrush/erlang-goldrush.hash index 00ccb43ca6..d575aa49b2 100644 --- a/package/erlang-goldrush/erlang-goldrush.hash +++ b/package/erlang-goldrush/erlang-goldrush.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 739d8ce15049c54f7e00528edbf536f63a24fdb9dfa053d176e6f97a9832b834 erlang-goldrush-0.1.8.tar.gz +sha256 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 erlang-goldrush-0.1.9.tar.gz diff --git a/package/erlang-goldrush/erlang-goldrush.mk b/package/erlang-goldrush/erlang-goldrush.mk index 2fa88107e1..e95b09cd86 100644 --- a/package/erlang-goldrush/erlang-goldrush.mk +++ b/package/erlang-goldrush/erlang-goldrush.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_GOLDRUSH_VERSION = 0.1.8 +ERLANG_GOLDRUSH_VERSION = 0.1.9 ERLANG_GOLDRUSH_SITE = $(call github,DeadZen,goldrush,$(ERLANG_GOLDRUSH_VERSION)) ERLANG_GOLDRUSH_LICENSE = ISC ERLANG_GOLDRUSH_LICENSE_FILES = LICENSE diff --git a/package/erlang-jiffy/Config.in b/package/erlang-jiffy/Config.in new file mode 100644 index 0000000000..d65f42c9fd --- /dev/null +++ b/package/erlang-jiffy/Config.in @@ -0,0 +1,10 @@ +comment "erlang-jiffy needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_ERLANG_JIFFY + bool "erlang-jiffy" + depends on BR2_INSTALL_LIBSTDCPP + help + JSON NIFs for Erlang. + + https://github.com/davisp/jiffy diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash new file mode 100644 index 0000000000..1f83e2789c --- /dev/null +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d erlang-jiffy-0.14.8.tar.gz diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk new file mode 100644 index 0000000000..674c80f4b7 --- /dev/null +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# erlang-jiffy +# +################################################################################ + +ERLANG_JIFFY_VERSION = 0.14.8 +ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) +ERLANG_JIFFY_LICENSE = MIT (core), \ + BSD-3-Clause (Google double conversion library), \ + BSD-3-Clause (tests) +ERLANG_JIFFY_LICENSE_FILES = LICENSE + +$(eval $(rebar-package)) diff --git a/package/erlang-lager/erlang-lager.hash b/package/erlang-lager/erlang-lager.hash index e436fdc7d5..97bf4c64ba 100644 --- a/package/erlang-lager/erlang-lager.hash +++ b/package/erlang-lager/erlang-lager.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 168a8e48646b04bcee1ab0c97c1ff63563bd7fd25638f1504b8d8f674d2ddd1b erlang-lager-2.2.0.tar.gz +sha256 5ef0f65e0c18a7df5c5f2cd8e96780396f13369127d87857e7931670c79a9327 erlang-lager-3.2.1.tar.gz diff --git a/package/erlang-lager/erlang-lager.mk b/package/erlang-lager/erlang-lager.mk index b55b6f7b78..208ccf1611 100644 --- a/package/erlang-lager/erlang-lager.mk +++ b/package/erlang-lager/erlang-lager.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_LAGER_VERSION = 2.2.0 +ERLANG_LAGER_VERSION = 3.2.1 ERLANG_LAGER_SITE = $(call github,basho,lager,$(ERLANG_LAGER_VERSION)) ERLANG_LAGER_LICENSE = Apache-2.0 ERLANG_LAGER_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash index d8b09f95a0..b6f7fb3b54 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 752b649f695e9f2777efd6b2d8dfdcc1f435104b4e363f5f0454b99fd009015c erlang-p1-cache-tab-1.0.1.tar.gz +sha256 9376c14eaeb78c3847c3cf38853bb6e6860fb63959e182deeff5c819b23c95a4 erlang-p1-cache-tab-1.0.7.tar.gz diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk index 8f131237c6..6f1a13930e 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_CACHE_TAB_VERSION = 1.0.1 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.7 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION)) ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-iconv/Config.in b/package/erlang-p1-iconv/Config.in index 98efb217d4..cec17d0605 100644 --- a/package/erlang-p1-iconv/Config.in +++ b/package/erlang-p1-iconv/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ERLANG_P1_ICONV bool "erlang-p1-iconv" + select BR2_PACKAGE_ERLANG_P1_UTILS select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Erlang interface to libiconv diff --git a/package/erlang-p1-iconv/erlang-p1-iconv.hash b/package/erlang-p1-iconv/erlang-p1-iconv.hash index a284189a32..883fd52095 100644 --- a/package/erlang-p1-iconv/erlang-p1-iconv.hash +++ b/package/erlang-p1-iconv/erlang-p1-iconv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3ef1fb814fdf23e8ad8a210efb66681fa67cd42753be536521bf9686158880d3 erlang-p1-iconv-0.9.0.tar.gz +sha256 ca20d58166a4fb38883977600aca61e02bfd1257b8bded8c8ddd82d2a96084e6 erlang-p1-iconv-1.0.4.tar.gz diff --git a/package/erlang-p1-iconv/erlang-p1-iconv.mk b/package/erlang-p1-iconv/erlang-p1-iconv.mk index 64a6ad4a96..044361e415 100644 --- a/package/erlang-p1-iconv/erlang-p1-iconv.mk +++ b/package/erlang-p1-iconv/erlang-p1-iconv.mk @@ -4,10 +4,11 @@ # ################################################################################ -ERLANG_P1_ICONV_VERSION = 0.9.0 -ERLANG_P1_ICONV_SITE = $(call github,processone,eiconv,$(ERLANG_P1_ICONV_VERSION)) -ERLANG_P1_ICONV_LICENSE = GPL-2.0+ -ERLANG_P1_ICONV_LICENSE_FILES = COPYING +ERLANG_P1_ICONV_VERSION = 1.0.4 +ERLANG_P1_ICONV_SITE = $(call github,processone,iconv,$(ERLANG_P1_ICONV_VERSION)) +ERLANG_P1_ICONV_LICENSE = Apache-2.0 +ERLANG_P1_ICONV_LICENSE_FILES = LICENSE.txt +ERLANG_P1_ICONV_DEPENDENCIES = erlang-p1-utils ifeq ($(BR2_PACKAGE_LIBICONV),y) ERLANG_P1_ICONV_DEPENDENCIES += libiconv diff --git a/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch new file mode 100644 index 0000000000..5fe86d900f --- /dev/null +++ b/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch @@ -0,0 +1,20 @@ +Without this patch, dependencies would be downloaded and compiled +by rebar at build time. + +Signed-off-by: Christophe Romain + +diff --git a/rebar.config b/rebar.config +index fbc69a1..6250420 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -29,10 +29,6 @@ + + {port_specs, [{"priv/lib/esip_drv.so", ["c_src/esip_codec.c"]}]}. + +-{deps, [{stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.10"}}}, +- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.11"}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.7"}}}]}. +- + {clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}. + + {cover_enabled, true}. diff --git a/package/erlang-p1-sip/erlang-p1-sip.hash b/package/erlang-p1-sip/erlang-p1-sip.hash index 74382cca9a..2ea7bc8ec4 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.hash +++ b/package/erlang-p1-sip/erlang-p1-sip.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2d6dfad997931668eb83a0cb127ccca8c51f8a383d76f9dea393c0b3a4eabae7 erlang-p1-sip-1.0.0.tar.gz +sha256 2c6ed00220ead631a4755000ad9f118d79c8c4d41aa7c98bd27365a8345f9a5d erlang-p1-sip-1.0.11.tar.gz diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk index b589721eb9..0f4b33e2d1 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,10 +4,10 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = 1.0.0 -ERLANG_P1_SIP_SITE = $(call github,processone,p1_sip,$(ERLANG_P1_SIP_VERSION)) -ERLANG_P1_SIP_LICENSE = GPL-2.0 with OpenSSL exception -ERLANG_P1_SIP_LICENSE_FILES = COPYING +ERLANG_P1_SIP_VERSION = 1.0.11 +ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION)) +ERLANG_P1_SIP_LICENSE = Apache-2.0 +ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt ERLANG_P1_SIP_DEPENDENCIES = erlang-p1-stun erlang-p1-tls erlang-p1-utils ERLANG_P1_SIP_INSTALL_STAGING = YES diff --git a/package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch b/package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch deleted file mode 100644 index 7385503b71..0000000000 --- a/package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f5a2b8b78afb253630ee8833f16f131b3b52701e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= -Date: Mon, 29 Feb 2016 10:56:32 +0100 -Subject: [PATCH] Stdint is required on windows - -[Backport from upstream commit -4fc5cae81122540fff983e40dda1fa905c329fd0, which happens to not only -fix the build on Windows, but also with the musl C library.] -Signed-off-by: Thomas Petazzoni ---- - c_src/stringprep.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/c_src/stringprep.cpp b/c_src/stringprep.cpp -index 461cf09..26215cf 100644 ---- a/c_src/stringprep.cpp -+++ b/c_src/stringprep.cpp -@@ -19,6 +19,7 @@ - */ - - #include -+#include - #include - - #include "uni_data.c" --- -2.7.4 - diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash index 23bc6fbdce..ee7bdd9660 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5a74277e7bfb18b8f35838fa78fcde83f0acdb5b2a5b90c4b6d2470a33f7911e erlang-p1-stringprep-1.0.0.tar.gz +sha256 9d7485312d023eeb83f308206ff8088c03b49195fb7bf4b3b699d386e33e908a erlang-p1-stringprep-1.0.8.tar.gz diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index 3bc8c7290b..2355918975 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 1.0.0 +ERLANG_P1_STRINGPREP_VERSION = 1.0.8 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt diff --git a/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch new file mode 100644 index 0000000000..30101359f4 --- /dev/null +++ b/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch @@ -0,0 +1,16 @@ +Without this patch, dependencies would be downloaded and compiled +by rebar at build time. + +diff --git a/rebar.config b/rebar.config +index 94ee830..d0af863 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -22,9 +22,6 @@ + + {erl_opts, [debug_info, {i, "include"}]}. + +-{deps, [{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.11"}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.7"}}}]}. +- + {cover_enabled, true}. + {cover_export_enabled, true}. diff --git a/package/erlang-p1-stun/erlang-p1-stun.hash b/package/erlang-p1-stun/erlang-p1-stun.hash index be56608097..893bc30e0b 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/package/erlang-p1-stun/erlang-p1-stun.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ca33833f4b6ef70a7628e6f3697d15cb4e26d32ef4e5a31bbddee86cabe19c50 erlang-p1-stun-0.9.0.tar.gz +sha256 75aac56fa770b3b4ea2d32e63706d2b8d56f8e0db54243acffa7448f4256864e erlang-p1-stun-1.0.10.tar.gz diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk index f9056f5b3b..5116c15284 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.mk +++ b/package/erlang-p1-stun/erlang-p1-stun.mk @@ -4,10 +4,10 @@ # ################################################################################ -ERLANG_P1_STUN_VERSION = 0.9.0 +ERLANG_P1_STUN_VERSION = 1.0.10 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) -ERLANG_P1_STUN_LICENSE = GPL-2.0+ -ERLANG_P1_STUN_LICENSE_FILES = COPYING +ERLANG_P1_STUN_LICENSE = Apache-2.0 +ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt ERLANG_P1_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils ERLANG_P1_STUN_INSTALL_STAGING = YES diff --git a/package/erlang-p1-tls/Config.in b/package/erlang-p1-tls/Config.in index 0df334820d..a684fbb6a6 100644 --- a/package/erlang-p1-tls/Config.in +++ b/package/erlang-p1-tls/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ERLANG_P1_TLS bool "erlang-p1-tls" + select BR2_PACKAGE_ERLANG_P1_UTILS select BR2_PACKAGE_OPENSSL help Erlang interface to OpenSSL diff --git a/package/erlang-p1-tls/erlang-p1-tls.hash b/package/erlang-p1-tls/erlang-p1-tls.hash index fd8d801f90..eb707f1d49 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.hash +++ b/package/erlang-p1-tls/erlang-p1-tls.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8e8b848a112ff6bf146df34b4f6bc50160a8858a18499a7a6124193b37237a40 erlang-p1-tls-1.0.0.tar.gz +sha256 c42237e5dd231c558b48633788a0e9ca55b4f3b5bc4692107fee031a8f91cda3 erlang-p1-tls-1.0.11.tar.gz diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index b2451df751..63d0112cc2 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/package/erlang-p1-tls/erlang-p1-tls.mk @@ -4,11 +4,11 @@ # ################################################################################ -ERLANG_P1_TLS_VERSION = 1.0.0 -ERLANG_P1_TLS_SITE = $(call github,processone,tls,$(ERLANG_P1_TLS_VERSION)) -ERLANG_P1_TLS_LICENSE = GPL-2.0+ with OpenSSL exception -ERLANG_P1_TLS_LICENSE_FILES = COPYING +ERLANG_P1_TLS_VERSION = 1.0.11 +ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION)) +ERLANG_P1_TLS_LICENSE = Apache-2.0 +ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt ERLANG_P1_TLS_INSTALL_STAGING = YES -ERLANG_P1_TLS_DEPENDENCIES = openssl +ERLANG_P1_TLS_DEPENDENCIES = openssl erlang-p1-utils $(eval $(rebar-package)) diff --git a/package/erlang-p1-utils/erlang-p1-utils.hash b/package/erlang-p1-utils/erlang-p1-utils.hash index c41e5ef525..200d102450 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.hash +++ b/package/erlang-p1-utils/erlang-p1-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9c7e9fa2990edd419953a6ae609ffed0b90e671b57c468d97c0d85d866d80210 erlang-p1-utils-1.0.3.tar.gz +sha256 9b43e025b923221cfe6a6efc76790d97b1c233e3e2db37fc804294d847bcfaa3 erlang-p1-utils-1.0.8.tar.gz diff --git a/package/erlang-p1-utils/erlang-p1-utils.mk b/package/erlang-p1-utils/erlang-p1-utils.mk index c9d9299443..32564cf89f 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.mk +++ b/package/erlang-p1-utils/erlang-p1-utils.mk @@ -4,10 +4,11 @@ # ################################################################################ -ERLANG_P1_UTILS_VERSION = 1.0.3 +ERLANG_P1_UTILS_VERSION = 1.0.8 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) -ERLANG_P1_UTILS_LICENSE = GPL-2.0+ +ERLANG_P1_UTILS_LICENSE = Apache-2.0 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt ERLANG_P1_UTILS_INSTALL_STAGING = YES $(eval $(rebar-package)) +$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch new file mode 100644 index 0000000000..9b0a53502c --- /dev/null +++ b/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch @@ -0,0 +1,18 @@ +Without this patch, dependencies would be downloaded and compiled +by rebar at build time. + +Signed-off-by: Christophe Romain + +diff --git a/rebar.config b/rebar.config +index 3e20029..a47f1ff 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -31,8 +31,6 @@ + {port_specs, [{"priv/lib/fxml.so", ["c_src/fxml.c"]}, + {"priv/lib/fxml_stream.so", ["c_src/fxml_stream.c"]}]}. + +-{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.7"}}}]}. +- + {clean_files, ["c_src/fxml.gcda", "c_src/fxml.gcno", "c_src/fxml_stream.gcda", "c_src/fxml_stream.gcno"]}. + + {cover_enabled, true}. diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-p1-xml/erlang-p1-xml.hash index 8e4a79fee1..00b90b52ec 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/package/erlang-p1-xml/erlang-p1-xml.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4c163c5b9572baa93eb97e03544db57dc751c7995a5279081a0d56f5fdaa2521 erlang-p1-xml-1.1.1.tar.gz +sha256 0163e7bd11b6705732fd7281209925e39534c9ea123887574218422c34762d7c erlang-p1-xml-1.1.22.tar.gz diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk index 31bab2311d..1e43400fc1 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.mk +++ b/package/erlang-p1-xml/erlang-p1-xml.mk @@ -4,8 +4,8 @@ # ################################################################################ -ERLANG_P1_XML_VERSION = 1.1.1 -ERLANG_P1_XML_SITE = $(call github,processone,xml,$(ERLANG_P1_XML_VERSION)) +ERLANG_P1_XML_VERSION = 1.1.22 +ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION)) ERLANG_P1_XML_LICENSE = Apache-2.0 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils @@ -14,3 +14,4 @@ ERLANG_P1_XML_INSTALL_STAGING = YES ERLANG_P1_XML_USE_AUTOCONF = YES $(eval $(rebar-package)) +$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-xmpp/0001-fix-includes.patch b/package/erlang-p1-xmpp/0001-fix-includes.patch new file mode 100644 index 0000000000..d0a267b721 --- /dev/null +++ b/package/erlang-p1-xmpp/0001-fix-includes.patch @@ -0,0 +1,16 @@ +Without this patch, rebar fails to find include file fxml.hrl. + +Signed-off-by: Christophe Romain + +diff --git a/include/xmpp.hrl b/include/xmpp.hrl +index afa5f61..678858e 100644 +--- a/include/xmpp.hrl ++++ b/include/xmpp.hrl +@@ -26,7 +26,7 @@ + -include("ns.hrl"). + -include("jid.hrl"). + -include("xmpp_codec.hrl"). +--include("fxml.hrl"). ++-include_lib("p1_xml/include/fxml.hrl"). + + -type stanza() :: iq() | presence() | message(). diff --git a/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch new file mode 100644 index 0000000000..fa5c269c22 --- /dev/null +++ b/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch @@ -0,0 +1,18 @@ +Without this patch, dependencies would be downloaded and compiled +by rebar at build time. + +Signed-off-by: Christophe Romain + +diff --git a/rebar.config b/rebar.config +index 79494b7..8d769f1 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -24,9 +24,6 @@ + {i, "../fast_xml/include"}, + {i, "deps/fast_xml/include"}]}. + +-{deps, [{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.22"}}}, +- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.8"}}}]}. +- + {cover_enabled, true}. + {cover_export_enabled, true}. diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-p1-xmpp/Config.in new file mode 100644 index 0000000000..1d518e2023 --- /dev/null +++ b/package/erlang-p1-xmpp/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_ERLANG_P1_XMPP + bool "erlang-p1-xmpp" + select BR2_PACKAGE_ERLANG_P1_XML + select BR2_PACKAGE_ERLANG_P1_STRINGPREP + help + XMPP library for Erlang. + + https://github.com/processone/xmpp diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash new file mode 100644 index 0000000000..f245c843e8 --- /dev/null +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e7b5db5ab6204f5bc6ebf91a183ebeae2b43ca6372dd2506599a8e8168a99c50 erlang-p1-xmpp-1.1.9.tar.gz diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk new file mode 100644 index 0000000000..149d8bc5c7 --- /dev/null +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# erlang-p1-xmpp +# +################################################################################ + +ERLANG_P1_XMPP_VERSION = 1.1.9 +ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION)) +ERLANG_P1_XMPP_LICENSE = Apache-2.0 +ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt +ERLANG_P1_XMPP_INSTALL_STAGING = YES +ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \ + host-erlang-p1-xml + +$(eval $(rebar-package)) +$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch new file mode 100644 index 0000000000..facfc2c200 --- /dev/null +++ b/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch @@ -0,0 +1,18 @@ +Without this patch, dependencies would be downloaded and compiled +by rebar at build time. + +Signed-off-by: Christophe Romain + +diff --git a/rebar.config b/rebar.config +index 68ffdeb..651a829 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -24,8 +24,6 @@ + {port_env, [{"CFLAGS", "$CFLAGS"}, {"LDFLAGS", "$LDFLAGS -lyaml"}]}. + {port_specs, [{"priv/lib/fast_yaml.so", ["c_src/fast_yaml.c"]}]}. + +-{deps, [{p1_utils, ".*", {git, "git://github.com/processone/p1_utils", {tag, "1.0.7"}}}]}. +- + {clean_files, ["c_src/fast_yaml.gcda", "c_src/fast_yaml.gcno"]}. + + {cover_enabled, true}. diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.hash b/package/erlang-p1-yaml/erlang-p1-yaml.hash index 0e11e45003..5b8956d7b5 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/package/erlang-p1-yaml/erlang-p1-yaml.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8eaaddda056f1ebb515a5456ba2be855e5b71b9b6eb35788527f39c6600ac6b4 erlang-p1-yaml-1.0.0.tar.gz +sha256 bf225023168873affd2c67a2ce5c6c81c3db0c7df4f0caa113f23770c7b04e05 erlang-p1-yaml-1.0.9.tar.gz diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk index 22fcda43f8..d8865e0d42 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ b/package/erlang-p1-yaml/erlang-p1-yaml.mk @@ -4,10 +4,10 @@ # ################################################################################ -ERLANG_P1_YAML_VERSION = 1.0.0 -ERLANG_P1_YAML_SITE = $(call github,processone,p1_yaml,$(ERLANG_P1_YAML_VERSION)) +ERLANG_P1_YAML_VERSION = 1.0.9 +ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION)) ERLANG_P1_YAML_LICENSE = Apache-2.0 -ERLANG_P1_YAML_LICENSE_FILES = COPYING +ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt ERLANG_P1_YAML_DEPENDENCIES = libyaml erlang-p1-utils $(eval $(rebar-package)) diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.hash b/package/erlang-p1-zlib/erlang-p1-zlib.hash index 488e75294c..eded821013 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.hash +++ b/package/erlang-p1-zlib/erlang-p1-zlib.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 cb534ee8d8746e38027ada0ccd7e910daa025c74461286ded60ffaa933e3cf7b erlang-p1-zlib-1.0.0.tar.gz +sha256 2200330f7d4fc595caf8806fec1318b853009ab3d643cf063d19bff59bf2b45e erlang-p1-zlib-1.0.2.tar.gz diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk index 89574b8275..a57b19fd13 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.mk +++ b/package/erlang-p1-zlib/erlang-p1-zlib.mk @@ -4,10 +4,10 @@ # ################################################################################ -ERLANG_P1_ZLIB_VERSION = 1.0.0 -ERLANG_P1_ZLIB_SITE = $(call github,processone,zlib,$(ERLANG_P1_ZLIB_VERSION)) -ERLANG_P1_ZLIB_LICENSE = GPL-2.0+ -ERLANG_P1_ZLIB_LICENSE_FILES = COPYING +ERLANG_P1_ZLIB_VERSION = 1.0.2 +ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION)) +ERLANG_P1_ZLIB_LICENSE = Apache-2.0 +ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt ERLANG_P1_ZLIB_DEPENDENCIES = zlib $(eval $(rebar-package)) diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash index c39c26e30a..dc12ccd062 100644 --- a/package/erlang/erlang.hash +++ b/package/erlang/erlang.hash @@ -1,3 +1,3 @@ # md5 from http://www.erlang.org/download/MD5, sha256 locally computed -md5 7e4ff32f97c36fb3dab736f8d481830b otp_src_18.3.tar.gz -sha256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 otp_src_18.3.tar.gz +md5 a8c259ec47bf84e77510673e1b76b6db otp_src_19.3.tar.gz +sha256 fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 otp_src_19.3.tar.gz diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 364085c4dd..0f04a84424 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -5,7 +5,7 @@ ################################################################################ # See note below when updating Erlang -ERLANG_VERSION = 18.3 +ERLANG_VERSION = 19.3 ERLANG_SITE = http://www.erlang.org/download ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz ERLANG_DEPENDENCIES = host-erlang @@ -19,7 +19,7 @@ ERLANG_AUTORECONF = YES # Whenever updating Erlang, this value should be updated as well, to the # value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.8.2 +ERLANG_EI_VSN = 3.9.3 # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes diff --git a/package/evemu/evemu.hash b/package/evemu/evemu.hash index 5e653f7d59..b5f0bf5d55 100644 --- a/package/evemu/evemu.hash +++ b/package/evemu/evemu.hash @@ -1,2 +1,2 @@ -# Hash from https://lists.freedesktop.org/archives/input-tools/2016-September/001330.html -sha256 541cc138f0215b7d0cd4ad5e6bb1402518ffc5e31294c36bb67b4ff1791bb27f evemu-2.5.0.tar.xz +# Locally computed +sha256 ed81dd4552ffeb92c346b47e56b249c67f1cb37d5b31fc073ea0ad4858ae3dcc evemu-2.6.0.tar.xz diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index d52520732d..fba45216ce 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -EVEMU_VERSION = 2.5.0 +EVEMU_VERSION = 2.6.0 EVEMU_SITE = http://www.freedesktop.org/software/evemu EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz EVEMU_LICENSE = LGPL-3.0 (library), GPL-3.0 (tools) diff --git a/package/exfat-utils/exfat-utils.hash b/package/exfat-utils/exfat-utils.hash index b40e632a5a..f0d6b64259 100644 --- a/package/exfat-utils/exfat-utils.hash +++ b/package/exfat-utils/exfat-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6aa51926416b9d0977b456902f4c4cd10bcce4b2d160859a7a2fc9ca6bcbbb11 exfat-utils-1.2.4.tar.gz +sha256 b96b6692cf92a629c9eca0fe8c782646e20479524c7d2a99b7e9b43c3cf8ac43 exfat-utils-1.2.6.tar.gz diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk index 622c18178b..c1b5a93540 100644 --- a/package/exfat-utils/exfat-utils.mk +++ b/package/exfat-utils/exfat-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFAT_UTILS_VERSION = 1.2.4 +EXFAT_UTILS_VERSION = 1.2.6 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) EXFAT_UTILS_LICENSE = GPL-3.0+ EXFAT_UTILS_LICENSE_FILES = COPYING diff --git a/package/exfat/exfat.hash b/package/exfat/exfat.hash index cf3aab19f7..15b67f0094 100644 --- a/package/exfat/exfat.hash +++ b/package/exfat/exfat.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9312d23a5d82543ad2e9ab7f0a0b471aea53eeb8eae664451c881b46d849756e fuse-exfat-1.2.4.tar.gz +sha256 e1105256d75860c0678f98bbae0b8fe465d4c96ed187b7035556097f152478e7 fuse-exfat-1.2.6.tar.gz diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index ae89217523..f5ed13e207 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFAT_VERSION = 1.2.4 +EXFAT_VERSION = 1.2.6 EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION) EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz EXFAT_DEPENDENCIES = libfuse host-pkgconf diff --git a/package/exiv2/exiv2.hash b/package/exiv2/exiv2.hash index b1e78d2c94..cdd840c225 100644 --- a/package/exiv2/exiv2.hash +++ b/package/exiv2/exiv2.hash @@ -1,4 +1,4 @@ # From http://www.exiv2.org/download.html -md5 258d4831b30f75a01e0234065c6c2806 exiv2-0.25.tar.gz +md5 f936d2ca5cbe1e18c71ca2baa5e84fb4 exiv2-0.26-trunk.tar.gz # Locally calculated -sha256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 exiv2-0.25.tar.gz +sha256 0c625cbeb494aa1b9221280a5b053b54d0c9720d48fa9120cef7c6f93efd4dc3 exiv2-0.26-trunk.tar.gz diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk index 95d03cf18f..f56e861222 100644 --- a/package/exiv2/exiv2.mk +++ b/package/exiv2/exiv2.mk @@ -4,8 +4,9 @@ # ################################################################################ -EXIV2_VERSION = 0.25 -EXIV2_SITE = http://www.exiv2.org +EXIV2_VERSION = 0.26 +EXIV2_SITE = http://www.exiv2.org/builds +EXIV2_SOURCE = exiv2-$(EXIV2_VERSION)-trunk.tar.gz EXIV2_INSTALL_STAGING = YES EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF diff --git a/package/feh/feh.hash b/package/feh/feh.hash index faca43dbed..c11ff64175 100644 --- a/package/feh/feh.hash +++ b/package/feh/feh.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 a9e818a4ad6ab427597e1799527a7576856c233525e67afb1eb2cb3ae709d853 feh-2.17.1.tar.bz2 +sha256 d82f68c7a96e1860dab3584ed58bda69446b692ae79a4ca999018507da310563 feh-2.18.3.tar.bz2 diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 03651cdb76..ac8f68388b 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -4,7 +4,7 @@ # ################################################################################ -FEH_VERSION = 2.17.1 +FEH_VERSION = 2.18.3 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = libcurl imlib2 libpng xlib_libXinerama xlib_libXt diff --git a/package/fetchmail/Config.in b/package/fetchmail/Config.in index 1e829a0512..62f4f84d50 100644 --- a/package/fetchmail/Config.in +++ b/package/fetchmail/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_FETCHMAIL depends on BR2_USE_MMU # fork() select BR2_PACKAGE_CA_CERTIFICATES select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Fetchmail - the mail-retrieval daemon Client daemon to move mail from POP and IMAP to your local computer diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 2c3786f8e7..164b2f8ad8 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -13,15 +13,23 @@ FETCHMAIL_LICENSE_FILES = COPYING FETCHMAIL_AUTORECONF = YES FETCHMAIL_GETTEXTIZE = YES +# needed to help fetchmail detecting the availability of openssl, +# because it doesn't use pkg-config +ifeq ($(BR2_STATIC_LIBS),y) FETCHMAIL_CONF_ENV += LIBS="-lz" +endif FETCHMAIL_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr FETCHMAIL_DEPENDENCIES = \ ca-certificates \ - openssl \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) + openssl + +# libintl is an optional dependency +ifeq ($(BR2_PACKAGE_GETTEXT),y) +FETCHMAIL_DEPENDENCIES += gettext +endif # fetchmailconf.py script is not (yet) python3-compliant. # Prevent the pyc-compilation with python-3 from failing by removing this diff --git a/package/fftw/fftw.hash b/package/fftw/fftw.hash index 62b8f0f0d4..b00f447e06 100644 --- a/package/fftw/fftw.hash +++ b/package/fftw/fftw.hash @@ -1,2 +1,4 @@ -# From http://www.fftw.org/fftw-3.3.4.tar.gz.md5sum -md5 2edab8c06b24feeb3b82bbb3ebf3e7b3 fftw-3.3.4.tar.gz +# From http://www.fftw.org/fftw-3.3.6-pl2.tar.gz.md5sum +md5 927e481edbb32575397eb3d62535a856 fftw-3.3.6-pl2.tar.gz +# Locally computed +sha256 a5de35c5c824a78a058ca54278c706cdf3d4abba1c56b63531c2cb05f5d57da2 fftw-3.3.6-pl2.tar.gz diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 671c99bd9e..0f32f7958b 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFTW_VERSION = 3.3.4 +FFTW_VERSION = 3.3.6-pl2 FFTW_SITE = http://www.fftw.org FFTW_INSTALL_STAGING = YES FFTW_LICENSE = GPL-2.0+ diff --git a/package/file/file.hash b/package/file/file.hash index 3fafff8e7b..dcf96ecb27 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 file-5.30.tar.gz +sha256 09c588dac9cff4baa054f51a36141793bcf64926edc909594111ceae60fce4ee file-5.31.tar.gz diff --git a/package/file/file.mk b/package/file/file.mk index 1cd09c530f..375c60c33d 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.30 +FILE_VERSION = 5.31 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib diff --git a/package/fio/Config.in b/package/fio/Config.in index 89f54f99a2..8da227db7c 100644 --- a/package/fio/Config.in +++ b/package/fio/Config.in @@ -4,12 +4,6 @@ config BR2_PACKAGE_FIO depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_THREADS - # fio uses posix_madvise(), which is not part of any official - # release of uClibc, but is part of uClibc Git, and backported - # in Buildroot patch set of uClibc 0.9.33. Therefore, we - # disable the build of fio for external uClibc toolchains - # (which use an unknown uClibc version) - depends on !BR2_TOOLCHAIN_EXTERNAL_UCLIBC # fio uses fallocate() which becomes fallocate64() while compiling with # largefile support, but fallocate64() is not available on nios2 depends on !BR2_nios2 diff --git a/package/fio/fio.hash b/package/fio/fio.hash new file mode 100644 index 0000000000..7eb08140c5 --- /dev/null +++ b/package/fio/fio.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 1952db4d534221e6e8454f851dfcc38328b0ed4a3f499ea25a51ca2b5ccc8136 fio-fio-2.20.tar.gz diff --git a/package/fio/fio.mk b/package/fio/fio.mk index e7e9fbe2ec..c109f0795c 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIO_VERSION = fio-2.13 +FIO_VERSION = fio-2.20 FIO_SITE = git://git.kernel.dk/fio.git FIO_LICENSE = GPL-2.0 + special obligations FIO_LICENSE_FILES = COPYING diff --git a/package/flann/flann.hash b/package/flann/flann.hash index 08242eb2de..c2c41beb02 100644 --- a/package/flann/flann.hash +++ b/package/flann/flann.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3fec86866987c792c3fce7ecc8ba9d09a003f5d2d1a1ad94864550aad73a5c0b flann-3645f0c30a47267e56e5acdecfc7bac2b76bc3d5.tar.gz +sha256 b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3 flann-1.9.1.tar.gz diff --git a/package/flann/flann.mk b/package/flann/flann.mk index abfd0cdc4f..e777fd8b2e 100644 --- a/package/flann/flann.mk +++ b/package/flann/flann.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLANN_VERSION = 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5 +FLANN_VERSION = 1.9.1 FLANN_SITE = $(call github,mariusmuja,flann,$(FLANN_VERSION)) FLANN_INSTALL_STAGING = YES FLANN_LICENSE = BSD-3-Clause diff --git a/package/flex/0001-flex-disable-documentation.patch b/package/flex/0001-flex-disable-documentation.patch new file mode 100644 index 0000000000..68bec128ee --- /dev/null +++ b/package/flex/0001-flex-disable-documentation.patch @@ -0,0 +1,23 @@ +flex: disable documentation + +Since we prevent the flex binary to be built, we also need to prevent +the documentation to be built, otherwise it will fail like this: + +Making all in doc +make[2]: Entering directory '/br/output/build/flex-2.6.4/doc' +make[2]: *** No rule to make target '../src/flex', needed by 'flex.1'. +Stop. + +Signed-off-by: Vicente Olivert Riera + +diff -rup a/Makefile.in b/Makefile.in +--- a/Makefile.in 2017-05-06 15:49:09.000000000 +0100 ++++ b/Makefile.in 2017-05-10 14:35:20.152794902 +0100 +@@ -450,7 +450,6 @@ EXTRA_DIST = \ + + SUBDIRS = \ + src \ +- doc \ + examples \ + po \ + tests \ diff --git a/package/flex/0001-prog-ar.patch b/package/flex/0001-prog-ar.patch deleted file mode 100644 index e0626ff95f..0000000000 --- a/package/flex/0001-prog-ar.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in ---- flex-2.5.33.orig/Makefile.in 2007-01-18 17:29:25.000000000 +0100 -+++ flex-2.5.33/Makefile.in 2007-01-18 18:28:22.000000000 +0100 -@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" - "$(DESTDIR)$(includedir)" - libLIBRARIES_INSTALL = $(INSTALL_DATA) - LIBRARIES = $(lib_LIBRARIES) --AR = ar - ARFLAGS = cru - libfl_a_AR = $(AR) $(ARFLAGS) - libfl_a_LIBADD = diff --git a/package/flex/0002-fix-CVE-2016-6354.patch b/package/flex/0002-fix-CVE-2016-6354.patch deleted file mode 100644 index b0c780b993..0000000000 --- a/package/flex/0002-fix-CVE-2016-6354.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a5cbe929ac3255d371e698f62dc256afe7006466 Mon Sep 17 00:00:00 2001 -From: Will Estes -Date: Sat, 27 Feb 2016 11:56:05 -0500 -Subject: [PATCH] Fixed incorrect integer type - -Signed-off-by: Gustavo Zacarias ---- -Status: upstream - - flex.skl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/flex.skl b/src/flex.skl -index 36a526a..64f853d 100644 ---- a/flex.skl -+++ b/flex.skl -@@ -1703,7 +1703,7 @@ int yyFlexLexer::yy_get_next_buffer() - - else - { -- yy_size_t num_to_read = -+ int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) diff --git a/package/flex/Config.in b/package/flex/Config.in index 0a70a1c69e..76e8bc7bc8 100644 --- a/package/flex/Config.in +++ b/package/flex/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_FLEX A fast lexical analyser generator. A tool for generating programs that perform pattern-matching on text. - http://flex.sourceforge.net/ + https://github.com/westes/flex/ diff --git a/package/flex/flex.hash b/package/flex/flex.hash index b91ab57d98..cf2ce85d9c 100644 --- a/package/flex/flex.hash +++ b/package/flex/flex.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86088dd3 flex-2.5.37.tar.gz +sha256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 flex-2.6.4.tar.gz diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 9a3f840b11..aa6c026ee0 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLEX_VERSION = 2.5.37 -FLEX_SITE = http://download.sourceforge.net/project/flex +FLEX_VERSION = 2.6.4 +FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING @@ -16,7 +16,7 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 HOST_FLEX_DEPENDENCIES = host-m4 define FLEX_DISABLE_PROGRAM - $(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in + $(SED) 's/^bin_PROGRAMS.*//' $(@D)/src/Makefile.in endef FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM diff --git a/package/fltk/0002-jpeg-9.patch b/package/fltk/0002-jpeg-9.patch deleted file mode 100644 index 11ae85ee28..0000000000 --- a/package/fltk/0002-jpeg-9.patch +++ /dev/null @@ -1,26 +0,0 @@ -From http://www.fltk.org/str.php?L2920 -However it's not yet applied apparently until bundled jpeg is upgraded. - -Signed-off-by: Gustavo Zacarias - -diff -Nura fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx fltk-1.3.2/src/Fl_JPEG_Image.cxx ---- fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx 2014-07-03 12:56:27.731197463 -0300 -+++ fltk-1.3.2/src/Fl_JPEG_Image.cxx 2014-07-03 12:56:57.907218257 -0300 -@@ -155,7 +155,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_stdio_src(&dinfo, fp); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; -@@ -333,7 +333,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_mem_src(&dinfo, data); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; diff --git a/package/fltk/fltk.hash b/package/fltk/fltk.hash index 7b9b67dcfb..af968aac75 100644 --- a/package/fltk/fltk.hash +++ b/package/fltk/fltk.hash @@ -1,4 +1,4 @@ -# From http://www.fltk.org/software.php?VERSION=1.3.3 -md5 9ccdb0d19dc104b87179bd9fd10822e3 fltk-1.3.3-source.tar.gz +# From http://www.fltk.org/software.php?VERSION=1.3.4 +md5 d7fcd27ab928648e1a1366dd2e273970 fltk-1.3.4-1-source.tar.gz # Locally generated -sha256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 fltk-1.3.3-source.tar.gz +sha256 7fb2c8882433ce694e6900c94fda505e8f4ed3fa9c7e597007098a33b85c53f4 fltk-1.3.4-1-source.tar.gz diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk index 7ad717bf47..611d79da50 100644 --- a/package/fltk/fltk.mk +++ b/package/fltk/fltk.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLTK_VERSION = 1.3.3 -FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz +FLTK_VERSION = 1.3.4 +FLTK_SOURCE = fltk-$(FLTK_VERSION)-1-source.tar.gz FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION) FLTK_INSTALL_STAGING = YES # We force --libdir=/usr/lib, because by default, it is set to diff --git a/package/font-awesome/font-awesome.hash b/package/font-awesome/font-awesome.hash index 9f3715e5b6..e266168acc 100644 --- a/package/font-awesome/font-awesome.hash +++ b/package/font-awesome/font-awesome.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 7813f416057da622b16229b10fef550e1dc64c5bb59871cd38fa86e76dfdbae8 font-awesome-v4.5.0.tar.gz +sha256 de512ba0e1dead382bbfce372cde74b3f18971d876fffb635ee9333f0db05d43 font-awesome-v4.7.0.tar.gz diff --git a/package/font-awesome/font-awesome.mk b/package/font-awesome/font-awesome.mk index 8933783272..f39401041a 100644 --- a/package/font-awesome/font-awesome.mk +++ b/package/font-awesome/font-awesome.mk @@ -4,7 +4,7 @@ # ################################################################################ -FONT_AWESOME_VERSION = v4.5.0 +FONT_AWESOME_VERSION = v4.7.0 FONT_AWESOME_SITE = $(call github,FortAwesome,Font-Awesome,$(FONT_AWESOME_VERSION)) FONT_AWESOME_LICENSE = OFL-1.1 (font), MIT (CSS, LESS and Sass files) FONT_AWESOME_DIRECTORIES_LIST = css fonts less scss diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 8c1909ed91..e97709ca1b 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54 fping-3.16.tar.gz +sha256 67eb4152b98ad34f99d2eec4e1098a0bb52caf13c0c89cd147349d08190fe8ce fping-4.0.tar.gz diff --git a/package/fping/fping.mk b/package/fping/fping.mk index 5970d6379a..5af46c67f0 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 3.16 +FPING_VERSION = 4.0 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING diff --git a/package/freetype/0001-psaux-Better-protect-flex-handling.patch b/package/freetype/0001-psaux-Better-protect-flex-handling.patch deleted file mode 100644 index a59f5b34f1..0000000000 --- a/package/freetype/0001-psaux-Better-protect-flex-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Fri, 24 Mar 2017 09:15:10 +0100 -Subject: [PATCH] [psaux] Better protect `flex' handling. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935 - -* src/psaux/t1decode.c (t1_decoder_parse_charstrings) -: Since there is not a single flex operator but a -series of subroutine calls, malformed fonts can call arbitrary other -operators after the start of a flex, possibly adding points. For -this reason we have to check the available number of points before -inserting a point. - -Fixes CVE-2017-8105 - -Signed-off-by: Peter Korsgaard ---- -diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c -index af7b465e..7dd45135 100644 ---- a/src/psaux/t1decode.c -+++ b/src/psaux/t1decode.c -@@ -780,10 +780,19 @@ - /* point without adding any point to the outline */ - idx = decoder->num_flex_vectors++; - if ( idx > 0 && idx < 7 ) -+ { -+ /* in malformed fonts it is possible to have other */ -+ /* opcodes in the middle of a flex (which don't */ -+ /* increase `num_flex_vectors'); we thus have to */ -+ /* check whether we can add a point */ -+ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) ) -+ goto Syntax_Error; -+ - t1_builder_add_point( builder, - x, - y, - (FT_Byte)( idx == 3 || idx == 6 ) ); -+ } - } - break; - --- -2.11.0 - diff --git a/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch b/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch deleted file mode 100644 index 1b9d90a7d3..0000000000 --- a/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Sun, 26 Mar 2017 08:32:09 +0200 -Subject: [PATCH] * src/psaux/psobjs.c (t1_builder_close_contour): Add safety - guard. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941 - -Fixes CVE-2017-8287 - -Signed-off-by: Peter Korsgaard -diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c -index d18e821a..0baf8368 100644 ---- a/src/psaux/psobjs.c -+++ b/src/psaux/psobjs.c -@@ -1718,6 +1718,14 @@ - first = outline->n_contours <= 1 - ? 0 : outline->contours[outline->n_contours - 2] + 1; - -+ /* in malformed fonts it can happen that a contour was started */ -+ /* but no points were added */ -+ if ( outline->n_contours && first == outline->n_points ) -+ { -+ outline->n_contours--; -+ return; -+ } -+ - /* We must not include the last point in the path if it */ - /* is located on the first point. */ - if ( outline->n_points > 1 ) --- -2.11.0 - diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index b2cec04d3b..beff85846f 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,2 +1,5 @@ +# From https://sourceforge.net/projects/freetype/files/freetype2/2.8/ +md5 2413ac3eaf508ada019c63959ea81a92 freetype-2.8.tar.bz2 +sha1 42c6b1f733fe13a3eba135f5025b22cb68450f91 freetype-2.8.tar.bz2 # Locally calculated after checking pgp signature -sha256 3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88 freetype-2.7.1.tar.bz2 +sha256 a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b freetype-2.8.tar.bz2 diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 57f9b20483..9a98b4068b 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.7.1 +FREETYPE_VERSION = 2.8 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES diff --git a/package/fwup/0001-Fix-uclibc-build.patch b/package/fwup/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..f7bf245049 --- /dev/null +++ b/package/fwup/0001-Fix-uclibc-build.patch @@ -0,0 +1,36 @@ +From 0301cb4ffbf4705316ba017516745a535d66d552 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 28 May 2017 16:56:39 +0200 +Subject: [PATCH 1/1] Fix uclibc build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without sys/types.h the build breaks with errors like this: + +parse_file.h:28:5: error: unknown type name ‘off_t’ + off_t *map; + ^ + +Patch sent upstream: https://github.com/fhunleth/fwup/pull/61 + +Signed-off-by: Bernd Kuhls +--- + src/sparse_file.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sparse_file.h b/src/sparse_file.h +index 21bf5f9..579fbaa 100644 +--- a/src/sparse_file.h ++++ b/src/sparse_file.h +@@ -18,6 +18,7 @@ + #define SPARSE_FILE_H + + #include ++#include + + struct sparse_file_map + { +-- +2.11.0 + diff --git a/package/fwup/fwup.hash b/package/fwup/fwup.hash index e21eff0a6d..8679dcb265 100644 --- a/package/fwup/fwup.hash +++ b/package/fwup/fwup.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 64c3a0ac38dc11c0c05b2588a89638cbc37f5552ac0f1c290f7ee5365f2bba49 fwup-v0.8.2.tar.gz +sha256 cf2e6ff729c21bc000dbe008211cf9d4901be9b42c82a06e4068deb638ea8f6e fwup-v0.14.3.tar.gz diff --git a/package/fwup/fwup.mk b/package/fwup/fwup.mk index 0c2b0f9198..e47ecbe6dc 100644 --- a/package/fwup/fwup.mk +++ b/package/fwup/fwup.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWUP_VERSION = v0.8.2 +FWUP_VERSION = v0.14.3 FWUP_SITE = $(call github,fhunleth,fwup,$(FWUP_VERSION)) FWUP_LICENSE = Apache-2.0 FWUP_LICENSE_FILES = LICENSE diff --git a/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch deleted file mode 100644 index d8c6723ed3..0000000000 --- a/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From edb9057c195c41dd7bcd8603e5fd420359edd520 Mon Sep 17 00:00:00 2001 -From: nsz -Date: Mon, 23 Nov 2015 15:17:55 +0000 -Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for - printing fatal error - -libgcc/ - PR target/68059 - * config/arm/linux-atomic-64bit.c (__write): Rename to... - (write): ...this and fix the return type. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4 - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - libgcc/config/arm/linux-atomic-64bit.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c -index 7aa8dfc..570b4ce 100644 ---- a/libgcc/config/arm/linux-atomic-64bit.c -+++ b/libgcc/config/arm/linux-atomic-64bit.c -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - kernels; we check for that in an init section and bail out rather - unceremoneously. */ - --extern unsigned int __write (int fd, const void *buf, unsigned int count); -+extern int write (int fd, const void *buf, unsigned int count); - extern void abort (void); - - /* Kernel helper for compare-and-exchange. */ -@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void) - for the user - I'm not sure I can rely on much else being - available at this point, so do the same as generic-morestack.c - write () and abort (). */ -- __write (2 /* stderr. */, err, sizeof (err)); -+ write (2 /* stderr. */, err, sizeof (err)); - abort (); - } - }; --- -2.10.2 - diff --git a/package/gcc/4.8.5/100-uclibc-conf.patch b/package/gcc/4.8.5/100-uclibc-conf.patch deleted file mode 100644 index d56bf0a194..0000000000 --- a/package/gcc/4.8.5/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gcc-4.8.0/contrib/regression/objs-gcc.sh -=================================================================== ---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh 2009-04-09 17:00:19.000000000 +0200 -+++ gcc-4.8.0/contrib/regression/objs-gcc.sh 2013-03-23 17:39:04.000000000 +0100 -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/package/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional deleted file mode 100644 index b7094fe652..0000000000 --- a/package/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional +++ /dev/null @@ -1,122 +0,0 @@ -http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html - -On glibc the libc.so carries a copy of the math function copysignl() but -on uClibc math functions like copysignl() live in libm. Since libgcc_s -contains unresolved symbols, any attempt to link against libgcc_s -without explicitely specifying -lm fails, resulting in a broken -bootstrap of the compiler. - -Forward port to gcc 4.5.1 by Gustavo Zacarias - ---- - libgcc/Makefile.in | 4 +++- - libgcc/configure | 32 ++++++++++++++++++++++++++++++++ - libgcc/configure.ac | 21 +++++++++++++++++++++ - 3 files changed, 56 insertions(+), 1 deletion(-) - -Index: gcc-4.8.0/libgcc/Makefile.in -=================================================================== ---- gcc-4.8.0.orig/libgcc/Makefile.in 2013-02-04 20:06:20.000000000 +0100 -+++ gcc-4.8.0/libgcc/Makefile.in 2013-03-24 09:12:43.000000000 +0100 -@@ -41,6 +41,7 @@ - decimal_float = @decimal_float@ - enable_decimal_float = @enable_decimal_float@ - fixed_point = @fixed_point@ -+LIBGCC_LIBM = @LIBGCC_LIBM@ - - host_noncanonical = @host_noncanonical@ - target_noncanonical = @target_noncanonical@ -@@ -927,9 +928,10 @@ - @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_objs@,$(objects) libgcc.a,$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ -+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ - @shlib_map_file@,$(mapfile),$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ -- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) -+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) - - libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) - # @multilib_flags@ is still needed because this may use -Index: gcc-4.8.0/libgcc/configure -=================================================================== ---- gcc-4.8.0.orig/libgcc/configure 2012-11-05 00:08:42.000000000 +0100 -+++ gcc-4.8.0/libgcc/configure 2013-03-24 09:12:43.000000000 +0100 -@@ -564,6 +564,7 @@ - tmake_file - sfp_machine_header - set_use_emutls -+LIBGCC_LIBM - set_have_cc_tls - vis_hide - fixed_point -@@ -4481,6 +4482,37 @@ - fi - fi - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+echo "$as_me:$LINENO: checking for library containing copysignl" >&5 -+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 -+if test "${libgcc_cv_copysignl_lib+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ -+fi -+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 -+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac - - # Conditionalize the makefile for this target machine. - tmake_file_= -Index: gcc-4.8.0/libgcc/configure.ac -=================================================================== ---- gcc-4.8.0.orig/libgcc/configure.ac 2012-10-15 15:10:30.000000000 +0200 -+++ gcc-4.8.0/libgcc/configure.ac 2013-03-24 09:12:43.000000000 +0100 -@@ -326,6 +326,27 @@ - fi - AC_SUBST(set_have_cc_tls) - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+AC_CACHE_CHECK -+ libgcc_cv_copysignl_lib, -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ ]) -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac -+AC_SUBST(LIBGCC_LIBM) -+ - # See if we have emulated thread-local storage. - GCC_CHECK_EMUTLS - set_use_emutls= diff --git a/package/gcc/4.8.5/111-pr65730.patch b/package/gcc/4.8.5/111-pr65730.patch deleted file mode 100644 index f195e308da..0000000000 --- a/package/gcc/4.8.5/111-pr65730.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 10 Apr 2015 17:46:30 +0300 -Subject: [PATCH] Fix PR target/65730 - -2015-05-20 Max Filippov -gcc/ - * config/xtensa/xtensa.c (init_alignment_context): Replace MULT - by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT). - -Signed-off-by: Max Filippov ---- -Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452 -Changes to ChangeLog are dropped. - - 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 eb039ba..7296e36 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem) - if (ac->shift != NULL_RTX) - { - /* Shift is the byte count, but we need the bitcount. */ -- ac->shift = expand_simple_binop (SImode, MULT, ac->shift, -- GEN_INT (BITS_PER_UNIT), -+ gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0); -+ ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift, -+ GEN_INT (exact_log2 (BITS_PER_UNIT)), - NULL_RTX, 1, OPTAB_DIRECT); - ac->modemask = expand_simple_binop (SImode, ASHIFT, - GEN_INT (GET_MODE_MASK (mode)), --- -1.8.1.4 - diff --git a/package/gcc/4.8.5/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/package/gcc/4.8.5/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch deleted file mode 100644 index c11ad35aac..0000000000 --- a/package/gcc/4.8.5/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 6 Nov 2015 14:27:23 +0100 -Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit - -Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate -64-bit binaries by default. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gcc/config.gcc | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index 4a7cbd2..9cc765e 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -439,7 +439,7 @@ powerpc*-*-*) - cpu_type=rs6000 - extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h" - case x$with_cpu in -- xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500) -+ xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500) - cpu_is_64bit=yes - ;; - esac --- -2.6.2 - diff --git a/package/gcc/4.8.5/130-fix_build_with_gcc-6.patch b/package/gcc/4.8.5/130-fix_build_with_gcc-6.patch deleted file mode 100644 index 62ac3cbd65..0000000000 --- a/package/gcc/4.8.5/130-fix_build_with_gcc-6.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001 -From: edlinger -Date: Thu, 25 Feb 2016 15:33:50 +0000 -Subject: [PATCH 1/1] 2016-02-25 Bernd Edlinger - - Backported from mainline - 2016-02-19 Jakub Jelinek - Bernd Edlinger - - * Make-lang.in: Invoke gperf with -L C++. - * cfns.gperf: Remove prototypes for hash and libc_name_p - inlines. - * cfns.h: Regenerated. - * except.c (nothrow_libfn_p): Adjust. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4 - -Signed-off-by: Samuel Martin ---- - gcc/cp/Make-lang.in | 2 +- - gcc/cp/cfns.gperf | 10 ++-------- - gcc/cp/cfns.h | 41 ++++++++++++++--------------------------- - gcc/cp/except.c | 3 ++- - 5 files changed, 31 insertions(+), 37 deletions(-) - -diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in -index e98beb1..b09fb02 100644 ---- a/gcc/cp/Make-lang.in -+++ b/gcc/cp/Make-lang.in -@@ -111,7 +111,7 @@ else - # deleting the $(srcdir)/cp/cfns.h file. - $(srcdir)/cp/cfns.h: - endif -- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ -+ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \ - $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h - - # -diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf -index 68acd3d..214ecf6 100644 ---- a/gcc/cp/cfns.gperf -+++ b/gcc/cp/cfns.gperf -@@ -1,3 +1,5 @@ -+%language=C++ -+%define class-name libc_name - %{ - /* Copyright (C) 2000-2015 Free Software Foundation, Inc. - -@@ -16,14 +18,6 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - . */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - %} - %% - # The standard C library functions, for feeding to gperf; the result is used -diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h -index 1c6665d..596f413 100644 ---- a/gcc/cp/cfns.h -+++ b/gcc/cp/cfns.h -@@ -1,5 +1,5 @@ --/* ANSI-C code produced by gperf version 3.0.3 */ --/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */ -+/* C++ code produced by gperf version 3.0.4 */ -+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */ - - #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ -@@ -28,7 +28,7 @@ - #error "gperf generated tables don't work with this execution character set. Please report a bug to ." - #endif - --#line 1 "cfns.gperf" -+#line 3 "cfns.gperf" - - /* Copyright (C) 2000-2015 Free Software Foundation, Inc. - -@@ -47,25 +47,18 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - . */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - /* maximum key range = 391, duplicates = 0 */ - --#ifdef __GNUC__ --__inline --#else --#ifdef __cplusplus --inline --#endif --#endif --static unsigned int --hash (register const char *str, register unsigned int len) -+class libc_name -+{ -+private: -+ static inline unsigned int hash (const char *str, unsigned int len); -+public: -+ static const char *libc_name_p (const char *str, unsigned int len); -+}; -+ -+inline unsigned int -+libc_name::hash (register const char *str, register unsigned int len) - { - static const unsigned short asso_values[] = - { -@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len) - return hval + asso_values[(unsigned char)str[len - 1]]; - } - --#ifdef __GNUC__ --__inline --#ifdef __GNUC_STDC_INLINE__ --__attribute__ ((__gnu_inline__)) --#endif --#endif - const char * --libc_name_p (register const char *str, register unsigned int len) -+libc_name::libc_name_p (register const char *str, register unsigned int len) - { - enum - { -diff --git a/gcc/cp/except.c b/gcc/cp/except.c -index 3ff1ce6..2f2e396 100644 ---- a/gcc/cp/except.c -+++ b/gcc/cp/except.c -@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn) - unless the system headers are playing rename tricks, and if - they are, we don't want to be confused by them. */ - id = DECL_NAME (fn); -- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id)); -+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id), -+ IDENTIFIER_LENGTH (id)); - } - - /* Returns nonzero if an exception of type FROM will be caught by a --- -1.7.1 diff --git a/package/gcc/4.8.5/130-pr43538.patch b/package/gcc/4.8.5/130-pr43538.patch deleted file mode 100644 index 19e57bb059..0000000000 --- a/package/gcc/4.8.5/130-pr43538.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001 -From: glisse -Date: Fri, 25 Apr 2014 08:03:08 +0000 -Subject: [PATCH] 2014-04-25 Marc Glisse - - PR target/43538 - * mt-gnu: Don't reset CXXFLAGS_FOR_TARGET. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Max Filippov ---- - config/mt-gnu | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/mt-gnu b/config/mt-gnu -index 15bf417..5c696f5 100644 ---- a/config/mt-gnu -+++ b/config/mt-gnu -@@ -1 +1 @@ --CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE -+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE --- -2.1.4 - diff --git a/package/gcc/4.8.5/301-missing-execinfo_h.patch b/package/gcc/4.8.5/301-missing-execinfo_h.patch deleted file mode 100644 index 00efda24aa..0000000000 --- a/package/gcc/4.8.5/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.8.0/boehm-gc/include/gc.h -=================================================================== ---- gcc-4.8.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200 -+++ gcc-4.8.0/boehm-gc/include/gc.h 2013-03-23 17:39:20.000000000 +0100 -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package/gcc/4.8.5/305-libmudflap-susv3-legacy.patch b/package/gcc/4.8.5/305-libmudflap-susv3-legacy.patch deleted file mode 100644 index 35d5f50207..0000000000 --- a/package/gcc/4.8.5/305-libmudflap-susv3-legacy.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: gcc-4.8.0/libmudflap/mf-hooks2.c -=================================================================== ---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c 2013-02-03 18:48:05.000000000 +0100 -+++ gcc-4.8.0/libmudflap/mf-hooks2.c 2013-03-23 17:39:43.000000000 +0100 -@@ -424,7 +424,7 @@ - { - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); -- bzero (s, n); -+ memset (s, 0, n); - } - - -@@ -434,7 +434,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); - MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); -- bcopy (src, dest, n); -+ memmove (dest, src, n); - } - - -@@ -444,7 +444,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); - MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); -- return bcmp (s1, s2, n); -+ return n == 0 ? 0 : memcmp (s1, s2, n); - } - - -@@ -453,7 +453,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); -- return index (s, c); -+ return strchr (s, c); - } - - -@@ -462,7 +462,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); -- return rindex (s, c); -+ return strrchr (s, c); - } - - /* XXX: stpcpy, memccpy */ diff --git a/package/gcc/4.8.5/810-arm-softfloat-libgcc.patch b/package/gcc/4.8.5/810-arm-softfloat-libgcc.patch deleted file mode 100644 index c8cb377d55..0000000000 --- a/package/gcc/4.8.5/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: gcc-4.8.0/gcc/config/arm/linux-elf.h -=================================================================== ---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.0/gcc/config/arm/linux-elf.h 2013-03-23 17:40:00.000000000 +0100 -@@ -55,7 +55,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: gcc-4.8.0/libgcc/config/arm/t-linux -=================================================================== ---- gcc-4.8.0.orig/libgcc/config/arm/t-linux 2012-03-22 16:14:46.000000000 +0100 -+++ gcc-4.8.0/libgcc/config/arm/t-linux 2013-03-23 17:40:54.000000000 +0100 -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/package/gcc/4.8.5/830-arm_unbreak_armv4t.patch b/package/gcc/4.8.5/830-arm_unbreak_armv4t.patch deleted file mode 100644 index 37f8f2a54d..0000000000 --- a/package/gcc/4.8.5/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/package/gcc/4.8.5/841-PR57717-E500v2.patch b/package/gcc/4.8.5/841-PR57717-E500v2.patch deleted file mode 100644 index a011e24112..0000000000 --- a/package/gcc/4.8.5/841-PR57717-E500v2.patch +++ /dev/null @@ -1,23 +0,0 @@ -This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717 - -Upstream-Status: Backport -Signed-off-by: Julian Brown -[Gustavo: Update for gcc 4.8.3] - -fix for PR57717 (PowerPC E500v2) -http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html - -diff -Nura gcc-4.8.3/gcc/config/rs6000/rs6000.c gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c ---- gcc-4.8.3/gcc/config/rs6000/rs6000.c 2014-05-04 23:18:35.000000000 -0300 -+++ gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c 2014-05-22 15:20:12.554270919 -0300 -@@ -7343,9 +7343,7 @@ - && GET_CODE (XEXP (x, 1)) == CONST_INT - && reg_offset_p - && !SPE_VECTOR_MODE (mode) -- && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode -- || mode == DDmode || mode == TDmode -- || mode == DImode)) -+ && !(TARGET_E500_DOUBLE && GET_MODE_SIZE (mode) > UNITS_PER_WORD) - && (!VECTOR_MODE_P (mode) || VECTOR_MEM_NONE_P (mode))) - { - HOST_WIDE_INT val = INTVAL (XEXP (x, 1)); diff --git a/package/gcc/4.8.5/842-PR60155.patch b/package/gcc/4.8.5/842-PR60155.patch deleted file mode 100644 index 7bc2122fd4..0000000000 --- a/package/gcc/4.8.5/842-PR60155.patch +++ /dev/null @@ -1,111 +0,0 @@ -From gcc bugzilla https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 -Upstream status: in trunk. - -Signed-off-by: Gustavo Zacarias - ---- trunk/gcc/gcse.c 2014/02/12 14:50:06 207726 -+++ trunk/gcc/gcse.c 2014/04/04 22:25:51 209134 -@@ -2502,6 +2502,65 @@ - } - } - -+struct set_data -+{ -+ rtx insn; -+ const_rtx set; -+ int nsets; -+}; -+ -+/* Increment number of sets and record set in DATA. */ -+ -+static void -+record_set_data (rtx dest, const_rtx set, void *data) -+{ -+ struct set_data *s = (struct set_data *)data; -+ -+ if (GET_CODE (set) == SET) -+ { -+ /* We allow insns having multiple sets, where all but one are -+ dead as single set insns. In the common case only a single -+ set is present, so we want to avoid checking for REG_UNUSED -+ notes unless necessary. */ -+ if (s->nsets == 1 -+ && find_reg_note (s->insn, REG_UNUSED, SET_DEST (s->set)) -+ && !side_effects_p (s->set)) -+ s->nsets = 0; -+ -+ if (!s->nsets) -+ { -+ /* Record this set. */ -+ s->nsets += 1; -+ s->set = set; -+ } -+ else if (!find_reg_note (s->insn, REG_UNUSED, dest) -+ || side_effects_p (set)) -+ s->nsets += 1; -+ } -+} -+ -+static const_rtx -+single_set_gcse (rtx insn) -+{ -+ struct set_data s; -+ rtx pattern; -+ -+ gcc_assert (INSN_P (insn)); -+ -+ /* Optimize common case. */ -+ pattern = PATTERN (insn); -+ if (GET_CODE (pattern) == SET) -+ return pattern; -+ -+ s.insn = insn; -+ s.nsets = 0; -+ note_stores (pattern, record_set_data, &s); -+ -+ /* Considered invariant insns have exactly one set. */ -+ gcc_assert (s.nsets == 1); -+ return s.set; -+} -+ - /* Emit move from SRC to DEST noting the equivalence with expression computed - in INSN. */ - -@@ -2509,7 +2568,8 @@ - gcse_emit_move_after (rtx dest, rtx src, rtx insn) - { - rtx new_rtx; -- rtx set = single_set (insn), set2; -+ const_rtx set = single_set_gcse (insn); -+ rtx set2; - rtx note; - rtx eqv = NULL_RTX; - -@@ -3369,13 +3429,12 @@ - FOR_EACH_VEC_ELT (occrs_to_hoist, j, occr) - { - rtx insn; -- rtx set; -+ const_rtx set; - - gcc_assert (!occr->deleted_p); - - insn = occr->insn; -- set = single_set (insn); -- gcc_assert (set); -+ set = single_set_gcse (insn); - - /* Create a pseudo-reg to store the result of reaching - expressions into. Get the mode for the new pseudo -@@ -3456,10 +3515,8 @@ - { - rtx reg; - enum reg_class pressure_class; -- rtx set = single_set (insn); -+ const_rtx set = single_set_gcse (insn); - -- /* Considered invariant insns have only one set. */ -- gcc_assert (set != NULL_RTX); - reg = SET_DEST (set); - if (GET_CODE (reg) == SUBREG) - reg = SUBREG_REG (reg); diff --git a/package/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch b/package/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch deleted file mode 100644 index afa650c8b9..0000000000 --- a/package/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 845478644ba54a6947e9b224f2e5cd342e8257a9 Mon Sep 17 00:00:00 2001 -From: Andrew Hsieh -Date: Wed, 25 Jun 2014 22:13:48 -0700 -Subject: [PATCH] Fix a typo in vmlaq_lane_s32 - -BUG=15526898 - -Change-Id: I4e35a764d369d378808dab29beefe34d1f93249b -Signed-off-by: Peter Korsgaard ---- - -diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h -index 73c7e7d..92b0119 100644 ---- a/gcc/config/aarch64/arm_neon.h -+++ b/gcc/config/aarch64/arm_neon.h -@@ -9984,7 +9984,7 @@ - #define vmlaq_lane_s32(a, b, c, d) \ - __extension__ \ - ({ \ -- int32x4_t c_ = (c); \ -+ int32x2_t c_ = (c); \ - int32x4_t b_ = (b); \ - int32x4_t a_ = (a); \ - int32x4_t result; \ diff --git a/package/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch b/package/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 792976fd51..0000000000 --- a/package/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,273 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -70,7 +70,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -88,7 +88,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -2809,7 +2809,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) \ - && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) - - #include -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -987,7 +987,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough (most probably sufficient - // for non-ios_base::fixed outputs) - int __cs_size = __max_digits * 3; -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -572,7 +572,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -56,7 +56,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -182,7 +182,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -232,7 +232,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -289,7 +289,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -139,7 +139,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -180,7 +180,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -228,7 +228,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2571,7 +2571,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -787,7 +787,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -139,7 +139,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf diff --git a/package/gcc/4.8.5/851-PR-other-56780.patch b/package/gcc/4.8.5/851-PR-other-56780.patch deleted file mode 100644 index feb433920d..0000000000 --- a/package/gcc/4.8.5/851-PR-other-56780.patch +++ /dev/null @@ -1,244 +0,0 @@ -From afe990251bd9b3a063f03da31a3b8d139d033bc3 Mon Sep 17 00:00:00 2001 -From: ian -Date: Sat, 1 Jun 2013 00:20:49 +0000 -Subject: [PATCH] PR other/56780 - -* libiberty/configure.ac: Move test for --enable-install-libiberty -outside of the 'with_target_subdir' test so that it actually gets -run. Add output messages to show the test result. -* libiberty/configure: Regenerate. -* libiberty/Makefile.in (install_to_libdir): Place the -installation of the libiberty library in the same guard as that -used for the headers to prevent it being installed unless -requested via --enable-install-libiberty. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199570 138bc75d-0d04-0410-961f-82ee72b054a4 - -libiberty: fix --enable-install-libiberty flag [PR 56780] - -Commit 199570 fixed the --disable-install-libiberty behavior, but it also -added a bug where the enable path never works because the initial clear -of target_header_dir wasn't deleted. So we end up initializing properly -at the top only to reset it at the end all the time. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Romain - squash the two upstream commits - Remove the ChangeLog] -Signed-off-by: Romain Naour ---- - libiberty/Makefile.in | 24 ++++++++++----------- - libiberty/configure | 57 +++++++++++++++++++++++++++----------------------- - libiberty/configure.ac | 47 ++++++++++++++++++++++------------------- - 3 files changed, 68 insertions(+), 60 deletions(-) - -diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index f6a3ebd..75ff82d 100644 ---- a/libiberty/Makefile.in -+++ b/libiberty/Makefile.in -@@ -355,19 +355,19 @@ install-strip: install - # since it will be passed the multilib flags. - MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` - install_to_libdir: all -- ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR) -- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n -- ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ) -- mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB) - if test -n "${target_header_dir}"; then \ -- case "${target_header_dir}" in \ -- /*) thd=${target_header_dir};; \ -- *) thd=${includedir}/${target_header_dir};; \ -- esac; \ -- ${mkinstalldirs} $(DESTDIR)$${thd}; \ -- for h in ${INSTALLED_HEADERS}; do \ -- ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ -- done; \ -+ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ -+ $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ -+ ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \ -+ mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \ -+ case "${target_header_dir}" in \ -+ /*) thd=${target_header_dir};; \ -+ *) thd=${includedir}/${target_header_dir};; \ -+ esac; \ -+ ${mkinstalldirs} $(DESTDIR)$${thd}; \ -+ for h in ${INSTALLED_HEADERS}; do \ -+ ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ -+ done; \ - fi - @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install - -diff --git a/libiberty/configure b/libiberty/configure -index 5367027..4feb95a 100755 ---- a/libiberty/configure -+++ b/libiberty/configure -@@ -675,8 +675,8 @@ with_cross_host - with_newlib - enable_maintainer_mode - enable_multilib --enable_largefile - enable_install_libiberty -+enable_largefile - ' - ac_precious_vars='build_alias - host_alias -@@ -1303,8 +1303,8 @@ Optional Features: - enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-multilib build many library versions (default) -+ --enable-install-libiberty Install headers and library for end users - --disable-largefile omit support for large files -- --enable-install-libiberty Install headers for end users - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \ - cross_compiling=maybe - fi - -+# We may wish to install the target headers somewhere. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5 -+$as_echo_n "checking whether to install libiberty headers and static library... " >&6; } -+ -+# Check whether --enable-install-libiberty was given. -+if test "${enable_install_libiberty+set}" = set; then : -+ enableval=$enable_install_libiberty; enable_install_libiberty=$enableval -+else -+ enable_install_libiberty=no -+fi -+ -+# Option parsed, now set things appropriately. -+case x"$enable_install_libiberty" in -+ xyes|x) -+ target_header_dir=libiberty -+ ;; -+ xno) -+ target_header_dir= -+ ;; -+ *) -+ # This could be sanity-checked in various ways... -+ target_header_dir="${enable_install_libiberty}" -+ ;; -+esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5 -+$as_echo "$enable_install_libiberty" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5 -+$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;} -+ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -5476,7 +5505,6 @@ fi - - setobjs= - CHECK= --target_header_dir= - if test -n "${with_target_subdir}"; then - - # We are being configured as a target library. AC_REPLACE_FUNCS -@@ -5759,29 +5787,6 @@ _ACEOF - - esac - -- # We may wish to install the target headers somewhere. -- # Check whether --enable-install-libiberty was given. --if test "${enable_install_libiberty+set}" = set; then : -- enableval=$enable_install_libiberty; enable_install_libiberty=$enableval --else -- enable_install_libiberty=no --fi -- -- # Option parsed, now set things appropriately. -- case x"$enable_install_libiberty" in -- xyes|x) -- target_header_dir=libiberty -- ;; -- xno) -- target_header_dir= -- ;; -- *) -- # This could be sanity-checked in various ways... -- target_header_dir="${enable_install_libiberty}" -- ;; -- esac -- -- - else - - # Not a target library, so we set things up to run the test suite. -diff --git a/libiberty/configure.ac b/libiberty/configure.ac -index c763894..f17e6b6 100644 ---- a/libiberty/configure.ac -+++ b/libiberty/configure.ac -@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \ - cross_compiling=maybe - fi - -+# We may wish to install the target headers somewhere. -+AC_MSG_CHECKING([whether to install libiberty headers and static library]) -+dnl install-libiberty is disabled by default -+ -+AC_ARG_ENABLE(install-libiberty, -+[ --enable-install-libiberty Install headers and library for end users], -+enable_install_libiberty=$enableval, -+enable_install_libiberty=no)dnl -+ -+# Option parsed, now set things appropriately. -+case x"$enable_install_libiberty" in -+ xyes|x) -+ target_header_dir=libiberty -+ ;; -+ xno) -+ target_header_dir= -+ ;; -+ *) -+ # This could be sanity-checked in various ways... -+ target_header_dir="${enable_install_libiberty}" -+ ;; -+esac -+AC_MSG_RESULT($enable_install_libiberty) -+AC_MSG_NOTICE([target_header_dir = $target_header_dir]) -+ - GCC_NO_EXECUTABLES - AC_PROG_CC - AC_SYS_LARGEFILE -@@ -380,7 +405,6 @@ fi - - setobjs= - CHECK= --target_header_dir= - if test -n "${with_target_subdir}"; then - - # We are being configured as a target library. AC_REPLACE_FUNCS -@@ -492,27 +516,6 @@ if test -n "${with_target_subdir}"; then - - esac - -- # We may wish to install the target headers somewhere. -- AC_ARG_ENABLE(install-libiberty, -- [ --enable-install-libiberty Install headers for end users], -- enable_install_libiberty=$enableval, -- enable_install_libiberty=no)dnl -- -- # Option parsed, now set things appropriately. -- case x"$enable_install_libiberty" in -- xyes|x) -- target_header_dir=libiberty -- ;; -- xno) -- target_header_dir= -- ;; -- *) -- # This could be sanity-checked in various ways... -- target_header_dir="${enable_install_libiberty}" -- ;; -- esac -- -- - else - - # Not a target library, so we set things up to run the test suite. --- -1.9.3 - diff --git a/package/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch b/package/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch deleted file mode 100644 index aa1376c44c..0000000000 --- a/package/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 6 Aug 2015 01:16:02 +0300 -Subject: [PATCH] xtensa: add -mauto-litpools option - -With support from assembler this option allows compiling huge functions, -where single literal pool at the beginning of a function may not be -reachable by L32R instructions at its end. - -Currently assembler --auto-litpools option cannot deal with literals -used from multiple locations separated by more than 256 KBytes of code. -Don't turn constants into literals, instead use MOVI instruction to load -them into registers and let the assembler turn them into literals as -necessary. - -2015-08-12 Max Filippov -gcc/ - * config/xtensa/constraints.md (define_constraint "Y"): New - constraint. - * config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools. - * config/xtensa/linux.h (ASM_SPEC): Likewise. - * config/xtensa/predicates.md (move_operand): Match constants - and symbols in the presence of TARGET_AUTO_LITPOOLS. - * config/xtensa/xtensa.c (xtensa_valid_move): Don't allow - immediate references to TLS data. - (xtensa_emit_move_sequence): Don't force constants to memory in - the presence of TARGET_AUTO_LITPOOLS. - (print_operand): Add 'y' format, same as default, but capable of - printing SF mode constants as well. - * config/xtensa/xtensa.md (movsi_internal, movhi_internal) - (movsf_internal): Add movi pattern that loads literal. - (movsf, movdf): Don't force constants to memory in the presence - of TARGET_AUTO_LITPOOLS. - (movdf_internal): Add 'Y' constraint. - * config/xtensa/xtensa.opt (mauto-litpools): New option. - -Signed-off-by: Max Filippov ---- -Backported from: r226828 -Changes to ChangeLogs and documentation are dropped. - - gcc/config/xtensa/constraints.md | 5 +++++ - gcc/config/xtensa/elf.h | 4 +++- - gcc/config/xtensa/linux.h | 4 +++- - gcc/config/xtensa/predicates.md | 3 ++- - gcc/config/xtensa/xtensa.c | 19 ++++++++++++++++++- - gcc/config/xtensa/xtensa.md | 35 +++++++++++++++++++---------------- - gcc/config/xtensa/xtensa.opt | 4 ++++ - 7 files changed, 54 insertions(+), 20 deletions(-) - -diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md -index 30f4c1f..773d4f9 100644 ---- a/gcc/config/xtensa/constraints.md -+++ b/gcc/config/xtensa/constraints.md -@@ -111,6 +111,11 @@ - (and (match_code "const_int") - (match_test "xtensa_mask_immediate (ival)"))) - -+(define_constraint "Y" -+ "A constant that can be used in relaxed MOVI instructions." -+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -+ (match_test "TARGET_AUTO_LITPOOLS"))) -+ - ;; Memory constraints. Do not use define_memory_constraint here. Doing so - ;; causes reload to force some constants into the constant pool, but since - ;; the Xtensa constant pool can only be accessed with L32R instructions, it -diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h -index e59bede..12056f7 100644 ---- a/gcc/config/xtensa/elf.h -+++ b/gcc/config/xtensa/elf.h -@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3. If not see - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #undef LIB_SPEC - #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal" -diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h -index 675aacf..5b0243a 100644 ---- a/gcc/config/xtensa/linux.h -+++ b/gcc/config/xtensa/linux.h -@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3. If not see - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - -diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md -index e02209e..d7dfa11 100644 ---- a/gcc/config/xtensa/predicates.md -+++ b/gcc/config/xtensa/predicates.md -@@ -142,7 +142,8 @@ - (match_test "GET_MODE_CLASS (mode) == MODE_INT - && xtensa_simm12b (INTVAL (op))")) - (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -- (match_test "TARGET_CONST16 && CONSTANT_P (op) -+ (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS) -+ && CONSTANT_P (op) - && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0"))))) - - ;; Accept the floating point constant 1 in the appropriate mode. -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index eb039ba..206ff80 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands) - { - int dst_regnum = xt_true_regnum (operands[0]); - -+ if (xtensa_tls_referenced_p (operands[1])) -+ return FALSE; -+ - /* The stack pointer can only be assigned with a MOVSP opcode. */ - if (dst_regnum == STACK_POINTER_REGNUM) - return !TARGET_WINDOWED_ABI -@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode) - return 1; - } - -- if (! TARGET_CONST16) -+ if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16) - { - src = force_const_mem (SImode, src); - operands[1] = src; -@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter) - } - break; - -+ case 'y': -+ if (GET_CODE (x) == CONST_DOUBLE && -+ GET_MODE (x) == SFmode) -+ { -+ REAL_VALUE_TYPE r; -+ long l; -+ REAL_VALUE_FROM_CONST_DOUBLE (r, x); -+ REAL_VALUE_TO_TARGET_SINGLE (r, l); -+ fprintf (file, "0x%08lx", l); -+ break; -+ } -+ -+ /* fall through */ -+ - default: - if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG) - fprintf (file, "%s", reg_names[xt_true_regnum (x)]); -diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md -index 6d84384..0e673a3 100644 ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -761,8 +761,8 @@ - }) - - (define_insn "movsi_internal" -- [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A") -- (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))] -+ [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A") -+ (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))] - "xtensa_valid_move (SImode, operands)" - "@ - movi.n\t%0, %x1 -@@ -774,15 +774,16 @@ - mov\t%0, %1 - movsp\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr") - (set_attr "mode" "SI") -- (set_attr "length" "2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")]) -+ (set_attr "length" "2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")]) - - ;; 16-bit Integer moves - -@@ -796,21 +797,22 @@ - }) - - (define_insn "movhi_internal" -- [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A") -- (match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))] -+ [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A") -+ (match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))] - "xtensa_valid_move (HImode, operands)" - "@ - movi.n\t%0, %x1 - mov.n\t%0, %1 - mov\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - %v1l16ui\t%0, %1 - %v0s16i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,move,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,move,move,load,store,rsr,wsr") - (set_attr "mode" "HI") -- (set_attr "length" "2,2,3,3,3,3,3,3")]) -+ (set_attr "length" "2,2,3,3,3,3,3,3,3")]) - - ;; 8-bit Integer moves - -@@ -881,7 +883,7 @@ - (match_operand:SF 1 "general_operand" ""))] - "" - { -- if (!TARGET_CONST16 && CONSTANT_P (operands[1])) -+ if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1])) - operands[1] = force_const_mem (SFmode, operands[1]); - - if ((!register_operand (operands[0], SFmode) -@@ -896,8 +898,8 @@ - }) - - (define_insn "movsf_internal" -- [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U") -- (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))] -+ [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U") -+ (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))] - "((register_operand (operands[0], SFmode) - || register_operand (operands[1], SFmode)) - && !(FP_REG_P (xt_true_regnum (operands[0])) -@@ -912,13 +914,14 @@ - mov\t%0, %1 - wfr\t%0, %1 - rfr\t%0, %1 -+ movi\t%0, %y1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0" -- [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store") -+ [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store") - (set_attr "mode" "SF") -- (set_attr "length" "3,3,3,2,2,2,3,3,3,6,3,3,3")]) -+ (set_attr "length" "3,3,3,2,2,2,3,3,3,3,6,3,3,3")]) - - (define_insn "*lsiu" - [(set (match_operand:SF 0 "register_operand" "=f") -@@ -991,7 +994,7 @@ - (match_operand:DF 1 "general_operand" ""))] - "" - { -- if (CONSTANT_P (operands[1]) && !TARGET_CONST16) -+ if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS) - operands[1] = force_const_mem (DFmode, operands[1]); - - if (!register_operand (operands[0], DFmode) -@@ -1002,8 +1005,8 @@ - }) - - (define_insn_and_split "movdf_internal" -- [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U") -- (match_operand:DF 1 "move_operand" "r,iF,T,U,r"))] -+ [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U") -+ (match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))] - "register_operand (operands[0], DFmode) - || register_operand (operands[1], DFmode)" - "#" -diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt -index 2fd6cee..21c6e96 100644 ---- a/gcc/config/xtensa/xtensa.opt -+++ b/gcc/config/xtensa/xtensa.opt -@@ -38,6 +38,10 @@ mtext-section-literals - Target - Intersperse literal pools with code in the text section - -+mauto-litpools -+Target Report Mask(AUTO_LITPOOLS) -+Relax literals in assembler and place them automatically in the text section -+ - mserialize-volatile - Target Report Mask(SERIALIZE_VOLATILE) - -mno-serialize-volatile Do not serialize volatile memory references with MEMW instructions --- -1.8.1.4 - diff --git a/package/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch b/package/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch deleted file mode 100644 index abc7a08e8d..0000000000 --- a/package/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 10 Aug 2015 21:35:20 +0300 -Subject: [PATCH 1/3] xtensa: reimplement register spilling - -Spilling windowed registers in userspace is much easier, more portable, -less error-prone and equally effective as in kernel. Now that register -spilling syscall is considered obsolete in the xtensa linux kernel -replace it with CALL12 followed by series of ENTRY in libgcc. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use - CALL12 followed by series of ENTRY to spill windowed registers. - (__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill - instead of making linux spill syscall. - -Signed-off-by: Max Filippov ---- -Backported from: r226962 - - libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - -diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S -index 3ac8c1d..2e678af 100644 ---- a/libgcc/config/xtensa/lib2funcs.S -+++ b/libgcc/config/xtensa/lib2funcs.S -@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - .global __xtensa_libgcc_window_spill - .type __xtensa_libgcc_window_spill,@function - __xtensa_libgcc_window_spill: -- entry sp, 32 -- movi a2, 0 -- syscall -+ entry sp, 48 -+#if XCHAL_NUM_AREGS > 16 -+ call12 1f -+ retw -+ .align 4 -+1: -+ .rept (XCHAL_NUM_AREGS - 24) / 12 -+ _entry sp, 48 -+ mov a12, a0 -+ .endr -+ _entry sp, 16 -+#if XCHAL_NUM_AREGS % 12 == 0 -+ mov a4, a4 -+#elif XCHAL_NUM_AREGS % 12 == 4 -+ mov a8, a8 -+#elif XCHAL_NUM_AREGS % 12 == 8 -+ mov a12, a12 -+#endif -+ retw -+#else -+ mov a8, a8 - retw -+#endif - .size __xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill - - -@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto: - entry sp, 32 - - /* Flush registers. */ -- mov a5, a2 -- movi a2, 0 -- syscall -- mov a2, a5 -+ call8 __xtensa_libgcc_window_spill - - /* Because the save area for a0-a3 is stored one frame below - the one identified by a2, the only way to restore those --- -1.8.1.4 - diff --git a/package/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/package/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch deleted file mode 100644 index f23a5c0737..0000000000 --- a/package/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 14 Aug 2015 02:45:02 +0300 -Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde - -This allows having exception cleanup code in binaries that don't -register their unwind tables. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde - with unwind-dw2-fde-dip. - -Signed-off-by: Max Filippov ---- -Backported from: r226963 - - libgcc/config/xtensa/t-xtensa | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa -index 27399e6..66d0eb3 100644 ---- a/libgcc/config/xtensa/t-xtensa -+++ b/libgcc/config/xtensa/t-xtensa -@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \ - LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S - - LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \ -- $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -+ $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c --- -1.8.1.4 - diff --git a/package/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch b/package/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch deleted file mode 100644 index dc405132cc..0000000000 --- a/package/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 15 Aug 2015 05:12:11 +0300 -Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA - -Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame -higher than what was actually used by code at context->ra. This results -in invalid CFA value in signal frames and premature unwinding completion -in forced unwinding used by uClibc NPTL thread cancellation. -Returning context->sp from _Unwind_GetCFA makes all CFA values valid and -matching code that used them. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return - context->sp instead of context->cfa. - -Signed-off-by: Max Filippov ---- -Backported from: r226964 - - libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c -index 35f7797..ef6b900 100644 ---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c -+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c -@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index) - _Unwind_Word - _Unwind_GetCFA (struct _Unwind_Context *context) - { -- return (_Unwind_Ptr) context->cfa; -+ return (_Unwind_Ptr) context->sp; - } - - /* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ --- -1.8.1.4 - diff --git a/package/gcc/4.8.5/874-xtensa-add-uclinux-support.patch b/package/gcc/4.8.5/874-xtensa-add-uclinux-support.patch deleted file mode 100644 index 23db3d863c..0000000000 --- a/package/gcc/4.8.5/874-xtensa-add-uclinux-support.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 22 Aug 2015 08:44:26 +0300 -Subject: [PATCH] xtensa: add uclinux support - -2015-10-03 Max Filippov -gcc/ - * config.gcc (xtensa*-*-uclinux*): New configuration. - * config/xtensa/uclinux.h: New file. - * config/xtensa/uclinux.opt: New file. - -libgcc/ - * config.host (xtensa*-*-uclinux*): New configuration. - -Signed-off-by: Max Filippov ---- -Backported from: r228450 - - gcc/config.gcc | 5 ++++ - gcc/config/xtensa/uclinux.h | 69 +++++++++++++++++++++++++++++++++++++++++++ - gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++ - libgcc/config.host | 5 ++++ - 4 files changed, 111 insertions(+) - create mode 100644 gcc/config/xtensa/uclinux.h - create mode 100644 gcc/config/xtensa/uclinux.opt - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index c52f5a8..56797bd 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -2995,6 +2995,11 @@ xtensa*-*-linux*) - tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h" - tmake_file="${tmake_file} xtensa/t-xtensa" - ;; -+xtensa*-*-uclinux*) -+ tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h" -+ tmake_file="${tmake_file} xtensa/t-xtensa" -+ extra_options="${extra_options} xtensa/uclinux.opt" -+ ;; - am33_2.0-*-linux*) - tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h" - gas=yes gnu_ld=yes -diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h -new file mode 100644 -index 0000000..4606020 ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.h -@@ -0,0 +1,69 @@ -+/* Xtensa uClinux configuration. -+ Derived from the configuration for GCC for Intel i386 running Linux. -+ Copyright (C) 2001-2015 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC 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 3, or (at your option) any later -+version. -+ -+GCC 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 GCC; see the file COPYING3. If not see -+. */ -+ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ GNU_USER_TARGET_OS_CPP_BUILTINS (); \ -+ builtin_define ("__uClinux__"); \ -+ } \ -+ while (0) -+ -+#undef SUBTARGET_CPP_SPEC -+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" -+ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "long int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE 32 -+ -+#undef ASM_SPEC -+#define ASM_SPEC \ -+ "%{mtext-section-literals:--text-section-literals} \ -+ %{mno-text-section-literals:--no-text-section-literals} \ -+ %{mtarget-align:--target-align} \ -+ %{mno-target-align:--no-target-align} \ -+ %{mlongcalls:--longcalls} \ -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" -+ -+#undef LINK_SPEC -+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}" -+ -+#undef LOCAL_LABEL_PREFIX -+#define LOCAL_LABEL_PREFIX "." -+ -+/* Always enable "-fpic" for Xtensa Linux. */ -+#define XTENSA_ALWAYS_PIC 1 -+ -+#undef TARGET_LIBC_HAS_FUNCTION -+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function -+ -+#undef DBX_REGISTER_NUMBER -+ -diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt -new file mode 100644 -index 0000000..95ef777 ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.opt -@@ -0,0 +1,32 @@ -+; Xtensa uClinux options. -+ -+; Copyright (C) 2015 Free Software Foundation, Inc. -+; -+; This file is part of GCC. -+; -+; GCC 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 3, or (at your option) any later -+; version. -+; -+; GCC 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 GCC; see the file COPYING3. If not see -+; . -+ -+; See the GCC internals manual (options.texi) for a description of -+; this file's format. -+ -+; Please try to keep this file in ASCII collating order. -+ -+elf2flt -+Driver -+ -+elf2flt= -+Driver JoinedOrMissing -+ -+; This comment is to ensure we retain the blank line above. -diff --git a/libgcc/config.host b/libgcc/config.host -index 2c64756..2ee92c1 100644 ---- a/libgcc/config.host -+++ b/libgcc/config.host -@@ -1295,6 +1295,11 @@ xtensa*-*-linux*) - tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" - md_unwind_header=xtensa/linux-unwind.h - ;; -+xtensa*-*-uclinux*) -+ tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" -+ md_unwind_header=xtensa/linux-unwind.h -+ extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o" -+ ;; - am33_2.0-*-linux*) - # Don't need crtbeginT.o from *-*-linux* default. - extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" --- -1.8.1.4 - diff --git a/package/gcc/4.8.5/890-fix-m68k-compile.patch b/package/gcc/4.8.5/890-fix-m68k-compile.patch deleted file mode 100644 index 124e8427f8..0000000000 --- a/package/gcc/4.8.5/890-fix-m68k-compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -remove unused header, which breaks the toolchain building - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.8.5.orig/libgcc/config/m68k/linux-atomic.c gcc-4.8.5/libgcc/config/m68k/linux-atomic.c ---- gcc-4.8.5.orig/libgcc/config/m68k/linux-atomic.c 2013-02-04 20:06:20.000000000 +0100 -+++ gcc-4.8.5/libgcc/config/m68k/linux-atomic.c 2016-03-19 00:18:12.000000000 +0100 -@@ -33,7 +33,6 @@ - using the kernel helper defined below. There is no support for - 64-bit operations yet. */ - --#include - #include - - #ifndef __NR_atomic_cmpxchg_32 diff --git a/package/gcc/4.8.5/891-fix-m68k-uclinux.patch b/package/gcc/4.8.5/891-fix-m68k-uclinux.patch deleted file mode 100644 index 37c7ac406b..0000000000 --- a/package/gcc/4.8.5/891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,18 +0,0 @@ -avoids internal compiler error while compiling linux-atomic.c -See here: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.8.5.orig/libgcc/config.host gcc-4.8.5/libgcc/config.host ---- gcc-4.8.5.orig/libgcc/config.host 2014-03-20 17:12:30.000000000 +0100 -+++ gcc-4.8.5/libgcc/config.host 2016-04-27 15:04:01.521171537 +0200 -@@ -689,7 +689,7 @@ - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux diff --git a/package/gcc/4.8.5/900-musl-support.patch b/package/gcc/4.8.5/900-musl-support.patch deleted file mode 100644 index 6840fccea4..0000000000 --- a/package/gcc/4.8.5/900-musl-support.patch +++ /dev/null @@ -1,648 +0,0 @@ -Add musl support to gcc - -This patch comes from the musl-cross project at -https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version: - - * the config.sub modifications have been removed, because Buildroot - already overwrites all config.sub with a more recent config.sub - that has musl support. - - * change to ensure that a dummy dynamic linker path - MUSL_DYNAMIC_LINKER is defined for all architectures, - otherwise building gcc for architectures not supported by musl was - causing build failure. Bug reported upstream at - https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on. - - * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic - and only add the musl one as an addition, not as a replacement. Not - doing this breaks C++ exception handling with glibc, because - USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script - not testing dl_iterate_phdr() on any system except Solaris. - -Signed-off-by: Thomas Petazzoni -[Gustavo: Update for gcc 4.8.3] - -Index: b/fixincludes/mkfixinc.sh -=================================================================== ---- a/fixincludes/mkfixinc.sh -+++ b/fixincludes/mkfixinc.sh -@@ -19,7 +19,8 @@ - powerpc-*-eabi* | \ - powerpc-*-rtems* | \ - powerpcle-*-eabisim* | \ -- powerpcle-*-eabi* ) -+ powerpcle-*-eabi* | \ -+ *-musl* ) - # IF there is no include fixing, - # THEN create a no-op fixer and exit - (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} -Index: b/gcc/config/aarch64/aarch64-linux.h -=================================================================== ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -21,7 +21,12 @@ - #ifndef GCC_AARCH64_LINUX_H - #define GCC_AARCH64_LINUX_H - -+/* The AArch64 port currently supports two dynamic linkers: -+ - ld-linux-aarch64.so.1 - GLIBC dynamic linker -+ - ld-musl-aarch64.so.1 - musl libc dynamic linker */ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" - - #define CPP_SPEC "%{pthread:-D_REENTRANT}" - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -77,6 +77,23 @@ - %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ - %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" - -+/* For ARM musl currently supports four dynamic linkers: -+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI -+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI -+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB -+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB -+ musl does not support the legacy OABI mode. -+ All the dynamic linkers live in /lib. -+ We default to soft-float, EL. */ -+#undef MUSL_DYNAMIC_LINKER -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" -+#endif -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" -+ - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ - #undef LINK_SPEC -Index: b/gcc/config/i386/linux64.h -=================================================================== ---- a/gcc/config/i386/linux64.h -+++ b/gcc/config/i386/linux64.h -@@ -30,3 +30,10 @@ - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" - #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" -+#undef MUSL_DYNAMIC_LINKERX32 -+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" -Index: b/gcc/config/i386/linux.h -=================================================================== ---- a/gcc/config/i386/linux.h -+++ b/gcc/config/i386/linux.h -@@ -21,3 +21,5 @@ - - #define GNU_USER_LINK_EMULATION "elf_i386" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -32,10 +32,12 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ -@@ -53,18 +55,21 @@ - uClibc or Bionic is the default C library and whether - -muclibc or -mglibc or -mbionic has been passed to change the default. */ - --#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ -- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" -+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ -+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" - - #if DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) - #elif DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) - #elif DEFAULT_LIBC == LIBC_BIONIC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) - #else - #error "Unsupported DEFAULT_LIBC" - #endif /* DEFAULT_LIBC */ -@@ -82,23 +87,32 @@ - #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" - #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" - -+/* Musl dynamic linker paths must be defined on a per-architecture -+ basis, for each architecture supported by Musl. However, in order -+ to let other architectures continue to build with other C -+ libraries, we provide a dummy definition of the following defines. */ -+#define MUSL_DYNAMIC_LINKER "invalid" -+#define MUSL_DYNAMIC_LINKER32 "invalid" -+#define MUSL_DYNAMIC_LINKER64 "invalid" -+#define MUSL_DYNAMIC_LINKERX32 "invalid" -+ - #define GNU_USER_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ -- BIONIC_DYNAMIC_LINKER) -+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - #define GNU_USER_DYNAMIC_LINKER32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ -- BIONIC_DYNAMIC_LINKER32) -+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ -- BIONIC_DYNAMIC_LINKER64) -+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - #define GNU_USER_DYNAMIC_LINKERX32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ -- BIONIC_DYNAMIC_LINKERX32) -+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) - - /* Determine whether the entire c99 runtime - is present in the runtime library. */ - #undef TARGET_C99_FUNCTIONS --#define TARGET_C99_FUNCTIONS (OPTION_GLIBC) -+#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL) - - /* Whether we have sincos that follows the GNU extension. */ - #undef TARGET_HAS_SINCOS -@@ -107,3 +121,74 @@ - /* Whether we have Bionic libc runtime */ - #undef TARGET_HAS_BIONIC - #define TARGET_HAS_BIONIC (OPTION_BIONIC) -+ -+/* musl avoids problematic includes by rearranging the include directories. -+ * Unfortunately, this is mostly duplicated from cppdefault.c */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define INCLUDE_DEFAULTS_MUSL_GPP \ -+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ -+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, -+ -+#ifdef LOCAL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_LOCAL \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_LOCAL -+#endif -+ -+#ifdef PREFIX_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_PREFIX -+#endif -+ -+#ifdef CROSS_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_CROSS \ -+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#ifdef TOOL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_TOOL \ -+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_TOOL -+#endif -+ -+#ifdef NATIVE_SYSTEM_HEADER_DIR -+#define INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_NATIVE -+#endif -+ -+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) -+# undef INCLUDE_DEFAULTS_MUSL_LOCAL -+# define INCLUDE_DEFAULTS_MUSL_LOCAL -+# undef INCLUDE_DEFAULTS_MUSL_NATIVE -+# define INCLUDE_DEFAULTS_MUSL_NATIVE -+#else -+# undef INCLUDE_DEFAULTS_MUSL_CROSS -+# define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#undef INCLUDE_DEFAULTS -+#define INCLUDE_DEFAULTS \ -+ { \ -+ INCLUDE_DEFAULTS_MUSL_GPP \ -+ INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ INCLUDE_DEFAULTS_MUSL_CROSS \ -+ INCLUDE_DEFAULTS_MUSL_TOOL \ -+ INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ -+ { 0, 0, 0, 0, 0, 0 } \ -+ } -+#endif -Index: b/gcc/config/linux.opt -=================================================================== ---- a/gcc/config/linux.opt -+++ b/gcc/config/linux.opt -@@ -30,3 +30,7 @@ - muclibc - Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) - Use uClibc C library -+ -+mmusl -+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) -+Use musl C library -Index: b/gcc/config/microblaze/linux.h -=================================================================== ---- a/gcc/config/microblaze/linux.h -+++ b/gcc/config/microblaze/linux.h -@@ -25,7 +25,23 @@ - #undef TLS_NEEDS_GOT - #define TLS_NEEDS_GOT 1 - --#define DYNAMIC_LINKER "/lib/ld.so.1" -+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER -+#else -+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER -+#endif -+ -+ - #undef SUBTARGET_EXTRA_SPECS - #define SUBTARGET_EXTRA_SPECS \ - { "dynamic_linker", DYNAMIC_LINKER } -Index: b/gcc/config/mips/linux64.h -=================================================================== ---- a/gcc/config/mips/linux64.h -+++ b/gcc/config/mips/linux64.h -@@ -29,4 +29,4 @@ - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -- BIONIC_DYNAMIC_LINKERN32) -+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER) -Index: b/gcc/config/mips/linux.h -=================================================================== ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -18,3 +18,11 @@ - . */ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+ -+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" -Index: b/gcc/config/rs6000/linux64.h -=================================================================== ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -374,17 +374,23 @@ - #endif - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" - #elif DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER32 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - - #undef DEFAULT_ASM_ENDIAN - #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) -Index: b/gcc/config/rs6000/secureplt.h -=================================================================== ---- a/gcc/config/rs6000/secureplt.h -+++ b/gcc/config/rs6000/secureplt.h -@@ -18,3 +18,4 @@ - . */ - - #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" -+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" -Index: b/gcc/config/rs6000/sysv4.h -=================================================================== ---- a/gcc/config/rs6000/sysv4.h -+++ b/gcc/config/rs6000/sysv4.h -@@ -537,6 +537,9 @@ - #ifndef CC1_SECURE_PLT_DEFAULT_SPEC - #define CC1_SECURE_PLT_DEFAULT_SPEC "" - #endif -+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC -+#define LINK_SECURE_PLT_DEFAULT_SPEC "" -+#endif - - /* Pass -G xxx to the compiler. */ - #define CC1_SPEC "%{G*} %(cc1_cpu)" \ -@@ -585,7 +588,8 @@ - - /* Override the default target of the linker. */ - #define LINK_TARGET_SPEC \ -- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") -+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \ -+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" - - /* Any specific OS flags. */ - #define LINK_OS_SPEC "\ -@@ -763,15 +767,18 @@ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - - #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -894,6 +901,7 @@ - { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ - { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ - { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ -+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ - { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ - { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ - { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ -Index: b/gcc/config/sh/linux.h -=================================================================== ---- a/gcc/config/sh/linux.h -+++ b/gcc/config/sh/linux.h -@@ -43,7 +43,15 @@ - - #define TARGET_ASM_FILE_END file_end_indicate_exec_stack - -+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ -+#define MUSL_DYNAMIC_LINKER_E "eb" -+#else -+#define MUSL_DYNAMIC_LINKER_E -+#endif -+ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" - - #undef SUBTARGET_LINK_EMUL_SUFFIX - #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -550,7 +550,7 @@ - esac - - # Common C libraries. --tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" -+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" - - # Common parts for widely ported systems. - case ${target} in -@@ -653,6 +653,9 @@ - *-*-*uclibc*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" - ;; -+ *-*-*musl*) -+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" -+ ;; - *) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" - ;; -@@ -2135,6 +2138,10 @@ - powerpc*-*-linux*paired*) - tm_file="${tm_file} rs6000/750cl.h" ;; - esac -+ case ${target} in -+ *-linux*-musl*) -+ enable_secureplt=yes ;; -+ esac - if test x${enable_secureplt} = xyes; then - tm_file="rs6000/secureplt.h ${tm_file}" - fi -Index: b/gcc/configure -=================================================================== ---- a/gcc/configure -+++ b/gcc/configure -@@ -26936,6 +26940,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/configure.ac -=================================================================== ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -4848,6 +4852,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/ginclude/stddef.h -=================================================================== ---- a/gcc/ginclude/stddef.h -+++ b/gcc/ginclude/stddef.h -@@ -181,6 +181,7 @@ - #ifndef _GCC_SIZE_T - #ifndef _SIZET_ - #ifndef __size_t -+#ifndef __DEFINED_size_t /* musl */ - #define __size_t__ /* BeOS */ - #define __SIZE_T__ /* Cray Unicos/Mk */ - #define _SIZE_T -@@ -197,6 +198,7 @@ - #define ___int_size_t_h - #define _GCC_SIZE_T - #define _SIZET_ -+#define __DEFINED_size_t /* musl */ - #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ - || defined(__FreeBSD_kernel__) - /* __size_t is a typedef on FreeBSD 5, must not trash it. */ -@@ -214,6 +216,7 @@ - typedef long ssize_t; - #endif /* __BEOS__ */ - #endif /* !(defined (__GNUG__) && defined (size_t)) */ -+#endif /* __DEFINED_size_t */ - #endif /* __size_t */ - #endif /* _SIZET_ */ - #endif /* _GCC_SIZE_T */ -Index: b/libgcc/unwind-dw2-fde-dip.c -=================================================================== ---- a/libgcc/unwind-dw2-fde-dip.c -+++ b/libgcc/unwind-dw2-fde-dip.c -@@ -75,6 +75,13 @@ - # define USE_PT_GNU_EH_FRAME - #endif - -+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure -+ script. */ -+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -+ && defined(TARGET_DL_ITERATE_PHDR) -+# define USE_PT_GNU_EH_FRAME -+#endif -+ - #if defined(USE_PT_GNU_EH_FRAME) - - #include -Index: b/libgomp/config/posix/time.c -=================================================================== ---- a/libgomp/config/posix/time.c -+++ b/libgomp/config/posix/time.c -@@ -28,6 +28,8 @@ - The following implementation uses the most simple POSIX routines. - If present, POSIX 4 clocks should be used instead. */ - -+#define _POSIX_C_SOURCE 199309L /* for clocks */ -+ - #include "libgomp.h" - #include - #if TIME_WITH_SYS_TIME -Index: b/libitm/config/arm/hwcap.cc -=================================================================== ---- a/libitm/config/arm/hwcap.cc -+++ b/libitm/config/arm/hwcap.cc -@@ -40,7 +40,11 @@ - - #ifdef __linux__ - #include -+#ifdef __GLIBC__ - #include -+#else -+#include -+#endif - #include - - static void __attribute__((constructor)) -Index: b/libitm/config/linux/x86/tls.h -=================================================================== ---- a/libitm/config/linux/x86/tls.h -+++ b/libitm/config/linux/x86/tls.h -@@ -25,16 +25,19 @@ - #ifndef LIBITM_X86_TLS_H - #define LIBITM_X86_TLS_H 1 - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - /* Use slots in the TCB head rather than __thread lookups. - GLIBC has reserved words 10 through 13 for TM. */ - #define HAVE_ARCH_GTM_THREAD 1 - #define HAVE_ARCH_GTM_THREAD_DISP 1 - #endif -+#endif - - #include "config/generic/tls.h" - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - namespace GTM HIDDEN { - - #ifdef __x86_64__ -@@ -101,5 +104,6 @@ - - } // namespace GTM - #endif /* >= GLIBC 2.10 */ -+#endif - - #endif // LIBITM_X86_TLS_H -Index: b/libstdc++-v3/configure.host -=================================================================== ---- a/libstdc++-v3/configure.host -+++ b/libstdc++-v3/configure.host -@@ -264,6 +264,13 @@ - os_include_dir="os/bsd/freebsd" - ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) -+ # check for musl by target -+ case "${host_os}" in -+ *-musl*) -+ os_include_dir="os/generic" -+ ;; -+ *) -+ - if [ "$uclibc" = "yes" ]; then - os_include_dir="os/uclibc" - elif [ "$bionic" = "yes" ]; then -@@ -272,6 +279,9 @@ - os_include_dir="os/gnu-linux" - fi - ;; -+ -+ esac -+ ;; - hpux*) - os_include_dir="os/hpux" - ;; diff --git a/package/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch b/package/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch deleted file mode 100644 index 7799c1286e..0000000000 --- a/package/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.8.5.orig/libgcc/config/t-stack gcc-4.8.5/libgcc/config/t-stack ---- gcc-4.8.5.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 -+++ gcc-4.8.5/libgcc/config/t-stack 2016-03-07 05:28:12.000000000 +0100 -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif diff --git a/package/gcc/4.8.5/940-uclinux-enable-threads.patch b/package/gcc/4.8.5/940-uclinux-enable-threads.patch deleted file mode 100644 index e58e824938..0000000000 --- a/package/gcc/4.8.5/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.8.5.orig/gcc/config.gcc gcc-4.8.5/gcc/config.gcc ---- gcc-4.8.5.orig/gcc/config.gcc 2015-05-21 22:57:29.000000000 +0200 -+++ gcc-4.8.5/gcc/config.gcc 2016-07-02 20:35:24.107644834 +0200 -@@ -741,6 +741,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/package/gcc/6.3.0/896-microblaze-Revert.patch b/package/gcc/6.3.0/896-microblaze-Revert.patch new file mode 100644 index 0000000000..7026d0efe1 --- /dev/null +++ b/package/gcc/6.3.0/896-microblaze-Revert.patch @@ -0,0 +1,40 @@ +From 707a69dfb56a2976e2b5c010f0e5cb2ac9905a07 Mon Sep 17 00:00:00 2001 +From: eager +Date: Sat, 27 May 2017 18:29:40 +0000 +Subject: [PATCH] Revert: 2016-01-21 Ajit Agarwal + + + See https://gcc.gnu.org/ml/gcc/2017-05/msg00221.html. + + * config/microblaze/microblaze.h + (FIXED_REGISTERS): Update in macro. + (CALL_USED_REGISTERS): Update in macro. + + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248540 138bc75d-0d04-0410-961f-82ee72b054a4 +Signed-off-by: Waldemar Brodkorb +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 66e4ef5..2c9ece1 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -269,14 +269,14 @@ extern enum pipeline_type microblaze_pipe; + #define FIXED_REGISTERS \ + { \ + 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, \ +- 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ ++ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 1, 1, 1, 1 \ + } + + #define CALL_USED_REGISTERS \ + { \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ +- 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ ++ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 1, 1, 1, 1 \ + } + #define GP_REG_FIRST 0 +-- +2.1.4 + diff --git a/package/gcc/6.3.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch b/package/gcc/6.3.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch new file mode 100644 index 0000000000..1f2dcabede --- /dev/null +++ b/package/gcc/6.3.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch @@ -0,0 +1,178 @@ +From 81aab124bc697a87ad492d4cd3380599c0e0747e Mon Sep 17 00:00:00 2001 +From: jsm28 +Date: Fri, 6 Jan 2017 20:54:34 +0000 +Subject: [PATCH] Make MicroBlaze support DWARF EH (old Xilinx patch, needed + for glibc build). + +This patch, taken from + +and with a few formatting cleanups and an update for the removal of +gen_rtx_raw_REG, enables DWARF EH support for MicroBlaze. + +This is needed for building glibc with a compiler that includes shared +libgcc; right now all glibc builds for MicroBlaze are failing with my +bot for lack of this support. (It's dubious if we should have glibc +ports at all where required support is missing in FSF GCC.) + +Tested building glibc with build-many-glibcs.py. I have *not* done +any other testing or any execution testing for MicroBlaze. + +2017-01-06 Edgar E. Iglesias + David Holsgrove + + * common/config/microblaze/microblaze-common.c + (TARGET_EXCEPT_UNWIND_INFO): Remove. + * config/microblaze/microblaze-protos.h (microblaze_eh_return): + New prototype. + * config/microblaze/microblaze.c (microblaze_must_save_register) + (microblaze_expand_epilogue, microblaze_return_addr): Handle + calls_eh_return. + (microblaze_eh_return): New function. + * config/microblaze/microblaze.h (RETURN_ADDR_OFFSET) + (EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM) + (EH_RETURN_STACKADJ_RTX, ASM_PREFERRED_EH_DATA_FORMAT): New macros. + * config/microblaze/microblaze.md (eh_return): New pattern. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244183 138bc75d-0d04-0410-961f-82ee72b054a4 +Signed-off-by: Waldemar Brodkorb +--- + gcc/common/config/microblaze/microblaze-common.c | 3 --- + gcc/config/microblaze/microblaze-protos.h | 1 + + gcc/config/microblaze/microblaze.c | 27 ++++++++++++++++++++---- + gcc/config/microblaze/microblaze.h | 16 ++++++++++++++ + gcc/config/microblaze/microblaze.md | 10 +++++++++ + 6 files changed, 66 insertions(+), 7 deletions(-) + +diff --git a/gcc/common/config/microblaze/microblaze-common.c b/gcc/common/config/microblaze/microblaze-common.c +index 57a3099..4975663 100644 +--- a/gcc/common/config/microblaze/microblaze-common.c ++++ b/gcc/common/config/microblaze/microblaze-common.c +@@ -37,7 +37,4 @@ static const struct default_options microblaze_option_optimization_table[] = + #undef TARGET_OPTION_OPTIMIZATION_TABLE + #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table + +-#undef TARGET_EXCEPT_UNWIND_INFO +-#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info +- + struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER; +diff --git a/gcc/config/microblaze/microblaze-protos.h b/gcc/config/microblaze/microblaze-protos.h +index 6fb3066..9ba8f2d 100644 +--- a/gcc/config/microblaze/microblaze-protos.h ++++ b/gcc/config/microblaze/microblaze-protos.h +@@ -57,6 +57,7 @@ extern bool microblaze_tls_referenced_p (rtx); + extern int symbol_mentioned_p (rtx); + extern int label_mentioned_p (rtx); + extern bool microblaze_cannot_force_const_mem (machine_mode, rtx); ++extern void microblaze_eh_return (rtx op0); + #endif /* RTX_CODE */ + + /* Declare functions in microblaze-c.c. */ +diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c +index 03b70e1..746bef1 100644 +--- a/gcc/config/microblaze/microblaze.c ++++ b/gcc/config/microblaze/microblaze.c +@@ -1926,6 +1926,10 @@ microblaze_must_save_register (int regno) + if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM)) + return 1; + ++ if (crtl->calls_eh_return ++ && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) ++ return 1; ++ + if (!crtl->is_leaf) + { + if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) +@@ -1953,6 +1957,11 @@ microblaze_must_save_register (int regno) + return 1; + } + ++ if (crtl->calls_eh_return ++ && (regno == EH_RETURN_DATA_REGNO (0) ++ || regno == EH_RETURN_DATA_REGNO (1))) ++ return 1; ++ + return 0; + } + +@@ -3029,6 +3038,12 @@ microblaze_expand_epilogue (void) + emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx)); + } + ++ if (crtl->calls_eh_return) ++ emit_insn (gen_addsi3 (stack_pointer_rtx, ++ stack_pointer_rtx, ++ gen_raw_REG (SImode, ++ MB_EH_STACKADJ_REGNUM))); ++ + emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST + + MB_ABI_SUB_RETURN_ADDR_REGNUM))); + } +@@ -3326,10 +3341,14 @@ microblaze_return_addr (int count, rtx frame ATTRIBUTE_UNUSED) + if (count != 0) + return NULL_RTX; + +- return gen_rtx_PLUS (Pmode, +- get_hard_reg_initial_val (Pmode, +- MB_ABI_SUB_RETURN_ADDR_REGNUM), +- GEN_INT (8)); ++ return get_hard_reg_initial_val (Pmode, ++ MB_ABI_SUB_RETURN_ADDR_REGNUM); ++} ++ ++void ++microblaze_eh_return (rtx op0) ++{ ++ emit_insn (gen_movsi (gen_rtx_MEM (Pmode, stack_pointer_rtx), op0)); + } + + /* Queue an .ident string in the queue of top-level asm statements. +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 527f4d3..8fdadbf 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -184,6 +184,22 @@ extern enum pipeline_type microblaze_pipe; + #define INCOMING_RETURN_ADDR_RTX \ + gen_rtx_REG (Pmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM) + ++/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC. */ ++#define RETURN_ADDR_OFFSET (8) ++ ++/* Describe how we implement __builtin_eh_return. */ ++#define EH_RETURN_DATA_REGNO(N) \ ++ (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM) ++ ++#define MB_EH_STACKADJ_REGNUM MB_ABI_INT_RETURN_VAL2_REGNUM ++#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM) ++ ++/* Select a format to encode pointers in exception handling data. CODE ++ is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is ++ true if the symbol may be affected by dynamic relocations. */ ++#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \ ++ ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr) ++ + /* Use DWARF 2 debugging information by default. */ + #define DWARF2_DEBUGGING_INFO + #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG +diff --git a/gcc/config/microblaze/microblaze.md b/gcc/config/microblaze/microblaze.md +index 8f83daa..66ebc1e 100644 +--- a/gcc/config/microblaze/microblaze.md ++++ b/gcc/config/microblaze/microblaze.md +@@ -2324,4 +2324,14 @@ + (set_attr "mode" "SI") + (set_attr "length" "4")]) + ++; This is used in compiling the unwind routines. ++(define_expand "eh_return" ++ [(use (match_operand 0 "general_operand" ""))] ++ "" ++ " ++{ ++ microblaze_eh_return (operands[0]); ++ DONE; ++}") ++ + (include "sync.md") +-- +2.1.4 + diff --git a/package/gcc/7.1.0/0100-uclibc-conf.patch b/package/gcc/7.1.0/0100-uclibc-conf.patch new file mode 100644 index 0000000000..d354baf81f --- /dev/null +++ b/package/gcc/7.1.0/0100-uclibc-conf.patch @@ -0,0 +1,29 @@ +From 326b880b20e5f8187dbda736b4c4c662cbfb00ca Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 2 May 2017 22:36:15 +0200 +Subject: [PATCH] uclibc-conf + +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + contrib/regression/objs-gcc.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh +index 60b0497..6dc7ead 100755 +--- a/contrib/regression/objs-gcc.sh ++++ b/contrib/regression/objs-gcc.sh +@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ] + then + make all-gdb all-dejagnu all-ld || exit 1 + make install-gdb install-dejagnu install-ld || exit 1 ++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] ++ then ++ make all-gdb all-dejagnu all-ld || exit 1 ++ make install-gdb install-dejagnu install-ld || exit 1 + elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then + make bootstrap || exit 1 + make install || exit 1 +-- +2.9.3 + diff --git a/package/gcc/7.1.0/0810-arm-softfloat-libgcc.patch b/package/gcc/7.1.0/0810-arm-softfloat-libgcc.patch new file mode 100644 index 0000000000..63880dd091 --- /dev/null +++ b/package/gcc/7.1.0/0810-arm-softfloat-libgcc.patch @@ -0,0 +1,45 @@ +From 420a304ac0daa29d66da6ed5b0b49fc4c482d522 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 2 May 2017 22:46:18 +0200 +Subject: [PATCH] arm softfloat libgcc + +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + gcc/config/arm/linux-elf.h | 2 +- + libgcc/config/arm/t-linux | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h +index 3d62367..dad0b97 100644 +--- a/gcc/config/arm/linux-elf.h ++++ b/gcc/config/arm/linux-elf.h +@@ -58,7 +58,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + +diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux +index 3d520de..e7bc042 100644 +--- a/libgcc/config/arm/t-linux ++++ b/libgcc/config/arm/t-linux +@@ -1,6 +1,11 @@ + LIB1ASMSRC = arm/lib1funcs.S + LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ +- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 ++ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ ++ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ ++ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ ++ _arm_fixsfsi _arm_fixunssfsi + + # Just for these, we omit the frame pointer since it makes such a big + # difference. +-- +2.9.3 + diff --git a/package/gcc/7.1.0/0860-cilk-fix-build-without-wchar.patch b/package/gcc/7.1.0/0860-cilk-fix-build-without-wchar.patch new file mode 100644 index 0000000000..61ab01c713 --- /dev/null +++ b/package/gcc/7.1.0/0860-cilk-fix-build-without-wchar.patch @@ -0,0 +1,64 @@ +From 714739e69ead1d9823233af40645277f6d4633ea Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Tue, 2 May 2017 23:21:46 +0200 +Subject: [PATCH] cilk: fix build without wchar + +When building against uClibc with wchar support disabled, WCHAR_MIN and +WCHAR_MAX are not defined leading to compilation errors. + +Fix it by only including the wchar code if available. + +Signed-off-by: Peter Korsgaard +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h +index 641aa82..4f8e010 100644 +--- a/libcilkrts/include/cilk/reducer_min_max.h ++++ b/libcilkrts/include/cilk/reducer_min_max.h +@@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C + CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) + CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) + CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) ++#ifdef WCHAR_MIN + CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) ++#endif + CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) + CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) + CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) +@@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C + CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) ++#ifdef WCHAR_MIN + CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) ++#endif + CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) +@@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C + CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) + CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) + CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) ++#ifdef WCHAR_MAX + CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) ++#endif + CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) + CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) + CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) +@@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C + CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) ++#ifdef WCHAR_MAX + CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) ++#endif + CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) +-- +2.9.3 + diff --git a/package/gcc/7.1.0/0891-fix-m68k-uclinux.patch b/package/gcc/7.1.0/0891-fix-m68k-uclinux.patch new file mode 100644 index 0000000000..e84fd92453 --- /dev/null +++ b/package/gcc/7.1.0/0891-fix-m68k-uclinux.patch @@ -0,0 +1,30 @@ +From c2773170a1b0e2728f71f2275a99fd177ba2cef4 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 2 May 2017 23:25:17 +0200 +Subject: [PATCH] fix m68k uclinux avoids internal compiler error while + compiling linux-atomic.c See here: + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 + +Signed-off-by: Waldemar Brodkorb +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + libgcc/config.host | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgcc/config.host b/libgcc/config.host +index b279a64..04fe183 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -820,7 +820,7 @@ m68k*-*-netbsdelf*) + m68k*-*-openbsd*) + ;; + m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc +- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" ++ tmake_file="$tmake_file m68k/t-floatlib" + md_unwind_header=m68k/linux-unwind.h + ;; + m68k-*-linux*) # Motorola m68k's running GNU/Linux +-- +2.9.3 + diff --git a/package/gcc/7.1.0/0900-remove-selftests.patch b/package/gcc/7.1.0/0900-remove-selftests.patch new file mode 100644 index 0000000000..a3bc7a5730 --- /dev/null +++ b/package/gcc/7.1.0/0900-remove-selftests.patch @@ -0,0 +1,111 @@ +From 63f0917d90eb83d267dc517fdfb6523a74b1917c Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 3 May 2017 00:37:06 +0200 +Subject: [PATCH] remove selftests + +When the gcc archive is extracted by the gcc.mk, the gcc/testsuite +is excluded: + +HOST_GCC_EXCLUDES = \ + libjava/* libgo/* \ + gcc/testsuite/* libstdc++-v3/testsuite/* + +The new Makefile target from the "Selftest framework" [1] added a dependency +on the gcc/testsuite/Makefile. +Revert partially the commit [1] to allow building gcc without selftest. + +[1] https://github.com/gcc-mirror/gcc/commit/99b4f3a2d5bf2c137de9731e27b483eb6b462fd9 + +Signed-off-by: Romain Naour +--- + gcc/Makefile.in | 46 +++++----------------------------------------- + 1 file changed, 5 insertions(+), 41 deletions(-) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 74d1912..652a554 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -1581,14 +1581,13 @@ OBJS = \ + OBJS-libcommon = diagnostic.o diagnostic-color.o diagnostic-show-locus.o \ + edit-context.o \ + pretty-print.o intl.o \ +- vec.o input.o version.o hash-table.o ggc-none.o memory-block.o \ +- selftest.o ++ vec.o input.o version.o hash-table.o ggc-none.o memory-block.o + + # Objects in libcommon-target.a, used by drivers and by the core + # compiler and containing target-dependent code. + OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \ + opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \ +- hash-table.o file-find.o spellcheck.o selftest.o ++ hash-table.o file-find.o spellcheck.o + + # This lists all host objects for the front ends. + ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS)) +@@ -1865,10 +1864,10 @@ config.status: $(srcdir)/configure $(srcdir)/config.gcc + quickstrap: all + cd $(toplevel_builddir) && $(MAKE) all-target-libgcc + +-all.internal: start.encap rest.encap doc selftest ++all.internal: start.encap rest.encap doc + # This is what to compile if making a cross-compiler. + all.cross: native gcc-cross$(exeext) cpp$(exeext) specs \ +- libgcc-support lang.all.cross doc selftest @GENINSRC@ srcextra ++ libgcc-support lang.all.cross doc @GENINSRC@ srcextra + # This is what must be made before installing GCC and converting libraries. + start.encap: native xgcc$(exeext) cpp$(exeext) specs \ + libgcc-support lang.start.encap @GENINSRC@ srcextra +@@ -1888,41 +1887,6 @@ endif + # This does the things that can't be done on the host machine. + rest.cross: specs + +-# GCC's selftests. +-# Specify a dummy input file to placate the driver. +-# Specify -nostdinc to work around missing WIND_BASE environment variable +-# required for *-wrs-vxworks-* targets. +-# Specify -o /dev/null so the output of -S is discarded. More importantly +-# It does not try to create a file with the name "null.s" on POSIX and +-# "nul.s" on Windows. Because on Windows "nul" is a reserved file name. +-# Specify the path to gcc/testsuite/selftests within the srcdir +-# as an argument to -fself-test. +-SELFTEST_FLAGS = -nostdinc -x c /dev/null -S -o /dev/null \ +- -fself-test=$(srcdir)/testsuite/selftests +- +-# Run the selftests during the build once we have a driver and a cc1, +-# so that self-test failures are caught as early as possible. +-# Use "s-selftest" to ensure that we only run the selftests if the +-# driver, cc1, or selftest data change. +-.PHONY: selftest +-selftest: s-selftest +-s-selftest: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs \ +- $(srcdir)/testsuite/selftests +- $(GCC_FOR_TARGET) $(SELFTEST_FLAGS) +- $(STAMP) $@ +- +-# Convenience method for running selftests under gdb: +-.PHONY: selftest-gdb +-selftest-gdb: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs +- $(GCC_FOR_TARGET) $(SELFTEST_FLAGS) \ +- -wrapper gdb,--args +- +-# Convenience method for running selftests under valgrind: +-.PHONY: selftest-valgrind +-selftest-valgrind: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs +- $(GCC_FOR_TARGET) $(SELFTEST_FLAGS) \ +- -wrapper valgrind,--leak-check=full +- + # Recompile all the language-independent object files. + # This is used only if the user explicitly asks for it. + compilations: $(BACKEND) +@@ -2076,7 +2040,7 @@ gcc-nm.c: gcc-ar.c + cp $^ $@ + + COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o \ +- collect-utils.o file-find.o hash-table.o selftest.o ++ collect-utils.o file-find.o hash-table.o + COLLECT2_LIBS = @COLLECT2_LIBS@ + collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS) + # Don't try modifying collect2 (aka ld) in place--it might be linking this. +-- +2.9.3 + diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 5a0fd970b8..2b78b29d4a 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -4,33 +4,10 @@ choice prompt "GCC compiler Version" default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_OR1K if BR2_or1k - default BR2_GCC_VERSION_5_X + default BR2_GCC_VERSION_6_X help Select the version of gcc you wish to use. -config BR2_GCC_VERSION_4_8_X - bool "gcc 4.8.x" - # Broken or unsupported architectures - depends on !BR2_microblaze && !BR2_arc && !BR2_or1k \ - && !BR2_powerpc64le && !BR2_nios2 && !BR2_bfin - # Broken or unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8 - # Broken or unsupported PPC cores - depends on !BR2_powerpc_power8 - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv - # gcc-4.8.x + binutils-2.25 is broken for MIPS - depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X) - # Unsupported for MIPS R5 - depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - # musl ppc64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - # musl mips64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - config BR2_GCC_VERSION_ARC bool "gcc arc (6.x)" # Only supported architecture @@ -81,12 +58,21 @@ config BR2_GCC_VERSION_6_X bool "gcc 6.x" # Broken or unsupported architectures depends on !BR2_arc - depends on !BR2_microblaze depends on !BR2_or1k # Unsupported MIPS cores depends on !BR2_mips_m6250 && !BR2_mips_p6600 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 +config BR2_GCC_VERSION_7_X + bool "gcc 7.x" + # Broken or unsupported architectures + depends on !BR2_arc + depends on !BR2_microblaze + depends on !BR2_or1k + # Unsupported MIPS cores + depends on !BR2_mips_m6250 && !BR2_mips_p6600 + select BR2_TOOLCHAIN_GCC_AT_LEAST_7 + endchoice # Indicates if GCC for architecture supports --with-{arch,cpu,..} to @@ -102,10 +88,10 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE config BR2_GCC_VERSION string - default "4.8.5" if BR2_GCC_VERSION_4_8_X default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X default "6.3.0" if BR2_GCC_VERSION_6_X + default "7.1.0" if BR2_GCC_VERSION_7_X default "arc-2017.03" if BR2_GCC_VERSION_ARC default "musl-5.4.0" if BR2_GCC_VERSION_OR1K diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index db59bae309..f64329b072 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -1,15 +1,11 @@ -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.5.4/sha512.sum -sha512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115 gcc-4.5.4.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.7.4/sha512.sum -sha512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189 gcc-4.7.4.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.8.5/sha512.sum -sha512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea gcc-4.8.5.tar.bz2 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.4/sha512.sum sha512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe gcc-4.9.4.tar.bz2 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.4.0/sha512.sum sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b gcc-5.4.0.tar.bz2 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.3.0/sha512.sum sha512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 gcc-6.3.0.tar.bz2 +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.1.0/sha512.sum +sha512 b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec gcc-7.1.0.tar.bz2 # Locally calculated (fetched from Github) sha512 282f76b8b63372f5b4426092b80d36da96cd0bda2a8588405b9ec22806c69fafb696b0e0df65bc36c3c3aa8ce5befc24246fd5c6ddb21dcde01f45f7b11ff7c4 gcc-arc-2017.03.tar.gz diff --git a/package/gettext/0002-Update-after-gnulib-changed.patch b/package/gettext/0002-Update-after-gnulib-changed.patch new file mode 100644 index 0000000000..5f5e5f6c25 --- /dev/null +++ b/package/gettext/0002-Update-after-gnulib-changed.patch @@ -0,0 +1,86 @@ +From a6f9caf8cc7614665d1be694485dd7bc30399e0f Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Tue, 16 May 2017 00:27:57 +0200 +Subject: [PATCH] Update after gnulib changed. + +For buildroot we only need to update wint_t.m4 to fix autoreconf with +certain packages which already contain the updated version of this file. +Otherwise autoreconf will break: + +http://git.net/ml/bug-gnulib-gnu/2017-01/msg00067.html +https://git.busybox.net/buildroot/commit/package/wget?id=c36f0d65ad63589f1b21833ef53d429c018b6f8a + +Patch backported from upstream commit: +http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=a6f9caf8cc7614665d1be694485dd7bc30399e0f + +Needed for coreutils bump to 8.27 + +Signed-off-by: Bernd Kuhls + +diff --git a/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4 +index 8ff2a5b5a..d30b8bcf8 100644 +--- a/gettext-runtime/m4/wint_t.m4 ++++ b/gettext-runtime/m4/wint_t.m4 +@@ -1,11 +1,12 @@ +-# wint_t.m4 serial 5 (gettext-0.18.2) +-dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc. ++# wint_t.m4 serial 7 ++dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl From Bruno Haible. +-dnl Test whether has the 'wint_t' type. ++dnl Test whether has the 'wint_t' type and whether gnulib's ++dnl or would, if present, override 'wint_t'. + dnl Prerequisite: AC_PROG_CC + + AC_DEFUN([gt_TYPE_WINT_T], +@@ -28,5 +29,46 @@ AC_DEFUN([gt_TYPE_WINT_T], + [gt_cv_c_wint_t=no])]) + if test $gt_cv_c_wint_t = yes; then + AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) ++ ++ dnl Determine whether gnulib's or would, if present, ++ dnl override 'wint_t'. ++ AC_CACHE_CHECK([whether wint_t is too small], ++ [gl_cv_type_wint_t_too_small], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[ ++/* Tru64 with Desktop Toolkit C has a bug: must be included before ++ . ++ BSD/OS 4.0.1 has a bug: , and must be ++ included before . */ ++#if !(defined __GLIBC__ && !defined __UCLIBC__) ++# include ++# include ++# include ++#endif ++#include ++ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; ++ ]])], ++ [gl_cv_type_wint_t_too_small=no], ++ [gl_cv_type_wint_t_too_small=yes])]) ++ if test $gl_cv_type_wint_t_too_small = yes; then ++ GNULIB_OVERRIDES_WINT_T=1 ++ else ++ GNULIB_OVERRIDES_WINT_T=0 ++ fi ++ else ++ GNULIB_OVERRIDES_WINT_T=0 ++ fi ++ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) ++]) ++ ++dnl Prerequisites of the 'wint_t' override. ++AC_DEFUN([gl_TYPE_WINT_T_PREREQ], ++[ ++ AC_CHECK_HEADERS_ONCE([crtdefs.h]) ++ if test $ac_cv_header_crtdefs_h = yes; then ++ HAVE_CRTDEFS_H=1 ++ else ++ HAVE_CRTDEFS_H=0 + fi ++ AC_SUBST([HAVE_CRTDEFS_H]) + ]) diff --git a/package/git/0001-grep-set-default-output-method.patch b/package/git/0001-grep-set-default-output-method.patch deleted file mode 100644 index ade35eb021..0000000000 --- a/package/git/0001-grep-set-default-output-method.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 379642bcd8d89db52feba88a651e4e56d6ac5767 Mon Sep 17 00:00:00 2001 -From: Brandon Williams -Date: Fri, 17 Mar 2017 11:41:54 -0700 -Subject: [PATCH] grep: set default output method - -Signed-off-by: Brandon Williams -Signed-off-by: Junio C Hamano -Signed-off-by: Rahul Bedarkar ---- - grep.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/grep.c b/grep.c -index 0dbdc1d..56ef0ec 100644 ---- a/grep.c -+++ b/grep.c -@@ -12,6 +12,11 @@ static int grep_source_is_binary(struct grep_source *gs); - - static struct grep_opt grep_defaults; - -+static void std_output(struct grep_opt *opt, const void *buf, size_t size) -+{ -+ fwrite(buf, size, 1, stdout); -+} -+ - /* - * Initialize the grep_defaults template with hardcoded defaults. - * We could let the compiler do this, but without C99 initializers -@@ -42,6 +47,7 @@ void init_grep_defaults(void) - color_set(opt->color_selected, ""); - color_set(opt->color_sep, GIT_COLOR_CYAN); - opt->color = -1; -+ opt->output = std_output; - } - - static int parse_pattern_type_arg(const char *opt, const char *arg) -@@ -152,6 +158,7 @@ void grep_init(struct grep_opt *opt, const char *prefix) - opt->pathname = def->pathname; - opt->regflags = def->regflags; - opt->relative = def->relative; -+ opt->output = def->output; - - color_set(opt->color_context, def->color_context); - color_set(opt->color_filename, def->color_filename); -@@ -1379,11 +1386,6 @@ static int look_ahead(struct grep_opt *opt, - return 0; - } - --static void std_output(struct grep_opt *opt, const void *buf, size_t size) --{ -- fwrite(buf, size, 1, stdout); --} -- - static int fill_textconv_grep(struct userdiff_driver *driver, - struct grep_source *gs) - { --- -2.6.2 - diff --git a/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch b/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch deleted file mode 100644 index 077b554083..0000000000 --- a/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 2225e1ea20481a7c0da526891470abf9ece623e7 Mon Sep 17 00:00:00 2001 -From: Brandon Williams -Date: Fri, 17 Mar 2017 11:41:55 -0700 -Subject: [PATCH] grep: fix builds with with no thread support - -Commit 0281e487fd91 ("grep: optionally recurse into submodules") -added functions grep_submodule() and grep_submodule_launch() which -use "struct work_item" which is defined only when thread support -is available. - -The original implementation of grep_submodule() used the "struct -work_item" in order to gain access to a strbuf to store its output which -was to be printed at a later point in time. This differs from how both -grep_file() and grep_sha1() handle their output. This patch eliminates -the reliance on the "struct work_item" and instead opts to use the -output function stored in the output field of the "struct grep_opt" -object directly, making it behave similarly to both grep_file() and -grep_sha1(). - -Reported-by: Rahul Bedarkar -Signed-off-by: Brandon Williams -Reviewed-by: Jonathan Nieder -Signed-off-by: Junio C Hamano -Signed-off-by: Rahul Bedarkar ---- - builtin/grep.c | 21 +++++++++------------ - 1 file changed, 9 insertions(+), 12 deletions(-) - -diff --git a/builtin/grep.c b/builtin/grep.c -index 2c727ef..33561f2 100644 ---- a/builtin/grep.c -+++ b/builtin/grep.c -@@ -538,7 +538,7 @@ static int grep_submodule_launch(struct grep_opt *opt, - int status, i; - const char *end_of_base; - const char *name; -- struct work_item *w = opt->output_priv; -+ struct strbuf child_output = STRBUF_INIT; - - end_of_base = strchr(gs->name, ':'); - if (gs->identifier && end_of_base) -@@ -593,14 +593,16 @@ static int grep_submodule_launch(struct grep_opt *opt, - * child process. A '0' indicates a hit, a '1' indicates no hit and - * anything else is an error. - */ -- status = capture_command(&cp, &w->out, 0); -+ status = capture_command(&cp, &child_output, 0); - if (status && (status != 1)) { - /* flush the buffer */ -- write_or_die(1, w->out.buf, w->out.len); -+ write_or_die(1, child_output.buf, child_output.len); - die("process for submodule '%s' failed with exit code: %d", - gs->name, status); - } - -+ opt->output(opt, child_output.buf, child_output.len); -+ strbuf_release(&child_output); - /* invert the return code to make a hit equal to 1 */ - return !status; - } -@@ -641,19 +643,14 @@ static int grep_submodule(struct grep_opt *opt, const unsigned char *sha1, - } else - #endif - { -- struct work_item w; -+ struct grep_source gs; - int hit; - -- grep_source_init(&w.source, GREP_SOURCE_SUBMODULE, -+ grep_source_init(&gs, GREP_SOURCE_SUBMODULE, - filename, path, sha1); -- strbuf_init(&w.out, 0); -- opt->output_priv = &w; -- hit = grep_submodule_launch(opt, &w.source); -+ hit = grep_submodule_launch(opt, &gs); - -- write_or_die(1, w.out.buf, w.out.len); -- -- grep_source_clear(&w.source); -- strbuf_release(&w.out); -+ grep_source_clear(&gs); - return hit; - } - } --- -2.6.2 - diff --git a/package/git/git.hash b/package/git/git.hash index 4782dcbefb..efe6225621 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 016124c54ce2db7a4c2bd26b0de21fbf8f6bcaee04842aa221c7243141df4e42 git-2.12.3.tar.xz +sha256 4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258 git-2.13.0.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 9cea8de6b1..9cc88dd726 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.12.3 +GIT_VERSION = 2.13.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 7eb8e59475..36fa575c7c 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,4 +1,4 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000404.html -sha1 500ddae8e4225ae2e300934090f9b9a427b8def1 gnupg-2.1.20.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000405.html +sha1 1852c066bc21893bc52026ead78edf50fdf15e13 gnupg-2.1.21.tar.bz2 # Calculated based on the hash above -sha256 24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d gnupg-2.1.20.tar.bz2 +sha256 7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd gnupg-2.1.21.tar.bz2 diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index db7f4cbd5a..e5451639fd 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.1.20 +GNUPG2_VERSION = 2.1.21 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ diff --git a/package/go/go.hash b/package/go/go.hash index e50f0041f1..1836af2482 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc go1.7.4.src.tar.gz +sha256 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 go1.8.3.src.tar.gz diff --git a/package/go/go.mk b/package/go/go.mk index a461342581..a64356e069 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.7.4 +GO_VERSION = 1.8.3 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz diff --git a/package/grep/Config.in b/package/grep/Config.in index 64276506f0..5b0471b4c0 100644 --- a/package/grep/Config.in +++ b/package/grep/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_GREP bool "grep" depends on BR2_USE_WCHAR depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help The GNU regular expression matcher. diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 92a915cf1c..5101ddacf6 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -11,7 +11,11 @@ GREP_LICENSE = GPL-3.0+ GREP_LICENSE_FILES = COPYING GREP_CONF_OPTS = --disable-perl-regexp \ $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) -GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) + +# Can use libintl if available +ifeq ($(BR2_PACKAGE_GETTEXT),y) +GREP_DEPENDENCIES += gettext +endif # link with iconv if enabled ifeq ($(BR2_PACKAGE_LIBICONV),y) diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index ad2e090a43..5de84f77a1 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -11,6 +11,7 @@ HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/down HWLOC_LICENSE = BSD-3-Clause HWLOC_LICENSE_FILES = COPYING HWLOC_DEPENDENCIES = host-pkgconf +HWLOC_INSTALL_STAGING = YES # 0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch touches Makefile.am HWLOC_AUTORECONF = YES diff --git a/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch b/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch deleted file mode 100644 index 943679eda3..0000000000 --- a/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b218117cad34d39b9ffb587b45c71c5a49b12bde Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Fri, 31 Mar 2017 15:24:33 -0400 -Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/415 - -Fixes CVE-2017-7606 - -Signed-off-by: Peter Korsgaard ---- - coders/pnm.c | 2 +- - coders/rle.c | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/coders/pnm.c b/coders/pnm.c -index 9a1221d79..c525ebb8f 100644 ---- a/coders/pnm.c -+++ b/coders/pnm.c -@@ -1979,7 +1979,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, - pixel=ScaleQuantumToChar(GetPixelRed(image,p)); - else - pixel=ScaleQuantumToAny(GetPixelRed(image,p), -- max_value); -+ max_value); - } - q=PopCharPixel((unsigned char) pixel,q); - p+=GetPixelChannels(image); -diff --git a/coders/rle.c b/coders/rle.c -index 2318901ec..ec071dc7b 100644 ---- a/coders/rle.c -+++ b/coders/rle.c -@@ -271,7 +271,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) - p=colormap; - for (i=0; i < (ssize_t) number_colormaps; i++) - for (x=0; x < (ssize_t) map_length; x++) -- *p++=(unsigned char) ScaleShortToQuantum(ReadBlobLSBShort(image)); -+ *p++=(unsigned char) ScaleQuantumToChar(ScaleShortToQuantum( -+ ReadBlobLSBShort(image))); - } - if ((flags & 0x08) != 0) - { -@@ -476,7 +477,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) - for (x=0; x < (ssize_t) number_planes; x++) - { - ValidateColormapValue(image,(size_t) (x*map_length+ -- (*p & mask)),&index,exception); -+ (*p & mask)),&index,exception); - *p=colormap[(ssize_t) index]; - p++; - } --- -2.11.0 - diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index ff7b24a9ab..ce7e6b8757 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,2 +1,2 @@ # From http://www.imagemagick.org/download/releases/digest.rdf -sha256 4a1dde5bdfec0fc549955a051be25b7ff96dfb192060997699e43c7ce0f06ab2 ImageMagick-7.0.5-4.tar.xz +sha256 007648793640b1d33f1285426df7c43fcf412eaef27b0b68fa7977bf29c4d30e ImageMagick-7.0.5-8.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 9bef6f7815..ae6122c964 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-4 +IMAGEMAGICK_VERSION = 7.0.5-8 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 diff --git a/package/iproute2/0002-Add-missing-sys-types.h-include.patch b/package/iproute2/0002-Add-missing-sys-types.h-include.patch deleted file mode 100644 index ef918140da..0000000000 --- a/package/iproute2/0002-Add-missing-sys-types.h-include.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 560dee4b4be54699c0c9679771c9e0d61e4db80a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 19 Nov 2015 17:48:55 +0100 -Subject: [PATCH] Add missing include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The u_intXX_t types are defined in , so it should be -included before using those types. Otherwise, with certain C -libraries, the build fails with: - -In file included from ../include/iptables.h:4:0, - from m_ipt.c:18: -../include/iptables_common.h:47:16: error: unknown type name ‘u_int32_t’ - #define __le32 u_int32_t - -Signed-off-by: Thomas Petazzoni ---- - include/iptables_common.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/iptables_common.h b/include/iptables_common.h -index 9099667..2c27a4b 100644 ---- a/include/iptables_common.h -+++ b/include/iptables_common.h -@@ -43,6 +43,8 @@ extern char *lib_dir; - extern void init_extensions(void); - #endif - -+#include -+ - #define __be32 u_int32_t - #define __le32 u_int32_t - #define __be16 u_int16_t --- -2.6.3 - diff --git a/package/iproute2/0002-ip-include-libc-headers-first.patch b/package/iproute2/0002-ip-include-libc-headers-first.patch new file mode 100644 index 0000000000..b842142443 --- /dev/null +++ b/package/iproute2/0002-ip-include-libc-headers-first.patch @@ -0,0 +1,35 @@ +From 8afdd8babb9e82bcfde78e851b24b698436a6f9f Mon Sep 17 00:00:00 2001 +Message-Id: <8afdd8babb9e82bcfde78e851b24b698436a6f9f.1495466847.git.baruch@tkos.co.il> +From: Baruch Siach +Date: Mon, 22 May 2017 15:42:49 +0300 +Subject: [PATCH] ip: include libc headers first + +Including libc headers first helps as a workaround to redefinition of struct +ethhdr with a suitably patched musl libc that suppresses the kernel +if_ether.h. + +Signed-off-by: Baruch Siach +--- +Upstream status: posted http://marc.info/?l=linux-netdev&m=149545968900803&w=2 + + ip/iplink_bridge.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c +index 818b43c89b5b..cccdec1c203a 100644 +--- a/ip/iplink_bridge.c ++++ b/ip/iplink_bridge.c +@@ -13,9 +13,9 @@ + #include + #include + #include ++#include + #include + #include +-#include + #include + + #include "rt_names.h" +-- +2.11.0 + diff --git a/package/iproute2/0003-tc-add-missing-limits.h-header.patch b/package/iproute2/0003-tc-add-missing-limits.h-header.patch deleted file mode 100644 index b9b27f31a7..0000000000 --- a/package/iproute2/0003-tc-add-missing-limits.h-header.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1f4547b0a81db617f4b0d02711d9e39278eb8283 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 22 Dec 2016 20:45:11 +0200 -Subject: [PATCH] tc: add missing limits.h header - -This fixes under musl build issues like: - -f_matchall.c: In function ‘matchall_parse_opt’: -f_matchall.c:48:12: error: ‘LONG_MIN’ undeclared (first use in this function) - if (h == LONG_MIN || h == LONG_MAX) { - ^ -f_matchall.c:48:12: note: each undeclared identifier is reported only once for each function it appears in -f_matchall.c:48:29: error: ‘LONG_MAX’ undeclared (first use in this function) - if (h == LONG_MIN || h == LONG_MAX) { - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: posted http://marc.info/?l=linux-netdev&m=148243283002957&w=2 ---- - tc/tc_util.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tc/tc_util.h b/tc/tc_util.h -index f198a4ad5554..4db26c6d5e25 100644 ---- a/tc/tc_util.h -+++ b/tc/tc_util.h -@@ -2,6 +2,7 @@ - #define _TC_UTIL_H_ 1 - - #define MAX_MSG 16384 -+#include - #include - #include - #include --- -2.11.0 - diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 5cacc7f99c..5bc47d8da4 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,2 +1,2 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 iproute2-4.9.0.tar.xz +sha256 72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 iproute2-4.11.0.tar.xz diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 6ecfc09847..5502d7358b 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 4.9.0 +IPROUTE2_VERSION = 4.11.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ diff --git a/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch b/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch deleted file mode 100644 index be8472053f..0000000000 --- a/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch +++ /dev/null @@ -1,286 +0,0 @@ -From e96fc4fdd525fa0ede28074a7e2b1caf94b58b0d Mon Sep 17 00:00:00 2001 -From: Michael Adams -Date: Sat, 4 Mar 2017 14:43:24 -0800 -Subject: [PATCH] Fixed bugs due to uninitialized data in the JP2 decoder. - Also, added some comments marking I/O stream interfaces that probably need to - be changed (in the long term) to fix integer overflow problems. - -Signed-off-by: Peter Korsgaard ---- - src/libjasper/base/jas_stream.c | 18 +++++++++++++++++ - src/libjasper/jp2/jp2_cod.c | 44 ++++++++++++++++++++++++++++------------- - 2 files changed, 48 insertions(+), 14 deletions(-) - -diff --git a/src/libjasper/base/jas_stream.c b/src/libjasper/base/jas_stream.c -index 327ee57..d70408f 100644 ---- a/src/libjasper/base/jas_stream.c -+++ b/src/libjasper/base/jas_stream.c -@@ -664,6 +664,7 @@ int jas_stream_ungetc(jas_stream_t *stream, int c) - return 0; - } - -+/* FIXME integral type */ - int jas_stream_read(jas_stream_t *stream, void *buf, int cnt) - { - int n; -@@ -690,6 +691,7 @@ int jas_stream_read(jas_stream_t *stream, void *buf, int cnt) - return n; - } - -+/* FIXME integral type */ - int jas_stream_write(jas_stream_t *stream, const void *buf, int cnt) - { - int n; -@@ -742,6 +744,7 @@ int jas_stream_puts(jas_stream_t *stream, const char *s) - return 0; - } - -+/* FIXME integral type */ - char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize) - { - int c; -@@ -765,6 +768,7 @@ char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize) - return buf; - } - -+/* FIXME integral type */ - int jas_stream_gobble(jas_stream_t *stream, int n) - { - int m; -@@ -783,6 +787,7 @@ int jas_stream_gobble(jas_stream_t *stream, int n) - return n; - } - -+/* FIXME integral type */ - int jas_stream_pad(jas_stream_t *stream, int n, int c) - { - int m; -@@ -885,6 +890,7 @@ long jas_stream_tell(jas_stream_t *stream) - * Buffer initialization code. - \******************************************************************************/ - -+/* FIXME integral type */ - static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf, - int bufsize) - { -@@ -1060,6 +1066,7 @@ static int jas_strtoopenmode(const char *s) - return openmode; - } - -+/* FIXME integral type */ - int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n) - { - int all; -@@ -1085,6 +1092,7 @@ int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n) - return 0; - } - -+/* FIXME integral type */ - long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt) - { - int old; -@@ -1094,6 +1102,7 @@ long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt) - return old; - } - -+/* FIXME integral type */ - int jas_stream_display(jas_stream_t *stream, FILE *fp, int n) - { - unsigned char buf[16]; -@@ -1168,6 +1177,7 @@ long jas_stream_length(jas_stream_t *stream) - * Memory stream object. - \******************************************************************************/ - -+/* FIXME integral type */ - static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt) - { - ssize_t n; -@@ -1209,6 +1219,7 @@ static int mem_resize(jas_stream_memobj_t *m, size_t bufsize) - return 0; - } - -+/* FIXME integral type */ - static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt) - { - size_t n; -@@ -1264,6 +1275,7 @@ static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt) - return ret; - } - -+/* FIXME integral type */ - static long mem_seek(jas_stream_obj_t *obj, long offset, int origin) - { - jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj; -@@ -1310,6 +1322,7 @@ static int mem_close(jas_stream_obj_t *obj) - * File stream object. - \******************************************************************************/ - -+/* FIXME integral type */ - static int file_read(jas_stream_obj_t *obj, char *buf, int cnt) - { - jas_stream_fileobj_t *fileobj; -@@ -1318,6 +1331,7 @@ static int file_read(jas_stream_obj_t *obj, char *buf, int cnt) - return read(fileobj->fd, buf, cnt); - } - -+/* FIXME integral type */ - static int file_write(jas_stream_obj_t *obj, char *buf, int cnt) - { - jas_stream_fileobj_t *fileobj; -@@ -1326,6 +1340,7 @@ static int file_write(jas_stream_obj_t *obj, char *buf, int cnt) - return write(fileobj->fd, buf, cnt); - } - -+/* FIXME integral type */ - static long file_seek(jas_stream_obj_t *obj, long offset, int origin) - { - jas_stream_fileobj_t *fileobj; -@@ -1352,6 +1367,7 @@ static int file_close(jas_stream_obj_t *obj) - * Stdio file stream object. - \******************************************************************************/ - -+/* FIXME integral type */ - static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt) - { - FILE *fp; -@@ -1367,6 +1383,7 @@ static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt) - return result; - } - -+/* FIXME integral type */ - static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt) - { - FILE *fp; -@@ -1377,6 +1394,7 @@ static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt) - return (n != JAS_CAST(size_t, cnt)) ? (-1) : cnt; - } - -+/* FIXME integral type */ - static long sfile_seek(jas_stream_obj_t *obj, long offset, int origin) - { - FILE *fp; -diff --git a/src/libjasper/jp2/jp2_cod.c b/src/libjasper/jp2/jp2_cod.c -index 7f3608a..8d98a2c 100644 ---- a/src/libjasper/jp2/jp2_cod.c -+++ b/src/libjasper/jp2/jp2_cod.c -@@ -183,15 +183,28 @@ jp2_boxinfo_t jp2_boxinfo_unk = { - * Box constructor. - \******************************************************************************/ - --jp2_box_t *jp2_box_create(int type) -+jp2_box_t *jp2_box_create0() - { - jp2_box_t *box; -- jp2_boxinfo_t *boxinfo; -- - if (!(box = jas_malloc(sizeof(jp2_box_t)))) { - return 0; - } - memset(box, 0, sizeof(jp2_box_t)); -+ box->type = 0; -+ box->len = 0; -+ // Mark the box data as never having been constructed -+ // so that we will not errantly attempt to destroy it later. -+ box->ops = &jp2_boxinfo_unk.ops; -+ return box; -+} -+ -+jp2_box_t *jp2_box_create(int type) -+{ -+ jp2_box_t *box; -+ jp2_boxinfo_t *boxinfo; -+ if (!(box = jp2_box_create0())) { -+ return 0; -+ } - box->type = type; - box->len = 0; - if (!(boxinfo = jp2_boxinfolookup(type))) { -@@ -248,14 +261,9 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) - box = 0; - tmpstream = 0; - -- if (!(box = jas_malloc(sizeof(jp2_box_t)))) { -+ if (!(box = jp2_box_create0())) { - goto error; - } -- -- // Mark the box data as never having been constructed -- // so that we will not errantly attempt to destroy it later. -- box->ops = &jp2_boxinfo_unk.ops; -- - if (jp2_getuint32(in, &len) || jp2_getuint32(in, &box->type)) { - goto error; - } -@@ -263,10 +271,12 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) - box->info = boxinfo; - box->len = len; - JAS_DBGLOG(10, ( -- "preliminary processing of JP2 box: type=%c%s%c (0x%08x); length=%d\n", -+ "preliminary processing of JP2 box: " -+ "type=%c%s%c (0x%08x); length=%"PRIuFAST32"\n", - '"', boxinfo->name, '"', box->type, box->len - )); - if (box->len == 1) { -+ JAS_DBGLOG(10, ("big length\n")); - if (jp2_getuint64(in, &extlen)) { - goto error; - } -@@ -382,6 +392,7 @@ static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in) - { - jp2_bpcc_t *bpcc = &box->data.bpcc; - unsigned int i; -+ bpcc->bpcs = 0; - bpcc->numcmpts = box->datalen; - if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) { - return -1; -@@ -462,6 +473,7 @@ static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in) - jp2_cdef_t *cdef = &box->data.cdef; - jp2_cdefchan_t *chan; - unsigned int channo; -+ cdef->ents = 0; - if (jp2_getuint16(in, &cdef->numchans)) { - return -1; - } -@@ -518,7 +530,9 @@ int jp2_box_put(jp2_box_t *box, jas_stream_t *out) - } - - if (dataflag) { -- if (jas_stream_copy(out, tmpstream, box->len - JP2_BOX_HDRLEN(false))) { -+ if (jas_stream_copy(out, tmpstream, box->len - -+ JP2_BOX_HDRLEN(false))) { -+ jas_eprintf("cannot copy box data\n"); - goto error; - } - jas_stream_close(tmpstream); -@@ -777,6 +791,7 @@ static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in) - jp2_cmap_t *cmap = &box->data.cmap; - jp2_cmapent_t *ent; - unsigned int i; -+ cmap->ents = 0; - - cmap->numchans = (box->datalen) / 4; - if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) { -@@ -835,6 +850,7 @@ static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in) - int_fast32_t x; - - pclr->lutdata = 0; -+ pclr->bpc = 0; - - if (jp2_getuint16(in, &pclr->numlutents) || - jp2_getuint8(in, &pclr->numchans)) { -@@ -869,9 +885,9 @@ static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out) - #if 0 - jp2_pclr_t *pclr = &box->data.pclr; - #endif --/* Eliminate warning about unused variable. */ --box = 0; --out = 0; -+ /* Eliminate warning about unused variable. */ -+ box = 0; -+ out = 0; - return -1; - } - --- -2.11.0 - diff --git a/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch b/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch deleted file mode 100644 index 16a3e75bf1..0000000000 --- a/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 58ba0365d911b9f9dd68e9abf826682c0b4f2293 Mon Sep 17 00:00:00 2001 -From: Michael Adams -Date: Mon, 6 Mar 2017 08:06:54 -0800 -Subject: [PATCH] Added a check in the JP2 encoder to ensure that the image to - be coded has at least one component. - -Signed-off-by: Peter Korsgaard ---- - src/libjasper/jp2/jp2_enc.c | 5 +++++ - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/libjasper/jp2/jp2_enc.c b/src/libjasper/jp2/jp2_enc.c -index 9a5e106..af4d9a4 100644 ---- a/src/libjasper/jp2/jp2_enc.c -+++ b/src/libjasper/jp2/jp2_enc.c -@@ -115,6 +115,11 @@ int jp2_encode(jas_image_t *image, jas_stream_t *out, const char *optstr) - iccstream = 0; - iccprof = 0; - -+ if (jas_image_numcmpts(image) < 1) { -+ jas_eprintf("image must have at least one component\n"); -+ goto error; -+ } -+ - allcmptssame = 1; - sgnd = jas_image_cmptsgnd(image, 0); - prec = jas_image_cmptprec(image, 0); --- -2.11.0 - diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index 15e9829382..b2b82178eb 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5b24faf5ed38670d6286e45ab7516b26458d05e7929b435afe569176765f4dda jasper-2.0.12.tar.gz +sha256 b50413b41bfc82ae419298b41eadcde1aa31f362fb9dc2ac089e5cbc19f60c24 jasper-version-2.0.13.tar.gz diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index dbb3875687..2aa3f9d554 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,8 +4,8 @@ # ################################################################################ -JASPER_VERSION = 2.0.12 -JASPER_SITE = http://www.ece.uvic.ca/~frodo/jasper/software +JASPER_VERSION = version-2.0.13 +JASPER_SITE = $(call github,mdadams,jasper,$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer License Version 2.0 JASPER_LICENSE_FILES = LICENSE diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index d5db668a64..138efa1d05 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4fa8280c023805e2104b9331632daa2c6493d6b11ec0611110b1e12eadb70794 kodi-pvr-argustv-2.5.4-Krypton.tar.gz +sha256 ba9e4d76b9e6d2d879e95eeda0d919ca5eabc0d6f59037f173cd9294b2ce8e4a kodi-pvr-argustv-2.5.6-Krypton.tar.gz diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 06bdba98d3..2cf4d75293 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_ARGUSTV_VERSION = 2.5.4-Krypton +KODI_PVR_ARGUSTV_VERSION = 2.5.6-Krypton KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index 1d377b32d6..e9b867318d 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d31c00a8b3b09fa0f552de732fee4ff46e90673e03551bed67b3e3a1e2815281 kodi-pvr-dvblink-3.4.3-Krypton.tar.gz +sha256 a45fff0c1fe6d91fd957e2a4e62e9c72a5c36d796c41caa6b1e5a4814f82a503 kodi-pvr-dvblink-3.4.5v2-Krypton.tar.gz diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index 7d9826783a..9860b63b2a 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_DVBLINK_VERSION = 3.4.3-Krypton +KODI_PVR_DVBLINK_VERSION = 3.4.5v2-Krypton KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) KODI_PVR_DVBLINK_LICENSE = GPL-2.0+ KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index 8ec0e60675..ccb45219cc 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 91479e7c0201563f83c5cf75b520b2ef4405dc80fb7c3f4c81fa72be6a64169d kodi-pvr-dvbviewer-2.4.7.tar.gz +sha256 4332fa50172409271909c90a8f923eb336ff93b0a7d61b183ce84d6975fa622e kodi-pvr-dvbviewer-2.4.11-Krypton.tar.gz diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index 020398736b..0c62c5a5b9 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_DVBVIEWER_VERSION = 2.4.7 +KODI_PVR_DVBVIEWER_VERSION = 2.4.11-Krypton KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+ KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index 1d4c73f033..7417b26723 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 87ad3adc22ec64be15b9408c51388bb7d12b0089dd466aae73ae082d0576320c kodi-pvr-filmon-1.4.7-Krypton.tar.gz +sha256 0384db9cbcd8ab2e7b8b0eb8c22e8913e734e436234c43d357718c5273058605 kodi-pvr-filmon-1.4.8-Krypton.tar.gz diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index af0fe64cdc..daa3e39dfc 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_FILMON_VERSION = 1.4.7-Krypton +KODI_PVR_FILMON_VERSION = 1.4.8-Krypton KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ KODI_PVR_FILMON_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index b9ef293d0f..8262f4e111 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 df6be23cb370bce2a6b2a8944358d27e11a8edc665deb976cbd4d2e7e1eba1c0 kodi-pvr-hdhomerun-2.4.6-Krypton.tar.gz +sha256 3c000b3ebab2b12f5635451f6a71ad01c4f4d7043623cfeebfe6b7c662e026d9 kodi-pvr-hdhomerun-2.4.7-Krypton.tar.gz diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index aaecc7f320..75fa48764a 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_HDHOMERUN_VERSION = 2.4.6-Krypton +KODI_PVR_HDHOMERUN_VERSION = 2.4.7-Krypton KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 13f250acfc..5656e8e3b4 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 c66d8a6b2499d31947aa532629ccabf82cec94bff866ef30f64ec0a752b77407 kodi-pvr-hts-3.4.17.tar.gz +sha256 29867bd1fad4c4d69ec0d25ea1bb1507fd4543442aef890a2124f63f67318d92 kodi-pvr-hts-3.4.24-Krypton.tar.gz diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 90f05fb091..fb5873bff9 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_HTS_VERSION = 3.4.17 +KODI_PVR_HTS_VERSION = 3.4.24-Krypton KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 47eae669ba..906cbb575e 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 58be5ff8a2f97bb4a49e473be9385ff188582b5ed2cbf8ffc5d55ba0c1fc0ffb kodi-pvr-iptvsimple-8f725faf6b31151f91f52e8ce336ff57a905046d.tar.gz +sha256 0a006e275cddba02d5d3fd22a95cec6411a765719509a9bc8fcc93dfa247bd4c kodi-pvr-iptvsimple-2.4.11-Krypton.tar.gz diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 99045a1521..5ea0a454f5 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_IPTVSIMPLE_VERSION = 8f725faf6b31151f91f52e8ce336ff57a905046d +KODI_PVR_IPTVSIMPLE_VERSION = 2.4.11-Krypton KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 02d59df892..6eb0abfbaf 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 59264354c79eaf1658755cb5bc05efc8bca581ed8fb762e82665ec128453e648 kodi-pvr-mediaportal-tvserver-2.4.16-Krypton.tar.gz +sha256 3f5c022f83636b3739f26c1a07166b498eac82e8081ed7551980f4bb27c6b56e kodi-pvr-mediaportal-tvserver-2.4.19v2-Krypton.tar.gz diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 02ef48cd02..99a318911e 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 2.4.16-Krypton +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 2.4.19v2-Krypton KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 4deb220817..3d10b5bbec 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 5b0839141c9bdd1150442ef06974755bccb381b2998ddffa584eb234a83b7af5 kodi-pvr-nextpvr-2.4.11-Krypton.tar.gz +sha256 b126943a6d48ea4d2df38951505f385c2a499e399201eccd798a34076d3c5842 kodi-pvr-nextpvr-2.4.13-Krypton.tar.gz diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index 8f06f320cd..d0a04991d9 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_NEXTPVR_VERSION = 2.4.11-Krypton +KODI_PVR_NEXTPVR_VERSION = 2.4.13-Krypton KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index 29fc6e6a87..261558ee3f 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4315b5f87986c17e668d0d89093059b96315b8a7908fc060e2660e5bf8216057 kodi-pvr-njoy-2.4.2-Krypton.tar.gz +sha256 e4e0a6bb1bf0c6f8ae011eba58c5f0ae19a6574bb35fc6a7fbdbb99d20242a2c kodi-pvr-njoy-2.4.3-Krypton.tar.gz diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index 0106585bbf..e946e6783d 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_NJOY_VERSION = 2.4.2-Krypton +KODI_PVR_NJOY_VERSION = 2.4.3-Krypton KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ KODI_PVR_NJOY_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 62d9965cb9..5044806761 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 0e5a0fcbdbda0200ebde50552bd68eddd8644010bd39d1cf0038ba28182ca8bb kodi-pvr-pctv-1.4.5-Krypton.tar.gz +sha256 95f95f39739baf6013bb6c9188743f842f6ba3e1fa541907067f795e1a3c66a1 kodi-pvr-pctv-1.4.7-Krypton.tar.gz diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 881dbe08ce..6c7a03049d 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_PCTV_VERSION = 1.4.5-Krypton +KODI_PVR_PCTV_VERSION = 1.4.7-Krypton KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 914ef48b85..07c768f252 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 3bdd6debd8e8085e54d665f4b870bc77a18800c08d517d837d2ac703b0984622 kodi-pvr-stalker-2.8.3-Krypton.tar.gz +sha256 466cb3869927cdd245a746a32d92250e198befe577f7a847884eab1fd8eeb139 kodi-pvr-stalker-2.8.6-Krypton.tar.gz diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index eeadc03bd3..ee61171d78 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_STALKER_VERSION = 2.8.3-Krypton +KODI_PVR_STALKER_VERSION = 2.8.6-Krypton KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index a3d3c21dc4..5f2c78f0fa 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b04f1e3fc50d1cf230a2950349d69abdc15ccc36d08c2a7aba471cdd9f56b114 kodi-pvr-vbox-3.6.7.tar.gz +sha256 78065a46b95b3988b1e49fe05da249a1896f54a2c30116a9446f7c4f55db743b kodi-pvr-vbox-3.6.10-Krypton.tar.gz diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index 40d6dc1f18..2c54e14937 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VBOX_VERSION = 3.6.7 +KODI_PVR_VBOX_VERSION = 3.6.10-Krypton KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ KODI_PVR_VBOX_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index a21b9c61cb..6d42583a9b 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 25753e89b86f4a91e389adecb285b7c835c139b12c41437f6b89291c092763b6 kodi-pvr-vdr-vnsi-2a90c2f9a1f3e5889336a8df5426ff99b0318b0f.tar.gz +sha256 b65acb7ade6eaac395ea357158a4aae5ccd141612acfd834b72fbdf8db4e8b0e kodi-pvr-vdr-vnsi-4ed7d602924dbfcdd2770c0e13423092e829460d.tar.gz diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 87ca850fbb..e068641c0d 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VDR_VNSI_VERSION = 2a90c2f9a1f3e5889336a8df5426ff99b0318b0f +KODI_PVR_VDR_VNSI_VERSION = 4ed7d602924dbfcdd2770c0e13423092e829460d KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index e14a2cfbb2..7c91e36066 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d3bccae1740ef24d43d30008e4c767169f1cb3d18b0dc8042679226c024267c9 kodi-pvr-vuplus-2.4.6-Krypton.tar.gz +sha256 79cd3ea79957ae2bca67c9a1cefe3546f27a6d4e88adb4973bb08228425be2fe kodi-pvr-vuplus-2.4.10-Krypton.tar.gz diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index f5c15b0499..e99f2260fa 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VUPLUS_VERSION = 2.4.6-Krypton +KODI_PVR_VUPLUS_VERSION = 2.4.10-Krypton KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index 0aa996dbf2..4c050fb654 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b88e7a185f2f88ce8fa683a263702e2621efef14abd343414fedf900d163baa5 kodi-pvr-wmc-1.4.7-Krypton.tar.gz +sha256 7f5dfb88f54d511d575b7aabd94e1a862afb7e8a0b89fa957db6a135c31846eb kodi-pvr-wmc-1.4.9v2-Krypton.tar.gz diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 1339adb413..b6e3d43256 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_WMC_VERSION = 1.4.7-Krypton +KODI_PVR_WMC_VERSION = 1.4.9v2-Krypton KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = src/client.h diff --git a/package/libconfuse/libconfuse.hash b/package/libconfuse/libconfuse.hash index ec485a1908..e57e59c56d 100644 --- a/package/libconfuse/libconfuse.hash +++ b/package/libconfuse/libconfuse.hash @@ -1,3 +1,3 @@ -# From https://github.com/martinh/libconfuse/releases/download/v3.0/confuse-3.0.tar.xz.md5, sha256 locally computed. -md5 c534b51a2118ed57031dc548032304a3 confuse-3.0.tar.xz -sha256 bb75174e02aa8b44fa1a872a47beeea1f5fe715ab669694c97803eb6127cc861 confuse-3.0.tar.xz +# From https://github.com/martinh/libconfuse/releases/download/v3.1/confuse-3.1.tar.xz.md5, sha256 locally computed. +md5 08f1ace0055f92d80a8ad11671346a37 confuse-3.1.tar.xz +sha256 8171f31e0071d5e4460269fdcc8b4e748cf23b4bf6bbe672f718a136dd63ca66 confuse-3.1.tar.xz diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index 2908af3292..5f1d5cdff9 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -4,13 +4,11 @@ # ################################################################################ -LIBCONFUSE_VERSION = 3.0 +LIBCONFUSE_VERSION = 3.1 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.xz LIBCONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION) LIBCONFUSE_INSTALL_STAGING = YES LIBCONFUSE_CONF_OPTS = --disable-rpath -LIBCONFUSE_DEPENDENCIES = host-flex -HOST_LIBCONFUSE_DEPENDENCIES = host-flex LIBCONFUSE_LICENSE = ISC LIBCONFUSE_LICENSE_FILES = LICENSE diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index f322ba1478..247e631819 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2017-April/139263.html -md5 4867866477f228973a64e68051ca9c66 libdrm-2.4.80.tar.bz2 -sha1 eabfc3e04d0737834ccb49fe34fc369f0e0588f9 libdrm-2.4.80.tar.bz2 -sha256 a82a519601e9cdfad795e760807eb07ac8913b225e25fc8fe9bc03e3be6549f1 libdrm-2.4.80.tar.bz2 -sha512 478f64bcc6f4815368ae86d023f11ba6b37595bb9d8baa588b466c6c0e2aae48a50a489137750ed21fbabef5afabf183c78c152eb770bfe316fa7401b191a30b libdrm-2.4.80.tar.bz2 +# From https://lists.freedesktop.org/archives/dri-devel/2017-May/142708.html +md5 d04f3567f0a812188d06f860fded5ab7 libdrm-2.4.81.tar.bz2 +sha1 40f0994b5fb9992e6f55d3a14537def21719d896 libdrm-2.4.81.tar.bz2 +sha256 8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae libdrm-2.4.81.tar.bz2 +sha512 5f7a1524acad59890d3f890bed90a660a424e18a88d587ca356223bde4a7446d1c540f97ec11cb10d2e7ed1b4ae86127957634354a1be6d04199295ab24782e5 libdrm-2.4.81.tar.bz2 diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 01b1aed764..54187f3cb4 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.80 +LIBDRM_VERSION = 2.4.81 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = http://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index 613866cfb6..1d3d18434f 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,2 +1,5 @@ -# Hash from https://lists.freedesktop.org/archives/input-tools/2017-January/001380.html -sha256 ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688 libevdev-1.5.6.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2017-May/001387.html +md5 4f1cfaee8d75ea3fbbfeb99a98730952 libevdev-1.5.7.tar.xz +sha1 ba1d8b66af9bd4e1d503ce6b2ed011e9e309048c libevdev-1.5.7.tar.xz +sha256 a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422 libevdev-1.5.7.tar.xz +sha512 53adf6c92ec61f0635b643a88d8762a18f7cd3088d23ac95831be32cc7150ebd19f20265b90f6a1f9a63420c2f8968c2d17d8dc4892c0e90f9dfcce82c622df1 libevdev-1.5.7.tar.xz diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index 01ee7fbaae..e5d9c60d26 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.5.6 +LIBEVDEV_VERSION = 1.5.7 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash index eee2a66280..fcf212ed2a 100644 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 670a13518fabf2a99f9e349c33d5421c2146eec15b73c5edef3f1981a7adaeda libgpiod-v0.1.3.tar.gz +sha256 de1947f3cb2cc4174364af430309fe6238976658575655bdbd76c60cffa7df92 libgpiod-v0.2.tar.gz diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk index 0947a4ab2c..c95ea44514 100644 --- a/package/libgpiod/libgpiod.mk +++ b/package/libgpiod/libgpiod.mk @@ -4,10 +4,17 @@ # ################################################################################ -LIBGPIOD_VERSION = v0.1.3 +LIBGPIOD_VERSION = v0.2 LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION)) -LIBGPIOD_LICENSE = GPL-3.0+ +LIBGPIOD_LICENSE = LGPL-2.1+ LIBGPIOD_LICENSE_FILES = COPYING + +# Needed for autoreconf to work properly +define LIBGPIOD_FIXUP_M4_DIR + mkdir $(@D)/m4 +endef +LIBGPIOD_POST_EXTRACT_HOOKS += LIBGPIOD_FIXUP_M4_DIR + # fetched from github, no configure script provided LIBGPIOD_AUTORECONF = YES diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 10dcb4db9f..0f259e9a1c 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.12.sha256sum -sha256 84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c gtk+-3.22.12.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.15.sha256sum +sha256 c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb gtk+-3.22.15.tar.xz diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 1759953ab9..f3b1705d98 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.22 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).12 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).15 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 3663b51122..490131c3aa 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2017-March/033531.html -sha256 12a670f63d01e9e9c98ad0b31aef22160aac52187b4ee8f068a6902181c1a8a8 libinput-1.7.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2017-May/034037.html +sha256 0b1e5a6c106ccc609ccececd9e33e6b27c8b01fc7457ddb4c1dd266e780d6bc2 libinput-1.7.2.tar.xz diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 801a813168..4ecc2d14ac 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.7.0 +LIBINPUT_VERSION = 1.7.2 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev diff --git a/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch b/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch new file mode 100644 index 0000000000..d19306fd07 --- /dev/null +++ b/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch @@ -0,0 +1,65 @@ +From 0b80e8beff68a0570fdc2d9281992060414475c1 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 29 Apr 2017 22:13:54 +0200 +Subject: [PATCH] allow to install to a specific location using DESTDIR + +DESTDIR is the autotools standard variable where to copy +headers, libraries and binaries. It's not the same as "prefix". + +So while installing to Buildroot STAGING directory, use prefix=/usr +and DESTOR=$(STAGING_DIR). + +Signed-off-by: Romain Naour +Sigend-off-by: Corentin GUILLEVIC +--- + include/Makefile | 12 ++++++------ + src/Makefile | 10 +++++----- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/include/Makefile b/include/Makefile +index 26a8139..a8cf369 100644 +--- a/include/Makefile ++++ b/include/Makefile +@@ -2,10 +2,10 @@ include ../Makefile.common + + .PHONY: install + install: +- mkdir -p $(prefix)/include/loki +- mkdir -p $(prefix)/include/loki/flex +- mkdir -p $(prefix)/include/loki/yasli ++ mkdir -p $(DESTDIR)$(prefix)/include/loki ++ mkdir -p $(DESTDIR)$(prefix)/include/loki/flex ++ mkdir -p $(DESTDIR)$(prefix)/include/loki/yasli + +- install -m 644 loki/*.h $(prefix)/include/loki +- install -m 644 loki/flex/*.h $(prefix)/include/loki/flex +- install -m 644 loki/yasli/*.h $(prefix)/include/loki/yasli ++ install -m 644 loki/*.h $(DESTDIR)$(prefix)/include/loki ++ install -m 644 loki/flex/*.h $(DESTDIR)$(prefix)/include/loki/flex ++ install -m 644 loki/yasli/*.h $(DESTDIR)$(prefix)/include/loki/yasli +diff --git a/src/Makefile b/src/Makefile +index b272929..054285e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -74,13 +74,13 @@ INSTALL_DATA := $(INSTALL) -m 644 + install: install-static install-shared + + install-static: $(RESULT_DIR)$(STATIC_LIB) +- mkdir -p $(prefix)/lib +- $(INSTALL_DATA) $(RESULT_DIR)$(STATIC_LIB) $(prefix)/lib ++ mkdir -p $(DESTDIR)$(prefix)/lib ++ $(INSTALL_DATA) $(RESULT_DIR)$(STATIC_LIB) $(DESTDIR)$(prefix)/lib + + install-shared: $(RESULT_DIR)$(SHARED_LIB_VERSIONED) +- mkdir -p $(prefix)/lib +- $(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(prefix)/lib +- cd $(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE) ++ mkdir -p $(DESTDIR)$(prefix)/lib ++ $(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(DESTDIR)$(prefix)/lib ++ cd $(DESTDIR)$(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE) + + %.lo : %.cpp + $(CXX) -c $(CXXFLAGS) -fPIC $(CPPFLAGS) -o $@ $< +-- +2.9.3 + diff --git a/package/libloki/0002-use-ln-snf.patch b/package/libloki/0002-use-ln-snf.patch new file mode 100644 index 0000000000..5b73d7f9dd --- /dev/null +++ b/package/libloki/0002-use-ln-snf.patch @@ -0,0 +1,31 @@ +From 7fcaa080ef3fddb3f7dcfaf2984bc397d7c9e96c Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 29 Apr 2017 22:27:26 +0200 +Subject: [PATCH] use ln -snf + +Otherwise the install step fail due to existing symlink. + +'libloki.so': File exists + +Signed-off-by: Romain Naour +Sigend-off-by: Corentin GUILLEVIC +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 054285e..2c169ab 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -80,7 +80,7 @@ install-static: $(RESULT_DIR)$(STATIC_LIB) + install-shared: $(RESULT_DIR)$(SHARED_LIB_VERSIONED) + mkdir -p $(DESTDIR)$(prefix)/lib + $(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(DESTDIR)$(prefix)/lib +- cd $(DESTDIR)$(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE) ++ cd $(DESTDIR)$(prefix)/lib; ln -snf $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE) + + %.lo : %.cpp + $(CXX) -c $(CXXFLAGS) -fPIC $(CPPFLAGS) -o $@ $< +-- +2.9.3 + diff --git a/package/libloki/Config.in b/package/libloki/Config.in new file mode 100644 index 0000000000..4ce4429a7d --- /dev/null +++ b/package/libloki/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBLOKI + bool "libloki" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + help + A C++ library of designs, containing flexible + implementations of common design patterns and idioms. + + http://sourceforge.net/projects/loki-lib + +comment "libloki needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libloki/libloki.hash b/package/libloki/libloki.hash new file mode 100644 index 0000000000..52d67c8801 --- /dev/null +++ b/package/libloki/libloki.hash @@ -0,0 +1,5 @@ +# From https://sourceforge.net/projects/loki-lib/files/Loki/Loki%200.1.7 +md5 33a24bcbb99fa2ec8fcbbab65649f3f6 loki-0.1.7.tar.bz2 +sha1 006c630217b1e1fd33015dc0597d2d743d8ee4e3 loki-0.1.7.tar.bz2 +# locally computed +sha256 07553754f6be2738559947db69b0718512665bf4a34015fa3a875b6eb1111198 loki-0.1.7.tar.bz2 diff --git a/package/libloki/libloki.mk b/package/libloki/libloki.mk new file mode 100644 index 0000000000..7564239f6a --- /dev/null +++ b/package/libloki/libloki.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# libloki +# +################################################################################ + +LIBLOKI_VERSION = 0.1.7 +LIBLOKI_SOURCE = loki-$(LIBLOKI_VERSION).tar.bz2 +LIBLOKI_SITE = https://sourceforge.net/projects/loki-lib/files/Loki/Loki%20$(LIBLOKI_VERSION) +LIBLOKI_LICENSE = MIT +LIBLOKI_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBLOKI_BUILD_TARGETS += build-static +LIBLOKI_INSTALL_TARGETS += install-static +else ifeq ($(BR2_SHARED_LIBS),y) +LIBLOKI_BUILD_TARGETS += build-shared +LIBLOKI_INSTALL_TARGETS += install-shared +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBLOKI_BUILD_TARGETS += build-static build-shared +LIBLOKI_INSTALL_TARGETS += install-static install-shared +endif + +define LIBLOKI_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) $(LIBLOKI_BUILD_TARGETS) +endef + +define LIBLOKI_INSTALL_STAGING_CMDS + $(MAKE) -C $(@D)/src DESTDIR=$(STAGING_DIR) $(LIBLOKI_INSTALL_TARGETS) + $(MAKE) -C $(@D)/include DESTDIR=$(STAGING_DIR) install +endef + +define LIBLOKI_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) $(LIBLOKI_INSTALL_TARGETS) +endef + +$(eval $(generic-package)) diff --git a/package/libmaxminddb/0001-Add-disable-tests-to-configure.patch b/package/libmaxminddb/0001-Add-disable-tests-to-configure.patch deleted file mode 100644 index 8ff64e9ebd..0000000000 --- a/package/libmaxminddb/0001-Add-disable-tests-to-configure.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8287848f747bd37298a2d32b8fd06cc59eb28028 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 9 Feb 2017 21:40:43 +0100 -Subject: [PATCH] Add --disable-tests to configure - -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 6 +++++- - configure.ac | 6 ++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 1804945..cebcd31 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,8 +5,12 @@ nodist_include_HEADERS = include/maxminddb_config.h - - SUBDIRS = \ - src \ -- bin \ -+ bin -+ -+if TESTS -+SUBDIRS += \ - t -+endif - - EXTRA_DIST = doc t Changes.md LICENSE NOTICE README.md projects/VS12 projects/VS12-tests - dist-hook: -diff --git a/configure.ac b/configure.ac -index 7916212..2a22fab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,6 +119,12 @@ AC_ARG_ENABLE( - esac],[debug=false]) - AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) - -+AC_ARG_ENABLE([tests], -+ AS_HELP_STRING([--enable-tests], [Compilation of tests code]), -+ [enable_tests=${enableval}], -+ [enable_tests=yes]) -+AM_CONDITIONAL([TESTS], [test "${enable_tests}" = "yes"]) -+ - AC_CONFIG_FILES([Makefile - src/Makefile - bin/Makefile --- -2.5.0 - diff --git a/package/libmaxminddb/libmaxminddb.hash b/package/libmaxminddb/libmaxminddb.hash index 3d5b4caa74..952a655d0f 100644 --- a/package/libmaxminddb/libmaxminddb.hash +++ b/package/libmaxminddb/libmaxminddb.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 4147241d4e3103bd843167ae5a0d5cf176632b6898cb1cca6223d2d58cc53ef5 libmaxminddb-1.2.0.tar.gz +sha256 06a0ec3d1496e1a7e30d74ea15373e0010bbe392ea1819c149aaf724dc57dd9a libmaxminddb-1.2.1.tar.gz diff --git a/package/libmaxminddb/libmaxminddb.mk b/package/libmaxminddb/libmaxminddb.mk index c6e70c537a..f0678a05ee 100644 --- a/package/libmaxminddb/libmaxminddb.mk +++ b/package/libmaxminddb/libmaxminddb.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.2.0 +LIBMAXMINDDB_VERSION = 1.2.1 LIBMAXMINDDB_SITE = $(call github,maxmind,libmaxminddb,$(LIBMAXMINDDB_VERSION)) LIBMAXMINDDB_INSTALL_STAGING = YES LIBMAXMINDDB_LICENSE = Apache-2.0 LIBMAXMINDDB_LICENSE_FILES = LICENSE -# Fetched from Github, with no configure script, and we're patching -# configure.ac +# Fetched from Github, with no configure script LIBMAXMINDDB_AUTORECONF = YES LIBMAXMINDDB_CONF_OPTS = --disable-tests diff --git a/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch b/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch new file mode 100644 index 0000000000..3bae15c221 --- /dev/null +++ b/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch @@ -0,0 +1,47 @@ +From fd1694c9d85666a39fe39e76518581b1ccd5a6c5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= +Date: Thu, 2 Feb 2017 11:16:49 +0100 +Subject: [PATCH] Fix build with --disable-nls on platforms without libintl + included in libc. + +Signed-off-by: Stefan Sørensen + +--- + +Status: accepted upstream, not yet released. + +diff --git a/src/pwmake.c b/src/pwmake.c +index 5b8cfb8..81f7cd3 100644 +--- a/src/pwmake.c ++++ b/src/pwmake.c +@@ -33,9 +33,11 @@ main(int argc, char *argv[]) + int bits; + void *auxerror; + ++#ifdef ENABLE_NLS + setlocale(LC_ALL, ""); + bindtextdomain("libpwquality", "/usr/share/locale"); + textdomain("libpwquality"); ++#endif + + if (argc != 2) { + usage(basename(argv[0])); +diff --git a/src/pwscore.c b/src/pwscore.c +index 219a175..24c13f2 100644 +--- a/src/pwscore.c ++++ b/src/pwscore.c +@@ -34,9 +34,11 @@ main(int argc, char *argv[]) + size_t len; + char *user = NULL; + ++#ifdef ENABLE_NLS + setlocale(LC_ALL, ""); + bindtextdomain("libpwquality", "/usr/share/locale"); + textdomain("libpwquality"); ++#endif + + if (argc > 2) { + usage(basename(argv[0])); +-- +2.9.3 + diff --git a/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch b/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch new file mode 100644 index 0000000000..1b4f24264c --- /dev/null +++ b/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch @@ -0,0 +1,26 @@ +From b1f2f1f71894fa0af92041fb4d5b6146101d63e5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= +Date: Thu, 2 Feb 2017 11:17:26 +0100 +Subject: [PATCH] Fix memory leak in settings when using bad word list. + +Signed-off-by: Stefan Sørensen + +--- + +Status: accepted upstream, not yet released. + +diff --git a/src/settings.c b/src/settings.c +index 5c38b30..4b026b1 100644 +--- a/src/settings.c ++++ b/src/settings.c +@@ -46,6 +46,7 @@ pwquality_free_settings(pwquality_settings_t *pwq) + { + if (pwq) { + free(pwq->dict_path); ++ free(pwq->bad_words); + free(pwq); + } + } +-- +2.9.3 + diff --git a/package/libpwquality/Config.in b/package/libpwquality/Config.in new file mode 100644 index 0000000000..4e855254a6 --- /dev/null +++ b/package/libpwquality/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_LIBPWQUALITY + bool "libpwquality" + help + This is a library for password quality checks and generation + of random passwords that pass the checks. This library uses + the cracklib and cracklib dictionaries to perform some of + the checks. + + https://github.com/libpwquality/libpwquality + +if BR2_PACKAGE_LIBPWQUALITY + +config BR2_PACKAGE_LIBPWQUALITY_TOOLS + bool "install tools" + help + Install libpwquality command line tools generating/checking + passwords. + +endif diff --git a/package/libpwquality/libpwquality.hash b/package/libpwquality/libpwquality.hash new file mode 100644 index 0000000000..0e3f9e30fd --- /dev/null +++ b/package/libpwquality/libpwquality.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a libpwquality-1.3.0.tar.bz2 diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk new file mode 100644 index 0000000000..66b15d805b --- /dev/null +++ b/package/libpwquality/libpwquality.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# libpwquality +# +################################################################################ + +LIBPWQUALITY_VERSION = 1.3.0 +LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 +LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) +LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ +LIBPWQUALITY_INSTALL_STAGING = YES +LIBPWQUALITY_DEPENDENCIES = cracklib +LIBPWQUALITY_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_PYTHON),y) +LIBPWQUALITY_CONF_OPTS += --enable-python-bindings +LIBPWQUALITY_DEPENDENCIES += python +LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +else +LIBPWQUALITY_CONF_OPTS += --disable-python-bindings +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +LIBPWQUALITY_CONF_OPTS += --enable-pam +LIBPWQUALITY_DEPENDENCIES += linux-pam +else +LIBPWQUALITY_CONF_OPTS += --disable-pam +endif + +ifeq ($(BR2_PACKAGE_LIBPWQUALITY_TOOLS),) +define LIBPWQUALITY_REMOVE_TOOLS + rm -f $(TARGET_DIR)/usr/bin/pwmake + rm -f $(TARGET_DIR)/usr/bin/pwscore +endef + +LIBPWQUALITY_POST_INSTALL_TARGET_HOOKS += LIBPWQUALITY_REMOVE_TOOLS +endif + +$(eval $(autotools-package)) diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index df39f327b6..10124618f1 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b libupnp-1.6.21.tar.bz2 +sha256 0bdfacb7fa8d99b78343b550800ff193264f92c66ef67852f87f042fd1a1ebbc libupnp-1.6.22.tar.bz2 diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 0701fb2821..bf01b4d946 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.6.21 +LIBUPNP_VERSION = 1.6.22 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no diff --git a/package/libupnpp/libupnpp.hash b/package/libupnpp/libupnpp.hash index dde4c4f67c..4e759bd47f 100644 --- a/package/libupnpp/libupnpp.hash +++ b/package/libupnpp/libupnpp.hash @@ -1,2 +1,2 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.15.1.tar.gz.sha256 -sha256 c558e6285d61485e656bc973511396665b68b1d5cfa34db5fa4e64e0f2026c3a libupnpp-0.15.1.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.15.2.tar.gz.sha256 +sha256 3abcc0c951ac37b92b9b1f6d10255a5b54353a1cb43a58d48324c08c6e41a6ab libupnpp-0.15.2.tar.gz diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index 52753cfbe8..961051c7b2 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.15.1 +LIBUPNPP_VERSION = 0.15.2 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = GPL-2.0+ LIBUPNPP_LICENSE_FILES = COPYING diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash index c02fa0aedc..fc7bd1b9af 100644 --- a/package/libv4l/libv4l.hash +++ b/package/libv4l/libv4l.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ac9f8c88bfffa3a7e85c0edd04f7d3d54e6a30c214e79f2c6ecc6fbf57cb229d v4l-utils-1.12.2.tar.bz2 +sha256 0618162ddb0b57fe7c45407d4d66ed79e3a134cdbc9e72598d34e61d3359e20d v4l-utils-1.12.5.tar.bz2 diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 7a5956c2d2..08dc6cbf17 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBV4L_VERSION = 1.12.2 +LIBV4L_VERSION = 1.12.5 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES diff --git a/package/libva-intel-driver/libva-intel-driver.hash b/package/libva-intel-driver/libva-intel-driver.hash index 6115f815b5..d20ecd1e45 100644 --- a/package/libva-intel-driver/libva-intel-driver.hash +++ b/package/libva-intel-driver/libva-intel-driver.hash @@ -1,4 +1,4 @@ # From https://github.com/01org/intel-vaapi-driver/releases -sha1 f29e89b9a9fcafa153110a6a1762541c2a80f899 intel-vaapi-driver-1.8.1.tar.bz2 +sha1 1564e41f36b1ec646250418eeb344a916eb28407 intel-vaapi-driver-1.8.2.tar.bz2 # Locally computed -sha256 efd041602635ce9450fbdf864563d3b95341ef3877337772af708d9cc17b2fce intel-vaapi-driver-1.8.1.tar.bz2 +sha256 866cdf9974911e58b0d3a2cade29dbe7b5b68836e142cf092b99db68e366b702 intel-vaapi-driver-1.8.2.tar.bz2 diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk index 8683210ebf..c8d28e24fe 100644 --- a/package/libva-intel-driver/libva-intel-driver.mk +++ b/package/libva-intel-driver/libva-intel-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_INTEL_DRIVER_VERSION = 1.8.1 +LIBVA_INTEL_DRIVER_VERSION = 1.8.2 LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 LIBVA_INTEL_DRIVER_SITE = \ https://github.com/01org/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 0590423537..875a4d1961 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,4 +1,4 @@ # From https://github.com/01org/libva/releases -sha1 ae1f580d3ca54199393133214ac1e5a66d9cbeb3 libva-1.8.1.tar.bz2 +sha1 7c4253c97f5e1e76500ff75321287131941494bc libva-1.8.2.tar.bz2 # Locally computed -sha256 c1d5d85b6b40b76f37993b4da33388d3d73b64998dcbc160b7578e24ed775c73 libva-1.8.1.tar.bz2 +sha256 9ed3e3ddc8f47a715d4c6ec366beb21c83fc4e8a3d4d39a811baff76f0a0cede libva-1.8.2.tar.bz2 diff --git a/package/libva/libva.mk b/package/libva/libva.mk index ffd990fab3..b89d5fa27c 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 1.8.1 +LIBVA_VERSION = 1.8.2 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/01org/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 3522415268..fb2f99cb1f 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -44,6 +44,13 @@ else LINUX_PAM_CONF_OPTS += --disable-audit endif +ifeq ($(BR2_PACKAGE_CRACKLIB),y) +LINUX_PAM_CONF_OPTS += --enable-cracklib +LINUX_PAM_DEPENDENCIES += cracklib +else +LINUX_PAM_CONF_OPTS += --disable-cracklib +endif + # Install default pam config (deny everything except login) define LINUX_PAM_INSTALL_CONFIG $(INSTALL) -m 0644 -D package/linux-pam/login.pam \ diff --git a/package/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch b/package/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch deleted file mode 100644 index fc3dce97e0..0000000000 --- a/package/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 780bec6c2742231ca73d4dee51c727815cf857b3 Mon Sep 17 00:00:00 2001 -From: Erico Nunes -Date: Fri, 30 Sep 2016 17:45:31 +0200 -Subject: [PATCH] rusers.h is unused and not available for uClibc-ng / libtirpc - -Signed-off-by: Waldemar Brodkorb -[Erico: Rebase for ltp 20160920] -Signed-off-by: Erico Nunes ---- - .../tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c | 1 - - .../rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c | 1 - - .../rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c | 1 - - .../rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c | 1 - - .../rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c | 1 - - .../rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c | 1 - - .../rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c | 1 - - .../rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c | 1 - - .../rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c | 1 - - .../rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c | 1 - - .../rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c | 1 - - 11 files changed, 11 deletions(-) - -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c -index 7f157e1..728c023 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c -index d9a3111..8d80a5e 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c -index cabffc7..a4d1d6f 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c -index 4f10466..863aec7 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c -index 290f357..e849468 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c -index 55bac16..8c1800b 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c -index 09d1bf9..384a00d 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c -index 3e15306..285eb21 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c -index a7030a2..1f2690a 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c -index 06f4740..faa8ef6 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c -index ca38aa0..974f5fb 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include --- -2.7.4 - diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index b8311e094e..68b95234dd 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,2 +1,2 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20170116/ltp-full-20170116.tar.xz.sha1 -sha1 b42047fe0d30db9b2c760bd1ab901ecb133835fc ltp-full-20170116.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20170516/ltp-full-20170516.tar.xz.sha1 +sha1 bd5210b73b14708c88449089a3a3c64ace3cd22a ltp-full-20170516.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index a4546dff82..eb9453af6f 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20170116 +LTP_TESTSUITE_VERSION = 20170516 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+ diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index ec733efd13..6849d5d6a6 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,3 +1,3 @@ -# From http://lttng.org/files/lttng-modules/lttng-modules-2.9.1.tar.bz2.{md5,sha1} -md5 5a16bca52233cc2bdff572b1120a88f6 lttng-modules-2.9.1.tar.bz2 -sha1 5b47e923a8d697b0f5799f0eb226a41c4957966c lttng-modules-2.9.1.tar.bz2 +# From http://lttng.org/files/lttng-modules/lttng-modules-2.9.2.tar.bz2.{md5,sha1} +md5 6c02645c77fd4d6475a4f83bda1d75ff lttng-modules-2.9.2.tar.bz2 +sha1 da54a8478019c0d551590c37826e78c058e9cb8b lttng-modules-2.9.2.tar.bz2 diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index 9f624e5915..f53b085597 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.9.1 +LTTNG_MODULES_VERSION = 2.9.2 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) diff --git a/package/lua-ev/lua-ev.hash b/package/lua-ev/lua-ev.hash index 522e7e7e88..3f8d981297 100644 --- a/package/lua-ev/lua-ev.hash +++ b/package/lua-ev/lua-ev.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f7f5df5ecfe4bd54797261d1b1bd3f770d39128b7aba72deef6d1d8d8e2b53fe lua-ev-v1.4.tar.gz +sha256 4e26e05830955fdd882a1b48b535be94356582eea310327f839f830cd9250d3a lua-ev-339426fbe528f11cb3cd1af69a88f06bba367981.tar.gz diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk index 68f7fc75b0..39394875b8 100644 --- a/package/lua-ev/lua-ev.mk +++ b/package/lua-ev/lua-ev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_EV_VERSION = v1.4 +LUA_EV_VERSION = 339426fbe528f11cb3cd1af69a88f06bba367981 LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION)) LUA_EV_DEPENDENCIES = luainterpreter libev LUA_EV_LICENSE = MIT diff --git a/package/lua-sdl2/Config.in b/package/lua-sdl2/Config.in new file mode 100644 index 0000000000..f716dba9b5 --- /dev/null +++ b/package/lua-sdl2/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LUA_SDL2 + bool "lua-sdl2" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_SDL2 + select BR2_PACKAGE_SDL2_IMAGE + select BR2_PACKAGE_SDL2_MIXER + select BR2_PACKAGE_SDL2_NET + select BR2_PACKAGE_SDL2_TTF + help + Lua-SDL2 is a pure C binding of SDL2 to Lua 5.1, Lua 5.2, + Lua 5.3, and LuaJIT. + + https://github.com/Tangent128/luasdl2 + +comment "lua-sdl2 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/lua-sdl2/lua-sdl2.hash b/package/lua-sdl2/lua-sdl2.hash new file mode 100644 index 0000000000..56a2eeda6c --- /dev/null +++ b/package/lua-sdl2/lua-sdl2.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 36b626485529f318f284e0cc0c806d5a425fbde4e1e6329d4d5ee9f495ecff62 lua-sdl2-2.0.5.6.0-1.src.rock diff --git a/package/lua-sdl2/lua-sdl2.mk b/package/lua-sdl2/lua-sdl2.mk new file mode 100644 index 0000000000..adb3723c84 --- /dev/null +++ b/package/lua-sdl2/lua-sdl2.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# lua-sdl2 +# +################################################################################ + +LUA_SDL2_VERSION = 2.0.5.6.0-1 +LUA_SDL2_LICENSE = ISC +LUA_SDL2_SUBDIR = luasdl2-2.0.5-6.0 +LUA_SDL2_LICENSE_FILES = $(LUA_SDL2_SUBDIR)/LICENSE +LUA_SDL2_DEPENDENCIES = sdl2 sdl2_image sdl2_mixer sdl2_net sdl2_ttf + +$(eval $(luarocks-package)) diff --git a/package/luaossl/Config.in b/package/luaossl/Config.in new file mode 100644 index 0000000000..d8763e76a3 --- /dev/null +++ b/package/luaossl/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_LUAOSSL + bool "luaossl" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_OPENSSL + help + luaossl is a comprehensive binding to OpenSSL for Lua 5.1, + 5.2, and later. + + It includes support for certificate and key management, + key generation, signature verification, and deep bindings + to the distinguished name, alternative name, and X.509v3 + extension interfaces. It also binds OpenSSL's bignum, message + digest, HMAC, cipher, and CSPRNG interfaces. + + http://25thandclement.com/~william/projects/luaossl.html + +comment "luaossl needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/luaossl/luaossl.hash b/package/luaossl/luaossl.hash new file mode 100644 index 0000000000..ea9f5e3335 --- /dev/null +++ b/package/luaossl/luaossl.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 51641d8971c19b2c65d3954ded12c306d4ecf6315ff8f1ec584e9a23ca998576 luaossl-20161214-0.src.rock diff --git a/package/luaossl/luaossl.mk b/package/luaossl/luaossl.mk new file mode 100644 index 0000000000..5bb3e82605 --- /dev/null +++ b/package/luaossl/luaossl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# luaossl +# +################################################################################ + +LUAOSSL_VERSION_UPSTREAM = 20161214 +LUAOSSL_VERSION = $(LUAOSSL_VERSION_UPSTREAM)-0 +LUAOSSL_SUBDIR = luaossl-rel-$(LUAOSSL_VERSION_UPSTREAM) +LUAOSSL_LICENSE = MIT +LUAOSSL_LICENSE_FILES = $(LUAOSSL_SUBDIR)/LICENSE +LUAOSSL_DEPENDENCIES = openssl + +$(eval $(luarocks-package)) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 566c487811..81d0e974e4 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,2 +1,2 @@ # From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum -sha512 971a40f93db2b18a4b5c04f2b34d48cbcce81e6e3999760a474ddc52e8653317ac4969f402b9c9e12e486772bc27da8d9ca448f0551338b2a62031082a113f7c LVM2.2.02.170.tgz +sha512 801adcc2ae483f81edf6bfba73090b6b8f710370e48764f08a62da71d617157075bea01593c2535ad5ba71dcb5e0cfe83cec9a65180a6e8b9e0d214bdee79883 LVM2.2.02.171.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 11fd8a25ee..9a422feda4 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.170 +LVM2_VERSION = 2.02.171 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES diff --git a/package/lxc/0001-CVE-2017-5985-Ensure-target-netns-is-caller-owned.patch b/package/lxc/0001-CVE-2017-5985-Ensure-target-netns-is-caller-owned.patch deleted file mode 100644 index 79d19b3afb..0000000000 --- a/package/lxc/0001-CVE-2017-5985-Ensure-target-netns-is-caller-owned.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 16af238036a5464ae8f2420ed3af214f0de875f9 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Sat, 28 Jan 2017 13:02:34 +0100 -Subject: [PATCH] CVE-2017-5985: Ensure target netns is caller-owned - -Before this commit, lxc-user-nic could potentially have been tricked into -operating on a network namespace over which the caller did not hold privilege. - -This commit ensures that the caller is privileged over the network namespace by -temporarily dropping privilege. - -Launchpad: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1654676 -Reported-by: Jann Horn -Signed-off-by: Christian Brauner -Signed-off-by: Peter Korsgaard ---- - src/lxc/lxc_user_nic.c | 119 ++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 87 insertions(+), 32 deletions(-) - -diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c -index 409a53a1..96dc3986 100644 ---- a/src/lxc/lxc_user_nic.c -+++ b/src/lxc/lxc_user_nic.c -@@ -50,6 +50,14 @@ - #include "utils.h" - #include "network.h" - -+#define usernic_debug_stream(stream, format, ...) \ -+ do { \ -+ fprintf(stream, "%s: %d: %s: " format, __FILE__, __LINE__, \ -+ __func__, __VA_ARGS__); \ -+ } while (false) -+ -+#define usernic_error(format, ...) usernic_debug_stream(stderr, format, __VA_ARGS__) -+ - static void usage(char *me, bool fail) - { - fprintf(stderr, "Usage: %s lxcpath name pid type bridge nicname\n", me); -@@ -670,68 +678,115 @@ again: - } - - #define VETH_DEF_NAME "eth%d" -- - static int rename_in_ns(int pid, char *oldname, char **newnamep) - { -- int fd = -1, ofd = -1, ret, ifindex = -1; -+ uid_t ruid, suid, euid; -+ int fret = -1; -+ int fd = -1, ifindex = -1, ofd = -1, ret; - bool grab_newname = false; - - ofd = lxc_preserve_ns(getpid(), "net"); - if (ofd < 0) { -- fprintf(stderr, "Failed opening network namespace path for '%d'.", getpid()); -- return -1; -+ usernic_error("Failed opening network namespace path for '%d'.", getpid()); -+ return fret; - } - - fd = lxc_preserve_ns(pid, "net"); - if (fd < 0) { -- fprintf(stderr, "Failed opening network namespace path for '%d'.", pid); -- return -1; -+ usernic_error("Failed opening network namespace path for '%d'.", pid); -+ goto do_partial_cleanup; -+ } -+ -+ ret = getresuid(&ruid, &euid, &suid); -+ if (ret < 0) { -+ usernic_error("Failed to retrieve real, effective, and saved " -+ "user IDs: %s\n", -+ strerror(errno)); -+ goto do_partial_cleanup; -+ } -+ -+ ret = setns(fd, CLONE_NEWNET); -+ close(fd); -+ fd = -1; -+ if (ret < 0) { -+ usernic_error("Failed to setns() to the network namespace of " -+ "the container with PID %d: %s.\n", -+ pid, strerror(errno)); -+ goto do_partial_cleanup; - } - -- if (setns(fd, 0) < 0) { -- fprintf(stderr, "setns to container network namespace\n"); -- goto out_err; -+ ret = setresuid(ruid, ruid, 0); -+ if (ret < 0) { -+ usernic_error("Failed to drop privilege by setting effective " -+ "user id and real user id to %d, and saved user " -+ "ID to 0: %s.\n", -+ ruid, strerror(errno)); -+ // COMMENT(brauner): It's ok to jump to do_full_cleanup here -+ // since setresuid() will succeed when trying to set real, -+ // effective, and saved to values they currently have. -+ goto do_full_cleanup; - } -- close(fd); fd = -1; -+ - if (!*newnamep) { - grab_newname = true; - *newnamep = VETH_DEF_NAME; -- if (!(ifindex = if_nametoindex(oldname))) { -- fprintf(stderr, "failed to get netdev index\n"); -- goto out_err; -+ -+ ifindex = if_nametoindex(oldname); -+ if (!ifindex) { -+ usernic_error("Failed to get netdev index: %s.\n", strerror(errno)); -+ goto do_full_cleanup; - } - } -- if ((ret = lxc_netdev_rename_by_name(oldname, *newnamep)) < 0) { -- fprintf(stderr, "Error %d renaming netdev %s to %s in container\n", ret, oldname, *newnamep); -- goto out_err; -+ -+ ret = lxc_netdev_rename_by_name(oldname, *newnamep); -+ if (ret < 0) { -+ usernic_error("Error %d renaming netdev %s to %s in container.\n", ret, oldname, *newnamep); -+ goto do_full_cleanup; - } -+ - if (grab_newname) { -- char ifname[IFNAMSIZ], *namep = ifname; -+ char ifname[IFNAMSIZ]; -+ char *namep = ifname; -+ - if (!if_indextoname(ifindex, namep)) { -- fprintf(stderr, "Failed to get new netdev name\n"); -- goto out_err; -+ usernic_error("Failed to get new netdev name: %s.\n", strerror(errno)); -+ goto do_full_cleanup; - } -+ - *newnamep = strdup(namep); - if (!*newnamep) -- goto out_err; -+ goto do_full_cleanup; - } -- if (setns(ofd, 0) < 0) { -- fprintf(stderr, "Error returning to original netns\n"); -- close(ofd); -- return -1; -+ -+ fret = 0; -+ -+do_full_cleanup: -+ ret = setresuid(ruid, euid, suid); -+ if (ret < 0) { -+ usernic_error("Failed to restore privilege by setting effective " -+ "user id to %d, real user id to %d, and saved user " -+ "ID to %d: %s.\n", -+ ruid, euid, suid, strerror(errno)); -+ fret = -1; -+ // COMMENT(brauner): setns() should fail if setresuid() doesn't -+ // succeed but there's no harm in falling through; keeps the -+ // code cleaner. - } -- close(ofd); - -- return 0; -+ ret = setns(ofd, CLONE_NEWNET); -+ if (ret < 0) { -+ usernic_error("Failed to setns() to original network namespace " -+ "of PID %d: %s.\n", -+ ofd, strerror(errno)); -+ fret = -1; -+ } - --out_err: -- if (ofd >= 0) -- close(ofd); -- if (setns(ofd, 0) < 0) -- fprintf(stderr, "Error returning to original network namespace\n"); -+do_partial_cleanup: - if (fd >= 0) - close(fd); -- return -1; -+ close(ofd); -+ -+ return fret; - } - - /* --- -2.11.0 - diff --git a/package/lxc/Config.in b/package/lxc/Config.in index c5c75ea70f..22aa813197 100644 --- a/package/lxc/Config.in +++ b/package/lxc/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_LXC # build system forcefully builds a shared library depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call - select BR2_PACKAGE_LIBCAP help Linux Containers (LXC), provides the ability to group and isolate of a set of processes in a jail by virtualizing and accounting the diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index f80c88d6e6..501f86971f 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1c09c075f06ec029f86fa6370c7d379494ff4c66a129eda17af7b7b41e055f5d lxc-2.0.7.tar.gz +sha256 0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494 lxc-2.0.8.tar.gz +sha256 16cf466db42a45bd579bdb66efbeb63764cd93d049f05a6d8a659846cab9b47f bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 9412df524a..8a200e7d3c 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,13 +4,17 @@ # ################################################################################ -LXC_VERSION = 2.0.7 +LXC_VERSION = 2.0.8 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPL-2.1+ LXC_LICENSE_FILES = COPYING -LXC_DEPENDENCIES = libcap host-pkgconf +LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES +# This patch fixes compilation without capabilities +LXC_PATCH = \ + https://github.com/lxc/lxc/commit/bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch + LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ --disable-python --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) @@ -22,6 +26,13 @@ else LXC_CONF_OPTS += --disable-gnutls endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +LXC_CONF_OPTS += --enable-capabilities +LXC_DEPENDENCIES += libcap +else +LXC_CONF_OPTS += --disable-capabilities +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) LXC_CONF_OPTS += --enable-seccomp LXC_DEPENDENCIES += libseccomp diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index d0dceb7d52..fbde9ec332 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 17.0.5 +MESA3D_HEADERS_VERSION = 17.0.6 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 3e1017837e..ccd1afe7c7 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2017-April/000322.html -md5 5587b6b693260e3a3125f60fed6a625d mesa-17.0.5.tar.xz -sha1 030fe080bb53377e44ece3f99b969af08e4a4ff8 mesa-17.0.5.tar.xz -sha256 668efa445d2f57a26e5c096b1965a685733a3b57d9c736f9d6460263847f9bfe mesa-17.0.5.tar.xz -sha512 942fa62c9098bcd030856cd622696eae418f292addb912e1d558cf27d396f25c3f2000dae97a12d1ff233f1ea157497259442082005035bb27b9bafb2cfc33c3 mesa-17.0.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2017-May/000327.html +md5 77ea38dc0ab899864b06ea2941ac31a4 mesa-17.0.6.tar.xz +sha1 f348781d5e4342ef5b78572f68ef9749e308dbd7 mesa-17.0.6.tar.xz +sha256 89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d mesa-17.0.6.tar.xz +sha512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf mesa-17.0.6.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b26d67747c..1404f8407d 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 17.0.5 +MESA3D_VERSION = 17.0.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos diff --git a/package/minidlna/minidlna.hash b/package/minidlna/minidlna.hash index d1ed4b9184..8f6b1cc2de 100644 --- a/package/minidlna/minidlna.hash +++ b/package/minidlna/minidlna.hash @@ -1,3 +1,5 @@ -# From http://sourceforge.net/projects/minidlna/files/minidlna/1.1.5/ -md5 1970e553a1eb8a3e7e302e2ce292cbc4 minidlna-1.1.5.tar.gz -sha1 8185337621f5f9111118d8a4bca1e8cfcdd19505 minidlna-1.1.5.tar.gz +# From http://sourceforge.net/projects/minidlna/files/minidlna/1.2.0/ +md5 5f59700431e9f66198238deeb4e0d0de minidlna-1.2.0.tar.gz +sha1 700e07440167ddef44b06aa59cabe5e3abe612f6 minidlna-1.2.0.tar.gz +# Locally computed +sha256 8d34436580c4c44be25976d5e46bc5b71af69bf441c4492774eac001164c4433 minidlna-1.2.0.tar.gz diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 40f918c3ee..4fa55454c9 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIDLNA_VERSION = 1.1.5 +MINIDLNA_VERSION = 1.2.0 MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 5571c62657..409486ac70 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 7838c92e50afe75669f751db8e15f06666e32d5951d026a89de28f7c7a8c347f MoarVM-2017.04.tar.gz +sha256 7cb9b7a871b14ac9b6cddc57e646d277177c4b3b21220e6fbc204084a15a4e41 MoarVM-2017.05.tar.gz diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index df5defd0ac..e03d59411d 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2017.04 +MOARVM_VERSION = 2017.05 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 diff --git a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch index 3714b65821..6adbd81550 100644 --- a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch +++ b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch @@ -1,6 +1,6 @@ -From 155f96953d1b898f04a4e708c9ebc1e450b2f63e Mon Sep 17 00:00:00 2001 +From 357bea890354acda52aa6dfaec7fa232fa0b8208 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci -Date: Tue, 24 Nov 2015 23:11:10 +0100 +Date: Tue, 23 May 2017 11:19:58 +0200 Subject: [PATCH] Remove unit-tests from mono compilation This patch fixes compiling errors with unit-tests under linux. @@ -11,19 +11,19 @@ Signed-off-by: Angelo Compagnucci 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mono/Makefile.am b/mono/Makefile.am -index ef41dfe..7129507 100644 +index 8c9c2cb..7af36ec 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am -@@ -30,7 +30,7 @@ monotouch-do-clean: - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ +@@ -34,7 +34,7 @@ monotouch-do-clean: + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ done; else --SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler +-SUBDIRS = $(btls_dirs) arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler ++SUBDIRS = $(btls_dirs) arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler endif endif --DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler +-DIST_SUBDIRS = btls arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler ++DIST_SUBDIRS = btls arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler -- -1.9.1 +2.7.4 diff --git a/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch b/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch deleted file mode 100644 index 3d932b6df9..0000000000 --- a/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 63f0b0246b8125ae48b15bd182bb5831be02e6c9 Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Mon, 27 Jun 2016 21:32:11 +0200 -Subject: [PATCH] fix musl incorrect sigcontext include - -On musl __GLIBC__ is not defined, so the conditional logic will -not produce correct result. Add a specific case to handle when -__GLIBC__ is not defined. - -Signed-off-by: Angelo Compagnucci ---- - libgc/os_dep.c | 2 +- - mono/mini/exceptions-arm.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgc/os_dep.c b/libgc/os_dep.c -index 8c8e098..34859c1 100644 ---- a/libgc/os_dep.c -+++ b/libgc/os_dep.c -@@ -32,7 +32,7 @@ - /* prototypes, so we have to include the top-level sigcontext.h to */ - /* make sure the former gets defined to be the latter if appropriate. */ - # include --# if 2 <= __GLIBC__ -+# if 2 <= __GLIBC__ || !defined(__GLIBC__) - # if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ - /* glibc 2.1 no longer has sigcontext.h. But signal.h */ - /* has the right declaration for glibc 2.1. */ -diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c -index b036aa7..a3e2164 100644 ---- a/mono/mini/exceptions-arm.c -+++ b/mono/mini/exceptions-arm.c -@@ -14,7 +14,7 @@ - #include - - #ifndef MONO_CROSS_COMPILE --#ifdef HAVE_ASM_SIGCONTEXT_H -+#if defined(HAVE_ASM_SIGCONTEXT_H) && defined(__GLIBC__) - #include - #endif /* def HAVE_ASM_SIGCONTEXT_H */ - #endif --- -1.9.1 - diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 6719fec4d4..89b8ed0bd5 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 8965d107f4ebf4583ba1b50e0dcad39f0dc6adac8df7a083e9c5879ad93c0ea4 mono-4.6.2.16.tar.bz2 +sha256 18cb38a670e51609c36c687ed90ad42cfedabeffd0a2dc5f7f0c46249eb8dbef mono-4.8.1.0.tar.bz2 diff --git a/package/mono/mono.mk b/package/mono/mono.mk index c6e2cd3a13..0fafc974d4 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 4.6.2.16 +MONO_VERSION = 4.8.1.0 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2 MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial @@ -20,9 +20,10 @@ MONO_AUTORECONF = YES # Disable managed code (mcs folder) from building MONO_CONF_OPTS = --with-mcs-docs=no \ --with-ikvm-native=no \ - --enable-minimal=profiler,debug \ + --enable-minimal=profiler,debug,aot \ --disable-mcs-build \ - --enable-static + --enable-static \ + --disable-btls # The libraries have been built by the host-mono build. Since they are # architecture-independent, we simply copy them to the target. @@ -44,8 +45,9 @@ MONO_DEPENDENCIES += host-mono HOST_MONO_CONF_OPTS = --with-mcs-docs=no \ --disable-libraries \ --with-ikvm-native=no \ - --enable-minimal=profiler,debug \ - --enable-static + --enable-minimal=profiler,debug,aot \ + --enable-static \ + --disable-btls # ensure monolite is used HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false diff --git a/package/monolite/monolite.hash b/package/monolite/monolite.hash index 621e5e4f5f..09f9554c8d 100644 --- a/package/monolite/monolite.hash +++ b/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 c01e9ba37d8d8f9ef68e08170b2582cc710a8a77756e2412dff298a39b3c4d2b monolite-149-latest.tar.gz +sha256 2cdf6cff1d82d76412461a4c8a3616bb2aa1e835fb55479941662dec3799c924 monolite-156-latest.tar.gz diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk index 6b982b3441..73f235225b 100644 --- a/package/monolite/monolite.mk +++ b/package/monolite/monolite.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONOLITE_VERSION = 149 +MONOLITE_VERSION = 156 MONOLITE_SITE = http://download.mono-project.com/monolite/ MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPL-2.0 or commercial diff --git a/package/mosh/Config.in b/package/mosh/Config.in index 18065201bc..da8a305a06 100644 --- a/package/mosh/Config.in +++ b/package/mosh/Config.in @@ -20,15 +20,16 @@ config BR2_PACKAGE_MOSH # runtime dependency select BR2_PACKAGE_OPENSSH if !BR2_PACKAGE_DROPBEAR_CLIENT help - Remote terminal application that supports intermittent connectivity, - allows roaming, and provides speculative local echo and line editing - of user keystrokes. + Remote terminal application that supports intermittent + connectivity, allows roaming, and provides speculative local + echo and line editing of user keystrokes. - Mosh requires that the remote machine has a locale setting matching - the one on the client. + Mosh requires that the remote machine has a locale setting + matching the one on the client. - When using mosh with dropbear on a remote machine, the client needs mosh - with a version above 1.3.0 and the --no-ssh-pty option needs to be passed - when starting the connection. + When using mosh with dropbear on a remote machine, the + client needs mosh with a version above 1.3.0 and the + --no-ssh-pty option needs to be passed when starting the + connection. - https://mosh.mit.edu + https://mosh.org diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash index 31f59c7f5e..4dae51df64 100644 --- a/package/mosh/mosh.hash +++ b/package/mosh/mosh.hash @@ -1,2 +1,2 @@ -# From https://mailman.mit.edu/pipermail/mosh-users/2016-August/000330.html -sha256 7e82b7fbfcc698c70f5843bb960dadb8e7bd7ac1d4d2151c9d979372ea850e85 mosh-1.2.6.tar.gz +# From https://mailman.mit.edu/pipermail/mosh-users/2017-March/000340.html +sha256 320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376 mosh-1.3.0.tar.gz diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk index 0da91059ec..06502f6e0c 100644 --- a/package/mosh/mosh.mk +++ b/package/mosh/mosh.mk @@ -4,8 +4,8 @@ # ################################################################################ -MOSH_VERSION = 1.2.6 -MOSH_SITE = https://mosh.mit.edu +MOSH_VERSION = 1.3.0 +MOSH_SITE = https://mosh.org MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPL-3.0+ with exception MOSH_LICENSE_FILES = COPYING COPYING.iOS diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 37141971e2..cea79e2643 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f4055e1189e5cc00e83706b2e0b5ead924ced0303e073d7802ee9f9a8eba4b47 mpd-0.20.6.tar.xz +sha256 005ac663b39a76701ba043cce4caef82ac6b0c2f16aae12fdc28e1b3b5b6c780 mpd-0.20.7.tar.xz sha256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 mpd-0.19.21.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 7fd9bc9f52..fce2472997 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -6,7 +6,7 @@ MPD_VERSION_MAJOR = $(call qstrip,$(BR2_PACKAGE_MPD_VERSION_STRING)) ifeq ($(BR2_PACKAGE_MPD_VERSION_0_20),y) -MPD_VERSION = $(MPD_VERSION_MAJOR).6 +MPD_VERSION = $(MPD_VERSION_MAJOR).7 else MPD_VERSION = $(MPD_VERSION_MAJOR).21 endif diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 12baecf786..dfc660336e 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 e935a8bb373345c833dff3a304c6d392775d206b94c802d9285ae80ac6b66d0b nano-2.8.1.tar.xz +sha256 c7cf264f0f3e4af43ecdbc4ec72c3b1e831c69a1a5f6512d5b0c109e6bac7b11 nano-2.8.4.tar.xz diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 9e7fdc72bc..966d43b53d 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 2.8 -NANO_VERSION = $(NANO_VERSION_MAJOR).1 +NANO_VERSION = $(NANO_VERSION_MAJOR).4 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 94f3e26784..2861aedc87 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/NetworkManager-1.4.2.sha256sum -sha256 a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204 NetworkManager-1.4.2.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.8/NetworkManager-1.8.0.sha256sum +sha256 fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e NetworkManager-1.8.0.tar.xz diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 6adc9b1ab6..4a05a658b9 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.4 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 +NETWORK_MANAGER_VERSION_MAJOR = 1.8 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES @@ -32,6 +32,20 @@ NETWORK_MANAGER_CONF_OPTS = \ --disable-ifupdown \ --disable-ifnet +ifeq ($(BR2_PACKAGE_OFONO),y) +NETWORK_MANAGER_DEPENDENCIES += ofono +NETWORK_MANAGER_CONF_OPTS += --with-ofono +else +NETWORK_MANAGER_CONF_OPTS += --without-ofono +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +NETWORK_MANAGER_DEPENDENCIES += libcurl +NETWORK_MANAGER_CONF_OPTS += --enable-concheck +else +NETWORK_MANAGER_CONF_OPTS += --disable-concheck +endif + ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes diff --git a/package/openssl/openssl.hash b/package/openssl/openssl.hash index 064eeca6f4..da911c5ce9 100644 --- a/package/openssl/openssl.hash +++ b/package/openssl/openssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.0.2k.tar.gz.sha256 -sha256 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 openssl-1.0.2k.tar.gz +# From https://www.openssl.org/source/openssl-1.0.2l.tar.gz.sha256 +sha256 ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c openssl-1.0.2l.tar.gz # Locally computed sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 1536982f8b..5f56b445ab 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSL_VERSION = 1.0.2k +OPENSSL_VERSION = 1.0.2l OPENSSL_SITE = http://www.openssl.org/source OPENSSL_LICENSE = OpenSSL or SSLeay OPENSSL_LICENSE_FILES = LICENSE diff --git a/package/pcsc-lite/pcsc-lite.hash b/package/pcsc-lite/pcsc-lite.hash index 8df43a1052..4a3bd63199 100644 --- a/package/pcsc-lite/pcsc-lite.hash +++ b/package/pcsc-lite/pcsc-lite.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2 pcsc-lite-1.8.20.tar.bz2 +sha256 ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2 pcsc-lite-1.8.21.tar.bz2 diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk index c6c4962ce2..0fbc3b3909 100644 --- a/package/pcsc-lite/pcsc-lite.mk +++ b/package/pcsc-lite/pcsc-lite.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCSC_LITE_VERSION = 1.8.20 +PCSC_LITE_VERSION = 1.8.21 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2 PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/file/4203 PCSC_LITE_INSTALL_STAGING = YES diff --git a/package/php-amqp/php-amqp.hash b/package/php-amqp/php-amqp.hash index 73c69d920b..4b3b19726f 100644 --- a/package/php-amqp/php-amqp.hash +++ b/package/php-amqp/php-amqp.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 38a92eaef1aa863404170bcd15605f7f78140eeec1ff5be6af65c5b8081e2599 amqp-1.7.1.tgz +sha256 f45831d498b8fa47a151c31f6abdc0530aa6eabda6e2e10514aca3bdc76a5098 amqp-1.9.0.tgz diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk index fe49f4ba09..a2815d6be7 100644 --- a/package/php-amqp/php-amqp.mk +++ b/package/php-amqp/php-amqp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_AMQP_VERSION = 1.7.1 +PHP_AMQP_VERSION = 1.9.0 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz PHP_AMQP_SITE = https://pecl.php.net/get PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php-geoip/php-geoip.hash b/package/php-geoip/php-geoip.hash index 37298802dc..21e26c8ea2 100644 --- a/package/php-geoip/php-geoip.hash +++ b/package/php-geoip/php-geoip.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 63167b717f624580b93f3c6c050d8d64ebc6cbe1377069646eb387534c7a2f7e php-geoip-ebb68228ad94298a305710f701b2ade9acff985d.tar.gz +sha256 b2d05c03019d46135c249b5a7fa0dbd43ca5ee98aea8ed807bc7aa90ac8c0f06 geoip-1.1.1.tgz diff --git a/package/php-geoip/php-geoip.mk b/package/php-geoip/php-geoip.mk index 8f4e3bf6d8..1853f7dafd 100644 --- a/package/php-geoip/php-geoip.mk +++ b/package/php-geoip/php-geoip.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_GEOIP_VERSION = ebb68228ad94298a305710f701b2ade9acff985d -PHP_GEOIP_SITE = $(call github,php7-extensions,ext-php7-geoip,$(PHP_GEOIP_VERSION)) +PHP_GEOIP_VERSION = 1.1.1 +PHP_GEOIP_SOURCE = geoip-$(PHP_GEOIP_VERSION).tgz +PHP_GEOIP_SITE = https://pecl.php.net/get PHP_GEOIP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ --with-geoip=$(STAGING_DIR)/usr # phpize does the autoconf magic diff --git a/package/php-gnupg/php-gnupg.hash b/package/php-gnupg/php-gnupg.hash index f0654b5781..4185665e04 100644 --- a/package/php-gnupg/php-gnupg.hash +++ b/package/php-gnupg/php-gnupg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6f1a4b5a95fe501519de76d66602e46290cc452fc48f3a5ec2eacaffe68d9a01 php-gnupg-30fab6eaf9eb61c65b3b46987442be058cbd7823.tar.gz +sha256 35e16bee11345a7d6bf57bea3cadf45e371ad1ed4e0218b0c06f6f637e4e1772 gnupg-1.4.0.tgz diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk index e595cd3fe5..55772aa672 100644 --- a/package/php-gnupg/php-gnupg.mk +++ b/package/php-gnupg/php-gnupg.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_GNUPG_VERSION = 30fab6eaf9eb61c65b3b46987442be058cbd7823 -PHP_GNUPG_SITE = $(call github,Sean-Der,pecl-encryption-gnupg,$(PHP_GNUPG_VERSION)) +PHP_GNUPG_VERSION = 1.4.0 +PHP_GNUPG_SOURCE = gnupg-$(PHP_GNUPG_VERSION).tgz +PHP_GNUPG_SITE = https://pecl.php.net/get # phpize does the autoconf magic PHP_GNUPG_DEPENDENCIES = php libgpgme host-autoconf host-pkgconf PHP_GNUPG_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php-imagick/php-imagick.hash b/package/php-imagick/php-imagick.hash index e9912371b1..abb29d4e20 100644 --- a/package/php-imagick/php-imagick.hash +++ b/package/php-imagick/php-imagick.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 50bbc46e78cd6e1ea5d7660be1722258e60b1729483ca14b02da7cf9f5ed3e6a imagick-3.4.3RC1.tgz +sha256 1f3c5b5eeaa02800ad22f506cd100e8889a66b2ec937e192eaaa30d74562567c imagick-3.4.3.tgz diff --git a/package/php-imagick/php-imagick.mk b/package/php-imagick/php-imagick.mk index c8c2b85afe..9c47244cb7 100644 --- a/package/php-imagick/php-imagick.mk +++ b/package/php-imagick/php-imagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_IMAGICK_VERSION = 3.4.3RC1 +PHP_IMAGICK_VERSION = 3.4.3 PHP_IMAGICK_SOURCE = imagick-$(PHP_IMAGICK_VERSION).tgz PHP_IMAGICK_SITE = http://pecl.php.net/get PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php-memcached/php-memcached.hash b/package/php-memcached/php-memcached.hash index f2a096f3dd..7a8ec28340 100644 --- a/package/php-memcached/php-memcached.hash +++ b/package/php-memcached/php-memcached.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 73266212e791a4817da06be1daddf9ff7dd5b5b0b650b3fbd0f5fc6ccc18491b php-memcached-6ee96cad7be5caa1f13a1f3e5a4d5f900b9c04ce.tar.gz +sha256 5d1c29a1d5e391d6bb7b736a07e063d2f0834800673dd246d64ce1b73e47645d memcached-3.0.3.tgz diff --git a/package/php-memcached/php-memcached.mk b/package/php-memcached/php-memcached.mk index c4b76365ed..1f962b0d7d 100644 --- a/package/php-memcached/php-memcached.mk +++ b/package/php-memcached/php-memcached.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_MEMCACHED_VERSION = 6ee96cad7be5caa1f13a1f3e5a4d5f900b9c04ce -PHP_MEMCACHED_SITE = $(call github,php-memcached-dev,php-memcached,$(PHP_MEMCACHED_VERSION)) +PHP_MEMCACHED_VERSION = 3.0.3 +PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz +PHP_MEMCACHED_SITE = https://pecl.php.net/get PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ --disable-memcached-sasl \ --with-libmemcached-dir=$(STAGING_DIR)/usr \ diff --git a/package/php-ssh2/php-ssh2.hash b/package/php-ssh2/php-ssh2.hash index b514601b93..2529f9aef9 100644 --- a/package/php-ssh2/php-ssh2.hash +++ b/package/php-ssh2/php-ssh2.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3d79a6c9ffed3fd6ec16e834c0cc93cf125d9f5bdbb951b8b76a3507498548d5 php-ssh2-12dd52236c601577a63e33ee71e3ce6dad811e40.tar.gz +sha256 6a93891878b23904a773eb814fec7aea4ea00b4a412ee779c8535ed9c5e46ced ssh2-1.0.tgz diff --git a/package/php-ssh2/php-ssh2.mk b/package/php-ssh2/php-ssh2.mk index 931cde91c8..7a1372cd73 100644 --- a/package/php-ssh2/php-ssh2.mk +++ b/package/php-ssh2/php-ssh2.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_SSH2_VERSION = 12dd52236c601577a63e33ee71e3ce6dad811e40 -PHP_SSH2_SITE = $(call github,php,pecl-networking-ssh2,$(PHP_SSH2_VERSION)) +PHP_SSH2_VERSION = 1.0 +PHP_SSH2_SOURCE = ssh2-$(PHP_SSH2_VERSION).tgz +PHP_SSH2_SITE = https://pecl.php.net/get PHP_SSH2_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ --with-ssh2=$(STAGING_DIR)/usr # phpize does the autoconf magic diff --git a/package/php-yaml/php-yaml.hash b/package/php-yaml/php-yaml.hash index a40677ef5f..6a2f1545df 100644 --- a/package/php-yaml/php-yaml.hash +++ b/package/php-yaml/php-yaml.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d49acf2b7843258957a16df0d7ced56c0e1fc3eaa54f54289e4012edc002814c yaml-2.0.0RC7.tgz +sha256 ef13ff56c184290c025a522bf9ae2e1b3ecc8543c3a5161dd02adec90897a221 yaml-2.0.0.tgz diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk index 27118906d4..9296091749 100644 --- a/package/php-yaml/php-yaml.mk +++ b/package/php-yaml/php-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_YAML_VERSION = 2.0.0RC7 +PHP_YAML_VERSION = 2.0.0 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz PHP_YAML_SITE = https://pecl.php.net/get PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index 4ef5799adb..699e7057b1 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 poppler-0.54.0.tar.xz +sha256 537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658 poppler-0.55.0.tar.xz diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 056193c59d..5757100b5d 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPPLER_VERSION = 0.54.0 +POPPLER_VERSION = 0.55.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf @@ -46,10 +46,10 @@ POPPLER_CONF_OPTS += --disable-libtiff endif ifeq ($(BR2_PACKAGE_JPEG),y) -POPPLER_CONF_OPTS += --enable-libjpeg +POPPLER_CONF_OPTS += --enable-dctdecoder=libjpeg POPPLER_DEPENDENCIES += jpeg else -POPPLER_CONF_OPTS += --disable-libjpeg +POPPLER_CONF_OPTS += --enable-dctdecoder=none endif ifeq ($(BR2_PACKAGE_LIBPNG),y) diff --git a/package/powertop/0001-autotune-fix-use-after-close.patch b/package/powertop/0001-autotune-fix-use-after-close.patch deleted file mode 100644 index f2b3dff102..0000000000 --- a/package/powertop/0001-autotune-fix-use-after-close.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch pulled from https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/powertop&id=37469c47b885c50365f57044e4ad72e0e3512b91 - -Fixes a use-after-close bug in create_all_devfreq_devices(). - -Signed-off-by: Steven Noonan - ---- a/src/devices/devfreq.cpp -+++ b/src/devices/devfreq.cpp -@@ -247,6 +247,7 @@ void create_all_devfreq_devices(void) - fprintf(stderr, "Devfreq not enabled\n"); - is_enabled = false; - closedir(dir); -+ dir = NULL; - return; - } diff --git a/package/powertop/0002-dont-force-stack-smashing-protection.patch b/package/powertop/0001-dont-force-stack-smashing-protection.patch similarity index 100% rename from package/powertop/0002-dont-force-stack-smashing-protection.patch rename to package/powertop/0001-dont-force-stack-smashing-protection.patch diff --git a/package/powertop/0003-add-missing-sys-time.h-header.patch b/package/powertop/0003-add-missing-sys-time.h-header.patch deleted file mode 100644 index 7156e4256a..0000000000 --- a/package/powertop/0003-add-missing-sys-time.h-header.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 283cab667a9ac3ae3a675b5e5d1a42191188699f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 8 Aug 2015 18:24:48 +0200 -Subject: [PATCH] add missing sys/time.h header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -struct timeval is defined in sys/time.h with a musl toolchain. - -Fixes: -In file included from devices/devfreq.cpp:35:0: -devices/devfreq.h:35:18: error: field ‘stamp_before’ has incomplete type ‘timeval’ - struct timeval stamp_before, stamp_after; - -Signed-off-by: Romain Naour ---- - src/devices/devfreq.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/devices/devfreq.h b/src/devices/devfreq.h -index 16a60fb..4a8983b 100644 ---- a/src/devices/devfreq.h -+++ b/src/devices/devfreq.h -@@ -27,6 +27,7 @@ - - #include "device.h" - #include "../parameters/parameters.h" -+#include - - struct frequency; - --- -2.4.3 - diff --git a/package/powertop/0004-add-missing-stdio.h-header.patch b/package/powertop/0004-add-missing-stdio.h-header.patch deleted file mode 100644 index 7619cca131..0000000000 --- a/package/powertop/0004-add-missing-stdio.h-header.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e6cfd977c81b335664db1d5d3d6b5488c245e30f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 8 Aug 2015 18:26:15 +0200 -Subject: [PATCH] add missing stdio.h header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -snprinf is defined in stdio.h. - -Fixes: -perf/perf_bundle.cpp: In function ‘void parse_event_format(const char*)’: -perf/perf_bundle.cpp:141:75: error: ‘sprintf’ was not declared in this scope - sprintf(file, "/sys/kernel/debug/tracing/events/%s/%s/format", sys, event); - -Signed-off-by: Romain Naour ---- - src/perf/perf_bundle.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/perf/perf_bundle.cpp b/src/perf/perf_bundle.cpp -index cf1ae11..3d216ff 100644 ---- a/src/perf/perf_bundle.cpp -+++ b/src/perf/perf_bundle.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "perf_bundle.h" - #include "perf_event.h" --- -2.4.3 - diff --git a/package/powertop/powertop.hash b/package/powertop/powertop.hash index b64981ea7a..0f9acdc277 100644 --- a/package/powertop/powertop.hash +++ b/package/powertop/powertop.hash @@ -1,2 +1,2 @@ # Locally-generated hash -sha256 8d4b1490e2baad4467c0ded3c423db4472dcbf7b2dd8f8f2a928f54047c678ca powertop-2.7.tar.gz +sha256 aa7fb7d8e9a00f05e7d8a7a2866d85929741e0d03a5bf40cab22d2021c959250 powertop-v2.9.tar.gz diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk index bd73e19b4d..62b716f0f1 100644 --- a/package/powertop/powertop.mk +++ b/package/powertop/powertop.mk @@ -4,14 +4,12 @@ # ################################################################################ -POWERTOP_VERSION = 2.7 +POWERTOP_VERSION = 2.9 POWERTOP_SITE = https://01.org/sites/default/files/downloads/powertop +POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION).tar.gz POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-gettext host-pkgconf POWERTOP_LICENSE = GPL-2.0 POWERTOP_LICENSE_FILES = COPYING -# We're patching Makefile.am -POWERTOP_AUTORECONF = YES -POWERTOP_GETTEXTIZE = YES ifeq ($(BR2_NEEDS_GETTEXT),y) POWERTOP_DEPENDENCIES += gettext diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 6b4e0fa76e..3e1b012914 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" + select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime help This module provides controller area network support for Python. diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index a8778622bf..bd19d194b6 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b9b556fe6f016c0a3b27cc67790cf821, sha256 locally computed -md5 b9b556fe6f016c0a3b27cc67790cf821 python-can-1.4.3.tar.gz -sha256 2dcd32737cc39fbf39f41521146a9685f594942c99c6183bad7e3c404930198b python-can-1.4.3.tar.gz +# md5 from https://pypi.python.org/pypi/python-can/json, sha256 locally computed +md5 f653aecf8b9034bbba32cc04ca6a7b6d python-can-1.5.2.tar.gz +sha256 edabb426e6cd11c2dc7a98980340135aa0eb02143b0d51bf14e3e6178c131cc3 python-can-1.5.2.tar.gz diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index eddefdb4f7..a271baea00 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 1.4.3 -PYTHON_CAN_SITE = https://pypi.python.org/packages/source/p/python-can +PYTHON_CAN_VERSION = 1.5.2 +PYTHON_CAN_SITE = https://pypi.python.org/packages/a1/b1/80f023e2b728c7ebccbf989aec777f3add3dd4cee650573ce5d38132a07c PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt PYTHON_CAN_SETUP_TYPE = setuptools diff --git a/package/python-dataproperty/python-dataproperty.hash b/package/python-dataproperty/python-dataproperty.hash index 1ab0a40074..6ab0646ee7 100644 --- a/package/python-dataproperty/python-dataproperty.hash +++ b/package/python-dataproperty/python-dataproperty.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/dataproperty/json, sha256 locally computed -md5 70199d3e6e021810d0d3b4a42c37916f DataProperty-0.18.1.tar.gz -sha256 950131bd9fb874be606835e5f4a84d99f505d919aed94145932ec010190c7c66 DataProperty-0.18.1.tar.gz +md5 7b41e6f9b250c4f04f07bbd2999c4259 DataProperty-0.22.0.tar.gz +sha256 3ed49c923a996cbabc008fba7f2df8b2f303e961d64507348120faaacb6b5157 DataProperty-0.22.0.tar.gz diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 7e34425f14..7feeed5551 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.18.1 +PYTHON_DATAPROPERTY_VERSION = 0.22.0 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/42/b6/591366869e9fc7b19420ca4c177727f25dcccc07a46cecbda8d6abffa866 +PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/ed/00/091f46cc81869b925d4001300bef31ea2224436c494d1de7145d4bb56df1 PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 322e0a994a..55b07095b6 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/pillow/json, sha256 locally computed -md5 d040e1155b4d9d8b011aab67ee0ea86b Pillow-4.1.0.tar.gz -sha256 a0fd487fed4a35717401b7566e51a1520b34e7c0f7f2a315a6509f82bc86299f Pillow-4.1.0.tar.gz +md5 f2565954955c8d10f3b4f1f72f852bf7 Pillow-4.1.1.tar.gz +sha256 00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431 Pillow-4.1.1.tar.gz diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index e1167c8c4c..d6914c3e71 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 4.1.0 +PYTHON_PILLOW_VERSION = 4.1.1 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_SITE = https://pypi.python.org/packages/80/38/5cb561c68155834c596018c47caa44da88ed34b09579b921c0e493fb06c7 +PYTHON_PILLOW_SITE = https://pypi.python.org/packages/93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7 PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_SETUP_TYPE = setuptools diff --git a/package/python-pytablewriter/python-pytablewriter.hash b/package/python-pytablewriter/python-pytablewriter.hash index 80a9a02fd6..533d21a5b8 100644 --- a/package/python-pytablewriter/python-pytablewriter.hash +++ b/package/python-pytablewriter/python-pytablewriter.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/pytablewriter/json, sha256 locally computed -md5 c63d4d14836ae291e11448219abdf348 pytablewriter-0.17.2.tar.gz -sha256 629ecb7bfe3fb033427e02e0291270d13ff14bfc4caf2cac66b797ac5aea5fd1 pytablewriter-0.17.2.tar.gz +md5 a2d3fe29adc7708ce986646f41c1d229 pytablewriter-0.19.8.tar.gz +sha256 b76cb1591504ed1dcdc14ccf383806f45e2027bd72d844e545c6a0d18552d46c pytablewriter-0.19.8.tar.gz diff --git a/package/python-pytablewriter/python-pytablewriter.mk b/package/python-pytablewriter/python-pytablewriter.mk index 2788c854c5..ddbc17beda 100644 --- a/package/python-pytablewriter/python-pytablewriter.mk +++ b/package/python-pytablewriter/python-pytablewriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 0.17.2 +PYTHON_PYTABLEWRITER_VERSION = 0.19.8 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/47/5c/cbfed107164e56a6739d52694c4c584635970d6621b7e531464e89534956 +PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/9b/89/1883fcd076f40034539f577b033636b20d9a7983a8ba99e9b8ef11b680b2 PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE diff --git a/package/python-service-identity/python-service-identity.hash b/package/python-service-identity/python-service-identity.hash index 09561d8f93..7caaaf99e8 100644 --- a/package/python-service-identity/python-service-identity.hash +++ b/package/python-service-identity/python-service-identity.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/service_identity/json, sha256 locally computed -md5 d52392597b9c44a740abf322bfdb21e6 service_identity-16.0.0.tar.gz -sha256 0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036 service_identity-16.0.0.tar.gz +md5 f509cb41ca2f8420bd8496291136d6cc service_identity-17.0.0.tar.gz +sha256 4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab service_identity-17.0.0.tar.gz diff --git a/package/python-service-identity/python-service-identity.mk b/package/python-service-identity/python-service-identity.mk index 88549abff3..ccc6e71ac3 100644 --- a/package/python-service-identity/python-service-identity.mk +++ b/package/python-service-identity/python-service-identity.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SERVICE_IDENTITY_VERSION = 16.0.0 +PYTHON_SERVICE_IDENTITY_VERSION = 17.0.0 PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz -PYTHON_SERVICE_IDENTITY_SITE = https://pypi.python.org/packages/f3/2a/7c04e7ab74f9f2be026745a9ffa81fd9d56139fa6f5f4b4c8a8c07b2bfba +PYTHON_SERVICE_IDENTITY_SITE = https://pypi.python.org/packages/de/2a/cab6e30be82c8fcd2339ef618036720eda954cf05daef514e386661c9221 PYTHON_SERVICE_IDENTITY_LICENSE = MIT PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 3cd86470bd..2eef91cc0b 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,4 +1,2 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha1 6780d1abb66f33a97aad0edbe020403d0a15b67f redis-3.2.8.tar.gz -# Calculated based on the hash above -sha256 61b373c23d18e6cc752a69d5ab7f676c6216dc2853e46750a8c4ed791d68482c redis-3.2.8.tar.gz +sha256 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26 redis-3.2.9.tar.gz diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 458ed4f8ba..6a7a3128c3 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 3.2.8 +REDIS_VERSION = 3.2.9 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING diff --git a/package/sdl2_mixer/Config.in b/package/sdl2_mixer/Config.in new file mode 100644 index 0000000000..8e1cf58590 --- /dev/null +++ b/package/sdl2_mixer/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_SDL2_MIXER + bool "sdl2_mixer" + depends on BR2_PACKAGE_SDL2 + help + SDL_mixer is a sample multi-channel audio mixer library. It + supports any number of simultaneously playing channels of 16 + bit stereo audio, plus a single channel of music, mixed by + the popular FLAC, MikMod MOD, Timidity MIDI, Ogg Vorbis, and + SMPEG MP3 libraries. + + http://www.libsdl.org/projects/SDL_mixer/ diff --git a/package/sdl2_mixer/sdl2_mixer.hash b/package/sdl2_mixer/sdl2_mixer.hash new file mode 100644 index 0000000000..48bc887a4b --- /dev/null +++ b/package/sdl2_mixer/sdl2_mixer.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f SDL2_mixer-2.0.1.tar.gz diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk new file mode 100644 index 0000000000..c990847974 --- /dev/null +++ b/package/sdl2_mixer/sdl2_mixer.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# sdl2_mixer +# +################################################################################ + +SDL2_MIXER_VERSION = 2.0.1 +SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz +SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release +SDL2_MIXER_LICENSE = Zlib +SDL2_MIXER_LICENSE_FILES = COPYING.txt +SDL2_MIXER_INSTALL_STAGING = YES +SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf + +SDL2_MIXER_CONF_OPTS = \ + --disable-fluidsynth \ + --disable-music-mp3 + +ifeq ($(BR2_PACKAGE_FLAC),y) +SDL2_MIXER_CONF_OPTS += --enable-music-flac +SDL2_MIXER_DEPENDENCIES += flac +else +SDL2_MIXER_CONF_OPTS += --disable-music-flac +endif + +ifeq ($(BR2_PACKAGE_LIBMODPLUG),y) +SDL2_MIXER_CONF_OPTS += --enable-music-mod-modplug +SDL2_MIXER_DEPENDENCIES += libmodplug +else +SDL2_MIXER_CONF_OPTS += --disable-music-mod-modplug +endif + +ifeq ($(BR2_PACKAGE_TREMOR),y) +SDL2_MIXER_CONF_OPTS += --enable-music-ogg-tremor +SDL2_MIXER_DEPENDENCIES += tremor +else +SDL2_MIXER_CONF_OPTS += --disable-music-ogg-tremor +endif + +$(eval $(autotools-package)) diff --git a/package/sdl2_net/Config.in b/package/sdl2_net/Config.in new file mode 100644 index 0000000000..d5e749f5ac --- /dev/null +++ b/package/sdl2_net/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SDL2_NET + bool "sdl2_net" + depends on BR2_PACKAGE_SDL2 + help + This is a small sample cross-platform networking library, + with a sample chat client and server application. The chat + client uses the GUIlib GUI framework library. + + http://www.libsdl.org/projects/SDL_net/ diff --git a/package/sdl2_net/sdl2_net.hash b/package/sdl2_net/sdl2_net.hash new file mode 100644 index 0000000000..c5f4433837 --- /dev/null +++ b/package/sdl2_net/sdl2_net.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21 SDL2_net-2.0.1.tar.gz diff --git a/package/sdl2_net/sdl2_net.mk b/package/sdl2_net/sdl2_net.mk new file mode 100644 index 0000000000..2fa4a8c2e0 --- /dev/null +++ b/package/sdl2_net/sdl2_net.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# sdl2_net +# +################################################################################ + +SDL2_NET_VERSION = 2.0.1 +SDL2_NET_SOURCE = SDL2_net-$(SDL2_NET_VERSION).tar.gz +SDL2_NET_SITE = http://www.libsdl.org/projects/SDL_net/release +SDL2_NET_LICENSE = Zlib +SDL2_NET_LICENSE_FILES = COPYING.txt +SDL2_NET_INSTALL_STAGING = YES +SDL2_NET_DEPENDENCIES = sdl2 + +$(eval $(autotools-package)) diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index 9e305daddd..45dbbe8989 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3fbde4f6e7f5cbc7200f782bd9faca25f7e91edf7dd7a3b514cd616e556a1fee shairport-sync-3.0.1.tar.gz +sha256 b348b9b3cf3994d9222430bc514c94a22f2ed173956fdb097f3354cdba8fd198 shairport-sync-3.0.2.tar.gz diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 650c6d73e4..208a9b3b1e 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.0.1 +SHAIRPORT_SYNC_VERSION = 3.0.2 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause diff --git a/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch b/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch deleted file mode 100644 index 3d98203424..0000000000 --- a/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b6dcae8ec4334e2436cfa19a8052c3473f57a586 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 4 Mar 2017 15:02:43 +0100 -Subject: [PATCH 1/2] src/Makefile.am: don't use VPATH - -VPATH is a mechanism used to allow out-of-tree build, not to use source -code from a different directory. For this purpose, one should simply use -the "subdir-objects" AUTOMAKE_OPTIONS, and reference the source code of -the sub-directory in the _SOURCES variable. - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://github.com/irontec/sngrep/pull/176 ---- - src/Makefile.am | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 931ee06..961f4a0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,5 +1,5 @@ -+AUTOMAKE_OPTIONS=subdir-objects - bin_PROGRAMS=sngrep --VPATH=curses - sngrep_SOURCES=capture.c - if USE_EEP - sngrep_SOURCES+=capture_eep.c -@@ -12,8 +12,8 @@ sngrep_SOURCES+=capture_openssl.c - endif - sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c - sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c --sngrep_SOURCES+=util.c hash.c vector.c ui_panel.c scrollbar.c --sngrep_SOURCES+=ui_manager.c ui_call_list.c ui_call_flow.c ui_call_raw.c --sngrep_SOURCES+=ui_stats.c ui_filter.c ui_save.c ui_msg_diff.c --sngrep_SOURCES+=ui_column_select.c ui_settings.c -+sngrep_SOURCES+=util.c hash.c vector.c curses/ui_panel.c curses/scrollbar.c -+sngrep_SOURCES+=curses/ui_manager.c curses/ui_call_list.c curses/ui_call_flow.c curses/ui_call_raw.c -+sngrep_SOURCES+=curses/ui_stats.c curses/ui_filter.c curses/ui_save.c curses/ui_msg_diff.c -+sngrep_SOURCES+=curses/ui_column_select.c curses/ui_settings.c - --- -2.7.4 - diff --git a/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch b/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch deleted file mode 100644 index b51581f5c1..0000000000 --- a/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 22b08ab1a45eb3773b3c90dc37a31a7574520daa Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 4 Mar 2017 14:56:53 +0100 -Subject: [PATCH 2/2] configure.ac: switch to pkg-config to find openssl - -Using AC_CHECK_LIB() doesn't work properly for static linking, because -it doesn't return information on transitive dependencies of -libraries. For example, if library A internally uses library B, then -with dynamic linking, doing -lA is sufficient. However, with static -linking, one must do -lA -lB, and AC_CHECK_LIB() will only give the -lA -information. This for example causes a build failure when building -sngrep statically with openssl enabled: - -checking for SSL_new in -lssl... no -configure: error: You need to have libssl installed to compile sngrep - -due to undefined symbols in the OpenSSL library. - -The proper solution for this is to discover the library using -pkg-config, because pkg-config properly returns the list of necessary -libraries, as it understands the concept of "list of libraries needed -when dynamic linking" and "list of libraries needed for static linking". - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://github.com/irontec/sngrep/pull/176 ---- - configure.ac | 9 +-------- - src/Makefile.am | 4 ++++ - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 42e00e9..9f8e6d2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,14 +129,7 @@ AS_IF([test "x$WITH_OPENSSL" == "xyes"], [ - AS_IF([test "x$WITH_GNUTLS" == "xyes"], [ - AC_MSG_ERROR([ GnuTLS and OpenSSL can not be enabled at the same time ]) - ], []) -- -- AC_CHECK_LIB([ssl], [SSL_new], [], [ -- AC_MSG_ERROR([ You need to have libssl installed to compile sngrep]) -- ]) -- -- AC_CHECK_LIB([crypto], [EVP_get_cipherbyname], [], [ -- AC_MSG_ERROR([ You need to have libcrypto installed to compile sngrep]) -- ]) -+ PKG_CHECK_MODULES([SSL], [libssl libcrypto]) - AC_DEFINE([WITH_OPENSSL],[],[Compile With Openssl compatibility]) - ], []) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 961f4a0..3a471b7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,6 +1,8 @@ - AUTOMAKE_OPTIONS=subdir-objects - bin_PROGRAMS=sngrep - sngrep_SOURCES=capture.c -+sngrep_CFLAGS= -+sngrep_LDADD= - if USE_EEP - sngrep_SOURCES+=capture_eep.c - endif -@@ -9,6 +11,8 @@ sngrep_SOURCES+=capture_gnutls.c - endif - if WITH_OPENSSL - sngrep_SOURCES+=capture_openssl.c -+sngrep_CFLAGS+=$(SSL_CFLAGS) -+sngrep_LDADD+=$(SSL_LIBS) - endif - sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c - sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c --- -2.7.4 - diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash index dd75f89566..bc285450d3 100644 --- a/package/sngrep/sngrep.hash +++ b/package/sngrep/sngrep.hash @@ -1 +1 @@ -sha256 30fbfb4f90ed8805194b39683a8a2ed465776ffd60df4482bd029d63b316b3f1 sngrep-v1.4.2.tar.gz +sha256 7385ac202de6d6a1feffb2fd514600563133d9dfa7fb47be052de839abcc1d52 sngrep-v1.4.3.tar.gz diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 74b05b1782..560872f13a 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNGREP_VERSION = v1.4.2 +SNGREP_VERSION = v1.4.3 SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION)) SNGREP_LICENSE = GPL-3.0+ SNGREP_LICENSE_FILES = LICENSE diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 78748b0039..093ec6d64a 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 74559194e1dd9b9d577cac001c0e9d370856671b sqlite-autoconf-3180000.tar.gz +sha1 597735a7039ebb105ea36366783ff0a3177f9131 sqlite-autoconf-3190200.tar.gz # Calculated based on the hash above -sha256 a4e485ad3a16e054765baf6371826b5000beed07e626510896069c0bf013874c sqlite-autoconf-3170000.tar.gz +sha256 ca5361fb01cc3ad63d6fd4eb2cb0b6398e629595896d3558f7e121d37dac2ffc sqlite-autoconf-3190200.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index af4c571dfa..17b4d2dd3a 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3180000 +SQLITE_VERSION = 3190200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2017 SQLITE_LICENSE = Public domain diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 82e1ad66fe..63b1dd0d4f 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,2 +1,2 @@ # From: http://www.sudo.ws/download.html -sha256 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 sudo-1.8.19p2.tar.gz +sha256 9e97b8da859c6cc1b5b8c31db93002b750eae16af1bbda9140f8dd85b970e0e0 sudo-1.8.20.tar.gz diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 56f83eac9a..a6ea9acdb1 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUDO_VERSION = 1.8.19p2 +SUDO_VERSION = 1.8.20 SUDO_SITE = http://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause SUDO_LICENSE_FILES = doc/LICENSE diff --git a/package/swig/swig.hash b/package/swig/swig.hash index 92ddc110ca..77c93a96d6 100644 --- a/package/swig/swig.hash +++ b/package/swig/swig.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 2939aae39dec06095462f1b95ce1c958ac80d07b926e48871046d17c0094f44c swig-3.0.10.tar.gz +sha256 7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d swig-3.0.12.tar.gz diff --git a/package/swig/swig.mk b/package/swig/swig.mk index 740b597c60..cdf9533f2a 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -5,7 +5,7 @@ ################################################################################ SWIG_VERSION_MAJOR = 3.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).10 +SWIG_VERSION = $(SWIG_VERSION_MAJOR).12 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) HOST_SWIG_DEPENDENCIES = host-bison HOST_SWIG_CONF_OPTS = \ diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in index d9ef1bc7a4..dbc69f1fe8 100644 --- a/package/swupdate/Config.in +++ b/package/swupdate/Config.in @@ -32,6 +32,8 @@ config BR2_PACKAGE_SWUPDATE archives. * Select BR2_PACKAGE_UBOOT_TOOLS and BR2_PACKAGE_ZLIB to add support for setting the U-Boot environment. + * Select BR2_PACKAGE_ZEROMQ to add support for using a remote + handler. https://sbabic.github.io/swupdate diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index d4e8833930..5bdd9bf320 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ce28348e98aa5657154d2eacc2e8a9b114ba50a937531b010872c8eb6fd72b23 swupdate-2017.01.tar.gz +sha256 d5a4ff243bae865313b808aad57efa6400d41e83c49266a3a14a725d0c30d240 swupdate-2017.04.tar.gz diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 335ec90e72..560a2d4300 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2017.01 +SWUPDATE_VERSION = 2017.04 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0+, MIT, Public Domain SWUPDATE_LICENSE_FILES = COPYING @@ -71,6 +71,13 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=n endif +ifeq ($(BR2_PACKAGE_ZEROMQ),y) +SWUPDATE_DEPENDENCIES += zeromq +SWUPDATE_MAKE_ENV += HAVE_LIBZEROMQ=y +else +SWUPDATE_MAKE_ENV += HAVE_LIBZEROMQ=n +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) SWUPDATE_DEPENDENCIES += zlib SWUPDATE_MAKE_ENV += HAVE_ZLIB=y diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index 3b4dda8f15..8d4ecf48c1 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,4 +1,4 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 805002b2bef00cd9ab44c5037d09b29cb71a17f8 sysstat-11.4.3.tar.xz +sha1 0e4950da333ff4e68826d58a6f43cb8048d85e9c sysstat-11.4.4.tar.xz # Locally calculated -sha256 02e9cafa5557fbae435d33e592373655df929d817ae711d31142dd2f7d4dcee7 sysstat-11.4.3.tar.xz +sha256 6585f08e24347d2d6462aee6ef97e80fe4cc869605193184500df0f80fa61cc8 sysstat-11.4.4.tar.xz diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 31645b8f94..bd73214c35 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,10 +4,10 @@ # ################################################################################ -SYSSTAT_VERSION = 11.4.3 +SYSSTAT_VERSION = 11.4.4 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard -SYSSTAT_CONF_OPTS = --disable-man-group --disable-sensors +SYSSTAT_CONF_OPTS = --disable-file-attr --disable-sensors SYSSTAT_DEPENDENCIES = host-gettext SYSSTAT_LICENSE = GPL-2.0+ SYSSTAT_LICENSE_FILES = COPYING diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index 9909678a0c..b033d3c3f1 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 68d8d49dab5bf58b2e8d244eee1ee7f2379d967da19fe97dd9d59bcf40a22abc tcpreplay-4.2.3.tar.gz +sha256 043756c532dab93e2be33a517ef46b1341f7239278a1045ae670041dd8a4531d tcpreplay-4.2.6.tar.gz diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 6d5c32b9c8..adccde0eb0 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.2.3 +TCPREPLAY_VERSION = 4.2.6 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_LICENSE = GPL-3.0 TCPREPLAY_LICENSE_FILES = docs/LICENSE diff --git a/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch b/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch deleted file mode 100644 index 9df4577e14..0000000000 --- a/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 438274f938e046d33cb0e1230b41da32ffe223e1 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Fri, 2 Dec 2016 21:56:56 +0000 -Subject: [PATCH] * libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow - in TIFFReadEncodedStrip() that caused an integer division by zero. Reported - by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596 - -Fixes CVE-2016-10266 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_read.c | 2 +- - libtiff/tiffiop.h | 4 ++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c -index c26c55f4..52bbf507 100644 ---- a/libtiff/tif_read.c -+++ b/libtiff/tif_read.c -@@ -346,7 +346,7 @@ TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size) - rowsperstrip=td->td_rowsperstrip; - if (rowsperstrip>td->td_imagelength) - rowsperstrip=td->td_imagelength; -- stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip); -+ stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip); - stripinplane=(strip%stripsperplane); - plane=(uint16)(strip/stripsperplane); - rows=td->td_imagelength-stripinplane*rowsperstrip; -diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h -index ffbb647b..cb59460a 100644 ---- a/libtiff/tiffiop.h -+++ b/libtiff/tiffiop.h -@@ -250,6 +250,10 @@ struct tiff { - #define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \ - ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \ - 0U) -+/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */ -+/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */ -+#define TIFFhowmany_32_maxuint_compat(x, y) \ -+ (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0)) - #define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3) - #define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y)) - #define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y))) --- -2.11.0 - diff --git a/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch b/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch deleted file mode 100644 index d99b9007e8..0000000000 --- a/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 43bc256d8ae44b92d2734a3c5bc73957a4d7c1ec Mon Sep 17 00:00:00 2001 -From: erouault -Date: Sat, 3 Dec 2016 11:15:18 +0000 -Subject: [PATCH] * libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case - of failure in OJPEGPreDecode(). This will avoid a divide by zero, and - potential other issues. Reported by Agostino Sarubbo. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2611 - -Fixes CVE-2016-10267 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_ojpeg.c | 8 ++++++++ - 1 files changed, 15 insertions(+) - -diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c -index 1ccc3f9b..f19e8fd0 100644 ---- a/libtiff/tif_ojpeg.c -+++ b/libtiff/tif_ojpeg.c -@@ -244,6 +244,7 @@ typedef enum { - - typedef struct { - TIFF* tif; -+ int decoder_ok; - #ifndef LIBJPEG_ENCAP_EXTERNAL - JMP_BUF exit_jmpbuf; - #endif -@@ -722,6 +723,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s) - } - sp->write_curstrile++; - } -+ sp->decoder_ok = 1; - return(1); - } - -@@ -784,8 +786,14 @@ OJPEGPreDecodeSkipScanlines(TIFF* tif) - static int - OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s) - { -+ static const char module[]="OJPEGDecode"; - OJPEGState* sp=(OJPEGState*)tif->tif_data; - (void)s; -+ if( !sp->decoder_ok ) -+ { -+ TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized"); -+ return 0; -+ } - if (sp->libjpeg_jpeg_query_style==0) - { - if (OJPEGDecodeRaw(tif,buf,cc)==0) --- -2.11.0 - diff --git a/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch b/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch deleted file mode 100644 index 290834ec05..0000000000 --- a/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 1044b43637fa7f70fb19b93593777b78bd20da86 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Fri, 2 Dec 2016 23:05:51 +0000 -Subject: [PATCH] * libtiff/tif_pixarlog.c, libtiff/tif_luv.c: fix heap-based - buffer overflow on generation of PixarLog / LUV compressed files, with - ColorMap, TransferFunction attached and nasty plays with bitspersample. The - fix for LUV has not been tested, but suffers from the same kind of issue of - PixarLog. Reported by Agostino Sarubbo. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2604 - -Fixes CVE-2016-10269 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_luv.c | 18 ++++++++++++++---- - libtiff/tif_pixarlog.c | 17 +++++++++++++++-- - 2 files changed, 39 insertions(+), 6 deletions(-) - -diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c -index f68a9b13..e6783db5 100644 ---- a/libtiff/tif_luv.c -+++ b/libtiff/tif_luv.c -@@ -158,6 +158,7 @@ - typedef struct logLuvState LogLuvState; - - struct logLuvState { -+ int encoder_state; /* 1 if encoder correctly initialized */ - int user_datafmt; /* user data format */ - int encode_meth; /* encoding method */ - int pixel_size; /* bytes per pixel */ -@@ -1552,6 +1553,7 @@ LogLuvSetupEncode(TIFF* tif) - td->td_photometric, "must be either LogLUV or LogL"); - break; - } -+ sp->encoder_state = 1; - return (1); - notsupported: - TIFFErrorExt(tif->tif_clientdata, module, -@@ -1563,19 +1565,27 @@ notsupported: - static void - LogLuvClose(TIFF* tif) - { -+ LogLuvState* sp = (LogLuvState*) tif->tif_data; - TIFFDirectory *td = &tif->tif_dir; - -+ assert(sp != 0); - /* - * For consistency, we always want to write out the same - * bitspersample and sampleformat for our TIFF file, - * regardless of the data format being used by the application. - * Since this routine is called after tags have been set but - * before they have been recorded in the file, we reset them here. -+ * Note: this is really a nasty approach. See PixarLogClose - */ -- td->td_samplesperpixel = -- (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; -- td->td_bitspersample = 16; -- td->td_sampleformat = SAMPLEFORMAT_INT; -+ if( sp->encoder_state ) -+ { -+ /* See PixarLogClose. Might avoid issues with tags whose size depends -+ * on those below, but not completely sure this is enough. */ -+ td->td_samplesperpixel = -+ (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; -+ td->td_bitspersample = 16; -+ td->td_sampleformat = SAMPLEFORMAT_INT; -+ } - } - - static void -diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c -index d1246c3d..aa99bc92 100644 ---- a/libtiff/tif_pixarlog.c -+++ b/libtiff/tif_pixarlog.c -@@ -1233,8 +1233,10 @@ PixarLogPostEncode(TIFF* tif) - static void - PixarLogClose(TIFF* tif) - { -+ PixarLogState* sp = (PixarLogState*) tif->tif_data; - TIFFDirectory *td = &tif->tif_dir; - -+ assert(sp != 0); - /* In a really sneaky (and really incorrect, and untruthful, and - * troublesome, and error-prone) maneuver that completely goes against - * the spirit of TIFF, and breaks TIFF, on close, we covertly -@@ -1243,8 +1245,19 @@ PixarLogClose(TIFF* tif) - * readers that don't know about PixarLog, or how to set - * the PIXARLOGDATFMT pseudo-tag. - */ -- td->td_bitspersample = 8; -- td->td_sampleformat = SAMPLEFORMAT_UINT; -+ -+ if (sp->state&PLSTATE_INIT) { -+ /* We test the state to avoid an issue such as in -+ * http://bugzilla.maptools.org/show_bug.cgi?id=2604 -+ * What appends in that case is that the bitspersample is 1 and -+ * a TransferFunction is set. The size of the TransferFunction -+ * depends on 1<td_bitspersample = 8; -+ td->td_sampleformat = SAMPLEFORMAT_UINT; -+ } - } - - static void --- -2.11.0 - diff --git a/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch b/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch deleted file mode 100644 index a24d5d8487..0000000000 --- a/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 9a72a69e035ee70ff5c41541c8c61cd97990d018 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Sat, 3 Dec 2016 11:02:15 +0000 -Subject: [PATCH] * libtiff/tif_dirread.c: modify - ChopUpSingleUncompressedStrip() to instanciate compute ntrips as - TIFFhowmany_32(td->td_imagelength, rowsperstrip), instead of a logic based on - the total size of data. Which is faulty is the total size of data is not - sufficient to fill the whole image, and thus results in reading outside of - the StripByCounts/StripOffsets arrays when using TIFFReadScanline(). Reported - by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2608. - -* libtiff/tif_strip.c: revert the change in TIFFNumberOfStrips() done -for http://bugzilla.maptools.org/show_bug.cgi?id=2587 / CVE-2016-9273 since -the above change is a better fix that makes it unnecessary. - -Fixes CVE-2016-10270 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_dirread.c | 22 ++++++++++------------ - libtiff/tif_strip.c | 9 --------- - 2 files changed, 25 insertions(+), 21 deletions(-) - -diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c -index 3eec79c9..570d0c32 100644 ---- a/libtiff/tif_dirread.c -+++ b/libtiff/tif_dirread.c -@@ -5502,8 +5502,7 @@ ChopUpSingleUncompressedStrip(TIFF* tif) - uint64 rowblockbytes; - uint64 stripbytes; - uint32 strip; -- uint64 nstrips64; -- uint32 nstrips32; -+ uint32 nstrips; - uint32 rowsperstrip; - uint64* newcounts; - uint64* newoffsets; -@@ -5534,18 +5533,17 @@ ChopUpSingleUncompressedStrip(TIFF* tif) - return; - - /* -- * never increase the number of strips in an image -+ * never increase the number of rows per strip - */ - if (rowsperstrip >= td->td_rowsperstrip) - return; -- nstrips64 = TIFFhowmany_64(bytecount, stripbytes); -- if ((nstrips64==0)||(nstrips64>0xFFFFFFFF)) /* something is wonky, do nothing. */ -- return; -- nstrips32 = (uint32)nstrips64; -+ nstrips = TIFFhowmany_32(td->td_imagelength, rowsperstrip); -+ if( nstrips == 0 ) -+ return; - -- newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), -+ newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), - "for chopped \"StripByteCounts\" array"); -- newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), -+ newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), - "for chopped \"StripOffsets\" array"); - if (newcounts == NULL || newoffsets == NULL) { - /* -@@ -5562,18 +5560,18 @@ ChopUpSingleUncompressedStrip(TIFF* tif) - * Fill the strip information arrays with new bytecounts and offsets - * that reflect the broken-up format. - */ -- for (strip = 0; strip < nstrips32; strip++) { -+ for (strip = 0; strip < nstrips; strip++) { - if (stripbytes > bytecount) - stripbytes = bytecount; - newcounts[strip] = stripbytes; -- newoffsets[strip] = offset; -+ newoffsets[strip] = stripbytes ? offset : 0; - offset += stripbytes; - bytecount -= stripbytes; - } - /* - * Replace old single strip info with multi-strip info. - */ -- td->td_stripsperimage = td->td_nstrips = nstrips32; -+ td->td_stripsperimage = td->td_nstrips = nstrips; - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); - - _TIFFfree(td->td_stripbytecount); -diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c -index 4c46ecf5..1676e47d 100644 ---- a/libtiff/tif_strip.c -+++ b/libtiff/tif_strip.c -@@ -63,15 +63,6 @@ TIFFNumberOfStrips(TIFF* tif) - TIFFDirectory *td = &tif->tif_dir; - uint32 nstrips; - -- /* If the value was already computed and store in td_nstrips, then return it, -- since ChopUpSingleUncompressedStrip might have altered and resized the -- since the td_stripbytecount and td_stripoffset arrays to the new value -- after the initial affectation of td_nstrips = TIFFNumberOfStrips() in -- tif_dirread.c ~line 3612. -- See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */ -- if( td->td_nstrips ) -- return td->td_nstrips; -- - nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 : - TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip)); - if (td->td_planarconfig == PLANARCONFIG_SEPARATE) --- -2.11.0 - diff --git a/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch b/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch deleted file mode 100644 index c93be89e7d..0000000000 --- a/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5c080298d59efa53264d7248bbe3a04660db6ef7 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 19:25:44 +0000 -Subject: [PATCH] * tools/tiffcp.c: error out cleanly in cpContig2SeparateByRow - and cpSeparate2ContigByRow if BitsPerSample != 8 to avoid heap based - overflow. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2656 and - http://bugzilla.maptools.org/show_bug.cgi?id=2657 - -Fixes CVE-2017-5225 - -Signed-off-by: Peter Korsgaard ---- - tools/tiffcp.c | 24 ++++++++++++++++++++++-- - 1 file changed, 29 insertions(+), 2 deletions(-) - -diff --git a/tools/tiffcp.c b/tools/tiffcp.c -index bdf754c3..8bbcd52f 100644 ---- a/tools/tiffcp.c -+++ b/tools/tiffcp.c -@@ -591,7 +591,7 @@ static copyFunc pickCopyFunc(TIFF*, TIFF*, uint16, uint16); - static int - tiffcp(TIFF* in, TIFF* out) - { -- uint16 bitspersample, samplesperpixel = 1; -+ uint16 bitspersample = 1, samplesperpixel = 1; - uint16 input_compression, input_photometric = PHOTOMETRIC_MINISBLACK; - copyFunc cf; - uint32 width, length; -@@ -1067,6 +1067,16 @@ DECLAREcpFunc(cpContig2SeparateByRow) - register uint32 n; - uint32 row; - tsample_t s; -+ uint16 bps = 0; -+ -+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); -+ if( bps != 8 ) -+ { -+ TIFFError(TIFFFileName(in), -+ "Error, can only handle BitsPerSample=8 in %s", -+ "cpContig2SeparateByRow"); -+ return 0; -+ } - - inbuf = _TIFFmalloc(scanlinesizein); - outbuf = _TIFFmalloc(scanlinesizeout); -@@ -1120,6 +1130,16 @@ DECLAREcpFunc(cpSeparate2ContigByRow) - register uint32 n; - uint32 row; - tsample_t s; -+ uint16 bps = 0; -+ -+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); -+ if( bps != 8 ) -+ { -+ TIFFError(TIFFFileName(in), -+ "Error, can only handle BitsPerSample=8 in %s", -+ "cpSeparate2ContigByRow"); -+ return 0; -+ } - - inbuf = _TIFFmalloc(scanlinesizein); - outbuf = _TIFFmalloc(scanlinesizeout); -@@ -1784,7 +1804,7 @@ pickCopyFunc(TIFF* in, TIFF* out, uint16 bitspersample, uint16 samplesperpixel) - uint32 w, l, tw, tl; - int bychunk; - -- (void) TIFFGetField(in, TIFFTAG_PLANARCONFIG, &shortv); -+ (void) TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &shortv); - if (shortv != config && bitspersample != 8 && samplesperpixel > 1) { - fprintf(stderr, - "%s: Cannot handle different planar configuration w/ bits/sample != 8\n", --- -2.11.0 - diff --git a/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch b/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch deleted file mode 100644 index b3d8a40bba..0000000000 --- a/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 48780b4fcc425cddc4ef8ffdf536f96a0d1b313b Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 16:38:26 +0000 -Subject: [PATCH] libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to - avoid UndefinedBehaviorSanitizer warning. - Patch by Nicolás Peña. - Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2658 - -Fixes CVE-2017-7592 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_getimage.c | 2 +- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c -index fed31f1f..2fa1775c 100644 ---- a/libtiff/tif_getimage.c -+++ b/libtiff/tif_getimage.c -@@ -1302,7 +1302,7 @@ DECLAREContigPutFunc(putagreytile) - while (h-- > 0) { - for (x = w; x-- > 0;) - { -- *cp++ = BWmap[*pp][0] & (*(pp+1) << 24 | ~A1); -+ *cp++ = BWmap[*pp][0] & ((uint32)*(pp+1) << 24 | ~A1); - pp += samplesperpixel; - } - cp += toskew; --- -2.11.0 - diff --git a/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch b/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch deleted file mode 100644 index ec45bbe1fc..0000000000 --- a/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d60332057b9575ada4f264489582b13e30137be1 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 19:02:49 +0000 -Subject: [PATCH] * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add - _TIFFcalloc() - -* libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero -initialize tif_rawdata. -Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651 - -Fixes CVE-2017-7593 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_read.c | 4 +++- - libtiff/tif_unix.c | 8 ++++++++ - libtiff/tif_win32.c | 8 ++++++++ - libtiff/tiffio.h | 1 + - 4 files changed, 36 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c -index 277fdd69..4535ccb3 100644 ---- a/libtiff/tif_read.c -+++ b/libtiff/tif_read.c -@@ -985,7 +985,9 @@ TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size) - "Invalid buffer size"); - return (0); - } -- tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize); -+ /* Initialize to zero to avoid uninitialized buffers in case of */ -+ /* short reads (http://bugzilla.maptools.org/show_bug.cgi?id=2651) */ -+ tif->tif_rawdata = (uint8*) _TIFFcalloc(1, tif->tif_rawdatasize); - tif->tif_flags |= TIFF_MYBUFFER; - } - if (tif->tif_rawdata == NULL) { -diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c -index 7c7bc961..89dd32e8 100644 ---- a/libtiff/tif_unix.c -+++ b/libtiff/tif_unix.c -@@ -316,6 +316,14 @@ _TIFFmalloc(tmsize_t s) - return (malloc((size_t) s)); - } - -+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) -+{ -+ if( nmemb == 0 || siz == 0 ) -+ return ((void *) NULL); -+ -+ return calloc((size_t) nmemb, (size_t)siz); -+} -+ - void - _TIFFfree(void* p) - { -diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c -index d730b3ab..3e9001b7 100644 ---- a/libtiff/tif_win32.c -+++ b/libtiff/tif_win32.c -@@ -360,6 +360,14 @@ _TIFFmalloc(tmsize_t s) - return (malloc((size_t) s)); - } - -+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) -+{ -+ if( nmemb == 0 || siz == 0 ) -+ return ((void *) NULL); -+ -+ return calloc((size_t) nmemb, (size_t)siz); -+} -+ - void - _TIFFfree(void* p) - { -diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h -index 732da17f..fbd9171f 100644 ---- a/libtiff/tiffio.h -+++ b/libtiff/tiffio.h -@@ -293,6 +293,7 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void); - */ - - extern void* _TIFFmalloc(tmsize_t s); -+extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz); - extern void* _TIFFrealloc(void* p, tmsize_t s); - extern void _TIFFmemset(void* p, int v, tmsize_t c); - extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c); --- -2.11.0 - diff --git a/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch b/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch deleted file mode 100644 index 418a3d6980..0000000000 --- a/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2ea32f7372b65c24b2816f11c04bf59b5090d05b Mon Sep 17 00:00:00 2001 -From: erouault -Date: Thu, 12 Jan 2017 19:23:20 +0000 -Subject: [PATCH] * libtiff/tif_ojpeg.c: fix leak in - OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and - OJPEGReadHeaderInfoSecTablesAcTable - -Fixes CVE-2017-7594 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_ojpeg.c | 6 ++++++ - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c -index b92f0ebd..5f6c684c 100644 ---- a/libtiff/tif_ojpeg.c -+++ b/libtiff/tif_ojpeg.c -@@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif) - TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET); - p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64); - if (p!=64) -+ { -+ _TIFFfree(ob); - return(0); -+ } - sp->qtable[m]=ob; - sp->sof_tq[m]=m; - } -@@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif) - rb[sizeof(uint32)+5+n]=o[n]; - p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); - if (p!=q) -+ { -+ _TIFFfree(rb); - return(0); -+ } - sp->dctable[m]=rb; - sp->sos_tda[m]=(m<<4); - } --- -2.11.0 - diff --git a/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch b/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch deleted file mode 100644 index a1aae2dced..0000000000 --- a/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8283e4d1b7e53340684d12932880cbcbaf23a8c1 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Thu, 12 Jan 2017 17:43:25 +0000 -Subject: [PATCH] libtiff/tif_ojpeg.c: fix leak in - OJPEGReadHeaderInfoSecTablesAcTable when read fails. - Patch by Nicolás Peña. - Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2659 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes CVE-2017-7594 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_ojpeg.c | 3 +++ - 1 file changed, 10 insertions(+) - -diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c -index f19e8fd0..b92f0ebd 100644 ---- a/libtiff/tif_ojpeg.c -+++ b/libtiff/tif_ojpeg.c -@@ -1918,7 +1918,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif) - rb[sizeof(uint32)+5+n]=o[n]; - p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); - if (p!=q) -+ { -+ _TIFFfree(rb); - return(0); -+ } - sp->actable[m]=rb; - sp->sos_tda[m]=(sp->sos_tda[m]|m); - } --- -2.11.0 - diff --git a/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch b/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch deleted file mode 100644 index 862aae2a5a..0000000000 --- a/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 47f2fb61a3a64667bce1a8398a8fcb1b348ff122 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 12:15:01 +0000 -Subject: [PATCH] * libtiff/tif_jpeg.c: avoid integer division by zero in - JPEGSetupEncode() when horizontal or vertical sampling is set to 0. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2653 - -Fixes CVE-2017-7595 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_jpeg.c | 7 +++++++ - 1 file changed, 13 insertions(+) - -diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c -index 38595f98..6c17c388 100644 ---- a/libtiff/tif_jpeg.c -+++ b/libtiff/tif_jpeg.c -@@ -1626,6 +1626,13 @@ JPEGSetupEncode(TIFF* tif) - case PHOTOMETRIC_YCBCR: - sp->h_sampling = td->td_ycbcrsubsampling[0]; - sp->v_sampling = td->td_ycbcrsubsampling[1]; -+ if( sp->h_sampling == 0 || sp->v_sampling == 0 ) -+ { -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "Invalig horizontal/vertical sampling value"); -+ return (0); -+ } -+ - /* - * A ReferenceBlackWhite field *must* be present since the - * default value is inappropriate for YCbCr. Fill in the --- -2.11.0 - diff --git a/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch b/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch deleted file mode 100644 index c0c94291a8..0000000000 --- a/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3cfd62d77c2a7e147a05bd678524c345fa9c2bb8 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 13:28:01 +0000 -Subject: [PATCH] * libtiff/tif_dirread.c: avoid division by floating point 0 - in TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(), - and return 0 in that case (instead of infinity as before presumably) - Apparently some sanitizers do not like those divisions by zero. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2644 - -Fixes CVE-2017-7598 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_dirread.c | 10 ++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c -index 570d0c32..8a1e42aa 100644 ---- a/libtiff/tif_dirread.c -+++ b/libtiff/tif_dirread.c -@@ -2872,7 +2872,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedRational(TIFF* tif, TIFFD - m.l = direntry->tdir_offset.toff_long8; - if (tif->tif_flags&TIFF_SWAB) - TIFFSwabArrayOfLong(m.i,2); -- if (m.i[0]==0) -+ /* Not completely sure what we should do when m.i[1]==0, but some */ -+ /* sanitizers do not like division by 0.0: */ -+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ -+ if (m.i[0]==0 || m.i[1]==0) - *value=0.0; - else - *value=(double)m.i[0]/(double)m.i[1]; -@@ -2900,7 +2903,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedSrational(TIFF* tif, TIFF - m.l=direntry->tdir_offset.toff_long8; - if (tif->tif_flags&TIFF_SWAB) - TIFFSwabArrayOfLong(m.i,2); -- if ((int32)m.i[0]==0) -+ /* Not completely sure what we should do when m.i[1]==0, but some */ -+ /* sanitizers do not like division by 0.0: */ -+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ -+ if ((int32)m.i[0]==0 || m.i[1]==0) - *value=0.0; - else - *value=(double)((int32)m.i[0])/(double)m.i[1]; --- -2.11.0 - diff --git a/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch b/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch deleted file mode 100644 index 4f46d9bb08..0000000000 --- a/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0a76a8c765c7b8327c59646284fa78c3c27e5490 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 16:13:50 +0000 -Subject: [PATCH] * libtiff/tif_jpeg.c: validate BitsPerSample in - JPEGSetupEncode() to avoid undefined behaviour caused by invalid shift - exponent. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648 - -Fixes CVE-2017-7601 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_jpeg.c | 7 +++++++ - 1 file changed, 13 insertions(+) - -diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c -index 6c17c388..192989a9 100644 ---- a/libtiff/tif_jpeg.c -+++ b/libtiff/tif_jpeg.c -@@ -1632,6 +1632,13 @@ JPEGSetupEncode(TIFF* tif) - "Invalig horizontal/vertical sampling value"); - return (0); - } -+ if( td->td_bitspersample > 16 ) -+ { -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "BitsPerSample %d not allowed for JPEG", -+ td->td_bitspersample); -+ return (0); -+ } - - /* - * A ReferenceBlackWhite field *must* be present since the --- -2.11.0 - diff --git a/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch b/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch deleted file mode 100644 index d049b130cb..0000000000 --- a/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 66e7bd59520996740e4df5495a830b42fae48bc4 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 16:33:34 +0000 -Subject: [PATCH] * libtiff/tif_read.c: avoid potential undefined behaviour on - signed integer addition in TIFFReadRawStrip1() in isMapped() case. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2650 - -Fixes CVE-2017-7602 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_read.c | 27 ++++++++++++++++++--------- - 1 file changed, 24 insertions(+), 9 deletions(-) - -diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c -index 52bbf507..b7aacbda 100644 ---- a/libtiff/tif_read.c -+++ b/libtiff/tif_read.c -@@ -420,16 +420,25 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size, - return ((tmsize_t)(-1)); - } - } else { -- tmsize_t ma,mb; -+ tmsize_t ma; - tmsize_t n; -- ma=(tmsize_t)td->td_stripoffset[strip]; -- mb=ma+size; -- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size)) -- n=0; -- else if ((mbtif->tif_size)) -- n=tif->tif_size-ma; -- else -- n=size; -+ if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)|| -+ ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size)) -+ { -+ n=0; -+ } -+ else if( ma > TIFF_TMSIZE_T_MAX - size ) -+ { -+ n=0; -+ } -+ else -+ { -+ tmsize_t mb=ma+size; -+ if (mb>tif->tif_size) -+ n=tif->tif_size-ma; -+ else -+ n=size; -+ } - if (n!=size) { - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) - TIFFErrorExt(tif->tif_clientdata, module, --- -2.11.0 - diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 4439a35f39..516cb06266 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019 tiff-4.0.7.tar.gz +sha256 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910 tiff-4.0.8.tar.gz diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index e5b01db88a..405cb9251f 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.0.7 +TIFF_VERSION = 4.0.8 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = COPYRIGHT diff --git a/package/tinyalsa/0001-disable-doxygen-usage.patch b/package/tinyalsa/0001-disable-doxygen-usage.patch index 9c867a8fec..ed939fb9bf 100644 --- a/package/tinyalsa/0001-disable-doxygen-usage.patch +++ b/package/tinyalsa/0001-disable-doxygen-usage.patch @@ -4,29 +4,32 @@ In order to avoid a dependency on doxygen on the build machine, this patch adjusts the main Makefile to not build and install the documentation. -Signed-off-by: Thomas Petazzoni +[Vincent: tweak patch for 1.1.1 version] -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -13,13 +13,11 @@ +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/Makefile b/Makefile +--- a/Makefile 2017-05-24 05:23:57.000000000 +0100 ++++ b/Makefile 2017-05-25 10:35:20.781747053 +0100 +@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man all: $(MAKE) -C src $(MAKE) -C utils - $(MAKE) -C doxygen + $(MAKE) -C examples .PHONY: clean clean: $(MAKE) -C src clean $(MAKE) -C utils clean - $(MAKE) -C doxygen clean + $(MAKE) -C examples clean .PHONY: install - install: -@@ -27,5 +25,3 @@ - cp -Ru include/tinyalsa $(DESTDIR)$(INCDIR)/ +@@ -30,5 +28,4 @@ install: + install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/ $(MAKE) -C src install $(MAKE) -C utils install - $(MAKE) -C doxygen install -- + diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash index b6bea47eba..f9be664ca4 100644 --- a/package/tinyalsa/tinyalsa.hash +++ b/package/tinyalsa/tinyalsa.hash @@ -1,2 +1,2 @@ # locally computed -sha256 93f4ca1e6345974167dc5577e8151a31fa2e6a628727a72d59e18db2289e7a1c tinyalsa-1.1.0.tar.gz +sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index 064dfd0a8d..bd9d9a00d0 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYALSA_VERSION = 1.1.0 +TINYALSA_VERSION = 1.1.1 TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE diff --git a/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch b/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch deleted file mode 100644 index bddc2c720d..0000000000 --- a/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9b18a98614a9f201b0883c2b15e7c7bde0aa0ff2 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 5 Feb 2017 17:12:00 +0100 -Subject: [PATCH] compat: don't re-define program_invocation_short_name - -program_invocation_short_name is defined in errno.h, and its definition -can differ between the various C libraries: glibc defines it as: - extern char *program_invocation_short_name; - -while uClibc defines it as: - extern const char *program_invocation_short_name; - -So there is not simple solution to know the prototype. - -But since it is defined in errno.h, there is no reason to try and define -it ourselves; let's just trust what the header provides. - -Signed-off-by: "Yann E. MORIN" ---- - compat/getprogname.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/compat/getprogname.c b/compat/getprogname.c -index 80a496d..ad619fc 100644 ---- a/compat/getprogname.c -+++ b/compat/getprogname.c -@@ -19,11 +19,10 @@ - #include "compat.h" - - #if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME) -+#include - const char * - getprogname(void) - { -- extern char *program_invocation_short_name; -- - return (program_invocation_short_name); - } - #elif defined(HAVE___PROGNAME) --- -2.7.4 - diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 9195a1689c..ac42571fdf 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b tmux-2.3.tar.gz +sha256 757d6b13231d0d9dd48404968fc114ac09e005d475705ad0cd4b7166f799b349 tmux-2.4.tar.gz diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index f6dd1a9cc6..6636b9b5ff 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,7 +4,7 @@ # ################################################################################ -TMUX_VERSION = 2.3 +TMUX_VERSION = 2.4 TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = README diff --git a/package/tor/tor.hash b/package/tor/tor.hash index d14db040e7..bfdf055f4c 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d611283e1fb284b5f884f8c07e7d3151016851848304f56cfdf3be2a88bd1341 tor-0.2.9.10.tar.gz +sha256 9640c4448ef3cad7237c68ed6984e705db8fb2b9d6bb74c8815d01bb06527d02 tor-0.3.0.7.tar.gz diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 389af66562..305f6bf40e 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.2.9.10 +TOR_VERSION = 0.3.0.7 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE diff --git a/package/tremor/Config.in b/package/tremor/Config.in index 1a478c47a0..ec7b8f8c00 100644 --- a/package/tremor/Config.in +++ b/package/tremor/Config.in @@ -6,3 +6,5 @@ config BR2_PACKAGE_TREMOR decoder. It provides a decoding API similar to libvorbis, but gives much better performance on systems without a floating-point unit. + + https://wiki.xiph.org/Tremor diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index e8e72c8cf5..1eeafd0db7 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,2 +1,2 @@ -# https://github.com/kergoth/tslib/releases/download/1.9/tslib-1.9.tar.xz.sha256 -sha256 af4e40a4cf2aa7a81f1602de1613190a101760689709103cc3590132266ac7b8 tslib-1.9.tar.xz +# https://github.com/kergoth/tslib/releases/download/1.10/tslib-1.10.tar.xz.sha256 +sha256 26ce1df4647dc8d16f6247062f30a8a03c34165dd19e042d0b2df8860da265b2 tslib-1.10.tar.xz diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 27d960dd24..9d7b926f22 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.9 +TSLIB_VERSION = 1.10 TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL, LGPL diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index cfd9c01bd6..3154b3276e 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 94efc13b6c80c204dc4e3cf2ac79632f3c2cafe9cad4ee8948a71be6e4569a16 tvheadend-5cbaac172b4997fbf89667d79ac6e03b46460060.tar.gz +sha256 1994e379c798b118243e70f7fa38064a9b288d6e38b9ced0e8ad465f5d2e8fd9 tvheadend-54e63e3f9af8fdc0d23f61f3cda7fa7b246c1732.tar.gz diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 5ac44daf81..d66c0a6b30 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 5cbaac172b4997fbf89667d79ac6e03b46460060 +TVHEADEND_VERSION = 54e63e3f9af8fdc0d23f61f3cda7fa7b246c1732 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md @@ -57,6 +57,13 @@ TVHEADEND_DEPENDENCIES += liburiparser TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE) endif +ifeq ($(BR2_PACKAGE_PCRE),y) +TVHEADEND_DEPENDENCIES += pcre +TVHEADEND_CONF_OPTS += --enable-pcre +else +TVHEADEND_CONF_OPTS += --disable-pcre +endif + TVHEADEND_DEPENDENCIES += dtv-scan-tables # The tvheadend build system expects the transponder data to be present inside diff --git a/package/uboot-tools/0001-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch deleted file mode 100644 index fbc96084db..0000000000 --- a/package/uboot-tools/0001-drop-configh-from-tools.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b742c7590ac6d9ac72dd227679ccff79433b3512 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 4 Aug 2015 22:13:20 +0200 -Subject: [PATCH] drop configh from tools -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need to build u-boot tools without a board configuration for the target. -fw_env just uses config.h to define the default environment of the created -image, so it really isn't mandatory. - -Signed-off-by: Gustavo Zacarias -[Jörg Krause: update for version 2015.07] -Signed-off-by: Jörg Krause ---- - tools/env/fw_env.h | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h -index 57149e7..50049fe 100644 ---- a/tools/env/fw_env.h -+++ b/tools/env/fw_env.h -@@ -8,17 +8,6 @@ - #include - #include - --/* Pull in the current config to define the default environment */ --#include -- --#ifndef __ASSEMBLY__ --#define __ASSEMBLY__ /* get only #defines from config.h */ --#include --#undef __ASSEMBLY__ --#else --#include --#endif -- - /* - * To build the utility with the static configuration - * comment out the next line. --- -2.7.4 - diff --git a/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch b/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch deleted file mode 100644 index ae01b33708..0000000000 --- a/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7807af13118eff3ac291bbaaf2159c7a441c0902 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 16 Mar 2017 11:21:58 -0700 -Subject: [PATCH] Pass empty CFLAGS on invocation of libfdt/setup.py - -When building u-boot tools in cross-build environment CFLAGS environment -variable set up for target is taken into an account when building code -for host. Make it empty on invocation of python. - -This fixes the following build errors when cross-compiling for xtensa: - - cc1: error: unrecognized command line option "-mlongcalls" - cc1: error: unrecognized command line option "-mauto-litpools" - -Signed-off-by: Max Filippov -Reviewed-by: Simon Glass ---- - tools/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index 1c840d7..f3de657 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -120,7 +120,7 @@ _libfdt.so-sharedobjs += $(LIBFDT_OBJS) - libfdt: - - tools/_libfdt.so: $(patsubst %.o,%.c,$(LIBFDT_OBJS)) tools/libfdt_wrap.c -- LDFLAGS="$(HOSTLDFLAGS)" python $(srctree)/lib/libfdt/setup.py \ -+ LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= python $(srctree)/lib/libfdt/setup.py \ - "$(_hostc_flags)" $^ - mv _libfdt.so $@ - --- -2.1.4 - diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 9606d9f41e..e11d92ff15 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f u-boot-2017.03.tar.bz2 +sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 352f53d690..f6b1fc31fc 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2017.03 +UBOOT_TOOLS_VERSION = 2017.05 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ diff --git a/package/uclibc/0001-sync-features.h-with-GNU-C-library-fixes-gcc-7.1-too.patch b/package/uclibc/0001-sync-features.h-with-GNU-C-library-fixes-gcc-7.1-too.patch new file mode 100644 index 0000000000..eb1459be81 --- /dev/null +++ b/package/uclibc/0001-sync-features.h-with-GNU-C-library-fixes-gcc-7.1-too.patch @@ -0,0 +1,64 @@ +From 5b0f49037e8ea8500b05c8f31ee88529ccac4cee Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sun, 7 May 2017 16:28:14 +0200 +Subject: [PATCH] sync features.h with GNU C library, fixes gcc 7.1 toolchain + creation + +[Romain: backport to uClibc-ng 1.0.24] +Signed-off-by: Romain Naour +--- + include/features.h | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/include/features.h b/include/features.h +index e76bbba..f982079 100644 +--- a/include/features.h ++++ b/include/features.h +@@ -55,6 +55,7 @@ + These are defined by this file and are used by the + header files to decide what to declare or define: + ++ __USE_ISOC11 Define ISO C11 things. + __USE_ISOC99 Define ISO C99 things. + __USE_ISOC95 Define ISO C90 AMD1 (C95) things. + __USE_POSIX Define IEEE Std 1003.1 things. +@@ -91,6 +92,7 @@ + + + /* Undefine everything, so we get a clean slate. */ ++#undef __USE_ISOC11 + #undef __USE_ISOC99 + #undef __USE_ISOC95 + #undef __USE_POSIX +@@ -151,6 +153,8 @@ + #ifdef _GNU_SOURCE + # undef _ISOC99_SOURCE + # define _ISOC99_SOURCE 1 ++# undef _ISOC11_SOURCE ++# define _ISOC11_SOURCE 1 + # undef _POSIX_SOURCE + # define _POSIX_SOURCE 1 + # undef _POSIX_C_SOURCE +@@ -223,11 +227,14 @@ + # define _SVID_SOURCE 1 + #endif + +-/* This is to enable the ISO C99 extension. Also recognize the old macro +- which was used prior to the standard acceptance. This macro will +- eventually go away and the features enabled by default once the ISO C99 +- standard is widely adopted. */ +-#if (defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE \ ++/* This is to enable the ISO C11 extension. */ ++#if (defined _ISOC11_SOURCE \ ++ || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L)) ++# define __USE_ISOC11 1 ++#endif ++ ++/* This is to enable the ISO C99 extension. */ ++#if (defined _ISOC99_SOURCE || defined _ISOC11_SOURCE \ + || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)) + # define __USE_ISOC99 1 + #endif +-- +2.9.3 + diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index bbf389e327..a5a20ea51f 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -119,12 +119,6 @@ define UCLIBC_ARM_ABI_CONFIG $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config) endef -# Thumb1 build is broken with threads with old gcc versions (< 4.8). Since -# all cores supporting Thumb1 also support ARM, we use ARM code in this case. -ifeq ($(BR2_GCC_VERSION_4_8_X)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yyy) -UCLIBC_EXTRA_CFLAGS += -marm -endif - ifeq ($(BR2_BINFMT_FLAT),y) define UCLIBC_ARM_BINFMT_FLAT $(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config) diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index bcd78318cf..b192d0e18d 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,2 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.12.tar.gz.sha256: -sha256 20d97c2e5ff6911e1e1538edb1487823479802cba6bd4f4c4a74035edf61cb26 upmpdcli-1.2.12.tar.gz +# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.14.tar.gz.sha256: +sha256 fbfb392deec0b353704f8067d9863535dc2512f719d3305dbd73452ca59ec2fe upmpdcli-1.2.14.tar.gz diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index eabc04a21b..cc9f6528fe 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.2.12 +UPMPDCLI_VERSION = 1.2.14 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPL-2.0+ UPMPDCLI_LICENSE_FILES = COPYING diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index edbcd3fccd..2ced98d967 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,4 +1,4 @@ -# From https://www.linuxtv.org/pipermail/vdr/2016-December/029178.html -md5 6dbb208ea3d59658a18912b49af175b3 vdr-2.3.2.tar.bz2 +# From https://www.linuxtv.org/pipermail/vdr/2017-May/029263.html +md5 01fabef4d20ec01f11d53354d99a9642 vdr-2.3.5.tar.bz2 # Locally computed -sha256 6c6ab08cf4dadd296e5e4a1c13f793c2e9222ec23103ae7aa9d616619f1496c0 vdr-2.3.2.tar.bz2 +sha256 323fd01e4f8daef24bbdcb906023d18c998a204a22de110d1cb0089532e818b5 vdr-2.3.5.tar.bz2 diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 24467f79dc..6c4656624e 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.3.2 +VDR_VERSION = 2.3.5 VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2 VDR_SITE = ftp://ftp.tvdr.de/vdr/Developer VDR_LICENSE = GPL-2.0+ diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index 0f1b6dccd7..628dad74d9 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,6 +1,2 @@ -# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.md5 -md5 7ab63964ffec4c92a54deb018f23318b vlc-2.2.5.1.tar.xz -# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.sha1 -sha1 042962dba68e1414aa563883b0172ee121cf9555 vlc-2.2.5.1.tar.xz -# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.sha256 -sha256 b28b8a28f578c0c6cb1ebed293aca2a3cd368906cf777d1ab599e2784ddda1cc vlc-2.2.5.1.tar.xz +# From http://download.videolan.org/pub/videolan/vlc/2.2.6/vlc-2.2.6.tar.xz.sha256 +sha256 c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 vlc-2.2.6.tar.xz diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 3799acae86..49390a2856 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 2.2.5.1 +VLC_VERSION = 2.2.6 VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ diff --git a/package/wine/wine.hash b/package/wine/wine.hash index b4b67cd907..3490c7e542 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 wine-2.0.tar.bz2 +sha256 6cfb4eaae566dc7afb7ac0f1f2db2c0d69969952acab0debf084ee8f7b071583 wine-2.0.1.tar.xz diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 5c47186c78..68ebd4894a 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,8 +4,8 @@ # ################################################################################ -WINE_VERSION = 2.0 -WINE_SOURCE = wine-$(WINE_VERSION).tar.bz2 +WINE_VERSION = 2.0.1 +WINE_SOURCE = wine-$(WINE_VERSION).tar.xz WINE_SITE = https://dl.winehq.org/wine/source/2.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index bc85caa6ed..4d0b5feed9 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,2 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-November/002653.html -sha256 0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d xkbcomp-1.3.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-May/002797.html +md5 cc22b232bc78a303371983e1b48794ab xkbcomp-1.4.0.tar.bz2 +sha1 9578a564ff8fcf96581fb52860828fbab8c67b4f xkbcomp-1.4.0.tar.bz2 +sha256 bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b xkbcomp-1.4.0.tar.bz2 +sha512 c96a63fc2d9a6ac17123297574966c45d0dcfd4ae3d4073ce863c7738d453f4c0a5f7a87c06efdec19f0b270207a7170fe1aa72a73ef1b50f95c7ca262f4882e xkbcomp-1.4.0.tar.bz2 diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index 4fc4372fef..cc88561892 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.3.1 +XAPP_XKBCOMP_VERSION = 1.4.0 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index 36d16c21db..48283082d3 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-March/002782.html -md5 bd64be831914eda924f7166243c34968 xf86-input-libinput-0.25.0.tar.bz2 -sha1 e43fd18bc32b892fb203f842186ad0d6c675b696 xf86-input-libinput-0.25.0.tar.bz2 -sha256 bb7fd1658fa7e6c757fd55480aa8a07f8ccfb0a80ae42c29dbc67d57958c556f xf86-input-libinput-0.25.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-May/002798.html +md5 14003139614b25cc76c9a4cad059df89 xf86-input-libinput-0.25.1.tar.bz2 +sha1 00494b7566c0c5cbcb8d81655b967f42f7a40ef0 xf86-input-libinput-0.25.1.tar.bz2 +sha256 489f7d591c9ef08463d4966e61f7c6ea433f5fcbb9f5370fb621da639a84c7e0 xf86-input-libinput-0.25.1.tar.bz2 +sha512 9a8d16bdffb73a5318d22e352826c410ccb6f8c7ade31c23823bd6c17202bb67e917dfe8d4cab6e54fdf15f201d14d80b6306cedc5f93f66989edfcab5082ece xf86-input-libinput-0.25.1.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 16ab7ce17a..4e3976135d 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.25.0 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.25.1 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT diff --git a/package/xenomai/0001-arm-enable-armv5tej-support.patch b/package/xenomai/0001-arm-enable-armv5tej-support.patch deleted file mode 100644 index 5feaa59e89..0000000000 --- a/package/xenomai/0001-arm-enable-armv5tej-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fcd06f42fef4d52bb0d9772fa71015988c828b1b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 31 Mar 2017 21:10:23 +0200 -Subject: [PATCH] arm: enable armv5tej support - -armv5tej are not detected in lib/cobalt/arch/arm/include/asm/xenomai/features.h - -Apply the same patch from xenomai-2.6: -https://git.xenomai.org/xenomai-2.6.git/commit/?id=ebc2779baa222db4a5936c3d3022803355585b8c - -Signed-off-by: Romain Naour ---- - lib/cobalt/arch/arm/include/asm/xenomai/features.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/cobalt/arch/arm/include/asm/xenomai/features.h b/lib/cobalt/arch/arm/include/asm/xenomai/features.h -index 10bd0c7..e84b809 100644 ---- a/lib/cobalt/arch/arm/include/asm/xenomai/features.h -+++ b/lib/cobalt/arch/arm/include/asm/xenomai/features.h -@@ -34,7 +34,8 @@ - #endif /* armv4 */ - - #if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \ -- || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) -+ || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \ -+ || defined(__ARM_ARCH_5TEJ__) - #define __LINUX_ARM_ARCH__ 5 - #endif /* armv5 */ - --- -2.9.3 - diff --git a/package/xenomai/0002-boilerplate-build-obstack-support-conditionally.patch b/package/xenomai/0002-boilerplate-build-obstack-support-conditionally.patch deleted file mode 100644 index 1c61aa1785..0000000000 --- a/package/xenomai/0002-boilerplate-build-obstack-support-conditionally.patch +++ /dev/null @@ -1,283 +0,0 @@ -From 4c593544d2ff39ba6631cc3fa0b91493973674d4 Mon Sep 17 00:00:00 2001 -From: Philippe Gerum -Date: Fri, 14 Apr 2017 18:28:36 +0200 -Subject: [PATCH] boilerplate: build obstack support conditionally - -If the underlying *libc does not support obstacks, build a private -implementation, otherwise fully rely on the native support. - -This fixes a long-standing issue building replacement code for the -native obstack support, which ended up breaking builds over uClibc -1.0.21 and later. See https://patchwork.ozlabs.org/patch/745792/. - -[Backport from upstream.] -Signed-off-by: Romain Naour ---- - configure.ac | 4 ++ - include/boilerplate/obstack.h | 12 +++-- - lib/boilerplate/Makefile.am | 5 +- - lib/boilerplate/obstack.c | 111 +++++++----------------------------------- - 4 files changed, 34 insertions(+), 98 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8222e1d..fbfb60f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -495,6 +495,10 @@ fi - - test x$CONFIG_XENO_VALGRIND_API = xy && AC_DEFINE(CONFIG_XENO_VALGRIND_API,1,[config]) - -+dnl Check for obstack support in *libc -+AC_CHECK_HEADERS(obstack.h,libc_has_obstack=y) -+AM_CONDITIONAL(XENO_PRIVATE_OBSTACK,[test x$libc_has_obstack = x]) -+ - dnl Check for presence of some headers - AC_CHECK_HEADERS(mqueue.h) - -diff --git a/include/boilerplate/obstack.h b/include/boilerplate/obstack.h -index 206fe55..95eb792 100644 ---- a/include/boilerplate/obstack.h -+++ b/include/boilerplate/obstack.h -@@ -103,8 +103,12 @@ Summary: - - /* Don't do the contents of this file more than once. */ - --#ifndef _OBSTACK_H --#define _OBSTACK_H 1 -+#ifndef _BOILERPLATE_OBSTACK_H -+#define _BOILERPLATE_OBSTACK_H 1 -+ -+#ifdef HAVE_OBSTACK_H -+#include_next -+#else - - #ifdef __cplusplus - extern "C" { -@@ -506,4 +510,6 @@ __extension__ \ - } /* C++ */ - #endif - --#endif /* obstack.h */ -+#endif /* !HAVE_OBSTACK_H */ -+ -+#endif /* _BOILERPLATE_OBSTACK_H */ -diff --git a/lib/boilerplate/Makefile.am b/lib/boilerplate/Makefile.am -index 9b8612d..d7e6324 100644 ---- a/lib/boilerplate/Makefile.am -+++ b/lib/boilerplate/Makefile.am -@@ -6,10 +6,13 @@ libboilerplate_la_LIBADD = libversion.la libiniparser.la - libboilerplate_la_SOURCES = \ - ancillaries.c \ - hash.c \ -- obstack.c \ - setup.c \ - time.c - -+if XENO_PRIVATE_OBSTACK -+libboilerplate_la_SOURCES += obstack.c -+endif -+ - if XENO_DEBUG - libboilerplate_la_SOURCES += debug.c - endif -diff --git a/lib/boilerplate/obstack.c b/lib/boilerplate/obstack.c -index 4c645b2..fab62ce 100644 ---- a/lib/boilerplate/obstack.c -+++ b/lib/boilerplate/obstack.c -@@ -22,39 +22,11 @@ - #include - #include - --/* NOTE BEFORE MODIFYING THIS FILE: This version number must be -- incremented whenever callers compiled using an old obstack.h can no -- longer properly call the functions in this obstack.c. */ --#define OBSTACK_INTERFACE_VERSION 1 -- --/* Comment out all this code if we are using the GNU C Library, and are not -- actually compiling the library itself, and the installed library -- supports the same library interface we do. This code is part of the GNU -- C Library, but also included in many other GNU distributions. Compiling -- and linking in this code is a waste when using the GNU C library -- (especially if it is a shared library). Rather than having every GNU -- program understand `configure --with-gnu-libc' and omit the object -- files, it is simpler to just do this in the source for each such file. */ -- --#include /* Random thing to get __GNU_LIBRARY__. */ --#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 --# include --# if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION --# define ELIDE_CODE --# endif --#endif -+/* Use this obstack implementation unconditionally. */ - -+#include - #include -- --#ifndef ELIDE_CODE -- -- --# if HAVE_INTTYPES_H --# include --# endif --# if HAVE_STDINT_H || defined _LIBC --# include --# endif -+#include - - /* Determine default alignment. */ - union fooround -@@ -97,22 +69,7 @@ void (*obstack_alloc_failed_handler) (void) = print_and_abort; - - /* Exit value used when `print_and_abort' is used. */ - # include --# ifdef _LIBC - int obstack_exit_failure = EXIT_FAILURE; --# else --# include "exitfail.h" --# define obstack_exit_failure exit_failure --# endif -- --# ifdef _LIBC --# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) --/* A looong time ago (before 1994, anyway; we're not sure) this global variable -- was used by non-GNU-C macros to avoid multiple evaluation. The GNU C -- library still exports it because somebody might use it. */ --struct obstack *_obstack_compat; --compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0); --# endif --# endif - - /* Define a macro that either calls functions with the traditional malloc/free - calling interface, or calls functions with the mmalloc/mfree interface -@@ -148,7 +105,7 @@ _obstack_begin (struct obstack *h, - void *(*chunkfun) (long), - void (*freefun) (void *)) - { -- register struct _obstack_chunk *chunk; /* points to new chunk */ -+ struct _obstack_chunk *chunk; /* points to new chunk */ - - if (alignment == 0) - alignment = DEFAULT_ALIGNMENT; -@@ -195,7 +152,7 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment, - void (*freefun) (void *, void *), - void *arg) - { -- register struct _obstack_chunk *chunk; /* points to new chunk */ -+ struct _obstack_chunk *chunk; /* points to new chunk */ - - if (alignment == 0) - alignment = DEFAULT_ALIGNMENT; -@@ -246,11 +203,11 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment, - void - _obstack_newchunk (struct obstack *h, int length) - { -- register struct _obstack_chunk *old_chunk = h->chunk; -- register struct _obstack_chunk *new_chunk; -- register long new_size; -- register long obj_size = h->next_free - h->object_base; -- register long i; -+ struct _obstack_chunk *old_chunk = h->chunk; -+ struct _obstack_chunk *new_chunk; -+ long new_size; -+ long obj_size = h->next_free - h->object_base; -+ long i; - long already; - char *object_base; - -@@ -308,9 +265,6 @@ _obstack_newchunk (struct obstack *h, int length) - /* The new chunk certainly contains no empty object yet. */ - h->maybe_empty_object = 0; - } --# ifdef _LIBC --libc_hidden_def (_obstack_newchunk) --# endif - - /* Return nonzero if object OBJ has been allocated from obstack H. - This is here for debugging. -@@ -323,8 +277,8 @@ int _obstack_allocated_p (struct obstack *h, void *obj); - int - _obstack_allocated_p (struct obstack *h, void *obj) - { -- register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ -- register struct _obstack_chunk *plp; /* point to previous chunk if any */ -+ struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ -+ struct _obstack_chunk *plp; /* point to previous chunk if any */ - - lp = (h)->chunk; - /* We use >= rather than > since the object cannot be exactly at -@@ -346,8 +300,8 @@ _obstack_allocated_p (struct obstack *h, void *obj) - void - obstack_free (struct obstack *h, void *obj) - { -- register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ -- register struct _obstack_chunk *plp; /* point to previous chunk if any */ -+ struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ -+ struct _obstack_chunk *plp; /* point to previous chunk if any */ - - lp = h->chunk; - /* We use >= because there cannot be an object at the beginning of a chunk. -@@ -373,17 +327,12 @@ obstack_free (struct obstack *h, void *obj) - abort (); - } - --# ifdef _LIBC --/* Older versions of libc used a function _obstack_free intended to be -- called by non-GCC compilers. */ --strong_alias (obstack_free, _obstack_free) --# endif - - int - _obstack_memory_used (struct obstack *h) - { -- register struct _obstack_chunk* lp; -- register int nbytes = 0; -+ struct _obstack_chunk* lp; -+ int nbytes = 0; - - for (lp = h->chunk; lp != 0; lp = lp->prev) - { -@@ -393,26 +342,6 @@ _obstack_memory_used (struct obstack *h) - } - - /* Define the error handler. */ --# ifdef _LIBC --# include --# else --# include "gettext.h" --# endif --# ifndef _ --# define _(msgid) gettext (msgid) --# endif -- --# ifdef _LIBC --# include --# endif -- --# ifndef __attribute__ --/* This feature is available in gcc versions 2.5 and later. */ --# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) --# define __attribute__(Spec) /* empty */ --# endif --# endif -- - static void - __attribute__ ((noreturn)) - print_and_abort (void) -@@ -422,12 +351,6 @@ print_and_abort (void) - happen because the "memory exhausted" message appears in other places - like this and the translation should be reused instead of creating - a very similar string which requires a separate translation. */ --# ifdef _LIBC -- (void) __fxprintf (NULL, "%s\n", _("memory exhausted")); --# else -- fprintf (stderr, "%s\n", _("memory exhausted")); --# endif -+ fprintf (stderr, "memory exhausted\n"); - exit (obstack_exit_failure); - } -- --#endif /* !ELIDE_CODE */ --- -2.9.3 - diff --git a/package/xenomai/xenomai.hash b/package/xenomai/xenomai.hash index a6c43edfc5..1290ca54fb 100644 --- a/package/xenomai/xenomai.hash +++ b/package/xenomai/xenomai.hash @@ -1,2 +1,2 @@ # Locally computed; -sha256 8a03e150d80ebf5935f97804881095d2d5d7509de22f7b8791776688a29d7110 xenomai-3.0.4.tar.bz2 +sha256 84836a43b6a996dcdcb42b0b1653a3271cc201df2a2d42c1b4b3bafb2cca7c63 xenomai-3.0.5.tar.bz2 diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index fa46819592..c53d5148f0 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -6,7 +6,7 @@ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) ifeq ($(XENOMAI_VERSION),) -XENOMAI_VERSION = 3.0.4 +XENOMAI_VERSION = 3.0.5 else BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif diff --git a/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch b/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch deleted file mode 100644 index 36896b5b95..0000000000 --- a/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b981adb6769f6b7d80f6c98627391398a007a25b Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 15 Dec 2015 20:51:35 -0300 -Subject: [PATCH] xfsprogs: don't use CFLAGS with BUILD_CC - -When cross-compiling CFLAGS might not be suitable for the host -(BUILD_CC) compiler since it might contain arch-specific options. - -Signed-off-by: Gustavo Zacarias ---- - libxfs/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libxfs/Makefile b/libxfs/Makefile -index e021625..ad76a04 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -118,7 +118,7 @@ default: ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c - @echo " [CC] gen_crc32table" -- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $< -+ $(Q) $(BUILD_CC) -o gen_crc32table $< - @echo " [GENERATE] $@" - $(Q) ./gen_crc32table > crc32table.h - -@@ -129,7 +129,7 @@ crc32table.h: gen_crc32table.c - # disk. - crc32selftest: gen_crc32table.c crc32table.h crc32.c - @echo " [TEST] CRC32" -- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ -+ $(Q) $(BUILD_CC) -D CRC32_SELFTEST=1 crc32.c -o $@ - $(Q) ./$@ - - # set up include/xfs header directory --- -2.7.4 - diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index e990b78d77..edb2933c36 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,3 +1,2 @@ -# Locally calculated after checking pgp signature: -# https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.8.0.tar.sign -sha256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 xfsprogs-4.8.0.tar.xz +# From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc +sha256 c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 xfsprogs-4.11.0.tar.xz diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index c110733c83..ed56d3484e 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 4.8.0 +XFSPROGS_VERSION = 4.11.0 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index 7e7a07e3e3..48bc2b1eb2 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd xscreensaver-5.32.tar.gz +sha256 6b8b5238047f1613d99149bb02d5ed3384675f3ce74a0a8ba25290bd61abc06c xscreensaver-5.36.tar.gz diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index a726bee50b..77c37a9e98 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,8 +4,8 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.32 -XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver +XSCREENSAVER_VERSION = 5.36 +XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+ diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 76c0e7cdcf..d670f44747 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -320,10 +320,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_6 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_5 +config BR2_TOOLCHAIN_GCC_AT_LEAST_7 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7 default "6" if BR2_TOOLCHAIN_GCC_AT_LEAST_6 default "5" if BR2_TOOLCHAIN_GCC_AT_LEAST_5 default "4.9" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index ba5b97702a..d1b76c32ac 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -23,6 +23,10 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_7 + bool "7.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_7 + config BR2_TOOLCHAIN_EXTERNAL_GCC_6 bool "6.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_6