diff --git a/Config.in.legacy b/Config.in.legacy index 49f63fd14c..522102a0c0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,16 @@ endif ############################################################################### +comment "Legacy options removed in 2023.02" + +config BR2_PACKAGE_USBREDIR_SERVER + bool "usbredirserver removed" + select BR2_LEGACY + help + usbredirserver has been dropped by upstream since version + 0.13.0. usbredir tools (which include usbredirect binary) can + be used as a replacement. + comment "Legacy options removed in 2022.11" config BR2_PACKAGE_RABBITMQ_SERVER diff --git a/DEVELOPERS b/DEVELOPERS index 7b5eda1615..20677ef8ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -519,6 +519,9 @@ F: package/alsa-plugins/ N: Changming Huang F: package/qoriq-cadence-dp-firmware/ +N: Chris Dimich +F: package/freescale-imx/imx-vpu-hantro-daemon/ + N: Chris Packham F: package/coremark/ F: package/coremark-pro/ @@ -681,6 +684,7 @@ F: package/luaexpat/ F: package/xinetd/ N: Dario Binacchi +F: package/sscep/ F: package/uuu/ N: Dario Binacchi @@ -1394,6 +1398,7 @@ F: package/rtl8192eu/ F: package/serd/ F: package/sord/ F: package/sratom/ +F: package/stb/ F: package/zchunk/ F: support/testing/tests/package/sample_python_rtoml.py F: support/testing/tests/package/test_python_rtoml.py @@ -1672,6 +1677,7 @@ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ F: package/tinycompress/ +F: package/z3/ F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py @@ -1683,6 +1689,7 @@ F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_z3.py N: Julien Viard de Galbert F: package/dieharder/ @@ -2144,14 +2151,17 @@ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ N: Neal Frager +F: board/versal/ F: board/zynq/ F: board/zynqmp/ F: board/zynqmp/kria/ +F: configs/versal_vck190_defconfig F: configs/zynq_zc706_defconfig F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu106_defconfig F: configs/zynqmp_kria_kv260_defconfig F: package/bootgen/ +F: package/versal-firmware/ N: Nicola Di Lieto F: package/uacme/ @@ -2940,6 +2950,7 @@ F: package/utp_com/ N: Vincent Stehlé F: board/qemu/aarch64-ebbr/ F: configs/qemu_aarch64_ebbr_defconfig +F: package/edk2-non-osi/ N: Vincent Stehlé F: board/bananapi/bananapi-m2-zero/ diff --git a/Makefile b/Makefile index 9c1776eb6c..88f90cd2fa 100644 --- a/Makefile +++ b/Makefile @@ -396,6 +396,9 @@ unexport DESTDIR # Causes breakage with packages that needs host-ruby unexport RUBYOPT +# Compilation of perl-related packages will fail otherwise +unexport PERL_MM_OPT + include package/pkg-utils.mk include package/doc-asciidoc.mk diff --git a/board/andes/ae350/ae350.dts b/board/andes/ae350/ae350.dts deleted file mode 100755 index 5e5d70ab25..0000000000 --- a/board/andes/ae350/ae350.dts +++ /dev/null @@ -1,274 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <2>; - #size-cells = <2>; - compatible = "andestech,ae350"; - model = "andestech,ax45"; - aliases { - uart0 = &serial0; - spi0 = &spi; - }; - - chosen { - bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7"; - stdout-path = "uart0:38400n8"; - }; - cpus { - #address-cells = <1>; - #size-cells = <0>; - timebase-frequency = <60000000>; - CPU0: cpu@0 { - device_type = "cpu"; - reg = <0>; - status = "okay"; - compatible = "riscv"; - riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; - riscv,priv-major = <1>; - riscv,priv-minor = <10>; - mmu-type = "riscv,sv48"; - clock-frequency = <60000000>; - i-cache-size = <0x8000>; - i-cache-sets = <256>; - i-cache-block-size = <64>; - i-cache-line-size = <64>; - d-cache-size = <0x8000>; - d-cache-sets = <128>; - d-cache-block-size = <64>; - d-cache-line-size = <64>; - next-level-cache = <&L2>; - CPU0_intc: interrupt-controller { - #interrupt-cells = <1>; - interrupt-controller; - compatible = "riscv,cpu-intc"; - }; - }; - CPU1: cpu@1 { - device_type = "cpu"; - reg = <1>; - status = "okay"; - compatible = "riscv"; - riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; - riscv,priv-major = <1>; - riscv,priv-minor = <10>; - mmu-type = "riscv,sv48"; - clock-frequency = <60000000>; - i-cache-size = <0x8000>; - i-cache-sets = <256>; - i-cache-block-size = <64>; - i-cache-line-size = <64>; - d-cache-size = <0x8000>; - d-cache-sets = <128>; - d-cache-block-size = <64>; - d-cache-line-size = <64>; - next-level-cache = <&L2>; - CPU1_intc: interrupt-controller { - #interrupt-cells = <1>; - interrupt-controller; - compatible = "riscv,cpu-intc"; - }; - }; - CPU2: cpu@2 { - device_type = "cpu"; - reg = <2>; - status = "okay"; - compatible = "riscv"; - riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; - riscv,priv-major = <1>; - riscv,priv-minor = <10>; - mmu-type = "riscv,sv48"; - clock-frequency = <60000000>; - i-cache-size = <0x8000>; - i-cache-sets = <256>; - i-cache-block-size = <64>; - i-cache-line-size = <64>; - d-cache-size = <0x8000>; - d-cache-sets = <128>; - d-cache-block-size = <64>; - d-cache-line-size = <64>; - next-level-cache = <&L2>; - CPU2_intc: interrupt-controller { - #interrupt-cells = <1>; - interrupt-controller; - compatible = "riscv,cpu-intc"; - }; - }; - CPU3: cpu@3 { - device_type = "cpu"; - reg = <3>; - status = "okay"; - compatible = "riscv"; - riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; - riscv,priv-major = <1>; - riscv,priv-minor = <10>; - mmu-type = "riscv,sv48"; - clock-frequency = <60000000>; - i-cache-size = <0x8000>; - i-cache-sets = <256>; - i-cache-block-size = <64>; - i-cache-line-size = <64>; - d-cache-size = <0x8000>; - d-cache-sets = <128>; - d-cache-block-size = <64>; - d-cache-line-size = <64>; - next-level-cache = <&L2>; - CPU3_intc: interrupt-controller { - #interrupt-cells = <1>; - interrupt-controller; - compatible = "riscv,cpu-intc"; - }; - }; - }; - L2: l2-cache@e0500000 { - compatible = "cache"; - cache-level = <2>; - cache-size = <0x80000>; - reg = <0x00000000 0xe0500000 0x00000000 0x00001000>; - andes,inst-prefetch = <3>; - andes,data-prefetch = <3>; - // The value format is - andes,tag-ram-ctl = <0 0>; - andes,data-ram-ctl = <0 0>; - }; - memory@0 { - reg = <0x00000000 0x00000000 0x00000000 0x80000000>; - device_type = "memory"; - }; - soc { - #address-cells = <2>; - #size-cells = <2>; - compatible = "andestech,riscv-ae350-soc", "simple-bus"; - ranges; - plic0: interrupt-controller@e4000000 { - compatible = "riscv,plic0"; - reg = <0x00000000 0xe4000000 0x00000000 0x02000000>; - interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>; - interrupt-controller; - #address-cells = <2>; - #interrupt-cells = <2>; - riscv,ndev = <71>; - }; - plic1: interrupt-controller@e6400000 { - compatible = "riscv,plic1"; - reg = <0x00000000 0xe6400000 0x00000000 0x00400000>; - interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>; - interrupt-controller; - #address-cells = <2>; - #interrupt-cells = <2>; - riscv,ndev = <4>; - }; - plmt0: plmt0@e6000000 { - compatible = "riscv,plmt0"; - reg = <0x00000000 0xe6000000 0x00000000 0x00100000>; - interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>; - }; - spiclk: virt_100mhz { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <100000000>; - }; - timer0: timer@f0400000 { - compatible = "andestech,atcpit100"; - reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; - interrupts = <3 4>; - interrupt-parent = <&plic0>; - clock-frequency = <60000000>; - }; - pwm: pwm@f0400000 { - compatible = "andestech,atcpit100-pwm"; - reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; - interrupts = <3 4>; - interrupt-parent = <&plic0>; - clock-frequency = <60000000>; - pwm-cells = <2>; - }; - wdt: wdt@f0500000 { - compatible = "andestech,atcwdt200"; - reg = <0x00000000 0xf0500000 0x00000000 0x00001000>; - interrupts = <3 4>; - interrupt-parent = <&plic0>; - clock-frequency = <15000000>; - }; - serial0: serial@f0300000 { - compatible = "andestech,uart16550", "ns16550a"; - reg = <0x00000000 0xf0300000 0x00000000 0x00001000>; - interrupts = <9 4>; - interrupt-parent = <&plic0>; - clock-frequency = <19660800>; - reg-shift = <2>; - reg-offset = <32>; - no-loopback-test = <1>; - }; - rtc0: rtc@f0600000 { - compatible = "andestech,atcrtc100"; - reg = <0x00000000 0xf0600000 0x00000000 0x00001000>; - interrupts = <1 4 2 4>; - interrupt-parent = <&plic0>; - wakeup-source; - }; - gpio: gpio@f0700000 { - compatible = "andestech,atcgpio100"; - reg = <0x00000000 0xf0700000 0x00000000 0x00001000>; - interrupts = <7 4>; - interrupt-parent = <&plic0>; - wakeup-source; - }; - mac0: mac@e0100000 { - compatible = "andestech,atmac100"; - reg = <0x00000000 0xe0100000 0x00000000 0x00001000>; - interrupts = <19 4>; - interrupt-parent = <&plic0>; - dma-coherent; - }; - smu: smu@f0100000 { - compatible = "andestech,atcsmu"; - reg = <0x00000000 0xf0100000 0x00000000 0x00001000>; - }; - mmc0: mmc@f0e00000 { - compatible = "andestech,atfsdc010"; - reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>; - interrupts = <18 4>; - interrupt-parent = <&plic0>; - clock-freq-min-max = <400000 100000000>; - max-frequency = <100000000>; - fifo-depth = <16>; - cap-sd-highspeed; - dma-coherent; - }; - dma0: dma@f0c00000 { - compatible = "andestech,atcdmac300"; - reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>; - interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>; - interrupt-parent = <&plic0>; - dma-channels = <8>; - }; - lcd0: lcd@e0200000 { - compatible = "andestech,atflcdc100"; - reg = <0x00000000 0xe0200000 0x00000000 0x00001000>; - interrupts = <20 4>; - interrupt-parent = <&plic0>; - dma-coherent; - }; - pmu: pmu { - compatible = "riscv,andes-pmu"; - device_type = "pmu"; - }; - spi: spi@f0b00000 { - compatible = "andestech,atcspi200"; - reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>; - interrupts = <4 4>; - interrupt-parent = <&plic0>; - #address-cells = <1>; - #size-cells = <0>; - num-cs = <1>; - clocks = <&spiclk>; - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0x00000000>; - spi-max-frequency = <50000000>; - spi-cpol; - spi-cpha; - }; - }; - }; -}; diff --git a/board/andes/ae350/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg index b8b9fe6a62..58c6f8f156 100644 --- a/board/andes/ae350/genimage_sdcard.cfg +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -3,7 +3,7 @@ image boot.vfat { files = { "u-boot-spl.bin", "u-boot.itb", - "ae350.dtb", + "ae350_ax45mp.dtb", } } size = 2M diff --git a/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch deleted file mode 100644 index aeafed4c9f..0000000000 --- a/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001 -From: Yu Chien Peter Lin -Date: Wed, 29 Dec 2021 16:04:54 +0800 -Subject: [PATCH] Disable PIC explicitly for assembling - -This patch is necessary if the fw_dynamic load address -is not equal to link address. -However, they are equal currently, since we include an u-boot -patch for preventing fw_dynamic relocation. - -Signed-off-by: Yu Chien Peter Lin ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile b/Makefile -index d6f097d..441518d 100644 ---- a/Makefile -+++ b/Makefile -@@ -225,6 +225,7 @@ ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) - ASFLAGS += $(GENFLAGS) - ASFLAGS += $(platform-asflags-y) - ASFLAGS += $(firmware-asflags-y) -+ASFLAGS += -fno-pic - - ARFLAGS = rcs - --- -2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch deleted file mode 100644 index ae48a760c8..0000000000 --- a/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001 -From: Yu Chien Peter Lin -Date: Thu, 30 Dec 2021 08:47:34 +0800 -Subject: [PATCH] Enable cache for opensbi jump mode - -Signed-off-by: Yu Chien Peter Lin ---- - firmware/fw_base.S | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/firmware/fw_base.S b/firmware/fw_base.S -index ab33e11..155d230 100644 ---- a/firmware/fw_base.S -+++ b/firmware/fw_base.S -@@ -46,6 +46,8 @@ - .globl _start - .globl _start_warm - _start: -+ li t0, 0x80003 -+ csrw 0x7ca, t0 - /* Find preferred boot HART id */ - MOV_3R s0, a0, s1, a1, s2, a2 - call fw_boot_hart --- -2.25.1 diff --git a/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch deleted file mode 100644 index 7aff3cebf6..0000000000 --- a/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001 -From: Yu Chien Peter Lin -Date: Wed, 5 Jan 2022 11:00:59 +0800 -Subject: [PATCH] Fix mmc no partition table error - -Signed-off-by: Yu Chien Peter Lin ---- - drivers/mmc/ftsdc010_mci.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c -index 570d54cf..3b1e0aa0 100644 ---- a/drivers/mmc/ftsdc010_mci.c -+++ b/drivers/mmc/ftsdc010_mci.c -@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev) - return ret; - #endif - -- if (dev_read_bool(dev, "cap-mmc-highspeed") || \ -- dev_read_bool(dev, "cap-sd-highspeed")) -- chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz; -- - ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps, - priv->minmax[1] , priv->minmax[0]); - chip->mmc = &plat->mmc; --- -2.25.1 diff --git a/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch b/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch new file mode 100644 index 0000000000..be89a1563f --- /dev/null +++ b/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch @@ -0,0 +1,38 @@ +From 16aad5594e08550295ea3c12c1c9ed6f64774748 Mon Sep 17 00:00:00 2001 +From: Rick Chen +Date: Tue, 29 Mar 2022 13:41:10 +0800 +Subject: [PATCH] mmc: ftsdc010_mci: Support DTS of ftsdc010 driver for + generic dma + +The ftsdc010 driver has been implemented for generic dma in Linux +kernel. And its compatible is andestech,atfsdc010g to distinguish +the legacy andestech,atfsdc010 which is not for generic dma. + +Althought the ftsdc010_mci driver in U-Boot does not use dma, but +it still can work well with the mmc node for generic dma. So add +the compatible string to support it. + +Signed-off-by: Rick Chen + +Upstream-Status: Pending + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf9d..65b1d447a8 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -460,6 +460,7 @@ int ftsdc010_mmc_bind(struct udevice *dev) + + static const struct udevice_id ftsdc010_mmc_ids[] = { + { .compatible = "andestech,atfsdc010" }, ++ { .compatible = "andestech,atfsdc010g" }, + { } + }; + +-- +2.34.1 + diff --git a/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch deleted file mode 100644 index c6e1896f1c..0000000000 --- a/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001 -From: Yu Chien Peter Lin -Date: Wed, 5 Jan 2022 11:02:26 +0800 -Subject: [PATCH] Prevent fw_dynamic from relocation - -This patch prevents OpenSBI relocation, load fw_dynamic to link address - -Signed-off-by: Yu Chien Peter Lin ---- - board/AndesTech/ax25-ae350/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig -index e50f505a..385c4c11 100644 ---- a/board/AndesTech/ax25-ae350/Kconfig -+++ b/board/AndesTech/ax25-ae350/Kconfig -@@ -25,7 +25,7 @@ config SPL_TEXT_BASE - default 0x800000 - - config SPL_OPENSBI_LOAD_ADDR -- default 0x01000000 -+ default 0x0 - - config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y --- -2.25.1 diff --git a/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch b/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch new file mode 100644 index 0000000000..5080554ca1 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch @@ -0,0 +1,42 @@ +From 933ad8a59f7fd9b2088badc3e97167d750a40b5a Mon Sep 17 00:00:00 2001 +From: Bin Meng +Date: Mon, 12 Jul 2021 11:52:31 +0800 +Subject: [PATCH] spl: Align device tree blob address at 8-byte boundary + +Since libfdt v1.6.1, a new requirement on the device tree address via: + + commit 5e735860c478 ("libfdt: Check for 8-byte address alignment in fdt_ro_probe_()") + +must be met that the device tree must be loaded in to memory at an +8-byte aligned address. + +Signed-off-by: Bin Meng + +This patch was imported from U-boot patchwork: +https://patchwork.ozlabs.org/project/uboot/patch/20210712035231.26475-1-bmeng.cn@gmail.com/ + +Signed-off-by: Yu Chien Peter Lin +--- + common/spl/spl_fit.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c +index a35be529..a76ad14a 100644 +--- a/common/spl/spl_fit.c ++++ b/common/spl/spl_fit.c +@@ -382,6 +382,12 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, + */ + image_info.load_addr = spl_image->load_addr + spl_image->size; + ++ /* ++ * Since libfdt v1.6.1, the device tree must be loaded in to memory ++ * at an 8-byte aligned address. ++ */ ++ image_info.load_addr = roundup(image_info.load_addr, 8); ++ + /* Figure out which device tree the board wants to use */ + node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index++); + if (node < 0) { +-- +2.34.1 + diff --git a/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch deleted file mode 100644 index 20598fdba4..0000000000 --- a/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001 -From: Yu Chien Peter Lin -Date: Wed, 5 Jan 2022 18:17:39 +0800 -Subject: [PATCH] Fix u-boot proper booting issue - -Signed-off-by: Yu Chien Peter Lin ---- - arch/riscv/cpu/start.S | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S -index 76850ec9..2ccda4f5 100644 ---- a/arch/riscv/cpu/start.S -+++ b/arch/riscv/cpu/start.S -@@ -139,7 +139,9 @@ call_harts_early_init: - * accesses gd). - */ - mv gp, s0 -+#if !CONFIG_IS_ENABLED(RISCV_SMODE) - bnez tp, secondary_hart_loop -+#endif - #endif - - jal board_init_f_init_reserve --- -2.25.1 diff --git a/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch deleted file mode 100644 index efd78ab26d..0000000000 --- a/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001 -From: Yu Chien Peter Lin -Date: Thu, 6 Jan 2022 13:50:07 +0800 -Subject: [PATCH] Enable printing OpenSBI boot logo - -Signed-off-by: Yu Chien Peter Lin ---- - include/opensbi.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/opensbi.h b/include/opensbi.h -index d812cc8c..91fb8fd9 100644 ---- a/include/opensbi.h -+++ b/include/opensbi.h -@@ -20,7 +20,7 @@ - - enum sbi_scratch_options { - /** Disable prints during boot */ -- SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0), -+ SBI_SCRATCH_NO_BOOT_PRINTS = 0, - }; - - /** Representation dynamic info passed by previous booting stage */ --- -2.25.1 diff --git a/board/andes/ae350/post-build.sh b/board/andes/ae350/post-build.sh index 0e6ce228f4..84187a064b 100755 --- a/board/andes/ae350/post-build.sh +++ b/board/andes/ae350/post-build.sh @@ -1,3 +1,3 @@ #!/bin/sh cp $BINARIES_DIR/Image $TARGET_DIR/boot -cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot +cp $BINARIES_DIR/ae350_ax45mp.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt index 6825468d50..4de4cb3894 100644 --- a/board/andes/ae350/readme.txt +++ b/board/andes/ae350/readme.txt @@ -30,12 +30,10 @@ Result of the build After building, you should obtain the following files: output/images/ - |-- ae350.dtb + |-- ae350_ax45mp.dtb |-- boot.vfat |-- fw_dynamic.bin |-- fw_dynamic.elf - |-- fw_jump.bin - |-- fw_jump.elf |-- Image |-- rootfs.ext2 |-- rootfs.ext4 -> rootfs.ext2 diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf index 549eb93abc..be19e196a8 100644 --- a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label linux kernel /boot/Image - fdt /boot/ae350.dtb + fdt /boot/ae350_ax45mp.dtb append earlycon=sbi root=/dev/mmcblk0p2 rootwait diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment index 4992d712a5..fa38bbca3a 100644 --- a/board/andes/ae350/uboot.config.fragment +++ b/board/andes/ae350/uboot.config.fragment @@ -1,5 +1,7 @@ CONFIG_SPL_FS_FAT=y CONFIG_SPL_MMC=y # CONFIG_SPL_RAM_SUPPORT is not set -# CONFIG_OF_BOARD is not set -CONFIG_OF_SEPARATE=y +CONFIG_SPL_OPENSBI_LOAD_ADDR=0x0 +CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 +CONFIG_DISPLAY_CPUINFO=y +CONFIG_DISPLAY_BOARDINFO=y diff --git a/board/freescale/ls1028ardb/readme.txt b/board/freescale/ls1028ardb/readme.txt index 93396a4199..cfd1c8c490 100644 --- a/board/freescale/ls1028ardb/readme.txt +++ b/board/freescale/ls1028ardb/readme.txt @@ -8,6 +8,16 @@ for more details about the board and the QorIQ Layerscape SoC, see the following - https://www.nxp.com/design/qoriq-developer-resources/layerscape-ls1028a-reference-design-board:LS1028ARDB - https://www.nxp.com/LS1028A +for the software NXP LSDK (Layerscape Software Development Kit), see + - https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf + +the components from NXP are: + - rcw, LSDK 21.08 + - atf (fork), LSDK 21.08 + - uboot (fork), LSDK 21.08 + - cadence-dp-firmware (blob), LSDK 20.12 + - linux (fork), LSDK 21.08 + Build ===== @@ -58,3 +68,20 @@ To boot your newly created system: - put a DB9F cable into the UART1 Port and connect using a terminal emulator at 115200 bps, 8n1; - power on the board. + +The Cadence DP (Display Port) firmware must loaded from uboot with the following commands: + + => ext2load mmc 0 0x80000000 /boot/ls1028a-dp-fw.bin + 102464 bytes read in 24 ms (4.1 MiB/s) + => hdp load 0x80000000 0x2000 + Loading hdp firmware from 0x0000000080000000 offset 0x0000000000002000 + Loading hdp firmware Complete + => boot + +The interfaces of Ethernet switch (Felix DSA) are bring up with the following commands: + + ip link set eno2 up + ip link set swp0 up + ip link set swp1 up + ip link set swp2 up + ip link set swp3 up diff --git a/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf index c08ddde10d..bd6c7c95c3 100644 --- a/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf +++ b/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label ls1028ardb-buildroot kernel /boot/Image devicetree /boot/fsl-ls1028a-rdb.dtb - append root=/dev/mmcblk0p1 rootwait + append root=/dev/mmcblk0p1 rootwait video=1920x1080-32@60 cma=256M diff --git a/board/versal/genimage.cfg b/board/versal/genimage.cfg new file mode 100644 index 0000000000..d994d3a2bf --- /dev/null +++ b/board/versal/genimage.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "boot.bin", + "system.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/versal/post-build.sh b/board/versal/post-build.sh new file mode 100755 index 0000000000..ff8f8a6071 --- /dev/null +++ b/board/versal/post-build.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" +CONSOLE=$2 +ROOT=$3 + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label linux + kernel /Image + devicetree /system.dtb + append console=${CONSOLE} clk_ignore_unused root=/dev/${ROOT} rw rootwait + __HEADER_EOF diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh new file mode 100755 index 0000000000..890522c31d --- /dev/null +++ b/board/versal/post-image.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +# By default U-Boot loads DTB from a file named "system.dtb", so +# let's use a symlink with that name that points to the *first* +# devicetree listed in the config. + +FIRST_DT=$(sed -nr \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + ${BR2_CONFIG}) + +[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb + +BOARD_DIR="$(dirname $0)" +BOARD_NAME=$4 + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" + the_ROM_image: + { + image { + { type=bootimage, file=${BINARIES_DIR}/${BOARD_NAME}_vpl_gen_fixed.pdi } + { type=bootloader, file=${BINARIES_DIR}/${BOARD_NAME}_plm.elf } + { core=psm, file=${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf } + } + image { + id = 0x1c000000, name=apu_subsystem + { type=raw, load=0x00001000, file=${BINARIES_DIR}/system.dtb } + { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } + { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } + } + } + __HEADER_EOF + +${HOST_DIR}/bin/bootgen -arch versal -image ${BINARIES_DIR}/bootgen.bif -o ${BINARIES_DIR}/boot.bin -w on +support/scripts/genimage.sh -c ${BOARD_DIR}/genimage.cfg diff --git a/board/versal/readme.txt b/board/versal/readme.txt new file mode 100644 index 0000000000..9f234be620 --- /dev/null +++ b/board/versal/readme.txt @@ -0,0 +1,54 @@ +****************************************** +Xilinx VCK190 board - Versal +****************************************** + +This document describes the Buildroot support for the VCK190 +board by Xilinx, based on Versal. It has been tested with the +VCK190 production board. + +Evaluation board features can be found here with the link below. + +VCK190: +https://www.xilinx.com/products/boards-and-kits/vck190.html + + +How to build it +=============== + +Configure Buildroot: + + $ make versal_vck190_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + +-- boot.bin + +-- boot.vfat + +-- Image + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- sdcard.img + +-- system.dtb -> versal-vck190-rev1.1.dtb + `-- versal-vck190-rev1.1.dtb + +How to write the SD card +======================== + +WARNING! This will destroy all the card content. Use with care! + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to an SD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the SD. + +Eject the SD card, insert it in the board, and power it up. diff --git a/board/zynq/microzed/uboot.fragment b/board/zynq/microzed/uboot.fragment deleted file mode 100644 index bc4dffaffa..0000000000 --- a/board/zynq/microzed/uboot.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed" diff --git a/board/zynq/zc706/uboot.fragment b/board/zynq/zc706/uboot.fragment deleted file mode 100644 index ad5efa6204..0000000000 --- a/board/zynq/zc706/uboot.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706" diff --git a/board/zynq/zed/uboot.fragment b/board/zynq/zed/uboot.fragment deleted file mode 100644 index d58fcd5439..0000000000 --- a/board/zynq/zed/uboot.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" diff --git a/board/zynqmp/kria/kv260/uboot.fragment b/board/zynqmp/kria/kv260/uboot.fragment index 0ed560c411..9e32edfb36 100644 --- a/board/zynqmp/kria/kv260/uboot.fragment +++ b/board/zynqmp/kria/kv260/uboot.fragment @@ -1,4 +1,3 @@ -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-smk-k26-revA" CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 CONFIG_DTB_RESELECT=y CONFIG_DMA=y diff --git a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch b/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch deleted file mode 100644 index f4f1b1565a..0000000000 --- a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 59aa67f7a4d8efc564b46fe467aaf6eccec17183 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 20 Dec 2021 22:32:38 +0800 -Subject: [PATCH] MdeModulePkg/UsbBusDxe: fix NOOPT build error - -gcc-11 (fedora 35): - -/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c: In function ?UsbIoBulkTransfer?: -/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c:277:12: error: ?UsbHcBulkTransfer? accessing 80 bytes in a region of size 8 [-Werror=stringop-overflow=] - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Hao A Wu -(cherry picked from commit ae8272ef787d80950803c521a13a308651bdc62e) -Signed-off-by: Romain Naour ---- - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 2 +- - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -index 7529e03e85..b2ce97ca37 100644 ---- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -@@ -285,7 +285,7 @@ UsbHcBulkTransfer ( - IN UINT8 DevSpeed, - IN UINTN MaxPacket, - IN UINT8 BufferNum, -- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM], -+ IN OUT VOID *Data[], - IN OUT UINTN *DataLength, - IN OUT UINT8 *DataToggle, - IN UINTN TimeOut, -diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -index 1d2b8a6174..1316a5981f 100644 ---- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -@@ -149,7 +149,7 @@ UsbHcBulkTransfer ( - IN UINT8 DevSpeed, - IN UINTN MaxPacket, - IN UINT8 BufferNum, -- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM], -+ IN OUT VOID *Data[], - IN OUT UINTN *DataLength, - IN OUT UINT8 *DataToggle, - IN UINTN TimeOut, --- -2.35.3 - diff --git a/boot/edk2/Config.in b/boot/edk2/Config.in index df723122ee..855a62f70b 100644 --- a/boot/edk2/Config.in +++ b/boot/edk2/Config.in @@ -88,6 +88,7 @@ config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN bool "SolidRun MacchiatoBin" depends on BR2_aarch64 depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE + select BR2_PACKAGE_EDK2_NON_OSI select BR2_PACKAGE_HOST_DTC select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP help diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index f28e9ce841..94ee22ddc4 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 04791c13b414a6d1877182a6d565cb762c30aa63e49bb4d495fca68ef4dd209d edk2-edk2-stable202102-br1.tar.gz +sha256 c10520f269557d566e35fe8104141aa2865f9085ad2b3a30aae8a7e78a3ca5aa edk2-edk2-stable202208-br1.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 953bea6fd3..fb6b9a3280 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202102 +EDK2_VERSION = edk2-stable202208 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause-Patent @@ -47,7 +47,7 @@ endif EDK2_GIT_SUBMODULES = YES EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot -EDK2_PACKAGES_PATH = $(@D):$(EDK2_BUILD_PACKAGES):$(STAGING_DIR)/usr/share/edk2-platforms +EDK2_PACKAGES_PATHS = $(@D) $(EDK2_BUILD_PACKAGES) $(STAGING_DIR)/usr/share/edk2-platforms ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_I386),y) EDK2_ARCH = IA32 @@ -108,12 +108,13 @@ endef else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y) EDK2_ARCH = AARCH64 -EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware +EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware edk2-non-osi EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin EDK2_PLATFORM_NAME = Armada80x0McBin EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/ EDK2_BUILD_OPTS += -D INCLUDE_TFTP_COMMAND +EDK2_PACKAGES_PATHS += $(STAGING_DIR)/usr/share/edk2-non-osi else ifeq ($(BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA),y) EDK2_ARCH = AARCH64 @@ -134,6 +135,8 @@ EDK2_BASETOOLS_OPTS = \ EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \ EXTRA_OPTFLAGS="$(HOST_CPPFLAGS)" +EDK2_PACKAGES_PATH = $(subst $(space),:,$(strip $(EDK2_PACKAGES_PATHS))) + EDK2_BUILD_ENV += \ WORKSPACE=$(@D) \ PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \ diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 557472b58b..a729280060 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -277,7 +277,19 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_BIN bool "u-boot-nand.bin" config BR2_TARGET_UBOOT_FORMAT_ELF + bool "u-boot" + help + Install the u-boot image, which is directly the ELF binary + for the main U-Boot, potentially with debugging symbols. + +config BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF bool "u-boot.elf" + help + Install the u-boot.elf image, which is produced when + CONFIG_REMAKE_ELF=y. It is an ELF image (u-boot.elf) + produced from the raw U-Boot binary (u-boot.bin), which may + already have been statically relocated and may already have + a device-tree appended to it. config BR2_TARGET_UBOOT_FORMAT_IMG bool "u-boot.img" diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e073daa38..99e80ea5a1 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -60,6 +60,10 @@ UBOOT_MAKE_TARGET += mdbtrick endif endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF),y) +UBOOT_BINS += u-boot.elf +endif + # Call 'make all' unconditionally UBOOT_MAKE_TARGET += all diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig index a35ddd06ba..998276635b 100644 --- a/configs/andes_ae350_45_defconfig +++ b/configs/andes_ae350_45_defconfig @@ -4,32 +4,33 @@ BR2_RISCV_ISA_CUSTOM_RVM=y BR2_RISCV_ISA_CUSTOM_RVF=y BR2_RISCV_ISA_CUSTOM_RVD=y BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_OVERLAY="board/andes/ae350/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" -BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,andestech,linux,v6.0.y_ae350-ax45mp)/linux-v6.0.y_ae350-ax45mp.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="ae350_ax45mp" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="andes/ae350_ax45mp" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,riscv,opensbi,22f38ee6c658a660083aa45c4ec6c72f66a17260)/opensbi-22f38ee6c658a660083aa45c4ec6c72f66a17260.tar.gz" BR2_TARGET_OPENSBI_PLAT="andes/ae350" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,u-boot,u-boot,a5dfa3b8a0f7ad555495bad1386613d2de4ba619)/u-boot-a5dfa3b8a0f7ad555495bad1386613d2de4ba619.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index 22b9eb426a..1bc84f7b80 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -26,6 +26,9 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-rdb" BR2_LINUX_KERNEL_INSTALL_TARGET=y +# Target package +BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y + # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index e302fcbba5..967d064f1c 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -24,8 +24,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y @@ -36,7 +36,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 6f7c3bbe99..1cded53765 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -23,8 +23,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y @@ -35,7 +35,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index 1efcdf6071..d1e81d90fd 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -23,8 +23,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y @@ -35,7 +35,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index 932ff97ab3..6c490f195b 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +# Latest revision of branch boundary-lf-5.15.52-2.1.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -39,8 +39,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -51,7 +51,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index 53fbdc3da4..27cdc9e19e 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +# Latest revision of branch boundary-lf-5.15.52-2.1.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -39,8 +39,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -51,7 +51,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 51a0a56140..775bdecd90 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +# Latest revision of branch boundary-lf-5.15.52-2.1.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -39,8 +39,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -51,7 +51,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index 05caae466a..0767ab1375 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +# Latest revision of branch boundary-lf-5.15.52-2.1.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -39,8 +39,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mp_2gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -51,7 +51,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig new file mode 100644 index 0000000000..d87df221c6 --- /dev/null +++ b/configs/versal_vck190_defconfig @@ -0,0 +1,38 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2 vck190" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_versal" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_PACKAGE_VERSAL_FIRMWARE=y +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2" +BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_BOOTGEN=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 10a4f4095f..459a3a40bc 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/microzed/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 82c47be7a5..3ad8cbafe3 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/zc706/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 34e1b67184..a39911b757 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/zed/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 7afc7748b0..df01ad30b8 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/kv260/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/package/Config.in b/package/Config.in index 682faf3697..f4a423c7a6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -443,6 +443,7 @@ menu "Firmware" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" + source "package/versal-firmware/Config.in" source "package/wilc-firmware/Config.in" source "package/wilink-bt-firmware/Config.in" source "package/zd1211-firmware/Config.in" @@ -488,6 +489,7 @@ endmenu source "package/dvb-apps/Config.in" source "package/dvbsnoop/Config.in" source "package/edid-decode/Config.in" + source "package/edk2-non-osi/Config.in" source "package/edk2-platforms/Config.in" source "package/eudev/Config.in" source "package/ev3dev-linux-drivers/Config.in" @@ -722,6 +724,7 @@ menu "Lua libraries/modules" source "package/lua-lyaml/Config.in" source "package/lua-markdown/Config.in" source "package/lua-messagepack/Config.in" + source "package/lua-mqtt/Config.in" source "package/lua-msgpack-native/Config.in" source "package/lua-periphery/Config.in" source "package/lua-resty-http/Config.in" @@ -1020,6 +1023,7 @@ menu "External python modules" source "package/python-defusedxml/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" + source "package/python-dicttoxml2/Config.in" source "package/python-distro/Config.in" source "package/python-django/Config.in" source "package/python-django-enumfields/Config.in" @@ -1211,6 +1215,7 @@ menu "External python modules" source "package/python-pysnmp/Config.in" source "package/python-pysnmp-mibs/Config.in" source "package/python-pysocks/Config.in" + source "package/python-pyspnego/Config.in" source "package/python-pytablereader/Config.in" source "package/python-pytablewriter/Config.in" source "package/python-pytest/Config.in" @@ -1264,6 +1269,7 @@ menu "External python modules" source "package/python-sip/Config.in" source "package/python-six/Config.in" source "package/python-slob/Config.in" + source "package/python-smbprotocol/Config.in" source "package/python-smbus-cffi/Config.in" source "package/python-smmap2/Config.in" source "package/python-snappy/Config.in" @@ -1593,6 +1599,7 @@ menu "Graphics" source "package/opencl-clhpp/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" + source "package/opencv4-contrib/Config.in" source "package/opengl/Config.in" source "package/openjpeg/Config.in" source "package/pango/Config.in" @@ -1600,6 +1607,7 @@ menu "Graphics" source "package/pixman/Config.in" source "package/poppler/Config.in" source "package/powervr/Config.in" + source "package/stb/Config.in" source "package/tiff/Config.in" source "package/unclutter-xfixes/Config.in" source "package/waffle/Config.in" @@ -1949,6 +1957,7 @@ menu "Networking" source "package/slirp4netns/Config.in" source "package/snmppp/Config.in" source "package/sofia-sip/Config.in" + source "package/sscep/Config.in" source "package/sysrepo/Config.in" source "package/thrift/Config.in" source "package/usbredir/Config.in" @@ -2187,6 +2196,7 @@ menu "Miscellaneous" source "package/wine/Config.in" source "package/xmrig/Config.in" source "package/xutil_util-macros/Config.in" + source "package/z3/Config.in" endmenu menu "Networking applications" diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash index 7a4a6f7aca..b52a787ed5 100644 --- a/package/avro-c/avro-c.hash +++ b/package/avro-c/avro-c.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.11.0/c/avro-c-1.11.0.tar.gz.sha512 -sha512 5369ec11832e0ce1aa0181d594f657bae82ab5fb317ec1bee5ba190de9ed42956b425a5bf7e423940e8f871a54ae1246b92db2ce8562f270b4a05523ec4b60ae avro-c-1.11.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.1/c/avro-c-1.11.1.tar.gz.sha512 +sha512 e72e8c245a8b86326bc18a5d5127e9beeaceaf805e8a62760fd88d627e29954c750346485bb43822df408c8a172d910c27ddf7e3815bddbdb04d16c54d859323 avro-c-1.11.1.tar.gz # License files sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk index f55c579656..f217c1d7ed 100644 --- a/package/avro-c/avro-c.mk +++ b/package/avro-c/avro-c.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update python-avro -AVRO_C_VERSION = 1.11.0 +AVRO_C_VERSION = 1.11.1 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c AVRO_C_LICENSE = Apache-2.0 AVRO_C_LICENSE_FILES = LICENSE diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 5f59b30560..149d1e71f1 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/sha256sums.asc -sha256 9184a6ebbd9ce7eb211152e7f741a6c82f2d1cc0e24a84ec9c52939eee0f0542 cryptsetup-2.5.0.tar.xz +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc +sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 4a52bb62dd..659fdfa2a4 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.5 +CRYPTSETUP_VERSION_MAJOR = 2.6 CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index ff6e312fde..8f6c49c62b 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,5 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1 dropbear-2022.82.tar.bz2 +sha256 bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b dropbear-2022.83.tar.bz2 # License file, locally computed sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index bfb80345ec..36eb7898ba 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2022.82 +DROPBEAR_VERSION = 2022.83 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain @@ -64,13 +64,9 @@ define DROPBEAR_ENABLE_LEGACY_CRYPTO echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_DH_GROUP1 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_DSS 1' >> $(@D)/localoptions.h endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO -else -define DROPBEAR_DISABLE_LEGACY_CRYPTO - echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h -endef -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_LEGACY_CRYPTO endif ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),) diff --git a/package/edk2-non-osi/Config.in b/package/edk2-non-osi/Config.in new file mode 100644 index 0000000000..6c540c8a40 --- /dev/null +++ b/package/edk2-non-osi/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_EDK2_NON_OSI + bool + help + EDK2 description files for additional platforms, not + compatible with the normal licensing requirements. + The main EDK2 bootloader package will depend on these + description files while building firmware for some platforms. + + Only the Marvell Armada files are copied at this point. + + https://github.com/tianocore/edk2-non-osi diff --git a/package/edk2-non-osi/edk2-non-osi.hash b/package/edk2-non-osi/edk2-non-osi.hash new file mode 100644 index 0000000000..7941df1f2f --- /dev/null +++ b/package/edk2-non-osi/edk2-non-osi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7d27b1e6d90a26f3585ab58a2e051da69eae1b97754d3e2d80a5372879ae2501 edk2-non-osi-61662e8596dd9a64e3372f9a3ba6622d2628607c.tar.gz +sha256 38d73db2f9dfb32e1666d898cb9d7c1ccd78302dd9922d5fac4a9cf61fa872d9 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf diff --git a/package/edk2-non-osi/edk2-non-osi.mk b/package/edk2-non-osi/edk2-non-osi.mk new file mode 100644 index 0000000000..0abb3770c7 --- /dev/null +++ b/package/edk2-non-osi/edk2-non-osi.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# edk2-non-osi +# +################################################################################ + +# Keep in sync with latest commit as of the release date for boot/edk2 +EDK2_NON_OSI_VERSION = 61662e8596dd9a64e3372f9a3ba6622d2628607c +EDK2_NON_OSI_SITE = $(call github,tianocore,edk2-non-osi,$(EDK2_NON_OSI_VERSION)) +EDK2_NON_OSI_INSTALL_TARGET = NO +EDK2_NON_OSI_INSTALL_STAGING = YES + +# Copy Marvell Armada files +EDK2_NON_OSI_LICENSE += BSD-2-Clause-Patent (Marvell Armada) +EDK2_NON_OSI_LICENSE_FILES += Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf +EDK2_NON_OSI_DIRS += Silicon/Marvell/Armada7k8k/DeviceTree + +# There is nothing to build for edk2-non-osi. All we need to do is to copy +# the selected description files to staging, for other packages to build with. +define EDK2_NON_OSI_INSTALL_STAGING_CMDS + $(foreach d,$(EDK2_NON_OSI_DIRS),\ + mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi/$(d) && \ + cp -rf $(@D)/$(d)/* $(STAGING_DIR)/usr/share/edk2-non-osi/$(d)/ + ) +endef + +$(eval $(generic-package)) diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index 30ae235078..405a09241c 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dfdc34fea86e5037a3a6cbd2a83b1f655f16b4c9ab4f5ff9da91e45a358c9a14 edk2-platforms-db922e1253cb6f1fc456805bc42fb7d401eed5c2.tar.gz +sha256 1ed3f369a2743cc5a5fa4804d0af154e37b578f4e68c2e7f69734701a9b874db edk2-platforms-3c3b1168017073c2bb2d97336c5929ebae805be1.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 6b155bf013..20a058baff 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_PLATFORMS_VERSION = db922e1253cb6f1fc456805bc42fb7d401eed5c2 +EDK2_PLATFORMS_VERSION = 3c3b1168017073c2bb2d97336c5929ebae805be1 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt diff --git a/package/fakeroot/0001-fix-prototype-generation.patch b/package/fakeroot/0001-fix-prototype-generation.patch deleted file mode 100644 index 960bad2129..0000000000 --- a/package/fakeroot/0001-fix-prototype-generation.patch +++ /dev/null @@ -1,61 +0,0 @@ -Subject: Fix prototype generation for openat -Author: Christoph Biedl -Date: 2021-12-30 -Bug-Debian: https://bugs.debian.org/995393 -Forwarded: Yes (implicitely) - - As jrtc27 pointed out in IRC, ppc64el is more strict than other - architectures when it comes to va_arg handling: - - it's that ppc64le uses the elfv2 abi, and for variadic calls you - must reserve space for a parameter save area - - So enhance wrapawk to create a proper prototype and argument - handling although it's specific to the openat call. Also add the - missing documentation for the sixth column to wrapfunc.inp. - -Signed-off-by: Joel Stanley - ---- a/wrapawk -+++ b/wrapawk -@@ -37,7 +37,25 @@ - argtype=$3; - argname=$4; - MACRO=$5; -- if(MACRO){ -+ openat_extra=$6; -+ if(openat_extra){ -+ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; -+ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; -+ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; -+ -+ print ret " tmp_" name, openat_extra "{" > tmpffile; -+ print " mode_t mode = 0;" > tmpffile; -+ print " if (flags & O_CREAT) {" > tmpffile; -+ print " va_list args;" > tmpffile; -+ print " va_start(args, flags);" > tmpffile; -+ print " mode = va_arg(args, int);" > tmpffile; -+ print " va_end(args);" > tmpffile; -+ print " }" > tmpffile; -+ print " load_library_symbols();" > tmpffile; -+ print " return next_" name, argname ";" > tmpffile; -+ print "}" > tmpffile; -+ print "" > tmpffile; -+ } else if(MACRO){ - print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; - print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; - print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; ---- a/wrapfunc.inp -+++ b/wrapfunc.inp -@@ -9,8 +9,10 @@ - /**/ */ - /* each line of this file lists 4 fields, seperated by a ";". */ - /* The first field is the name of the wrapped function, then it's return */ --/* value. After that come the function arguments with types, and the last */ -+/* value. After that come the function arguments with types, and the fifth */ - /* field contains the function arguments without types. */ -+/* A sixth field is a special needed when wrapping the openat syscall. */ -+/* Otherwise it's like the third (function arguments with types). */ - /**/ - - /* __*xstat are used on glibc systems instead of just *xstat. */ diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index 3d53eeb097..5c50c83e13 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,4 +1,4 @@ -# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.26-1.dsc -sha256 480a578ffdc5592e73df4c086950d321b4adc78dbdaec56c82e4fe1fb68de8e9 fakeroot_1.26.orig.tar.gz +# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.30.1-1.dsc +sha256 32ebb1f421aca0db7141c32a8c104eb95d2b45c393058b9435fbf903dd2b6a75 fakeroot_1.30.1.orig.tar.gz # License files, locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 3fadf1c0f0..20c75d6966 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.26 +FAKEROOT_VERSION = 1.30.1 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz -FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20210907T092512Z/pool/main/f/fakeroot +FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20221120T030258Z/pool/main/f/fakeroot HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off @@ -18,9 +18,4 @@ HOST_FAKEROOT_CONF_ENV = \ FAKEROOT_LICENSE = GPL-3.0+ FAKEROOT_LICENSE_FILES = COPYING -define HOST_FAKEROOT_BUILD_AUX - mkdir -p $(@D)/build-aux -endef -HOST_FAKEROOT_POST_PATCH_HOOKS += HOST_FAKEROOT_BUILD_AUX - $(eval $(host-autotools-package)) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 4a4237fb42..13d611b696 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -115,6 +115,7 @@ source "package/freescale-imx/imx-vpuwrap/Config.in" source "package/freescale-imx/firmware-imx/Config.in" source "package/freescale-imx/imx-sc-firmware/Config.in" source "package/freescale-imx/imx-seco/Config.in" +source "package/freescale-imx/imx-vpu-hantro-daemon/Config.in" source "package/freescale-imx/imx-vpu-hantro-vc/Config.in" if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53) source "package/freescale-imx/gpu-amd-bin-mx51/Config.in" diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 4d28b037d0..27f6a438d1 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 39fe307916e19a0892a514621121086e276a43858af90230372a1344852116a2 imx-gpu-g2d-6.4.3.p2.0-arm.bin -sha256 2642a49e088daae4cf568a150d01e7c095995e8a6ff1883c02c3fa6d26d254b3 imx-gpu-g2d-6.4.3.p2.0-aarch64.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 7737a3372bcde34e2d275397df67c307df5033d5b133ac770f75cac4e1ec2580 imx-gpu-g2d-6.4.3.p4.4-arm.bin +sha256 8341d6e2cde3f3ffa035dc95b0487dd04a50531cc80f4cddc5a689ebc4946e02 imx-gpu-g2d-6.4.3.p4.4-aarch64.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index c5df87e618..d94da24d8f 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.3.p2.0-aarch64 +IMX_GPU_G2D_VERSION = 6.4.3.p4.4-aarch64 else -IMX_GPU_G2D_VERSION = 6.4.3.p2.0-arm +IMX_GPU_G2D_VERSION = 6.4.3.p4.4-arm endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 312eeb6f82..a0e6345b7a 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1324b1aaf190110b80ad9a6f6533f4f50dce9e9ab8d49d8503f59764b151d219 imx-gpu-viv-6.4.3.p2.0-aarch32.bin -sha256 003c30baefb1655790b475c3cdfa5cefbf81ea89ef37c6649b64f151dd23a52e imx-gpu-viv-6.4.3.p2.0-aarch64.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 5b9dd02cb2dfa564903872576cd6586fbf4a02abdb8e180978bd84205ab302a7 imx-gpu-viv-6.4.3.p4.4-aarch32.bin +sha256 5c52bd15146c24d449638c6276c07103949c8efbc53d002518541bc37c57e424 imx-gpu-viv-6.4.3.p4.4-aarch64.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 3c88b8b11e..06fbbc7343 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.3.p2.0-aarch64 +IMX_GPU_VIV_VERSION = 6.4.3.p4.4-aarch64 else -IMX_GPU_VIV_VERSION = 6.4.3.p2.0-aarch32 +IMX_GPU_VIV_VERSION = 6.4.3.p4.4-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/Config.in b/package/freescale-imx/imx-vpu-hantro-daemon/Config.in new file mode 100644 index 0000000000..663ed4346b --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro-daemon/Config.in @@ -0,0 +1,17 @@ +comment "imx-vpu-hantro-daemon needs an i.MX-specific Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +comment "imx-vpu-hantro-daemon needs an i.MX platform with Hantro VPU" + depends on BR2_LINUX_KERNEL + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO + +config BR2_PACKAGE_IMX_VPU_HANTRO_DAEMON + bool "imx-vpu-hantro-daemon" + depends on BR2_LINUX_KERNEL + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO + select BR2_PACKAGE_IMX_VPU_HANTRO + select BR2_PACKAGE_IMX_VPU_HANTRO_VC if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + help + i.MX Hantro V4L2 Daemon specific for the NXP i.MX SoC + integrating a Hantro Video Processing Unit (VPU) such as the + i.MX8MQ/i.MX8MM/i.MX8MP. diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash new file mode 100644 index 0000000000..e952491a60 --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 83ba2798564702d74ab65f6238f95f59247d983b846de1de4c19bdfaf6dabeb8 imx-vpu-hantro-daemon-1.1.4.tar.gz +sha256 bb645f02b260955f333348100e40af76253e2cd8b116bac047230439dd53ec5a LICENSE.txt diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk new file mode 100644 index 0000000000..4f6f166b60 --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# imx-vpu-hantro-daemon +# +################################################################################ + +IMX_VPU_HANTRO_DAEMON_VERSION = 1.1.4 +IMX_VPU_HANTRO_DAEMON_SITE = $(FREESCALE_IMX_SITE) +IMX_VPU_HANTRO_DAEMON_LICENSE = NXP Semiconductor Software License Agreement +IMX_VPU_HANTRO_DAEMON_LICENSE_FILES = LICENSE.txt +IMX_VPU_HANTRO_DAEMON_REDISTRIBUTE = NO +IMX_VPU_HANTRO_DAEMON_DEPENDENCIES = imx-vpu-hantro linux +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP),y) +IMX_VPU_HANTRO_DAEMON_DEPENDENCIES += imx-vpu-hantro-vc +endif + +IMX_VPU_HANTRO_DAEMON_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + SDKTARGETSYSROOT=$(STAGING_DIR) \ + LINUX_KERNEL_ROOT=$(LINUX_DIR) \ + CTRLSW_HDRPATH="$(STAGING_DIR)/usr/include" \ + PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) + +define IMX_VPU_HANTRO_DAEMON_BUILD_CMDS + $(MAKE) -C $(@D) $(IMX_VPU_HANTRO_DAEMON_MAKE_ENV) +endef + +define IMX_VPU_HANTRO_DAEMON_INSTALL_TARGET_CMDS + $(IMX_VPU_HANTRO_DAEMON_MAKE_ENV) $(MAKE) -C $(@D) \ + DEST_DIR=$(TARGET_DIR) libdir=/usr/lib install +endef + +$(eval $(generic-package)) diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash index aadf5b121f..bd9bc37c1f 100644 --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 d5efae484c4271c098286d007590d6bf40c272d4f35702ff65625f2362715ab3 imx-vpu-hantro-vc-1.4.0.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa imx-vpu-hantro-vc-1.9.0.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk index 5f4c6faee4..3d266fb5bd 100644 --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk @@ -4,10 +4,11 @@ # ################################################################################ -IMX_VPU_HANTRO_VC_VERSION = 1.4.0 +IMX_VPU_HANTRO_VC_VERSION = 1.9.0 IMX_VPU_HANTRO_VC_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_VC_SOURCE = imx-vpu-hantro-vc-$(IMX_VPU_HANTRO_VC_VERSION).bin IMX_VPU_HANTRO_VC_DEPENDENCIES = linux +IMX_VPU_HANTRO_VC_INSTALL_STAGING = YES IMX_VPU_HANTRO_VC_LICENSE = NXP Semiconductor Software License Agreement IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING @@ -17,6 +18,13 @@ define IMX_VPU_HANTRO_VC_EXTRACT_CMDS $(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE)) endef +define IMX_VPU_HANTRO_VC_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/ + cp -dpfr $(@D)/usr/include/hantro_VC8000E_enc/*.h $(STAGING_DIR)/usr/include/ + $(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so $(STAGING_DIR)/usr/lib/libhantro_vc8000e.so + $(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so.1 $(STAGING_DIR)/usr/lib/libhantro_vc8000e.so.1 +endef + define IMX_VPU_HANTRO_VC_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so $(TARGET_DIR)/usr/lib/libhantro_vc8000e.so $(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so.1 $(TARGET_DIR)/usr/lib/libhantro_vc8000e.so.1 diff --git a/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch b/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch new file mode 100644 index 0000000000..427ebeb38a --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch @@ -0,0 +1,45 @@ +From 73cd57c18066ff863335a8616d0b348541d26118 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Tue, 15 Nov 2022 21:43:47 +0100 +Subject: [PATCH] Fix Linux kernel version header + +- Up to kernel 5.10, NXP was using ION for memory management +- Starting with 5.15 kernels, NXP uses DMABUF and the ION header is no + longer in the kernel +- So keep the previous patch for people using kernel <= 5.10 +- Add path to the version.h header as imx-vpu-hantro will only include + ion.h depending on the kernel version + +Signed-off-by: Gary Bisson +--- + Makefile_G1G2 | 1 + + Makefile_H1 | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Makefile_G1G2 b/Makefile_G1G2 +index 25884fa..8e03e91 100755 +--- a/Makefile_G1G2 ++++ b/Makefile_G1G2 +@@ -11,6 +11,7 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so + INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc + #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver + INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include ++INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi + INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi + + CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \ +diff --git a/Makefile_H1 b/Makefile_H1 +index 479940a..7ac6f8d 100755 +--- a/Makefile_H1 ++++ b/Makefile_H1 +@@ -18,6 +18,7 @@ ENV = -DENC_MODULE_PATH=\\\"/dev/mxc_hantro_h1\\\" + ENV += -DEWL_NO_HW_TIMEOUT + ENV += -DUSE_ION + ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include ++ENV += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi + ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi + + ifeq ($(CFG_SECURE_DATA_PATH), y) +-- +2.35.1 + diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash index dd3b167e3e..637d7898cf 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00 imx-vpu-hantro-1.22.0.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3 imx-vpu-hantro-1.27.0.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk index 9d34c7add7..4cfc8f41ff 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.22.0 +IMX_VPU_HANTRO_VERSION = 1.27.0 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index ccb28bc4f6..5079de9840 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,3 +1,3 @@ # locally computed -sha256 b816ab94b1d248cfc5fe5f6381422346c273d01760bb324303e0298e10bd46e2 kernel-module-imx-gpu-viv-82c6cb6c607424403b8d76805bb17e7be74292f6.tar.gz -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 0754114b3088a46b9fee9a5bd1c7b9ec94b6ca656ed930c4cad9e04382e8e372 kernel-module-imx-gpu-viv-00fe5a0bedc07337c873f93998da9025083116ed.tar.gz +sha256 0754114b3088a46b9fee9a5bd1c7b9ec94b6ca656ed930c4cad9e04382e8e372 COPYING diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk index d301494a0b..5c96ba0390 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KERNEL_MODULE_IMX_GPU_VIV_VERSION = 82c6cb6c607424403b8d76805bb17e7be74292f6 +KERNEL_MODULE_IMX_GPU_VIV_VERSION = 00fe5a0bedc07337c873f93998da9025083116ed KERNEL_MODULE_IMX_GPU_VIV_SITE = \ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0 diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 35084a50ac..23a7c3fc05 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,3 +1,3 @@ -# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.9.sha256sum -sha256 28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962 gdk-pixbuf-2.42.9.tar.xz +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.sha256sum +sha256 ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b gdk-pixbuf-2.42.10.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 4a513effbd..561e191569 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.42 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).9 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPL-2.1+ diff --git a/package/gitlab-runner/gitlab-runner.hash b/package/gitlab-runner/gitlab-runner.hash index f4fab595b5..2d39eef39b 100644 --- a/package/gitlab-runner/gitlab-runner.hash +++ b/package/gitlab-runner/gitlab-runner.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 63a7963f750ec45a7cb34a660b7247a0aa6def98706b7bd80efc95053e66822d gitlab-runner-14.5.1.tar.gz +sha256 f7482926d20dbf98434e3d34662d93b601166eb784c6fb4bc56f89c1a4eff19d gitlab-runner-15.5.0.tar.gz sha256 0ae968b7ddd25da0209c3c6594aac1ac74ddf90385940b02b420463e2e0734de LICENSE diff --git a/package/gitlab-runner/gitlab-runner.mk b/package/gitlab-runner/gitlab-runner.mk index 9542275135..ecd109bf6e 100644 --- a/package/gitlab-runner/gitlab-runner.mk +++ b/package/gitlab-runner/gitlab-runner.mk @@ -4,7 +4,7 @@ # ################################################################################ -GITLAB_RUNNER_VERSION = 14.5.1 +GITLAB_RUNNER_VERSION = 15.5.0 GITLAB_RUNNER_SITE = https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(GITLAB_RUNNER_VERSION) GITLAB_RUNNER_LICENSE = MIT GITLAB_RUNNER_LICENSE_FILES = LICENSE diff --git a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch b/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch new file mode 100644 index 0000000000..39b8c0b51e --- /dev/null +++ b/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch @@ -0,0 +1,42 @@ +From 45fe4ac55ad88b6793d225e676205c30388ec138 Mon Sep 17 00:00:00 2001 +From: Ryan Volz +Date: Fri, 16 Sep 2022 21:05:51 -0400 +Subject: [PATCH] blocks: Including missing in blockinterleaver. + +Signed-off-by: Ryan Volz +[Retrieved (and backported) from: +https://github.com/gnuradio/gnuradio/commit/463c3477549b26b32d9b73eef30044e97c4eee64] +Signed-off-by: Gwenhael Goavec-Merou +--- + gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 2 +- + gr-blocks/lib/blockinterleaving.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h +index 9d4e0f249..df831fe5a 100644 +--- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h ++++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h +@@ -12,7 +12,7 @@ + #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H + + #include +- ++#include + + namespace gr { + namespace blocks { +diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc +index fc5873e11..768ad9ea7 100644 +--- a/gr-blocks/lib/blockinterleaving.cc ++++ b/gr-blocks/lib/blockinterleaving.cc +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + namespace gr { + namespace blocks { +-- +2.35.1 + diff --git a/package/gnuradio/0001-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch b/package/gnuradio/0001-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch deleted file mode 100644 index 532bebcf2e..0000000000 --- a/package/gnuradio/0001-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f643bc12100c67288adda3699a9e61d6a66fb529 Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 7 Feb 2020 16:49:30 +0100 -Subject: [PATCH] gr-digital:glfsr.h: drop boost/cstdint.hpp and use cstdint - -gr-digital/glfsr.h include boost/cstdint.hpp to have uintxx_t. -These types are in boost namespace but nor using namespace xxx, nor boost:: are used. -The result is : -In file included from /home/buildroot/autobuild/instance-0/output-1/build/gnuradio-3.8.0.0/gr-digital/lib/glfsr.cc:23: -/home/buildroot/autobuild/instance-0/output-1/build/gnuradio-3.8.0.0/gr-digital/lib/../include/gnuradio/digital/glfsr.h:42:5: error: 'uint32_t' does not name a type; did you mean 'u_int32_t'? -uint32_t d_shift_register; -^~~~~~~~ -u_int32_t - -Since Gnuradio policy is Less boost == better and C++11 is used, use cstdint -instead of boost/cstdint.hpp. - -[backported from 475e4a156b516c089175afb998acdc80b740b437] -Signed-off-by: Gwenhael Goavec-Merou ---- - gr-digital/include/gnuradio/digital/glfsr.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gr-digital/include/gnuradio/digital/glfsr.h b/gr-digital/include/gnuradio/digital/glfsr.h -index 0b5141f1f..1003bcd01 100644 ---- a/gr-digital/include/gnuradio/digital/glfsr.h -+++ b/gr-digital/include/gnuradio/digital/glfsr.h -@@ -24,7 +24,7 @@ - #define INCLUDED_DIGITAL_GLFSR_H - - #include --#include -+#include - - namespace gr { - namespace digital { --- -2.24.1 - diff --git a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch b/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch new file mode 100644 index 0000000000..f1ad77580f --- /dev/null +++ b/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch @@ -0,0 +1,33 @@ +From 901c2ad1ac88908a2e6db5615d5af39a218d826d Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Fri, 23 Sep 2022 08:41:26 +0200 +Subject: [PATCH] blocks/blockinterleaving.h: add missing cstddef header + (required for size_t) + +Fix build failure like: + +gnuradio/gr-blocks/lib/../include/gnuradio/blocks/blockinterleaving.h:25:36: error: ‘size_t’ was not declared in this scope + +This failure is due to the miss of cstddef include + +Signed-off-by: Gwenhael Goavec-Merou +[Upstream status: https://github.com/gnuradio/gnuradio/pull/6188] +--- + gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h +index df831fe5a..33c59e35b 100644 +--- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h ++++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + namespace gr { + namespace blocks { +-- +2.35.1 + diff --git a/package/gnuradio/0002-boost_qualify_placeholders_with_their_full_namespace.patch b/package/gnuradio/0002-boost_qualify_placeholders_with_their_full_namespace.patch deleted file mode 100644 index 431cc12522..0000000000 --- a/package/gnuradio/0002-boost_qualify_placeholders_with_their_full_namespace.patch +++ /dev/null @@ -1,1012 +0,0 @@ -From 5d4c317a372c77aa70df6ab3403d161cd41a7d17 Mon Sep 17 00:00:00 2001 -From: ponce -Date: Sun, 17 May 2020 14:02:57 +0200 -Subject: [PATCH] boost: qualify placeholders with their full namespace. - -This is needed with boost >= 1.73.0. - -[Upstream status: https://github.com/gnuradio/gnuradio/pull/3566] - -Signed-off-by: ponce -Signed-off-by: Gwenhael Goavec-Merou ---- - .../(exported from wiki) Message Passing.txt | 8 +++--- - gnuradio-runtime/lib/block.cc | 3 ++- - gr-blocks/lib/copy_impl.cc | 4 ++- - gr-blocks/lib/message_debug_impl.cc | 13 +++++++--- - gr-blocks/lib/message_strobe_impl.cc | 5 ++-- - gr-blocks/lib/message_strobe_random_impl.cc | 5 ++-- - gr-blocks/lib/multiply_matrix_impl.cc | 11 +++++--- - gr-blocks/lib/mute_impl.cc | 5 ++-- - gr-blocks/lib/nop_impl.cc | 5 ++-- - gr-blocks/lib/pdu_filter_impl.cc | 5 ++-- - gr-blocks/lib/pdu_remove_impl.cc | 5 ++-- - gr-blocks/lib/pdu_set_impl.cc | 4 ++- - gr-blocks/lib/random_pdu_impl.cc | 5 ++-- - gr-blocks/lib/repeat_impl.cc | 5 ++-- - gr-blocks/lib/socket_pdu_impl.cc | 18 ++++++++----- - .../lib/tagged_stream_multiply_length_impl.cc | 7 +++--- - gr-blocks/lib/tuntap_pdu_impl.cc | 3 ++- - gr-digital/lib/chunks_to_symbols_impl.cc | 5 ++-- - .../lib/constellation_receiver_cb_impl.cc | 14 ++++++----- - gr-digital/lib/costas_loop_cc_impl.cc | 4 ++- - gr-digital/lib/crc32_async_bb_impl.cc | 8 ++++-- - gr-digital/lib/header_payload_demux_impl.cc | 7 +++--- - .../lib/protocol_formatter_async_impl.cc | 4 ++- - gr-fec/lib/async_decoder_impl.cc | 8 ++++-- - gr-fec/lib/async_encoder_impl.cc | 8 ++++-- - gr-fec/lib/depuncture_bb_impl.cc | 4 ++- - gr-fec/lib/puncture_bb_impl.cc | 4 ++- - gr-fec/lib/puncture_ff_impl.cc | 4 ++- - gr-filter/lib/freq_xlating_fir_filter_impl.cc | 2 +- - gr-filter/lib/mmse_resampler_cc_impl.cc | 5 ++-- - gr-filter/lib/mmse_resampler_ff_impl.cc | 5 ++-- - gr-qtgui/lib/const_sink_c_impl.cc | 5 ++-- - gr-qtgui/lib/edit_box_msg_impl.cc | 4 ++- - gr-qtgui/lib/freq_sink_c_impl.cc | 12 ++++++--- - gr-qtgui/lib/freq_sink_f_impl.cc | 12 ++++++--- - gr-qtgui/lib/histogram_sink_f_impl.cc | 5 ++-- - gr-qtgui/lib/sink_c_impl.cc | 4 ++- - gr-qtgui/lib/sink_f_impl.cc | 4 ++- - gr-qtgui/lib/time_raster_sink_b_impl.cc | 4 ++- - gr-qtgui/lib/time_raster_sink_f_impl.cc | 4 ++- - gr-qtgui/lib/time_sink_c_impl.cc | 4 ++- - gr-qtgui/lib/time_sink_f_impl.cc | 4 ++- - gr-qtgui/lib/waterfall_sink_c_impl.cc | 13 +++++++--- - gr-qtgui/lib/waterfall_sink_f_impl.cc | 13 +++++++--- - gr-uhd/lib/usrp_block_impl.cc | 25 ++++++++++++------- - gr-uhd/lib/usrp_source_impl.cc | 5 ++-- - gr-zeromq/lib/pub_msg_sink_impl.cc | 4 ++- - gr-zeromq/lib/push_msg_sink_impl.cc | 4 ++- - 48 files changed, 213 insertions(+), 106 deletions(-) - -diff --git a/docs/usage-manual/(exported from wiki) Message Passing.txt b/docs/usage-manual/(exported from wiki) Message Passing.txt -index 4654bd5da..551e71022 100644 ---- a/docs/usage-manual/(exported from wiki) Message Passing.txt -+++ b/docs/usage-manual/(exported from wiki) Message Passing.txt -@@ -94,7 +94,7 @@ must then bind this port to the message handler. For this, we use - Boost's 'bind' function: - - set_msg_handler(pmt::pmt_t port_id, -- boost::bind(&block_class::message_handler_function, this, _1)); -+ boost::bind(&block_class::message_handler_function, this, boost::placeholders::_1)); - - In Python: - -@@ -241,15 +241,15 @@ The constructor of this block looks like this: - { - message_port_register_in(pmt::mp("print")); - set_msg_handler(pmt::mp("print"), -- boost::bind(&message_debug_impl::print, this, _1)); -+ boost::bind(&message_debug_impl::print, this, boost::placeholders::_1)); - - message_port_register_in(pmt::mp("store")); - set_msg_handler(pmt::mp("store"), -- boost::bind(&message_debug_impl::store, this, _1)); -+ boost::bind(&message_debug_impl::store, this, boost::placeholders::_1)); - - message_port_register_in(pmt::mp("print_pdu")); - set_msg_handler(pmt::mp("print_pdu"), -- boost::bind(&message_debug_impl::print_pdu, this, _1)); -+ boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1)); - } - - -diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc -index 591428390..fca4cab97 100644 ---- a/gnuradio-runtime/lib/block.cc -+++ b/gnuradio-runtime/lib/block.cc -@@ -61,7 +61,8 @@ block::block(const std::string& name, - { - global_block_registry.register_primitive(alias(), this); - message_port_register_in(d_system_port); -- set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1)); -+ set_msg_handler(d_system_port, -+ boost::bind(&block::system_handler, this, boost::placeholders::_1)); - - configure_default_loggers(d_logger, d_debug_logger, symbol_name()); - } -diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc -index c377e57b1..b55196c24 100644 ---- a/gr-blocks/lib/copy_impl.cc -+++ b/gr-blocks/lib/copy_impl.cc -@@ -44,7 +44,9 @@ copy_impl::copy_impl(size_t itemsize) - d_enabled(true) - { - message_port_register_in(pmt::mp("en")); -- set_msg_handler(pmt::mp("en"), boost::bind(©_impl::handle_enable, this, _1)); -+ set_msg_handler( -+ pmt::mp("en"), -+ boost::bind(©_impl::handle_enable, this, boost::placeholders::_1)); - } - - copy_impl::~copy_impl() {} -diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc -index a8c84aa50..916f97ca3 100644 ---- a/gr-blocks/lib/message_debug_impl.cc -+++ b/gr-blocks/lib/message_debug_impl.cc -@@ -90,14 +90,19 @@ message_debug_impl::message_debug_impl() - : block("message_debug", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)) - { - message_port_register_in(pmt::mp("print")); -- set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1)); -+ set_msg_handler( -+ pmt::mp("print"), -+ boost::bind(&message_debug_impl::print, this, boost::placeholders::_1)); - - message_port_register_in(pmt::mp("store")); -- set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1)); -+ set_msg_handler( -+ pmt::mp("store"), -+ boost::bind(&message_debug_impl::store, this, boost::placeholders::_1)); - - message_port_register_in(pmt::mp("print_pdu")); -- set_msg_handler(pmt::mp("print_pdu"), -- boost::bind(&message_debug_impl::print_pdu, this, _1)); -+ set_msg_handler( -+ pmt::mp("print_pdu"), -+ boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1)); - } - - message_debug_impl::~message_debug_impl() {} -diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc -index 038eeae5a..d131b8166 100644 ---- a/gr-blocks/lib/message_strobe_impl.cc -+++ b/gr-blocks/lib/message_strobe_impl.cc -@@ -53,8 +53,9 @@ message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, long period_ms) - message_port_register_out(d_port); - - message_port_register_in(pmt::mp("set_msg")); -- set_msg_handler(pmt::mp("set_msg"), -- boost::bind(&message_strobe_impl::set_msg, this, _1)); -+ set_msg_handler( -+ pmt::mp("set_msg"), -+ boost::bind(&message_strobe_impl::set_msg, this, boost::placeholders::_1)); - } - - message_strobe_impl::~message_strobe_impl() {} -diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc -index 0ab5d6adc..53e641fba 100644 ---- a/gr-blocks/lib/message_strobe_random_impl.cc -+++ b/gr-blocks/lib/message_strobe_random_impl.cc -@@ -74,8 +74,9 @@ message_strobe_random_impl::message_strobe_random_impl( - new gr::thread::thread(boost::bind(&message_strobe_random_impl::run, this))); - - message_port_register_in(pmt::mp("set_msg")); -- set_msg_handler(pmt::mp("set_msg"), -- boost::bind(&message_strobe_random_impl::set_msg, this, _1)); -+ set_msg_handler( -+ pmt::mp("set_msg"), -+ boost::bind(&message_strobe_random_impl::set_msg, this, boost::placeholders::_1)); - } - - long message_strobe_random_impl::next_delay() -diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc -index e1b9c746c..e38953bab 100644 ---- a/gr-blocks/lib/multiply_matrix_impl.cc -+++ b/gr-blocks/lib/multiply_matrix_impl.cc -@@ -235,9 +235,10 @@ multiply_matrix_impl::multiply_matrix_impl( - - pmt::pmt_t port_name = pmt::string_to_symbol("set_A"); - message_port_register_in(port_name); -- set_msg_handler( -- port_name, -- boost::bind(&multiply_matrix_impl::msg_handler_A, this, _1)); -+ set_msg_handler(port_name, -+ boost::bind(&multiply_matrix_impl::msg_handler_A, -+ this, -+ boost::placeholders::_1)); - } - - template <> -@@ -257,7 +258,9 @@ multiply_matrix_impl::multiply_matrix_impl( - pmt::pmt_t port_name = pmt::string_to_symbol("set_A"); - message_port_register_in(port_name); - set_msg_handler(port_name, -- boost::bind(&multiply_matrix_impl::msg_handler_A, this, _1)); -+ boost::bind(&multiply_matrix_impl::msg_handler_A, -+ this, -+ boost::placeholders::_1)); - } - - -diff --git a/gr-blocks/lib/mute_impl.cc b/gr-blocks/lib/mute_impl.cc -index bd65ce207..5c732f8f4 100644 ---- a/gr-blocks/lib/mute_impl.cc -+++ b/gr-blocks/lib/mute_impl.cc -@@ -47,8 +47,9 @@ mute_impl::mute_impl(bool mute) - d_mute(mute) - { - this->message_port_register_in(pmt::intern("set_mute")); -- this->set_msg_handler(pmt::intern("set_mute"), -- boost::bind(&mute_impl::set_mute_pmt, this, _1)); -+ this->set_msg_handler( -+ pmt::intern("set_mute"), -+ boost::bind(&mute_impl::set_mute_pmt, this, boost::placeholders::_1)); - } - - template -diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc -index db216d97a..e9baee587 100644 ---- a/gr-blocks/lib/nop_impl.cc -+++ b/gr-blocks/lib/nop_impl.cc -@@ -44,8 +44,9 @@ nop_impl::nop_impl(size_t sizeof_stream_item) - { - // Arrange to have count_received_msgs called when messages are received. - message_port_register_in(pmt::mp("port")); -- set_msg_handler(pmt::mp("port"), -- boost::bind(&nop_impl::count_received_msgs, this, _1)); -+ set_msg_handler( -+ pmt::mp("port"), -+ boost::bind(&nop_impl::count_received_msgs, this, boost::placeholders::_1)); - } - - nop_impl::~nop_impl() {} -diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc -index b0748eec0..63cfe47e4 100644 ---- a/gr-blocks/lib/pdu_filter_impl.cc -+++ b/gr-blocks/lib/pdu_filter_impl.cc -@@ -44,8 +44,9 @@ pdu_filter_impl::pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert) - { - message_port_register_out(pdu::pdu_port_id()); - message_port_register_in(pdu::pdu_port_id()); -- set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&pdu_filter_impl::handle_msg, this, _1)); -+ set_msg_handler( -+ pdu::pdu_port_id(), -+ boost::bind(&pdu_filter_impl::handle_msg, this, boost::placeholders::_1)); - } - - void pdu_filter_impl::handle_msg(pmt::pmt_t pdu) -diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc -index 19cc4dc76..2b97f827b 100644 ---- a/gr-blocks/lib/pdu_remove_impl.cc -+++ b/gr-blocks/lib/pdu_remove_impl.cc -@@ -42,8 +42,9 @@ pdu_remove_impl::pdu_remove_impl(pmt::pmt_t k) - { - message_port_register_out(pdu::pdu_port_id()); - message_port_register_in(pdu::pdu_port_id()); -- set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&pdu_remove_impl::handle_msg, this, _1)); -+ set_msg_handler( -+ pdu::pdu_port_id(), -+ boost::bind(&pdu_remove_impl::handle_msg, this, boost::placeholders::_1)); - } - - void pdu_remove_impl::handle_msg(pmt::pmt_t pdu) -diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc -index 40fbc3cd8..af59ef70f 100644 ---- a/gr-blocks/lib/pdu_set_impl.cc -+++ b/gr-blocks/lib/pdu_set_impl.cc -@@ -43,7 +43,9 @@ pdu_set_impl::pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v) - { - message_port_register_out(pdu::pdu_port_id()); - message_port_register_in(pdu::pdu_port_id()); -- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1)); -+ set_msg_handler( -+ pdu::pdu_port_id(), -+ boost::bind(&pdu_set_impl::handle_msg, this, boost::placeholders::_1)); - } - - void pdu_set_impl::handle_msg(pmt::pmt_t pdu) -diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc -index 75d825aef..6c142c353 100644 ---- a/gr-blocks/lib/random_pdu_impl.cc -+++ b/gr-blocks/lib/random_pdu_impl.cc -@@ -52,8 +52,9 @@ random_pdu_impl::random_pdu_impl(int min_items, - { - message_port_register_out(pdu::pdu_port_id()); - message_port_register_in(pmt::mp("generate")); -- set_msg_handler(pmt::mp("generate"), -- boost::bind(&random_pdu_impl::generate_pdu, this, _1)); -+ set_msg_handler( -+ pmt::mp("generate"), -+ boost::bind(&random_pdu_impl::generate_pdu, this, boost::placeholders::_1)); - if (length_modulo < 1) - throw std::runtime_error("length_module must be >= 1"); - if (max_items < length_modulo) -diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc -index 189fbc894..d6569625d 100644 ---- a/gr-blocks/lib/repeat_impl.cc -+++ b/gr-blocks/lib/repeat_impl.cc -@@ -44,8 +44,9 @@ repeat_impl::repeat_impl(size_t itemsize, int interp) - d_interp(interp) - { - message_port_register_in(pmt::mp("interpolation")); -- set_msg_handler(pmt::mp("interpolation"), -- boost::bind(&repeat_impl::msg_set_interpolation, this, _1)); -+ set_msg_handler( -+ pmt::mp("interpolation"), -+ boost::bind(&repeat_impl::msg_set_interpolation, this, boost::placeholders::_1)); - } - - void repeat_impl::msg_set_interpolation(pmt::pmt_t msg) -diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc -index df69f07ad..163eec3a6 100644 ---- a/gr-blocks/lib/socket_pdu_impl.cc -+++ b/gr-blocks/lib/socket_pdu_impl.cc -@@ -101,7 +101,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - start_tcp_accept(); - - set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&socket_pdu_impl::tcp_server_send, this, _1)); -+ boost::bind(&socket_pdu_impl::tcp_server_send, -+ this, -+ boost::placeholders::_1)); - } else if (type == "TCP_CLIENT") { - boost::system::error_code error = boost::asio::error::host_not_found; - d_tcp_socket.reset(new boost::asio::ip::tcp::socket(d_io_service)); -@@ -111,7 +113,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay)); - - set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&socket_pdu_impl::tcp_client_send, this, _1)); -+ boost::bind(&socket_pdu_impl::tcp_client_send, -+ this, -+ boost::placeholders::_1)); - - d_tcp_socket->async_read_some( - boost::asio::buffer(d_rxbuf), -@@ -130,8 +134,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - boost::asio::placeholders::error, - boost::asio::placeholders::bytes_transferred)); - -- set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&socket_pdu_impl::udp_send, this, _1)); -+ set_msg_handler( -+ pdu::pdu_port_id(), -+ boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1)); - } else if (type == "UDP_CLIENT") { - d_udp_socket.reset( - new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); -@@ -143,8 +148,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - boost::asio::placeholders::error, - boost::asio::placeholders::bytes_transferred)); - -- set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&socket_pdu_impl::udp_send, this, _1)); -+ set_msg_handler( -+ pdu::pdu_port_id(), -+ boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1)); - } else - throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type"); - -diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc -index 30f4c46dc..34b95d647 100644 ---- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc -+++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc -@@ -49,9 +49,10 @@ tagged_stream_multiply_length_impl::tagged_stream_multiply_length_impl( - set_tag_propagation_policy(TPP_DONT); - set_relative_rate(1, 1); - message_port_register_in(pmt::intern("set_scalar")); -- set_msg_handler( -- pmt::intern("set_scalar"), -- boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1)); -+ set_msg_handler(pmt::intern("set_scalar"), -+ boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, -+ this, -+ boost::placeholders::_1)); - } - - tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl() {} -diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc -index 4343ae1dc..0d9d7e28c 100644 ---- a/gr-blocks/lib/tuntap_pdu_impl.cc -+++ b/gr-blocks/lib/tuntap_pdu_impl.cc -@@ -96,7 +96,8 @@ tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU, bool istunflag) - - // set up input message port - message_port_register_in(pdu::pdu_port_id()); -- set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1)); -+ set_msg_handler(pdu::pdu_port_id(), -+ boost::bind(&tuntap_pdu_impl::send, this, boost::placeholders::_1)); - } - - int tuntap_pdu_impl::tun_alloc(char* dev, int flags) -diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc -index 26d590a66..a6810a69e 100644 ---- a/gr-digital/lib/chunks_to_symbols_impl.cc -+++ b/gr-digital/lib/chunks_to_symbols_impl.cc -@@ -53,8 +53,9 @@ chunks_to_symbols_impl::chunks_to_symbols_impl( - this->message_port_register_in(pmt::mp("set_symbol_table")); - this->set_msg_handler( - pmt::mp("set_symbol_table"), -- boost::bind( -- &chunks_to_symbols_impl::handle_set_symbol_table, this, _1)); -+ boost::bind(&chunks_to_symbols_impl::handle_set_symbol_table, -+ this, -+ boost::placeholders::_1)); - } - - template -diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc -index 7fb7559d5..7e216ece5 100644 ---- a/gr-digital/lib/constellation_receiver_cb_impl.cc -+++ b/gr-digital/lib/constellation_receiver_cb_impl.cc -@@ -61,14 +61,16 @@ constellation_receiver_cb_impl::constellation_receiver_cb_impl( - "This receiver only works with constellations of dimension 1."); - - message_port_register_in(pmt::mp("set_constellation")); -- set_msg_handler( -- pmt::mp("set_constellation"), -- boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, this, _1)); -+ set_msg_handler(pmt::mp("set_constellation"), -+ boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, -+ this, -+ boost::placeholders::_1)); - - message_port_register_in(pmt::mp("rotate_phase")); -- set_msg_handler( -- pmt::mp("rotate_phase"), -- boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, this, _1)); -+ set_msg_handler(pmt::mp("rotate_phase"), -+ boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, -+ this, -+ boost::placeholders::_1)); - } - - constellation_receiver_cb_impl::~constellation_receiver_cb_impl() {} -diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc -index c3b30834e..e1229e6f4 100644 ---- a/gr-digital/lib/costas_loop_cc_impl.cc -+++ b/gr-digital/lib/costas_loop_cc_impl.cc -@@ -82,7 +82,9 @@ costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order, bool use_snr) - - message_port_register_in(pmt::mp("noise")); - set_msg_handler(pmt::mp("noise"), -- boost::bind(&costas_loop_cc_impl::handle_set_noise, this, _1)); -+ boost::bind(&costas_loop_cc_impl::handle_set_noise, -+ this, -+ boost::placeholders::_1)); - } - - costas_loop_cc_impl::~costas_loop_cc_impl() {} -diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc -index bffbb2a73..66143866c 100644 ---- a/gr-digital/lib/crc32_async_bb_impl.cc -+++ b/gr-digital/lib/crc32_async_bb_impl.cc -@@ -48,9 +48,13 @@ crc32_async_bb_impl::crc32_async_bb_impl(bool check) - message_port_register_out(d_out_port); - - if (check) -- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this, _1)); -+ set_msg_handler( -+ d_in_port, -+ boost::bind(&crc32_async_bb_impl::check, this, boost::placeholders::_1)); - else -- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this, _1)); -+ set_msg_handler( -+ d_in_port, -+ boost::bind(&crc32_async_bb_impl::calc, this, boost::placeholders::_1)); - } - - crc32_async_bb_impl::~crc32_async_bb_impl() {} -diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc -index 98c805fb2..7cc1e0a4e 100644 ---- a/gr-digital/lib/header_payload_demux_impl.cc -+++ b/gr-digital/lib/header_payload_demux_impl.cc -@@ -150,9 +150,10 @@ header_payload_demux_impl::header_payload_demux_impl( - } - set_tag_propagation_policy(TPP_DONT); - message_port_register_in(msg_port_id()); -- set_msg_handler( -- msg_port_id(), -- boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1)); -+ set_msg_handler(msg_port_id(), -+ boost::bind(&header_payload_demux_impl::parse_header_data_msg, -+ this, -+ boost::placeholders::_1)); - for (size_t i = 0; i < special_tags.size(); i++) { - d_special_tags.push_back(pmt::string_to_symbol(special_tags[i])); - d_special_tags_last_value.push_back(pmt::PMT_NIL); -diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc -index 84b693745..c08bbb9ae 100644 ---- a/gr-digital/lib/protocol_formatter_async_impl.cc -+++ b/gr-digital/lib/protocol_formatter_async_impl.cc -@@ -55,7 +55,9 @@ protocol_formatter_async_impl::protocol_formatter_async_impl( - message_port_register_out(d_pld_port); - - set_msg_handler(d_in_port, -- boost::bind(&protocol_formatter_async_impl::append, this, _1)); -+ boost::bind(&protocol_formatter_async_impl::append, -+ this, -+ boost::placeholders::_1)); - } - - protocol_formatter_async_impl::~protocol_formatter_async_impl() {} -diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc -index e7a668c83..5d68d13ae 100644 ---- a/gr-fec/lib/async_decoder_impl.cc -+++ b/gr-fec/lib/async_decoder_impl.cc -@@ -65,10 +65,14 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder, - if (d_packed) { - d_pack = new blocks::kernel::pack_k_bits(8); - set_msg_handler(d_in_port, -- boost::bind(&async_decoder_impl::decode_packed, this, _1)); -+ boost::bind(&async_decoder_impl::decode_packed, -+ this, -+ boost::placeholders::_1)); - } else { - set_msg_handler(d_in_port, -- boost::bind(&async_decoder_impl::decode_unpacked, this, _1)); -+ boost::bind(&async_decoder_impl::decode_unpacked, -+ this, -+ boost::placeholders::_1)); - } - - // The maximum frame size is set by the initial frame size of the decoder. -diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc -index 811d55601..506ae5c7e 100644 ---- a/gr-fec/lib/async_encoder_impl.cc -+++ b/gr-fec/lib/async_encoder_impl.cc -@@ -64,7 +64,9 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, - - if (d_packed) { - set_msg_handler(d_in_port, -- boost::bind(&async_encoder_impl::encode_packed, this, _1)); -+ boost::bind(&async_encoder_impl::encode_packed, -+ this, -+ boost::placeholders::_1)); - - d_unpack = new blocks::kernel::unpack_k_bits(8); - -@@ -74,7 +76,9 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, - - } else { - set_msg_handler(d_in_port, -- boost::bind(&async_encoder_impl::encode_unpacked, this, _1)); -+ boost::bind(&async_encoder_impl::encode_unpacked, -+ this, -+ boost::placeholders::_1)); - } - - if (d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) { -diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc -index 27d00bb5b..f64dad45f 100644 ---- a/gr-fec/lib/depuncture_bb_impl.cc -+++ b/gr-fec/lib/depuncture_bb_impl.cc -@@ -74,7 +74,9 @@ depuncture_bb_impl::depuncture_bb_impl(int puncsize, int puncpat, int delay, cha - set_fixed_rate(true); - set_relative_rate((uint64_t)d_puncsize, (uint64_t)(d_puncsize - d_puncholes)); - set_output_multiple(d_puncsize); -- // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, _1)); -+ // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, -+ // this, -+ // boost::placeholders::_1)); - } - - depuncture_bb_impl::~depuncture_bb_impl() {} -diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc -index a365d6a69..f2078d8c5 100644 ---- a/gr-fec/lib/puncture_bb_impl.cc -+++ b/gr-fec/lib/puncture_bb_impl.cc -@@ -72,7 +72,9 @@ puncture_bb_impl::puncture_bb_impl(int puncsize, int puncpat, int delay) - set_fixed_rate(true); - set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize); - set_output_multiple(d_puncsize - d_puncholes); -- // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, this, _1)); -+ // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, -+ // this, -+ // boost::placeholders::_1)); - } - - puncture_bb_impl::~puncture_bb_impl() {} -diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc -index c95288d69..95fb649a8 100644 ---- a/gr-fec/lib/puncture_ff_impl.cc -+++ b/gr-fec/lib/puncture_ff_impl.cc -@@ -72,7 +72,9 @@ puncture_ff_impl::puncture_ff_impl(int puncsize, int puncpat, int delay) - set_fixed_rate(true); - set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize); - set_output_multiple(d_puncsize - d_puncholes); -- // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, this, _1)); -+ // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, -+ // this, -+ // boost::placeholders::_1)); - } - - puncture_ff_impl::~puncture_ff_impl() {} -diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.cc b/gr-filter/lib/freq_xlating_fir_filter_impl.cc -index 8ddc967ba..50ec58947 100644 ---- a/gr-filter/lib/freq_xlating_fir_filter_impl.cc -+++ b/gr-filter/lib/freq_xlating_fir_filter_impl.cc -@@ -72,7 +72,7 @@ freq_xlating_fir_filter_impl::freq_xlating_fir_filter_impl( - boost::bind( - &freq_xlating_fir_filter_impl::handle_set_center_freq, - this, -- _1)); -+ boost::placeholders::_1)); - } - - template -diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc -index 59f9eacfa..bdce51716 100644 ---- a/gr-filter/lib/mmse_resampler_cc_impl.cc -+++ b/gr-filter/lib/mmse_resampler_cc_impl.cc -@@ -52,8 +52,9 @@ mmse_resampler_cc_impl::mmse_resampler_cc_impl(float phase_shift, float resamp_r - - set_inverse_relative_rate(d_mu_inc); - message_port_register_in(pmt::intern("msg_in")); -- set_msg_handler(pmt::intern("msg_in"), -- boost::bind(&mmse_resampler_cc_impl::handle_msg, this, _1)); -+ set_msg_handler( -+ pmt::intern("msg_in"), -+ boost::bind(&mmse_resampler_cc_impl::handle_msg, this, boost::placeholders::_1)); - } - - mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; } -diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc -index 342d9f767..3d7272711 100644 ---- a/gr-filter/lib/mmse_resampler_ff_impl.cc -+++ b/gr-filter/lib/mmse_resampler_ff_impl.cc -@@ -53,8 +53,9 @@ mmse_resampler_ff_impl::mmse_resampler_ff_impl(float phase_shift, float resamp_r - set_inverse_relative_rate(d_mu_inc); - - message_port_register_in(pmt::intern("msg_in")); -- set_msg_handler(pmt::intern("msg_in"), -- boost::bind(&mmse_resampler_ff_impl::handle_msg, this, _1)); -+ set_msg_handler( -+ pmt::intern("msg_in"), -+ boost::bind(&mmse_resampler_ff_impl::handle_msg, this, boost::placeholders::_1)); - } - - mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; } -diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc -index 852f6ee10..04d421d03 100644 ---- a/gr-qtgui/lib/const_sink_c_impl.cc -+++ b/gr-qtgui/lib/const_sink_c_impl.cc -@@ -69,8 +69,9 @@ const_sink_c_impl::const_sink_c_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&const_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&const_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); - - for (int i = 0; i < d_nconnections; i++) { - d_residbufs_real.push_back( -diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc -index 8713aa820..39546cbf3 100644 ---- a/gr-qtgui/lib/edit_box_msg_impl.cc -+++ b/gr-qtgui/lib/edit_box_msg_impl.cc -@@ -158,7 +158,9 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type, - message_port_register_out(d_port); - message_port_register_in(pmt::mp("val")); - -- set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1)); -+ set_msg_handler( -+ pmt::mp("val"), -+ boost::bind(&edit_box_msg_impl::set_value, this, boost::placeholders::_1)); - } - - edit_box_msg_impl::~edit_box_msg_impl() -diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc -index 3a34df6ec..fe231699f 100644 ---- a/gr-qtgui/lib/freq_sink_c_impl.cc -+++ b/gr-qtgui/lib/freq_sink_c_impl.cc -@@ -82,17 +82,23 @@ freq_sink_c_impl::freq_sink_c_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, boost::bind(&freq_sink_c_impl::handle_set_bw, this, _1)); -+ set_msg_handler( -+ d_port_bw, -+ boost::bind(&freq_sink_c_impl::handle_set_bw, this, boost::placeholders::_1)); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1)); -+ set_msg_handler( -+ d_port, -+ boost::bind(&freq_sink_c_impl::handle_set_freq, this, boost::placeholders::_1)); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&freq_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc -index c14bfc31f..7090d8699 100644 ---- a/gr-qtgui/lib/freq_sink_f_impl.cc -+++ b/gr-qtgui/lib/freq_sink_f_impl.cc -@@ -82,17 +82,23 @@ freq_sink_f_impl::freq_sink_f_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, boost::bind(&freq_sink_f_impl::handle_set_bw, this, _1)); -+ set_msg_handler( -+ d_port_bw, -+ boost::bind(&freq_sink_f_impl::handle_set_bw, this, boost::placeholders::_1)); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1)); -+ set_msg_handler( -+ d_port, -+ boost::bind(&freq_sink_f_impl::handle_set_freq, this, boost::placeholders::_1)); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&freq_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc -index d16de932c..1602d1896 100644 ---- a/gr-qtgui/lib/histogram_sink_f_impl.cc -+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc -@@ -81,8 +81,9 @@ histogram_sink_f_impl::histogram_sink_f_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&histogram_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); - - // +1 for the PDU buffer - for (int i = 0; i < d_nconnections + 1; i++) { -diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc -index d3feb9d16..73136e789 100644 ---- a/gr-qtgui/lib/sink_c_impl.cc -+++ b/gr-qtgui/lib/sink_c_impl.cc -@@ -96,7 +96,9 @@ sink_c_impl::sink_c_impl(int fftsize, - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&sink_c_impl::handle_set_freq, this, _1)); -+ set_msg_handler( -+ d_port, -+ boost::bind(&sink_c_impl::handle_set_freq, this, boost::placeholders::_1)); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc -index 418b630b7..d31023a51 100644 ---- a/gr-qtgui/lib/sink_f_impl.cc -+++ b/gr-qtgui/lib/sink_f_impl.cc -@@ -95,7 +95,9 @@ sink_f_impl::sink_f_impl(int fftsize, - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1)); -+ set_msg_handler( -+ d_port, -+ boost::bind(&sink_f_impl::handle_set_freq, this, boost::placeholders::_1)); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc -index 045c216b0..3aa503ccf 100644 ---- a/gr-qtgui/lib/time_raster_sink_b_impl.cc -+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc -@@ -84,7 +84,9 @@ time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate, - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); - set_msg_handler(pmt::mp("in"), -- boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1)); -+ boost::bind(&time_raster_sink_b_impl::handle_pdus, -+ this, -+ boost::placeholders::_1)); - - d_scale = 1.0f; - -diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc -index d186f319d..b3516e5be 100644 ---- a/gr-qtgui/lib/time_raster_sink_f_impl.cc -+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc -@@ -84,7 +84,9 @@ time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate, - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); - set_msg_handler(pmt::mp("in"), -- boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1)); -+ boost::bind(&time_raster_sink_f_impl::handle_pdus, -+ this, -+ boost::placeholders::_1)); - - d_icols = static_cast(ceil(d_cols)); - d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment()); -diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc -index b73a1c1ad..83fbda298 100644 ---- a/gr-qtgui/lib/time_sink_c_impl.cc -+++ b/gr-qtgui/lib/time_sink_c_impl.cc -@@ -80,7 +80,9 @@ time_sink_c_impl::time_sink_c_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&time_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); - - // +2 for the PDU message buffers - for (unsigned int n = 0; n < d_nconnections + 2; n++) { -diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc -index df13998d7..dd5ed12c8 100644 ---- a/gr-qtgui/lib/time_sink_f_impl.cc -+++ b/gr-qtgui/lib/time_sink_f_impl.cc -@@ -80,7 +80,9 @@ time_sink_f_impl::time_sink_f_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&time_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); - - // +1 for the PDU buffer - for (unsigned int n = 0; n < d_nconnections + 1; n++) { -diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc -index fcf2ed98b..da38d32ba 100644 ---- a/gr-qtgui/lib/waterfall_sink_c_impl.cc -+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc -@@ -118,19 +118,24 @@ waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize, - // setup bw input port - message_port_register_in(d_port_bw); - set_msg_handler(d_port_bw, -- boost::bind(&waterfall_sink_c_impl::handle_set_bw, this, _1)); -+ boost::bind(&waterfall_sink_c_impl::handle_set_bw, -+ this, -+ boost::placeholders::_1)); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); - set_msg_handler(d_port, -- boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1)); -+ boost::bind(&waterfall_sink_c_impl::handle_set_freq, -+ this, -+ boost::placeholders::_1)); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&waterfall_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); - } - - waterfall_sink_c_impl::~waterfall_sink_c_impl() -diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc -index aa1037a47..d4231a564 100644 ---- a/gr-qtgui/lib/waterfall_sink_f_impl.cc -+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc -@@ -116,19 +116,24 @@ waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize, - // setup bw input port - message_port_register_in(d_port_bw); - set_msg_handler(d_port_bw, -- boost::bind(&waterfall_sink_f_impl::handle_set_bw, this, _1)); -+ boost::bind(&waterfall_sink_f_impl::handle_set_bw, -+ this, -+ boost::placeholders::_1)); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); - set_msg_handler(d_port, -- boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1)); -+ boost::bind(&waterfall_sink_f_impl::handle_set_freq, -+ this, -+ boost::placeholders::_1)); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&waterfall_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); - } - - waterfall_sink_f_impl::~waterfall_sink_f_impl() -diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc -index 4f030159f..697d633c1 100644 ---- a/gr-uhd/lib/usrp_block_impl.cc -+++ b/gr-uhd/lib/usrp_block_impl.cc -@@ -137,12 +137,18 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr, - // Set up message ports: - message_port_register_in(pmt::mp("command")); - set_msg_handler(pmt::mp("command"), -- boost::bind(&usrp_block_impl::msg_handler_command, this, _1)); -+ boost::bind(&usrp_block_impl::msg_handler_command, -+ this, -+ boost::placeholders::_1)); - - // cuz we lazy: --#define REGISTER_CMD_HANDLER(key, _handler) \ -- register_msg_cmd_handler(key, \ -- boost::bind(&usrp_block_impl::_handler, this, _1, _2, _3)) -+#define REGISTER_CMD_HANDLER(key, _handler) \ -+ register_msg_cmd_handler(key, \ -+ boost::bind(&usrp_block_impl::_handler, \ -+ this, \ -+ boost::placeholders::_1, \ -+ boost::placeholders::_2, \ -+ boost::placeholders::_3)) - // Register default command handlers: - REGISTER_CMD_HANDLER(cmd_freq_key(), _cmd_handler_freq); - REGISTER_CMD_HANDLER(cmd_gain_key(), _cmd_handler_gain); -@@ -257,11 +263,12 @@ bool usrp_block_impl::_check_mboard_sensors_locked() - } else if (_dev->get_clock_source(mboard_index) == "mimo") { - sensor_name = "mimo_locked"; - } -- if (not _wait_for_locked_sensor( -- get_mboard_sensor_names(mboard_index), -- sensor_name, -- boost::bind( -- &usrp_block_impl::get_mboard_sensor, this, _1, mboard_index))) { -+ if (not _wait_for_locked_sensor(get_mboard_sensor_names(mboard_index), -+ sensor_name, -+ boost::bind(&usrp_block_impl::get_mboard_sensor, -+ this, -+ boost::placeholders::_1, -+ mboard_index))) { - GR_LOG_WARN( - d_logger, - boost::format( -diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc -index a2ff0821b..5e6bd4328 100644 ---- a/gr-uhd/lib/usrp_source_impl.cc -+++ b/gr-uhd/lib/usrp_source_impl.cc -@@ -57,8 +57,9 @@ usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t& device_addr, - - _samp_rate = this->get_samp_rate(); - _samps_per_packet = 1; -- register_msg_cmd_handler(cmd_tag_key(), -- boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1)); -+ register_msg_cmd_handler( -+ cmd_tag_key(), -+ boost::bind(&usrp_source_impl::_cmd_handler_tag, this, boost::placeholders::_1)); - } - - usrp_source_impl::~usrp_source_impl() {} -diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc -index b5da7421e..957cfa411 100644 ---- a/gr-zeromq/lib/pub_msg_sink_impl.cc -+++ b/gr-zeromq/lib/pub_msg_sink_impl.cc -@@ -62,7 +62,9 @@ pub_msg_sink_impl::pub_msg_sink_impl(char* address, int timeout, bool bind) - } - - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&pub_msg_sink_impl::handler, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&pub_msg_sink_impl::handler, this, boost::placeholders::_1)); - } - - pub_msg_sink_impl::~pub_msg_sink_impl() -diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc -index 4140781ab..7d07d3a30 100644 ---- a/gr-zeromq/lib/push_msg_sink_impl.cc -+++ b/gr-zeromq/lib/push_msg_sink_impl.cc -@@ -62,7 +62,9 @@ push_msg_sink_impl::push_msg_sink_impl(char* address, int timeout, bool bind) - } - - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&push_msg_sink_impl::handler, this, _1)); -+ set_msg_handler( -+ pmt::mp("in"), -+ boost::bind(&push_msg_sink_impl::handler, this, boost::placeholders::_1)); - } - - push_msg_sink_impl::~push_msg_sink_impl() --- -2.26.2 - diff --git a/package/gnuradio/0003-gnuradio-runtime_pmt-dont-hardcode-INTERFACE_INCLUDE_DIRECTORIES.patch b/package/gnuradio/0003-gnuradio-runtime_pmt-dont-hardcode-INTERFACE_INCLUDE_DIRECTORIES.patch deleted file mode 100644 index 6b8987fa5f..0000000000 --- a/package/gnuradio/0003-gnuradio-runtime_pmt-dont-hardcode-INTERFACE_INCLUDE_DIRECTORIES.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 84dea8284c521f08508bb2dcbc99db3b5d3438fd Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Thu, 27 Aug 2020 17:32:09 +0200 -Subject: [PATCH] gnuradio-runtime_pmt: dont hardcode - INTERFACE_INCLUDE_DIRECTORIES - -gnuradio-runtimeTargets.cmake and gnuradio-pmtTargets.cmake are filled -using CMAKE_INSTALL_PREFIX for INSTALL_INTERFACE. - -Since CMAKE_INSTALL_PREFIX, in buildroot, is set to /usr, these files contains -path to host system. - -With BR2_COMPILER_PARANOID_UNSAFE_PATH package using gnuradio fails with: -arm-linux-gnueabihf-g++: ERROR: unsafe header/library path used in cross-compilation: '-isystem' '/usr/include' - -By simply providing 'include', produced .cmake contains: -INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -instead of -INTERFACE_INCLUDE_DIRECTORIES "/usr/include" - -[Upstream status: https://github.com/gnuradio/gnuradio/pull/3737] - -Signed-off-by: Gwenhael Goavec-Merou ---- - gnuradio-runtime/lib/CMakeLists.txt | 2 +- - gnuradio-runtime/lib/pmt/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt -index 5aa90a5e1..fc32f473b 100644 ---- a/gnuradio-runtime/lib/CMakeLists.txt -+++ b/gnuradio-runtime/lib/CMakeLists.txt -@@ -214,7 +214,7 @@ target_link_libraries(gnuradio-runtime PUBLIC - - target_include_directories(gnuradio-runtime - PUBLIC -- $ -+ $ - $ - $ - PRIVATE -diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt -index 9fb98d0fc..6dfcd945c 100644 ---- a/gnuradio-runtime/lib/pmt/CMakeLists.txt -+++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt -@@ -33,7 +33,7 @@ target_link_libraries(gnuradio-pmt - - target_include_directories(gnuradio-pmt - PUBLIC -- $ -+ $ - $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ - ) --- -2.26.2 - diff --git a/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch b/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch deleted file mode 100644 index 034c10c5cc..0000000000 --- a/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 268b1a599304f58bd56c86ff09041b5912c24a0c Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Sun, 1 Nov 2020 17:24:36 +0100 -Subject: [PATCH] gr-qtgui: dont't add examples/c++ subdirectory when gr-analog - is disabled - -gr-qtgui examples needs to have gr-analog enabled, without this dependency -compile crash with: - -In file included from -/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.cc:22: -/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.h:24:10: -fatal error: gnuradio/analog/noise_source.h: No such file or directory -24 | #include -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -compilation terminated. -make[3]: *** [gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/build.make:67: -gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/display_qt.cc.o] Error 1 -make[3]: *** Waiting for unfinished jobs.... -In file included from -/somewhere/gnuradio/build/gr-qtgui/examples/c++/moc_display_qt.cpp:10: -/somewhere/gnuradio/build/gr-qtgui/examples/c++/../../../../gr-qtgui/examples/c++/display_qt.h:24:10: -fatal error: gnuradio/analog/noise_source.h: No such file or directory -24 | #include -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -compilation terminated. - -GR_ANALOG is not an explicit dependency of GR_QTGUI, so disable c++ examples if -user has not selected this option. - -[backported from 7470a7a3771dd90defb826b464dfe62977cb1eb6] - -Signed-off-by: Gwenhael Goavec-Merou ---- - gr-qtgui/CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt -index 8831f3ad9..561186fbd 100644 ---- a/gr-qtgui/CMakeLists.txt -+++ b/gr-qtgui/CMakeLists.txt -@@ -68,7 +68,9 @@ if(ENABLE_GR_QTGUI) - add_subdirectory(include/gnuradio/qtgui) - add_subdirectory(lib) - add_subdirectory(docs) --add_subdirectory(examples/c++) -+if (ENABLE_GR_ANALOG) -+ add_subdirectory(examples/c++) -+endif(ENABLE_GR_ANALOG) - if(ENABLE_PYTHON) - add_subdirectory(swig) - add_subdirectory(python/qtgui) --- -2.26.2 - diff --git a/package/gnuradio/0005-boost-remove-deprecated-math-common_factor.hpp.patch b/package/gnuradio/0005-boost-remove-deprecated-math-common_factor.hpp.patch deleted file mode 100644 index 0c282b7322..0000000000 --- a/package/gnuradio/0005-boost-remove-deprecated-math-common_factor.hpp.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 2c767bb260a25b415e8c9c4b3ea37280b2127cec Mon Sep 17 00:00:00 2001 -From: japm48 -Date: Fri, 10 Apr 2020 23:35:30 +0200 -Subject: [PATCH] boost: remove deprecated math/common_factor.hpp - -Remove deprecation warning and prefer using std::{lcm,gcd} to Boost. -Fixes #2712. - -[Retrieved from: -https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec] -Signed-off-by: Fabrice Fontaine ---- - .../include/gnuradio/CMakeLists.txt | 1 + - .../include/gnuradio/integer_math.h | 35 +++++++++++++++++++ - gnuradio-runtime/lib/buffer.cc | 19 ++-------- - gr-digital/lib/symbol_sync_cc_impl.cc | 4 +-- - gr-digital/lib/symbol_sync_ff_impl.cc | 4 +-- - 5 files changed, 43 insertions(+), 20 deletions(-) - create mode 100644 gnuradio-runtime/include/gnuradio/integer_math.h - -diff --git a/gnuradio-runtime/include/gnuradio/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/CMakeLists.txt -index 8d718e87b5b..056af5d6f48 100644 ---- a/gnuradio-runtime/include/gnuradio/CMakeLists.txt -+++ b/gnuradio-runtime/include/gnuradio/CMakeLists.txt -@@ -31,6 +31,7 @@ install(FILES - gr_complex.h - hier_block2.h - high_res_timer.h -+ integer_math.h - io_signature.h - logger.h - math.h -diff --git a/gnuradio-runtime/include/gnuradio/integer_math.h b/gnuradio-runtime/include/gnuradio/integer_math.h -new file mode 100644 -index 00000000000..15141049fa4 ---- /dev/null -+++ b/gnuradio-runtime/include/gnuradio/integer_math.h -@@ -0,0 +1,35 @@ -+/* -*- c++ -*- */ -+/* -+ * Copyright 2020 Free Software Foundation, Inc. -+ * -+ * This file is part of GNU Radio -+ * -+ * SPDX-License-Identifier: GPL-3.0-or-later -+ * -+ */ -+#ifndef INCLUDED_GR_INTEGER_MATH_H -+#define INCLUDED_GR_INTEGER_MATH_H -+ -+#if (__cplusplus >= 201703L) -+ -+// Prefer C++17 goodness. -+#include -+#define GR_GCD std::gcd -+#define GR_LCM std::lcm -+ -+#elif (BOOST_VERSION >= 105800) -+ -+// Fallback: newer boost API (introduced in Boost 1.58.0). -+#include -+#define GR_GCD boost::integer::gcd -+#define GR_LCM boost::integer::lcm -+ -+#else -+ -+// Last resort: old deprecated boost API. -+#include -+#define GR_GCD boost::math::gcd -+#define GR_LCM boost::math::lcm -+ -+#endif /* __cplusplus >= 201703L */ -+#endif /* INCLUDED_GR_INTEGER_MATH_H */ -diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc -index 720c72c4ee8..46d704542b1 100644 ---- a/gnuradio-runtime/lib/buffer.cc -+++ b/gnuradio-runtime/lib/buffer.cc -@@ -13,22 +13,13 @@ - #endif - #include "vmcircbuf.h" - #include -+#include - #include - #include - #include - #include - #include - --// the following header is deprecated as of Boost 1.66.0, and the --// other API was introduced in Boost 1.58.0. Since we still support --// Boost back to 1.54.0, use the older API if pre-1.5.80 and otherwise --// use the newer API. --#if (BOOST_VERSION < 105800) --#include --#else --#include --#endif -- - namespace gr { - - static long s_buffer_count = 0; // counts for debugging storage mgmt -@@ -68,13 +59,9 @@ static long s_buffer_reader_count = 0; - * - * type_size * nitems == k * page_size - */ --static long minimum_buffer_items(long type_size, long page_size) -+static inline long minimum_buffer_items(long type_size, long page_size) - { --#if (BOOST_VERSION < 105800) -- return page_size / boost::math::gcd(type_size, page_size); --#else -- return page_size / boost::integer::gcd(type_size, page_size); --#endif -+ return page_size / GR_GCD(type_size, page_size); - } - - -diff --git a/gr-digital/lib/symbol_sync_cc_impl.cc b/gr-digital/lib/symbol_sync_cc_impl.cc -index 55f85e7c6a7..55f162dc727 100644 ---- a/gr-digital/lib/symbol_sync_cc_impl.cc -+++ b/gr-digital/lib/symbol_sync_cc_impl.cc -@@ -13,9 +13,9 @@ - #endif - - #include "symbol_sync_cc_impl.h" -+#include - #include - #include --#include - #include - - namespace gr { -@@ -95,7 +95,7 @@ symbol_sync_cc_impl::symbol_sync_cc_impl(enum ted_type detector_type, - throw std::runtime_error("unable to create interpolating_resampler_ccf"); - - // Block Internal Clocks -- d_interps_per_symbol_n = boost::math::lcm(d_ted->inputs_per_symbol(), d_osps_n); -+ d_interps_per_symbol_n = GR_LCM(d_ted->inputs_per_symbol(), d_osps_n); - d_interps_per_ted_input_n = d_interps_per_symbol_n / d_ted->inputs_per_symbol(); - d_interps_per_output_sample_n = d_interps_per_symbol_n / d_osps_n; - -diff --git a/gr-digital/lib/symbol_sync_ff_impl.cc b/gr-digital/lib/symbol_sync_ff_impl.cc -index d0ec32ab192..1172c1b4f8a 100644 ---- a/gr-digital/lib/symbol_sync_ff_impl.cc -+++ b/gr-digital/lib/symbol_sync_ff_impl.cc -@@ -13,9 +13,9 @@ - #endif - - #include "symbol_sync_ff_impl.h" -+#include - #include - #include --#include - #include - - namespace gr { -@@ -97,7 +97,7 @@ symbol_sync_ff_impl::symbol_sync_ff_impl(enum ted_type detector_type, - throw std::runtime_error("unable to create interpolating_resampler_fff"); - - // Block Internal Clocks -- d_interps_per_symbol_n = boost::math::lcm(d_ted->inputs_per_symbol(), d_osps_n); -+ d_interps_per_symbol_n = GR_LCM(d_ted->inputs_per_symbol(), d_osps_n); - d_interps_per_ted_input_n = d_interps_per_symbol_n / d_ted->inputs_per_symbol(); - d_interps_per_output_sample_n = d_interps_per_symbol_n / d_osps_n; - diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 103175946c..de19732cfb 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -15,19 +15,19 @@ config BR2_PACKAGE_GNURADIO depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-filesystem + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME - select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_REGEX select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_LOG4CPP select BR2_PACKAGE_GMP + select BR2_PACKAGE_SPDLOG select BR2_PACKAGE_VOLK help GNU Radio is a free & open-source software development @@ -81,6 +81,7 @@ config BR2_PACKAGE_GNURADIO_PYTHON depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_BOOST_PYTHON select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PYBIND select BR2_PACKAGE_PYTHON_SIX # runtime help Enable python component diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash index 90343cf385..efa0bb462b 100644 --- a/package/gnuradio/gnuradio.hash +++ b/package/gnuradio/gnuradio.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3e293541a9ac8d78660762bae8b80c0f6195b3494e1c50c01a9fd79cc60bb624 gnuradio-3.8.2.0.tar.gz +sha256 c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd gnuradio-3.10.4.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index e36dce081c..cc41f1e12b 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -4,22 +4,19 @@ # ################################################################################ -GNURADIO_VERSION = 3.8.2.0 -GNURADIO_SITE = https://github.com/gnuradio/gnuradio/releases/download/v$(GNURADIO_VERSION) +GNURADIO_VERSION = 3.10.4.0 +GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION)) GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ host-python3 \ - host-python-mako \ - host-python-six \ - host-swig \ boost \ log4cpp \ gmp \ + spdlog \ volk GNURADIO_CONF_OPTS = \ @@ -115,7 +112,8 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += python3 +GNURADIO_DEPENDENCIES += python3 python-pybind \ + host-python-numpy host-python-packaging GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON # mandatory to install python modules in site-packages and to use # correct path for python libraries diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash index 98af30e9fc..2c0995babf 100644 --- a/package/inadyn/inadyn.hash +++ b/package/inadyn/inadyn.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 7370eb7ad5d33a9cf2e7e4a6a86c09587fbf9592cd357c6f472c33f575bac26d inadyn-2.9.1.tar.gz +sha256 1727b6aae6727f99eba584e46950369d7b259d2ef09e5bc02566e9c3c1d6daf6 inadyn-2.10.0.tar.gz # Locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index 041d1eff57..5a24c1eced 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -4,7 +4,7 @@ # ################################################################################ -INADYN_VERSION = 2.9.1 +INADYN_VERSION = 2.10.0 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION) INADYN_LICENSE = GPL-2.0+ INADYN_LICENSE_FILES = COPYING @@ -15,6 +15,8 @@ INADYN_CONF_OPTS += --enable-openssl INADYN_DEPENDENCIES += openssl else ifeq ($(BR2_PACKAGE_GNUTLS),y) INADYN_DEPENDENCIES += gnutls +else ifeq ($BR2_PACKAGE_MBEDTLS, y) +INADYN_DEPENDENCIES += mbedtls else INADYN_CONF_OPTS += --disable-ssl endif diff --git a/package/intel-mediadriver/0001-Fix-uClibc-build.patch b/package/intel-mediadriver/0001-Fix-uClibc-build.patch deleted file mode 100644 index 97919d0632..0000000000 --- a/package/intel-mediadriver/0001-Fix-uClibc-build.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 2007edc683499d2e82772f84241b453bdf319372 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 29 Jul 2022 19:51:39 +0200 -Subject: [PATCH] Fix uClibc build - -uClibc does not provide execinfo.h - -Patch sent upstream: https://github.com/intel/media-driver/pull/1437 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 6 ++++++ - .../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 053904748..4a3f0869e 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON) - - option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF) - -+include(CheckIncludeFileCXX) -+check_include_file_cxx("execinfo.h" HAVE_EXECINFO) -+if (HAVE_EXECINFO) -+ add_definitions(-DHAVE_EXECINFO) -+endif() -+ - include(GNUInstallDirs) - - if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX) -diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -index bde216b83..120b02d55 100644 ---- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -@@ -34,7 +34,9 @@ - #include - #include // fork - #include -+#ifdef HAVE_EXECINFO - #include // backtrace -+#endif - #include - #include // fstat - #include // System V IPC -@@ -2473,6 +2475,7 @@ void MosUtilities::MosTraceEvent( - MOS_FreeMemory(pTraceBuf); - } - } -+#ifdef HAVE_EXECINFO - if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) - { - // reserve space for header and stack size field. -@@ -2492,6 +2495,7 @@ void MosUtilities::MosTraceEvent( - size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); - } - } -+#endif - } - return; - } --- -2.30.2 - diff --git a/package/intel-mediadriver/0002-Fix-build-with-libexecinfo.patch b/package/intel-mediadriver/0002-Fix-build-with-libexecinfo.patch deleted file mode 100644 index 3a6705f2b8..0000000000 --- a/package/intel-mediadriver/0002-Fix-build-with-libexecinfo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c5177d6fc64ad8bc25c8fbbe324e52744ef52e18 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 12 Aug 2022 09:50:33 +0200 -Subject: [PATCH] Fix build with libexecinfo - -Fix the following build failure with musl or uclibc-ng and libexecinfo: - -/home/giuliobenetti/autobuild/run/instance-2/output-1/build/intel-mediadriver-22.5.1/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp:2481: undefined reference to `backtrace' - -Fixes: - - http://autobuild.buildroot.org/results/3316e39c5113bb7600374eda45497a87c9ac9873 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/intel/media-driver/pull/1470] ---- - media_driver/media_top_cmake.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake -index 0e19a47c9..936d8c35a 100755 ---- a/media_driver/media_top_cmake.cmake -+++ b/media_driver/media_top_cmake.cmake -@@ -271,10 +271,16 @@ set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS}) - set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") - set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") - -+set(MEDIA_LINK_EXTERNAL_LIBS "${PKG_PCIACCESS_LIBRARIES} m pthread dl") -+find_package(Backtrace) -+if(Backtrace_FOUND) -+ set(MEDIA_LINK_EXTERNAL_LIBS "${MEDIA_LINK_EXTERNAL_LIBS} ${Backtrace_LIBRARY}") -+endif() -+ - bs_ufo_link_libraries_noBsymbolic( - ${LIB_NAME} - "${INCLUDED_LIBS}" -- "${PKG_PCIACCESS_LIBRARIES} m pthread dl" -+ "${MEDIA_LINK_EXTERNAL_LIBS}" - ) - - if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" STREQUAL "") --- -2.35.1 - diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index d1698cbfb5..0a42475400 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bee655102b0c56ea3eee6e8d1d203a67bf7e0c4696ebde2b8ae40067eb12b23f intel-media-22.6.0.tar.gz +sha256 f42c41dce7ab4213e21f6599cd0602e5ab40a8182ec286bfc0a16547721dff7a intel-media-22.6.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index d1a9ca7789..27f3193929 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.6.0 +INTEL_MEDIADRIVER_VERSION = 22.6.3 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index da4286ae23..e4fd569830 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 21a54b752c6b84f032b53a3e328d29f05a448b39f4c18f75fe4e79bb219dc40e intel-mediasdk-22.6.0.tar.gz +sha256 a47a554cb3055614a8041cf478c4c89e249c2157c7e98389fbaba6144dc18783 intel-mediasdk-22.6.3.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 30fddfbcfd..f5e39905a1 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.0 +INTEL_MEDIASDK_VERSION = 22.6.3 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index a47e169bed..387beadc3f 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2022-August/369983.html -sha256 7fd7eb2967f63beb4606f22d50e277d993480d05ef75dd88a9bd8e677323e5e1 libdrm-2.4.113.tar.xz -sha512 fca9834ce090f63ce6dc6d04491a2c5e86162fdddfc8ea70d55a6cdeb401be656388aae1577e58f463a78d8dc502be0a641908784819874e20bbec9a39a057e0 libdrm-2.4.113.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html +sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz +sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 34bd678c5a..56366b6c48 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.113 +LIBDRM_VERSION = 2.4.114 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT diff --git a/package/libgtk3/0002-fix-introspection-check.patch b/package/libgtk3/0002-fix-introspection-check.patch index b12e1a4fca..7edf7db71f 100644 --- a/package/libgtk3/0002-fix-introspection-check.patch +++ b/package/libgtk3/0002-fix-introspection-check.patch @@ -14,7 +14,7 @@ Signed-off-by: Hadrien Boutteville --- a/configure.ac +++ b/configure.ac -@@ -1679,7 +1679,10 @@ +@@ -1690,7 +1690,10 @@ # GObject introspection ################################################## diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0003-disable-atk-bridge.patch index 09ede96613..390fc012fa 100644 --- a/package/libgtk3/0003-disable-atk-bridge.patch +++ b/package/libgtk3/0003-disable-atk-bridge.patch @@ -7,7 +7,7 @@ Signed-off-by: Hadrien Boutteville --- a/configure.ac +++ b/configure.ac -@@ -1375,11 +1375,7 @@ +@@ -1386,11 +1386,7 @@ # Check for Accessibility Toolkit flags ######################################## diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index c68c6e90f6..1715b94e73 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.34.sha256sum -sha256 dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec gtk+-3.24.34.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.35.sha256sum +sha256 ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1 gtk+-3.24.35.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 53d7f6898a..f277fce2ed 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).34 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).35 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/libnss/libnss.hash b/package/libnss/libnss.hash index 2b34cc1a77..e3c27170e5 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_84_RTM/src/SHA256SUMS -sha256 9a387ffe350ff14f001d943f96cc0c064891551d71e1a97a5ddbffe7f1207a25 nss-3.84.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_85_RTM/src/SHA256SUMS +sha256 afd9d64510b1154debbd6cab3571e9ff64a3373898e03483e4c85cdada13d297 nss-3.85.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 415ca900df..627bea7de8 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.84 +LIBNSS_VERSION = 3.85 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch index d232e4d62f..d16bdb2b11 100644 --- a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch +++ b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch @@ -40,8 +40,8 @@ index a66f6aa..4e67782 100644 -bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) +bin_PROGRAMS = @PNG_ARM_NEON_TRUE@am__append_2 = arm/arm_init.c\ - @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c - + @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c \ + @PNG_ARM_NEON_TRUE@ arm/palette_neon_intrinsics.c -- 2.7.3 diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index 34b0a8a8b6..c1f65c93af 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.38/ -md5 122e6b7837811698563083b352bc8ca2 libpng-1.6.38.tar.xz -sha1 60960ed110094843e5efa221df6a7d21614a4dba libpng-1.6.38.tar.xz +# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.39/ +md5 aa1ae92e172417039bda072b702f6326 libpng-1.6.39.tar.xz +sha1 3f2386d61eccae211ec4f57899e4ac2ca60d390b libpng-1.6.39.tar.xz # Locally computed: -sha256 b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be libpng-1.6.38.tar.xz +sha256 1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937 libpng-1.6.39.tar.xz sha256 dfe5a536b0e5a531f844fb9c101a3089aca60772a503893b8e15f9457e369960 LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 43b4f373f1..a18c36fe78 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.38 +LIBPNG_VERSION = 1.6.39 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 382e9cb2ba..d81223e311 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182 linux-firmware-20220310.tar.xz +sha256 e9d174af729511c8cccb60ec4e0b223b3c44b67d813b42d1ab9813acfa667fa5 linux-firmware-20221012.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -14,9 +14,11 @@ sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENC sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware +sha256 8c45a83562a69f7ac4207e4cb5c0063af2e545791b3947bc81dc82305481c15c LICENSE.ice_enhanced sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x sha256 16d5040c7cf851fc693b7542e20870935b99802533ea1bfd231c377a2305e5c5 LICENCE.iwlwifi_firmware sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip +sha256 59ae206c89108905ebdc9ad4c9336526bd2c0d50fbf988c21e8c2a82719d42a4 LICENCE.moxa sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt @@ -33,6 +35,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 75afdb5d45a21ff95ff7aa82d67bc42a83830f2def98ea937c01d6e7603d76f9 WHENCE +sha256 6857749e23d6a2853e5d33f6d6012a60d5baa2b4d51b5f8c6799d00d68733841 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 64d096df14..ea97166d93 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20220310 +LINUX_FIRMWARE_VERSION = 20221012 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES @@ -643,7 +643,7 @@ LINUX_FIRMWARE_FILES += \ brcm/brcmfmac4373.bin \ brcm/brcmfmac4330-sdio.Prowise-PT301.txt \ brcm/brcmfmac4356-pcie.gpd-win-pocket.txt \ - brcm/brcmfmac4356-sdio.vamrs,rock960.txt + brcm/brcmfmac4356-sdio.AP6356S.txt LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index fb253c9bf6..e685cc3367 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.1.tar.bz2.sha256 -sha256 a7c86d91c9bbe66d27f025aa04b8cfc6d7785ed2fc7ef774930800ee44d7f343 lttng-modules-2.13.1.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.7.tar.bz2.sha256 +sha256 5a99679df7903160cbde3918fee5af90ffafc90fc96ccdefaa57cf230492b234 lttng-modules-2.13.7.tar.bz2 # Hash for license files sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index d527bc19ef..416833f4ef 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.13.1 +LTTNG_MODULES_VERSION = 2.13.7 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/*) @@ -14,6 +14,7 @@ LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m define LTTNG_MODULES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_KPROBES) + $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) endef $(eval $(kernel-module)) diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash index a532c6c7b3..e710199936 100644 --- a/package/lua-cffi/lua-cffi.hash +++ b/package/lua-cffi/lua-cffi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c30080d6309167f86d1a96d3ee33f33ef52e884052b7feac140b8c52db10ad7a lua-cffi-0.2.1.tar.gz +sha256 34fb4eea7a0abec2095f08596f604ac01c81b979bead7d2f5cb084b3e2b46cbc lua-cffi-0.2.2.tar.gz sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index 964f49f030..ac351f7f98 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION = 0.2.1 +LUA_CFFI_VERSION = 0.2.2 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md diff --git a/package/lua-mqtt/Config.in b/package/lua-mqtt/Config.in new file mode 100644 index 0000000000..b713319054 --- /dev/null +++ b/package/lua-mqtt/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LUA_MQTT + bool "lua-mqtt" + depends on BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4 + help + client library for MQTT 3.1.1 & 5. + + https://fperrad.frama.io/lua-mqtt + +comment "lua-mqtt needs a Lua >= 5.3" + depends on !BR2_PACKAGE_LUA_5_3 + depends on !BR2_PACKAGE_LUA_5_4 diff --git a/package/lua-mqtt/lua-mqtt.hash b/package/lua-mqtt/lua-mqtt.hash new file mode 100644 index 0000000000..3636e9e6af --- /dev/null +++ b/package/lua-mqtt/lua-mqtt.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 986ec63dd9f0761f9c5231f6e19529138602c289e13da5c71dc1449f5f247152 lua-mqtt-0.1.0-1.src.rock +sha256 e86d7c8adfabcb7c6515cc6e524bf0a76f7b3a86560a7ac47d7cabae5f8391a2 lua-mqtt-0.1.0/COPYRIGHT diff --git a/package/lua-mqtt/lua-mqtt.mk b/package/lua-mqtt/lua-mqtt.mk new file mode 100644 index 0000000000..a2f17d2b2e --- /dev/null +++ b/package/lua-mqtt/lua-mqtt.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# lua-mqtt +# +################################################################################ + +LUA_MQTT_VERSION = 0.1.0-1 +LUA_MQTT_LICENSE = MIT +LUA_MQTT_LICENSE_FILES = $(LUA_MQTT_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index 1031166f34..6ade624a23 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -86,14 +86,6 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz -# By default, go will attempt to download needed modules before building, which -# is not desirable. This behavior also causes permission issues when cleaning, -# as go downloads modules as read-only by default. Because mender-artifact -# includes the modules in the vendor directory, mod=vendor prevents the package -# from downloading the go modules during the build process and prevents -# permission issues when cleaning. -HOST_MENDER_ARTIFACT_GO_ENV = GOFLAGS="-mod=vendor" - HOST_MENDER_ARTIFACT_LDFLAGS = -X github.com/mendersoftware/mender-artifact/cli.Version=$(HOST_MENDER_ARTIFACT_VERSION) HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 60d9ae9436..1544bb3897 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.63.3/meson-0.63.3.tar.gz.asc -sha256 519c0932e1a8b208741f0fdce90aa5c0b528dd297cf337009bf63539846ac056 meson-0.63.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.64.1/meson-0.64.1.tar.gz.asc +sha256 3a8e030c2334f782085f81627062cc6d4a6771edf31e055ffe374f9e6b089ab9 meson-0.64.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 3ca483c289..5aae95973a 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.63.3 +MESON_VERSION = 0.64.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index a2a0223935..45e8b56e98 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 598ddf88c18f4d3825970cd391eebcaf66984d43ebf1ef43116356365b6bfe60 MoarVM-2022.06.tar.gz +sha256 337ef04d16f826f99465c653b92006028fe220be68d3dcfd0729612f4f6b5b46 MoarVM-2022.07.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 154a783f2c..9820f318b6 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2022.06 +MOARVM_VERSION = 2022.07 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 diff --git a/package/mupdf/0001-Makefile-add-an-install_libs-target.patch b/package/mupdf/0001-Makefile-add-an-install_libs-target.patch deleted file mode 100644 index 9cb5a2fec9..0000000000 --- a/package/mupdf/0001-Makefile-add-an-install_libs-target.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0989f13ecbc2155b05da0cb091801d32d750d2d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= - -Date: Thu, 29 Aug 2019 09:51:02 +0200 -Subject: [PATCH] Makefile: add an install_libs target. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows to install only the library files (if you need pymupdf but -not mupdf binaries for example). - -Signed-off-by: Raphaël Mélotte ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index c5bc541ac..e14f88526 100644 ---- a/Makefile -+++ b/Makefile -@@ -322,7 +322,7 @@ libs: $(INSTALL_LIBS) - tools: $(TOOL_APPS) - apps: $(TOOL_APPS) $(VIEW_APPS) - --install: libs apps -+install_libs: - install -d $(DESTDIR)$(incdir)/mupdf - install -d $(DESTDIR)$(incdir)/mupdf/fitz - install -d $(DESTDIR)$(incdir)/mupdf/pdf -@@ -333,6 +333,7 @@ install: libs apps - install -d $(DESTDIR)$(libdir) - install -m 644 $(INSTALL_LIBS) $(DESTDIR)$(libdir) - -+install: libs apps install_libs - install -d $(DESTDIR)$(bindir) - install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir) - --- -2.21.0 - diff --git a/package/mupdf/0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch b/package/mupdf/0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch deleted file mode 100644 index a4746961a6..0000000000 --- a/package/mupdf/0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001 -From: Robin Watts -Date: Fri, 22 Jan 2021 17:05:15 +0000 -Subject: [PATCH] Bug 703366: Fix double free of object during linearization. - -This appears to happen because we parse an illegal object from -a broken file and assign it to object 0, which is defined to -be free. - -Here, we fix the parsing code so this can't happen. - -[Retrieved from: -http://git.ghostscript.com/?p=mupdf.git;h=cee7cefc610d42fd383b3c80c12cbc675443176a] -Signed-off-by: Fabrice Fontaine ---- - source/pdf/pdf-parse.c | 6 ++++++ - source/pdf/pdf-xref.c | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c -index 7abc8c3d4..5761c3351 100644 ---- a/source/pdf/pdf-parse.c -+++ b/source/pdf/pdf-parse.c -@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, - fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num); - } - gen = buf->i; -+ if (gen < 0 || gen >= 65536) -+ { -+ if (try_repair) -+ *try_repair = 1; -+ fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen); -+ } - - tok = pdf_lex(ctx, file, buf); - if (tok != PDF_TOK_OBJ) -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 1b2bdcd59..30197b4b8 100644 ---- a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf) - { - ofs = fz_tell(ctx, doc->file); - trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL); -+ if (num == 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n"); - } - fz_catch(ctx) - { --- -2.17.1 - diff --git a/package/mupdf/0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch b/package/mupdf/0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch deleted file mode 100644 index 5335f140d6..0000000000 --- a/package/mupdf/0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch +++ /dev/null @@ -1,119 +0,0 @@ -From f5712c9949d026e4b891b25837edd2edc166151f Mon Sep 17 00:00:00 2001 -From: Tor Andersson -Date: Tue, 20 Apr 2021 14:46:48 +0200 -Subject: [PATCH] Bug 703791: Stay within hash table max key size in cached - color converter. - -[Retrieved from: -http://git.ghostscript.com/?p=mupdf.git;h=f5712c9949d026e4b891b25837edd2edc166151f] -Signed-off-by: Fabrice Fontaine ---- - include/mupdf/fitz/hash.h | 2 ++ - source/fitz/colorspace.c | 40 ++++++++++++++++++++++++--------------- - source/fitz/hash.c | 7 +++---- - 3 files changed, 30 insertions(+), 19 deletions(-) - -diff --git a/include/mupdf/fitz/hash.h b/include/mupdf/fitz/hash.h -index e92eb0458..feb37a5e4 100644 ---- a/include/mupdf/fitz/hash.h -+++ b/include/mupdf/fitz/hash.h -@@ -5,6 +5,8 @@ - #include "mupdf/fitz/context.h" - #include "mupdf/fitz/output.h" - -+#define FZ_HASH_TABLE_KEY_LENGTH 48 -+ - /** - Generic hash-table with fixed-length keys. - -diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c -index af454caf1..f4db9d3d2 100644 ---- a/source/fitz/colorspace.c -+++ b/source/fitz/colorspace.c -@@ -1025,23 +1025,30 @@ typedef struct fz_cached_color_converter - static void fz_cached_color_convert(fz_context *ctx, fz_color_converter *cc_, const float *ss, float *ds) - { - fz_cached_color_converter *cc = cc_->opaque; -- float *val = fz_hash_find(ctx, cc->hash, ss); -- int n = cc->base.ds->n * sizeof(float); -- -- if (val) -+ if (cc->hash) - { -- memcpy(ds, val, n); -- return; -- } -+ float *val = fz_hash_find(ctx, cc->hash, ss); -+ int n = cc->base.ds->n * sizeof(float); - -- cc->base.convert(ctx, &cc->base, ss, ds); -+ if (val) -+ { -+ memcpy(ds, val, n); -+ return; -+ } - -- val = Memento_label(fz_malloc_array(ctx, cc->base.ds->n, float), "cached_color_convert"); -- memcpy(val, ds, n); -- fz_try(ctx) -- fz_hash_insert(ctx, cc->hash, ss, val); -- fz_catch(ctx) -- fz_free(ctx, val); -+ cc->base.convert(ctx, &cc->base, ss, ds); -+ -+ val = Memento_label(fz_malloc_array(ctx, cc->base.ds->n, float), "cached_color_convert"); -+ memcpy(val, ds, n); -+ fz_try(ctx) -+ fz_hash_insert(ctx, cc->hash, ss, val); -+ fz_catch(ctx) -+ fz_free(ctx, val); -+ } -+ else -+ { -+ cc->base.convert(ctx, &cc->base, ss, ds); -+ } - } - - void fz_init_cached_color_converter(fz_context *ctx, fz_color_converter *cc, fz_colorspace *ss, fz_colorspace *ds, fz_colorspace *is, fz_color_params params) -@@ -1060,7 +1067,10 @@ void fz_init_cached_color_converter(fz_context *ctx, fz_color_converter *cc, fz_ - fz_try(ctx) - { - fz_find_color_converter(ctx, &cached->base, ss, ds, is, params); -- cached->hash = fz_new_hash_table(ctx, 256, n * sizeof(float), -1, fz_free); -+ if (n * sizeof(float) <= FZ_HASH_TABLE_KEY_LENGTH) -+ cached->hash = fz_new_hash_table(ctx, 256, n * sizeof(float), -1, fz_free); -+ else -+ fz_warn(ctx, "colorspace has too many components to be cached"); - } - fz_catch(ctx) - { -diff --git a/source/fitz/hash.c b/source/fitz/hash.c -index 882b886c9..287d43f03 100644 ---- a/source/fitz/hash.c -+++ b/source/fitz/hash.c -@@ -11,11 +11,9 @@ - and removed frequently. - */ - --enum { MAX_KEY_LEN = 48 }; -- - typedef struct - { -- unsigned char key[MAX_KEY_LEN]; -+ unsigned char key[FZ_HASH_TABLE_KEY_LENGTH]; - void *val; - } fz_hash_entry; - -@@ -50,7 +48,8 @@ fz_new_hash_table(fz_context *ctx, int initialsize, int keylen, int lock, fz_has - { - fz_hash_table *table; - -- assert(keylen <= MAX_KEY_LEN); -+ if (keylen > FZ_HASH_TABLE_KEY_LENGTH) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "hash table key length too large"); - - table = fz_malloc_struct(ctx, fz_hash_table); - table->keylen = keylen; --- -2.17.1 - diff --git a/package/mupdf/0004-Makefile-compile-hexdump.exe-with-HOSTCC.patch b/package/mupdf/0004-Makefile-compile-hexdump.exe-with-HOSTCC.patch deleted file mode 100644 index bc9debd332..0000000000 --- a/package/mupdf/0004-Makefile-compile-hexdump.exe-with-HOSTCC.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c0036573a995dc78d3cf60a30ff0af2b47f3680a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 14 Nov 2021 23:24:27 +0100 -Subject: [PATCH] Makefile: compile hexdump.exe with HOSTCC - -hexdump.exe must be compiled for the host or the build will fail when -cross-compiling with HAVE_OBJCOPY=no - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugs.ghostscript.com/show_bug.cgi?id=704442] ---- - Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Makefile b/Makefile -index 6492b1ca3..0732b358f 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,6 +60,8 @@ AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^ - ifdef RANLIB - RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@ - endif -+HOSTCC ?= $(CC) -+HOST_LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(HOSTCC) -o $@ $^ - LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p --exclude=platform/python --exclude=platform/c++ - WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@ -@@ -81,6 +83,9 @@ $(OUT)/%.a : - $(AR_CMD) - $(RANLIB_CMD) - -+$(OUT)/scripts/hexdump.exe: scripts/hexdump.c -+ $(HOST_LINK_CMD) -+ - $(OUT)/%.exe: %.c - $(LINK_CMD) - --- -2.33.0 - diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index 67093cbc9f..fa24e741c7 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 fc17bd01d5860e49b009f28a5ddb629e94af4510 mupdf-1.18.0-source.tar.xz +sha1 f27108668e876b47d7438e2a8b2295654e66f42d mupdf-1.20.3-source.tar.lz # Locally computed: -sha256 592d4f6c0fba41bb954eb1a41616661b62b134d5b383e33bd45a081af5d4a59a mupdf-1.18.0-source.tar.xz +sha256 6f73f63ef8aa81991dfd023d4426a548827d1d74e0bfcf2a013acad63b651868 mupdf-1.20.3-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index e86ba1e73f..c333f43957 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,8 +5,8 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.18.0 -MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.xz +MUPDF_VERSION = 1.20.3 +MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ MUPDF_LICENSE_FILES = COPYING @@ -71,7 +71,7 @@ endef define MUPDF_INSTALL_STAGING_CMDS $(MUPDF_MAKE_ENV) $(MAKE) -C $(@D) $(MUPDF_MAKE_OPTS) \ - DESTDIR="$(STAGING_DIR)" install_libs + DESTDIR="$(STAGING_DIR)" install-libs endef define MUPDF_INSTALL_TARGET_CMDS diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 83de85b415..86f414aca0 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v6/nano-6.4.tar.xz.asc -# using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 4199ae8ca78a7796de56de1a41b821dc47912c0307e9816b56cc317df34661c0 nano-6.4.tar.xz +# https://www.nano-editor.org/dist/v7/nano-7.0.tar.xz.asc +# using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F +sha256 8dd6eac38b2b8786d82681f0e1afd84f6b75210d17391b6443c437e451552149 nano-7.0.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index ecfc37412d..f9338550d4 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,8 +4,8 @@ # ################################################################################ -NANO_VERSION_MAJOR = 6 -NANO_VERSION = $(NANO_VERSION_MAJOR).4 +NANO_VERSION_MAJOR = 7 +NANO_VERSION = $(NANO_VERSION_MAJOR).0 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/ninja/ninja.hash b/package/ninja/ninja.hash index ecde199844..57c10bb287 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 549c31ee596566b952c600e23eb9b8d39a4112cd5fdeb2e5a83370669176da40 ninja-1.10.2.g51db2.kitware.jobserver-1.tar.gz +sha256 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db ninja-1.11.1.g95dee.kitware.jobserver-1.tar.gz sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index bc84046414..b7bc1a4f1c 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,8 +4,8 @@ # ################################################################################ -NINJA_VERSION_MAJOR = 1.10.2 -NINJA_VERSION = $(NINJA_VERSION_MAJOR).g51db2.kitware.jobserver-1 +NINJA_VERSION_MAJOR = 1.11.1 +NINJA_VERSION = $(NINJA_VERSION_MAJOR).g95dee.kitware.jobserver-1 NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING diff --git a/package/octave/octave.hash b/package/octave/octave.hash index 81d7311eeb..9696f2a00a 100644 --- a/package/octave/octave.hash +++ b/package/octave/octave.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 009388289b82fdcc920a2371355049cb6958c735ee9aa3893a256df4a6bf7515 octave-7.2.0.tar.lz +sha256 fdb32602252289e068431329add2eed146e6f26301cbb5fc4412f9d972db9475 octave-7.3.0.tar.lz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk index b28617438a..647f988a3f 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCTAVE_VERSION = 7.2.0 +OCTAVE_VERSION = 7.3.0 OCTAVE_SITE = https://ftp.gnu.org/gnu/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in new file mode 100644 index 0000000000..9800333035 --- /dev/null +++ b/package/opencv4-contrib/Config.in @@ -0,0 +1,313 @@ +menuconfig BR2_PACKAGE_OPENCV4_CONTRIB + bool "opencv4-contrib" + depends on BR2_PACKAGE_OPENCV4 + help + OpenCV (Open Source Computer Vision) is a library of + programming functions for real time computer vision. + + http://opencv.org/ + +if BR2_PACKAGE_OPENCV4_CONTRIB + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ALPHAMAT + bool "alphamat" + help + Computer Vision based Alpha Matting -- Given an input image + and a trimap, generate an alpha matte. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ARUCO + bool "aruco" + help + ArUco and ChArUco Markers -- Augmented reality ArUco marker + and "ChARUco" markers where ArUco markers embedded inside the + white areas of the checker board. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BARCODE + bool "barcode" + help + Barcode detecting and decoding methods. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BGSEGM + bool "bgsegm" + help + Background segmentation algorithm combining statistical + background image estimation and per-pixel Bayesian + segmentation. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BIOINSPIRED + bool "bioinspired" + help + Biological Vision -- Biologically inspired vision model: + minimize noise and luminance variance, transient event + segmentation, high dynamic range tone mapping methods. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CCALIB + bool "ccalib" + help + Custom Calibration -- Patterns for 3D reconstruction, + omnidirectional camera calibration, random pattern calibration + and multi-camera calibration. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CNN_3DOBJ + bool "cnn_3dobj" + help + Deep Object Recognition and Pose -- Uses Caffe Deep Neural Net + library to build, train and test a CNN model of visual object + recognition and pose. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CVV + bool "cvv" + help + Computer Vision Debugger -- Simple code that you can add + to your program that pops up a GUI allowing you to + interactively and visually debug computer vision programs. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DATASETS + bool "datasets" + help + Datasets Reader -- Code for reading existing computer vision + databases and samples of using the readers to train, test and + run using that dataset's data. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT + bool "dnn_objdetect" + help + Object Detection using CNNs -- Implements compact CNN Model + for object detection. Trained using Caffe but uses + opencv_dnn module. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_SUPERRES + bool "dnn_superres" + help + Superresolution using CNNs -- Contains four trained + convolutional neural networks to upscale images. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED + bool "dnns_easily_fooled" + help + Subvert DNNs -- This code can use the activations in a + network to fool the networks into recognizing something else. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM + bool "dpm" + help + Deformable Part Model -- Felzenszwalb's Cascade with + deformable parts object recognition code. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE + bool "face" + help + Face Recognition -- Face recognition techniques: Eigen, Fisher + and Local Binary Pattern Histograms LBPH methods. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE + bool "freetype" + help + Drawing text using freetype and harfbuzz. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FUZZY + bool "fuzzy" + help + Fuzzy Logic in Vision -- Fuzzy logic image transform and + inverse; Fuzzy image processing. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_HDF + bool "hdf" + help + Hierarchical Data Storage -- This module contains I/O + routines for Hierarchical Data Format: + https://en.m.wikipedia.org/wiki/Hierarchical_Data_Format + meant to store large amounts of data. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_HFS + bool "hfs" + help + Hierarchical Feature Selection for Efficient Image + Segmentation -- This module contains an efficient + algorithm to segment an image. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_IMG_HASH + bool "img_hash" + help + This module contains algorithms to extract hash of an + image allowing to efficiently estimate similarity between + images. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_INTENSITY_TRANSFORM + bool "intensity_transform" + help + The module brings implementations of intensity transformation + algorithms to adjust image contrast. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_JULIA + bool "julia" + help + Julia language wrappers with samples and tests. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_LINE_DESCRIPTOR + bool "line_descriptor" + help + Line Segment Extract and Match -- Methods of extracting, + describing and matching line segments using binary + descriptors. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MATLAB + bool "matlab" + help + Matlab Interface -- OpenCV Matlab Mex wrapper code generator + for certain opencv core modules. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MCC + bool "mcc" + help + Macbeth Color Chart detector -- Find and return color patch + location in MacBeth color calibration charts. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OPTFLOW + bool "optflow" + help + Optical Flow -- Algorithms for running and evaluating + deepflow, simpleflow, sparsetodenseflow and motion + templates (silhouette flow). + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OVIS + bool "ovis" + help + OGRE 3D Visualiser -- allows you to render 3D data using + the OGRE 3D engine. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_PHASE_UNWRAPPING + bool "phase_unwrapping" + help + Quality-guided phase unwrapping. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_PLOT + bool "plot" + help + Plotting -- The plot module allows you to easily plot data + in 1D or 2D. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_QUALITY + bool "quality" + help + Image Quality Analysis (IQA) API. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_RAPID + bool "rapid" + help + Silhouette based 3D object tracking. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_REG + bool "reg" + help + Image Registration -- Pixels based image registration for + precise alignment. Follows the paper "Image Alignment and + Stitching: A Tutorial", by Richard Szeliski. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_RGBD + bool "rgbd" + help + RGB-Depth Processing module -- Linemod 3D object recognition; + Fast surface normals and 3D plane finding. 3D visual odometry. + 3d reconstruction using KinectFusion. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SALIENCY + bool "saliency" + help + Saliency API -- Where humans would look in a scene. Has + routines for static, motion and "objectness" saliency. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM + bool "sfm" + help + Structure from Motion -- This module contains algorithms + to perform 3d reconstruction from 2d images. The core of + the module is a light version of Libmv. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SHAPE + bool "shape" + help + Shape Distance and Matching + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STEREO + bool "stereo" + help + Stereo Correspondence -- Stereo matching done with different + descriptors: Census / CS-Census / MCT / BRIEF / MV and dense + stereo correspondence using Quasi Dense Stereo method. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STRUCTURED_LIGHT + bool "structured_light" + help + Structured Light Use -- How to generate and project gray code + patterns and use them to find dense depth in a scene. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SUPERRES + bool "superres" + help + Super Resolution + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SURFACE_MATCHING + bool "surface_matching" + help + Point Pair Features -- Implements 3d object detection and + localization using multimodal point pair features. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TEXT + bool "text" + help + Scene Text Detection and Recognition -- This module contains + algorithms to perform text detection, words segmentation and + text recognition in a visual scene. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TRACKING + bool "tracking" + help + Vision Based Object Tracking -- Use and/or evaluate different + visual object tracking techniques. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIDEOSTAB + bool "videostab" + help + Video Stabilization + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIZ + bool "viz" + help + 3D Visualizer + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_WECHAT_QRCODE + bool "wechat_qrcode" + help + WeChat QR code detector for detecting and parsing QR code. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XFEATURES2D + bool "xfeatures2d" + help + Features2D extra -- Extra 2D Features Framework containing + experimental and non-free 2D feature detector/descriptor + algorithms. SURF, BRIEF, Censure, Freak, LUCID, Daisy, + Self-similar. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC + bool "ximgproc" + help + Extended Image Processing -- Structured Forests / Domain + Transform Filter / Guided Filter / Adaptive Manifold Filter + / Joint Bilateral Filter / Superpixels / Ridge Detection + Filter. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT + bool "xobjdetect" + help + Boosted 2D Object Detection -- Uses a Waldboost cascade and + local binary patterns computed as integral features for 2D + object detection. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO + bool "xphoto" + help + Extra Computational Photography -- Additional photo processing + algorithms: Color balance / Denoising / Inpainting. + +endif diff --git a/package/opencv4-contrib/opencv4-contrib.hash b/package/opencv4-contrib/opencv4-contrib.hash new file mode 100644 index 0000000000..4f15162e50 --- /dev/null +++ b/package/opencv4-contrib/opencv4-contrib.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7 opencv4-contrib-4.6.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk new file mode 100644 index 0000000000..81c45c6e02 --- /dev/null +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# opencv4-contrib +# +################################################################################ + +OPENCV4_CONTRIB_VERSION = 4.6.0 +OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) +OPENCV4_CONTRIB_INSTALL_TARGET = FALSE +OPENCV4_CONTRIB_LICENSE = Apache-2.0 +OPENCV4_CONTRIB_LICENSE_FILES = LICENSE + +# Modules provided by opencv4-contrib are built as part of the opencv4 package, +# so opencv4-contrib only serves for downloading the source code. + +$(eval $(generic-package)) diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index ef15c6d911..a665793ad9 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -82,11 +82,6 @@ OPENCV4_CONF_OPTS += \ # - viz: missing VTK dependency # - world: all-in-one module # -# * Contrib modules from [1] are disabled: -# - opencv_contrib package is not available in Buildroot; -# - OPENCV_EXTRA_MODULES_PATH is not set. -# -# [1] https://github.com/Itseez/opencv_contrib OPENCV4_CONF_OPTS += \ -DBUILD_opencv_androidcamera=OFF \ -DBUILD_opencv_apps=OFF \ @@ -232,6 +227,63 @@ OPENCV4_CONF_OPTS += \ OPENCV4_DEPENDENCIES += host-pkgconf zlib +ifeq ($(BR2_PACKAGE_OPENCV4_CONTRIB),y) +# OPENCV4 depends on OPENCV4_CONTRIB, and not the other way around. +# The modules in OPENCV4_CONTRIB get built as part of the build +# process for OPENCV4, so the source needs to be unpacked already +OPENCV4_DEPENDENCIES += opencv4-contrib +OPENCV4_CONF_OPTS += \ + -DOPENCV_EXTRA_MODULES_PATH=$(OPENCV4_CONTRIB_DIR)/modules \ + -DBUILD_opencv_alphamat=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ALPHAMAT),ON,OFF) \ + -DBUILD_opencv_aruco=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ARUCO),ON,OFF) \ + -DBUILD_opencv_barcode=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BARCODE),ON,OFF) \ + -DBUILD_opencv_bgsegm=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BGSEGM),ON,OFF) \ + -DBUILD_opencv_bioinspired=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BIOINSPIRED),ON,OFF) \ + -DBUILD_opencv_ccalib=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CCALIB),ON,OFF) \ + -DBUILD_opencv_cnn_3dobj=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CNN_3DOBJ),ON,OFF) \ + -DBUILD_opencv_cvv=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CVV),ON,OFF) \ + -DBUILD_opencv_datasets=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DATASETS),ON,OFF) \ + -DBUILD_opencv_dnn_objdetect=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT),ON,OFF) \ + -DBUILD_opencv_dnn_superres=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_SUPERRES),ON,OFF) \ + -DBUILD_opencv_dnns_easily_fooled=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED),ON,OFF) \ + -DBUILD_opencv_dpm=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM),ON,OFF) \ + -DBUILD_opencv_face=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE),ON,OFF) \ + -DBUILD_opencv_freetype=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE),ON,OFF) \ + -DBUILD_opencv_fuzzy=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FUZZY),ON,OFF) \ + -DBUILD_opencv_hdf=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_HDF),ON,OFF) \ + -DBUILD_opencv_hfs=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_HFS),ON,OFF) \ + -DBUILD_opencv_img_hash=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_IMG_HASH),ON,OFF) \ + -DBUILD_opencv_intensity_transform=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_INTENSITY_TRANSFORM),ON,OFF) \ + -DBUILD_opencv_julia=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_JULIA),ON,OFF) \ + -DBUILD_opencv_line_descriptor=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_LINE_DESCRIPTOR),ON,OFF) \ + -DBUILD_opencv_matlab=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MATLAB),ON,OFF) \ + -DBUILD_opencv_mcc=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MCC),ON,OFF) \ + -DBUILD_opencv_optflow=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OPTFLOW),ON,OFF) \ + -DBUILD_opencv_ovis=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OVIS),ON,OFF) \ + -DBUILD_opencv_phase_unwrapping=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_PHASE_UNWRAPPING),ON,OFF) \ + -DBUILD_opencv_plot=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_PLOT),ON,OFF) \ + -DBUILD_opencv_quality=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_QUALITY),ON,OFF) \ + -DBUILD_opencv_rapid=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_RAPID),ON,OFF) \ + -DBUILD_opencv_reg=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_REG),ON,OFF) \ + -DBUILD_opencv_rgbd=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_RGBD),ON,OFF) \ + -DBUILD_opencv_saliency=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SALIENCY),ON,OFF) \ + -DBUILD_opencv_sfm=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM),ON,OFF) \ + -DBUILD_opencv_shape=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SHAPE),ON,OFF) \ + -DBUILD_opencv_stereo=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STEREO),ON,OFF) \ + -DBUILD_opencv_structured_light=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STRUCTURED_LIGHT),ON,OFF) \ + -DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SUPERRES),ON,OFF) \ + -DBUILD_opencv_surface_matching=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SURFACE_MATCHING),ON,OFF) \ + -DBUILD_opencv_text=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TEXT),ON,OFF) \ + -DBUILD_opencv_tracking=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TRACKING),ON,OFF) \ + -DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIDEOSTAB),ON,OFF) \ + -DBUILD_opencv_viz=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIZ),ON,OFF) \ + -DBUILD_opencv_wechat_qrcode=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_WECHAT_QRCODE),ON,OFF) \ + -DBUILD_opencv_xfeatures2d=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XFEATURES2D),ON,OFF) \ + -DBUILD_opencv_ximgproc=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC),ON,OFF) \ + -DBUILD_opencv_xobjdetect=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT),ON,OFF) \ + -DBUILD_opencv_xphoto=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO),ON,OFF) +endif + ifeq ($(BR2_PACKAGE_OPENCV4_JPEG2000_WITH_JASPER),y) OPENCV4_CONF_OPTS += -DWITH_JASPER=ON OPENCV4_DEPENDENCIES += jasper diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 28679cf08f..505a4496c8 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0f722baf0f04eda387d934d86228aae07d848993900db6b9e7ab312c91fd84e5 osm2pgsql-1.7.0.tar.gz +sha256 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 osm2pgsql-1.7.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 821d903fd6..2bc8d41e6e 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.7.0 +OSM2PGSQL_VERSION = 1.7.2 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING diff --git a/package/pango/pango.hash b/package/pango/pango.hash index cbd391db20..60a6809ab5 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.10.sha256sum -sha256 7e5d2f1e40854d24a9a2c4d093bafe75dcdbeccdf1de43e4437332eabed64966 pango-1.50.10.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.12.sha256sum +sha256 caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3 pango-1.50.12.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 649f3398cf..698894d0c8 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).10 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).12 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 9bead47bd9..4585534569 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 32a6db3f42f00eb95a07369160a614420443ca4f4e90ac628db8ca508e08538e pipewire-0.3.59.tar.bz2 +sha256 8164eb53c9eafedfa22fe1adc4b8e38f3173c6f33695c735a17ed1a3d43c664e pipewire-0.3.60.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index d7ae07170d..9fef605878 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.59 +PIPEWIRE_VERSION = 0.3.60 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -105,6 +105,12 @@ endif ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy) PIPEWIRE_CONF_OPTS += -Dbluez5=enabled PIPEWIRE_DEPENDENCIES += bluez5_utils sbc +ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y) +PIPEWIRE_CONF_OPTS += -Dbluez5-backend-native-mm=enabled +PIPEWIRE_DEPENDENCIES += modem-manager +else +PIPEWIRE_CONF_OPTS += -Dbluez5-backend-native-mm=disabled +endif ifeq ($(BR2_PACKAGE_OPUS),y) PIPEWIRE_CONF_OPTS += -Dbluez5-codec-opus=enabled PIPEWIRE_DEPENDENCIES += opus @@ -189,7 +195,10 @@ PIPEWIRE_CONF_OPTS += -Dlibpulse=disabled endif ifeq ($(BR2_PACKAGE_READLINE),y) +PIPEWIRE_CONF_OPTS += -Dreadline=enabled PIPEWIRE_DEPENDENCIES += readline +else +PIPEWIRE_CONF_OPTS += -Dreadline=disabled endif ifeq ($(BR2_PACKAGE_SDL2),y) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index f7e3f39503..666c5ac971 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -20,8 +20,10 @@ # ################################################################################ +BR_CARGO_HOME = $(DL_DIR)/br-cargo-home + PKG_COMMON_CARGO_ENV = \ - CARGO_HOME=$(HOST_DIR)/share/cargo + CARGO_HOME=$(BR_CARGO_HOME) # __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS is needed to allow # passing the -Z target-applies-to-host, which is needed together with @@ -79,7 +81,7 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +$(2)_DL_ENV += CARGO_HOME=$$(BR_CARGO_HOME) # If building in a sub directory, use that to find the Cargo.toml ifneq ($$($(2)_SUBDIR),) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 0b3dc3d32f..cdc67b32c0 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -87,7 +87,8 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ $$(HOST_GO_COMMON_ENV) \ - GOPROXY=direct + GOPROXY=direct \ + $$($(2)_GO_ENV) # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 32dcfea0bc..f4f35bf96a 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -45,11 +45,16 @@ endef # only, as this can fail in complex cases. # $(1): the name of the package in upper-case letters define kconfig-package-regen-dot-config - $(if $(filter olddefconfig,$($(1)_KCONFIG_RULES)), - $(Q)$($(1)_KCONFIG_MAKE) olddefconfig, - $(if $(filter oldnoconfig,$($(1)_KCONFIG_RULES)), - $(Q)$($(1)_KCONFIG_MAKE) oldnoconfig, - $(Q)(yes "" | $($(1)_KCONFIG_MAKE) oldconfig))) + $(Q)[ -e $($(1)_DIR)/.br_regen_dot_config ] || \ + $($(1)_KCONFIG_MAKE) -pn config 2>/dev/null \ + | sed 's/^\([_0-9a-zA-Z]*config\):.*/\1/ p; d' >$($(1)_DIR)/.br_regen_dot_config + $(Q)if grep -q '\bolddefconfig\b' $($(1)_DIR)/.br_regen_dot_config; then \ + $($(1)_KCONFIG_MAKE) olddefconfig; \ + elif grep -q '\boldnoconfig\b' $($(1)_DIR)/.br_regen_dot_config; then \ + $($(1)_KCONFIG_MAKE) oldnoconfig; \ + else \ + yes "" | $($(1)_KCONFIG_MAKE) oldconfig; \ + fi endef # Macro to create a .config file where all given fragments are merged into. @@ -147,19 +152,6 @@ $(2)_KCONFIG_MAKE = \ $$($(2)_MAKE_ENV) $$($(2)_MAKE) -C $$($(2)_DIR) \ $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) -# $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax -# of the shell conflicts with Make's own syntax, this means that backticks -# are used with those shell constructs. Unfortunately, the backtick syntax -# does not nest, and we need to use Make instead of the shell to handle -# conditions. - -# A recursively expanded variable is necessary, to be sure that the shell -# command is called when the rule is processed during the build and not -# when the rule is created when parsing all packages. -$(2)_KCONFIG_RULES = \ - $$(shell $$($(2)_KCONFIG_MAKE) -pn config 2>/dev/null | \ - sed 's/^\([_0-9a-zA-Z]*config\):.*/\1/ p; d') - # The specified source configuration file and any additional configuration file # fragments are merged together to .config, after the package has been patched. # Since the file could be a defconfig file it needs to be expanded to a diff --git a/package/polkit/0001-make-netgroup-support-optional-meson.patch b/package/polkit/0001-make-netgroup-support-optional-meson.patch deleted file mode 100644 index bddeb339bd..0000000000 --- a/package/polkit/0001-make-netgroup-support-optional-meson.patch +++ /dev/null @@ -1,260 +0,0 @@ -From b57deee8178190a7ecc75290fa13cf7daabc2c66 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Sun, 15 May 2022 05:04:10 +0000 -Subject: [PATCH] Make netgroup support optional - -On at least Linux/musl and Linux/uclibc, netgroup support is not -available. PolKit fails to compile on these systems for that reason. - -This change makes netgroup support conditional on the presence of the -setnetgrent(3) function which is required for the support to work. If -that function is not available on the system, an error will be returned -to the administrator if unix-netgroup: is specified in configuration. - -(sam: rebased for Meson and Duktape.) - -Closes: https://gitlab.freedesktop.org/polkit/polkit/-/issues/14 -Closes: https://gitlab.freedesktop.org/polkit/polkit/-/issues/163 -Closes: https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/52 -Signed-off-by: A. Wilcox -Signed-off-by: Daniel Lang - ---- - meson.build | 1 + - src/polkit/polkitidentity.c | 17 +++++++++++++++++ - src/polkit/polkitunixnetgroup.c | 3 +++ - .../polkitbackendduktapeauthority.c | 4 ++-- - .../polkitbackendinteractiveauthority.c | 14 ++++++++------ - src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ - test/polkit/polkitidentitytest.c | 8 +++++++- - test/polkit/polkitunixnetgrouptest.c | 2 ++ - .../test-polkitbackendjsauthority.c | 2 ++ - 9 files changed, 44 insertions(+), 9 deletions(-) - -diff --git a/meson.build b/meson.build -index 908f0aa..66c4e9b 100644 ---- a/meson.build -+++ b/meson.build -@@ -89,6 +89,7 @@ config_h.set('_GNU_SOURCE', true) - check_functions = [ - 'clearenv', - 'fdatasync', -+ 'setnetgrent', - ] - - foreach func: check_functions -diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c -index 3aa1f7f..793f17d 100644 ---- a/src/polkit/polkitidentity.c -+++ b/src/polkit/polkitidentity.c -@@ -182,7 +182,15 @@ polkit_identity_from_string (const gchar *str, - } - else if (g_str_has_prefix (str, "unix-netgroup:")) - { -+#ifndef HAVE_SETNETGRENT -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Netgroups are not available on this machine ('%s')", -+ str); -+#else - identity = polkit_unix_netgroup_new (str + sizeof "unix-netgroup:" - 1); -+#endif - } - - if (identity == NULL && (error != NULL && *error == NULL)) -@@ -344,6 +352,14 @@ polkit_identity_new_for_gvariant (GVariant *variant, - GVariant *v; - const char *name; - -+#ifndef HAVE_SETNETGRENT -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Netgroups are not available on this machine"); -+ goto out; -+#else -+ - v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error); - if (v == NULL) - { -@@ -353,6 +369,7 @@ polkit_identity_new_for_gvariant (GVariant *variant, - name = g_variant_get_string (v, NULL); - ret = polkit_unix_netgroup_new (name); - g_variant_unref (v); -+#endif - } - else - { -diff --git a/src/polkit/polkitunixnetgroup.c b/src/polkit/polkitunixnetgroup.c -index 8a2b369..83f8d4a 100644 ---- a/src/polkit/polkitunixnetgroup.c -+++ b/src/polkit/polkitunixnetgroup.c -@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUnixNetgroup *group, - PolkitIdentity * - polkit_unix_netgroup_new (const gchar *name) - { -+#ifndef HAVE_SETNETGRENT -+ g_assert_not_reached(); -+#endif - g_return_val_if_fail (name != NULL, NULL); - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP, - "name", name, -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index c89dbcf..f4b4304 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -1035,7 +1035,7 @@ js_polkit_user_is_in_netgroup (duk_context *cx) - - user = duk_require_string (cx, 0); - netgroup = duk_require_string (cx, 1); -- -+#ifdef HAVE_SETNETGRENT - if (innetgr (netgroup, - NULL, /* host */ - user, -@@ -1043,7 +1043,7 @@ js_polkit_user_is_in_netgroup (duk_context *cx) - { - is_in_netgroup = TRUE; - } -- -+#endif - duk_push_boolean (cx, is_in_netgroup); - return 1; - } -diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index d935a7a..1cfc88e 100644 ---- a/src/polkitbackend/polkitbackendinteractiveauthority.c -+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2248,25 +2248,26 @@ get_users_in_net_group (PolkitIdentity *group, - GList *ret; - - ret = NULL; -+#ifdef HAVE_SETNETGRENT - name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); - --#ifdef HAVE_SETNETGRENT_RETURN -+# ifdef HAVE_SETNETGRENT_RETURN - if (setnetgrent (name) == 0) - { - g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno)); - goto out; - } --#else -+# else - setnetgrent (name); --#endif -+# endif /* HAVE_SETNETGRENT_RETURN */ - - for (;;) - { --#if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) -+# if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) - const char *hostname, *username, *domainname; --#else -+# else - char *hostname, *username, *domainname; --#endif -+# endif /* defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) */ - PolkitIdentity *user; - GError *error = NULL; - -@@ -2297,6 +2298,7 @@ get_users_in_net_group (PolkitIdentity *group, - - out: - endnetgrent (); -+#endif /* HAVE_SETNETGRENT */ - return ret; - } - -diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp -index 2568e8e..999269b 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.cpp -+++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1271,6 +1271,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - - JS::CallArgs args = JS::CallArgsFromVp (argc, vp); - -+#ifdef HAVE_SETNETGRENT - JS::RootedString usrstr (authority->priv->cx); - usrstr = args[0].toString(); - user = JS_EncodeStringToUTF8 (cx, usrstr); -@@ -1285,6 +1286,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - { - is_in_netgroup = true; - } -+#endif - - ret = true; - -diff --git a/test/polkit/polkitidentitytest.c b/test/polkit/polkitidentitytest.c -index e91967b..2635c4c 100644 ---- a/test/polkit/polkitidentitytest.c -+++ b/test/polkit/polkitidentitytest.c -@@ -145,11 +145,15 @@ struct ComparisonTestData comparison_test_data [] = { - {"unix-group:root", "unix-group:jane", FALSE}, - {"unix-group:jane", "unix-group:jane", TRUE}, - -+#ifdef HAVE_SETNETGRENT - {"unix-netgroup:foo", "unix-netgroup:foo", TRUE}, - {"unix-netgroup:foo", "unix-netgroup:bar", FALSE}, -+#endif - - {"unix-user:root", "unix-group:root", FALSE}, -+#ifdef HAVE_SETNETGRENT - {"unix-user:jane", "unix-netgroup:foo", FALSE}, -+#endif - - {NULL}, - }; -@@ -181,11 +185,13 @@ main (int argc, char *argv[]) - g_test_add_data_func ("/PolkitIdentity/group_string_2", "unix-group:jane", test_string); - g_test_add_data_func ("/PolkitIdentity/group_string_3", "unix-group:users", test_string); - -+#ifdef HAVE_SETNETGRENT - g_test_add_data_func ("/PolkitIdentity/netgroup_string", "unix-netgroup:foo", test_string); -+ g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); -+#endif - - g_test_add_data_func ("/PolkitIdentity/user_gvariant", "unix-user:root", test_gvariant); - g_test_add_data_func ("/PolkitIdentity/group_gvariant", "unix-group:root", test_gvariant); -- g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); - - add_comparison_tests (); - -diff --git a/test/polkit/polkitunixnetgrouptest.c b/test/polkit/polkitunixnetgrouptest.c -index 3701ba1..e1d211e 100644 ---- a/test/polkit/polkitunixnetgrouptest.c -+++ b/test/polkit/polkitunixnetgrouptest.c -@@ -69,7 +69,9 @@ int - main (int argc, char *argv[]) - { - g_test_init (&argc, &argv, NULL); -+#ifdef HAVE_SETNETGRENT - g_test_add_func ("/PolkitUnixNetgroup/new", test_new); - g_test_add_func ("/PolkitUnixNetgroup/set_name", test_set_name); -+#endif - return g_test_run (); - } -diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c -index 2103b17..b187a2f 100644 ---- a/test/polkitbackend/test-polkitbackendjsauthority.c -+++ b/test/polkitbackend/test-polkitbackendjsauthority.c -@@ -137,12 +137,14 @@ test_get_admin_identities (void) - "unix-group:users" - } - }, -+#ifdef HAVE_SETNETGRENT - { - "net.company.action3", - { - "unix-netgroup:foo" - } - }, -+#endif - }; - guint n; - --- -GitLab - diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index 398f924275..ffdc2a7568 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,3 @@ -# Locally calculated after checking pgp signature -sha256 9dc7ae341a797c994a5a36da21963f0c5c8e3e5a1780ccc2a5f52e7be01affaa polkit-121.tar.gz - # Locally calculated +sha256 0d69656d60800835c3d7d1f0a8362b32e1ae3ace2875a35bb624296fc52d5dc4 polkit-122.tar.gz sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index 39048a988d..205d6aff4c 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,8 +4,8 @@ # ################################################################################ -POLKIT_VERSION = 121 -POLKIT_SITE = https://www.freedesktop.org/software/polkit/releases +POLKIT_VERSION = 122 +POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VENDOR = polkit_project diff --git a/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch b/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch deleted file mode 100644 index 4329c9cd80..0000000000 --- a/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 845c18c1288b7a96592901baadb198f96dd71c46 Mon Sep 17 00:00:00 2001 -From: fidomax -Date: Tue, 26 Jan 2021 09:49:19 +0300 -Subject: [PATCH] Disable forced static linking of liblwgeom - -In case of shared libs build fails: -ld: cannot find -lgeos_c -ld: attempted static link of dynamic object `/usr/lib/libproj.so' - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/postgis/postgis/commit/98070faad220e12fcaed9a583a70a37c510b7c6b.patch ---- - loader/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/loader/Makefile.in b/loader/Makefile.in -index 9aebfe07f..9a0c90d3a 100644 ---- a/loader/Makefile.in -+++ b/loader/Makefile.in -@@ -44,7 +44,7 @@ ICONV_CFLAGS=@ICONV_CFLAGS@ - - # liblwgeom - LIBLWGEOM=../liblwgeom/liblwgeom.la --LDFLAGS += -static $(LIBLWGEOM) -+LDFLAGS += $(LIBLWGEOM) - - # GTK includes and libraries - GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@ --- -2.30.0 - diff --git a/package/postgis/0002-raster-loader-Makefile.in-do-not-force-static-linkin.patch b/package/postgis/0002-raster-loader-Makefile.in-do-not-force-static-linkin.patch deleted file mode 100644 index 756a7c10dd..0000000000 --- a/package/postgis/0002-raster-loader-Makefile.in-do-not-force-static-linkin.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 29c33c483e22a4445d870739187d128df0f11f60 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 27 Jul 2022 15:12:40 +0200 -Subject: [PATCH] raster/loader/Makefile.in: do not force static linking - -This is similar to commit -https://github.com/postgis/postgis/commit/98070faad220e12fcaed9a583a70a37c510b7c6b, -but applied to raster/loader. It ensures that if only shared variants -of the libraries are available, the link still works. If you force --static and only shared variants of some of the libraries are -available, the link fails with "d: attempted static link of dynamic -object XYZ". - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/postgis/postgis/pull/702 ---- - raster/loader/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in -index 3df47a96f..d0a408333 100644 ---- a/raster/loader/Makefile.in -+++ b/raster/loader/Makefile.in -@@ -36,7 +36,7 @@ PGSQL_BINDIR=@PGSQL_BINDIR@ - - RT_CORE=../rt_core - --LIBLWGEOM_LDFLAGS= -static ../../liblwgeom/liblwgeom.la -+LIBLWGEOM_LDFLAGS= ../../liblwgeom/liblwgeom.la - LIBLWGEOM_CFLAGS=-I../../liblwgeom - LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@ - LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@ --- -2.37.1 - diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 9569ca71dd..8550a57939 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 18cf3d013f45b1aa8ed59d78bc707e9e125e250d8f0615396ae9bfe3dd7c3d7c postgis-3.2.2.tar.gz +sha256 9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068 postgis-3.3.2.tar.gz sha256 55b69f22e1752830dd565852dc7ff242daf289dbd3a6bfede5db43f90d2e28c9 LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index e6ea52bf7a..4148180adf 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.2.2 +POSTGIS_VERSION = 3.3.2 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index 6357a87931..176b3d22c7 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 c5809dfb02be8784ec17897380009052 aiocoap-0.4.1.tar.gz -sha256 c47c9d19a98699f27707186871b7c84f4a7016fe4fbb5bd300f809ae456f8a55 aiocoap-0.4.1.tar.gz +md5 218178420e8fc3581001f52eb726b016 aiocoap-0.4.4.tar.gz +sha256 9d7c9626cbc4dc24a91c6b8694cbeb834e376ab7e20e4137609380f726a9540b aiocoap-0.4.4.tar.gz # Locally computed sha256 checksums sha256 2bb211d412a6bfa4b2a9cf01123c7fe90e5e6185938896e23ab07b84f8494180 LICENSE diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index c933d27b23..96d8619a84 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.1 +PYTHON_AIOCOAP_VERSION = 0.4.4 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/67/1c/6d6764010a4779d61bc7241afa663b368261c72af20555b26efc875d4276 +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/6a/7c/139993da8dcdfc86446ee6df65b98c68e40c5fcb0caeff3a6b348d9f7d6f PYTHON_AIOCOAP_SETUP_TYPE = setuptools PYTHON_AIOCOAP_LICENSE = MIT PYTHON_AIOCOAP_LICENSE_FILES = LICENSE diff --git a/package/python-aioprocessing/python-aioprocessing.hash b/package/python-aioprocessing/python-aioprocessing.hash index cf92a72d4a..8913a7abb0 100644 --- a/package/python-aioprocessing/python-aioprocessing.hash +++ b/package/python-aioprocessing/python-aioprocessing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioprocessing/json -md5 838b6aa073f1373bd42204f86b0e3196 aioprocessing-2.0.0.tar.gz -sha256 469dfb746e8c4e0c727ba135cfabf9e034c554f6a73c27f908bfe3625dd74b9e aioprocessing-2.0.0.tar.gz +md5 e533c65f5879374c27f266c2040405ea aioprocessing-2.0.1.tar.gz +sha256 fe01c7b1a38c78168611d3040e73d93036c3b7c8a649d636dc9ed7a3bc9b1ba2 aioprocessing-2.0.1.tar.gz # Locally computed sha256 checksums sha256 53c809e8f0b91a68a39477e5fbdf77fe2b74dd6a1647c2dd9b7b22fed135239e LICENSE.txt diff --git a/package/python-aioprocessing/python-aioprocessing.mk b/package/python-aioprocessing/python-aioprocessing.mk index e1e919de2d..6cd59ab599 100644 --- a/package/python-aioprocessing/python-aioprocessing.mk +++ b/package/python-aioprocessing/python-aioprocessing.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_AIOPROCESSING_VERSION = 2.0.0 +PYTHON_AIOPROCESSING_VERSION = 2.0.1 PYTHON_AIOPROCESSING_SOURCE = aioprocessing-$(PYTHON_AIOPROCESSING_VERSION).tar.gz -PYTHON_AIOPROCESSING_SITE = https://files.pythonhosted.org/packages/8e/3e/54266241660fb026bfd27f660d44cd81a4b7f8a145d8e2db010de12622a0 -PYTHON_AIOPROCESSING_SETUP_TYPE = setuptools +PYTHON_AIOPROCESSING_SITE = https://files.pythonhosted.org/packages/4d/85/9a75151e7049bf144c01384279201d82d99484bd658f8e6fb013552d8724 +PYTHON_AIOPROCESSING_SETUP_TYPE = flit PYTHON_AIOPROCESSING_LICENSE = BSD-2-Clause PYTHON_AIOPROCESSING_LICENSE_FILES = LICENSE.txt diff --git a/package/python-aiosignal/python-aiosignal.hash b/package/python-aiosignal/python-aiosignal.hash index f2a09749b8..061816a66e 100644 --- a/package/python-aiosignal/python-aiosignal.hash +++ b/package/python-aiosignal/python-aiosignal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosignal/json -md5 011700c3acc576a3a38deade6a4860cb aiosignal-1.2.0.tar.gz -sha256 78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2 aiosignal-1.2.0.tar.gz +md5 2a15f4008b899377590cef4773020902 aiosignal-1.3.1.tar.gz +sha256 54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc aiosignal-1.3.1.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-aiosignal/python-aiosignal.mk b/package/python-aiosignal/python-aiosignal.mk index e0436e973e..ffd581cfba 100644 --- a/package/python-aiosignal/python-aiosignal.mk +++ b/package/python-aiosignal/python-aiosignal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOSIGNAL_VERSION = 1.2.0 +PYTHON_AIOSIGNAL_VERSION = 1.3.1 PYTHON_AIOSIGNAL_SOURCE = aiosignal-$(PYTHON_AIOSIGNAL_VERSION).tar.gz -PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/27/6b/a89fbcfae70cf53f066ec22591938296889d3cc58fec1e1c393b10e8d71d +PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/ae/67/0952ed97a9793b4958e5736f6d2b346b414a2cd63e82d05940032f45b32f PYTHON_AIOSIGNAL_SETUP_TYPE = setuptools PYTHON_AIOSIGNAL_LICENSE = Apache-2.0 PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index 6a6782b397..e256e9dc08 100644 --- a/package/python-alembic/python-alembic.hash +++ b/package/python-alembic/python-alembic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/alembic/json -md5 3d336c248990cafc69ea403d6af18994 alembic-1.8.0.tar.gz -sha256 a2d4d90da70b30e70352cd9455e35873a255a31402a438fe24815758d7a0e5e1 alembic-1.8.0.tar.gz +md5 667a722df7dbef926a4ce760b9917622 alembic-1.8.1.tar.gz +sha256 cd0b5e45b14b706426b833f06369b9a6d5ee03f826ec3238723ce8caaf6e5ffa alembic-1.8.1.tar.gz # Locally computed sha256 checksums sha256 f0e3f7a5080879ccae798882d9bee3d48fe335d0bad84ca8eec86fa594375ea0 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index d40acef5f7..735678b384 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.8.0 +PYTHON_ALEMBIC_VERSION = 1.8.1 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/43/f2/f6096d23eb43d436f7c3408a6c83f82a1c704bfb50fb608574b048484480 +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/37/ab/80e6d86ca81235ea1a7104089dddf74de4b45f8af0a05d4b265be44d6ff9 PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE diff --git a/package/python-arrow/python-arrow.hash b/package/python-arrow/python-arrow.hash index 9216e1c26c..30fb88e8c0 100644 --- a/package/python-arrow/python-arrow.hash +++ b/package/python-arrow/python-arrow.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/arrow/json -md5 608682052926c7e5636285af0618ef38 arrow-1.2.0.tar.gz -sha256 16fc29bbd9e425e3eb0fef3018297910a0f4568f21116fc31771e2760a50e074 arrow-1.2.0.tar.gz +md5 a964a7574e486b0642f3fbc02ef22773 arrow-1.2.3.tar.gz +sha256 3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1 arrow-1.2.3.tar.gz # Locally computed sha256 checksums sha256 40d6e1255d7151f5f041a514725d3c94ffa8c1881e5a0c29b6bea93f03e2e3bb LICENSE diff --git a/package/python-arrow/python-arrow.mk b/package/python-arrow/python-arrow.mk index a20ac8dbc7..1e34ef09c8 100644 --- a/package/python-arrow/python-arrow.mk +++ b/package/python-arrow/python-arrow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ARROW_VERSION = 1.2.0 +PYTHON_ARROW_VERSION = 1.2.3 PYTHON_ARROW_SOURCE = arrow-$(PYTHON_ARROW_VERSION).tar.gz -PYTHON_ARROW_SITE = https://files.pythonhosted.org/packages/dc/bd/2565b8533bb8cf66e10a9e68a1d489ad839799b2050f0635039e614e3b1a +PYTHON_ARROW_SITE = https://files.pythonhosted.org/packages/7f/c0/c601ea7811f422700ef809f167683899cdfddec5aa3f83597edf97349962 PYTHON_ARROW_SETUP_TYPE = setuptools PYTHON_ARROW_LICENSE = Apache-2.0 PYTHON_ARROW_LICENSE_FILES = LICENSE diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index 631db812dc..fec707ce02 100644 --- a/package/python-asgiref/python-asgiref.hash +++ b/package/python-asgiref/python-asgiref.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asgiref/json -md5 5afe03ecc39ae94950ff95e80166d945 asgiref-3.3.4.tar.gz -sha256 d1216dfbdfb63826470995d31caed36225dcaf34f182e0fa257a4dd9e86f1b78 asgiref-3.3.4.tar.gz +md5 b3cf42bb1f9191196f9ed1678f9dc106 asgiref-3.5.2.tar.gz +sha256 4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424 asgiref-3.5.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index 0353f5d5a0..afc083fb1f 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.3.4 +PYTHON_ASGIREF_VERSION = 3.5.2 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/d8/3f/ef696a6d8254f182b1a089aeffb638d2eb83055e603146d3a40605c5b7da +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/1f/35/e7d59b92ceffb1dc62c65156278de378670b46ab2364a3ea7216fe194ba3 PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE diff --git a/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch b/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch new file mode 100644 index 0000000000..2be7ec6cda --- /dev/null +++ b/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch @@ -0,0 +1,28 @@ +From d04d51d62a23370869ad466fa95b7d4ec2e0fa6e Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 14 Nov 2022 22:30:33 +0100 +Subject: [PATCH] Remove uneeded dependency to "wheel" + +Attempting to build Automat in Buildroot fails while trying +to check for this undeeded dependency. + +Signed-off-by: Julien Olivain +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index c2f9816..afa8012 100644 +--- a/setup.py ++++ b/setup.py +@@ -15,7 +15,6 @@ setup( + packages=find_packages(exclude=[]), + package_dir={'automat': 'automat'}, + setup_requires=[ +- 'wheel', + 'setuptools-scm', + ], + install_requires=[ +-- +2.38.1 + diff --git a/package/python-automat/python-automat.hash b/package/python-automat/python-automat.hash index 33a64abedf..cfb16ac664 100644 --- a/package/python-automat/python-automat.hash +++ b/package/python-automat/python-automat.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/automat/json -md5 d6cef9886b037b8857bfbc686f3ae30a Automat-20.2.0.tar.gz -sha256 7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 Automat-20.2.0.tar.gz +md5 b8064994239aabb172748f984489ce75 Automat-22.10.0.tar.gz +sha256 e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e Automat-22.10.0.tar.gz # Locally computed sha256 checksums sha256 b2201301678d0a937d938543827ca1360712eb34e23de8ee3f3bfffbd4c0e376 LICENSE diff --git a/package/python-automat/python-automat.mk b/package/python-automat/python-automat.mk index b94fd2e1c4..675fbd2260 100644 --- a/package/python-automat/python-automat.mk +++ b/package/python-automat/python-automat.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOMAT_VERSION = 20.2.0 +PYTHON_AUTOMAT_VERSION = 22.10.0 PYTHON_AUTOMAT_SOURCE = Automat-$(PYTHON_AUTOMAT_VERSION).tar.gz -PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/80/c5/82c63bad570f4ef745cc5c2f0713c8eddcd07153b4bee7f72a8dc9f9384b +PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/7a/7b/9c3d26d8a0416eefbc0428f168241b32657ca260fb7ef507596ff5c2f6c4 PYTHON_AUTOMAT_SETUP_TYPE = setuptools PYTHON_AUTOMAT_LICENSE = MIT PYTHON_AUTOMAT_LICENSE_FILES = LICENSE diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash index d752fa8ae6..0d457a11fd 100644 --- a/package/python-avro/python-avro.hash +++ b/package/python-avro/python-avro.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.11.0/py/avro-1.11.0.tar.gz.sha512 -sha512 8af67deb33b9990b74ffd7ab5c3c55e13a649070b4623c7bbe2b278287fd0929e57ed6d0344f9e93f3eb79663b43f75891d0810812349dfaecce65fdd9b44e93 avro-1.11.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.1/py/avro-1.11.1.tar.gz.sha512 +sha512 bce5983cd7ed20be848cca41d143f16bf5bab57edc010d590fc1268405de4267e028ff7ec740282a03034aff5aa528feadb2be4e71ee6879b3080e0a9e19cb37 avro-1.11.1.tar.gz # License files sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/package/python-avro/python-avro.mk b/package/python-avro/python-avro.mk index 42aa11aa4e..6193cbbd8e 100644 --- a/package/python-avro/python-avro.mk +++ b/package/python-avro/python-avro.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update avro-c -PYTHON_AVRO_VERSION = 1.11.0 +PYTHON_AVRO_VERSION = 1.11.1 PYTHON_AVRO_SITE = \ https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz diff --git a/package/python-babel/python-babel.hash b/package/python-babel/python-babel.hash index 5211f20110..2b2f56d8c6 100644 --- a/package/python-babel/python-babel.hash +++ b/package/python-babel/python-babel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/babel/json -md5 7166099733d78aa857d74fa50d8ff58c Babel-2.9.1.tar.gz -sha256 bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0 Babel-2.9.1.tar.gz +md5 9ee7784fd452d456206ecd3a12694010 Babel-2.11.0.tar.gz +sha256 5ef4b3226b0180dedded4229651c8b0e1a3a6a2837d45a073272f313e4cf97f6 Babel-2.11.0.tar.gz # Locally computed sha256 checksums -sha256 28c97bf33e7506e277487bdaa3a69b70f170d6af5a82785ac0a74c8428042e40 LICENSE +sha256 2499aec3c5f041c3ac2c448a15fb233314e4c20cbac1530be04ec31b2788631c LICENSE diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk index a503a139f9..35857dc127 100644 --- a/package/python-babel/python-babel.mk +++ b/package/python-babel/python-babel.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_BABEL_VERSION = 2.9.1 +PYTHON_BABEL_VERSION = 2.11.0 PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/17/e6/ec9aa6ac3d00c383a5731cc97ed7c619d3996232c977bb8326bcbb6c687e +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/ff/80/45b42203ecc32c8de281f52e3ec81cb5e4ef16127e9e8543089d8b1649fb PYTHON_BABEL_SETUP_TYPE = setuptools PYTHON_BABEL_LICENSE = BSD-3-Clause PYTHON_BABEL_LICENSE_FILES = LICENSE +HOST_PYTHON_BABEL_DEPENDENCIES = host-python-pytz $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-bcrypt/Config.in b/package/python-bcrypt/Config.in index 9e9864e9d2..67800df3e1 100644 --- a/package/python-bcrypt/Config.in +++ b/package/python-bcrypt/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_BCRYPT bool "python-bcrypt" - select BR2_PACKAGE_PYTHON_CFFI # runtime + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS help Modern password hashing for your software and your servers. diff --git a/package/python-bcrypt/python-bcrypt.hash b/package/python-bcrypt/python-bcrypt.hash index b1970d8684..e148078699 100644 --- a/package/python-bcrypt/python-bcrypt.hash +++ b/package/python-bcrypt/python-bcrypt.hash @@ -1,5 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/bcrypt/json -md5 fe31390dab603728f756cd3d6830c80a bcrypt-3.2.0.tar.gz -sha256 5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29 bcrypt-3.2.0.tar.gz +# Locally calculated after vendoring +sha256 d64daee0af1afe137718674e67a49b8bb791842aab265b588a6d68d44a449c70 bcrypt-4.0.1.tar.gz # Locally computed sha256 checksums sha256 8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90 LICENSE diff --git a/package/python-bcrypt/python-bcrypt.mk b/package/python-bcrypt/python-bcrypt.mk index ad770cc974..cbd6855d9c 100644 --- a/package/python-bcrypt/python-bcrypt.mk +++ b/package/python-bcrypt/python-bcrypt.mk @@ -4,12 +4,23 @@ # ################################################################################ -PYTHON_BCRYPT_VERSION = 3.2.0 +PYTHON_BCRYPT_VERSION = 4.0.1 PYTHON_BCRYPT_SOURCE = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz -PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/d8/ba/21c475ead997ee21502d30f76fd93ad8d5858d19a3fad7cd153de698c4dd +PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/8c/ae/3af7d006aacf513975fd1948a6b4d6f8b4a307f8a244e1a3d3774b297aad PYTHON_BCRYPT_SETUP_TYPE = setuptools PYTHON_BCRYPT_LICENSE = Apache-2.0 PYTHON_BCRYPT_LICENSE_FILES = LICENSE -PYTHON_BCRYPT_DEPENDENCIES = host-python-cffi +PYTHON_BCRYPT_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-rustc +PYTHON_BCRYPT_ENV = \ + $(PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +# We need to vendor the Cargo crates at download time +PYTHON_BCRYPT_DOWNLOAD_POST_PROCESS = cargo +PYTHON_BCRYPT_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_BCRYPT_DL_ENV = \ + $(PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/_bcrypt/Cargo.toml $(eval $(python-package)) diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.hash b/package/python-beautifulsoup4/python-beautifulsoup4.hash index 665c142d53..4641d2e3a3 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.hash +++ b/package/python-beautifulsoup4/python-beautifulsoup4.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/beautifulsoup4/json -md5 e754242642253dd31d249d00358d552e beautifulsoup4-4.10.0.tar.gz -sha256 c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891 beautifulsoup4-4.10.0.tar.gz +md5 22f22f89cf9da41b22e1ece9639c66a3 beautifulsoup4-4.11.1.tar.gz +sha256 ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693 beautifulsoup4-4.11.1.tar.gz # Locally computed sha256 checksums -sha256 a47ea51236098464fe0b4f559743590b533056d9e00f49ecbf80299fab47e231 COPYING.txt +sha256 9e41dab3a48f5c734a9d5446557b28a6616e4924ee51d205598e4416bb93ce25 LICENSE diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.mk b/package/python-beautifulsoup4/python-beautifulsoup4.mk index f729d1051a..78f885ba08 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.mk +++ b/package/python-beautifulsoup4/python-beautifulsoup4.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_BEAUTIFULSOUP4_VERSION = 4.10.0 +PYTHON_BEAUTIFULSOUP4_VERSION = 4.11.1 PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz -PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/a1/69/daeee6d8f22c997e522cdbeb59641c4d31ab120aba0f2c799500f7456b7e +PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/e8/b0/cd2b968000577ec5ce6c741a54d846dfa402372369b8b6861720aa9ecea7 PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = setuptools PYTHON_BEAUTIFULSOUP4_LICENSE = MIT -PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = COPYING.txt +PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-bluezero/python-bluezero.hash b/package/python-bluezero/python-bluezero.hash index 59e8c5af5b..6bedf62b27 100644 --- a/package/python-bluezero/python-bluezero.hash +++ b/package/python-bluezero/python-bluezero.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bluezero/json -md5 b26e6425d8adc4613b7cdf1d131f8c0b bluezero-0.6.0.tar.gz -sha256 d94f0672b1de3ff0040801538143fe9a42c501d8db79bcd183c9e051b8da83bc bluezero-0.6.0.tar.gz +md5 efa07525f1bf6db9af66eb7d9775cdb0 bluezero-0.7.1.tar.gz +sha256 f146feb65ee9f6fd9f3638ff0a44df9fd6efb48cf66a39ce51a62a7d38ab5206 bluezero-0.7.1.tar.gz # Locally computed sha256 checksums sha256 59319e80b4caa94ace4817c9f84aa16abc9d4d2b5f7866251b5fda92e87ccdef LICENSE diff --git a/package/python-bluezero/python-bluezero.mk b/package/python-bluezero/python-bluezero.mk index 7e244fe3f0..34efb6155c 100644 --- a/package/python-bluezero/python-bluezero.mk +++ b/package/python-bluezero/python-bluezero.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLUEZERO_VERSION = 0.6.0 +PYTHON_BLUEZERO_VERSION = 0.7.1 PYTHON_BLUEZERO_SOURCE = bluezero-$(PYTHON_BLUEZERO_VERSION).tar.gz -PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/be/15/4a806580ffd359a03184776f37cf201298918f302b414b8a3e594d1be65c +PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/9a/66/d4a92869ed2afd9483a65aff200b2ba0ca4365429bc9a836c5803ab876a5 PYTHON_BLUEZERO_SETUP_TYPE = setuptools PYTHON_BLUEZERO_LICENSE = MIT PYTHON_BLUEZERO_LICENSE_FILES = LICENSE diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index 96c03be61c..347acde9b2 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/boto3/json -sha256 833e67edfb73f2cc22ff27a1c33728686dc90a9e81ba2551f9462ea2d1b04f41 boto3-1.24.8.tar.gz +# md5, sha256 from https://pypi.org/pypi/boto3/json +md5 17f5f946d79da139fa9fd9b014fe0d99 boto3-1.26.0.tar.gz +sha256 8f0e4eb5c26f927c09bc03302d38156af578b816f1e4f8ca4f0f734d134b9d4f boto3-1.26.0.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index c5f9133573..03dc32a08b 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.24.8 +PYTHON_BOTO3_VERSION = 1.26.0 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/60/3b/6fed306341003fd059f402d22747ba33d07b8ac8bfe53dbedb2c6e42ee3b +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/77/18/91af4ff58b26d03af8bf8e0759c4087b77032bdc54199d750905080c669a PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index bb806fe251..72e64f521e 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/botocore/json -sha256 db6667b8dfd175d16187653942cd91dd1f0cf36adc0ea9d7a0805ba4d2a3321f botocore-1.27.8.tar.gz +# md5, sha256 from https://pypi.org/pypi/botocore/json +md5 fae1e9ad89e12436ef65b8208febdc3e botocore-1.29.0.tar.gz +sha256 f25dc0827005f81abf4b890a20c71f64ee40ea9e9795df38a242fdeed79e0a89 botocore-1.29.0.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 459eefeab1..9d2a94b39b 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.27.8 +PYTHON_BOTOCORE_VERSION = 1.29.0 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/d1/b0/ea92703bbbf82353d571636fe6697b162c3881576986d6474119d03fce53 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/0a/95/8f31139077187f2da9132d7547979262376e19056d99c7cf6278431a53de PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-channels-redis/python-channels-redis.hash b/package/python-channels-redis/python-channels-redis.hash index 5c98953fa1..eaab5814a6 100644 --- a/package/python-channels-redis/python-channels-redis.hash +++ b/package/python-channels-redis/python-channels-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/channels-redis/json -md5 9ec9ffd467e181906f257d6c0dbabf45 channels_redis-2.4.1.tar.gz -sha256 ddfa0c067085fdce24fb80d9c0b848638cbdbf0e1167f14eb2e99d635ad216e6 channels_redis-2.4.1.tar.gz +md5 82898cb3b50bb19e8484b80b4d940910 channels_redis-4.0.0.tar.gz +sha256 122414f29f525f7b9e0c9d59cdcfc4dc1b0eecba16fbb6a1c23f1d9b58f49dcb channels_redis-4.0.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-channels-redis/python-channels-redis.mk b/package/python-channels-redis/python-channels-redis.mk index c2c6f59c3c..727f403aaf 100644 --- a/package/python-channels-redis/python-channels-redis.mk +++ b/package/python-channels-redis/python-channels-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHANNELS_REDIS_VERSION = 2.4.1 +PYTHON_CHANNELS_REDIS_VERSION = 4.0.0 PYTHON_CHANNELS_REDIS_SOURCE = channels_redis-$(PYTHON_CHANNELS_REDIS_VERSION).tar.gz -PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/87/a9/8d11c32ae6bf3a2cc893185f7d1e03b80bda680131a08473c07ed1fe591d +PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/8a/8d/bf96c62e3ca6c5ae59eb3482804afbe026c1c98b05b3ab65a0d46663644a PYTHON_CHANNELS_REDIS_SETUP_TYPE = setuptools PYTHON_CHANNELS_REDIS_LICENSE = BSD-3-Clause PYTHON_CHANNELS_REDIS_LICENSE_FILES = LICENSE diff --git a/package/python-channels/python-channels.hash b/package/python-channels/python-channels.hash index 2d0097da2b..ea643f1589 100644 --- a/package/python-channels/python-channels.hash +++ b/package/python-channels/python-channels.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/channels/json -md5 6f3fb75828b681a69372934a09ac3f32 channels-2.3.1.tar.gz -sha256 6b8ebd93fe0041a23e31c9f4130d92fadb9c0040c0eb377a004540631325a31d channels-2.3.1.tar.gz +md5 b145f0623bf1bad8ceb534c306ad2f2a channels-4.0.0.tar.gz +sha256 0ce53507a7da7b148eaa454526e0e05f7da5e5d1c23440e4886cf146981d8420 channels-4.0.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-channels/python-channels.mk b/package/python-channels/python-channels.mk index c0eca71aa2..40f17cb114 100644 --- a/package/python-channels/python-channels.mk +++ b/package/python-channels/python-channels.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHANNELS_VERSION = 2.3.1 +PYTHON_CHANNELS_VERSION = 4.0.0 PYTHON_CHANNELS_SOURCE = channels-$(PYTHON_CHANNELS_VERSION).tar.gz -PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/75/53/2db9662a52dcedb02a25f87d8efc5e630059967790e4c10887dbd2db2073 +PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/8e/cb/6fedd9df5972b893a04c8e5d7748873d6480a813e74b0797945bee1f4282 PYTHON_CHANNELS_SETUP_TYPE = setuptools PYTHON_CHANNELS_LICENSE = BSD-3-Clause PYTHON_CHANNELS_LICENSE_FILES = LICENSE diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index 06d9453163..e538d1fcdc 100644 --- a/package/python-cheroot/python-cheroot.hash +++ b/package/python-cheroot/python-cheroot.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cheroot/json -md5 7ace4b584a8092deb9f6b0142a627086 cheroot-8.2.1.tar.gz -sha256 5b525b3e4a755adf78070ab54c1821fb860d4255a9317dba2b88eb2df2441cff cheroot-8.2.1.tar.gz +md5 70247d0948899f453b50e6181cddd0d7 cheroot-8.6.0.tar.gz +sha256 366adf6e7cac9555486c2d1be6297993022eff6f8c4655c1443268cca3f08e25 cheroot-8.6.0.tar.gz # Locally computed sha256 checksums -sha256 da6dc218683f6dab91c6367f00bf33095d980fb1f04d430c81c5e6994b8605e0 LICENSE.md +sha256 e20feeb491a7e98084f15719349e9857aad41c4503c5e479f8815b063dbf7564 LICENSE.md diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 9eae887989..95f2e39480 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 8.2.1 +PYTHON_CHEROOT_VERSION = 8.6.0 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/9b/4d/2e51e7ce60f54a5279e91648b9b9b497d4d22bc624ecae6af1b6866144a7 +PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/99/c4/9b5ca09208047f2689c24ee63e195aa01ceffb7857d715cabc046559ddd6 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools diff --git a/package/python-cherrypy/python-cherrypy.hash b/package/python-cherrypy/python-cherrypy.hash index 2e7a92d6f3..cd8f8756d8 100644 --- a/package/python-cherrypy/python-cherrypy.hash +++ b/package/python-cherrypy/python-cherrypy.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/CherryPy/json, sha256 locally computed -md5 e21fd0c5706504a8f26c46d808a14255 CherryPy-12.0.1.tar.gz -sha256 6a3a90a43b1e05bd4634c60acfdcf34efe74f9f8746aca14dbe95a9b69db30ea CherryPy-12.0.1.tar.gz -sha256 02f4efe6e7dcd218c33cfa065c0552de983b5ad563b053e97697c5abd2ef14f9 LICENSE.md +# md5, sha256 from https://pypi.org/pypi/cherrypy/json +md5 033c58bf3da497f283b039911d1c882b CherryPy-18.8.0.tar.gz +sha256 9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b CherryPy-18.8.0.tar.gz +# Locally computed sha256 checksums +sha256 45ade933c280ece37e3e01d3a91afeed9505746a456f72ad10b0897c49e65104 LICENSE.md diff --git a/package/python-cherrypy/python-cherrypy.mk b/package/python-cherrypy/python-cherrypy.mk index 72b17bc876..9b6ad0e99a 100644 --- a/package/python-cherrypy/python-cherrypy.mk +++ b/package/python-cherrypy/python-cherrypy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHERRYPY_VERSION = 12.0.1 +PYTHON_CHERRYPY_VERSION = 18.8.0 PYTHON_CHERRYPY_SOURCE = CherryPy-$(PYTHON_CHERRYPY_VERSION).tar.gz -PYTHON_CHERRYPY_SITE = https://pypi.python.org/packages/be/d8/a8ef56bfe1c39d466b8d55b496b64459cc43dec71361d88edf904901637f +PYTHON_CHERRYPY_SITE = https://files.pythonhosted.org/packages/60/ea/6c4d16b0cd1f4f64a478bac8a37d75a585e854afb5693ce80a9711efdc4a PYTHON_CHERRYPY_LICENSE = BSD-3-Clause PYTHON_CHERRYPY_LICENSE_FILES = LICENSE.md PYTHON_CHERRYPY_SETUP_TYPE = setuptools diff --git a/package/python-colorama/python-colorama.hash b/package/python-colorama/python-colorama.hash index e975a66363..aba1be3eba 100644 --- a/package/python-colorama/python-colorama.hash +++ b/package/python-colorama/python-colorama.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorama/json -md5 57b22f2597f63df051b69906fbf310cc colorama-0.4.4.tar.gz -sha256 5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b colorama-0.4.4.tar.gz +md5 11fe1cbf8299798551ac88f824ea11c4 colorama-0.4.6.tar.gz +sha256 08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 colorama-0.4.6.tar.gz # Locally computed sha256 checksums sha256 cac35c02686e5d04a5a7140bfb3b36e73aed496656e891102e428886d7930318 LICENSE.txt diff --git a/package/python-colorama/python-colorama.mk b/package/python-colorama/python-colorama.mk index d3d29a63e9..d633e00602 100644 --- a/package/python-colorama/python-colorama.mk +++ b/package/python-colorama/python-colorama.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_COLORAMA_VERSION = 0.4.4 +PYTHON_COLORAMA_VERSION = 0.4.6 PYTHON_COLORAMA_SOURCE = colorama-$(PYTHON_COLORAMA_VERSION).tar.gz -PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe -PYTHON_COLORAMA_SETUP_TYPE = setuptools +PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4 +PYTHON_COLORAMA_SETUP_TYPE = pep517 PYTHON_COLORAMA_LICENSE = BSD-3-Clause PYTHON_COLORAMA_LICENSE_FILES = LICENSE.txt +PYTHON_COLORAMA_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-colorlog/python-colorlog.hash b/package/python-colorlog/python-colorlog.hash index f324c1f290..f4d0dd4c0e 100644 --- a/package/python-colorlog/python-colorlog.hash +++ b/package/python-colorlog/python-colorlog.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorlog/json -md5 f1b92c1cac428b2e3c9ac7edf2988440 colorlog-6.4.1.tar.gz -sha256 af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8 colorlog-6.4.1.tar.gz +md5 80b79f7824d39d4f3b11c75d1cba094e colorlog-6.7.0.tar.gz +sha256 bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 colorlog-6.7.0.tar.gz # Locally computed sha256 checksums sha256 b1d9082bc483623fd59fc7279b457f0e40d942a76426cde257239e04dfe4125a LICENSE diff --git a/package/python-colorlog/python-colorlog.mk b/package/python-colorlog/python-colorlog.mk index 801b30be89..12a1c8ec77 100644 --- a/package/python-colorlog/python-colorlog.mk +++ b/package/python-colorlog/python-colorlog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORLOG_VERSION = 6.4.1 +PYTHON_COLORLOG_VERSION = 6.7.0 PYTHON_COLORLOG_SOURCE = colorlog-$(PYTHON_COLORLOG_VERSION).tar.gz -PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/d6/4a/840f6cb7e922a717c765a3cdc6988aff22a6ef211d88c8d16701dfbd664f +PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/78/6b/4e5481ddcdb9c255b2715f54c863629f1543e97bc8c309d1c5c131ad14f2 PYTHON_COLORLOG_SETUP_TYPE = setuptools PYTHON_COLORLOG_LICENSE = MIT PYTHON_COLORLOG_LICENSE_FILES = LICENSE diff --git a/package/python-cppy/python-cppy.hash b/package/python-cppy/python-cppy.hash new file mode 100644 index 0000000000..45b78eab8e --- /dev/null +++ b/package/python-cppy/python-cppy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/cppy/json +md5 7c1f825c43dd66454440932a35b9969c cppy-1.2.1.tar.gz +sha256 83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b cppy-1.2.1.tar.gz +# Locally computed sha256 checksums +sha256 db7a008bff1e63ccec397cfa033109740c4dc6cb12070a70d0cfe69aba27c4df LICENSE diff --git a/package/python-cppy/python-cppy.mk b/package/python-cppy/python-cppy.mk new file mode 100644 index 0000000000..adadc352d3 --- /dev/null +++ b/package/python-cppy/python-cppy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-cppy +# +################################################################################ + +PYTHON_CPPY_VERSION = 1.2.1 +PYTHON_CPPY_SOURCE = cppy-$(PYTHON_CPPY_VERSION).tar.gz +PYTHON_CPPY_SITE = https://files.pythonhosted.org/packages/c5/7e/6cc5acd93752ee52d2f0423046072a2ce3ae16dfcd44373b9fe2a0222204 +PYTHON_CPPY_LICENSE = BSD-3-Clause +PYTHON_CPPY_LICENSE_FILES = LICENSE +PYTHON_CPPY_SETUP_TYPE = setuptools + +$(eval $(host-python-package)) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 0f6a62164b..40d217f666 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 59f77beef181a9e6643ad2c10b8c6551fc561452287bd3552bec76c86d55b774 cryptography-38.0.1.tar.gz +sha256 cd0b4536eabc6fcb80aa03430fc2ca485d33249eea0cd23f76c1dd9da410c66c cryptography-38.0.3.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index c0265f5bfa..69eb90d795 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 38.0.1 +PYTHON_CRYPTOGRAPHY_VERSION = 38.0.3 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6d/0c/5e67831007ba6cd7e52c4095f053cf45c357739b0a7c46a45ddd50049019 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/13/dd/a9608b7aebe5d2dc0c98a4b2090a6b815628efa46cc1c046b89d8cd25f4c PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD diff --git a/package/python-cssselect/python-cssselect.hash b/package/python-cssselect/python-cssselect.hash index f0687a4abd..df2523265f 100644 --- a/package/python-cssselect/python-cssselect.hash +++ b/package/python-cssselect/python-cssselect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssselect/json -md5 fa57704c1cb66cc8e537b782bd6b227e cssselect-1.1.0.tar.gz -sha256 f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc cssselect-1.1.0.tar.gz +md5 27fbafacce5447cb867acb240d35002a cssselect-1.2.0.tar.gz +sha256 666b19839cfaddb9ce9d36bfe4c969132c647b92fc9088c4e23f786b30f1b3dc cssselect-1.2.0.tar.gz # Locally computed sha256 checksums sha256 5c8da9f744e0afba81a48c9b5dbe73048f798b3287d6f1af8a05ee08ebb10892 LICENSE diff --git a/package/python-cssselect/python-cssselect.mk b/package/python-cssselect/python-cssselect.mk index f6faa94b4c..96f6f98737 100644 --- a/package/python-cssselect/python-cssselect.mk +++ b/package/python-cssselect/python-cssselect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CSSSELECT_VERSION = 1.1.0 +PYTHON_CSSSELECT_VERSION = 1.2.0 PYTHON_CSSSELECT_SOURCE = cssselect-$(PYTHON_CSSSELECT_VERSION).tar.gz -PYTHON_CSSSELECT_SITE = https://files.pythonhosted.org/packages/70/54/37630f6eb2c214cdee2ae56b7287394c8aa2f3bafb8b4eb8c3791aae7a14 +PYTHON_CSSSELECT_SITE = https://files.pythonhosted.org/packages/d1/91/d51202cc41fbfca7fa332f43a5adac4b253962588c7cc5a54824b019081c PYTHON_CSSSELECT_SETUP_TYPE = setuptools PYTHON_CSSSELECT_LICENSE = BSD-3-Clause PYTHON_CSSSELECT_LICENSE_FILES = LICENSE diff --git a/package/python-daphne/0001-remove-pytest-runner-requirement.patch b/package/python-daphne/0001-remove-pytest-runner-requirement.patch index 30acf201d6..70cdb4f19d 100644 --- a/package/python-daphne/0001-remove-pytest-runner-requirement.patch +++ b/package/python-daphne/0001-remove-pytest-runner-requirement.patch @@ -15,13 +15,13 @@ index 64e94f1..4e3abb0 100755 --- a/setup.py +++ b/setup.py @@ -23,7 +23,6 @@ setup( - packages=find_packages() + ["twisted.plugins"], include_package_data=True, - install_requires=["twisted[tls]>=18.7", "autobahn>=0.18", "asgiref~=3.2"], + install_requires=["twisted[tls]>=22.4", "autobahn>=22.4.2", "asgiref>=3.5.2,<4"], + python_requires=">=3.7", - setup_requires=["pytest-runner"], - extras_require={ - "tests": ["hypothesis~=3.88", "pytest~=3.10", "pytest-asyncio~=0.8"] - }, + extras_require={"tests": ["hypothesis", "pytest", "pytest-asyncio", "django"]}, + entry_points={ + "console_scripts": ["daphne = daphne.cli:CommandLineInterface.entrypoint"] -- 2.21.0 diff --git a/package/python-daphne/python-daphne.hash b/package/python-daphne/python-daphne.hash index f80d7175cb..90d053bff6 100644 --- a/package/python-daphne/python-daphne.hash +++ b/package/python-daphne/python-daphne.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/daphne/json -md5 564353eaed92659e3b113d966a0288f2 daphne-2.4.1.tar.gz0 -sha256 1e41d02d78da373c1f8504835cdca6d447b5d64c2941661d4bd968d412b6c383 daphne-2.4.1.tar.gz -# Locally computed sha256 +md5 f0dcc0618459ad7d25508704f9505b56 daphne-4.0.0.tar.gz +sha256 cce9afc8f49a4f15d4270b8cfb0e0fe811b770a5cc795474e97e4da287497666 daphne-4.0.0.tar.gz +# Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-daphne/python-daphne.mk b/package/python-daphne/python-daphne.mk index cd4739db19..c08088278e 100644 --- a/package/python-daphne/python-daphne.mk +++ b/package/python-daphne/python-daphne.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DAPHNE_VERSION = 2.4.1 +PYTHON_DAPHNE_VERSION = 4.0.0 PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz -PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/03/6c/847d1c962f8c45aa2ab0791583c4a41669d158e28fd6369ce940b8ea8417 +PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/d7/77/57b19d5caabf8537879aa4cf3a017b99d0b727f2521ffca7fd9140573509 PYTHON_DAPHNE_SETUP_TYPE = setuptools # https://github.com/django/daphne/blob/master/LICENSE PYTHON_DAPHNE_LICENSE = BSD-3-Clause diff --git a/package/python-dataproperty/python-dataproperty.hash b/package/python-dataproperty/python-dataproperty.hash index 380846e9f1..3edec5cc8c 100644 --- a/package/python-dataproperty/python-dataproperty.hash +++ b/package/python-dataproperty/python-dataproperty.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dataproperty/json -md5 ce5fd0d37b6d0ca57f144e22cd62bfec DataProperty-0.54.2.tar.gz -sha256 df2fcf00e7a57f0a6089f686f847527eb3c91ded5c419daef6d06ee4bb1187b4 DataProperty-0.54.2.tar.gz +md5 8c8864a1dc456d25456b5c4de99a3fb6 DataProperty-0.55.0.tar.gz +sha256 73ccf10f8b123968210438a1a1aa859ea6d5a16b4e1f4d307da7a81b838e79fa DataProperty-0.55.0.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 1b07dc1bb7..0feef55310 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.54.2 +PYTHON_DATAPROPERTY_VERSION = 0.55.0 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/9a/03/44fb9094c4fb8032f254eaa37b3b07db82fa35779ceca097b3cde8464749 +PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/85/6e/627eba99858c486c5b82468e4aaf60808c2e35d1bb768ee5da712b6fe9be PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE diff --git a/package/python-decorator/python-decorator.hash b/package/python-decorator/python-decorator.hash index 46ff7206d7..e12d34e7ed 100644 --- a/package/python-decorator/python-decorator.hash +++ b/package/python-decorator/python-decorator.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/decorator/json -md5 d01585c3ea5b36a209747fcc978a98c8 decorator-5.1.0.tar.gz -sha256 e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7 decorator-5.1.0.tar.gz +md5 a6b34700dcac8a4bb04efd55e99626c1 decorator-5.1.1.tar.gz +sha256 637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 decorator-5.1.1.tar.gz # Locally computed sha256 checksums sha256 fd11660cabf0532082c45706862fafc294907ec7f8e217818240a4999806782e LICENSE.txt diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index a61f045e2a..5dba8cc915 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DECORATOR_VERSION = 5.1.0 +PYTHON_DECORATOR_VERSION = 5.1.1 PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz -PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/92/3c/34f8448b61809968052882b830f7d8d9a8e1c07048f70deb039ae599f73c +PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/66/0c/8d907af351aa16b42caae42f9d6aa37b900c67308052d10fdce809f8d952 PYTHON_DECORATOR_LICENSE = BSD-2-Clause PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_CPE_ID_VENDOR = python diff --git a/package/python-dialog3/python-dialog3.hash b/package/python-dialog3/python-dialog3.hash index 4c43d4bf5e..d66f328638 100644 --- a/package/python-dialog3/python-dialog3.hash +++ b/package/python-dialog3/python-dialog3.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pythondialog/json -md5 07e257d91099b804e040c6ea5ec56041 pythondialog-3.5.1.tar.gz -# Locally computed -sha256 34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8 pythondialog-3.5.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pythondialog/json +md5 94a9236e427de783fa3ee8288834f7f1 pythondialog-3.5.3.tar.gz +sha256 b2a34a8af0a6625ccbdf45cd343b854fc6c1a85231dadc80b8805db836756323 pythondialog-3.5.3.tar.gz +# Locally computed sha256 checksums sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/python-dialog3/python-dialog3.mk b/package/python-dialog3/python-dialog3.mk index 6051985640..e936de5811 100644 --- a/package/python-dialog3/python-dialog3.mk +++ b/package/python-dialog3/python-dialog3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DIALOG3_VERSION = 3.5.1 +PYTHON_DIALOG3_VERSION = 3.5.3 PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.gz -PYTHON_DIALOG3_SITE = https://files.pythonhosted.org/packages/72/3c/26ed0db035f97196704d0197d8b2254b8a6ca93a2d132430b0b0d597aa79 +PYTHON_DIALOG3_SITE = https://files.pythonhosted.org/packages/4e/40/5c84d79f7d536ca2c3722af521eff4faafe54a93797f08c72eb72e68fb68 PYTHON_DIALOG3_LICENSE = LGPL-2.1+ PYTHON_DIALOG3_LICENSE_FILES = COPYING PYTHON_DIALOG3_SETUP_TYPE = setuptools diff --git a/package/python-dicttoxml2/Config.in b/package/python-dicttoxml2/Config.in new file mode 100644 index 0000000000..0bd8068dd6 --- /dev/null +++ b/package/python-dicttoxml2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_DICTTOXML2 + bool "python-dicttoxml2" + select BR2_PACKAGE_PYTHON3_PYEXPAT + help + Converts a Python dictionary or other native data type into + a valid XML string. + + https://github.com/Ousret/dicttoxml diff --git a/package/python-dicttoxml2/python-dicttoxml2.hash b/package/python-dicttoxml2/python-dicttoxml2.hash new file mode 100644 index 0000000000..4cc92d1d37 --- /dev/null +++ b/package/python-dicttoxml2/python-dicttoxml2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dicttoxml2/json +md5 787ea4b80cd6234a41c016e8efa7ff40 dicttoxml2-2.1.0.tar.gz +sha256 67cb729f337dd752808c021b70c8df8a34f84b9e111a5dbaa37e000eeaf4d462 dicttoxml2-2.1.0.tar.gz +# Locally computed +sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/package/python-dicttoxml2/python-dicttoxml2.mk b/package/python-dicttoxml2/python-dicttoxml2.mk new file mode 100644 index 0000000000..d2abe63860 --- /dev/null +++ b/package/python-dicttoxml2/python-dicttoxml2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-dicttoxml2 +# +################################################################################ + +PYTHON_DICTTOXML2_VERSION = 2.1.0 +PYTHON_DICTTOXML2_SOURCE = dicttoxml2-$(PYTHON_DICTTOXML2_VERSION).tar.gz +PYTHON_DICTTOXML2_SITE = https://files.pythonhosted.org/packages/0b/24/7a6d37b2770843e34685e470fd711955cb0f77c354c73d8ca64b02420bce +PYTHON_DICTTOXML2_SETUP_TYPE = setuptools +PYTHON_DICTTOXML2_LICENSE = GPL-2.0 +PYTHON_DICTTOXML2_LICENSE_FILES = LICENCE.txt + +$(eval $(python-package)) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 72adc30bb1..b9ae8a1da1 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 75ec07b3e00c79fd6e67fbee53786b7a Django-4.0.8.tar.gz -sha256 07e6433f263c3839939cfabeb6d7557841e0419e47759a7b7d37f6d44d40adcb Django-4.0.8.tar.gz +md5 60c54c37ecf9e5e635ee6bb07a13a9fa Django-4.1.3.tar.gz +sha256 678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1 Django-4.1.3.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 567d590f77..c90caa9635 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.0.8 +PYTHON_DJANGO_VERSION = 4.1.3 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/1a/de/08d8a349ed0e3e1999eb86ae0347cc9eaf634cd65f1eb80b9387ac1dbe3c +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/d0/ab/33f9c2bd4cf7ff2d319131eca7231247f962f781ebc8a012ebe02582244a PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE diff --git a/package/python-docker/python-docker.hash b/package/python-docker/python-docker.hash index 678245a979..3fc3c4f0f4 100644 --- a/package/python-docker/python-docker.hash +++ b/package/python-docker/python-docker.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/docker/json -md5 e1e8dc73e3220fe9eec1faf80b0290de docker-4.1.0.tar.gz -sha256 6e06c5e70ba4fad73e35f00c55a895a448398f3ada7faae072e2bb01348bafc1 docker-4.1.0.tar.gz +md5 8e85e23ed30a3d07129e197d35e56eb4 docker-6.0.1.tar.gz +sha256 896c4282e5c7af5c45e8b683b0b0c33932974fe6e50fc6906a0a83616ab3da97 docker-6.0.1.tar.gz # Locally computed sha256 checksums sha256 f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2 LICENSE diff --git a/package/python-docker/python-docker.mk b/package/python-docker/python-docker.mk index f476a1badd..4da972e017 100644 --- a/package/python-docker/python-docker.mk +++ b/package/python-docker/python-docker.mk @@ -4,13 +4,14 @@ # ################################################################################ -PYTHON_DOCKER_VERSION = 4.1.0 +PYTHON_DOCKER_VERSION = 6.0.1 PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz -PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/de/54/a822d7116ff2f726f3da2b3e6c87659657bdcb7a36e382860ed505ed5e45 +PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/79/26/6609b51ecb418e12d1534d00b888ce7e108f38b47dc6cd589598d5c6aaa2 PYTHON_DOCKER_SETUP_TYPE = setuptools PYTHON_DOCKER_LICENSE = Apache-2.0 PYTHON_DOCKER_LICENSE_FILES = LICENSE PYTHON_DOCKER_CPE_ID_VENDOR = docker PYTHON_DOCKER_CPE_ID_PRODUCT = docker-py +PYTHON_DOCKER_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index f5e0b82db8..6a36f362e9 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz -sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz -sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt +# md5, sha256 from https://pypi.org/pypi/docutils/json +md5 0afa992a6e93db892107c3f087d0d9df docutils-0.19.tar.gz +sha256 33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 docutils-0.19.tar.gz +# Locally computed sha256 checksums +sha256 16b78bd9994588326a871ac39f64480969ebeb57ecd46a31874744560e72390a COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 39a570f5a1..d06521d10f 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.18.1 +PYTHON_DOCUTILS_VERSION = 0.19 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/6b/5c/330ea8d383eb2ce973df34d1239b3b21e91cd8c865d21ff82902d952f91f PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, Python-2.0, GPL-3.0+ (emacs mode) PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt PYTHON_DOCUTILS_SETUP_TYPE = setuptools diff --git a/package/python-dominate/python-dominate.hash b/package/python-dominate/python-dominate.hash index 2e77d72a2e..89293baec6 100644 --- a/package/python-dominate/python-dominate.hash +++ b/package/python-dominate/python-dominate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dominate/json -md5 9f714324ca99eee98bb3c3cdbe838de6 dominate-2.6.0.tar.gz -sha256 76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4 dominate-2.6.0.tar.gz +md5 77bba29beaaac4dfb657092cd89db033 dominate-2.7.0.tar.gz +sha256 520101360892ebf9d0553f67d37e359ff92403d8a1e33814030503088a05da49 dominate-2.7.0.tar.gz # Locally computed sha256 checksums sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 LICENSE.txt diff --git a/package/python-dominate/python-dominate.mk b/package/python-dominate/python-dominate.mk index 79fc058737..0f3687de5f 100644 --- a/package/python-dominate/python-dominate.mk +++ b/package/python-dominate/python-dominate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOMINATE_VERSION = 2.6.0 +PYTHON_DOMINATE_VERSION = 2.7.0 PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz -PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/29/23/edf8e470f1053245c1aa99d92c8a3da9e83f6c7d3eb39205486965425be5 +PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/12/d7/5e5f50f5d5bdd4282d2a70b9479c1d91d6628bebd4829e455cdf7366a92e PYTHON_DOMINATE_SETUP_TYPE = setuptools PYTHON_DOMINATE_LICENSE = LGPL-3.0+ PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-dpkt/python-dpkt.hash b/package/python-dpkt/python-dpkt.hash index e5e986628c..7de0d748fc 100644 --- a/package/python-dpkt/python-dpkt.hash +++ b/package/python-dpkt/python-dpkt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dpkt/json -md5 ac3ace1c5ee12a74f12a863ac9082b59 dpkt-1.9.7.2.tar.gz -sha256 80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b dpkt-1.9.7.2.tar.gz +md5 0f16de3c0b8caa6ec2261210f08c7b8b dpkt-1.9.8.tar.gz +sha256 43f8686e455da5052835fd1eda2689d51de3670aac9799b1b00cfd203927ee45 dpkt-1.9.8.tar.gz # Locally computed sha256 checksums sha256 4c5ffde575425591cbd51410219a6b98bbbb717e0c5784187e356653da8e5095 LICENSE diff --git a/package/python-dpkt/python-dpkt.mk b/package/python-dpkt/python-dpkt.mk index 87945d67c6..a99a1e8604 100644 --- a/package/python-dpkt/python-dpkt.mk +++ b/package/python-dpkt/python-dpkt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DPKT_VERSION = 1.9.7.2 +PYTHON_DPKT_VERSION = 1.9.8 PYTHON_DPKT_SOURCE = dpkt-$(PYTHON_DPKT_VERSION).tar.gz -PYTHON_DPKT_SITE = https://files.pythonhosted.org/packages/95/51/923b370880eff9b62fe4fe965a916da709022a02669c670731da69088e93 +PYTHON_DPKT_SITE = https://files.pythonhosted.org/packages/c9/7d/52f17a794db52a66e46ebb0c7549bf2f035ed61d5a920ba4aaa127dd038e PYTHON_DPKT_SETUP_TYPE = setuptools PYTHON_DPKT_LICENSE = BSD-3-Clause PYTHON_DPKT_LICENSE_FILES = LICENSE diff --git a/package/python-dtschema/python-dtschema.hash b/package/python-dtschema/python-dtschema.hash index 7b183e28e3..32e6e99fa7 100644 --- a/package/python-dtschema/python-dtschema.hash +++ b/package/python-dtschema/python-dtschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dtschema/json -md5 ed75defac9a7297a567f278994b14d5b dtschema-2022.8.tar.gz -sha256 1befe7c9f74cea248a8b524cf6185ac48912a5b2aae96854d77cb94584433ca4 dtschema-2022.8.tar.gz +md5 69f39814b2e90809b32cbeafc3e6aaab dtschema-2022.11.tar.gz +sha256 825e51b8bb82a2d4833d15c25ff2b9a3f5a53b36a490d7c4b6b136037e823320 dtschema-2022.11.tar.gz # Locally computed sha256 checksums sha256 ca0d66263406dc684fe9db60577b234f65ffdf620d7e041c708e969447b69111 LICENSE.txt diff --git a/package/python-dtschema/python-dtschema.mk b/package/python-dtschema/python-dtschema.mk index 263061dc98..90fffd4255 100644 --- a/package/python-dtschema/python-dtschema.mk +++ b/package/python-dtschema/python-dtschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DTSCHEMA_VERSION = 2022.8 +PYTHON_DTSCHEMA_VERSION = 2022.11 PYTHON_DTSCHEMA_SOURCE = dtschema-$(PYTHON_DTSCHEMA_VERSION).tar.gz -PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/95/be/cb576760b9578cb69da020aeb80f3c2d05ff46b4090ab350c1e05691329e +PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/9a/15/41ece48fc9524ad815238cfbd164b8ac9dde889759790afbcc4903564dbd PYTHON_DTSCHEMA_SETUP_TYPE = setuptools PYTHON_DTSCHEMA_LICENSE = BSD-2-Clause PYTHON_DTSCHEMA_LICENSE_FILES = LICENSE.txt diff --git a/package/python-ecdsa/python-ecdsa.hash b/package/python-ecdsa/python-ecdsa.hash index a082d30b0f..382cccd47c 100644 --- a/package/python-ecdsa/python-ecdsa.hash +++ b/package/python-ecdsa/python-ecdsa.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ecdsa/json -md5 d0dd59c43af0f640a60599551529f5d0 ecdsa-0.17.0.tar.gz -sha256 b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa ecdsa-0.17.0.tar.gz +md5 cbca26ec29cc50e32e8b070aa2ec0786 ecdsa-0.18.0.tar.gz +sha256 190348041559e21b22a1d65cee485282ca11a6f81d503fddb84d5017e9ed1e49 ecdsa-0.18.0.tar.gz # Locally computed sha256 checksums sha256 3eca9845773d2e5b8cc9d8c119d345f00a4806e4bd660d4a3d6cdf9c0e9d8bb2 LICENSE diff --git a/package/python-ecdsa/python-ecdsa.mk b/package/python-ecdsa/python-ecdsa.mk index eda35616de..d3d49c2520 100644 --- a/package/python-ecdsa/python-ecdsa.mk +++ b/package/python-ecdsa/python-ecdsa.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ECDSA_VERSION = 0.17.0 +PYTHON_ECDSA_VERSION = 0.18.0 PYTHON_ECDSA_SOURCE = ecdsa-$(PYTHON_ECDSA_VERSION).tar.gz -PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/bf/3d/3d909532ad541651390bf1321e097404cbd39d1d89c2046f42a460220fb3 +PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/ff/7b/ba6547a76c468a0d22de93e89ae60d9561ec911f59532907e72b0d8bc0f1 PYTHON_ECDSA_SETUP_TYPE = setuptools PYTHON_ECDSA_LICENSE = MIT PYTHON_ECDSA_LICENSE_FILES = LICENSE diff --git a/package/python-engineio/python-engineio.hash b/package/python-engineio/python-engineio.hash index 5762303af0..651226cc9c 100644 --- a/package/python-engineio/python-engineio.hash +++ b/package/python-engineio/python-engineio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-engineio/json -md5 d2bc7184d64e9d5a692bfad29ff73dea python-engineio-4.2.1.tar.gz -sha256 d510329b6d8ed5662547862f58bc73659ae62defa66b66d745ba021de112fa62 python-engineio-4.2.1.tar.gz +md5 cb093c07bc5b5351e6a2edb555b02f33 python-engineio-4.3.4.tar.gz +sha256 d8d8b072799c36cadcdcc2b40d2a560ce09797ab3d2d596b2ad519a5e4df19ae python-engineio-4.3.4.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-engineio/python-engineio.mk b/package/python-engineio/python-engineio.mk index 81bd49fb64..388e669155 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 4.2.1 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/74/1e/33e402011bb2fe33ab12762e5a66d66df1d47302a23e9c5e8310e11b1403 +PYTHON_ENGINEIO_VERSION = 4.3.4 +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/7e/ff/970c5d084f513fb38108cd7c90497489d7cff8666f9bfabae00a3f4e13d4 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE diff --git a/package/python-entrypoints/python-entrypoints.hash b/package/python-entrypoints/python-entrypoints.hash index 95c092e5e0..a8deb85614 100644 --- a/package/python-entrypoints/python-entrypoints.hash +++ b/package/python-entrypoints/python-entrypoints.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/entrypoints/json -md5 c5c61ea2e46a0c50ea08f4af7955a0b1 entrypoints-0.3.tar.gz -sha256 c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451 entrypoints-0.3.tar.gz +md5 3acd8b72119a8fb1eac7030c24ac6b49 entrypoints-0.4.tar.gz +sha256 b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4 entrypoints-0.4.tar.gz # Locally computed sha256 checksums sha256 de5fcd7349cdf399b0707a2a024833c4704743650133c72d6f0ff7561a03a848 LICENSE diff --git a/package/python-entrypoints/python-entrypoints.mk b/package/python-entrypoints/python-entrypoints.mk index 7ab1b4d64a..287b83605d 100644 --- a/package/python-entrypoints/python-entrypoints.mk +++ b/package/python-entrypoints/python-entrypoints.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_ENTRYPOINTS_VERSION = 0.3 +PYTHON_ENTRYPOINTS_VERSION = 0.4 PYTHON_ENTRYPOINTS_SOURCE = entrypoints-$(PYTHON_ENTRYPOINTS_VERSION).tar.gz -PYTHON_ENTRYPOINTS_SITE = https://files.pythonhosted.org/packages/b4/ef/063484f1f9ba3081e920ec9972c96664e2edb9fdc3d8669b0e3b8fc0ad7c -PYTHON_ENTRYPOINTS_SETUP_TYPE = distutils +PYTHON_ENTRYPOINTS_SITE = https://files.pythonhosted.org/packages/ea/8d/a7121ffe5f402dc015277d2d31eb82d2187334503a011c18f2e78ecbb9b2 +PYTHON_ENTRYPOINTS_SETUP_TYPE = flit PYTHON_ENTRYPOINTS_LICENSE = MIT PYTHON_ENTRYPOINTS_LICENSE_FILES = LICENSE diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index d7cc864668..e4dd67de07 100644 --- a/package/python-filelock/python-filelock.hash +++ b/package/python-filelock/python-filelock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/filelock/json -md5 f8458b5235a9e439fd512dc08947f6b2 filelock-3.3.0.tar.gz -sha256 8c7eab13dc442dc249e95158bcc12dec724465919bdc9831fdbf0660f03d1785 filelock-3.3.0.tar.gz +md5 9bd8d33d5d7dc95012981ccbfb2d2a0f filelock-3.8.0.tar.gz +sha256 55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc filelock-3.8.0.tar.gz # Locally computed sha256 checksums sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/python-filelock/python-filelock.mk b/package/python-filelock/python-filelock.mk index 00c32b2caa..8d5308ddca 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.3.0 +PYTHON_FILELOCK_VERSION = 3.8.0 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/fd/6e/665a6cb363bee26e40954ee812e4e733fd7cafd84c06e0c7c2357641abd6 +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/95/55/b897882bffb8213456363e646bf9e9fa704ffda5a7d140edf935a9e02c7b PYTHON_FILELOCK_SETUP_TYPE = setuptools PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE diff --git a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash index 4c2a701eb3..50ca14371d 100644 --- a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash +++ b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-sqlalchemy/json -md5 dcb6b62248ced71dab183f2cb2778583 Flask-SQLAlchemy-2.5.1.tar.gz -sha256 2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912 Flask-SQLAlchemy-2.5.1.tar.gz +md5 cbc5756b7e14683de1a540516159a81a Flask-SQLAlchemy-3.0.2.tar.gz +sha256 16199f5b3ddfb69e0df2f52ae4c76aedbfec823462349dabb21a1b2e0a2b65e9 Flask-SQLAlchemy-3.0.2.tar.gz # Locally computed sha256 checksums sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk index b1d00ad6c0..ca6fd0c793 100644 --- a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk +++ b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_SQLALCHEMY_VERSION = 2.5.1 +PYTHON_FLASK_SQLALCHEMY_VERSION = 3.0.2 PYTHON_FLASK_SQLALCHEMY_SOURCE = Flask-SQLAlchemy-$(PYTHON_FLASK_SQLALCHEMY_VERSION).tar.gz -PYTHON_FLASK_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/35/f0/39dd2d8e7e5223f78a5206d7020dc0e16718a964acfb3564d89e9798ab9b +PYTHON_FLASK_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/0b/b7/05a8f9c3f010775275f8dec53e40ff7ea1ae61bf1cfa4b524caf4d3da982 PYTHON_FLASK_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_FLASK_SQLALCHEMY_LICENSE = BSD-3-Clause PYTHON_FLASK_SQLALCHEMY_LICENSE_FILES = LICENSE.rst diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash index 5f19a450a1..9b6391750a 100644 --- a/package/python-flask/python-flask.hash +++ b/package/python-flask/python-flask.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/flask/json -md5 93f1832e5be704ef6ff2a4124579cd85 Flask-2.1.2.tar.gz -sha256 315ded2ddf8a6281567edb27393010fe3406188bafbfe65a3339d5787d89e477 Flask-2.1.2.tar.gz +md5 c0d2276cb7d59a06d62c915da9c77ba6 Flask-2.2.2.tar.gz +sha256 642c450d19c4ad482f96729bd2a8f6d32554aa1e231f4f6b4e7e5264b16cca2b Flask-2.2.2.tar.gz # Locally computed sha256 checksums sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst sha256 7535eac513edd12fb8e33f203c6a403549629e34b363418cdbd6c6ea5464515d docs/license.rst diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk index b684aff480..1b1ffdf034 100644 --- a/package/python-flask/python-flask.mk +++ b/package/python-flask/python-flask.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 2.1.2 +PYTHON_FLASK_VERSION = 2.2.2 PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/d3/3c/94f38d4db919a9326a706ad56f05a7e6f0c8f7b7d93e2997cca54d3bc14b +PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/69/b6/53cfa30eed5aa7343daff36622843688ba8c6fe9829bb2b92e193ab1163f PYTHON_FLASK_SETUP_TYPE = setuptools PYTHON_FLASK_LICENSE = BSD-3-Clause PYTHON_FLASK_LICENSE_FILES = LICENSE.rst docs/license.rst diff --git a/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch deleted file mode 100644 index 5a94e1dcab..0000000000 --- a/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 2cd8b5708be88b90ea2fa0fb35407a5ec2038c8e Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sat, 27 Nov 2021 02:36:15 -0700 -Subject: [PATCH] Fix ast version parser for multiple assignments - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/takluyver/flit/pull/474] ---- - flit_core/common.py | 21 +++++++++++-------- - .../tests/samples/moduleunimportabledouble.py | 8 +++++++ - flit_core/tests/test_common.py | 5 +++++ - 3 files changed, 25 insertions(+), 9 deletions(-) - create mode 100644 flit_core/tests/samples/moduleunimportabledouble.py - -diff --git a/flit_core/common.py b/flit_core/common.py -index f1f378f..86bcf4b 100644 ---- a/flit_core/common.py -+++ b/flit_core/common.py -@@ -132,15 +132,18 @@ def get_docstring_and_version_via_ast(target): - for child in node.body: - # Only use the version from the given module if it's a simple - # string assignment to __version__ -- is_version_str = ( -- isinstance(child, ast.Assign) -- and len(child.targets) == 1 -- and isinstance(child.targets[0], ast.Name) -- and child.targets[0].id == "__version__" -- and isinstance(child.value, ast.Str) -- ) -- if is_version_str: -- version = child.value.s -+ if isinstance(child, ast.Assign): -+ for target in child.targets: -+ is_version_str = ( -+ isinstance(target, ast.Name) -+ and target.id == "__version__" -+ and isinstance(child.value, ast.Str) -+ ) -+ if is_version_str: -+ version = child.value.s -+ break -+ else: -+ continue - break - else: - version = None -diff --git a/flit_core/tests/samples/moduleunimportabledouble.py b/flit_core/tests/samples/moduleunimportabledouble.py -new file mode 100644 -index 0000000..42d51f3 ---- /dev/null -+++ b/flit_core/tests/samples/moduleunimportabledouble.py -@@ -0,0 +1,8 @@ -+ -+""" -+A sample unimportable module with double assignment -+""" -+ -+raise ImportError() -+ -+VERSION = __version__ = "0.1" -diff --git a/flit_core/tests/test_common.py b/flit_core/tests/test_common.py -index 02cfab7..42e230b 100644 ---- a/flit_core/tests/test_common.py -+++ b/flit_core/tests/test_common.py -@@ -70,6 +70,11 @@ class ModuleTests(TestCase): - 'version': '0.1'} - ) - -+ info = get_info_from_module(Module('moduleunimportabledouble', samples_dir)) -+ self.assertEqual(info, {'summary': 'A sample unimportable module with double assignment', -+ 'version': '0.1'} -+ ) -+ - info = get_info_from_module(Module('module1', samples_dir / 'constructed_version')) - self.assertEqual(info, {'summary': 'This module has a __version__ that requires runtime interpretation', - 'version': '1.2.3'} --- -2.33.1 - diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index 135be93660..9281635f1a 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json -md5 4a4791e97f3a8c9a1645064a35636ee6 flit_core-3.7.1.tar.gz -sha256 14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f flit_core-3.7.1.tar.gz +md5 7c41da13273f7787709a24f74e0f5a99 flit_core-3.8.0.tar.gz +sha256 b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3 flit_core-3.8.0.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 2dc67bd517..4d7bee81da 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLIT_CORE_VERSION = 3.7.1 +PYTHON_FLIT_CORE_VERSION = 3.8.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz -PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index 4d1ac3b411..04a3a44e89 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 6ac017ba79ac7a1491e47e89012efeab frozenlist-1.3.1.tar.gz -sha256 3a735e4211a04ccfa3f4833547acdf5d2f863bfeb01cfd3edaffbc251f15cec8 frozenlist-1.3.1.tar.gz +md5 14e9ffd849c6a1dfa3c6b1fb1ff77b14 frozenlist-1.3.3.tar.gz +sha256 58bcc55721e8a90b88332d6cd441261ebb22342e238296bb330968952fbb3a6a frozenlist-1.3.3.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 51b5d42832..88833b0465 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.3.1 +PYTHON_FROZENLIST_VERSION = 1.3.3 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/8a/95/229aacfe85daa28e2792481a98c336bc30d3729533e6a44db537880aca21 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/e9/10/d629476346112b85c912527b9080944fd2c39a816c2225413dbc0bb6fcc0 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index 8e2a95b03e..b5fd1fd7b2 100644 --- a/package/python-greenlet/python-greenlet.hash +++ b/package/python-greenlet/python-greenlet.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/greenlet/json -md5 b3e86eb9ab0908e6e3ef542e9b94d7e1 greenlet-1.1.3.post0.tar.gz -sha256 f5e09dc5c6e1796969fd4b775ea1417d70e49a5df29aaa8e5d10675d9e11872c greenlet-1.1.3.post0.tar.gz +md5 1d73a38c1c0b0c7e16ec17d6a19f3652 greenlet-2.0.0.tar.gz +sha256 6c66f0da8049ee3c126b762768179820d4c0ae0ca46ae489039e4da2fae39a52 greenlet-2.0.0.tar.gz # Locally computed sha256 checksums sha256 769831d6e5dfaf2c20802faccff1fafb4c2025dd8f6253dfa47fcad59d4d0979 LICENSE sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index b4a0e5af08..42bf7970d8 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 1.1.3.post0 +PYTHON_GREENLET_VERSION = 2.0.0 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/ea/37/e54ce453b298e890f59dba3db32461579328a07d5b65e3eabf80f971c099 +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/23/6f/f72865c589d0c79f03b51520a4cdd65647de0513e9ad107a5731df89c235 PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF diff --git a/package/python-httplib2/python-httplib2.hash b/package/python-httplib2/python-httplib2.hash index 2c5914c5f6..4da8f26e43 100644 --- a/package/python-httplib2/python-httplib2.hash +++ b/package/python-httplib2/python-httplib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httplib2/json -md5 de7f5e3a4adb3105889867327bdd39dc httplib2-0.19.1.tar.gz -sha256 0b12617eeca7433d4c396a100eaecfa4b08ee99aa881e6df6e257a7aad5d533d httplib2-0.19.1.tar.gz +md5 b42f508585d988e77eac3980db1fd967 httplib2-0.21.0.tar.gz +sha256 fc144f091c7286b82bec71bdbd9b27323ba709cc612568d3000893bfd9cb4b34 httplib2-0.21.0.tar.gz # Locally computed sha256 checksums sha256 589eec38f72df2be203711d3b8cbece9b908c5e7ff00bc3cab7f63bae9e366b4 LICENSE diff --git a/package/python-httplib2/python-httplib2.mk b/package/python-httplib2/python-httplib2.mk index a259c33c73..1093ecab39 100644 --- a/package/python-httplib2/python-httplib2.mk +++ b/package/python-httplib2/python-httplib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPLIB2_VERSION = 0.19.1 +PYTHON_HTTPLIB2_VERSION = 0.21.0 PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz -PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/ed/cd/533a1e9e04671bcee5d2854b4f651a3fab9586d698de769d93b05ee2bff1 +PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/c2/37/a093aaa902f6b2301f0f2cff5285548dbc4ab9b9a29215eb440381cbb32b PYTHON_HTTPLIB2_SETUP_TYPE = setuptools PYTHON_HTTPLIB2_LICENSE = MIT PYTHON_HTTPLIB2_LICENSE_FILES = LICENSE diff --git a/package/python-huepy/0001-fix-import-with-python3.patch b/package/python-huepy/0001-fix-import-with-python3.patch deleted file mode 100644 index e04eacb228..0000000000 --- a/package/python-huepy/0001-fix-import-with-python3.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/huepy/__init__.py -+++ b/huepy/__init__.py -@@ -1,4 +1,4 @@ --from hue import COMMANDS -+from .hue import COMMANDS - - __all__ = list(COMMANDS.keys()) - __version__ = '1.0.1' diff --git a/package/python-huepy/python-huepy.hash b/package/python-huepy/python-huepy.hash index 32d0eb2674..74b02864d3 100644 --- a/package/python-huepy/python-huepy.hash +++ b/package/python-huepy/python-huepy.hash @@ -1,4 +1,5 @@ -# Locally computer sha256 checksums -md5 da6514d9d61fb75ac9470f6863ce1aca python-huepy-a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e.tar.gz -sha256 63147cef5ecae5c1ab38000be91def351710e6bef2c5f67b5303418becf6c0f2 python-huepy-a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e.tar.gz +# md5, sha256 from https://pypi.org/pypi/huepy/json +md5 394a1072bec18c27097b053c40ddf0ea huepy-1.2.1.tar.gz +sha256 5b29beef797312fb7606188bc5cd98f78ab8f7e01576427a9312f1c9b20b759d huepy-1.2.1.tar.gz +# Locally computed sha256 checksums sha256 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b LICENSE diff --git a/package/python-huepy/python-huepy.mk b/package/python-huepy/python-huepy.mk index 5c1041205d..cca3c3429e 100644 --- a/package/python-huepy/python-huepy.mk +++ b/package/python-huepy/python-huepy.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_HUEPY_VERSION = a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e -PYTHON_HUEPY_SITE = $(call github,s0md3v,hue,$(PYTHON_HUEPY_VERSION)) +PYTHON_HUEPY_VERSION = 1.2.1 +PYTHON_HUEPY_SOURCE = huepy-$(PYTHON_HUEPY_VERSION).tar.gz +PYTHON_HUEPY_SITE = https://files.pythonhosted.org/packages/d6/4e/2dae447d8858a31158ca6c313f5d1902bc83b8542bb5f10c0307de2973bc PYTHON_HUEPY_LICENSE = GPL-3.0 PYTHON_HUEPY_LICENSE_FILES = LICENSE PYTHON_HUEPY_SETUP_TYPE = setuptools diff --git a/package/python-humanize/python-humanize.hash b/package/python-humanize/python-humanize.hash index 9b2559ab11..871bb9bfa5 100644 --- a/package/python-humanize/python-humanize.hash +++ b/package/python-humanize/python-humanize.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/humanize/json -md5 04f5b334283e1f7f0dfeccf7d5a4b880 humanize-3.11.0.tar.gz -sha256 4160cdc63fcd0daac27d2e1e218a31bb396fc3fe5712d153675d89432a03778f humanize-3.11.0.tar.gz +md5 5e90552713107f756788ecdd8fbe341d humanize-4.4.0.tar.gz +sha256 efb2584565cc86b7ea87a977a15066de34cdedaf341b11c851cfcfd2b964779c humanize-4.4.0.tar.gz # Locally computed sha256 checksums sha256 8ba6c18112a431400ad3c743f70670079b302545d98884fc2f28a91c383a0380 LICENCE diff --git a/package/python-humanize/python-humanize.mk b/package/python-humanize/python-humanize.mk index ea5454d6cc..04cb0713fc 100644 --- a/package/python-humanize/python-humanize.mk +++ b/package/python-humanize/python-humanize.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HUMANIZE_VERSION = 3.11.0 +PYTHON_HUMANIZE_VERSION = 4.4.0 PYTHON_HUMANIZE_SOURCE = humanize-$(PYTHON_HUMANIZE_VERSION).tar.gz -PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/a6/d0/e06993724937f2aab3e7085d137d453968aaac0f74661ef9c90528a79d61 +PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/51/19/3e1adf0e7a8c8361496b085edcab2ddcd85410735a2b6fdd044247fc5b75 PYTHON_HUMANIZE_SETUP_TYPE = setuptools PYTHON_HUMANIZE_LICENSE = MIT PYTHON_HUMANIZE_LICENSE_FILES = LICENCE diff --git a/package/python-ifaddr/python-ifaddr.hash b/package/python-ifaddr/python-ifaddr.hash index 57b155caa5..e3c2b13b69 100644 --- a/package/python-ifaddr/python-ifaddr.hash +++ b/package/python-ifaddr/python-ifaddr.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ifaddr/json -md5 97c4eb7505643b5f1fe17733cb42abd9 ifaddr-0.1.7.tar.gz -sha256 1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 ifaddr-0.1.7.tar.gz +md5 b1cac02b5dc354d68dd6d853bc9565a7 ifaddr-0.2.0.tar.gz +sha256 cc0cbfcaabf765d44595825fb96a99bb12c79716b73b44330ea38ee2b0c4aed4 ifaddr-0.2.0.tar.gz # Locally computed sha256 checksums sha256 8700856576ae2bc80c63bc970250510d9213fb02fed006d5f22742c9ddde24d7 LICENSE.txt diff --git a/package/python-ifaddr/python-ifaddr.mk b/package/python-ifaddr/python-ifaddr.mk index f1154d9de8..9b7d50d825 100644 --- a/package/python-ifaddr/python-ifaddr.mk +++ b/package/python-ifaddr/python-ifaddr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IFADDR_VERSION = 0.1.7 +PYTHON_IFADDR_VERSION = 0.2.0 PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz -PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/3d/fc/4ce147e3997cd0ea470ad27112087545cf83bf85015ddb3054673cb471bb +PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/e8/ac/fb4c578f4a3256561548cd825646680edcadb9440f3f68add95ade1eb791 PYTHON_IFADDR_SETUP_TYPE = setuptools PYTHON_IFADDR_LICENSE = MIT PYTHON_IFADDR_LICENSE_FILES = LICENSE.txt diff --git a/package/python-incremental/python-incremental.hash b/package/python-incremental/python-incremental.hash index 47af832f39..456e8ca16d 100644 --- a/package/python-incremental/python-incremental.hash +++ b/package/python-incremental/python-incremental.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/incremental/json -md5 9f7ad12e0c05a12cee52a7350976c4e3 incremental-21.3.0.tar.gz -sha256 02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57 incremental-21.3.0.tar.gz +md5 9fffa2490ca649550c79a78e85ef2eef incremental-22.10.0.tar.gz +sha256 912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 incremental-22.10.0.tar.gz # Locally computed sha256 checksums sha256 d043bc8899b4695de1f4511d8f507b927e11723b981ce600fa3ef7b73954afa5 LICENSE diff --git a/package/python-incremental/python-incremental.mk b/package/python-incremental/python-incremental.mk index 7c6b2a547c..4b032d2649 100644 --- a/package/python-incremental/python-incremental.mk +++ b/package/python-incremental/python-incremental.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INCREMENTAL_VERSION = 21.3.0 +PYTHON_INCREMENTAL_VERSION = 22.10.0 PYTHON_INCREMENTAL_SOURCE = incremental-$(PYTHON_INCREMENTAL_VERSION).tar.gz -PYTHON_INCREMENTAL_SITE = https://files.pythonhosted.org/packages/4f/c5/430765c697afc217c8491785de321a21fa4d983dda14bcd82feb965b0593 +PYTHON_INCREMENTAL_SITE = https://files.pythonhosted.org/packages/86/42/9e87f04fa2cd40e3016f27a4b4572290e95899c6dce317e2cdb580f3ff09 PYTHON_INCREMENTAL_SETUP_TYPE = setuptools PYTHON_INCREMENTAL_LICENSE = MIT PYTHON_INCREMENTAL_LICENSE_FILES = LICENSE diff --git a/package/python-ipython/0001-set-correct-python-executable-path.patch b/package/python-ipython/0001-set-correct-python-executable-path.patch deleted file mode 100644 index 0fbd5a1c8e..0000000000 --- a/package/python-ipython/0001-set-correct-python-executable-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -Set correct Python executable path - -Signed-off-by: Philippe Proulx - ---- python-ipython-2.1.0/setupbase.py 2014-05-21 15:19:12.000000000 -0400 -+++ python-ipython-2.1.0-new/setupbase.py 2014-07-23 23:34:32.892030423 -0400 -@@ -394,7 +394,7 @@ class build_scripts_entrypt(build_script - - mod, func = entrypt.split(':') - with open(outfile, 'w') as f: -- f.write(script_src.format(executable=sys.executable, -+ f.write(script_src.format(executable='/usr/bin/env python', - mod=mod, func=func)) - - return outfiles, outfiles diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index cd18c3d125..e61727e045 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz -sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz +md5 8c98f6def0622ea32975cb779247c3d7 ipython-8.6.0.tar.gz +sha256 7c959e3dedbf7ed81f9b9d8833df252c430610e2a4a6464ec13cd20975ce20a5 ipython-8.6.0.tar.gz # Locally computed sha256 checksums sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 389ebfa897..f3aac75db1 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.31.1 +PYTHON_IPYTHON_VERSION = 8.6.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/7f/59/05e94e067afb61460f0d5229a1edb800e2f65b8436085fad9cd262d80d45 PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython PYTHON_IPYTHON_CPE_ID_PRODUCT = ipython -PYTHON_IPYTHON_SETUP_TYPE = distutils +PYTHON_IPYTHON_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-iso8601/python-iso8601.hash b/package/python-iso8601/python-iso8601.hash index 76dd5ec452..7c6d3f3ded 100644 --- a/package/python-iso8601/python-iso8601.hash +++ b/package/python-iso8601/python-iso8601.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/iso8601/json -md5 d6fe8ccc847aaf8ac965da3b6023e697 iso8601-0.1.14.tar.gz -sha256 8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79 iso8601-0.1.14.tar.gz +md5 29dd454d638bd684bd3466583f6724dc iso8601-1.1.0.tar.gz +sha256 32811e7b81deee2063ea6d2e94f8819a86d1f3811e49d23623a41fa832bef03f iso8601-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 116d368d14a8cf0061027c944c60ee20b476ce42814818a7d627396906761f16 LICENSE +sha256 516b02cd11e78c37a04f9effadd85af0483dda7ab1e715eef1cc94f97dc49e13 LICENSE diff --git a/package/python-iso8601/python-iso8601.mk b/package/python-iso8601/python-iso8601.mk index 3f128d15e4..68bf69933a 100644 --- a/package/python-iso8601/python-iso8601.mk +++ b/package/python-iso8601/python-iso8601.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ISO8601_VERSION = 0.1.14 +PYTHON_ISO8601_VERSION = 1.1.0 PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz -PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/f9/ed/b97abc7877e5b253eef96a469f47d617b0ebcccc735405fa1a620c7ee833 +PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/31/8c/1c342fdd2f4af0857684d16af766201393ef53318c15fa785fcb6c3b7c32 PYTHON_ISO8601_SETUP_TYPE = setuptools PYTHON_ISO8601_LICENSE = MIT PYTHON_ISO8601_LICENSE_FILES = LICENSE diff --git a/package/python-jaraco-classes/python-jaraco-classes.hash b/package/python-jaraco-classes/python-jaraco-classes.hash index 088ee2269e..0e170d58d1 100644 --- a/package/python-jaraco-classes/python-jaraco-classes.hash +++ b/package/python-jaraco-classes/python-jaraco-classes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jaraco.classes/json -md5 63d4f5a2df2625ec3979c9633da1505e jaraco.classes-2.0.tar.gz -sha256 dcc2c4a8ca4b344cdbf2e1be7124a5c4f192574cdbb453b62350ae8240a2caf5 jaraco.classes-2.0.tar.gz +md5 a661acdae43995c08500324a8df62f03 jaraco.classes-3.2.3.tar.gz +sha256 89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a jaraco.classes-3.2.3.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-jaraco-classes/python-jaraco-classes.mk b/package/python-jaraco-classes/python-jaraco-classes.mk index 7455ed4d44..4790516330 100644 --- a/package/python-jaraco-classes/python-jaraco-classes.mk +++ b/package/python-jaraco-classes/python-jaraco-classes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_CLASSES_VERSION = 2.0 +PYTHON_JARACO_CLASSES_VERSION = 3.2.3 PYTHON_JARACO_CLASSES_SOURCE = jaraco.classes-$(PYTHON_JARACO_CLASSES_VERSION).tar.gz -PYTHON_JARACO_CLASSES_SITE = https://files.pythonhosted.org/packages/6e/27/f6ce0863a6ce574922ffe70d63c40b9771aefb686cb595cf435d184f0ca3 +PYTHON_JARACO_CLASSES_SITE = https://files.pythonhosted.org/packages/bf/02/a956c9bfd2dfe60b30c065ed8e28df7fcf72b292b861dca97e951c145ef6 PYTHON_JARACO_CLASSES_LICENSE = MIT PYTHON_JARACO_CLASSES_LICENSE_FILES = LICENSE PYTHON_JARACO_CLASSES_SETUP_TYPE = setuptools diff --git a/package/python-jaraco-functools/python-jaraco-functools.hash b/package/python-jaraco-functools/python-jaraco-functools.hash index 95380aff98..a7cbb3daf1 100644 --- a/package/python-jaraco-functools/python-jaraco-functools.hash +++ b/package/python-jaraco-functools/python-jaraco-functools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jaraco.functools/json -md5 c245ade3e753bc556415f1fec102f232 jaraco.functools-2.0.tar.gz -sha256 35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345 jaraco.functools-2.0.tar.gz +md5 f25708d7f38b9264459046fcc0afc8c1 jaraco.functools-3.5.2.tar.gz +sha256 45b05c158f3ad28731075556ffd4749bd254ec67f91e1eb367dcfebff1151db4 jaraco.functools-3.5.2.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-jaraco-functools/python-jaraco-functools.mk b/package/python-jaraco-functools/python-jaraco-functools.mk index f062063b0b..8f64c4687e 100644 --- a/package/python-jaraco-functools/python-jaraco-functools.mk +++ b/package/python-jaraco-functools/python-jaraco-functools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_FUNCTOOLS_VERSION = 2.0 +PYTHON_JARACO_FUNCTOOLS_VERSION = 3.5.2 PYTHON_JARACO_FUNCTOOLS_SOURCE = jaraco.functools-$(PYTHON_JARACO_FUNCTOOLS_VERSION).tar.gz -PYTHON_JARACO_FUNCTOOLS_SITE = https://files.pythonhosted.org/packages/a9/1e/44f6a5cffef147a3ffd37a748b8f4c2ded9b07ca20a15f17cd9874158f24 +PYTHON_JARACO_FUNCTOOLS_SITE = https://files.pythonhosted.org/packages/b4/ea/9abca360081de9157668fcc52765989158aaf29b4826f26fcb17852d08e6 PYTHON_JARACO_FUNCTOOLS_LICENSE = MIT PYTHON_JARACO_FUNCTOOLS_LICENSE_FILES = LICENSE PYTHON_JARACO_FUNCTOOLS_SETUP_TYPE = setuptools diff --git a/package/python-jmespath/python-jmespath.hash b/package/python-jmespath/python-jmespath.hash index a1c64a121e..03f64f3b74 100644 --- a/package/python-jmespath/python-jmespath.hash +++ b/package/python-jmespath/python-jmespath.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/jmespath/json -sha256 a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e jmespath-1.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/jmespath/json +md5 2dd28beb22d698f58fe2281bfe5fe3a3 jmespath-1.0.1.tar.gz +sha256 90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe jmespath-1.0.1.tar.gz # Locally computed sha256 checksums sha256 66b313cce80ed0623fc7db3f24863a0c80fd83eb341a46b57864158ae74faa56 LICENSE.txt diff --git a/package/python-jmespath/python-jmespath.mk b/package/python-jmespath/python-jmespath.mk index 48b19e8494..a94a13a229 100644 --- a/package/python-jmespath/python-jmespath.mk +++ b/package/python-jmespath/python-jmespath.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JMESPATH_VERSION = 1.0.0 +PYTHON_JMESPATH_VERSION = 1.0.1 PYTHON_JMESPATH_SOURCE = jmespath-$(PYTHON_JMESPATH_VERSION).tar.gz -PYTHON_JMESPATH_SITE = https://files.pythonhosted.org/packages/06/7e/44686b986ef9ca6069db224651baaa8300b93af2a085a5b135997bf659b3 +PYTHON_JMESPATH_SITE = https://files.pythonhosted.org/packages/00/2a/e867e8531cf3e36b41201936b7fa7ba7b5702dbef42922193f05c8976cd6 PYTHON_JMESPATH_SETUP_TYPE = setuptools PYTHON_JMESPATH_LICENSE = MIT PYTHON_JMESPATH_LICENSE_FILES = LICENSE.txt diff --git a/package/python-jsonschema/python-jsonschema.hash b/package/python-jsonschema/python-jsonschema.hash index d4c2759811..19b9659d08 100644 --- a/package/python-jsonschema/python-jsonschema.hash +++ b/package/python-jsonschema/python-jsonschema.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema/json -md5 3bc1f63a74fc61bf2847f22cadb0dfff jsonschema-4.16.0.tar.gz -sha256 165059f076eff6971bae5b742fc029a7b4ef3f9bcf04c14e4776a7605de14b23 jsonschema-4.16.0.tar.gz +md5 e569b6114d575bdb05cb8ce4676fe458 jsonschema-4.17.0.tar.gz +sha256 5bfcf2bca16a087ade17e02b282d34af7ccd749ef76241e7f9bd7c0cb8a9424d jsonschema-4.17.0.tar.gz # Locally computed sha256 checksums sha256 4f92a015a13c4d1a040bef018aa13430b4f1bc73b41b16bb846c346766de7439 COPYING sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a json/LICENSE diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 68a25aed58..8cc624886c 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JSONSCHEMA_VERSION = 4.16.0 +PYTHON_JSONSCHEMA_VERSION = 4.17.0 PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz -PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/cf/54/8923ba38b5145f2359d57e5516715392491d674c83f446cd4cd133eeb4d6 +PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/3a/3d/0653047b9b2ed03d3e96012bc90cfc96227221193fbedd4dc0cbf5a0e342 PYTHON_JSONSCHEMA_SETUP_TYPE = pep517 PYTHON_JSONSCHEMA_LICENSE = MIT PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING json/LICENSE diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index 692217f437..45f5bf7c84 100644 --- a/package/python-keyring/python-keyring.hash +++ b/package/python-keyring/python-keyring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/keyring/json -md5 1eb6d586ee5794de4bf39c1f513a3139 keyring-19.2.0.tar.gz -sha256 91037ccaf0c9a112a76f7740e4a416b9457a69b66c2799421581bee710a974b3 keyring-19.2.0.tar.gz +md5 60219a9a22467e15fcd09515b5b2ef39 keyring-23.9.3.tar.gz +sha256 69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5 keyring-23.9.3.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 0e05738605..8d7833e14f 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 19.2.0 +PYTHON_KEYRING_VERSION = 23.9.3 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/ee/46/77fdb7cd2b0f1f684afbc35a59b3d7ebb6961fe528f97b86900002968914 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/2a/ef/28d3d5428108111dae4304a2ebec80d113aea9e78c939e25255425d486ff PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE diff --git a/package/python-kiwisolver/python-kiwisolver.hash b/package/python-kiwisolver/python-kiwisolver.hash index aa7d79ced7..7f2e263a5b 100644 --- a/package/python-kiwisolver/python-kiwisolver.hash +++ b/package/python-kiwisolver/python-kiwisolver.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 48168c0ace18319c649e31907f6d8586f648e503560f506f128798b99393bcdb python-kiwisolver-1.1.0.tar.gz -sha256 95c32f73d43fa54d8146badbcbd73b83acb7fa2cc81a7cef7784b3cd33b146a0 LICENSE +# md5, sha256 from https://pypi.org/pypi/kiwisolver/json +md5 34796908455c3b23c889439b541e424b kiwisolver-1.4.4.tar.gz +sha256 d41997519fcba4a1e46eb4a2fe31bc12f0ff957b2b81bac28db24744f333e955 kiwisolver-1.4.4.tar.gz +# Locally computed sha256 checksums +sha256 26da8d49744796f2601fb5fe9e5d8b9e8102064ca60a8dc1825b6177cb05450c LICENSE diff --git a/package/python-kiwisolver/python-kiwisolver.mk b/package/python-kiwisolver/python-kiwisolver.mk index 2b99803c0d..2c5db26dbc 100644 --- a/package/python-kiwisolver/python-kiwisolver.mk +++ b/package/python-kiwisolver/python-kiwisolver.mk @@ -4,10 +4,12 @@ # ################################################################################ -PYTHON_KIWISOLVER_VERSION = 1.1.0 -PYTHON_KIWISOLVER_SITE = $(call github,nucleic,kiwi,$(PYTHON_KIWISOLVER_VERSION)) +PYTHON_KIWISOLVER_VERSION = 1.4.4 +PYTHON_KIWISOLVER_SOURCE = kiwisolver-$(PYTHON_KIWISOLVER_VERSION).tar.gz +PYTHON_KIWISOLVER_SITE = https://files.pythonhosted.org/packages/5f/5c/272a7dd49a1914f35cd8d6d9f386defa8b047f6fbd06badd6b77b3ba24e7 PYTHON_KIWISOLVER_LICENSE = BSD-3-Clause PYTHON_KIWISOLVER_LICENSE_FILES = LICENSE PYTHON_KIWISOLVER_SETUP_TYPE = setuptools +PYTHON_KIWISOLVER_DEPENDENCIES = host-python-cppy $(eval $(python-package)) diff --git a/package/python-lark/python-lark.hash b/package/python-lark/python-lark.hash index 3773c00f7c..abc168e93b 100644 --- a/package/python-lark/python-lark.hash +++ b/package/python-lark/python-lark.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lark/json -md5 fd3ca96a8d9d67798508470032921078 lark-1.1.2.tar.gz -sha256 7a8d0c07d663da9391d7faee1bf1d7df4998c47ca43a593cbef5c7566acd057a lark-1.1.2.tar.gz +md5 d7368d8f9fd0b844c034f321f5b52fd4 lark-1.1.4.tar.gz +sha256 eee86062b149600ef62de0d8dfd38cf85ffc737e16911e7d8c18880f8c5b1333 lark-1.1.4.tar.gz # Locally computed sha256 checksums -sha256 6e83ad8e0de51690a53eac02dd2b6188dfd7949053be56fba5b651140d27ee57 LICENSE +sha256 8263e5652d07cecb3adadf05140b65e70cfa169ecec5f520fe1671479ce12a83 LICENSE diff --git a/package/python-lark/python-lark.mk b/package/python-lark/python-lark.mk index 52c249552e..548adcd833 100644 --- a/package/python-lark/python-lark.mk +++ b/package/python-lark/python-lark.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LARK_VERSION = 1.1.2 +PYTHON_LARK_VERSION = 1.1.4 PYTHON_LARK_SOURCE = lark-$(PYTHON_LARK_VERSION).tar.gz -PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/a3/c5/11d0a086590b207ad1b6c9ba6e019f8290652f3d703cdb002d72e220dd99 +PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/1d/08/eb2590d4f824b5a947d866c603799fa70278f1372cbf8d15b7b4823dfb2b PYTHON_LARK_SETUP_TYPE = setuptools PYTHON_LARK_LICENSE = MIT PYTHON_LARK_LICENSE_FILES = LICENSE diff --git a/package/python-libusb1/python-libusb1.hash b/package/python-libusb1/python-libusb1.hash index 7d2302e088..86dea08c89 100644 --- a/package/python-libusb1/python-libusb1.hash +++ b/package/python-libusb1/python-libusb1.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/libusb1/json, sha256 locally computed -md5 b087646fb0c8c4cf7e8123af72f885b9 libusb1-2.0.1.tar.gz -sha256 d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46 libusb1-2.0.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/libusb1/json +md5 ffbb02bf9aa49f973a6a58112aed7b06 libusb1-3.0.0.tar.gz +sha256 5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538 libusb1-3.0.0.tar.gz +# Locally computed sha256 checksums sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/python-libusb1/python-libusb1.mk b/package/python-libusb1/python-libusb1.mk index 40a64141af..48a0b1dea3 100644 --- a/package/python-libusb1/python-libusb1.mk +++ b/package/python-libusb1/python-libusb1.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LIBUSB1_VERSION = 2.0.1 +PYTHON_LIBUSB1_VERSION = 3.0.0 PYTHON_LIBUSB1_SOURCE = libusb1-$(PYTHON_LIBUSB1_VERSION).tar.gz -PYTHON_LIBUSB1_SITE = https://files.pythonhosted.org/packages/a9/97/e8afa2af12b6de608ec86c8c4ad57f1248d98946d1b5e1aa0bff926755e9 +PYTHON_LIBUSB1_SITE = https://files.pythonhosted.org/packages/f4/83/59bf75e74e0c4859ea63eae0c7da660c1dcb78b31667d4a5f735d52f5974 PYTHON_LIBUSB1_SETUP_TYPE = setuptools PYTHON_LIBUSB1_LICENSE = LGPL-2.1+ PYTHON_LIBUSB1_LICENSE_FILES = COPYING.LESSER diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index f5b5daf06d..4bacafafde 100644 --- a/package/python-mako/python-mako.hash +++ b/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 409bdc38e9ddda5eada61fb092cb12fd Mako-1.1.5.tar.gz -sha256 169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3 Mako-1.1.5.tar.gz +md5 4fa0a489a247c59b36fe3e0de5514fed Mako-1.2.3.tar.gz +sha256 7fde96466fcfeedb0eed94f187f20b23d85e4cb41444be0e542e2c8c65c396cd Mako-1.2.3.tar.gz # Locally computed sha256 checksums -sha256 47cd0d41b1092f9161cfb629ed15e5cea185144710ff4633a4281ef088ff5de7 LICENSE +sha256 760f22b3e9ea4a50eb99201bd8dd118869f28108cfb64ccce6d1b305cf9ae9fa LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 553c4a5339..a663b7dbda 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.1.5 +PYTHON_MAKO_VERSION = 1.2.3 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/d1/42/ff293411e980debfc647be9306d89840c8b82ea24571b014f1a35b2ad80f +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/b9/38/c25f0874ea71802fc6f1e9f0f88a7e9666818121b28991bbc1d8eddbcdb1 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE diff --git a/package/python-markdown2/python-markdown2.hash b/package/python-markdown2/python-markdown2.hash index a3e310aacf..f8582ba5b8 100644 --- a/package/python-markdown2/python-markdown2.hash +++ b/package/python-markdown2/python-markdown2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown2/json -md5 6134fce06c4783b3178a90a719fa9d91 markdown2-2.4.1.tar.gz -sha256 ce9265cf179c4e07934e7b6a4b03f3edb7891e66e6d0f7017755f6064bbbe13f markdown2-2.4.1.tar.gz +md5 bb3f451bed011a0d8959e3c1d5850c53 markdown2-2.4.6.tar.gz +sha256 f65b4dbe1e16591b14fd40bc659b8b58d285eab70c1da21f390294fcdec42bb0 markdown2-2.4.6.tar.gz # Locally computed sha256 checksums sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index 6acfad2ccb..b1c162e12f 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.4.1 +PYTHON_MARKDOWN2_VERSION = 2.4.6 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/fb/10/4f327f4517fa5dda90021618fe174d1f4aff3c4e06abcd7f77685a455511 +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/83/b7/24613765f558afde9f47b61fcd787a9856ac1515b53af38bd11bf2fb3c8c PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash index 520bb405fb..2d1d81c62e 100644 --- a/package/python-markupsafe/python-markupsafe.hash +++ b/package/python-markupsafe/python-markupsafe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markupsafe/json -md5 892e0fefa3c488387e5cc0cad2daa523 MarkupSafe-2.0.1.tar.gz -sha256 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a MarkupSafe-2.0.1.tar.gz +md5 9809f9fdd98bc835b0c21aa8f79cbf30 MarkupSafe-2.1.1.tar.gz +sha256 7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b MarkupSafe-2.1.1.tar.gz # Locally computed sha256 checksums sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index e0e689f5a1..49bfc0b840 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKUPSAFE_VERSION = 2.0.1 +PYTHON_MARKUPSAFE_VERSION = 2.1.1 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz -PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e +PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/1d/97/2288fe498044284f39ab8950703e88abbac2abbdf65524d576157af70556 PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index eadf300bc2..b9936fe8bf 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 06d9d166b4a2d86f06ed09eeb362ac03728e1fbd2b852cc6a4ddc7cc75029237 maturin-0.13.7.tar.gz +sha256 54976d46be5d1e0d94ae8fbcfb8e72212b1ec9fe9752e3d14510c17a4000efeb maturin-0.14.1.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index ffbd131ef0..ab87df3842 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.13.7 +PYTHON_MATURIN_VERSION = 0.14.1 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/4f/19/6f982e341612ab442f90ba1a047a4188d48473ad0d1dbfb3dffdaa20e095 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a3/54/6bac789ab775b5ef1f07977e998cf719857e2675c3442f3f24e0399e1483 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.hash b/package/python-mbstrdecoder/python-mbstrdecoder.hash index 90b9abb8d6..dd2f412bee 100644 --- a/package/python-mbstrdecoder/python-mbstrdecoder.hash +++ b/package/python-mbstrdecoder/python-mbstrdecoder.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mbstrdecoder/json -md5 b32ff478a38730a8ab0b884fe162cc41 mbstrdecoder-1.1.0.tar.gz -sha256 f4dfd549e424ad8dfc985e6af8b55cb4ec0c208782f610d57439fe6a9a44c244 mbstrdecoder-1.1.0.tar.gz +md5 62efa113a3cd2d40942359d6699338f7 mbstrdecoder-1.1.1.tar.gz +sha256 0a99413b92bbaddda89d376f496d710dc7131417e98414a756ebcd41374e068d mbstrdecoder-1.1.1.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.mk b/package/python-mbstrdecoder/python-mbstrdecoder.mk index 63f9af74f5..f875e4d71d 100644 --- a/package/python-mbstrdecoder/python-mbstrdecoder.mk +++ b/package/python-mbstrdecoder/python-mbstrdecoder.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MBSTRDECODER_VERSION = 1.1.0 +PYTHON_MBSTRDECODER_VERSION = 1.1.1 PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz -PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/6c/10/f82ba5a91489c91bf6adaa0e1aca38a7ab2d1d7d80195a5f6ad8c2ff387a +PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/ba/ac/ba46bb6eb6165541ce25ff230469efe1c04043cf173f856dcc91876c38de PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools PYTHON_MBSTRDECODER_LICENSE = MIT PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE diff --git a/package/python-memory-profiler/python-memory-profiler.hash b/package/python-memory-profiler/python-memory-profiler.hash index 9ee515b529..9e3aca517b 100644 --- a/package/python-memory-profiler/python-memory-profiler.hash +++ b/package/python-memory-profiler/python-memory-profiler.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/memory-profiler/json -md5 b1d1783064a1198fb21bc877e535ec1b memory_profiler-0.58.0.tar.gz -sha256 01385ac0fec944fcf7969814ec4406c6d8a9c66c079d09276723c5a7680f44e5 memory_profiler-0.58.0.tar.gz +md5 c4d29b47885c32581f5bcefb44d2ca8e memory_profiler-0.60.0.tar.gz +sha256 6a12869511d6cebcb29b71ba26985675a58e16e06b3c523b49f67c5497a33d1c memory_profiler-0.60.0.tar.gz # Locally computed sha256 checksums sha256 51926ce91b8283532efa9dfb02518582c15f49c105a3ac18cce1f7a4947e96ae COPYING diff --git a/package/python-memory-profiler/python-memory-profiler.mk b/package/python-memory-profiler/python-memory-profiler.mk index 053b0e2d62..5e43662e07 100644 --- a/package/python-memory-profiler/python-memory-profiler.mk +++ b/package/python-memory-profiler/python-memory-profiler.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MEMORY_PROFILER_VERSION = 0.58.0 +PYTHON_MEMORY_PROFILER_VERSION = 0.60.0 PYTHON_MEMORY_PROFILER_SOURCE = memory_profiler-$(PYTHON_MEMORY_PROFILER_VERSION).tar.gz -PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/8f/fd/d92b3295657f8837e0177e7b48b32d6651436f0293af42b76d134c3bb489 +PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/06/dd/7308a8ef1902db9d81c5bc226befe346a87ed8787caff00b8d91ed9f3b86 PYTHON_MEMORY_PROFILER_SETUP_TYPE = setuptools PYTHON_MEMORY_PROFILER_LICENSE = BSD-3-Clause PYTHON_MEMORY_PROFILER_LICENSE_FILES = COPYING diff --git a/package/python-mistune/python-mistune.hash b/package/python-mistune/python-mistune.hash index a7a5936096..161f2ed6ff 100644 --- a/package/python-mistune/python-mistune.hash +++ b/package/python-mistune/python-mistune.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mistune/json -md5 fb6ab174ece938dea09f8b2adad771e4 mistune-0.8.4.tar.gz -sha256 59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e mistune-0.8.4.tar.gz +md5 a4437edb22cf6519a7c61730fecb1a3f mistune-2.0.4.tar.gz +sha256 9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808 mistune-2.0.4.tar.gz # Locally computed sha256 checksums -sha256 0c5259c3dd0a7c46f4835221645f62a0638c9b9faa02af08676e8069e1ff964b LICENSE +sha256 539013fd8e19f744f8bf0e27a532bbff54cd689ecef7a800f56ae5dc824be870 LICENSE diff --git a/package/python-mistune/python-mistune.mk b/package/python-mistune/python-mistune.mk index 6beb425837..1e4bb71903 100644 --- a/package/python-mistune/python-mistune.mk +++ b/package/python-mistune/python-mistune.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MISTUNE_VERSION = 0.8.4 +PYTHON_MISTUNE_VERSION = 2.0.4 PYTHON_MISTUNE_SOURCE = mistune-$(PYTHON_MISTUNE_VERSION).tar.gz -PYTHON_MISTUNE_SITE = https://files.pythonhosted.org/packages/2d/a4/509f6e7783ddd35482feda27bc7f72e65b5e7dc910eca4ab2164daf9c577 +PYTHON_MISTUNE_SITE = https://files.pythonhosted.org/packages/cd/9b/0f98334812f548a5ee4399b76e33752a74fc7bb976f5efb34d962f03d585 PYTHON_MISTUNE_LICENSE = BSD-3-Clause PYTHON_MISTUNE_LICENSE_FILES = LICENSE PYTHON_MISTUNE_SETUP_TYPE = setuptools diff --git a/package/python-more-itertools/python-more-itertools.hash b/package/python-more-itertools/python-more-itertools.hash index 4e6e7bdfb8..c12d3f5623 100644 --- a/package/python-more-itertools/python-more-itertools.hash +++ b/package/python-more-itertools/python-more-itertools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/more-itertools/json -md5 9930552c4f7eedc00193673d5f7f0f19 more-itertools-8.10.0.tar.gz -sha256 1debcabeb1df793814859d64a81ad7cb10504c24349368ccf214c664c474f41f more-itertools-8.10.0.tar.gz +md5 58f6fe36c3c94bbc569130df546dcfc9 more-itertools-9.0.0.tar.gz +sha256 5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab more-itertools-9.0.0.tar.gz # Locally computed sha256 checksums sha256 09f1c8c9e941af3e584d59641ea9b87d83c0cb0fd007eb5ef391a7e2643c1a46 LICENSE diff --git a/package/python-more-itertools/python-more-itertools.mk b/package/python-more-itertools/python-more-itertools.mk index 3b9957b72e..734d87e057 100644 --- a/package/python-more-itertools/python-more-itertools.mk +++ b/package/python-more-itertools/python-more-itertools.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 8.10.0 +PYTHON_MORE_ITERTOOLS_VERSION = 9.0.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/8a/f7/93cf3c81629c95f6f40e509f7cd63985a6ddd829181a66c1c8ef101e55f2 -PYTHON_MORE_ITERTOOLS_SETUP_TYPE = setuptools +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/13/b3/397aa9668da8b1f0c307bc474608653d46122ae0563d1d32f60e24fa0cbd +PYTHON_MORE_ITERTOOLS_SETUP_TYPE = flit PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-msgfy/python-msgfy.hash b/package/python-msgfy/python-msgfy.hash index c795f7fa5e..9f5bfe4804 100644 --- a/package/python-msgfy/python-msgfy.hash +++ b/package/python-msgfy/python-msgfy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgfy/json -md5 4a3d8ac9908acd5f661a58b12f9e0d17 msgfy-0.1.0.tar.gz -sha256 474c08302cd56ccee1300ac7976a01ebd1e42716fc9bcd947d39a311a15b7012 msgfy-0.1.0.tar.gz +md5 1727a08a0cf7fb704045168c71993280 msgfy-0.2.0.tar.gz +sha256 37c907cccb19afe73ce44111a21b410b685be92c9c44496bc4381fd93c5ad7b6 msgfy-0.2.0.tar.gz # Locally computed sha256 checksums sha256 fcfe96f8fb1bf3478a51c828e7f7afee01500ce1c2d4345d052edb858be05227 LICENSE diff --git a/package/python-msgfy/python-msgfy.mk b/package/python-msgfy/python-msgfy.mk index c187061d41..4100a912b2 100644 --- a/package/python-msgfy/python-msgfy.mk +++ b/package/python-msgfy/python-msgfy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGFY_VERSION = 0.1.0 +PYTHON_MSGFY_VERSION = 0.2.0 PYTHON_MSGFY_SOURCE = msgfy-$(PYTHON_MSGFY_VERSION).tar.gz -PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/24/b5/7cc6ba75b6489245f9b75f11a85202b934fa92f6c99a4fa1c639f08d68e8 +PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/c6/2a/663ef86625f34ee4165da1eb824442cfb1f676e892946d7fe39a8c775682 PYTHON_MSGFY_SETUP_TYPE = setuptools PYTHON_MSGFY_LICENSE = MIT PYTHON_MSGFY_LICENSE_FILES = LICENSE diff --git a/package/python-mutagen/python-mutagen.hash b/package/python-mutagen/python-mutagen.hash index 0cf25fd5fe..2e1a588936 100644 --- a/package/python-mutagen/python-mutagen.hash +++ b/package/python-mutagen/python-mutagen.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mutagen/json -md5 76e1f7fc2386813c0ff2716695fb06e1 mutagen-1.45.1.tar.gz -sha256 6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1 mutagen-1.45.1.tar.gz +md5 648c9f38b8ef46ffb0d5135524650b87 mutagen-1.46.0.tar.gz +sha256 6e5f8ba84836b99fe60be5fb27f84be4ad919bbb6b49caa6ae81e70584b55e58 mutagen-1.46.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/python-mutagen/python-mutagen.mk b/package/python-mutagen/python-mutagen.mk index 627ec70e96..07ac9542c6 100644 --- a/package/python-mutagen/python-mutagen.mk +++ b/package/python-mutagen/python-mutagen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MUTAGEN_VERSION = 1.45.1 +PYTHON_MUTAGEN_VERSION = 1.46.0 PYTHON_MUTAGEN_SOURCE = mutagen-$(PYTHON_MUTAGEN_VERSION).tar.gz -PYTHON_MUTAGEN_SITE = https://files.pythonhosted.org/packages/f3/d9/2232a4cb9a98e2d2501f7e58d193bc49c956ef23756d7423ba1bd87e386d +PYTHON_MUTAGEN_SITE = https://files.pythonhosted.org/packages/b1/54/d1760a363d0fe345528e37782f6c18123b0e99e8ea755022fd51f1ecd0f9 PYTHON_MUTAGEN_LICENSE = GPL-2.0 PYTHON_MUTAGEN_LICENSE_FILES = COPYING PYTHON_MUTAGEN_SETUP_TYPE = setuptools diff --git a/package/python-networkmanager/python-networkmanager.hash b/package/python-networkmanager/python-networkmanager.hash index 105949d50e..d4e21f1d82 100644 --- a/package/python-networkmanager/python-networkmanager.hash +++ b/package/python-networkmanager/python-networkmanager.hash @@ -1,5 +1,5 @@ -# md5 and sha256 from https://pypi.python.org/pypi/python-networkmanager/json -md5 f638d854a3639fb37c0e06d1092a771e python-networkmanager-2.1.tar.gz -sha256 aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc python-networkmanager-2.1.tar.gz -# Locally computed -sha256 be40f44d54bb5e0f0eee28e957ad020a00a6e3adb0290262e92129eba1c044cf COPYING +# md5, sha256 from https://pypi.org/pypi/python-networkmanager/json +md5 7e05d3ca40a4fa50222ba93cda3d0d02 python-networkmanager-2.2.tar.gz +sha256 de6eb921d94aba7549f428ed2b3aa482a5d543ecb6965cbaa0fbb555ab31b9d5 python-networkmanager-2.2.tar.gz +# Locally computed sha256 checksums +sha256 d12bbc105c723d4471b39fe8197d43df822e5b4bda822a8255719d039e701f49 COPYING diff --git a/package/python-networkmanager/python-networkmanager.mk b/package/python-networkmanager/python-networkmanager.mk index de893f757a..785d2c0d3e 100644 --- a/package/python-networkmanager/python-networkmanager.mk +++ b/package/python-networkmanager/python-networkmanager.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_NETWORKMANAGER_VERSION = 2.1 -PYTHON_NETWORKMANAGER_SITE = https://files.pythonhosted.org/packages/73/ec/2cc46290cedc99f59df3633d428dfa91d95946ca49af96fdb53514ee195f +PYTHON_NETWORKMANAGER_VERSION = 2.2 +PYTHON_NETWORKMANAGER_SITE = https://files.pythonhosted.org/packages/f2/3d/0924d03117636b80a88af783f857fb101e4c47953a8bb0f733b964d50af4 PYTHON_NETWORKMANAGER_SETUP_TYPE = setuptools PYTHON_NETWORKMANAGER_LICENSE = Zlib PYTHON_NETWORKMANAGER_LICENSE_FILES = COPYING diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash index ace5c6721a..d166f0b8d8 100644 --- a/package/python-networkx/python-networkx.hash +++ b/package/python-networkx/python-networkx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/networkx/json -md5 407eb28c54e08725559754ca7ab185e0 networkx-2.6.3.tar.gz -sha256 c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51 networkx-2.6.3.tar.gz +md5 22139ab5a47818fa00cbaa91eb126381 networkx-2.8.8.tar.gz +sha256 230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e networkx-2.8.8.tar.gz # Locally computed sha256 checksums -sha256 f9c25c92ced5a264a3fe857231205d5eb625ae367935aaf8d61cdd5087dfb90e LICENSE.txt +sha256 aae9f809fb1a1592ed72e9f52df10cfad8fe226b8d4d28385f90dd4341ce7119 LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index 1908ed8f93..f097671d66 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NETWORKX_VERSION = 2.6.3 +PYTHON_NETWORKX_VERSION = 2.8.8 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/97/ae/7497bc5e1c84af95e585e3f98585c9f06c627fac6340984c4243053e8f44 +PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/cd/16/c44e8550012735b8f21b3df7f39e8ba5a987fb764ac017ad5f3589735889 PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_CPE_ID_VENDOR = python diff --git a/package/python-oauthlib/python-oauthlib.hash b/package/python-oauthlib/python-oauthlib.hash index e55f0c861d..6a2ad003e1 100644 --- a/package/python-oauthlib/python-oauthlib.hash +++ b/package/python-oauthlib/python-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/oauthlib/json -md5 9201e30a4eacf3ecfa15503b241ad5e3 oauthlib-3.1.1.tar.gz -sha256 8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3 oauthlib-3.1.1.tar.gz +md5 2f7b898cc1af8c1409cc329e8843ea8f oauthlib-3.2.2.tar.gz +sha256 9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918 oauthlib-3.2.2.tar.gz # Locally computed sha256 checksums sha256 3d1e12d8ac52c0b6c148af6d291f72400b8720ed16c0ac4a89868b6d14b1c939 LICENSE diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index 7369768b35..1e49487d6a 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OAUTHLIB_VERSION = 3.1.1 +PYTHON_OAUTHLIB_VERSION = 3.2.2 PYTHON_OAUTHLIB_SOURCE = oauthlib-$(PYTHON_OAUTHLIB_VERSION).tar.gz -PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/9e/84/001a3f8d9680f3b26d5e7711e13d5ff92e4b511766a72ac6b4a4e5f06796 +PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6d/fa/fbf4001037904031639e6bfbfc02badfc7e12f137a8afa254df6c4c8a670 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.hash b/package/python-opcua-asyncio/python-opcua-asyncio.hash index d8aee272de..36b16a1596 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.hash +++ b/package/python-opcua-asyncio/python-opcua-asyncio.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 e5fab37a92162351fe40cab43df09db8a2e9f8b8a2a8f13ed680aa6f6d687ec3 opcua-asyncio-0.8.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/asyncua/json +md5 a52df0dc0586abd1592c97a0274d1c9d asyncua-1.0.0.tar.gz +sha256 25966e374b0c90da112a96e9dbc5cc36c123b2b60412eac6f26b04a4b0b4d91e asyncua-1.0.0.tar.gz +# Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index 50b581037b..509beda151 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OPCUA_ASYNCIO_VERSION = 0.8.4 -PYTHON_OPCUA_ASYNCIO_SOURCE = opcua-asyncio-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz -PYTHON_OPCUA_ASYNCIO_SITE = $(call github,FreeOpcUa,opcua-asyncio,$(PYTHON_OPCUA_ASYNCIO_VERSION)) +PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.0 +PYTHON_OPCUA_ASYNCIO_SOURCE = asyncua-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz +PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/e7/ea/6fe0799c740b0fc8ffda42fc97bf45204ffe06fe41d505c02654e0d4e379 PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index 1de1d7cdc2..8563ed544f 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 285091518bdbde8086c60c5ed6d7090eccc1c232b00138c964c410f1a7da654f orjson-3.7.11.tar.gz +sha256 dc06889b0ce52d5e96253573f6cbdf5939c5902022cbe2538cedc622e9378372 orjson-3.8.2.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index 0a266e827a..b18a5cdada 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.7.11 +PYTHON_ORJSON_VERSION = 3.8.2 PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/fd/52/42520dbfd47191977140c49fa601624b9b4c6cc9d6a62d3e68970ee9eac6 +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/13/08/d476fff015ccc0f043d3df6332c807695ae3d6abc1758b24f3d335750550 PYTHON_ORJSON_SETUP_TYPE = pep517 PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index a07af19a4b..aee658c790 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography, python-bcrypt select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index 951bd8e114..f4142b5c33 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 6e47947882e2c1b81f35b4133e8e62b9 paramiko-2.10.3.tar.gz -sha256 ddb1977853aef82804b35d72a0e597b244fa326c404c350bd00c5b01dbfee71a paramiko-2.10.3.tar.gz +md5 b01682efcd6943936702c497afdd0aed paramiko-2.11.0.tar.gz +sha256 003e6bee7c034c21fbb051bf83dc0a9ee4106204dd3c53054c71452cc4ec3938 paramiko-2.11.0.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 46209f5823..a33e11c768 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.10.3 +PYTHON_PARAMIKO_VERSION = 2.11.0 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/d4/93/1a1eb7f214e6774099d56153db9e612f93cb8ffcdfd2eca243fcd5bb3a78 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/1d/08/3b8d8f1b4ec212c17429c2f3ff55b7f2237a1ad0c954972e39c8f0ac394c PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE diff --git a/package/python-pathpy/python-pathpy.hash b/package/python-pathpy/python-pathpy.hash index 0b9b7b7cd6..f2f1880e4d 100644 --- a/package/python-pathpy/python-pathpy.hash +++ b/package/python-pathpy/python-pathpy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/path.py/json -md5 307098b1827af6031687edb49ce2c39c path.py-12.0.1.tar.gz -sha256 9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f path.py-12.0.1.tar.gz +md5 c748063e113914dcb08e3f4eb6cd1de0 path.py-12.5.0.tar.gz +sha256 8d885e8b2497aed005703d94e0fd97943401f035e42a136810308bff034529a8 path.py-12.5.0.tar.gz # Locally computed sha256 checksums sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-pathpy/python-pathpy.mk b/package/python-pathpy/python-pathpy.mk index 3b7388bdd2..2fd6e931f8 100644 --- a/package/python-pathpy/python-pathpy.mk +++ b/package/python-pathpy/python-pathpy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHPY_VERSION = 12.0.1 +PYTHON_PATHPY_VERSION = 12.5.0 PYTHON_PATHPY_SOURCE = path.py-$(PYTHON_PATHPY_VERSION).tar.gz -PYTHON_PATHPY_SITE = https://files.pythonhosted.org/packages/70/63/c01c1bb2df17db4c78f78cc439a2800f55bec5445cabf1f3579a37909f41 +PYTHON_PATHPY_SITE = https://files.pythonhosted.org/packages/b6/e3/81be70016d58ade0f516191fa80152daba5453d0b07ce648d9daae86a188 PYTHON_PATHPY_SETUP_TYPE = setuptools PYTHON_PATHPY_LICENSE = MIT PYTHON_PATHPY_LICENSE_FILES = LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.hash b/package/python-pathvalidate/python-pathvalidate.hash index adf1a75dca..828236304e 100644 --- a/package/python-pathvalidate/python-pathvalidate.hash +++ b/package/python-pathvalidate/python-pathvalidate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathvalidate/json -md5 afc0343cd8c4ad732431a8b860d73330 pathvalidate-2.5.0.tar.gz -sha256 119ba36be7e9a405d704c7b7aea4b871c757c53c9adc0ed64f40be1ed8da2781 pathvalidate-2.5.0.tar.gz +md5 541238984572fb21db2da2af1d70a993 pathvalidate-2.5.2.tar.gz +sha256 5ff57d0fabe5ecb7a4f1e4957bfeb5ad8ab5ab4c0fa71f79c6bbc24bd9b7d14d pathvalidate-2.5.2.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.mk b/package/python-pathvalidate/python-pathvalidate.mk index bb434f3662..6ca8c0f2ad 100644 --- a/package/python-pathvalidate/python-pathvalidate.mk +++ b/package/python-pathvalidate/python-pathvalidate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 2.5.0 +PYTHON_PATHVALIDATE_VERSION = 2.5.2 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/2e/89/7853a1ea323e848ab1e90c8930733bc19e35a935deb80d78b572c36ea33f +PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/60/f7/ff244fdd8ed98e98d4f9acecfe74a890e5e3245ce55253ef88db51e94652 PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools PYTHON_PATHVALIDATE_LICENSE = MIT PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE diff --git a/package/python-pbr/python-pbr.hash b/package/python-pbr/python-pbr.hash index 8cf2a18d36..4ca503e976 100644 --- a/package/python-pbr/python-pbr.hash +++ b/package/python-pbr/python-pbr.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pbr/json -md5 62565acc6bf3e7e10b082463421f8b46 pbr-5.6.0.tar.gz -sha256 42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd pbr-5.6.0.tar.gz +md5 99ef94dbe5a00054fdcbbaa87268c3cd pbr-5.11.0.tar.gz +sha256 b97bc6695b2aff02144133c2e7399d5885223d42b7912ffaec2ca3898e673bfe pbr-5.11.0.tar.gz # Locally computed sha256 checksums sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 LICENSE sha256 eb4a8c8791f6caab1cf36df26db2b6f4e2ddda52657b060ff7f02abc63910aef pbr/tests/testpackage/LICENSE.txt diff --git a/package/python-pbr/python-pbr.mk b/package/python-pbr/python-pbr.mk index 3cc7ab81fa..99f0101e19 100644 --- a/package/python-pbr/python-pbr.mk +++ b/package/python-pbr/python-pbr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PBR_VERSION = 5.6.0 +PYTHON_PBR_VERSION = 5.11.0 PYTHON_PBR_SOURCE = pbr-$(PYTHON_PBR_VERSION).tar.gz -PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/35/8c/69ed04ae31ad498c9bdea55766ed4c0c72de596e75ac0d70b58aa25e0acf +PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/52/fb/630d52aaca8fc7634a0711b6ae12a0e828b6f9264bd8051225025c3ed075 PYTHON_PBR_SETUP_TYPE = setuptools PYTHON_PBR_LICENSE = Apache-2.0 (module), BSD-3-Clause (test package) PYTHON_PBR_LICENSE_FILES = LICENSE pbr/tests/testpackage/LICENSE.txt diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index 69214110f8..d1442ca39d 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 efbdb4201a5e6383fb4d12e26f78f355 pip-21.2.4.tar.gz -sha256 0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b pip-21.2.4.tar.gz +md5 f0dd02265e7ccd2f8758c840fba64810 pip-22.3.tar.gz +sha256 8182aec21dad6c0a49a2a3d121a87cd524b950e0b6092b181625f07ebdde7530 pip-22.3.tar.gz # Locally computed sha256 checksums -sha256 23a7361c2b1581028bc623b9da2bd24997abcaa4781ace6ad444a37944f8dae1 LICENSE.txt +sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 81fc87d5f0..0f2c5d8e02 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 21.2.4 +PYTHON_PIP_VERSION = 22.3 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/52/e1/06c018197d8151383f66ebf6979d951995cf495629fc54149491f5d157d0 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/f8/08/7f92782ff571c7c7cb6c5eeb8ebbb1f68cb02bdb24e55c5de4dd9ce98bc3 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt diff --git a/package/python-portend/python-portend.hash b/package/python-portend/python-portend.hash index 1e212b15e5..6af3b77792 100644 --- a/package/python-portend/python-portend.hash +++ b/package/python-portend/python-portend.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/portend/json -md5 0ab51a12b7462a5275946a3645a71e92 portend-2.5.tar.gz -sha256 19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9 portend-2.5.tar.gz +md5 c37d676837505a6fc8dd33185c6d62a7 portend-3.1.0.tar.gz +sha256 239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4 portend-3.1.0.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-portend/python-portend.mk b/package/python-portend/python-portend.mk index 8d619052c9..4322121e9b 100644 --- a/package/python-portend/python-portend.mk +++ b/package/python-portend/python-portend.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PORTEND_VERSION = 2.5 +PYTHON_PORTEND_VERSION = 3.1.0 PYTHON_PORTEND_SOURCE = portend-$(PYTHON_PORTEND_VERSION).tar.gz -PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/2c/59/948666fc2455ae471efd40cb2a9a990f5f6f2354a9a6b228e29b9fb4a307 +PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/6e/0a/42bcc9c97744958ce72d33f526e972379b9e90adede8a151f338818c41d4 PYTHON_PORTEND_LICENSE = MIT PYTHON_PORTEND_LICENSE_FILES = LICENSE PYTHON_PORTEND_SETUP_TYPE = setuptools diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 5a24634a56..8b91ee767f 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json -md5 ba9e63c3e7e5a4f4ce4e4770a4daba96 prompt_toolkit-3.0.20.tar.gz -sha256 eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c prompt_toolkit-3.0.20.tar.gz +md5 0cc5e752cb2759e99658e2391644e767 prompt_toolkit-3.0.31.tar.gz +sha256 9ada952c9d1787f52ff6d5f3484d0b4df8952787c087edf6a1f7c2cb1ea88148 prompt_toolkit-3.0.31.tar.gz # Locally computed sha256 checksums sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index b575783f96..bef761e20f 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.20 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.31 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/b4/56/9ab5868f34ab2657fba7e2192f41316252ab04edbbeb2a8583759960a1a7 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/80/76/c94cf323ca362dd7baca8d8ddf3b5fe1576848bc0156522ad581c04f8446 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index 552ced55ec..c7b7e46ec1 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 91060da163ef478002a4456dd99cbb4c psutil-5.8.0.tar.gz -sha256 0c9ccb99ab76025f2f0bbecf341d4656e9c1351db8cc8a03ccd62e318ab4b5c6 psutil-5.8.0.tar.gz +md5 66b847f94545e96b540518ebe19740b4 psutil-5.9.3.tar.gz +sha256 7ccfcdfea4fc4b0a02ca2c31de7fcd186beb9cff8207800e14ab66f79c773af6 psutil-5.9.3.tar.gz # Locally computed sha256 checksums sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 3a2781c284..578f69d3c7 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.8.0 +PYTHON_PSUTIL_VERSION = 5.9.3 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/de/eb/1c01a34c86ee3b058c556e407ce5b07cb7d186ebe47b3e69d6f152ca5cc5 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE diff --git a/package/python-psycopg2/python-psycopg2.hash b/package/python-psycopg2/python-psycopg2.hash index d02ffc2ec8..58f98f9d84 100644 --- a/package/python-psycopg2/python-psycopg2.hash +++ b/package/python-psycopg2/python-psycopg2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psycopg2/json -md5 182e3e8cf3381c254f65f70cad4976e5 psycopg2-2.9.1.tar.gz -sha256 de5303a6f1d0a7a34b9d40e4d3bef684ccc44a49bbe3eb85e3c0bffb4a131b7c psycopg2-2.9.1.tar.gz +md5 3cec7285f61690633bb070d4bba259c2 psycopg2-2.9.5.tar.gz +sha256 a5246d2e683a972e2187a8714b5c2cf8156c064629f9a9b1a873c1730d9e245a psycopg2-2.9.5.tar.gz # Locally computed sha256 checksums sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index de466e2c59..fa23c2814f 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSYCOPG2_VERSION = 2.9.1 +PYTHON_PSYCOPG2_VERSION = 2.9.5 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz -PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/aa/8a/7c80e7e44fb1b4277e89bd9ca509aefdd4dd1b2c547c6f293afe9f7ffd04 +PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/89/d6/cd8c46417e0f7a16b4b0fc321f4ab676a59250d08fce5b64921897fb07cc PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE diff --git a/package/python-pudb/python-pudb.hash b/package/python-pudb/python-pudb.hash index fc19f589d9..d9943a3601 100644 --- a/package/python-pudb/python-pudb.hash +++ b/package/python-pudb/python-pudb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pudb/json -md5 100b955e103b72279604420bbdcd07a5 pudb-2021.1.tar.gz -sha256 309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e pudb-2021.1.tar.gz +md5 c2b4275b76068f18d630f7bae889345b pudb-2022.1.2.tar.gz +sha256 6b83ab805bddb53710109690a2237e98bf83c0b3a00033c517cdf5f6a8fa470d pudb-2022.1.2.tar.gz # Locally computed sha256 checksums sha256 a95343fffff49cde3d9bf33cf6bb71cb3bf0ed83f47d98a7ba04b175d29c79ab LICENSE diff --git a/package/python-pudb/python-pudb.mk b/package/python-pudb/python-pudb.mk index 31df3147d0..7df38f0f02 100644 --- a/package/python-pudb/python-pudb.mk +++ b/package/python-pudb/python-pudb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PUDB_VERSION = 2021.1 +PYTHON_PUDB_VERSION = 2022.1.2 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/c7/69/813e93519fc28744457ff68fa2eaac3b4ea30dda1e6994e969fe9d3008d9 +PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/8b/ef/6dea7c63fdddd7753e2a2930e59799ef32247f2499c0d9bcd233439e7483 PYTHON_PUDB_SETUP_TYPE = setuptools PYTHON_PUDB_LICENSE = MIT PYTHON_PUDB_LICENSE_FILES = LICENSE diff --git a/package/python-py/python-py.hash b/package/python-py/python-py.hash index 2d9928f376..537fe31773 100644 --- a/package/python-py/python-py.hash +++ b/package/python-py/python-py.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/py/json -md5 5f108bfe00d5468cbdb8071051f86a55 py-1.10.0.tar.gz -sha256 21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3 py-1.10.0.tar.gz +md5 bde7dcc1cb452a1e10206ef2f811ba88 py-1.11.0.tar.gz +sha256 51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 py-1.11.0.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 py/_vendored_packages/iniconfig-1.1.1.dist-info/LICENSE diff --git a/package/python-py/python-py.mk b/package/python-py/python-py.mk index d8cb6fa544..cec02dcfa9 100644 --- a/package/python-py/python-py.mk +++ b/package/python-py/python-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PY_VERSION = 1.10.0 +PYTHON_PY_VERSION = 1.11.0 PYTHON_PY_SOURCE = py-$(PYTHON_PY_VERSION).tar.gz -PYTHON_PY_SITE = https://files.pythonhosted.org/packages/0d/8c/50e9f3999419bb7d9639c37e83fa9cdcf0f601a9d407162d6c37ad60be71 +PYTHON_PY_SITE = https://files.pythonhosted.org/packages/98/ff/fec109ceb715d2a6b4c4a85a61af3b40c723a961e8828319fbcb15b868dc PYTHON_PY_DEPENDENCIES = host-python-setuptools-scm PYTHON_PY_SETUP_TYPE = setuptools PYTHON_PY_LICENSE = MIT diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index 2a712e26c9..852e568ac5 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 e4bde1955c2d15cae07349275cda48fa61a46dd51562717c2f0f1374dd459547 python-pydal-20220814.1.tar.gz +sha256 0a2dbc5d61d37d2b59d441ed0aab48c1ec906ce66088eb5cee021b009601de02 python-pydal-20220916.1.tar.gz sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 89c3f14726..a3df1ccff1 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20220814.1 +PYTHON_PYDAL_VERSION = 20220916.1 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 215b5d1714..a5eb025fcb 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 7845d2f3c8fe8602f73f53ec5b6dfa29 pydantic-1.8.2.tar.gz -sha256 26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b pydantic-1.8.2.tar.gz +md5 9691f29e97c1280ab56b7d0a2dade9c1 pydantic-1.10.2.tar.gz +sha256 91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410 pydantic-1.10.2.tar.gz # Locally computed sha256 checksums sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index b282241506..04014214e1 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.8.2 +PYTHON_PYDANTIC_VERSION = 1.10.2 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/b9/d2/12a808613937a6b98cd50d6467352f01322dc0d8ca9fb5b94441625d6684 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/7d/7d/58dd62f792b002fa28cce4e83cb90f4359809e6d12db86eedf26a752895c PYTHON_PYDANTIC_SETUP_TYPE = setuptools PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE diff --git a/package/python-pyelftools/python-pyelftools.hash b/package/python-pyelftools/python-pyelftools.hash index a309b90e15..7cffe2d646 100644 --- a/package/python-pyelftools/python-pyelftools.hash +++ b/package/python-pyelftools/python-pyelftools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyelftools/json -md5 061d67c669a9b1f8d07f28c47fb6a65f pyelftools-0.27.tar.gz -sha256 cde854e662774c5457d688ca41615f6594187ba7067af101232df889a6b7a66b pyelftools-0.27.tar.gz +md5 2afc97cd239c0dea0cca97d00d3dcb42 pyelftools-0.29.tar.gz +sha256 ec761596aafa16e282a31de188737e5485552469ac63b60cfcccf22263fd24ff pyelftools-0.29.tar.gz # Locally computed sha256 checksums sha256 ae18bf4cb82f92af7547259177bc28bc48e4fc732518bcedfe690226288d3445 LICENSE diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 5bfdcd33ae..7566f24895 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYELFTOOLS_VERSION = 0.27 +PYTHON_PYELFTOOLS_VERSION = 0.29 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 +PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/0e/35/e76da824595452a5ad07f289ea1737ca0971fc6cc7b6ee9464279be06b5e PYTHON_PYELFTOOLS_LICENSE = Public domain PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE PYTHON_PYELFTOOLS_SETUP_TYPE = setuptools diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index abbb1261b2..46b5ae6336 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyftpdlib/json -md5 459dd3e685c4b7dfcf574ca05e5586eb pyftpdlib-1.5.6.tar.gz -sha256 fda655d81f29af52885ca2f8a2704134baed540f16d66a0b26e8fdfafd12db5e pyftpdlib-1.5.6.tar.gz +md5 6d9539aea866d4f959d86ae001cdddf7 pyftpdlib-1.5.7.tar.gz +sha256 7ea3ce4137db8209af1f6b9ea020590f462c63ed7c7a1240bd596e4d3a7b656e pyftpdlib-1.5.7.tar.gz # Locally computed sha256 checksums sha256 67a832551570a5ac5f7901eaa5ece4b9491fda7f2d8c93957c3bbc68a5a76d88 LICENSE diff --git a/package/python-pyftpdlib/python-pyftpdlib.mk b/package/python-pyftpdlib/python-pyftpdlib.mk index 931e2dad06..bd1ada8125 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.6 +PYTHON_PYFTPDLIB_VERSION = 1.5.7 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/31/61/63ef60aca6de07eba1639d9d47f3f8e29462e8bb49d6a8dce9aeff240646 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/2f/bc/f03a15bf807698bbecdcf316041e3d79b25a40fa7b6e071e17702ff7b9d4 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index 09b47b2bdc..610acb96d7 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pygments/json -md5 390a49fa0eb5486a795b2b54b9a7b666 Pygments-2.7.4.tar.gz -sha256 df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337 Pygments-2.7.4.tar.gz +md5 6ccae578d28d18968b30a4711652fd9a Pygments-2.13.0.tar.gz +sha256 56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1 Pygments-2.13.0.tar.gz # Locally computed sha256 checksums -sha256 c012cf17a2ba79142977c8cc5bb1497a675401bf79c2c9b95a7604e2ddfde8b8 LICENSE +sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index 781b16353b..c09350c42b 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.7.4 +PYTHON_PYGMENTS_VERSION = 2.13.0 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/e1/86/8059180e8217299079d8719c6e23d674aadaba0b1939e25e0cc15dcf075b +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/e0/ef/5905cd3642f2337d44143529c941cc3a02e5af16f0f65f81cbef7af452bb PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments diff --git a/package/python-pyhamcrest/python-pyhamcrest.hash b/package/python-pyhamcrest/python-pyhamcrest.hash index b2e84d7d1f..176079e0f5 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.hash +++ b/package/python-pyhamcrest/python-pyhamcrest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyhamcrest/json -md5 7a086f0b067f8d38958ec32f054559b4 PyHamcrest-2.0.2.tar.gz -sha256 412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316 PyHamcrest-2.0.2.tar.gz +md5 c808291b2fca0991d044927884e6d15e pyhamcrest-2.0.4.tar.gz +sha256 b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1 pyhamcrest-2.0.4.tar.gz # Locally computed sha256 checksums sha256 71beae6c8151362cfe398cbd350191a1cc52d3d28499839a7830b25f5b50a7fe LICENSE.txt diff --git a/package/python-pyhamcrest/python-pyhamcrest.mk b/package/python-pyhamcrest/python-pyhamcrest.mk index 28979600dd..de5295e964 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.mk +++ b/package/python-pyhamcrest/python-pyhamcrest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYHAMCREST_VERSION = 2.0.2 -PYTHON_PYHAMCREST_SOURCE = PyHamcrest-$(PYTHON_PYHAMCREST_VERSION).tar.gz -PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/58/05/7b993fabb44ff0b52a90916d96bfd91a65ecf90b8248e72bba325ba8e438 +PYTHON_PYHAMCREST_VERSION = 2.0.4 +PYTHON_PYHAMCREST_SOURCE = pyhamcrest-$(PYTHON_PYHAMCREST_VERSION).tar.gz +PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/b1/9a/588f086b64ace8d2e9843d8551e9068b2570c3c51b06cb49a107303f8700 PYTHON_PYHAMCREST_SETUP_TYPE = setuptools PYTHON_PYHAMCREST_LICENSE = BSD-3-Clause PYTHON_PYHAMCREST_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index 8b113d4ab7..009b264336 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/PyICU/json -md5 7656f5cc53a7c18b40e653d6eefdee14 PyICU-1.9.7.tar.gz -# Locally computed -sha256 db27cd1cc150b879c5465872bec7fdaf340eca140aa922be03891d5b9f855b61 PyICU-1.9.7.tar.gz -sha256 74bbadee4ee3c3a1ac0ecfbd74bc7ce64046de1ceddf4717dc923809ca8ffce3 LICENSE +# md5, sha256 from https://pypi.org/pypi/pyicu/json +md5 4090ebb98702338cac3dbed2d72c2fd7 PyICU-2.10.2.tar.gz +sha256 0c3309eea7fab6857507ace62403515b60fe096cbfb4f90d14f55ff75c5441c1 PyICU-2.10.2.tar.gz +# Locally computed sha256 checksums +sha256 00da5bf22f2386c4f6f07c734490e9b818c4dcf70e6ca49f594e9cec636b9c40 LICENSE diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index c6587c399c..512b2f857f 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 1.9.7 +PYTHON_PYICU_VERSION = 2.10.2 PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://pypi.python.org/packages/6e/88/f42a1297909ca6d9113ba37b37067011ae29432fe592fdd98cf52ad23b77 +PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/64/00/a531e119a97e54601f616f5061879ec2d4bb058d225014f9acf94b2970c3 PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index d51df02be1..cc64be6cca 100644 --- a/package/python-pyjwt/python-pyjwt.hash +++ b/package/python-pyjwt/python-pyjwt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyJWT/json -md5 665f444d7805e36826bb09ce6434e73a PyJWT-2.4.0.tar.gz -sha256 d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba PyJWT-2.4.0.tar.gz +md5 aeed6d3a581ae383b2288a2079fa562d PyJWT-2.6.0.tar.gz +sha256 69285c7e31fc44f68a1feb309e948e0df53259d579295e6cfe2b1792329f05fd PyJWT-2.6.0.tar.gz # Locally computed sha256 checksums sha256 797a7a20231d4c433e9f1911db1731d06b5828b98f499819a034f7c0f56f5ce5 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index 53cc50b650..fe4eeff38a 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 2.4.0 +PYTHON_PYJWT_VERSION = 2.6.0 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/d8/6b/6287745054dbcccf75903630346be77d4715c594402cec7c2518032416c2 +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/75/65/db64904a7f23e12dbf0565b53de01db04d848a497c6c9b87e102f74c9304 PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE diff --git a/package/python-pylibftdi/python-pylibftdi.hash b/package/python-pylibftdi/python-pylibftdi.hash index 5570c1c9f6..ee0ba127ca 100644 --- a/package/python-pylibftdi/python-pylibftdi.hash +++ b/package/python-pylibftdi/python-pylibftdi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pylibftdi/json -md5 c48e442cef7b1e865b4d96ab92f509ad pylibftdi-0.18.1.tar.gz -sha256 bdd04076933959b20b3c8b4fb8be7882d3362675f259e7eeb23ebff03b81859d pylibftdi-0.18.1.tar.gz +md5 fb43ade3283b809d4ebe92bf4a60d7fc pylibftdi-0.20.0.tar.gz +sha256 f4a87fc4af2c9c7d42badd4192ca9b529f32c9d96fdc8daea7e29c509226df5f pylibftdi-0.20.0.tar.gz # Locally computed sha256 checksums -sha256 0e40132339e1ef7d17d93837fbc273d1e87302e9295162bd19c9161e5700ddcc LICENSE.txt +sha256 0d3f1af06b566a783091422061b60e864fc5d5853418b71643041e254b4ae7f9 LICENSE.txt diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 2f5614867d..34040b72ac 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYLIBFTDI_VERSION = 0.18.1 +PYTHON_PYLIBFTDI_VERSION = 0.20.0 PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz -PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/50/9b/1e1cdb9715bacfb83e5eaf5e69f4e2fbd92d61f43c5e185cc3935ec01b28 +PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/b8/03/4f778ce6dceea58dc5bfd555c22fdb265afc922d81d3c4496a791a54c479 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index 8e60d94e62..b5243567b7 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,4 +1,5 @@ -# sha256 locally computed -sha256 088c7ece2a11cad652939719695c457f26f9148cd7d2f4a79872167925180ad5 pymodbus-2.2.0.tar.gz -# Hash for license file -sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f doc/LICENSE +# md5, sha256 from https://pypi.org/pypi/pymodbus/json +md5 25a8724539d0eac1b09d9b41812d86f9 pymodbus-3.0.0.tar.gz +sha256 37c9b6f3e5c82f39ee42047ca48cbc9fd0c49a6731126789500191e9deea6cbc pymodbus-3.0.0.tar.gz +# Locally computed sha256 checksums +sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index d96e21a55c..2ed7e94afe 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 2.2.0 +PYTHON_PYMODBUS_VERSION = 3.0.0 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = $(call github,riptideio,pymodbus,v$(PYTHON_PYMODBUS_VERSION)) +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/0f/5a/50e9492f98ef911af18c2b603bc003fef726e84d22bac2ce6e651643b29c PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause -PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE +PYTHON_PYMODBUS_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index ee7a916519..21befb3b7c 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 70d6c2232e531772bbe9a813044262f9 PyMuPDF-1.18.14.tar.gz -sha256 efe85cb80f79cc3f3890aa2ab82b962b8a999ca078e33e9bacc5d0be5c4656dc PyMuPDF-1.18.14.tar.gz -# Locally computed: -sha256 282751b8c98ee9e445346eb57a992c9ecbe25ed8dd554df046777313e19b10f9 COPYING +md5 450f0c613fec4b0d061299d3d935fafa PyMuPDF-1.20.2.tar.gz +sha256 02eedf01f57c6bafb5e8667cea0088a2d2522643c47100f1908bec3a68a84888 PyMuPDF-1.20.2.tar.gz +# Locally computed sha256 checksums +sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index ceeeb0a55b..238fc4dd47 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -5,11 +5,11 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.18.14 +PYTHON_PYMUPDF_VERSION = 1.20.2 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/41/f6/dbefe3d6949fa81fb7bcac9141e4345330d272724718ac5a6af78297498b +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/4a/09/6afe87a8ea7acb6e4709223a704270ffe9929497add4d06b12305e229ba8 PYTHON_PYMUPDF_SETUP_TYPE = setuptools -PYTHON_PYMUPDF_LICENSE = GPL-3.0, AGPL-3.0+ (code generated from mupdf) +PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github PYTHON_PYMUPDF_DEPENDENCIES = freetype mupdf zlib diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index 0dc9f921fa..bc65bb5868 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 182c9f258c431c731906ab7fdaf6d0a8 pyOpenSSL-22.0.0.tar.gz -sha256 660b1b1425aac4a1bea1d94168a85d99f0b3144c869dd4390d27629d0087f1bf pyOpenSSL-22.0.0.tar.gz +md5 6834da75e33d3c8dcd891b723bfcec9e pyOpenSSL-22.1.0.tar.gz +sha256 7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968 pyOpenSSL-22.1.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index 21a3f06907..85f856b319 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 22.0.0 +PYTHON_PYOPENSSL_VERSION = 22.1.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/35/d3/d6a9610f19d943e198df502ae660c6b5acf84cc3bc421a2aa3c0fb6b21d1 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/e7/2f/c6d89edac75482f11e231b644e365d31d5479b7b727734e6a8f3d00decd5 PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl diff --git a/package/python-pyparted/python-pyparted.hash b/package/python-pyparted/python-pyparted.hash index 0c3e4a15fd..a13276ce79 100644 --- a/package/python-pyparted/python-pyparted.hash +++ b/package/python-pyparted/python-pyparted.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 d214288ae1a70b5925861ce01b3352378eb6b1419aa3b786f509e9ef2a501c02 python-pyparted-3.11.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyparted/json +md5 97df779564210100ea3e4eda0d33f7b9 pyparted-3.12.0.tar.gz +sha256 da985e116beb733371feb605b174db9eec8bd0eedffc8f739f8e603f51b521e7 pyparted-3.12.0.tar.gz +# Locally computed sha256 checksums sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/python-pyparted/python-pyparted.mk b/package/python-pyparted/python-pyparted.mk index 9d48fd9351..5e12995e2e 100644 --- a/package/python-pyparted/python-pyparted.mk +++ b/package/python-pyparted/python-pyparted.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_PYPARTED_VERSION = 3.11.6 -PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,v$(PYTHON_PYPARTED_VERSION)) -PYTHON_PYPARTED_SETUP_TYPE = distutils +PYTHON_PYPARTED_VERSION = 3.12.0 +PYTHON_PYPARTED_SOURCE = pyparted-$(PYTHON_PYPARTED_VERSION).tar.gz +PYTHON_PYPARTED_SITE = https://files.pythonhosted.org/packages/c2/d0/d32aa5758d6567eef620075f5c84f475c93bb1bf8da9d17051ce3ef055db +PYTHON_PYPARTED_SETUP_TYPE = setuptools PYTHON_PYPARTED_LICENSE = GPL-2.0+ PYTHON_PYPARTED_LICENSE_FILES = COPYING PYTHON_PYPARTED_DEPENDENCIES = parted diff --git a/package/python-pyroute2/python-pyroute2.hash b/package/python-pyroute2/python-pyroute2.hash index c292379ebf..bac8809f2d 100644 --- a/package/python-pyroute2/python-pyroute2.hash +++ b/package/python-pyroute2/python-pyroute2.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/pyroute2/json -md5 371683b62314211b8bc9807ac8ef1144 pyroute2-0.5.7.tar.gz -sha256 963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98 pyroute2-0.5.7.tar.gz +md5 caaef93e32f2c3aee305aefba7c8ad21 pyroute2-0.7.3.tar.gz +sha256 7041040db1c2d187fbccd151485b1244c41d758be821785847946370eb6bb706 pyroute2-0.7.3.tar.gz # Locally computed sha256 -sha256 4739b32a2478e9c204bf010bad5d565d188e59ff905e3c8f71fe3398098b7093 LICENSE.Apache.v2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL.v2 -sha256 e329111754f1340de20b6084cae4d264b7b4fc8fb48964173f8ee0cb7440a51c README.license.md +sha256 4739b32a2478e9c204bf010bad5d565d188e59ff905e3c8f71fe3398098b7093 LICENSE.Apache-2.0 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0-or-later +sha256 cbd229e4525bd162dd51f53b2e972d0383f0d0bd5277a10387a57ab9bff97c9f README.license.rst diff --git a/package/python-pyroute2/python-pyroute2.mk b/package/python-pyroute2/python-pyroute2.mk index 44c42d1033..fb4a1cbe5d 100644 --- a/package/python-pyroute2/python-pyroute2.mk +++ b/package/python-pyroute2/python-pyroute2.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PYROUTE2_VERSION = 0.5.7 +PYTHON_PYROUTE2_VERSION = 0.7.3 PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz -PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/6b/94/2a5f6c11369a21efd27a0b4cb92adf5012da7acdbce7e78055710986ca23 +PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/9c/e6/8d163b1aea84223696fef8f8c55566adf166b79d614d602469d64af00226 PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPL-2.0+ -PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache.v2 LICENSE.GPL.v2 README.license.md -PYTHON_PYROUTE2_SETUP_TYPE = distutils +PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache-2.0 LICENSE.GPL-2.0-or-later README.license.rst +PYTHON_PYROUTE2_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash index 70d1cc6fa2..bb55c7135d 100644 --- a/package/python-pyrsistent/python-pyrsistent.hash +++ b/package/python-pyrsistent/python-pyrsistent.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyrsistent/json -md5 cef3da08455664bf917dcf8cd00d49a4 pyrsistent-0.18.1.tar.gz -sha256 d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96 pyrsistent-0.18.1.tar.gz +md5 23da81256b8817e123568a858bf78997 pyrsistent-0.19.2.tar.gz +sha256 bfa0351be89c9fcbcb8c9879b826f4353be10f58f8a677efab0c017bf7137ec2 pyrsistent-0.19.2.tar.gz # Locally computed sha256 checksums sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk index 27ec41028f..6a5ac30a15 100644 --- a/package/python-pyrsistent/python-pyrsistent.mk +++ b/package/python-pyrsistent/python-pyrsistent.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYRSISTENT_VERSION = 0.18.1 +PYTHON_PYRSISTENT_VERSION = 0.19.2 PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz -PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/42/ac/455fdc7294acc4d4154b904e80d964cc9aae75b087bbf486be04df9f2abd +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/b8/ef/325da441a385a8a931b3eeb70db23cb52da42799691988d8d943c5237f10 PYTHON_PYRSISTENT_SETUP_TYPE = setuptools PYTHON_PYRSISTENT_LICENSE = MIT PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit diff --git a/package/python-pysmb/python-pysmb.hash b/package/python-pysmb/python-pysmb.hash index 03713837fc..025e47d030 100644 --- a/package/python-pysmb/python-pysmb.hash +++ b/package/python-pysmb/python-pysmb.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 af9db2e99eaa01e87b0ebc10f87db7c630cc880c7ae3d9dd06f1e5313e82d5a2 pysmb-1.2.7.tar.gz +sha256 9215356c446e4c6b335b4a481f52d746ff60926badfecbc33524b94908fdc0e1 pysmb-1.2.8.tar.gz sha256 8c487d5c10f024e44a9cf1df21d1fd28a80bd2dfddd9f1dcd109a47d721f497f LICENSE diff --git a/package/python-pysmb/python-pysmb.mk b/package/python-pysmb/python-pysmb.mk index 89ff08e958..36993ce42c 100644 --- a/package/python-pysmb/python-pysmb.mk +++ b/package/python-pysmb/python-pysmb.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYSMB_VERSION = 1.2.7 +PYTHON_PYSMB_VERSION = 1.2.8 PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz PYTHON_PYSMB_SITE = https://miketeo.net/files/Projects/pysmb PYTHON_PYSMB_LICENSE = Libpng diff --git a/package/python-pyspnego/Config.in b/package/python-pyspnego/Config.in new file mode 100644 index 0000000000..7533b725ec --- /dev/null +++ b/package/python-pyspnego/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYSPNEGO + bool "python-pyspnego" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + help + Windows Negotiate Authentication Client and Server. + + https://github.com/jborean93/pyspnego diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash new file mode 100644 index 0000000000..400e380b5d --- /dev/null +++ b/package/python-pyspnego/python-pyspnego.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/pyspnego/json +md5 67114f5e59c6d5b45fe2b38c128c2140 pyspnego-0.6.3.tar.gz +sha256 6060a0e683171090adcf92c9d319ddd334f15117fa199a703d8c9bd094d9f6c0 pyspnego-0.6.3.tar.gz + +# Locally computed +sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk new file mode 100644 index 0000000000..0910c57b7d --- /dev/null +++ b/package/python-pyspnego/python-pyspnego.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyspnego +# +################################################################################ + +PYTHON_PYSPNEGO_VERSION = 0.6.3 +PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/ba/13/7b4e7dcff1eb24a13e0a631a4b49eab361678e4490d691c03253ae736da4 +PYTHON_PYSPNEGO_SETUP_TYPE = setuptools +PYTHON_PYSPNEGO_LICENSE = MIT +PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-pytablereader/python-pytablereader.hash b/package/python-pytablereader/python-pytablereader.hash index 675ce5680e..2034cfd61e 100644 --- a/package/python-pytablereader/python-pytablereader.hash +++ b/package/python-pytablereader/python-pytablereader.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytablereader/json -md5 23ba6121e2f916dfbf4015516779dfcd pytablereader-0.26.1.tar.gz -sha256 f2e1477de8886267b765af7861baacc65606761bfabb0689f118cc5d27861f26 pytablereader-0.26.1.tar.gz +md5 8d732b706186666a4c28d14927c26754 pytablereader-0.31.3.tar.gz +sha256 e292b81ecd96546fe0f53d9c83e716a4682d07d7ead6d9be8beb14ab0591df11 pytablereader-0.31.3.tar.gz # Locally computed sha256 checksums -sha256 7fcef461a93fea587224132a865d1285969c9bec15baf59caeb7a8c7638a8744 LICENSE +sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-pytablereader/python-pytablereader.mk b/package/python-pytablereader/python-pytablereader.mk index 0f9e4c593a..daa484d393 100644 --- a/package/python-pytablereader/python-pytablereader.mk +++ b/package/python-pytablereader/python-pytablereader.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEREADER_VERSION = 0.26.1 +PYTHON_PYTABLEREADER_VERSION = 0.31.3 PYTHON_PYTABLEREADER_SOURCE = pytablereader-$(PYTHON_PYTABLEREADER_VERSION).tar.gz -PYTHON_PYTABLEREADER_SITE = https://files.pythonhosted.org/packages/1e/bc/f60da8a733cd87215d8533f28536f8149eca3b898bbca346b37b6c915d8d +PYTHON_PYTABLEREADER_SITE = https://files.pythonhosted.org/packages/b5/c8/67590578e27cb1716c7b71291946d685b5bf63fbfe7a254a7cb3f6f8aeab PYTHON_PYTABLEREADER_SETUP_TYPE = setuptools PYTHON_PYTABLEREADER_LICENSE = MIT PYTHON_PYTABLEREADER_LICENSE_FILES = LICENSE diff --git a/package/python-pytablewriter/python-pytablewriter.hash b/package/python-pytablewriter/python-pytablewriter.hash index 27a84f5fda..f082542dfb 100644 --- a/package/python-pytablewriter/python-pytablewriter.hash +++ b/package/python-pytablewriter/python-pytablewriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytablewriter/json -md5 4909dcdba8c6df35e14dbecbc6c94b6c pytablewriter-0.46.1.tar.gz -sha256 9d52ecc84bb89197c312e193b4ff04a3c934b914f3c32e4826d44a0acbc7764f pytablewriter-0.46.1.tar.gz +md5 0eaa4a2429d22389b5e4b8c5f5135bbb pytablewriter-0.64.2.tar.gz +sha256 99409d401d6ef5f06d1bc40f265a8e3053afe4cbfbaf709f71124076afb40dbb pytablewriter-0.64.2.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-pytablewriter/python-pytablewriter.mk b/package/python-pytablewriter/python-pytablewriter.mk index a63f7f8a2a..d865a89330 100644 --- a/package/python-pytablewriter/python-pytablewriter.mk +++ b/package/python-pytablewriter/python-pytablewriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 0.46.1 +PYTHON_PYTABLEWRITER_VERSION = 0.64.2 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/bb/86/d5f3dfec35d2d7583c9f3f1d731adf729851d1fe01011f07a747eb8c7df0 +PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/a6/e1/50c1cd9734a9edc1386913b178f9e4757c1bc37665c1855a6596c25957d6 PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index e20d78aa01..b683c60553 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 0c74a0ae2b509735594684bf00512252 pytest-asyncio-0.19.0.tar.gz -sha256 ac4ebf3b6207259750bc32f4c1d8fcd7e79739edbc67ad0c58dd150b1d072fed pytest-asyncio-0.19.0.tar.gz +md5 894109d45a7b6f46718bbe4611aa7817 pytest-asyncio-0.20.1.tar.gz +sha256 626699de2a747611f3eeb64168b3575f70439b06c3d0206e6ceaeeb956e65519 pytest-asyncio-0.20.1.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index 337565ca85..b70e0ad0f4 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.19.0 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.20.1 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/43/1c/4293ce5ddfd1db78fbf192bd3c47183c9ecc2816b8de382ed1b2491c7cea +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9e/8f/5a918ac4e2366b61156e16fa9bfb3be52401d81f5309efb1f4e04d99ac39 PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index c2ead0aa64..2ae1e61ed4 100644 --- a/package/python-pytest/python-pytest.hash +++ b/package/python-pytest/python-pytest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest/json -md5 4a98001581a18d4084cb5027fdb1467d pytest-7.1.2.tar.gz -sha256 a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45 pytest-7.1.2.tar.gz +md5 49decbade40109f9c6970df60c22a230 pytest-7.2.0.tar.gz +sha256 c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59 pytest-7.2.0.tar.gz # Locally computer sha256 sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index 85d762ac8b..1794582dd3 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 7.1.2 +PYTHON_PYTEST_VERSION = 7.2.0 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/4e/1f/34657c6ac56f3c58df650ba41f8ffb2620281ead8e11bcdc7db63cf72a78 +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/0b/21/055f39bf8861580b43f845f9e8270c7786fe629b2f8562ff09007132e2e7 PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index e0f253902c..e71e77e5b7 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 d7b7060bbac4970afa2050c139c9fcb6 pytz-2021.3.tar.gz -sha256 acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 pytz-2021.3.tar.gz +md5 bf46b54a7e9bcb65ea38f54646181979 pytz-2022.6.tar.gz +sha256 e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2 pytz-2022.6.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index d606750699..58f06e1993 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2021.3 +PYTHON_PYTZ_VERSION = 2022.6 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/76/63/1be349ff0a44e4795d9712cc0b2d806f5e063d4d34631b71b832fac715a8 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch b/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch index d798f836a5..26f1ef6390 100644 --- a/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch +++ b/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch @@ -24,9 +24,9 @@ index 9dffb3c..aa9942f 100644 --- a/src/pyudev/_ctypeslib/utils.py +++ b/src/pyudev/_ctypeslib/utils.py @@ -28,7 +28,7 @@ - from __future__ import print_function - from __future__ import unicode_literals + """ + # isort: STDLIB -from ctypes import CDLL +from ctypes import cdll, CDLL from ctypes.util import find_library @@ -41,7 +41,7 @@ index 9dffb3c..aa9942f 100644 + try: + lib = cdll.LoadLibrary('lib%s.so' % name) + except OSError: - raise ImportError('No library named %s' % name) + raise ImportError("No library named %s" % name) - lib = CDLL(library_name, use_errno=True) # Add function signatures for funcname, signature in signatures.items(): diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash index def10542fa..014bf20933 100644 --- a/package/python-pyudev/python-pyudev.hash +++ b/package/python-pyudev/python-pyudev.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyudev/json -md5 377eda61186c91e9440f01d76dbb4206 pyudev-0.22.0.tar.gz -sha256 69bb1beb7ac52855b6d1b9fe909eefb0017f38d917cba9939602c6880035b276 pyudev-0.22.0.tar.gz +md5 17c0a41f0e4dfc016350806a0a60f630 pyudev-0.24.0.tar.gz +sha256 b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3 pyudev-0.24.0.tar.gz # Locally computed sha256 checksums sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk index 42d5c7000b..5d48cd4f7c 100644 --- a/package/python-pyudev/python-pyudev.mk +++ b/package/python-pyudev/python-pyudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUDEV_VERSION = 0.22.0 +PYTHON_PYUDEV_VERSION = 0.24.0 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/72/c8/4660d815a79b1d42c409012aaa10ebd6b07a47529b4cb6880f27a24bd646 +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/00/8d/810750cb2fc64d7e0dbefc106a9137b157616a95be3f0ea51ca3cf6c762a PYTHON_PYUDEV_LICENSE = LGPL-2.1+ PYTHON_PYUDEV_LICENSE_FILES = COPYING PYTHON_PYUDEV_SETUP_TYPE = setuptools diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 57c71dabfa..9465e251f8 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 7a00d4540374f34e152a33faa1fcee5f redis-3.5.3.tar.gz -sha256 0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2 redis-3.5.3.tar.gz +md5 15f05dbef3d166c6244f7afa6c3cacf8 redis-4.3.4.tar.gz +sha256 ddf27071df4adf3821c4f2ca59d67525c3a82e5f268bed97b813cb4fabf87880 redis-4.3.4.tar.gz # Locally computed sha256 checksums sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 98c1a16599..7c18f31507 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 3.5.3 +PYTHON_REDIS_VERSION = 4.3.4 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/b3/17/1e567ff78c83854e16b98694411fe6e08c3426af866ad11397cddceb80d3 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/8f/d4/78ef2d3f316041fa6c92daa7ac2c8056c39858c3775fad35fd84b9b3a6fb PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE diff --git a/package/python-reentry/python-reentry.hash b/package/python-reentry/python-reentry.hash index 522b936118..1d6ff0e217 100644 --- a/package/python-reentry/python-reentry.hash +++ b/package/python-reentry/python-reentry.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/reentry/json -md5 398c1e5bbda657aa645c8d2d38afb63f reentry-1.3.2.tar.gz -sha256 c6667e59aeabbb4d122aadc2170102a270e6a811d16a5431c5c3b91fabd7cf02 reentry-1.3.2.tar.gz +md5 30b57a189bb3c319c0552a2f3105d34d reentry-1.3.3.tar.gz +sha256 6343d83245e5047c9f8db0702ec1a7fa8210bd553f0ab643212572f6fce2c3ff reentry-1.3.3.tar.gz # Locally computed sha256 checksums sha256 4ae7f3216208a7e2327236e95bcd2397b2495f1c2298c708986c893bea608509 LICENSE diff --git a/package/python-reentry/python-reentry.mk b/package/python-reentry/python-reentry.mk index ec33c17452..5808eee4a2 100644 --- a/package/python-reentry/python-reentry.mk +++ b/package/python-reentry/python-reentry.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REENTRY_VERSION = 1.3.2 +PYTHON_REENTRY_VERSION = 1.3.3 PYTHON_REENTRY_SOURCE = reentry-$(PYTHON_REENTRY_VERSION).tar.gz -PYTHON_REENTRY_SITE = https://files.pythonhosted.org/packages/a0/88/eb0c107c19227a2292ed11711034a3d80c0dc1368d2b3ebeb3fe7b936a8e +PYTHON_REENTRY_SITE = https://files.pythonhosted.org/packages/95/20/e820a29014f1cb662423d7001dc09a9ea5280083ea300f0c5efe5cae238b PYTHON_REENTRY_SETUP_TYPE = setuptools PYTHON_REENTRY_LICENSE = MIT PYTHON_REENTRY_LICENSE_FILES = LICENSE diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index b0f5bb05da..11a5765e41 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json -md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz -sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz +md5 a85ced10be8bfe76fed4f30c42d32d5c regex-2022.10.31.tar.gz +sha256 a3a98921da9a1bf8457aeee6a551948a83601689e5ecdd736894ea9bbec77e83 regex-2022.10.31.tar.gz # Locally computed sha256 checksums sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index bb8fdf3e48..81bd460ecc 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REGEX_VERSION = 2021.4.4 +PYTHON_REGEX_VERSION = 2022.10.31 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz -PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f +PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/27/b5/92d404279fd5f4f0a17235211bb0f5ae7a0d9afb7f439086ec247441ed28 PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = Apache-2.0 PYTHON_REGEX_LICENSE_FILES = LICENSE.txt diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.hash b/package/python-requests-oauthlib/python-requests-oauthlib.hash index d33cabfefc..08c19ab1f6 100644 --- a/package/python-requests-oauthlib/python-requests-oauthlib.hash +++ b/package/python-requests-oauthlib/python-requests-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-oauthlib/json -md5 1ebcd55f1b1b9281940b4bc33010e2ba requests-oauthlib-1.3.0.tar.gz -sha256 b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a requests-oauthlib-1.3.0.tar.gz +md5 c4f3b4ecdb72a56a13675e5a3302852a requests-oauthlib-1.3.1.tar.gz +sha256 75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a requests-oauthlib-1.3.1.tar.gz # Locally computed sha256 checksums sha256 ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8 LICENSE diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.mk b/package/python-requests-oauthlib/python-requests-oauthlib.mk index 9fe5b186b0..cdd334fb9a 100644 --- a/package/python-requests-oauthlib/python-requests-oauthlib.mk +++ b/package/python-requests-oauthlib/python-requests-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.3.0 +PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.3.1 PYTHON_REQUESTS_OAUTHLIB_SOURCE = requests-oauthlib-$(PYTHON_REQUESTS_OAUTHLIB_VERSION).tar.gz -PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/23/eb/68fc8fa86e0f5789832f275c8289257d8dc44dbe93fce7ff819112b9df8f +PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/95/52/531ef197b426646f26b53815a7d2a67cb7a331ef098bb276db26a68ac49f PYTHON_REQUESTS_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_REQUESTS_OAUTHLIB_LICENSE = ISC PYTHON_REQUESTS_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.hash b/package/python-requests-toolbelt/python-requests-toolbelt.hash index 833570b113..28abf2c628 100644 --- a/package/python-requests-toolbelt/python-requests-toolbelt.hash +++ b/package/python-requests-toolbelt/python-requests-toolbelt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-toolbelt/json -md5 b1509735c4b4cf95df2619facbc3672e requests-toolbelt-0.9.1.tar.gz -sha256 968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0 requests-toolbelt-0.9.1.tar.gz +md5 636d226d03632d013269aebbc85f4f4b requests-toolbelt-0.10.1.tar.gz +sha256 62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d requests-toolbelt-0.10.1.tar.gz # Locally computed sha256 checksums -sha256 3a1a3cffa7abc000cbd726a664f56c33c532a55480f9e056dfe941cf93b7c37f LICENSE +sha256 1f8cf8bdacd98ed6d36d0fec0c07f7765acebd6e81205962ab5146023b3c858d LICENSE diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.mk b/package/python-requests-toolbelt/python-requests-toolbelt.mk index 119c402785..8c141e3aa9 100644 --- a/package/python-requests-toolbelt/python-requests-toolbelt.mk +++ b/package/python-requests-toolbelt/python-requests-toolbelt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_TOOLBELT_VERSION = 0.9.1 +PYTHON_REQUESTS_TOOLBELT_VERSION = 0.10.1 PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz -PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/28/30/7bf7e5071081f761766d46820e52f4b16c8a08fef02d2eb4682ca7534310 +PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/0c/4c/07f01c6ac44f7784fa399137fbc8d0cdc1b5d35304e8c0f278ad82105b58 PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE diff --git a/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch b/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch deleted file mode 100644 index 95892f997f..0000000000 --- a/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch +++ /dev/null @@ -1,147 +0,0 @@ -Description: This patch fixes the "multiple definition of" errors with gcc10 - -Signed-off-by: Michael Fischer - -diff -purN python-rpi-gpio.org/source/common.c python-rpi-gpio/source/common.c ---- python-rpi-gpio.org/source/common.c 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/common.c 2020-08-07 09:31:33.948575964 +0200 -@@ -28,6 +28,9 @@ - const int pin_to_gpio_rev1[41] = {-1, -1, -1, 0, -1, 1, -1, 4, 14, -1, 15, 17, 18, 21, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; - const int pin_to_gpio_rev2[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; - const int pin_to_gpio_rev3[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, 5, -1, 6, 12, 13, -1, 19, 16, 26, 20, -1, 21 }; -+const int (*pin_to_gpio)[41]; -+int gpio_direction[54]; -+rpi_info rpiinfo; - int setup_error = 0; - int module_setup = 0; - -diff -purN python-rpi-gpio.org/source/common.h python-rpi-gpio/source/common.h ---- python-rpi-gpio.org/source/common.h 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/common.h 2020-08-07 09:31:33.948575964 +0200 -@@ -30,14 +30,14 @@ SOFTWARE. - #define I2C 42 - #define PWM 43 - --int gpio_mode; --const int pin_to_gpio_rev1[41]; --const int pin_to_gpio_rev2[41]; --const int pin_to_gpio_rev3[41]; --const int (*pin_to_gpio)[41]; --int gpio_direction[54]; --rpi_info rpiinfo; --int setup_error; --int module_setup; -+extern int gpio_mode; -+extern const int pin_to_gpio_rev1[41]; -+extern const int pin_to_gpio_rev2[41]; -+extern const int pin_to_gpio_rev3[41]; -+extern const int (*pin_to_gpio)[41]; -+extern int gpio_direction[54]; -+extern rpi_info rpiinfo; -+extern int setup_error; -+extern int module_setup; - int check_gpio_priv(void); - int get_gpio_number(int channel, unsigned int *gpio); -diff -purN python-rpi-gpio.org/source/constants.c python-rpi-gpio/source/constants.c ---- python-rpi-gpio.org/source/constants.c 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/constants.c 2020-08-07 09:32:15.522196618 +0200 -@@ -21,6 +21,7 @@ - */ - - #include "Python.h" -+#define CONSTANTS_C - #include "constants.h" - #include "common.h" - #include "c_gpio.h" -diff -purN python-rpi-gpio.org/source/constants.h python-rpi-gpio/source/constants.h ---- python-rpi-gpio.org/source/constants.h 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/constants.h 2020-08-07 09:32:15.522196618 +0200 -@@ -23,22 +23,28 @@ SOFTWARE. - #define PY_PUD_CONST_OFFSET 20 - #define PY_EVENT_CONST_OFFSET 30 - --PyObject *high; --PyObject *low; --PyObject *input; --PyObject *output; --PyObject *pwm; --PyObject *serial; --PyObject *i2c; --PyObject *spi; --PyObject *unknown; --PyObject *board; --PyObject *bcm; --PyObject *pud_off; --PyObject *pud_up; --PyObject *pud_down; --PyObject *rising_edge; --PyObject *falling_edge; --PyObject *both_edge; -+#ifdef CONSTANTS_C -+#define MAYBE_EXTERN -+#else -+#define MAYBE_EXTERN extern -+#endif -+ -+MAYBE_EXTERN PyObject *high; -+MAYBE_EXTERN PyObject *low; -+MAYBE_EXTERN PyObject *input; -+MAYBE_EXTERN PyObject *output; -+MAYBE_EXTERN PyObject *pwm; -+MAYBE_EXTERN PyObject *serial; -+MAYBE_EXTERN PyObject *i2c; -+MAYBE_EXTERN PyObject *spi; -+MAYBE_EXTERN PyObject *unknown; -+MAYBE_EXTERN PyObject *board; -+MAYBE_EXTERN PyObject *bcm; -+MAYBE_EXTERN PyObject *pud_off; -+MAYBE_EXTERN PyObject *pud_up; -+MAYBE_EXTERN PyObject *pud_down; -+MAYBE_EXTERN PyObject *rising_edge; -+MAYBE_EXTERN PyObject *falling_edge; -+MAYBE_EXTERN PyObject *both_edge; - - void define_constants(PyObject *module); -diff -purN python-rpi-gpio.org/source/event_gpio.c python-rpi-gpio/source/event_gpio.c ---- python-rpi-gpio.org/source/event_gpio.c 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/event_gpio.c 2020-08-07 09:42:05.564483136 +0200 -@@ -57,7 +57,7 @@ struct callback - }; - struct callback *callbacks = NULL; - --pthread_t threads; -+static pthread_t threads; - int event_occurred[54] = { 0 }; - int thread_running = 0; - int epfd_thread = -1; -diff -purN python-rpi-gpio.org/source/py_pwm.h python-rpi-gpio/source/py_pwm.h ---- python-rpi-gpio.org/source/py_pwm.h 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/py_pwm.h 2020-08-07 09:38:49.445646807 +0200 -@@ -20,5 +20,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR - SOFTWARE. - */ - --PyTypeObject PWMType; -+extern PyTypeObject PWMType; - PyTypeObject *PWM_init_PWMType(void); -diff -purN python-rpi-gpio.org/source/soft_pwm.c python-rpi-gpio/source/soft_pwm.c ---- python-rpi-gpio.org/source/soft_pwm.c 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/soft_pwm.c 2020-08-07 09:42:40.753160437 +0200 -@@ -25,7 +25,7 @@ SOFTWARE. - #include - #include "c_gpio.h" - #include "soft_pwm.h" --pthread_t threads; -+static pthread_t threads; - - struct pwm - { -diff -purN python-rpi-gpio.org/source/soft_pwm.h python-rpi-gpio/source/soft_pwm.h ---- python-rpi-gpio.org/source/soft_pwm.h 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/soft_pwm.h 2020-08-07 09:39:25.916811352 +0200 -@@ -26,4 +26,4 @@ void pwm_set_duty_cycle(unsigned int gpi - void pwm_set_frequency(unsigned int gpio, float freq); - void pwm_start(unsigned int gpio); - void pwm_stop(unsigned int gpio); --int pwm_exists(unsigned int gpio); -+extern int pwm_exists(unsigned int gpio); diff --git a/package/python-rpi-gpio/python-rpi-gpio.hash b/package/python-rpi-gpio/python-rpi-gpio.hash index 09d1a90765..22bcaebdcb 100644 --- a/package/python-rpi-gpio/python-rpi-gpio.hash +++ b/package/python-rpi-gpio/python-rpi-gpio.hash @@ -1,6 +1,5 @@ -# md5 from https://pypi.python.org/pypi/rpi_gpio/json -# sha256 from https://pypi.python.org/pypi/rpi_gpio/json -md5 777617f9dea9a1680f9af43db0cf150e RPi.GPIO-0.7.0.tar.gz -sha256 7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f RPi.GPIO-0.7.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/rpi_gpio/json +md5 22704930a4e674a3d35342bde6d69fe5 RPi.GPIO-0.7.1.tar.gz +sha256 cd61c4b03c37b62bba4a5acfea9862749c33c618e0295e7e90aa4713fb373b70 RPi.GPIO-0.7.1.tar.gz # Locally computed -sha256 a668b3edecb3e69e81ec25987257008208ffcba9d6c43682033b8060c5f2f994 LICENCE.txt +sha256 1ccf039a03088da42bdb218a446a564330b881ec71f7022a9fb1930f3fb65d8a LICENCE.txt diff --git a/package/python-rpi-gpio/python-rpi-gpio.mk b/package/python-rpi-gpio/python-rpi-gpio.mk index dfc59c882e..4e62e07533 100644 --- a/package/python-rpi-gpio/python-rpi-gpio.mk +++ b/package/python-rpi-gpio/python-rpi-gpio.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_RPI_GPIO_VERSION = 0.7.0 +PYTHON_RPI_GPIO_VERSION = 0.7.1 PYTHON_RPI_GPIO_SOURCE = RPi.GPIO-$(PYTHON_RPI_GPIO_VERSION).tar.gz -PYTHON_RPI_GPIO_SITE = https://sourceforge.net/projects/raspberry-gpio-python/files +PYTHON_RPI_GPIO_SITE = https://files.pythonhosted.org/packages/c4/0f/10b524a12b3445af1c607c27b2f5ed122ef55756e29942900e5c950735f2 PYTHON_RPI_GPIO_LICENSE = MIT PYTHON_RPI_GPIO_LICENSE_FILES = LICENCE.txt -PYTHON_RPI_GPIO_SETUP_TYPE = distutils +PYTHON_RPI_GPIO_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-rsa/python-rsa.hash b/package/python-rsa/python-rsa.hash index 2ea1245667..0e2b3a9119 100644 --- a/package/python-rsa/python-rsa.hash +++ b/package/python-rsa/python-rsa.hash @@ -1,5 +1,5 @@ -# From https://pypi.org/project/rsa/ -sha256 5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17 rsa-4.8.tar.gz - -# Locally computed +# md5, sha256 from https://pypi.org/pypi/rsa/json +md5 26a1efb79164a95c363e550c3eefe683 rsa-4.9.tar.gz +sha256 e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 rsa-4.9.tar.gz +# Locally computed sha256 checksums sha256 073f28b7d389c8fe74f607e17c27f81eaa5ace69edc43a884f23f41b41c5c726 LICENSE diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk index 0de35fe43e..01b5c49b50 100644 --- a/package/python-rsa/python-rsa.mk +++ b/package/python-rsa/python-rsa.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RSA_VERSION = 4.8 +PYTHON_RSA_VERSION = 4.9 PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz -PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/8c/ee/4022542e0fed77dd6ddade38e1e4dea3299f873b7fd4e6d78319953b0f83 +PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d7fb232c2e452547ddfa243e93131e7cfa766da627b52 PYTHON_RSA_SETUP_TYPE = setuptools PYTHON_RSA_LICENSE = Apache-2.0 PYTHON_RSA_LICENSE_FILES = LICENSE diff --git a/package/python-secretstorage/python-secretstorage.hash b/package/python-secretstorage/python-secretstorage.hash index a8e535f892..ae0a5be347 100644 --- a/package/python-secretstorage/python-secretstorage.hash +++ b/package/python-secretstorage/python-secretstorage.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/secretstorage/json -md5 c2a8c0e08e5da198fc38c379b98c28f1 SecretStorage-3.1.2.tar.gz -sha256 15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6 SecretStorage-3.1.2.tar.gz +md5 c6ff1cc866d2f1d274b75c6490726b1b SecretStorage-3.3.3.tar.gz +sha256 2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 SecretStorage-3.3.3.tar.gz # Locally computed sha256 checksums sha256 70f6bfca77633c35efa218328eda5486d7054c2914d61820980e378797520a25 LICENSE diff --git a/package/python-secretstorage/python-secretstorage.mk b/package/python-secretstorage/python-secretstorage.mk index 4c209bf513..81487aa8fb 100644 --- a/package/python-secretstorage/python-secretstorage.mk +++ b/package/python-secretstorage/python-secretstorage.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SECRETSTORAGE_VERSION = 3.1.2 +PYTHON_SECRETSTORAGE_VERSION = 3.3.3 PYTHON_SECRETSTORAGE_SOURCE = SecretStorage-$(PYTHON_SECRETSTORAGE_VERSION).tar.gz -PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/fd/9f/36197c75d9a09b1ab63f56cb985af6cd858ca3fc41fd9cd890ce69bae5b9 +PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/53/a4/f48c9d79cb507ed1373477dbceaba7401fd8a23af63b837fa61f1dcd3691 PYTHON_SECRETSTORAGE_SETUP_TYPE = setuptools PYTHON_SECRETSTORAGE_LICENSE = BSD-3-Clause PYTHON_SECRETSTORAGE_LICENSE_FILES = LICENSE diff --git a/package/python-semantic-version/python-semantic-version.hash b/package/python-semantic-version/python-semantic-version.hash index 692905ec29..49e28c429a 100644 --- a/package/python-semantic-version/python-semantic-version.hash +++ b/package/python-semantic-version/python-semantic-version.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/semantic-version/json -md5 76d7364def7ee487b6153d40b13de904 semantic_version-2.8.5.tar.gz -sha256 d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54 semantic_version-2.8.5.tar.gz +md5 e48abef93ba69abcd4eaf4640edfc38b semantic_version-2.10.0.tar.gz +sha256 bdabb6d336998cbb378d4b9db3a4b56a1e3235701dc05ea2690d9a997ed5041c semantic_version-2.10.0.tar.gz # Locally computed sha256 checksums sha256 a85e7ef2fbc670d26781ed6844cd31a7e8ada65d21328f75a0b02402faae37ea LICENSE diff --git a/package/python-semantic-version/python-semantic-version.mk b/package/python-semantic-version/python-semantic-version.mk index 2352690e26..76a65e734f 100644 --- a/package/python-semantic-version/python-semantic-version.mk +++ b/package/python-semantic-version/python-semantic-version.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SEMANTIC_VERSION_VERSION = 2.8.5 +PYTHON_SEMANTIC_VERSION_VERSION = 2.10.0 PYTHON_SEMANTIC_VERSION_SOURCE = semantic_version-$(PYTHON_SEMANTIC_VERSION_VERSION).tar.gz -PYTHON_SEMANTIC_VERSION_SITE = https://files.pythonhosted.org/packages/d4/52/3be868c7ed1f408cb822bc92ce17ffe4e97d11c42caafce0589f05844dd0 +PYTHON_SEMANTIC_VERSION_SITE = https://files.pythonhosted.org/packages/7d/31/f2289ce78b9b473d582568c234e104d2a342fd658cc288a7553d83bb8595 PYTHON_SEMANTIC_VERSION_SETUP_TYPE = setuptools PYTHON_SEMANTIC_VERSION_LICENSE = BSD-2-Clause PYTHON_SEMANTIC_VERSION_LICENSE_FILES = LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index e9fda822ae..729ffe94c4 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 6dc8c7586d95f7679c7bf7f749336cf8 sentry-sdk-1.4.3.tar.gz -sha256 b9844751e40710e84a457c5bc29b21c383ccb2b63d76eeaad72f7f1c808c8828 sentry-sdk-1.4.3.tar.gz +md5 7f31bd0d6d968c711f8b1d928836eaaa sentry-sdk-1.10.1.tar.gz +sha256 105faf7bd7b7fa25653404619ee261527266b14103fe1389e0ce077bd23a9691 sentry-sdk-1.10.1.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 9238b7fb1c..d8e9e8a2c9 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.4.3 +PYTHON_SENTRY_SDK_VERSION = 1.10.1 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/a7/30/1d967b2e0cac2fa388344b2968fa57e69d5382b922e57cda43af54b9063a +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/43/37/89598a56119199b69a3c4b13e2ce1b57ff69f68313ed393016086d6b487b PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE diff --git a/package/python-setproctitle/python-setproctitle.hash b/package/python-setproctitle/python-setproctitle.hash index 88e4453277..ac8fed986a 100644 --- a/package/python-setproctitle/python-setproctitle.hash +++ b/package/python-setproctitle/python-setproctitle.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setproctitle/json -md5 9898587a1668f1c53f6699ca5d35256d setproctitle-1.2.2.tar.gz -sha256 7dfb472c8852403d34007e01d6e3c68c57eb66433fb8a5c77b13b89a160d97df setproctitle-1.2.2.tar.gz +md5 fa9771540422a59a8dee1331ad6fd3a9 setproctitle-1.3.2.tar.gz +sha256 b9fb97907c830d260fa0658ed58afd48a86b2b88aac521135c352ff7fd3477fd setproctitle-1.3.2.tar.gz # Locally computed -sha256 85bd836337aa702e0a4e2a54676c6ae046ffb357dbf4a990189595a60fcd1648 COPYRIGHT +sha256 4ace14d0836da75079088cfc5cef6f2ddc8ce16f600609b36ee1bf10f8101f61 COPYRIGHT diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk index 13e9e261be..7055920c08 100644 --- a/package/python-setproctitle/python-setproctitle.mk +++ b/package/python-setproctitle/python-setproctitle.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETPROCTITLE_VERSION = 1.2.2 +PYTHON_SETPROCTITLE_VERSION = 1.3.2 PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz -PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/a1/7f/a1d4f4c7b66f0fc02f35dc5c85f45a8b4e4a7988357a29e61c14e725ef86 +PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/b5/47/ac709629ddb9779fee29b7d10ae9580f60a4b37e49bce72360ddf9a79cdc PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash index 6b3b1de3dd..40b4b0e7f7 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json -md5 1c9351fa5cebd12e76488737a7c78f2e setuptools_scm_git_archive-1.1.tar.gz -sha256 6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062 setuptools_scm_git_archive-1.1.tar.gz +md5 df3933d33c49c5d9aca06715b4c65370 setuptools_scm_git_archive-1.4.tar.gz +sha256 b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0 setuptools_scm_git_archive-1.4.tar.gz # Locally computed sha256 checksums sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 032e2d3fc9..278fc972e5 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.1 +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4 PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/7e/2c/0c15b29a1b5940250bfdc4a4f53272e35cd7cf8a34159291b6b4ec9eb291 +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/69/5f/7135eec07395c51d3dd6899251b277405ecc2f8f7a80ef80a483e3c5a2bd PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 2592fc201c..3e4ae01d92 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 9018a18990e7c16159ec3972affba76c setuptools-65.5.0.tar.gz -sha256 512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17 setuptools-65.5.0.tar.gz +md5 3f062858ddfb5efa564c9c02a30cb104 setuptools-65.5.1.tar.gz +sha256 e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f setuptools-65.5.1.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 9dc0a6a38b..3b62221e25 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 65.5.0 +PYTHON_SETUPTOOLS_VERSION = 65.5.1 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/c5/41/247814d8b7a044717164c74080725a6c8f3d2b5fc82b34bd825b617df663 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/26/f4/ca5cb6df512f453ad50f78900bf7ec6a5491ee44bb49d0f6f76802dbdd43 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python diff --git a/package/python-sh/python-sh.hash b/package/python-sh/python-sh.hash index 13a0207de9..a31aacdee1 100644 --- a/package/python-sh/python-sh.hash +++ b/package/python-sh/python-sh.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sh/json -md5 33becadcb5214afd00b9eec05fa98c06 sh-1.14.2.tar.gz -sha256 9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d sh-1.14.2.tar.gz -# Locally computed +md5 d60498172876f35aef6303a9cbb8eb11 sh-1.14.3.tar.gz +sha256 e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7 sh-1.14.3.tar.gz +# Locally computed sha256 checksums sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk index d2d8b14c8b..781de88ab1 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SH_VERSION = 1.14.2 +PYTHON_SH_VERSION = 1.14.3 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://files.pythonhosted.org/packages/80/39/ed280d183c322453e276a518605b2435f682342f2c3bcf63228404d36375 +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/b7/09/89c28aaf2a49f226fef8587c90c6386bd2cc03a0295bc4ff7fc6ee43c01d PYTHON_SH_SETUP_TYPE = setuptools PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt diff --git a/package/python-simplesqlite/python-simplesqlite.hash b/package/python-simplesqlite/python-simplesqlite.hash index 404670aef3..06edbfab3d 100644 --- a/package/python-simplesqlite/python-simplesqlite.hash +++ b/package/python-simplesqlite/python-simplesqlite.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplesqlite/json -md5 f1d4f2ec14e2c782a62e451587477598 SimpleSQLite-0.45.2.tar.gz -sha256 0b19c99c36b63173a715649f94a2fc3aee8deb9b70c683d584bca85e5930244b SimpleSQLite-0.45.2.tar.gz +md5 11f2ef73243fb0d677ed00d22f1441b2 SimpleSQLite-1.3.0.tar.gz +sha256 f7e862bec5982059e665cc73b6fdb4c8340a1f565ba3497387c3c48f10d43bf8 SimpleSQLite-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 98799b7c99b561c5ffa3ac86600e501f761afa8e72af8a2515026445fe134105 LICENSE +sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-simplesqlite/python-simplesqlite.mk b/package/python-simplesqlite/python-simplesqlite.mk index 88ffcd4d45..ea60cefc16 100644 --- a/package/python-simplesqlite/python-simplesqlite.mk +++ b/package/python-simplesqlite/python-simplesqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLESQLITE_VERSION = 0.45.2 +PYTHON_SIMPLESQLITE_VERSION = 1.3.0 PYTHON_SIMPLESQLITE_SOURCE = SimpleSQLite-$(PYTHON_SIMPLESQLITE_VERSION).tar.gz -PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/b3/d1/bc3668ed7d90ee70d556124b8b5b3329505d72b5290bb393626f1afe714d +PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/a0/2c/39a9e7dc4af46d101f48753086c686982790ecc2bdf5e9fa88f85f027e7a PYTHON_SIMPLESQLITE_SETUP_TYPE = setuptools PYTHON_SIMPLESQLITE_LICENSE = MIT PYTHON_SIMPLESQLITE_LICENSE_FILES = LICENSE diff --git a/package/python-smbprotocol/Config.in b/package/python-smbprotocol/Config.in new file mode 100644 index 0000000000..ae58a7d9a1 --- /dev/null +++ b/package/python-smbprotocol/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_SMBPROTOCOL + bool "python-smbprotocol" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_PYSPNEGO # runtime + help + Interact with a server using the SMB 2/3 Protocol. + + https://github.com/jborean93/smbprotocol diff --git a/package/python-smbprotocol/python-smbprotocol.hash b/package/python-smbprotocol/python-smbprotocol.hash new file mode 100644 index 0000000000..a46f9f635b --- /dev/null +++ b/package/python-smbprotocol/python-smbprotocol.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/smbprotocol/json +md5 a7474ab4cf8912dffaab56ad5067f429 smbprotocol-1.10.1.tar.gz +sha256 b5bc9d4930ec947d42c21089a4d373b97e3f6488fd15d32d27189312fd8a04c9 smbprotocol-1.10.1.tar.gz + +# Locally computed +sha256 4c3c550abc2b04c507ed0d641dd7e524eaff5bd06c7862af957301836d496d15 LICENSE diff --git a/package/python-smbprotocol/python-smbprotocol.mk b/package/python-smbprotocol/python-smbprotocol.mk new file mode 100644 index 0000000000..17c2b17dbc --- /dev/null +++ b/package/python-smbprotocol/python-smbprotocol.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-smbprotocol +# +################################################################################ + +PYTHON_SMBPROTOCOL_VERSION = 1.10.1 +PYTHON_SMBPROTOCOL_SOURCE = smbprotocol-$(PYTHON_SMBPROTOCOL_VERSION).tar.gz +PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/13/1a/73ad1883beebe4f6f47879cb9880690944faa00681141920c7a2219f6152 +PYTHON_SMBPROTOCOL_SETUP_TYPE = setuptools +PYTHON_SMBPROTOCOL_LICENSE = MIT +PYTHON_SMBPROTOCOL_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-socketio/python-socketio.hash b/package/python-socketio/python-socketio.hash index 40e74cef96..abdcc3a5b7 100644 --- a/package/python-socketio/python-socketio.hash +++ b/package/python-socketio/python-socketio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-socketio/json -md5 0507825ca4bd6527cbaed81ec5767bfe python-socketio-5.4.0.tar.gz -sha256 ca807c9e1f168e96dea412d64dd834fb47c470d27fd83da0504aa4b248ba2544 python-socketio-5.4.0.tar.gz +md5 e63369252a9d383cbfc503337b864733 python-socketio-5.7.2.tar.gz +sha256 92395062d9db3c13d30e7cdedaa0e1330bba78505645db695415f9a3c628d097 python-socketio-5.7.2.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-socketio/python-socketio.mk b/package/python-socketio/python-socketio.mk index f23342b776..aecff55ef4 100644 --- a/package/python-socketio/python-socketio.mk +++ b/package/python-socketio/python-socketio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_SOCKETIO_VERSION = 5.4.0 -PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/72/70/9b992f4b8adfcbf0724c079c18629d83f20b36fb0eb64d4fdf874054becf +PYTHON_SOCKETIO_VERSION = 5.7.2 +PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/ee/56/294629986bf6cea96e0edb3933a7f2fac7a079d12909e893903a2effc670 PYTHON_SOCKETIO_SETUP_TYPE = setuptools PYTHON_SOCKETIO_LICENSE = MIT PYTHON_SOCKETIO_LICENSE_FILES = LICENSE diff --git a/package/python-soupsieve/python-soupsieve.hash b/package/python-soupsieve/python-soupsieve.hash index 699cb9581a..cf348d441f 100644 --- a/package/python-soupsieve/python-soupsieve.hash +++ b/package/python-soupsieve/python-soupsieve.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/soupsieve/json -md5 73ff6ce22ba973fe2d47197834e0f728 soupsieve-2.2.1.tar.gz -sha256 052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc soupsieve-2.2.1.tar.gz +md5 4c824620563604cbf783de149c8b8889 soupsieve-2.3.2.post1.tar.gz +sha256 fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d soupsieve-2.3.2.post1.tar.gz # Locally computed sha256 checksums -sha256 e34a760fe8bb3e3c1ffaa88abe495cf76e56f8ae3c7a6dde0e4b41cd013c41d4 LICENSE.md +sha256 bc66234cadd3f6e7aaf7160faf165f3f869ffc8a11b6b0d6c44a2e2a83314dd0 LICENSE.md diff --git a/package/python-soupsieve/python-soupsieve.mk b/package/python-soupsieve/python-soupsieve.mk index dd2ddebbb1..ebf2ada7ac 100644 --- a/package/python-soupsieve/python-soupsieve.mk +++ b/package/python-soupsieve/python-soupsieve.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SOUPSIEVE_VERSION = 2.2.1 +PYTHON_SOUPSIEVE_VERSION = 2.3.2.post1 PYTHON_SOUPSIEVE_SOURCE = soupsieve-$(PYTHON_SOUPSIEVE_VERSION).tar.gz -PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/c8/3f/e71d92e90771ac2d69986aa0e81cf0dfda6271e8483698f4847b861dd449 -PYTHON_SOUPSIEVE_SETUP_TYPE = setuptools +PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/f3/03/bac179d539362319b4779a00764e95f7542f4920084163db6b0fd4742d38 +PYTHON_SOUPSIEVE_SETUP_TYPE = pep517 PYTHON_SOUPSIEVE_LICENSE = MIT PYTHON_SOUPSIEVE_LICENSE_FILES = LICENSE.md +PYTHON_SOUPSIEVE_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-spidev/python-spidev.hash b/package/python-spidev/python-spidev.hash index c74d7c470c..cd8a24eb72 100644 --- a/package/python-spidev/python-spidev.hash +++ b/package/python-spidev/python-spidev.hash @@ -1,5 +1,5 @@ -# sha256 from https://pypi.org/project/spidev -sha256 8a7f5c289f161ea2ac4697fa8a10918232c990678dd0053084b3c43b1363910d spidev-3.5.tar.gz - -# locally computed -sha256 153a6f02f41aebe292cf3307f973a80b4fb0c988d8d3e7d126c7a66c20b1cc27 README.md +# md5, sha256 from https://pypi.org/pypi/spidev/json +md5 83a73279d6e823a9030c4315577bfae3 spidev-3.6.tar.gz +sha256 14dbc37594a4aaef85403ab617985d3c3ef464d62bc9b769ef552db53701115b spidev-3.6.tar.gz +# Locally computed sha256 checksums +sha256 510129bc8174c0fa81fa6d653691d1bd5d3555f7f38979ec45b5fc5bbff5377b LICENSE diff --git a/package/python-spidev/python-spidev.mk b/package/python-spidev/python-spidev.mk index e1065610a7..f48b5b0832 100644 --- a/package/python-spidev/python-spidev.mk +++ b/package/python-spidev/python-spidev.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SPIDEV_VERSION = 3.5 +PYTHON_SPIDEV_VERSION = 3.6 PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz -PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/62/56/de649e7d95f9fcfaf965a6eb937b4a46bc77ef21487c99cde1a7a0546040 +PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/c7/d9/401c0a7be089e02826cf2c201f489876b601f15be100fe391ef9c2faed83 PYTHON_SPIDEV_SETUP_TYPE = setuptools PYTHON_SPIDEV_LICENSE = MIT -PYTHON_SPIDEV_LICENSE_FILES = README.md +PYTHON_SPIDEV_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index 3274e10fd3..9f479d8f7b 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 af9722657ba51131703dbe75f24b054a SQLAlchemy-1.3.10.tar.gz -sha256 0f0768b5db594517e1f5e1572c73d14cf295140756431270d89496dc13d5e46c SQLAlchemy-1.3.10.tar.gz +md5 52318b83e8931c5f5a459f54fe4be3e8 SQLAlchemy-1.4.42.tar.gz +sha256 177e41914c476ed1e1b77fd05966ea88c094053e17a85303c4ce007f88eff363 SQLAlchemy-1.4.42.tar.gz # Locally computed sha256 checksums -sha256 0acffa15f3427e94014235e3c44376f6fe5df0ff461a93a9116eebcce74c056e LICENSE +sha256 859ded25da34c1eb73e6e736df4c5f8ce3ed2ed5290663176f06e7720d9c9a20 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index d6829853fc..a94b9eca92 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 1.3.10 +PYTHON_SQLALCHEMY_VERSION = 1.4.42 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/14/0e/487f7fc1e432cec50d2678f94e4133f2b9e9356e35bacc30d73e8cb831fc +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/e4/56/8ea85eaab7d93b58f9c213ad8fc5882838189a29fc8cc401d80710a12969 PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE diff --git a/package/python-sqliteschema/python-sqliteschema.hash b/package/python-sqliteschema/python-sqliteschema.hash index e60bd64325..d5fe6e7af1 100644 --- a/package/python-sqliteschema/python-sqliteschema.hash +++ b/package/python-sqliteschema/python-sqliteschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqliteschema/json -md5 4fb0130e7cc60d92be468091fbfc3d51 sqliteschema-1.2.1.tar.gz -sha256 dde195bd7bc70d5841bc01dff20ec23bd43be87d760d2dfc7c7f2e5fd3808ef3 sqliteschema-1.2.1.tar.gz +md5 46da4f7575a0cc6c1d92377a279e5188 sqliteschema-1.3.0.tar.gz +sha256 1acdd5087cab54a099135a5623bb1960019816e2e3042b889c637901a832d3c3 sqliteschema-1.3.0.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-sqliteschema/python-sqliteschema.mk b/package/python-sqliteschema/python-sqliteschema.mk index 5c52e35111..c399ebd6f6 100644 --- a/package/python-sqliteschema/python-sqliteschema.mk +++ b/package/python-sqliteschema/python-sqliteschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLITESCHEMA_VERSION = 1.2.1 +PYTHON_SQLITESCHEMA_VERSION = 1.3.0 PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/85/f8/be54d4bebf551cb533d1dea11c3bf165a1a408c2a1cceb1f9724aadd9967 +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/3d/ff/91cfff0c96f9ba2bddc27d6855db4907af77551a267b86740c8842beeb78 PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools PYTHON_SQLITESCHEMA_LICENSE = MIT PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE diff --git a/package/python-sqlparse/python-sqlparse.hash b/package/python-sqlparse/python-sqlparse.hash index d7e329eda2..c78fd2edc3 100644 --- a/package/python-sqlparse/python-sqlparse.hash +++ b/package/python-sqlparse/python-sqlparse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlparse/json -md5 2ce34181d6b7b234c9f3c0ecd1ffb93e sqlparse-0.3.0.tar.gz -sha256 7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873 sqlparse-0.3.0.tar.gz +md5 180fb4e11a3f79b119868d7c102d7816 sqlparse-0.4.3.tar.gz +sha256 69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268 sqlparse-0.4.3.tar.gz # Locally computed sha256 checksums sha256 c1938235b80d39e93138eae89edc3af67e18ecbc40d266529fa57b2dce426310 LICENSE diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 22111dfc41..23b1338e49 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLPARSE_VERSION = 0.3.0 +PYTHON_SQLPARSE_VERSION = 0.4.3 PYTHON_SQLPARSE_SOURCE = sqlparse-$(PYTHON_SQLPARSE_VERSION).tar.gz -PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/63/c8/229dfd2d18663b375975d953e2bdc06d0eed714f93dcb7732f39e349c438 +PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b69f3a34b8867877e4dbf2a37b7f2a5c0bbb5a9eed64efd1ad1 PYTHON_SQLPARSE_SETUP_TYPE = setuptools PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index 0fca58354b..d802a63d87 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 f8b2b0df1adf3f83b829a85e31bddb2d tempora-1.14.1.tar.gz -sha256 cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6 tempora-1.14.1.tar.gz +md5 24b77c173a7e89084004a38fe44e3ce3 tempora-5.0.2.tar.gz +sha256 31fa5bb33b2641026211f23e808eb8bd351901988b167d45f323c8f450ecf211 tempora-5.0.2.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index b2f1b6b309..e22ac52472 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 1.14.1 +PYTHON_TEMPORA_VERSION = 5.0.2 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/2f/b5/5b0464385454c5ca93a39a1c6acefdf574aeb10ef45fa8958b3832cc7d96 +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/72/2c/9aff4204a4ea5172b0cb3508f8a504ab6562ba539825ea2e33a5b4cb629b PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 36365cc3d3..9e0324ed64 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 043e89644f8909d462fbbfa511c768df termcolor-1.1.0.tar.gz -sha256 1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b termcolor-1.1.0.tar.gz +md5 04e4981838535169d19d26a14a76af17 termcolor-2.1.0.tar.gz +sha256 b80df54667ce4f48c03fe35df194f052dc27a541ebbf2544e4d6b47b5d6949c4 termcolor-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 497b3272b67b94a7aa58fa3748d21b62b29ccb783b1cda816f594e3932590bbf COPYING.txt +sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index ccdff4c0d7..8731032fec 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 1.1.0 +PYTHON_TERMCOLOR_VERSION = 2.1.0 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981 -PYTHON_TERMCOLOR_SETUP_TYPE = distutils +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/62/1a/e78a930f70dd576f2a7250a98263ac973a80d6f1a395d89328844881a0c0 +PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt +PYTHON_TERMCOLOR_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-thrift/python-thrift.hash b/package/python-thrift/python-thrift.hash index 1d1d628908..0907a6e88f 100644 --- a/package/python-thrift/python-thrift.hash +++ b/package/python-thrift/python-thrift.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/thrift/json -md5 c3bc8d9a910d2c9ce26f2ad1f7c96762 thrift-0.13.0.tar.gz -sha256 9af1c86bf73433afc6010ed376a6c6aca2b54099cc0d61895f640870a9ae7d89 thrift-0.13.0.tar.gz +md5 486887192acd558636a1528dfddf918c thrift-0.16.0.tar.gz +sha256 2b5b6488fcded21f9d312aa23c9ff6a0195d0f6ae26ddbd5ad9e3e25dfc14408 thrift-0.16.0.tar.gz # Locally computed sha256 checksums -sha256 c13578ae9d0529d0252e1c7375b917bacf58723dce1fcd40c7ed59183401b468 LICENSE +sha256 35e2508f171c3ac2529f402c123c12f3b2ac91643f2e52b334f71f8c861be321 README.md diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk index 3a908ca91c..23a2ad0476 100644 --- a/package/python-thrift/python-thrift.mk +++ b/package/python-thrift/python-thrift.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_THRIFT_VERSION = 0.13.0 +PYTHON_THRIFT_VERSION = 0.16.0 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/97/1e/3284d19d7be99305eda145b8aa46b0c33244e4a496ec66440dac19f8274d +PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/e4/23/dd951c9883cb49a73b750bdfe91e39d78e8a3f1f7175608634f381a197d5 PYTHON_THRIFT_SETUP_TYPE = setuptools PYTHON_THRIFT_LICENSE = Apache-2.0 -PYTHON_THRIFT_LICENSE_FILES = LICENSE +PYTHON_THRIFT_LICENSE_FILES = README.md $(eval $(python-package)) diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index e9fbbedf65..f30a6bb136 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tornado/json -md5 cf39425f3d7eba9a54287f3e795a2f23 tornado-6.0.4.tar.gz -sha256 0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc tornado-6.0.4.tar.gz +md5 32fbad606b439c3e1bf4e79d4e872741 tornado-6.2.tar.gz +sha256 9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13 tornado-6.2.tar.gz # Locally computed sha256 checksums -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index c05a7d65d3..2af86ecb18 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 6.0.4 +PYTHON_TORNADO_VERSION = 6.2 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/95/84/119a46d494f008969bf0c775cb2c6b3579d3c4cc1bb1b41a022aa93ee242 +PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/f3/9e/225a41452f2d9418d89be5e32cf824c84fe1e639d350d6e8d49db5b7f73a PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_CPE_ID_VENDOR = tornadoweb diff --git a/package/python-tqdm/python-tqdm.hash b/package/python-tqdm/python-tqdm.hash index 8251ae48d2..4be54de7de 100644 --- a/package/python-tqdm/python-tqdm.hash +++ b/package/python-tqdm/python-tqdm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/project/tqdm -md5 285af1f905f4c375f03a86a667047950 tqdm-4.40.1.tar.gz -sha256 e405d16c98fcf30725d0c9d493ed07302a18846b5452de5253030ccd18996f87 tqdm-4.40.1.tar.gz +md5 5822af464d77ea156ad1167c23e1bdac tqdm-4.64.1.tar.gz +sha256 5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4 tqdm-4.64.1.tar.gz # Locally computed sha256 checksums -sha256 1bbf12d09d437844527b3cdaba01d379dac651b5cbb5ebb0d764274684d2680b LICENCE +sha256 a0fc1785a8f2a200a3124d703d49550601b7741ccffc861713c2ddaa07a537dd LICENCE diff --git a/package/python-tqdm/python-tqdm.mk b/package/python-tqdm/python-tqdm.mk index 5ceddde14c..a6296bd0f5 100644 --- a/package/python-tqdm/python-tqdm.mk +++ b/package/python-tqdm/python-tqdm.mk @@ -4,13 +4,14 @@ # ################################################################################ -PYTHON_TQDM_VERSION = 4.40.1 +PYTHON_TQDM_VERSION = 4.64.1 PYTHON_TQDM_SOURCE = tqdm-$(PYTHON_TQDM_VERSION).tar.gz -PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/4c/45/830c5c4bfaba60ef7d356a53c7751a86c81d148a16fda0daf3ac5ca8e288 +PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/c1/c2/d8a40e5363fb01806870e444fc1d066282743292ff32a9da54af51ce36a2 PYTHON_TQDM_SETUP_TYPE = setuptools PYTHON_TQDM_LICENSE = MPL-2.0, MIT PYTHON_TQDM_LICENSE_FILES = LICENCE PYTHON_TQDM_CPE_ID_VENDOR = tqdm_project PYTHON_TQDM_CPE_ID_PRODUCT = tqdm +PYTHON_TQDM_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 01e2bf8e30..095e85c155 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 19483ec0685e837912cff128209aa845 traitlets-5.1.0.tar.gz -sha256 bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d traitlets-5.1.0.tar.gz +md5 d5f87bbea8acf897ac3e435c7b71acdc traitlets-5.5.0.tar.gz +sha256 b122f9ff2f2f6c1709dab289a05555be011c87828e911c0cf4074b85cb780a79 traitlets-5.5.0.tar.gz # Locally computed sha256 checksums -sha256 71c89129039b870cc92309466c4fbe8f285a82fa0ea36f0e840fa83979cbe31f COPYING.md +sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 5f41f6ee8f..25ab71047a 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.1.0 +PYTHON_TRAITLETS_VERSION = 5.5.0 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/d5/bc/37d490908e7ac949614d62767db3c86f37bc5adb6129d378c35859a75b87 +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/dd/a8/278742d17c9e95ccb0dcb86ae216df114d2166d88e72f42b60a7b58b600b PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md -PYTHON_TRAITLETS_SETUP_TYPE = distutils +PYTHON_TRAITLETS_SETUP_TYPE = pep517 +PYTHON_TRAITLETS_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 8995bf2cfe..57dc50ee74 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,6 @@ # ################################################################################ -# When bumping this package, make sure to also verify if the -# python-twisted package still works and to update its hash, -# as they share the same version/site variables. PYTHON_TREQ_VERSION = 22.2.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index c0acf35560..1f3baf57e2 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -31,7 +31,7 @@ config BR2_PACKAGE_PYTHON_TWISTED_TLS config BR2_PACKAGE_PYTHON_TWISTED_CONCH bool "Conch support" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography, python-bcrypt select BR2_PACKAGE_PYTHON_APPDIRS # runtime select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 63da0125b8..36612ff5e7 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz -sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz +md5 c9a5dad0813512fabd9de502738c0bf8 Twisted-22.10.0.tar.gz +sha256 32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31 Twisted-22.10.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8a89d3dc82..398baed2a8 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,12 +4,9 @@ # ################################################################################ -# When bumping this package, make sure to also verify if the -# python-treq package still works and to update its hash, -# as they share the same version/site variables. -PYTHON_TWISTED_VERSION = 22.2.0 +PYTHON_TWISTED_VERSION = 22.10.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/b2/ce/cbb56597127b1d51905b0cddcc3f314cc769769efc5e9a8a67f4617f7bca PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE diff --git a/package/python-txtorcon/python-txtorcon.hash b/package/python-txtorcon/python-txtorcon.hash index 220b5fb23e..9c8e3599ea 100644 --- a/package/python-txtorcon/python-txtorcon.hash +++ b/package/python-txtorcon/python-txtorcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txtorcon/json -md5 dbb53821a3ce3e921e09c5de4f722fdb txtorcon-21.1.0.tar.gz -sha256 aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6 txtorcon-21.1.0.tar.gz +md5 17a84954a4ba13fa6ee443129bdc401a txtorcon-22.0.0.tar.gz +sha256 89a1b65e32a4b369d67e6c166387fbc468cc5d05227448d239a5e7e9718aa053 txtorcon-22.0.0.tar.gz # Locally computed sha256 checksums sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index acf586cb8c..c17d5da074 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXTORCON_VERSION = 21.1.0 +PYTHON_TXTORCON_VERSION = 22.0.0 PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz -PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/eb/43/2426009377cef519c53bdc8969590cb100e9fd745846859963c881c6d176 +PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/47/ca/7941660345c769637a97bdbaf25202460fbab35eead55c538fb1fe61b71e PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE diff --git a/package/python-unittest-xml-reporting/python-unittest-xml-reporting.hash b/package/python-unittest-xml-reporting/python-unittest-xml-reporting.hash index 9db3a09d38..674a533e6a 100644 --- a/package/python-unittest-xml-reporting/python-unittest-xml-reporting.hash +++ b/package/python-unittest-xml-reporting/python-unittest-xml-reporting.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/unittest-xml-reporting/json -md5 474cd89f9609828ef6039a0f00afd9db unittest-xml-reporting-3.0.4.tar.gz -sha256 984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695 unittest-xml-reporting-3.0.4.tar.gz -# Locally calculated +md5 f12aeab63ff44e295526e103313d66c8 unittest-xml-reporting-3.2.0.tar.gz +sha256 edd8d3170b40c3a81b8cf910f46c6a304ae2847ec01036d02e9c0f9b85762d28 unittest-xml-reporting-3.2.0.tar.gz +# Locally computed sha256 checksums sha256 0596648105bee470f9cafd62753b931efe52392096439d88e2564cf7d7cf0e68 LICENSE diff --git a/package/python-unittest-xml-reporting/python-unittest-xml-reporting.mk b/package/python-unittest-xml-reporting/python-unittest-xml-reporting.mk index 5744c50a7c..05bbed79a8 100644 --- a/package/python-unittest-xml-reporting/python-unittest-xml-reporting.mk +++ b/package/python-unittest-xml-reporting/python-unittest-xml-reporting.mk @@ -4,20 +4,11 @@ # ################################################################################ -PYTHON_UNITTEST_XML_REPORTING_VERSION = 3.0.4 +PYTHON_UNITTEST_XML_REPORTING_VERSION = 3.2.0 PYTHON_UNITTEST_XML_REPORTING_SOURCE = unittest-xml-reporting-$(PYTHON_UNITTEST_XML_REPORTING_VERSION).tar.gz -PYTHON_UNITTEST_XML_REPORTING_SITE = https://files.pythonhosted.org/packages/bc/09/677086169c8e302b614de7d4a97c45c4446a382f31cc010fb31177258508 -# License file missing in Pypi tarball, download separately. Issue -# reported at -# https://github.com/xmlrunner/unittest-xml-reporting/issues/259 -PYTHON_UNITTEST_XML_REPORTING_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/xmlrunner/unittest-xml-reporting/$(PYTHON_UNITTEST_XML_REPORTING_VERSION)/LICENSE +PYTHON_UNITTEST_XML_REPORTING_SITE = https://files.pythonhosted.org/packages/ed/40/3bf1afc96e93c7322520981ac4593cbb29daa21b48d32746f05ab5563dca PYTHON_UNITTEST_XML_REPORTING_SETUP_TYPE = setuptools PYTHON_UNITTEST_XML_REPORTING_LICENSE = BSD-2-Clause PYTHON_UNITTEST_XML_REPORTING_LICENSE_FILES = LICENSE -define PYTHON_UNITTEST_XML_REPORTING_ADD_LICENSE_FILE - $(INSTALL) -D -m 0644 $(PYTHON_UNITTEST_XML_REPORTING_DL_DIR)/LICENSE $(@D)/LICENSE -endef -PYTHON_UNITTEST_XML_REPORTING_POST_EXTRACT_HOOKS += PYTHON_UNITTEST_XML_REPORTING_ADD_LICENSE_FILE - $(eval $(python-package)) diff --git a/package/python-validators/Config.in b/package/python-validators/Config.in index e700369910..8a2ddb49fb 100644 --- a/package/python-validators/Config.in +++ b/package/python-validators/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_VALIDATORS bool "python-validators" - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime help Python Data Validation for Humans. diff --git a/package/python-validators/python-validators.hash b/package/python-validators/python-validators.hash index 2845a2e8c0..4f4e1c21f8 100644 --- a/package/python-validators/python-validators.hash +++ b/package/python-validators/python-validators.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/validators/json -md5 2f0446f2a15aa694be0cfd8728eb4444 validators-0.15.0.tar.gz -sha256 31e8bb01b48b48940a021b8a9576b840f98fa06b91762ef921d02cb96d38727a validators-0.15.0.tar.gz +md5 f03b5acb91079450bae664726ae01948 validators-0.20.0.tar.gz +sha256 24148ce4e64100a2d5e267233e23e7afeb55316b47d30faae7eb6e7292bc226a validators-0.20.0.tar.gz # Locally computed sha256 checksums sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE diff --git a/package/python-validators/python-validators.mk b/package/python-validators/python-validators.mk index 5bed051911..731aca11f6 100644 --- a/package/python-validators/python-validators.mk +++ b/package/python-validators/python-validators.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_VALIDATORS_VERSION = 0.15.0 +PYTHON_VALIDATORS_VERSION = 0.20.0 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz -PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/c4/4a/4f9c892f9a9f08ee5f99c32bbd4297499099c2c5f7eff8c617a57d31a7d8 +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/95/14/ed0af6865d378cfc3c504aed0d278a890cbefb2f1934bf2dbe92ecf9d6b1 PYTHON_VALIDATORS_SETUP_TYPE = setuptools PYTHON_VALIDATORS_LICENSE = MIT PYTHON_VALIDATORS_LICENSE_FILES = LICENSE diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 3b633f9156..59facb8fea 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/watchdog/json -md5 6aac660b0f3358c63658806a0579b832 watchdog-2.1.6.tar.gz -sha256 a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7 watchdog-2.1.6.tar.gz +md5 0e60e0a2d3a8c18ba37105f8b44de810 watchdog-2.1.9.tar.gz +sha256 43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609 watchdog-2.1.9.tar.gz # Locally computed sha256 checksums sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index 2dafef97e1..71a3f8a0c2 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 2.1.6 +PYTHON_WATCHDOG_VERSION = 2.1.9 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/e8/a8/fc4edd7d768361b00ea850e5310211d157df6b5a1db6148dd434e787d898 +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/42/f7/da8e889f8626786eac9454e8d2718fc79359ed517be20cdd50c647167d39 PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING diff --git a/package/python-wcwidth/python-wcwidth.hash b/package/python-wcwidth/python-wcwidth.hash index ed1d2cd61f..216182c2ed 100644 --- a/package/python-wcwidth/python-wcwidth.hash +++ b/package/python-wcwidth/python-wcwidth.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wcwidth/json -md5 b32584cd6084b4a8c81df13a2a6b4351 wcwidth-0.1.9.tar.gz -sha256 ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1 wcwidth-0.1.9.tar.gz -# Locally computed -sha256 0eddcc52cd3ef5d30798b8d43a14d3f0f1dcf0a6e4c1d0f2e177c44ce85bb69c LICENSE.txt +md5 a07a75f99d316e14838ac760c831ea37 wcwidth-0.2.5.tar.gz +sha256 c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83 wcwidth-0.2.5.tar.gz +# Locally computed sha256 checksums +sha256 70b98a95a2144eb70af8017fa8c6d95ce247e40867436e8bc649e137fe13d21a LICENSE diff --git a/package/python-wcwidth/python-wcwidth.mk b/package/python-wcwidth/python-wcwidth.mk index ccbd0e99ca..a170a8e395 100644 --- a/package/python-wcwidth/python-wcwidth.mk +++ b/package/python-wcwidth/python-wcwidth.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_WCWIDTH_VERSION = 0.1.9 +PYTHON_WCWIDTH_VERSION = 0.2.5 PYTHON_WCWIDTH_SOURCE = wcwidth-$(PYTHON_WCWIDTH_VERSION).tar.gz -PYTHON_WCWIDTH_SITE = https://pypi.python.org/packages/25/9d/0acbed6e4a4be4fc99148f275488580968f44ddb5e69b8ceb53fc9df55a0 +PYTHON_WCWIDTH_SITE = https://files.pythonhosted.org/packages/89/38/459b727c381504f361832b9e5ace19966de1a235d73cdbdea91c771a1155 PYTHON_WCWIDTH_SETUP_TYPE = setuptools PYTHON_WCWIDTH_LICENSE = MIT -PYTHON_WCWIDTH_LICENSE_FILES = LICENSE.txt +PYTHON_WCWIDTH_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 21e58d3677..4da8ea479a 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 b270213554d781c86b6c3d390b097f2f weasyprint-57.0.tar.gz -sha256 7b6f5cc13819e9a7d8748c1dbf0e8d2444f7a4818a98339f82dccaa822bf911b weasyprint-57.0.tar.gz +md5 bab389bdfb25e03d64591c56367fb344 weasyprint-57.1.tar.gz +sha256 397a9d11298f94485ec3b7b68aeef1c6106fb638350126d9d4a64109b73508a0 weasyprint-57.1.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index 9dd364e1c1..d1e5e7983d 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 57.0 +PYTHON_WEASYPRINT_VERSION = 57.1 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/b7/98/cd0df64b306ac901ffd53c50d9d5d79d92cae756b6469fc14771adb39d77 +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/32/3f/d305dc714c119e5b11c0ea1ecff9741407b6da90d6b684859d3b3e586692 PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE diff --git a/package/python-webpy/python-webpy.hash b/package/python-webpy/python-webpy.hash index ed3da6b1ab..540771a244 100644 --- a/package/python-webpy/python-webpy.hash +++ b/package/python-webpy/python-webpy.hash @@ -1,5 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/web.py/json -md5 4e7ec89e7ae1e938d01fff01ba752606 web.py-0.40.tar.gz -sha256 dc5e42ffbc42d77d07f75b7acca9975a3368ae609774e49ddebb497a784131f3 web.py-0.40.tar.gz -# Locally computed sha256 checksums -sha256 791bf6e9419435f114a19fc6519ff33738021eb3c41b18490943230ab0894df9 LICENSE.txt +md5 cd2c0296ceffa1acb96ae5315214eb42 web.py-0.62.tar.gz +sha256 5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e web.py-0.62.tar.gz diff --git a/package/python-webpy/python-webpy.mk b/package/python-webpy/python-webpy.mk index 187a481286..06d4ae039b 100644 --- a/package/python-webpy/python-webpy.mk +++ b/package/python-webpy/python-webpy.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_WEBPY_VERSION = 0.40 +PYTHON_WEBPY_VERSION = 0.62 PYTHON_WEBPY_SOURCE = web.py-$(PYTHON_WEBPY_VERSION).tar.gz -PYTHON_WEBPY_SITE = https://files.pythonhosted.org/packages/e3/23/ed84b174add09153329c6357984c8433e2f350de91c3859fa48c3cdbf7dc +PYTHON_WEBPY_SITE = https://files.pythonhosted.org/packages/cd/6e/338a060bb5b52ee8229bdada422eaa5f71b13f8d33467f37f870ed2cae4b PYTHON_WEBPY_SETUP_TYPE = setuptools PYTHON_WEBPY_LICENSE = Public Domain -PYTHON_WEBPY_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/package/python-websocket-client/Config.in b/package/python-websocket-client/Config.in index 519e506615..f915905400 100644 --- a/package/python-websocket-client/Config.in +++ b/package/python-websocket-client/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT bool "python-websocket-client" - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON3_SSL # runtime help WebSocket client for python. hybi13 is supported. diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash index 1e745dc1d5..08a6c260ca 100644 --- a/package/python-websocket-client/python-websocket-client.hash +++ b/package/python-websocket-client/python-websocket-client.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websocket-client/json -md5 8fc86b13dc97dc032855c6257f9168df websocket_client-0.58.0.tar.gz -sha256 63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f websocket_client-0.58.0.tar.gz +md5 1e8b6daae0cad86f8cd9210b24bdf95b websocket-client-1.4.1.tar.gz +sha256 f9611eb65c8241a67fb373bef040b3cf8ad377a9f6546a12b620b6511e8ea9ef websocket-client-1.4.1.tar.gz # Locally computed sha256 checksums -sha256 7c6699c75f87b52bdc542db26d6b1b92892577cda46e20eceb79e2790a1c291b LICENSE +sha256 638eb70dcc4af2e6d8388de0636ced399f7c24716e11b8573a6b06f879e80691 LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk index d2873e3601..7e21187e22 100644 --- a/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_WEBSOCKET_CLIENT_VERSION = 0.58.0 -PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz -PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/4a/df/112c278ba1ead96786d24d973429ce1e1a2c86b9843183d9f8ef8c6330d7 +PYTHON_WEBSOCKET_CLIENT_VERSION = 1.4.1 +PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket-client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/99/11/01fe7ebcb7545a1990c53c11f31230afe1388b0b34256e3fd20e49482245 PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools -PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+ +PYTHON_WEBSOCKET_CLIENT_LICENSE = Apache-2.0 PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index cec1d1599c..62c7cb8467 100644 --- a/package/python-websockets/python-websockets.hash +++ b/package/python-websockets/python-websockets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websockets/json -md5 ebb9e4930bf2c35cd3723be0dfa83d89 websockets-10.0.tar.gz -sha256 c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002 websockets-10.0.tar.gz +md5 d6b1a2cb5e194ae43f849c125b71c8db websockets-10.4.tar.gz +sha256 eef610b23933c54d5d921c92578ae5f89813438fded840c2e9809d378dc765d3 websockets-10.4.tar.gz # Locally computed sha256 checksums sha256 daeca11bf3608da35e546ea0c32be18958a8be1441fa3de9cbd20e4c8bc718e6 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index 9f4c5f1da7..7f721220a5 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 10.0 +PYTHON_WEBSOCKETS_VERSION = 10.4 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/1c/f4/61aee1eb4baadf8477fb7f3bc6b04a50fe683ef8ad2f60282806821e4b3b +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/85/dc/549a807a53c13fd4a8dac286f117a7a71260defea9ec0c05d6027f2ae273 PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 73fa6b5630..13b95bc448 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/Werkzeug/json -md5 5835c8738b8081c53367cbcc5db8784c Werkzeug-2.1.2.tar.gz -sha256 1ce08e8093ed67d638d63879fd1ba3735817f7a80de3674d293f5984f25fb6e6 Werkzeug-2.1.2.tar.gz +md5 9d7e50c5bb3a9fc12823b5faf374b90e Werkzeug-2.2.2.tar.gz +sha256 7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f Werkzeug-2.2.2.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index 9b32fdf097..3ebae3c165 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.1.2 +PYTHON_WERKZEUG_VERSION = 2.2.2 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/10/cf/97eb1a3847c01ae53e8376bc21145555ac95279523a935963dc8ff96c50b +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/f8/c1/1c8e539f040acd80f844c69a5ef8e2fccdf8b442dabb969e497b55d544e1 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst diff --git a/package/python-wrapt/python-wrapt.hash b/package/python-wrapt/python-wrapt.hash index 63dae991eb..cb62e19aa7 100644 --- a/package/python-wrapt/python-wrapt.hash +++ b/package/python-wrapt/python-wrapt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wrapt/json -md5 6d56ed0de4336462a73350341462f45e wrapt-1.12.1.tar.gz -sha256 b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7 wrapt-1.12.1.tar.gz +md5 6e7340264f038efdefcba707250c91c2 wrapt-1.14.1.tar.gz +sha256 380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d wrapt-1.14.1.tar.gz # Locally computed sha256 checksums -sha256 e37c13f84fb3c9a54161b0fcf75f4d302fb86ce42cd6106147bda79e4197d9f2 LICENSE +sha256 77d2a9159cffe12473f539a71a3e741f35117e61bfd005ebd60c3a1778e2c1f1 LICENSE diff --git a/package/python-wrapt/python-wrapt.mk b/package/python-wrapt/python-wrapt.mk index 32d8a24c14..406f6c3aa1 100644 --- a/package/python-wrapt/python-wrapt.mk +++ b/package/python-wrapt/python-wrapt.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WRAPT_VERSION = 1.12.1 +PYTHON_WRAPT_VERSION = 1.14.1 PYTHON_WRAPT_SOURCE = wrapt-$(PYTHON_WRAPT_VERSION).tar.gz -PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/82/f7/e43cefbe88c5fd371f4cf0cf5eb3feccd07515af9fd6cf7dbf1d1793a797 -PYTHON_WRAPT_SETUP_TYPE = distutils +PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/11/eb/e06e77394d6cf09977d92bff310cb0392930c08a338f99af6066a5a98f92 +PYTHON_WRAPT_SETUP_TYPE = setuptools PYTHON_WRAPT_LICENSE = BSD-2-Clause PYTHON_WRAPT_LICENSE_FILES = LICENSE diff --git a/package/python-wtforms/python-wtforms.hash b/package/python-wtforms/python-wtforms.hash index ed9bfd1a23..12b980de02 100644 --- a/package/python-wtforms/python-wtforms.hash +++ b/package/python-wtforms/python-wtforms.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/wtforms/json -md5 2b6ea167a71c6becf20f0934417fd06c WTForms-2.3.3.tar.gz -sha256 81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c WTForms-2.3.3.tar.gz +md5 509a985769df13938c8307b55a614773 WTForms-3.0.1.tar.gz +sha256 6b351bbb12dd58af57ffef05bc78425d08d1914e0fd68ee14143b7ade023c5bc WTForms-3.0.1.tar.gz # Locally computed sha256 checksums sha256 cf40d60ff34f6b2b68a53d220f8b66567b5ac8dd1119b37b62fd15e9518fe59b LICENSE.rst sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-wtforms/python-wtforms.mk b/package/python-wtforms/python-wtforms.mk index 23280a6fe5..65b5748b6b 100644 --- a/package/python-wtforms/python-wtforms.mk +++ b/package/python-wtforms/python-wtforms.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_WTFORMS_VERSION = 2.3.3 +PYTHON_WTFORMS_VERSION = 3.0.1 PYTHON_WTFORMS_SOURCE = WTForms-$(PYTHON_WTFORMS_VERSION).tar.gz -PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/dd/3f/f25d26b1c66896e2876124a12cd8be8f606abf4e1890a20f3ca04e4a1555 +PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/9a/7d/d4aa68f5bfcb91dd61a7faf0e862512ae7b3d531c41f24c217910aec0559 PYTHON_WTFORMS_SETUP_TYPE = setuptools PYTHON_WTFORMS_LICENSE = BSD-3-Clause PYTHON_WTFORMS_LICENSE_FILES = LICENSE.rst docs/license.rst +PYTHON_WTFORMS_DEPENDENCIES = host-python-babel $(eval $(python-package)) diff --git a/package/python-xlib/python-xlib.hash b/package/python-xlib/python-xlib.hash index 120541f998..066f450416 100644 --- a/package/python-xlib/python-xlib.hash +++ b/package/python-xlib/python-xlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-xlib/json -md5 3a87f81bff4cb4f8a52881097ba51a49 python-xlib-0.27.tar.bz2 -sha256 a90667c70905c6ef0754c8a09fa61acbc1e1b7ddb946d527831800d7cbfe9348 python-xlib-0.27.tar.bz2 +md5 ba31623fb64a1e5a0b1ae1f6495c3bf6 python-xlib-0.32.tar.gz +sha256 20e1382f8a98d8ed0facfa45415c46fd0c8eeb6f9996e58c22d3382a4ed6e37b python-xlib-0.32.tar.gz # Locally computed sha256 checksums sha256 06eb1c441443cf15ac84f309003f4c43c62246939d37c75fc3e056c2d34cd300 LICENSE diff --git a/package/python-xlib/python-xlib.mk b/package/python-xlib/python-xlib.mk index ae8ca1653b..32f16e5d66 100644 --- a/package/python-xlib/python-xlib.mk +++ b/package/python-xlib/python-xlib.mk @@ -4,9 +4,8 @@ # ################################################################################ -PYTHON_XLIB_VERSION = 0.27 -PYTHON_XLIB_SOURCE = python-xlib-$(PYTHON_XLIB_VERSION).tar.bz2 -PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/e8/fa/a61ef33df117de4c57d11b4ba0b624f5352f21aa2e1eda404860155e8855 +PYTHON_XLIB_VERSION = 0.32 +PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/4d/cf/a29ecb43a5c84a65ffd726e3b28806f56b3bc5e796ddb533ff52af107dcf PYTHON_XLIB_SETUP_TYPE = setuptools PYTHON_XLIB_LICENSE = LGPL-2.1+ PYTHON_XLIB_LICENSE_FILES = LICENSE diff --git a/package/python-xlsxwriter/python-xlsxwriter.hash b/package/python-xlsxwriter/python-xlsxwriter.hash index 7c9698067b..4363799079 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.hash +++ b/package/python-xlsxwriter/python-xlsxwriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/xlsxwriter/json -md5 5f759dccf222e8f2a9924e90c4afaf84 XlsxWriter-3.0.1.tar.gz -sha256 3f39bf581c55f3ad1438bc170d7f4c4649cee8b6b7a80d21f79508118eeea52a XlsxWriter-3.0.1.tar.gz +md5 b08fcc4753c14aa64b9d99219475d91e XlsxWriter-3.0.3.tar.gz +sha256 e89f4a1d2fa2c9ea15cde77de95cd3fd8b0345d0efb3964623f395c8c4988b7f XlsxWriter-3.0.3.tar.gz # Locally computed sha256 checksums -sha256 8fbb9b28ef0afac1c7d999102fd2634f347448d069c8c821976f3dbd2b3f812c LICENSE.txt +sha256 6287be39bd007c8729f5c3cf8dfda9b462af725c1d06e3bf0e17b1532196a08f LICENSE.txt diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index 4c8a512086..4055e52622 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 3.0.1 +PYTHON_XLSXWRITER_VERSION = 3.0.3 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/5d/36/e943d07af9d26cc2f11861955dbf0031e891f77f3d55f70217fd6a0f4d9f +PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/53/04/91ff43803c3e88c32aa272fdbda5859fc3c3b50b0de3a1e439cc57455330 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt diff --git a/package/python-yatl/python-yatl.hash b/package/python-yatl/python-yatl.hash index 8ce192bf95..61391f6370 100644 --- a/package/python-yatl/python-yatl.hash +++ b/package/python-yatl/python-yatl.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/yatl/json -md5 551136eba4c5551c01b051341b190641 yatl-20211217.1.tar.gz -sha256 d22bf7abe40d9bdd16bd15824d2df65e65e405df6ecb8601fdc7c233bf6b3004 yatl-20211217.1.tar.gz +md5 f02b367e1c56af94eafd5bd1019c03be yatl-20220907.1.tar.gz +sha256 67d43ad79e1f58d8552718018470856a2ad210bdfeec42e978b28b1b21560d00 yatl-20220907.1.tar.gz diff --git a/package/python-yatl/python-yatl.mk b/package/python-yatl/python-yatl.mk index 12a8039891..0c33971b89 100644 --- a/package/python-yatl/python-yatl.mk +++ b/package/python-yatl/python-yatl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YATL_VERSION = 20211217.1 +PYTHON_YATL_VERSION = 20220907.1 PYTHON_YATL_SOURCE = yatl-$(PYTHON_YATL_VERSION).tar.gz -PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/03/05/0be8164e8151fd8c96caeb2560f955dc2dc1a969f0868f48c046cd863fe6 +PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/09/68/0c9d0a1192fdad5f3d38db096106c5adabb9b26c9ae107897997f56d1788 PYTHON_YATL_SETUP_TYPE = setuptools PYTHON_YATL_LICENSE = BSD-3-Clause diff --git a/package/python-zeroconf/Config.in b/package/python-zeroconf/Config.in index 1570674f59..69ea81d93a 100644 --- a/package/python-zeroconf/Config.in +++ b/package/python-zeroconf/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_ZEROCONF bool "python-zeroconf" + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_IFADDR # runtime help Pure Python Multicast DNS Service Discovery Library diff --git a/package/python-zeroconf/python-zeroconf.hash b/package/python-zeroconf/python-zeroconf.hash index be91b59048..13e1d16cde 100644 --- a/package/python-zeroconf/python-zeroconf.hash +++ b/package/python-zeroconf/python-zeroconf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zeroconf/json -md5 98e683a247fe9915a5d4845c38b37ff3 zeroconf-0.29.0.tar.gz -sha256 7aefbb658b452b1fd7e51124364f938c6f5e42d6ea893fa2557bea8c06c540af zeroconf-0.29.0.tar.gz +md5 f85fb9d239397b53836495fd49b85e5f zeroconf-0.39.4.tar.gz +sha256 701e4d697f89fe952aa9c13a512ed6bf472dcf4f0a6d275e71085604b3882295 zeroconf-0.39.4.tar.gz # Locally computed sha256 checksums -sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING +sha256 35e4136e96aace60757a8b939741959d8627c4bc1fce62af99df325395276c56 COPYING diff --git a/package/python-zeroconf/python-zeroconf.mk b/package/python-zeroconf/python-zeroconf.mk index 67bfa72e03..d939b2e5ae 100644 --- a/package/python-zeroconf/python-zeroconf.mk +++ b/package/python-zeroconf/python-zeroconf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZEROCONF_VERSION = 0.29.0 +PYTHON_ZEROCONF_VERSION = 0.39.4 PYTHON_ZEROCONF_SOURCE = zeroconf-$(PYTHON_ZEROCONF_VERSION).tar.gz -PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/ca/77/eb6137997adc60811c6c46b28b00abac5c16daf14383f61d8a0180326b38 +PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/f5/4f/c47cea73d7ae5467b63de3999d7207fd5b14d70cb2f35ce81c4ab7d7a52e PYTHON_ZEROCONF_SETUP_TYPE = setuptools PYTHON_ZEROCONF_LICENSE = LGPL-2.1+ PYTHON_ZEROCONF_LICENSE_FILES = COPYING diff --git a/package/python-zlmdb/python-zlmdb.hash b/package/python-zlmdb/python-zlmdb.hash index d98dc7d12a..1ae5d72efa 100644 --- a/package/python-zlmdb/python-zlmdb.hash +++ b/package/python-zlmdb/python-zlmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zlmdb/json -md5 d730a394b74108933a65c9fbe76aba36 zlmdb-22.3.1.tar.gz -sha256 0d416a47b1ee627186af8e5c99e5246f6b277df44ba5c6bb67e947eabf948e5a zlmdb-22.3.1.tar.gz +md5 1e217f3228cb4c2303f06461b79e593e zlmdb-22.6.1.tar.gz +sha256 aff353121c2eed3c18e53c82358c41932a21bf882995ee3a79c6eb1ae4c95397 zlmdb-22.6.1.tar.gz # Locally computed sha256 checksums sha256 8a139bf325dcca11e0e476ce537bf791a6cfbeed8899a9b6ddc55238e180d230 LICENSE diff --git a/package/python-zlmdb/python-zlmdb.mk b/package/python-zlmdb/python-zlmdb.mk index a040622d9d..d20ac9e016 100644 --- a/package/python-zlmdb/python-zlmdb.mk +++ b/package/python-zlmdb/python-zlmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZLMDB_VERSION = 22.3.1 +PYTHON_ZLMDB_VERSION = 22.6.1 PYTHON_ZLMDB_SOURCE = zlmdb-$(PYTHON_ZLMDB_VERSION).tar.gz -PYTHON_ZLMDB_SITE = https://files.pythonhosted.org/packages/71/87/bb3cebd5312e670e33551317c7fc5e4b6a4a9af39075a71cd541b32cc0bf +PYTHON_ZLMDB_SITE = https://files.pythonhosted.org/packages/97/15/992e61a18cb64b573814c9d92676b22d522f2cc2ea79ff78b834bd392b80 PYTHON_ZLMDB_SETUP_TYPE = setuptools PYTHON_ZLMDB_LICENSE = MIT PYTHON_ZLMDB_LICENSE_FILES = LICENSE diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index f7fa673e24..6bab9d2c1c 100644 --- a/package/python-zope-interface/python-zope-interface.hash +++ b/package/python-zope-interface/python-zope-interface.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zope-interface/json -md5 c58b31da83449631efb499de13c68c6a zope.interface-5.4.0.tar.gz -sha256 5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e zope.interface-5.4.0.tar.gz +md5 644f7574b81710a21b1b738d448811e4 zope.interface-5.5.1.tar.gz +sha256 6d678475fdeb11394dc9aaa5c564213a1567cc663082e0ee85d52f78d1fbaab2 zope.interface-5.5.1.tar.gz # Locally computed sha256 checksums sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-zope-interface/python-zope-interface.mk b/package/python-zope-interface/python-zope-interface.mk index beacfb4f5e..4f201e5cbf 100644 --- a/package/python-zope-interface/python-zope-interface.mk +++ b/package/python-zope-interface/python-zope-interface.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPE_INTERFACE_VERSION = 5.4.0 +PYTHON_ZOPE_INTERFACE_VERSION = 5.5.1 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/ae/58/e0877f58daa69126a5fb325d6df92b20b77431cd281e189c5ec42b722f58 +PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/c5/ec/3e116b5c3c54f1fb7296a686c110c14d1242bbea17286c487892075d9858 PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index d3b5368903..92aa7274ba 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 +From 51ed7f93cc0333efa8fccd9b88db713c48993df9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77f91e72b1..0c809f3d8a 100644 +index 8fbcd7ac17..2957c8e5a1 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1600,6 +1600,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -2078,6 +2078,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 77f91e72b1..0c809f3d8a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1627,6 +1628,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -2105,6 +2106,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -35,10 +35,10 @@ index 77f91e72b1..0c809f3d8a 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index d60f05251a..1ee5a09588 100644 +index ab5e1de6fa..0cf89ed641 100644 --- a/configure.ac +++ b/configure.ac -@@ -1110,6 +1110,12 @@ fi +@@ -1441,6 +1441,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index d60f05251a..1ee5a09588 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.25.1 +2.34.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 411b8dae4e..5389cb5d15 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 +From b180ab302e2a82be239af334382436628b81381e Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,18 +10,18 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1ee5a09588..c2445edc88 100644 +index 0cf89ed641..830885fcb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -4230,7 +4230,7 @@ fi +@@ -5086,7 +5086,7 @@ fi])) + dnl if ac_cv_func_getaddrinfo + ]) - AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) - --if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes -+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes +-if test "$ac_cv_func_getaddrinfo" = no -o "$ac_cv_buggy_getaddrinfo" = yes ++if test "$ac_cv_func_getaddrinfo" = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes then - if test $ipv6 = yes - then + AS_VAR_IF([ipv6], [yes], [ + AC_MSG_ERROR([m4_normalize([ -- -2.25.1 +2.34.1 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 7ac0f39d06..5b3911374e 100644 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 +From 8e02cebdac536dfb6748da2c50656a26f70d9da7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0c809f3d8a..7c3dde8dd4 100644 +index 2957c8e5a1..c1cfb96767 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -218,6 +218,8 @@ FILEMODE= 644 +@@ -239,6 +239,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,18 +56,18 @@ index 0c809f3d8a..7c3dde8dd4 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -628,6 +630,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -739,6 +741,7 @@ sharedmods: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt @LIBMPDEC_INTERNAL@ @LIBEXPA + *) quiet="";; \ esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1748,7 +1751,8 @@ libainstall: @DEF_MAKE_RULE@ python-config + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build +@@ -2228,7 +2231,8 @@ libainstall: all python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) - sharedinstall: sharedmods + sharedinstall: all - $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ + $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ @@ -75,12 +75,12 @@ index 0c809f3d8a..7c3dde8dd4 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index c2445edc88..73d66167de 100644 +index 830885fcb3..5a6a1fe608 100644 --- a/configure.ac +++ b/configure.ac -@@ -3091,6 +3091,8 @@ LIBS="$withval $LIBS" - - PKG_PROG_PKG_CONFIG +@@ -3562,6 +3562,8 @@ LIBS="$withval $LIBS" + ], + [AC_MSG_RESULT(no)]) +AC_SUBST(DISABLED_EXTENSIONS) + @@ -88,11 +88,11 @@ index c2445edc88..73d66167de 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index 770866bca7..b6c829b3a5 100644 +index 15d0d4576a..e496ee34c2 100644 --- a/setup.py +++ b/setup.py -@@ -58,7 +58,10 @@ with warnings.catch_warnings(): - TEST_EXTENSIONS = (sysconfig.get_config_var('TEST_MODULES') == 'yes') +@@ -56,7 +56,10 @@ + # This global variable is used to hold the list of modules to be disabled. -DISABLED_MODULE_LIST = [] @@ -104,5 +104,5 @@ index 770866bca7..b6c829b3a5 100644 # --list-module-names option used by Tools/scripts/generate_module_names.py LIST_MODULE_NAMES = False -- -2.25.1 +2.34.1 diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 0311348405..9a55d2582d 100644 --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 +From 132b9dca3bb4d4682f7e318648ce11e1abb31b62 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -23,10 +23,10 @@ Refresh for 3.10.0 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index 1a9bd12..3cf7d67 100644 +index f287b34998..298234d6a1 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py -@@ -234,7 +234,10 @@ class build_ext(Command): +@@ -234,7 +234,10 @@ def finalize_options(self): if (sysconfig.get_config_var('Py_ENABLE_SHARED')): if not sysconfig.python_build: # building third party extensions @@ -39,10 +39,10 @@ index 1a9bd12..3cf7d67 100644 # building python standard extensions self.library_dirs.append('.') diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 95b48f6..9fb1956 100644 +index ebe3711827..6328ec41af 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -123,10 +123,17 @@ _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', +@@ -168,10 +168,17 @@ def joinuser(*args): _PY_VERSION = sys.version.split()[0] _PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}' _PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}' @@ -65,5 +65,5 @@ index 95b48f6..9fb1956 100644 _USER_BASE = None -- -2.30.2 +2.34.1 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index 3e224995a5..78b3ae596d 100644 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 +From 5d13e384b30a2c0b1c7b65718590b7fb0c3ba55e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 66d372a..e632b6f 100644 +index e496ee34c2..1904898165 100644 --- a/setup.py +++ b/setup.py -@@ -1147,12 +1147,9 @@ class PyBuildExt(build_ext): +@@ -1107,12 +1107,9 @@ def detect_readline_curses(self): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) @@ -23,9 +23,9 @@ index 66d372a..e632b6f 100644 readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, libraries=readline_libs)) else: + self.missing.append('readline') -- -2.25.1 +2.34.1 diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch index 48d8cc790e..749e295df1 100644 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 +From ad463b5d58ae79f69b011fb048861bd874d34369 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index ec3ba60607..e27620035c 100644 +index 1904898165..32294546b6 100644 --- a/setup.py +++ b/setup.py -@@ -830,10 +830,10 @@ class PyBuildExt(build_ext): +@@ -852,10 +852,10 @@ def configure_compiler(self): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -33,5 +33,5 @@ index ec3ba60607..e27620035c 100644 def init_inc_lib_dirs(self): -- -2.25.1 +2.34.1 diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch index 32e2261a05..a473896127 100644 --- a/package/python3/0007-Abort-on-failed-module-build.patch +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 +From 60b1664a7acebadb1a3d6df871145147f33b5afe Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,10 +14,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index e27620035c..d3f0e663f2 100644 +index 32294546b6..0e04944ce0 100644 --- a/setup.py +++ b/setup.py -@@ -561,6 +561,7 @@ class PyBuildExt(build_ext): +@@ -579,6 +579,7 @@ def print_three_column(lst): print("Failed to build these modules:") print_three_column(failed) print() @@ -26,5 +26,5 @@ index e27620035c..d3f0e663f2 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.25.1 +2.34.1 diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch index df31cd6220..7722a04f38 100644 --- a/package/python3/0008-Serial-ioctl-workaround.patch +++ b/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 +From 90f3075b629d90d942da1d22ef7563f7149f4f6c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -15,7 +15,7 @@ Signed-off-by: Baruch Siach 1 file changed, 2 insertions(+) diff --git a/Modules/termios.c b/Modules/termios.c -index 75e5e52320..eefbddfe69 100644 +index 354e5ca18d..c08957c500 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -15,7 +15,9 @@ @@ -29,5 +29,5 @@ index 75e5e52320..eefbddfe69 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.25.1 +2.34.1 diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index 8a77fe3708..eff8fc7694 100644 --- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 +From 2439bd2ed5dbdd7e5fda15adefd0f6f1b047ec1b Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -21,7 +21,7 @@ diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/buil index ccc70e6465..d6d54195c1 100644 --- a/Lib/distutils/command/build_scripts.py +++ b/Lib/distutils/command/build_scripts.py -@@ -91,7 +91,7 @@ class build_scripts(Command): +@@ -91,7 +91,7 @@ def copy_scripts(self): adjust = True post_interp = match.group(1) or b'' @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.25.1 +2.34.1 diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index a1f9ab6cd9..f26ee85b61 100644 --- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 +From 55ef5552e4ee60266e3299f253bec3b13785e585 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.25.1 +2.34.1 diff --git a/package/python3/0011-Add-an-option-to-disable-pydoc.patch b/package/python3/0011-Add-an-option-to-disable-pydoc.patch index a843c8c126..f7bfd437bb 100644 --- a/package/python3/0011-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0011-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From a65e5d3caf8e076d531191164c23c6240461f675 Mon Sep 17 00:00:00 2001 +From 38b7f7949258aeadf8bc45525be91340bb732a2a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -19,10 +19,10 @@ Signed-off-by: Adam Duskett 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index c0d5511..32b3df7 100644 +index c1cfb96767..403380e181 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1391,7 +1391,9 @@ bininstall: altbininstall +@@ -1864,7 +1864,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -32,15 +32,15 @@ index c0d5511..32b3df7 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1442,7 +1444,6 @@ LIBSUBDIRS= asyncio \ +@@ -1915,7 +1917,6 @@ LIBSUBDIRS= asyncio \ lib2to3 lib2to3/fixes lib2to3/pgen2 \ logging \ multiprocessing multiprocessing/dummy \ - pydoc_data \ + re \ site-packages \ sqlite3 \ - tkinter \ -@@ -1530,6 +1531,10 @@ TESTSUBDIRS= ctypes/test \ +@@ -2008,6 +2009,10 @@ TESTSUBDIRS= ctypes/test \ tkinter/test/test_ttk \ unittest/test unittest/test/testmock @@ -49,15 +49,15 @@ index c0d5511..32b3df7 100644 +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c + libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index 083a12d..9079531 100644 +index 5a6a1fe608..f68ea72321 100644 --- a/configure.ac +++ b/configure.ac -@@ -3373,6 +3373,12 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi +@@ -4171,6 +4171,12 @@ AS_VAR_IF([posix_threads], [stub], [ + AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) + ]) +AC_SUBST(PYDOC) + @@ -65,14 +65,14 @@ index 083a12d..9079531 100644 + AS_HELP_STRING([--disable-pydoc], [disable pydoc]), + [ PYDOC="${enableval}" ], [ PYDOC=yes ]) + - # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) + AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index d00d389..d23f148 100644 +index 0e04944ce0..3e55f5b2e0 100644 --- a/setup.py +++ b/setup.py -@@ -2721,6 +2721,12 @@ def main(): +@@ -1593,6 +1593,12 @@ class DummyProcess: # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -85,7 +85,7 @@ index d00d389..d23f148 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2746,8 +2752,7 @@ def main(): +@@ -1617,8 +1623,7 @@ class DummyProcess: # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in @@ -96,5 +96,5 @@ index d00d389..d23f148 100644 # --install-platlib -- -2.30.2 +2.34.1 diff --git a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch index c8f2e528bf..0085d5a63f 100644 --- a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 +From 0e4f0a525ea0a68f6d4c5349c301da2e9b0c8ac9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -14,15 +14,15 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett --- Makefile.pre.in | 17 ++++++++++++----- - configure.ac | 5 +++++ + configure.ac | 6 ++++++ setup.py | 6 +++--- - 3 files changed, 20 insertions(+), 8 deletions(-) + 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 28cf88e..63fa9fb 100644 +index 403380e181..f5d0573067 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1395,7 +1395,9 @@ ifeq (@PYDOC@,yes) +@@ -1868,7 +1868,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -32,15 +32,15 @@ index 28cf88e..63fa9fb 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1441,7 +1443,6 @@ LIBSUBDIRS= asyncio \ +@@ -1914,7 +1916,6 @@ LIBSUBDIRS= asyncio \ idlelib idlelib/Icons \ - importlib importlib/metadata \ + importlib importlib/resources importlib/metadata \ json \ - lib2to3 lib2to3/fixes lib2to3/pgen2 \ logging \ multiprocessing multiprocessing/dummy \ - site-packages \ -@@ -1458,10 +1459,6 @@ LIBSUBDIRS= asyncio \ + re \ +@@ -1934,10 +1935,6 @@ LIBSUBDIRS= asyncio \ TESTSUBDIRS= ctypes/test \ distutils/tests \ idlelib/idle_test \ @@ -48,10 +48,10 @@ index 28cf88e..63fa9fb 100644 - lib2to3/tests/data \ - lib2to3/tests/data/fixers \ - lib2to3/tests/data/fixers/myfixes \ - sqlite3/test \ test test/audiodata \ test/capath test/cjkencodings \ -@@ -1535,6 +1532,14 @@ ifeq (@PYDOC@,yes) + test/data test/decimaltestdata \ +@@ -2013,6 +2010,14 @@ ifeq (@PYDOC@,yes) LIBSUBDIRS += pydoc_data endif @@ -64,9 +64,9 @@ index 28cf88e..63fa9fb 100644 +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c + libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -1637,10 +1642,12 @@ ifeq (@PYC_BUILD@,yes) +@@ -2115,10 +2120,12 @@ ifeq (@PYC_BUILD@,yes) -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -80,26 +80,27 @@ index 28cf88e..63fa9fb 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index 9079531..34c2ba9 100644 +index f68ea72321..d8e10cf2b2 100644 --- a/configure.ac +++ b/configure.ac -@@ -6014,6 +6014,11 @@ else - fi - AC_SUBST(TEST_MODULES) +@@ -7078,6 +7078,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu + # substitute multiline block, must come after last PY_STDLIB_MOD() + AC_SUBST([MODULE_BLOCK]) +AC_SUBST(LIB2TO3) + +AC_ARG_ENABLE(lib2to3, + AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), + [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) - ++ # generate output files AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) + AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) diff --git a/setup.py b/setup.py -index d23f148..663fd44 100644 +index 3e55f5b2e0..c490b0b08f 100644 --- a/setup.py +++ b/setup.py -@@ -2722,11 +2722,11 @@ def main(): +@@ -1594,11 +1594,11 @@ class DummyProcess: import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -115,5 +116,5 @@ index d23f148..663fd44 100644 name = "Python", version = sys.version.split()[0], -- -2.30.2 +2.34.1 diff --git a/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch index 81fa52bb73..795ea3b898 100644 --- a/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 +From ef8c030e01b1be8be582e90c31298a5863094858 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module @@ -10,49 +10,40 @@ Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett --- - Makefile.pre.in | 7 +++++-- + Makefile.pre.in | 5 ++++- configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5847029..5628860 100644 +index f5d0573067..9f4cdf14cf 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1446,7 +1446,6 @@ LIBSUBDIRS= asyncio \ - logging \ +@@ -1920,7 +1920,6 @@ LIBSUBDIRS= asyncio \ multiprocessing multiprocessing/dummy \ + re \ site-packages \ - sqlite3 \ tkinter \ + tomllib \ turtledemo \ - unittest \ -@@ -1459,7 +1458,6 @@ LIBSUBDIRS= asyncio \ - TESTSUBDIRS= ctypes/test \ - distutils/tests \ - idlelib/idle_test \ -- sqlite3/test \ - test test/audiodata \ - test/capath test/cjkencodings \ - test/data test/decimaltestdata \ -@@ -1540,6 +1538,11 @@ TESTSUBDIRS += lib2to3/tests \ +@@ -2018,6 +2017,10 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif +ifeq (@SQLITE3@,yes) +LIBSUBDIRS += sqlite3 -+TESTSUBDIRS += sqlite3/test +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c + libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index 34c2ba9..dfee472 100644 +index d8e10cf2b2..4cc0951ab9 100644 --- a/configure.ac +++ b/configure.ac -@@ -3373,6 +3373,15 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi +@@ -4171,6 +4171,15 @@ AS_VAR_IF([posix_threads], [stub], [ + AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) + ]) +AC_SUBST(SQLITE3) +AC_ARG_ENABLE(sqlite3, @@ -67,5 +58,5 @@ index 34c2ba9..dfee472 100644 AC_ARG_ENABLE(pydoc, -- -2.30.2 +2.34.1 diff --git a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch index db79f5691f..04f7e34435 100644 --- a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 +From bbbfe699d648a5cb191203b16e1786e8cf4ea908 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module @@ -15,18 +15,18 @@ Signed-off-by: Adam Duskett 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5628860..c968113 100644 +index 9f4cdf14cf..4f83911200 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1446,7 +1446,6 @@ LIBSUBDIRS= asyncio \ - logging \ +@@ -1920,7 +1920,6 @@ LIBSUBDIRS= asyncio \ multiprocessing multiprocessing/dummy \ + re \ site-packages \ - tkinter \ + tomllib \ turtledemo \ unittest \ - urllib \ -@@ -1522,8 +1521,6 @@ TESTSUBDIRS= ctypes/test \ +@@ -2001,8 +2000,6 @@ TESTSUBDIRS= ctypes/test \ test/tracedmodules \ test/xmltestdata test/xmltestdata/c14n-20 \ test/ziptestdata \ @@ -35,8 +35,8 @@ index 5628860..c968113 100644 unittest/test unittest/test/testmock ifeq (@PYDOC@,yes) -@@ -1543,6 +1540,13 @@ LIBSUBDIRS += sqlite3 - TESTSUBDIRS += sqlite3/test +@@ -2021,6 +2018,13 @@ ifeq (@SQLITE3@,yes) + LIBSUBDIRS += sqlite3 endif +ifeq (@TK@,yes) @@ -47,13 +47,13 @@ index 5628860..c968113 100644 + + TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c + libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index dfee472..dc76dff 100644 +index 4cc0951ab9..f4ce506801 100644 --- a/configure.ac +++ b/configure.ac -@@ -3382,6 +3382,15 @@ if test "$SQLITE3" = "no" ; then +@@ -4180,6 +4180,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -70,5 +70,5 @@ index dfee472..dc76dff 100644 AC_ARG_ENABLE(pydoc, -- -2.30.2 +2.34.1 diff --git a/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch index 35d92fb7d1..da6f891104 100644 --- a/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From 962deb43f5f340a8472d432ae8e6d61186f9040e Mon Sep 17 00:00:00 2001 +From 03e28cdd46dac1b7e4e9c8bbd2ea44b09e514205 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -10,15 +10,15 @@ Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett --- - Makefile.pre.in | 4 +++- + Makefile.pre.in | 4 +++- configure.ac | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index c968113..f89f155 100644 +index 4f83911200..8e879b35c6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1432,7 +1432,6 @@ LIBSUBDIRS= asyncio \ +@@ -1905,7 +1905,6 @@ LIBSUBDIRS= asyncio \ concurrent concurrent/futures \ csv \ ctypes ctypes/macholib \ @@ -26,7 +26,7 @@ index c968113..f89f155 100644 dbm \ distutils distutils/command \ email email/mime \ -@@ -1546,6 +1545,9 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ +@@ -2024,6 +2023,9 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif @@ -35,12 +35,12 @@ index c968113..f89f155 100644 +endif TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c + libinstall: all $(srcdir)/Modules/xxmodule.c diff --git a/configure.ac b/configure.ac -index dc76dff..4f1cda5 100644 +index f4ce506801..0ae9863cd6 100644 --- a/configure.ac +++ b/configure.ac -@@ -3391,6 +3391,15 @@ if test "$TK" = "no"; then +@@ -4189,6 +4189,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -57,5 +57,5 @@ index dc76dff..4f1cda5 100644 AC_ARG_ENABLE(pydoc, -- -2.30.2 +2.34.1 diff --git a/package/python3/0016-Add-an-option-to-disable-expat.patch b/package/python3/0016-Add-an-option-to-disable-expat.patch index 83c89e1f68..c30740762a 100644 --- a/package/python3/0016-Add-an-option-to-disable-expat.patch +++ b/package/python3/0016-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 +From c9a2ea3edacf57746517600ccc11c254a9fd6c48 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -17,23 +17,22 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett --- Makefile.pre.in | 5 ++++- - configure.ac | 18 +++++++++++++----- - setup.py | 2 +- - 3 files changed, 18 insertions(+), 7 deletions(-) + configure.ac | 20 ++++++++++++++------ + 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f89f155..08c5e8a 100644 +index 8e879b35c6..80d617cf7f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1450,7 +1450,6 @@ LIBSUBDIRS= asyncio \ +@@ -1925,7 +1925,6 @@ LIBSUBDIRS= asyncio \ urllib \ venv venv/scripts venv/scripts/common venv/scripts/posix \ wsgiref \ - $(XMLLIBSUBDIRS) \ xmlrpc \ - zoneinfo - TESTSUBDIRS= ctypes/test \ -@@ -1549,6 +1548,10 @@ ifeq (@CURSES@,yes) + zoneinfo \ + __phello__ +@@ -2027,6 +2026,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -42,13 +41,13 @@ index f89f155..08c5e8a 100644 +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c + libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index 4f1cda5..e99a174 100644 +index 0ae9863cd6..201cad0bfc 100644 --- a/configure.ac +++ b/configure.ac -@@ -3094,13 +3094,21 @@ PKG_PROG_PKG_CONFIG +@@ -3565,15 +3565,23 @@ LIBS="$withval $LIBS" AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -64,7 +63,8 @@ index 4f1cda5..e99a174 100644 -AC_MSG_RESULT($with_system_expat) +AC_MSG_RESULT($with_expat) -+ + +-AS_VAR_IF([with_system_expat], [yes], [ +if test "$with_expat" != "none"; then + EXPAT=yes +else @@ -72,22 +72,11 @@ index 4f1cda5..e99a174 100644 + EXPAT=no +fi +AC_SUBST(EXPAT) - - # Check for use of the system libffi library - AC_MSG_CHECKING(for --with-system-ffi) -diff --git a/setup.py b/setup.py -index 663fd44..e30ed52 100644 ---- a/setup.py -+++ b/setup.py -@@ -1764,7 +1764,7 @@ class PyBuildExt(build_ext): - # - # More information on Expat can be found at www.libexpat.org. - # -- if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"): - expat_inc = [] - define_macros = [] - extra_compile_args = [] ++ ++AS_VAR_IF([with_expat], [system], [ + LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS-""} + LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"} + LIBEXPAT_INTERNAL= -- -2.30.2 +2.34.1 diff --git a/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch index 2afcf4526d..63a07fb514 100644 --- a/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch +++ b/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch @@ -1,4 +1,4 @@ -From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 +From d8ef6a7a9f2b954cf1c1e37fc3c35055b42af0f5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:49:55 +0100 Subject: [PATCH] Add an option to disable CJK codecs @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 9ef0ecd42f..18e6fd70a0 100644 +index 201cad0bfc..ecdd7dbc07 100644 --- a/configure.ac +++ b/configure.ac -@@ -3390,6 +3390,12 @@ if test "$SQLITE3" = "no" ; then +@@ -4188,6 +4188,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -26,5 +26,5 @@ index 9ef0ecd42f..18e6fd70a0 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.34.1 diff --git a/package/python3/0018-Add-an-option-to-disable-NIS.patch b/package/python3/0018-Add-an-option-to-disable-NIS.patch index d8fe3616c0..977955d1cb 100644 --- a/package/python3/0018-Add-an-option-to-disable-NIS.patch +++ b/package/python3/0018-Add-an-option-to-disable-NIS.patch @@ -1,4 +1,4 @@ -From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 +From 09fc9f72ebe60bb65e80732a6bd4f12a84159f6d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:11 +0100 Subject: [PATCH] Add an option to disable NIS @@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 18e6fd70a0..46d2a8131e 100644 +index ecdd7dbc07..1bdde7f69d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3396,6 +3396,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -4194,6 +4194,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) @@ -29,5 +29,5 @@ index 18e6fd70a0..46d2a8131e 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.34.1 diff --git a/package/python3/0019-Add-an-option-to-disable-unicodedata.patch b/package/python3/0019-Add-an-option-to-disable-unicodedata.patch index 3519377b5e..74702b67a5 100644 --- a/package/python3/0019-Add-an-option-to-disable-unicodedata.patch +++ b/package/python3/0019-Add-an-option-to-disable-unicodedata.patch @@ -1,4 +1,4 @@ -From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 +From 4fe7f375a3d171d294caebdd7b7ce49bbc9ad9f3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:27 +0100 Subject: [PATCH] Add an option to disable unicodedata @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 46d2a8131e..5844e3b73f 100644 +index 1bdde7f69d..ba4b0e0c1c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3402,6 +3402,12 @@ AC_ARG_ENABLE(nis, +@@ -4200,6 +4200,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) @@ -26,5 +26,5 @@ index 46d2a8131e..5844e3b73f 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.34.1 diff --git a/package/python3/0020-Add-an-option-to-disable-IDLE.patch b/package/python3/0020-Add-an-option-to-disable-IDLE.patch index f09037f7db..09b5f13cdb 100644 --- a/package/python3/0020-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0020-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 +From 2c9dbd6d49744aa8da8ebf8d0187d6b06f93c2b5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -18,10 +18,10 @@ Signed-off-by: Adam Duskett 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 08c5e8a..461c5e3 100644 +index 80d617cf7f..8d1ba1356c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1389,7 +1389,9 @@ bininstall: altbininstall +@@ -1862,7 +1862,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -31,15 +31,15 @@ index 08c5e8a..461c5e3 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1439,7 +1441,6 @@ LIBSUBDIRS= asyncio \ +@@ -1912,7 +1914,6 @@ LIBSUBDIRS= asyncio \ ensurepip ensurepip/_bundled \ html \ http \ - idlelib idlelib/Icons \ - importlib importlib/metadata \ + importlib importlib/resources importlib/metadata \ json \ logging \ -@@ -1552,6 +1553,10 @@ ifeq (@EXPAT@,yes) +@@ -2030,6 +2031,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -48,13 +48,13 @@ index 08c5e8a..461c5e3 100644 +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c + libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index e99a174..baaa743 100644 +index ba4b0e0c1c..5e6d72f7db 100644 --- a/configure.ac +++ b/configure.ac -@@ -6073,6 +6073,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -7137,6 +7137,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -66,12 +66,12 @@ index e99a174..baaa743 100644 + # generate output files AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) - AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) + AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) diff --git a/setup.py b/setup.py -index e30ed52..4dff249 100644 +index c490b0b08f..4d49a792f7 100644 --- a/setup.py +++ b/setup.py -@@ -2722,11 +2722,14 @@ def main(): +@@ -1594,11 +1594,14 @@ class DummyProcess: import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -88,5 +88,5 @@ index e30ed52..4dff249 100644 name = "Python", version = sys.version.split()[0], -- -2.30.2 +2.34.1 diff --git a/package/python3/0021-Add-an-option-to-disable-decimal.patch b/package/python3/0021-Add-an-option-to-disable-decimal.patch index fd1887d603..d683565f94 100644 --- a/package/python3/0021-Add-an-option-to-disable-decimal.patch +++ b/package/python3/0021-Add-an-option-to-disable-decimal.patch @@ -1,4 +1,4 @@ -From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 +From 7091fdf77f612425c178a75148560f9c3514e8b8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:31 +0100 Subject: [PATCH] Add an option to disable decimal @@ -14,15 +14,14 @@ Signed-off-by: Adam Duskett [james.hilliard1@gmail.com: adapt to python 3.9] Signed-off-by: James Hilliard --- - configure.ac | 17 ++++++++++++----- - setup.py | 2 +- - 2 files changed, 13 insertions(+), 6 deletions(-) + configure.ac | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 7bd4623ccd..e513ef6a20 100644 +index 5e6d72f7db..e6b1f1e9de 100644 --- a/configure.ac +++ b/configure.ac -@@ -3145,13 +3145,20 @@ fi +@@ -3630,14 +3630,21 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library @@ -34,9 +33,8 @@ index 7bd4623ccd..e513ef6a20 100644 + AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), [], - [with_system_libmpdec="no"]) -+ [with_libmpdec="builtin"]) - -AC_MSG_RESULT($with_system_libmpdec) ++ [with_libmpdec="builtin"]) +AC_MSG_RESULT($with_libmpdec) +if test "$with_libmpdec" != "none"; then + MPDEC=yes @@ -46,21 +44,11 @@ index 7bd4623ccd..e513ef6a20 100644 +fi +AC_SUBST(MPDEC) - # Check whether _decimal should use a coroutine-local or thread-local context - AC_MSG_CHECKING(for --with-decimal-contextvar) -diff --git a/setup.py b/setup.py -index c4ee989ba3..3d0c74bb7f 100644 ---- a/setup.py -+++ b/setup.py -@@ -2321,7 +2321,7 @@ class PyBuildExt(build_ext): - # Stefan Krah's _decimal module - extra_compile_args = [] - undef_macros = [] -- if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-libmpdec=system' in sysconfig.get_config_var("CONFIG_ARGS"): - include_dirs = [] - libraries = ['mpdec'] - sources = ['_decimal/_decimal.c'] +-AS_VAR_IF([with_system_libmpdec], [yes], [ ++AS_VAR_IF([with_libmpdec], [system], [ + LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""} + LIBMPDEC_LDFLAGS=${LIBMPDEC_LDFLAGS-"-lmpdec"} + LIBMPDEC_INTERNAL= -- -2.25.1 +2.34.1 diff --git a/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch index 0459b5a14d..56713a7f8f 100644 --- a/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -1,4 +1,4 @@ -From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 +From d48d9da534cec7891ae444b4ab94a76ac67f5daa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:58 +0100 Subject: [PATCH] Add an option to disable the ossaudiodev module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index e513ef6a20..c07505e89e 100644 +index e6b1f1e9de..db33d567ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -3175,6 +3175,12 @@ fi +@@ -3678,6 +3678,12 @@ fi AC_MSG_RESULT($with_decimal_contextvar) @@ -22,9 +22,9 @@ index e513ef6a20..c07505e89e 100644 + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" + fi]) + - # Check for support for loadable sqlite extensions - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) - AC_ARG_ENABLE(loadable-sqlite-extensions, + # Check for libmpdec machine flavor + AC_MSG_CHECKING(for decimal libmpdec machine) + AS_CASE([$ac_sys_system], -- -2.25.1 +2.34.1 diff --git a/package/python3/0023-Add-an-option-to-disable-openssl-support.patch b/package/python3/0023-Add-an-option-to-disable-openssl-support.patch index 4801a27300..d4c9fd43be 100644 --- a/package/python3/0023-Add-an-option-to-disable-openssl-support.patch +++ b/package/python3/0023-Add-an-option-to-disable-openssl-support.patch @@ -1,4 +1,4 @@ -From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 +From 25c900e81a2fc0bbe35e7c94e2e5028cfbf6582a Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Feb 2017 17:55:59 -0800 Subject: [PATCH] Add an option to disable openssl support. @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 08c148c..a81a24c 100644 +index db33d567ad..42fe6c8f5a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3421,6 +3421,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -4219,6 +4219,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index 08c148c..a81a24c 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.30.2 +2.34.1 diff --git a/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch index adb04d69ea..9250007dae 100644 --- a/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch +++ b/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch @@ -1,4 +1,4 @@ -From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 +From 9082468ca620db77b670ccf568a96bbabb865f80 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:29:05 +0100 Subject: [PATCH] Add an option to disable the readline module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index a81a24c..41a21ff 100644 +index 42fe6c8f5a..19875d7d30 100644 --- a/configure.ac +++ b/configure.ac -@@ -3427,6 +3427,12 @@ AC_ARG_ENABLE(openssl, +@@ -4225,6 +4225,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index a81a24c..41a21ff 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.30.2 +2.34.1 diff --git a/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index d466bc3a76..70a0d6cd15 100644 --- a/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -1,4 +1,4 @@ -From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 +From 988a335cb34b5fc25ea345ba04ff5ddffe2e946c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:31:11 +0100 Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index 41a21ff..fa81bc7 100644 +index 19875d7d30..ca6c16491a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3433,6 +3433,24 @@ AC_ARG_ENABLE(readline, +@@ -4231,6 +4231,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index 41a21ff..fa81bc7 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.30.2 +2.34.1 diff --git a/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch index 814a9d42e5..b6bfb010a0 100644 --- a/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 +From 755fb526a62df2a73560f42184db8aadb6899bb0 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -27,7 +27,7 @@ Signed-off-by: Matthew Weber 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in -index a1bc3cd..164d2d3 100644 +index a1bc3cd5f7..164d2d3603 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") @@ -49,5 +49,5 @@ index a1bc3cd..164d2d3 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.30.2 +2.34.1 diff --git a/package/python3/0028-Add-an-option-to-disable-uuid-module.patch b/package/python3/0027-Add-an-option-to-disable-uuid-module.patch similarity index 81% rename from package/python3/0028-Add-an-option-to-disable-uuid-module.patch rename to package/python3/0027-Add-an-option-to-disable-uuid-module.patch index fc4b64dc64..a9501ec189 100644 --- a/package/python3/0028-Add-an-option-to-disable-uuid-module.patch +++ b/package/python3/0027-Add-an-option-to-disable-uuid-module.patch @@ -1,4 +1,4 @@ -From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 +From 58027d25c3cabcf654cb0b31a61d7cbd53dc68c0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 10:54:56 +0200 Subject: [PATCH] Add an option to disable uuid module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index fa81bc7..4e733f6 100644 +index ca6c16491a..ed03b27fb1 100644 --- a/configure.ac +++ b/configure.ac -@@ -3469,6 +3469,15 @@ if test "$CURSES" = "no"; then +@@ -4267,6 +4267,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index fa81bc7..4e733f6 100644 AC_ARG_ENABLE(pydoc, -- -2.30.2 +2.34.1 diff --git a/package/python3/0027-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0027-Fix-cross-compiling-the-uuid-module.patch deleted file mode 100644 index d19aedb6c1..0000000000 --- a/package/python3/0027-Fix-cross-compiling-the-uuid-module.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Fri, 20 Jul 2018 10:17:39 -0400 -Subject: [PATCH] Fix cross compiling the uuid module - -Python 3.7 has a new _uuid module, however, the include directory -search path for uuid.h is hardcoded to /usr/include/uuid, which should -not be used when cross-compiling. - -To fix this, use the same solution as the one used by the NIS -detection: append "uuid" to each of the include directories in -"inc_dirs", instead of hardcoding /usr/include/uuid. - -Signed-off-by: Adam Duskett -[Thomas: drop STAGING_DIR based solution, use a solution similar to -the one used for the NIS detection.] -Signed-off-by: Thomas Petazzoni ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3d0c74bb7f..c7be85f352 100644 ---- a/setup.py -+++ b/setup.py -@@ -1866,10 +1866,10 @@ class PyBuildExt(build_ext): - - def detect_uuid(self): - # Build the _uuid module if possible -- uuid_h = sysconfig.get_config_var("HAVE_UUID_H") -- uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H") -- if uuid_h or uuid_uuid_h: -- if sysconfig.get_config_var("HAVE_LIBUUID"): -+ uuid_h = find_file("uuid.h", self.inc_dirs, -+ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) -+ if uuid_h is not None: -+ if self.compiler.find_library_file(self.lib_dirs, 'uuid'): - uuid_libs = ["uuid"] - else: - uuid_libs = [] --- -2.25.1 - diff --git a/package/python3/0028-fix-building-on-older-distributions.patch b/package/python3/0028-fix-building-on-older-distributions.patch new file mode 100644 index 0000000000..4541b31c5f --- /dev/null +++ b/package/python3/0028-fix-building-on-older-distributions.patch @@ -0,0 +1,47 @@ +From e52e2c5e3df4bc3d2ff07ecb3b8e2a9099ea1631 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 16 Aug 2018 14:52:37 -0700 +Subject: [PATCH] fix building on older distributions + +Python > 3.6.3 calls os.replace in the update_file.py script, during the +regen-importlib phase of the build process. + +According to Doc/whatsnew/3.3.rst line 1631, os.replace acts in the same +way as os.rename, however, it is now cross-platform compatible for Windows. + +Because BuildRoot is guaranteed only to be built in POSIX environment, it is +safe to change os.replace back to os.rename. + +This change fixes building on older systems such as CentOS7, that only come +with python 2. + +Signed-off-by: Adam Duskett +--- + Tools/scripts/update_file.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py +index b4182c1d0c..ab443cb1a6 100644 +--- a/Tools/scripts/update_file.py ++++ b/Tools/scripts/update_file.py +@@ -53,7 +53,7 @@ def update_file_with_tmpfile(filename, tmpfile, *, create=False): + if not create: + raise # re-raise + outcome = 'created' +- os.replace(tmpfile, filename) ++ os.rename(tmpfile, filename) + else: + with targetfile: + old_contents = targetfile.read() +@@ -62,7 +62,7 @@ def update_file_with_tmpfile(filename, tmpfile, *, create=False): + # Now compare! + if old_contents != new_contents: + outcome = 'updated' +- os.replace(tmpfile, filename) ++ os.rename(tmpfile, filename) + else: + outcome = 'same' + os.unlink(tmpfile) +-- +2.34.1 + diff --git a/package/python3/0030-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 91% rename from package/python3/0030-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index eff010fa22..5253076d90 100644 --- a/package/python3/0030-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From d009b0142f77881dd75ff760fec728dbc8581a03 Mon Sep 17 00:00:00 2001 +From 07b950aadd570b9f96a1f128505a959b32f40962 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -30,10 +30,10 @@ Signed-off-by: Peter Korsgaard 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 913051c276..aba03f3779 100644 +index ed03b27fb1..841fd6732c 100644 --- a/configure.ac +++ b/configure.ac -@@ -876,7 +876,11 @@ AC_MSG_CHECKING([for multiarch]) +@@ -1086,7 +1086,11 @@ AC_MSG_CHECKING([for multiarch]) AS_CASE([$ac_sys_system], [Darwin*], [MULTIARCH=""], [FreeBSD*], [MULTIARCH=""], @@ -47,5 +47,5 @@ index 913051c276..aba03f3779 100644 AC_SUBST([MULTIARCH]) AC_MSG_RESULT([$MULTIARCH]) -- -2.20.1 +2.34.1 diff --git a/package/python3/0029-fix-building-on-older-distributions.patch b/package/python3/0029-fix-building-on-older-distributions.patch deleted file mode 100644 index fb59e593f4..0000000000 --- a/package/python3/0029-fix-building-on-older-distributions.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 16 Aug 2018 14:52:37 -0700 -Subject: [PATCH] fix building on older distributions - -Python > 3.6.3 calls os.replace in the update_file.py script, during the -regen-importlib phase of the build process. - -According to Doc/whatsnew/3.3.rst line 1631, os.replace acts in the same -way as os.rename, however, it is now cross-platform compatible for Windows. - -Because BuildRoot is guaranteed only to be built in POSIX environment, it is -safe to change os.replace back to os.rename. - -This change fixes building on older systems such as CentOS7, that only come -with python 2. - -Signed-off-by: Adam Duskett ---- - Tools/scripts/update_file.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py -index 224585c69b..ef458c0c63 100644 ---- a/Tools/scripts/update_file.py -+++ b/Tools/scripts/update_file.py -@@ -16,7 +16,7 @@ def main(old_path, new_path): - with open(new_path, 'rb') as f: - new_contents = f.read() - if old_contents != new_contents: -- os.replace(new_path, old_path) -+ os.rename(new_path, old_path) - else: - os.unlink(new_path) - --- -2.25.1 - diff --git a/package/python3/0031-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch similarity index 80% rename from package/python3/0031-Add-an-option-to-disable-the-berkeleydb-module.patch rename to package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch index 0c0d51a7eb..5fb436db59 100644 --- a/package/python3/0031-Add-an-option-to-disable-the-berkeleydb-module.patch +++ b/package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch @@ -1,4 +1,4 @@ -From cf4d7fd9f7cb6c1ced32ee323b2b5755640051b7 Mon Sep 17 00:00:00 2001 +From 67e9793d070ac5c8e83abbe95b9208533ffeadd0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Apr 2020 22:01:40 +0200 Subject: [PATCH] Add an option to disable the berkeleydb module @@ -9,10 +9,10 @@ Signed-off-by: Bernd Kuhls 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 4e733f6..1e52f30 100644 +index 841fd6732c..06c9a81f95 100644 --- a/configure.ac +++ b/configure.ac -@@ -3480,6 +3480,12 @@ if test "$UUID" = "no"; then +@@ -4280,6 +4280,12 @@ if test "$UUID" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" fi @@ -26,5 +26,5 @@ index 4e733f6..1e52f30 100644 AC_ARG_ENABLE(pydoc, -- -2.30.2 +2.34.1 diff --git a/package/python3/0032-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch similarity index 89% rename from package/python3/0032-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch rename to package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch index 0458283c18..712fd08fb1 100644 --- a/package/python3/0032-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch +++ b/package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch @@ -1,4 +1,4 @@ -From 3c83eedcc2df3ecf6c4a17953ca24dff60c1378e Mon Sep 17 00:00:00 2001 +From 3edeed879871a10acbe802f4a68cff3d4869dbde Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 12 Nov 2020 00:16:18 +0100 Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method @@ -23,10 +23,10 @@ Signed-off-by: Daniel Lang 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/crypt.py b/Lib/crypt.py -index 33dbc46bb3..4692a5270c 100644 +index de4a14a388..ba482487a7 100644 --- a/Lib/crypt.py +++ b/Lib/crypt.py -@@ -94,7 +94,9 @@ def _add_method(name, *args, rounds=None): +@@ -98,7 +98,9 @@ def _add_method(name, *args, rounds=None): result = crypt('', salt) except OSError as e: # Not all libc libraries support all encryption methods. @@ -38,5 +38,5 @@ index 33dbc46bb3..4692a5270c 100644 raise if result and len(result) == method.total_size: -- -2.25.4 +2.34.1 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index f9b8e2ec8d..c4ee79305d 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a30ecde59c47048013eb5a658c9b5dec277203d2793667f578df7671f7f03f3 Python-3.10.8.tar.xz -sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE +sha256 a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3 Python-3.11.0.tar.xz +sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index b291fcf582..4d94d25ff8 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.10 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).8 +PYTHON3_VERSION_MAJOR = 3.11 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -47,7 +47,12 @@ HOST_PYTHON3_CONF_ENV += \ PYTHON3_DEPENDENCIES = host-python3 libffi -HOST_PYTHON3_DEPENDENCIES = host-autoconf-archive host-expat host-zlib host-libffi +HOST_PYTHON3_DEPENDENCIES = \ + host-autoconf-archive \ + host-expat \ + host-libffi \ + host-pkgconf \ + host-zlib ifeq ($(BR2_PACKAGE_HOST_PYTHON3_BZIP2),y) HOST_PYTHON3_DEPENDENCIES += host-bzip2 @@ -180,6 +185,7 @@ endif PYTHON3_CONF_OPTS += \ --without-ensurepip \ --without-cxx-main \ + --with-build-python=$(HOST_DIR)/bin/python3 \ --with-system-ffi \ --disable-pydoc \ --disable-test-modules \ diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk index 2ccdd8b903..4f75287269 100644 --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk @@ -11,12 +11,18 @@ QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING EULA EULA.txt QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES +ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),) QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO +endif define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS $(call NXP_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) endef +define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 $(@D)/dp/ls1028a-dp-fw.bin $(TARGET_DIR)/boot/ls1028a-dp-fw.bin +endef + define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 0644 $(@D)/dp/ls1028a-dp-fw.bin $(BINARIES_DIR)/ls1028a-dp-fw.bin endef diff --git a/package/quazip/quazip.hash b/package/quazip/quazip.hash index bcb16acdc0..16d299fdf4 100644 --- a/package/quazip/quazip.hash +++ b/package/quazip/quazip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2dfb911d6b27545de0b98798d967c40430312377e6ade57096d6ec80c720cb61 quazip-1.2.tar.gz +sha256 c1239559cd6860cab80a0fd81f4204e606f9324f702dab6166b0960676ee1754 quazip-1.3.tar.gz sha256 b455b21b0d31d6e51993f1fb7e0694c75fa0eb0519a9ea62e4815fcf48b140b0 COPYING diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 7731e59d94..f4de2a11a4 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUAZIP_VERSION = 1.2 +QUAZIP_VERSION = 1.3 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = \ diff --git a/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch b/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch deleted file mode 100644 index 093d7cc821..0000000000 --- a/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 02b222a335527f1031cc9495d8c5ebc1bc5b1d4e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 11 Nov 2020 15:00:47 +0100 -Subject: [PATCH] quota: Use realloc(3) instead of reallocarray(3) - -reallocarray(3) has been added to glibc relatively recently (version -2.26, from 2017) and apparently not all users run new enough glibc. Just -use realloc(3) for now since in this case there's no real risk of -overflow. - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Jan Kara -[Retrieved from: -https://sourceforge.net/p/linuxquota/code/ci/02b222a335527f1031cc9495d8c5ebc1bc5b1d4e] ---- - quota.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/quota.c b/quota.c -index a6ed61f..a60de12 100644 ---- a/quota.c -+++ b/quota.c -@@ -385,7 +385,7 @@ int main(int argc, char **argv) - break; - case 259: - fscount++; -- fsnames = reallocarray(fsnames, fscount, sizeof(char *)); -+ fsnames = realloc(fsnames, fscount * sizeof(char *)); - if (!fsnames) - die(1, _("Not enough memory for filesystem names")); - fsnames[fscount - 1] = optarg; --- -2.28.0 - diff --git a/package/quota/quota.hash b/package/quota/quota.hash index 354a3e2de4..5b083c911c 100644 --- a/package/quota/quota.hash +++ b/package/quota/quota.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.06/ (click on info button) -md5 aef94648438832b684978d46fdf75110 quota-4.06.tar.gz -sha1 98288699cc14da42f762301c2b6731ec7c777681 quota-4.06.tar.gz +# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.09/ (click on info button) +md5 f85c2e15d9a735640675ff4977b57bb6 quota-4.09.tar.gz +sha1 5c215d869626b532be2773f4161bdcc8b9f97126 quota-4.09.tar.gz # Locally calculated -sha256 2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d quota-4.06.tar.gz +sha256 9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9 quota-4.09.tar.gz sha256 32a5fd41e7a257f7f0373988ea8d45cebdbf376060703c242c11c000751b1203 COPYING diff --git a/package/quota/quota.mk b/package/quota/quota.mk index 0c751d4436..1b6a4b1975 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUOTA_VERSION = 4.06 +QUOTA_VERSION = 4.09 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_LICENSE = GPL-2.0+ diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 6f5902fd52..53d6d8ca06 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -57,6 +57,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ + touch $(BINARIES_DIR)/rpi-firmware/overlays/README endef else # Still create the directory, so a genimage.cfg can include it independently of diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index 342faf26e3..cfb472808b 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_RPI_USERLAND bool "rpi-userland" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_LIBOPENVG - select BR2_PACKAGE_HAS_LIBOPENMAX + select BR2_PACKAGE_HAS_LIBEGL if BR2_arm + select BR2_PACKAGE_HAS_LIBGLES if BR2_arm + select BR2_PACKAGE_HAS_LIBOPENVG if BR2_arm + select BR2_PACKAGE_HAS_LIBOPENMAX if BR2_arm help Raspberry Pi Userland contains the necessary library to use the VideoCore driver. @@ -18,7 +18,7 @@ config BR2_PACKAGE_RPI_USERLAND https://github.com/raspberrypi/userland/ -if BR2_PACKAGE_RPI_USERLAND +if BR2_PACKAGE_RPI_USERLAND && BR2_arm config BR2_PACKAGE_PROVIDES_LIBEGL default "rpi-userland" @@ -40,6 +40,6 @@ config BR2_PACKAGE_RPI_USERLAND_HELLO endif comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_arm + depends on BR2_arm || BR2_arch64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 2800b56296..cb08945156 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -11,12 +11,18 @@ RPI_USERLAND_LICENSE_FILES = LICENCE RPI_USERLAND_INSTALL_STAGING = YES RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr +ifeq ($(BR2_arm),y) RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +endif ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) RPI_USERLAND_DEPENDENCIES += libexecinfo endif +ifeq ($(BR2_aarch64),y) +RPI_USERLAND_CONF_OPTS += -DARM64=ON +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 595402f1b8..af9927a028 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 9081928cced6fc650eaccb88f2ea154dc95c066957b234fa9c0cbe1770479f54 rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 b22e0efcdff9bcb27aef82148f26a5d3d67da618da3e6e8c9402fe7fcdd8ca69 rust-1.64.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 e40f1a1ad1404e87511e86964e03636de9e45b68bc745f1814e6e0b1f8fb8523 rust-1.64.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 27926d9f16018c3e8ac57012cd7062f12783e5eca34dcc57da2b7bf1bea80d32 rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 2e046d4aad27d98e5d15a2c74272169995740981acb006aeb4109e1bdf5ff0d4 rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 9f0c8a041fe1351bc3d615a74a4c9d5b1cbe194903f2b9a77dc6b42ca374ead9 rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 913e8286a3bc709ee0916fabec31dd9b6703c40b065b1ac59fd2125011a7fb34 rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 822cfc0abb4a30f37bf53b6703acac69f56edb2700a62502caca5ae09ede4e10 rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 283e8fb39770a9dc939ba750c44a9c40cac799e77a0556354de448c166b792c0 rust-1.64.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 bd69e42f6cfe3ba96d781ad0b4095ddac4f0fc31c1af445018edf6f0aba543e4 rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 40abc9ec4f86ff0e37ba176e4c68dfa708e9857bb0372169c865367593127566 rust-std-1.64.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 2438f7116711b2c65b60d59662ad333cc5f66868ec34498777ed764103f4d4a3 rust-std-1.64.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 9e7dc879ce647d0b5c7423dcfea1438d64ea2e0764895b5cb9b3258ab0ecf8dd rust-std-1.64.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 07fbe4ef51f33e7954e25c433522da224b10c6f7353f612713669a4fc58704e8 rust-std-1.64.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 9955ac8be9828e0400c16a1c0388a769401dc8e732d099ffada156867cab08fb rust-std-1.64.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 f0d24e63e2687af229ea1472650bf5dd5a50d7706062b47a73413e28101fccf1 rust-std-1.64.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 af9b36ce5ad613112f83f085840e1f2c5f58ec7b72d8dbf9e833883105699a37 rust-std-1.64.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 5246edd6be26f10d11a3100d3e74f460c2cfbdabb417e4cc8225ce2b82c485ce rust-std-1.64.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 ef1820f55b341ed1a78cadbd3564f9f8800f99bbfb7533821ef5f90ba2c21e87 rust-std-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 eca7608caa6b8fb31467b4524292e86f854ebd06fcff29f58f5fc860b664c711 rust-std-1.64.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 a31b9284ca3e864343fdad900fc877cc14e00de32dcde7326023372720cd4b09 rust-std-1.64.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 742fac589f1bc1a0ddd857e32b317e2b673c40adb8ef6dfc3516563ba9bc839f rust-std-1.64.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 791aafcfb41c342783bc3c8cdb57ac61453fc02eee185f15c275716f419556f3 rust-std-1.64.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-i586-unknown-linux-musl.tar.xz.asc -sha256 0cb3b0848cd31bd68ac82cd138c6345e5348f5af3dcc1f13275ee019a0895c59 rust-std-1.64.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 c80c57df63517d6171c061e6c095b794593172a3abefa9b4202992706bda12e5 rust-std-1.64.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b193faf2e37951bf1ac6c3f2d4bd4fe84971a2f56f22e66323cccd142df54156 rust-std-1.64.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 45baef38fbfadf21d4e603554c49d62525d1dff887e4ea7045b1fc88feb81663 rust-std-1.64.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-mips-unknown-linux-musl.tar.xz.asc -sha256 993b3e003feaa966466509ea9161106978ef7c874877461b4ca1a9936032b25b rust-std-1.64.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 a2d2e2d274105054303adfd9ecb75ea2fba36a228ab23a669c609062f4db0035 rust-std-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 83981de8b57719d714d59b55f3749d8c6ff10588d8d6c7d7ae371bfb668a7b5b rust-std-1.64.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 8ec026244400bac48d918230a0c99aa2c31ff33d6cc4d18552228509ca58c074 rust-std-1.64.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 97f40ad383014955448f7917abba7a547d1ddd205746641d3e9c3f730cbd129e rust-std-1.64.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 7dbcf969fc6717215796079437cf073a8ef7df95b77ded4654009c8379c91e0a rust-std-1.64.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 288dd07746b0ece185753e784c7e97f2f01984e9302ef46a4ff71db665002637 rust-std-1.64.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 6b29ebec4cd705760db634717cf6df68a9a377d52c25def30f5a2e2641a83279 rust-std-1.64.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 dc0352fdcf7f8b4fcb551d63001738ee120ea2a0fcc7d55db11f1f87eba90b3e rust-std-1.64.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ef697469b2a3ea8897f49b70e3be0c7aaca3f26fd3234812113e2e85cafac738 rust-std-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 284b09a96d4cdbb96827914a318f9c41e2b207c0afeae76b9f0e3830d2ef2d4d rust-std-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 939db2384f543325cc8a2423ab53e28623b9e9762dacea1e2010cf894d3e6ab1 rust-std-1.64.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 3551f014fe1839e68e7b06eeb1b3f67869bef9c4849da9c9c01a7b8c3e32ebf2 rust-std-1.64.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b rust-std-1.64.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.64.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.64.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 29af13a882abbe797fadd43afcb75bce2e2304438db9e21a3e64a2e9100501fb rust-std-1.64.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b3a83a9585b8c4ede4eab2a11b3f96895f676d8b46c9642140c4fefd5c309ed1 rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 50595b96f98e0940bbfe00209d6c233e9158e140ecd6088ad3bd53f89b123e9d rust-1.65.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 afa3af620b3a0bf8a1da33413eace1db681db5f99b2572ac016027b3d71a50b7 rust-1.65.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 c6b48026fb131a404bcdc7a691246c3de716e32805d58d1571e253b9a5b047b5 rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 5601b31290790a7077c342c8731bb1d5de1a89639476e14bc7840aeaa3ab6010 rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 8cf900ac125d6bebc97ebb777761923b2062e4fc36692c1f2d68faa0e70949b2 rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 e0654c20446aa5c66def122617f3ca4be9e9b86e75040327e3d35973b6b88980 rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 f02e1bac01415e101fac58608b070b0f37c7df1a142c8001ddbc489cfb85c232 rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 e7dc9bb42c0e738f68f8ad4b05cf4b7bef8fa490c379e5730c7e282507b305ee rust-1.65.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 9455cab767f7b9f46259aac8d953f15f11b3d65513384e2b0a5e77d0432ae82f rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 735b681c8a6e60925c76d6cc899e78b4cb4562ada24a1f265b2021c1faad78ad rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 9ea488da40c347826cce7e238847c745ee566254bb1d077412673f8243fb1cd2 rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 c8793e77ef43336bc372a7a5b4720d5449e92577c7875471c2bc40ddbfde4811 rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 f7d5eb17dbe46ee9d3c4f9fcffc07b8e3311c747545402c8d3b5c43043f27288 rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 32d7f301196d73027fb9a5ae595dbadacdc234307c36b4a175a132e75318e38c rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 453a1443e4753611dc4e6969e50ad8d7984a31d1a457729a860599ed19b1de7a rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 d079e841be640b4ce26aa821f29bc813243a7c0af7b8aca8ca4acf5c2e5b722f rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 1d11ab1d60070ae30ff87b55dca077f4d532d814a9ab7bc77055b5b429a78c6e rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 fec73401941bffce3b6913d31955f1291119dea119c0051d94f271ae7c959d4c rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 c14268337c69650a2618909d8e691489385d748374d73ab8d6a2f9d6b030d70d rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 9368527053c4bab0fd320209b45f0278d0a1e54a37006a56a6e565404ab73fef rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 0b5bc219333e3e983fb1e7e86a0c268c4a52ccbd6326a16785be9d9017d97e9f rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 533eda439eb5ffec258b8219445742d6d60570040b3ff167291e3d0d985b9d70 rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.asc +sha256 7f5d9ae65827aef1a51676927a4c9533f942021d2fd45fd93b23dfaa738ee205 rust-std-1.65.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 99bd62d593a6ab3205cab7f06b5793a075b9d05d868e927a6948e46269d61e82 rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.asc +sha256 644a4c57c1392f776c5ebb13f9832778b69464391b3766e6bbd18c3aa11787a6 rust-std-1.65.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 50c65a8effc85aa89242ba0a2a2c89bfcc4d0a39dcb42396d10b0036b9a4e90c rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.asc +sha256 3bc5043f4eb7bb6418708792ee8e777197e562d03843a9adf62ce245ba07289a rust-std-1.65.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 338c702b79dac33e32dde097084dd38852487d2976c5eb66b44ba8fc8319342b rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 9450745a5e678c9b7e65ecc7d6a016f92d8d22d8091c4a77431b1e58b99a435f rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 a0a0e60a0e850140194250fbbfb962c322d4f474f4ec22d03b7f537034257c09 rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 0862706d22dcfee39b0d2df874dd6065d8c3020c0b8974f6e7b694edd42413ae rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 79e078420f7c45fd1cf38b70620ced50d35ddb1621736b65be987c20481fe5bc rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 482e9245873338a08f47ea2c29683134b8813deb3e3eafb78b786d34bbecce51 rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 672b9ea8018dcdf7d5f79f5298bacc34e7600a082727b4f1a20c14251752aaa2 rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 8a26e08908156ae5a05c64c2732435ef4efb994a2ac6d0b2e9c93c0dae19d089 rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 ce18b44300f7d5d94856cef5b270ba010061fafa411beb9782207e26cbab88a6 rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 fa99f123ce14f1cda245857b50fd4709adee960e7d36ce663b87c13aee18b64b rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 a3f6740be345364f4599ae837d2401e0f31e5d33a4f958852d12a384ee581a83 rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 fc2a8816665f464d3085dcd379c44b9de0ee1f1084fae0a4c32c57754b27992b rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9 rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 55abeb1b55aeebc46a4af2f304271361397df58d12f7eb23fb262bc3132c6056 rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index a356acd3dc..91ee5a5372 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.64.0 +RUST_BIN_VERSION = 1.65.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index fbef37683a..9776f3f84c 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.64.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.64.0-src.tar.xz.asc -sha256 e8170d318fac9d2fc17d5c3e648e7068f56e8db8d233d864aeffbef7c6542eac rustc-1.64.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc +sha256 2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf rustc-1.65.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 4b5e5fac48..d501391d77 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.64.0 +RUST_VERSION = 1.65.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/sbc/Config.in b/package/sbc/Config.in index f1dbc0ec2c..4d1f6297f7 100644 --- a/package/sbc/Config.in +++ b/package/sbc/Config.in @@ -1,8 +1,17 @@ config BR2_PACKAGE_SBC bool "sbc" - select BR2_PACKAGE_LIBSNDFILE help An audio codec to connect bluetooth high quality audio devices like headphones or loudspeakers. http://www.bluez.org/ + +if BR2_PACKAGE_SBC + +config BR2_PACKAGE_SBC_TOOLS + bool "tools" + select BR2_PACKAGE_LIBSNDFILE + help + Build the command-line SBC tools as well as the library. + +endif diff --git a/package/sbc/sbc.mk b/package/sbc/sbc.mk index 744ce5f895..7a37a99643 100644 --- a/package/sbc/sbc.mk +++ b/package/sbc/sbc.mk @@ -8,8 +8,16 @@ SBC_VERSION = 2.0 SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth SBC_INSTALL_STAGING = YES -SBC_DEPENDENCIES = libsndfile host-pkgconf -SBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) +SBC_DEPENDENCIES = host-pkgconf +SBC_LICENSE := LGPL-2.1+ (library) SBC_LICENSE_FILES = COPYING COPYING.LIB +ifeq ($(BR2_PACKAGE_SBC_TOOLS),y) +SBC_DEPENDENCIES += libsndfile +SBC_CONF_OPTS += --enable-tools --enable-tester +SBC_LICENSE += , GPL-2.0+ (programs) +else +SBC_CONF_OPTS += --disable-tools --disable-tester +endif + $(eval $(autotools-package)) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 782c552c52..923a900dc0 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.1.tar.gz.sig -sha256 bc121588b1105065598ce38078026a414c28ea95e66ed2adab4c44d80b309e1b SDL2-2.24.1.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.2.tar.gz.sig +sha256 b35ef0a802b09d90ed3add0dcac0e95820804202914f5bb7b0feb710f1a1329f SDL2-2.24.2.tar.gz # Locally calculated sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 28e2c5cb36..a1dc8b5b73 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.24.1 +SDL2_VERSION = 2.24.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index a490b002b6..3313b341f9 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz -sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt +sha256 78cdad51f3cc3ada6932b1bb6e914b33798ab970a1e817763f22ddbfd97d0c57 SDL2_ttf-2.20.1.tar.gz +sha256 28aabfed22b3cb0b7e23ef40385e4f66297c960082f029c96d073cc1d4e008d5 LICENSE.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 054e327fac..4b44b0fc41 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.18 +SDL2_TTF_VERSION = 2.20.1 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch deleted file mode 100644 index de95405531..0000000000 --- a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 13 Jan 2022 17:56:10 +0200 -Subject: [PATCH] configure.ac: correct the getprotobynumber_r test - -The AC_TRY_COMPILE test succeeds even when libc does not provide the -tested symbol. The compiler produces a warning, but exits successfully. -Use AC_TRY_LINK that will only succeeds if libc provides the symbol. - -This fixes build with musl libc that does not support -getprotobynumber_r(). - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to socat@dest-unreach.org - - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d4acc9e7e6f5..973a7f2218c9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) - # getprotobynumber_r() is not standardized - AC_MSG_CHECKING(for getprotobynumber_r() variant) - AC_CACHE_VAL(sc_cv_getprotobynumber_r, --[AC_TRY_COMPILE([#include -+[AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], - [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], -- [AC_TRY_COMPILE([#include -+ [AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL,1024);], - [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], -- [AC_TRY_COMPILE([#include -+ [AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL);], - [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], - --- -2.34.1 - diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 4f7ff5328e..2113e1b3a4 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 5c28dd258ba928326d0716fcb4895cc2 socat-1.7.4.3.tar.bz2 +md5 a605d3779465f42c07fc507cfbfb08f9 socat-1.7.4.4.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007 socat-1.7.4.3.tar.bz2 +sha256 fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac socat-1.7.4.4.tar.bz2 # Locally calculated -sha256 432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb README +sha256 3555c6bc2779ff0f9a7145d1e3cd1d8fde59548bcd3364a23b907de21eec5aa8 README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index bfccd02031..f958f26522 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.3 +SOCAT_VERSION = 1.7.4.4 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception @@ -39,7 +39,7 @@ SOCAT_DEPENDENCIES = host-autoconf # incompatibile license (GPL-3.0+) SOCAT_CONF_OPTS = --disable-readline -ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_STATIC_LIBS),y:) +ifeq ($(BR2_PACKAGE_LIBOPENSSL):$(BR2_STATIC_LIBS),y:) SOCAT_DEPENDENCIES += openssl else SOCAT_CONF_OPTS += --disable-openssl diff --git a/package/spdlog/spdlog.hash b/package/spdlog/spdlog.hash index 866d1d6d02..af89ba4e84 100644 --- a/package/spdlog/spdlog.hash +++ b/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224 spdlog-1.10.0.tar.gz +sha256 ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb spdlog-1.11.0.tar.gz sha256 a7241a379cb98d37788f82c2fc2e484c3ae85dae881fd3406f0637644850926f LICENSE diff --git a/package/spdlog/spdlog.mk b/package/spdlog/spdlog.mk index 9c5e76a9e8..32a0265484 100644 --- a/package/spdlog/spdlog.mk +++ b/package/spdlog/spdlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPDLOG_VERSION = 1.10.0 +SPDLOG_VERSION = 1.11.0 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE diff --git a/package/sscep/Config.in b/package/sscep/Config.in new file mode 100644 index 0000000000..4b9039c9b2 --- /dev/null +++ b/package/sscep/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SSCEP + bool "sscep" + select BR2_PACKAGE_OPENSSL + help + SSCEP is a client-only implementation of the SCEP + (Cisco System's Simple Certificate Enrollment Protocol). + + https://github.com/certnanny/sscep diff --git a/package/sscep/sscep.hash b/package/sscep/sscep.hash new file mode 100644 index 0000000000..549c63b918 --- /dev/null +++ b/package/sscep/sscep.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 489cc8e093986776eb3f15082bf766778f707176f3cd604bf0ef1008da06b8e5 sscep-0.10.0.tar.gz +sha256 e1328c292102a22c10e8dcfbfda33740f603767c73f8c5b5189c5513eb6b4dea COPYING diff --git a/package/sscep/sscep.mk b/package/sscep/sscep.mk new file mode 100644 index 0000000000..782bd358ed --- /dev/null +++ b/package/sscep/sscep.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# sscep +# +################################################################################ + +SSCEP_VERSION = 0.10.0 +SSCEP_SITE = $(call github,certnanny,sscep,v$(SSCEP_VERSION)) +SSCEP_LICENSE = BSD-2-Clause, OpenSSL, OpenOSP +SSCEP_LICENSE_FILES = COPYING +SSCEP_AUTORECONF = YES +SSCEP_DEPENDENCIES = host-pkgconf openssl + +$(eval $(autotools-package)) diff --git a/package/ssdp-responder/Config.in b/package/ssdp-responder/Config.in index df57546eed..8b5dfe67a6 100644 --- a/package/ssdp-responder/Config.in +++ b/package/ssdp-responder/Config.in @@ -7,14 +7,16 @@ config BR2_PACKAGE_SSDP_RESPONDER targeted more at embedded systems that need to announce themselves to Windows systems. - ssdpd is a stand-alone UNIX, no external dependencies but the - standard C library. It has a built-in web server for serving - the UPnP XML description which Windows use to present the - icon, by default an InternetGatewayDevice is announced. + The project consists of ssdpd and ssdp-scan. The former is a + stand-alone UNIX daemon, it has no dependencies but a standard + C library. It comes with built-in web server for serving the + UPnP XML description on port 1901, the XML is used by Windows + to present the icon, by default an InternetGatewayDevice is + announced. - Also included is ssdp-scan, a tool similar to mdns-scan, which - continuously scans for SSDP capable hosts on the network. - Take care only to use for debugging since it scans the network - quite aggressively. + ssdp-scan is a tool, similar to mdns-scan, to find other SSDP + capable hosts on the network. Take care to only use it for + debugging, or quicker device discovery operations, since it + scans the network quite aggressively. https://github.com/troglobit/ssdp-responder/ diff --git a/package/ssdp-responder/S50ssdpd b/package/ssdp-responder/S50ssdpd old mode 100755 new mode 100644 index e33992be91..8654de4f26 --- a/package/ssdp-responder/S50ssdpd +++ b/package/ssdp-responder/S50ssdpd @@ -1,25 +1,32 @@ #!/bin/sh -NAME=ssdpd -PIDFILE=/var/run/$NAME.pid -DAEMON=/usr/sbin/$NAME -CFGFILE=/etc/default/$NAME +DAEMON=ssdpd +PIDFILE=/var/run/$DAEMON.pid +CFGFILE=/etc/default/$DAEMON DAEMON_ARGS="" # Read configuration variable file if it is present -[ -f $CFGFILE ] && . $CFGFILE +# shellcheck source=/dev/null +[ -r "$CFGFILE" ] && . "$CFGFILE" +# shellcheck disable=SC2086 start() { - printf 'Starting %s: ' "$NAME" - start-stop-daemon -S -q -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf 'Starting %s: ' "$DAEMON" + if start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS; then + echo "OK" + else + echo "FAIL" + fi } stop() { - printf 'Stopping %s: ' "$NAME" - start-stop-daemon -K -q -p $PIDFILE -x $DAEMON - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf 'Stopping %s: ' "$DAEMON" + if start-stop-daemon -K -q -p "$PIDFILE" -x "$DAEMON"; then + echo "OK" + else + echo "FAIL" + fi } restart() { @@ -28,15 +35,15 @@ restart() { } case "$1" in - start|stop|restart) - "$1" - ;; - reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 + start|stop|restart) + "$1" + ;; + reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac exit $? diff --git a/package/ssdp-responder/ssdp-responder.hash b/package/ssdp-responder/ssdp-responder.hash index e8cbbb4a1f..425ad86e08 100644 --- a/package/ssdp-responder/ssdp-responder.hash +++ b/package/ssdp-responder/ssdp-responder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7ae49229e7c7a55fed9e36598b12e2173eecef0fffe0a386b6a10fad30f3c79f ssdp-responder-1.8.tar.gz -sha256 e17dc0bc91bf499d8cca5e016c22c6d2a4770e3cc1a43756a7973375a83ddb90 LICENSE +sha256 974c244abd4ba8c87532867a84756182a1460c99072ffb1eb91c5a1f73311d89 ssdp-responder-1.9.tar.gz +sha256 68d6fdc22e337f725fe719bf9ae6d92b1d8d0ca4cff8219b303ab76706670a8d LICENSE diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 3fee4c2006..fd7b1ea44b 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSDP_RESPONDER_VERSION = 1.8 +SSDP_RESPONDER_VERSION = 1.9 SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) SSDP_RESPONDER_LICENSE = ISC SSDP_RESPONDER_LICENSE_FILES = LICENSE diff --git a/package/stb/Config.in b/package/stb/Config.in new file mode 100644 index 0000000000..41014d242b --- /dev/null +++ b/package/stb/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_STB + bool "stb" + help + Single-file image and audio processing libraries for C/C++. + + https://github.com/nothings/stb diff --git a/package/stb/stb.hash b/package/stb/stb.hash new file mode 100644 index 0000000000..097ad3424f --- /dev/null +++ b/package/stb/stb.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 c47cf5abe21e1d620afccd159c23fe71dfa86eb270015a7646a4f79e9bfd5503 stb-8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55.tar.gz +sha256 bebfe904b14301657e4e5d655c811d51fd31b97c455b9cc2d8600d6bac6cff63 LICENSE diff --git a/package/stb/stb.mk b/package/stb/stb.mk new file mode 100644 index 0000000000..59358aec26 --- /dev/null +++ b/package/stb/stb.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# stb +# +################################################################################ + +STB_VERSION = 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55 +STB_SITE = $(call github,nothings,stb,$(STB_VERSION)) +STB_LICENSE = Public Domain or MIT +STB_LICENSE_FILES = LICENSE +STB_INSTALL_STAGING = YES +STB_INSTALL_TARGET = NO + +define STB_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/stb + $(INSTALL) -m 0644 $(@D)/*.h $(STAGING_DIR)/usr/include/stb + $(INSTALL) -D -m 0644 $(STB_PKGDIR)/stb.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/stb.pc +endef + +$(eval $(generic-package)) diff --git a/package/stb/stb.pc b/package/stb/stb.pc new file mode 100644 index 0000000000..165b6da94a --- /dev/null +++ b/package/stb/stb.pc @@ -0,0 +1,8 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: stb +Description: single-file image and audio processing libraries for C/C++ +Version: 0.0 +Cflags: -I${includedir}/stb diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 8c38b7c713..72b72cc94d 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -29,7 +29,7 @@ SURICATA_DEPENDENCIES = \ SURICATA_CONF_ENV = \ ac_cv_path_HAVE_SPHINXBUILD=no \ - CARGO_HOME=$(HOST_DIR)/share/cargo \ + CARGO_HOME=$(BR_CARGO_HOME) \ RUST_TARGET=$(RUSTC_TARGET_NAME) SURICATA_CONF_OPTS = \ diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 8b43d92219..f546b17d0a 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a3403447805bb97f8b6f38dfdc9dde24c24e4389cf7f2348358774605ad2687e timescaledb-2.8.0.tar.gz +sha256 22a057c4472d23bf08778932e391f38f350ef0307cf99fb8e279c8245667d3e9 timescaledb-2.8.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 12e5ca7af4..659d07bd0c 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.8.0 +TIMESCALEDB_VERSION = 2.8.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE diff --git a/package/tpm2-pkcs11/tpm2-pkcs11.hash b/package/tpm2-pkcs11/tpm2-pkcs11.hash index 1d5bcc7a54..b027bad72a 100644 --- a/package/tpm2-pkcs11/tpm2-pkcs11.hash +++ b/package/tpm2-pkcs11/tpm2-pkcs11.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 078a445ed0e9f5009675a162b4b7b88f3520436cfbc791bb2249f37bd1f475bd tpm2-pkcs11-1.7.0.tar.gz +sha256 79f28899047defd6b4b72b7268dd56abf27774954022315f818c239af33e05bd tpm2-pkcs11-1.8.0.tar.gz sha256 793aa007f793458434d7cc60b1c827053a399308658b32fcaa6023802adc22e1 LICENSE diff --git a/package/tpm2-pkcs11/tpm2-pkcs11.mk b/package/tpm2-pkcs11/tpm2-pkcs11.mk index adb5a46f56..9d61340775 100644 --- a/package/tpm2-pkcs11/tpm2-pkcs11.mk +++ b/package/tpm2-pkcs11/tpm2-pkcs11.mk @@ -4,14 +4,15 @@ # ################################################################################ -TPM2_PKCS11_VERSION = 1.7.0 +TPM2_PKCS11_VERSION = 1.8.0 TPM2_PKCS11_SITE = https://github.com/tpm2-software/tpm2-pkcs11/releases/download/$(TPM2_PKCS11_VERSION) TPM2_PKCS11_LICENSE = BSD-2-Clause TPM2_PKCS11_LICENSE_FILES = LICENSE TPM2_PKCS11_DEPENDENCIES = host-pkgconf libyaml openssl sqlite tpm2-tss TPM2_PKCS11_CONF_OPTS += \ - --disable-hardening + --disable-hardening \ + --disable-ptool-checks # Fix tpm.c:746:5: error: 'for' loop initial declarations are only allowed in C99 mode # Fix implicit declaration of function 'strnlen' diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index b203e5bf5b..aadd320063 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2022-August/000072.html -sha512 e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b tzdata2022c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2022-October/000075.html +sha512 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6 tzdata2022f.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 7a1a77fcd9..45bd7cf6e6 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2022c +TZDATA_VERSION = 2022f TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 5d0b96f3c0..253d5cdc6b 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -49,3 +49,13 @@ comment "udisks needs a toolchain with dynamic library, locale, wchar, threads, comment "udisks can't be built with Optimize for fast" depends on BR2_OPTIMIZE_FAST + +if BR2_PACKAGE_UDISKS + +config BR2_PACKAGE_UDISKS_FHS_MEDIA + bool "Mount devices in /media instead of /run/media" + help + Support mounting in /media for compatibility with the + Filesystem Hierarchy Standard (FHS) + +endif diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index 959333d01f..840f552b04 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -29,7 +29,6 @@ UDISKS_CONF_OPTS = \ --disable-acl \ --disable-bcache \ --disable-btrfs \ - --disable-fhs-media \ --disable-introspection \ --disable-iscsi \ --disable-lsm \ @@ -40,4 +39,10 @@ UDISKS_CONF_OPTS = \ --disable-vdo \ --disable-zram +ifeq ($(BR2_PACKAGE_UDISKS_FHS_MEDIA),y) +UDISKS_CONF_OPTS += --enable-fhs-media +else +UDISKS_CONF_OPTS += --disable-fhs-media +endif + $(eval $(autotools-package)) diff --git a/package/uhubctl/uhubctl.hash b/package/uhubctl/uhubctl.hash index c696d70f6c..8a4581b84c 100644 --- a/package/uhubctl/uhubctl.hash +++ b/package/uhubctl/uhubctl.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 391f24fd1f89cacce801df38ecc289b34c3627bc08ee69eec515af7e1a283d97 uhubctl-2.4.0.tar.gz -sha256 2d3aa0737e8db9dfd710f9a282b446cb7b15b2b3eecac383f0c45c64d736eea0 LICENSE +sha256 d4452252f7862f7a45dd9c62f2ea7cd3a57ab5f5ab0e54a857d4c695699bbba3 uhubctl-2.5.0.tar.gz +sha256 5eb09049fafa91347386daf769223ba2ee6914cb26ab95b86854ad6edea49b5d LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/uhubctl/uhubctl.mk b/package/uhubctl/uhubctl.mk index 3429d7d151..f9815409ae 100644 --- a/package/uhubctl/uhubctl.mk +++ b/package/uhubctl/uhubctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -UHUBCTL_VERSION = 2.4.0 +UHUBCTL_VERSION = 2.5.0 UHUBCTL_SITE = $(call github,mvp,uhubctl,v$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 UHUBCTL_LICENSE_FILES = LICENSE COPYING diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index d86d9c2067..7b62522727 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -6,6 +6,7 @@ UNBOUND_VERSION = 1.17.0 UNBOUND_SITE = https://www.unbound.net/downloads +UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause UNBOUND_LICENSE_FILES = LICENSE diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in index 8ce180a884..6de6227e5c 100644 --- a/package/usbredir/Config.in +++ b/package/usbredir/Config.in @@ -15,18 +15,26 @@ config BR2_PACKAGE_USBREDIR protocol. Note: only the library is installed, not the utilities. Say - 'y' below if you want the server too. + 'y' below if you want the tools too. http://www.spice-space.org/page/UsbRedir if BR2_PACKAGE_USBREDIR -config BR2_PACKAGE_USBREDIR_SERVER - bool "usbredirserver on target" +config BR2_PACKAGE_USBREDIR_TOOLS + bool "enable tools" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2 + select BR2_PACKAGE_LIBGLIB2 help If you want to serve usbredir requests on your target, say - 'y' here to have the usbredir server on the target. + 'y' here to have the tools built and installed on the target + (including usbredirect binary). - Note: the server is not required to use the library. + Note: the tools are not required to use the library. + +comment "tools needs a toolchain w/ wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR endif diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash index f738c36690..577e08efba 100644 --- a/package/usbredir/usbredir.hash +++ b/package/usbredir/usbredir.hash @@ -1,5 +1,5 @@ -# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum -sha256 fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d usbredir-0.12.0.tar.xz +# https://spice-space.org/download/usbredir/usbredir-0.13.0.tar.xz.sha256sum +sha256 4ba6faa02c0ae6deeb4c53883d66ab54b3a5899bead42ce4ded9568b9a7dc46e usbredir-0.13.0.tar.xz # Hash for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index 6792a3e758..325e7313aa 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBREDIR_VERSION = 0.12.0 +USBREDIR_VERSION = 0.13.0 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz USBREDIR_SITE = http://spice-space.org/download/usbredir USBREDIR_LICENSE = LGPL-2.1+ (libraries) @@ -14,21 +14,15 @@ USBREDIR_DEPENDENCIES = host-pkgconf libusb USBREDIR_CONF_OPTS = \ -Dgit_werror=disabled \ -Dstack_protector=disabled \ - -Dtests=disabled \ - -Dtools=disabled - -ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y) + -Dtests=disabled +ifeq ($(BR2_PACKAGE_USBREDIR_TOOLS),y) USBREDIR_LICENSE += , GPL-2.0+ (program) USBREDIR_LICENSE_FILES += COPYING - -else # BR2_PACKAGE_USBREDIR_SERVER != y - -define USBREDIR_POST_INSTALL_TARGET_RM_SERVER - rm -f $(TARGET_DIR)/usr/sbin/usbredirserver -endef -USBREDIR_POST_INSTALL_TARGET_HOOKS += USBREDIR_POST_INSTALL_TARGET_RM_SERVER - -endif # BR2_PACKAGE_USBREDIR_SERVER +USBREDIR_DEPENDENCIES += libglib2 +USBREDIR_CONF_OPTS += -Dtools=enabled +else +USBREDIR_CONF_OPTS += -Dtools=disabled +endif $(eval $(meson-package)) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 50da0f9bf3..cc1cd83266 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 baaf3e031958075b96530d43d7435f19cb428088894066e0b02349a3b9666666 uuu_source-1.5.4.tar.gz +sha256 932c0a4acde0f52b907f5693c6d133c83142c4ca6e9df05a38b3ac1e50628883 uuu_source-1.5.11.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 681c1fbc44..647015e2dd 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.4 +UUU_VERSION = 1.5.11 UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in new file mode 100644 index 0000000000..8d13816149 --- /dev/null +++ b/package/versal-firmware/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_VERSAL_FIRMWARE + bool "versal-firmware" + depends on BR2_aarch64 + help + Pre-built firmware files for Xilinx Versal boards. + + https://github.com/nealfrager/buildroot-firmware + +if BR2_PACKAGE_VERSAL_FIRMWARE + +config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION + string "firmware version" + default "v2022.2" + help + Release version of Versal firmware. + +config BR2_PACKAGE_VERSAL_FIRMWARE_BOARD + string "board name" + default "vck190" + help + Name of Versal target board. + Used for installing the appropriate firmware. + +endif # BR2_PACKAGE_VERSAL_FIRMWARE diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk new file mode 100644 index 0000000000..3e4b9e558d --- /dev/null +++ b/package/versal-firmware/versal-firmware.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# versal-firmware +# +################################################################################ + +VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_SITE = $(call github,nealfrager,buildroot-firmware,$(VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_LICENSE = Xilinx-Binary-Only +VERSAL_FIRMWARE_LICENSE_FILES = LICENSE +VERSAL_FIRMWARE_INSTALL_TARGET = NO +VERSAL_FIRMWARE_INSTALL_IMAGES = YES + +define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS + $(foreach f,plm.elf psmfw.elf vpl_gen_fixed.pdi,\ + $(INSTALL) -D -m 0755 $(@D)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)_$(f) \ + $(BINARIES_DIR)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)_$(f) + ) +endef + +$(eval $(generic-package)) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index 4717523dc2..8884babbc0 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2022-October/042466.html -sha256 9046f10a425d4e2a00965a03acfb6b3fb575a56503ac72c2b86821c69653375c wayland-protocols-1.27.tar.xz -sha512 c0a49bc46c663c9f602998dfe2e184c09756790fbcc7acbc2bf9d9cf8f7d6dcdd00259b768222a30e5d134e6f97f7f4faf252947b544e8b32f53278b70da0390 wayland-protocols-1.27.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-November/042490.html +sha256 c7659fb6bf14905e68ef605f898de60d1c066bf66dbea92798573dddec1535b6 wayland-protocols-1.28.tar.xz +sha512 092454c6a7e5cc47729de49e9061fb91dfdc5610859e17c495642806ca14dcfb3850a5d3a7459ddb70b2adb08d2590d4b0f92c3a97600e48598682d59adb102f wayland-protocols-1.28.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 2510d7c04e..830136ce06 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.27 +WAYLAND_PROTOCOLS_VERSION = 1.28 WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT diff --git a/package/xerces/0002-InMemMsgLoader-loadMsg-fix-memory-leak-when-transcod.patch b/package/xerces/0002-InMemMsgLoader-loadMsg-fix-memory-leak-when-transcod.patch deleted file mode 100644 index 76b37c63d9..0000000000 --- a/package/xerces/0002-InMemMsgLoader-loadMsg-fix-memory-leak-when-transcod.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 1bdf6d8ba878c1fe1d779824be70001fc0bebd2c Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Fri, 27 Aug 2021 01:33:27 +0200 -Subject: [PATCH] InMemMsgLoader::loadMsg(): fix memory leak when transcoding - fails. - -Seen with the IconvGNU transcoder when parsing " - ---- - .../MsgLoaders/InMemory/InMemMsgLoader.cpp | 31 ++++++++++++++----- - 1 file changed, 23 insertions(+), 8 deletions(-) - -diff --git a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp -index cda103226..6971fde96 100644 ---- a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp -+++ b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp -@@ -25,6 +25,7 @@ - // --------------------------------------------------------------------------- - #include - #include -+#include - #include - #include - #include -@@ -153,14 +154,28 @@ bool InMemMsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad - XMLCh* tmp4 = 0; - - bool bRet = false; -- if (repText1) -- tmp1 = XMLString::transcode(repText1, manager); -- if (repText2) -- tmp2 = XMLString::transcode(repText2, manager); -- if (repText3) -- tmp3 = XMLString::transcode(repText3, manager); -- if (repText4) -- tmp4 = XMLString::transcode(repText4, manager); -+ try -+ { -+ if (repText1) -+ tmp1 = XMLString::transcode(repText1, manager); -+ if (repText2) -+ tmp2 = XMLString::transcode(repText2, manager); -+ if (repText3) -+ tmp3 = XMLString::transcode(repText3, manager); -+ if (repText4) -+ tmp4 = XMLString::transcode(repText4, manager); -+ } -+ catch( const TranscodingException& ) -+ { -+ if (tmp1) -+ manager->deallocate(tmp1); -+ if (tmp2) -+ manager->deallocate(tmp2); -+ if (tmp3) -+ manager->deallocate(tmp3); -+ // Note: tmp4 cannot leak -+ throw; -+ } - - bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4, manager); - --- -2.17.1 - diff --git a/package/xerces/xerces.hash b/package/xerces/xerces.hash index c75ce860e8..e6b5b922d2 100644 --- a/package/xerces/xerces.hash +++ b/package/xerces/xerces.hash @@ -1,5 +1,5 @@ -# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.3.tar.xz.sha256 -sha256 12fc99a9fc1d1a79bd0e927b8b5637a576d6656f45b0d5e70ee3694d379cc149 xerces-c-3.2.3.tar.xz +# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.4.tar.xz.sha256 +sha256 075bc57940da0f9be6dd183c550c8ce0b9833e4550dc382048377a1a5e3b2bd9 xerces-c-3.2.4.tar.xz # Hash for license file sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index a3e5361b2e..08efa6fb5c 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -4,7 +4,7 @@ # ################################################################################ -XERCES_VERSION = 3.2.3 +XERCES_VERSION = 3.2.4 XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.xz XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources XERCES_LICENSE = Apache-2.0 diff --git a/package/z3/Config.in b/package/z3/Config.in new file mode 100644 index 0000000000..55b0e8bb3b --- /dev/null +++ b/package/z3/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_Z3 + bool "z3" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 + # z3 needs fenv.h which is not provided by uclibc + depends on !BR2_TOOLCHAIN_USES_UCLIBC + # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 + depends on !BR2_nios2 + help + Z3, also known as the Z3 Theorem Prover, is a cross-platform + satisfiability modulo theories (SMT) solver. + + https://github.com/Z3Prover/z3 + +if BR2_PACKAGE_Z3 + +config BR2_PACKAGE_Z3_PYTHON + bool "Python bindings" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + +endif diff --git a/package/z3/z3.hash b/package/z3/z3.hash new file mode 100644 index 0000000000..d38c5f1971 --- /dev/null +++ b/package/z3/z3.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 e3a82431b95412408a9c994466fad7252135c8ed3f719c986cd75c8c5f234c7e z3-4.11.2.tar.gz +sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk new file mode 100644 index 0000000000..2252e05395 --- /dev/null +++ b/package/z3/z3.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# z3 +# +################################################################################ + +Z3_VERSION = 4.11.2 +Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) +Z3_LICENSE = MIT +Z3_LICENSE_FILES = LICENSE.txt +Z3_INSTALL_STAGING = YES +Z3_SUPPORTS_IN_SOURCE_BUILD = NO + +ifeq ($(BR2_PACKAGE_Z3_PYTHON),y) +Z3_CONF_OPTS += \ + -DCMAKE_INSTALL_PYTHON_PKG_DIR=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + -DZ3_BUILD_PYTHON_BINDINGS=ON +else +Z3_CONF_OPTS += -DZ3_BUILD_PYTHON_BINDINGS=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index 64587bc0df..cba7ed679e 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,7 +18,7 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -609,7 +609,7 @@ INSTALL: ALL install date.1 +@@ -615,7 +615,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". diff --git a/package/zic/zic.hash b/package/zic/zic.hash index c9c7491948..40f68f0299 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2022-August/000072.html -sha512 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06 tzcode2022c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2022-October/000075.html +sha512 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b tzcode2022f.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index bb5cd3c916..229afaadc2 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2022c +ZIC_VERSION = 2022f ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 2b678ae8c4..4b5012b807 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -46,15 +46,6 @@ case ":${PATH:-unset}:" in ;; esac -if test -n "$PERL_MM_OPT" ; then - echo - echo "You have PERL_MM_OPT defined because Perl local::lib" - echo "is installed on your system. Please unset this variable" - echo "before starting Buildroot, otherwise the compilation of" - echo "Perl related packages will fail" - exit 1 -fi - check_prog_host() { prog="$1" diff --git a/support/testing/tests/package/test_z3.py b/support/testing/tests/package/test_z3.py new file mode 100644 index 0000000000..71b074a587 --- /dev/null +++ b/support/testing/tests/package/test_z3.py @@ -0,0 +1,44 @@ +import os + +import infra.basetest + + +class TestZ3(infra.basetest.BRTest): + # Need to use a different toolchain than the default due to + # z3 requiring fenv.h not provided by uclibc. + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_Z3=y + BR2_PACKAGE_Z3_PYTHON=y + BR2_ROOTFS_OVERLAY="{}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + # overlay to add a z3 smt and python test scripts + infra.filepath("tests/package/test_z3/rootfs-overlay")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check program executes + cmd = "z3 --version" + self.assertRunOk(cmd) + + # Run a basic smt2 example + cmd = "z3 /root/z3test.smt2" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "unsat") + + # Run a basic python example + cmd = "/root/z3test.py" + self.assertRunOk(cmd, timeout=10) diff --git a/support/testing/tests/package/test_z3/rootfs-overlay/root/z3test.py b/support/testing/tests/package/test_z3/rootfs-overlay/root/z3test.py new file mode 100755 index 0000000000..98b8e57b56 --- /dev/null +++ b/support/testing/tests/package/test_z3/rootfs-overlay/root/z3test.py @@ -0,0 +1,21 @@ +#! /usr/bin/env python3 + +import z3 + +x = z3.Real('x') +y = z3.Real('y') +z = z3.Real('z') +s = z3.Solver() + +s.add(3 * x + 2 * y - z == 1) +s.add(2 * x - 2 * y + 4 * z == -2) +s.add(-x + y / 2 - z == 0) + +check = s.check() +model = s.model() + +print(check) +print(model) + +assert check == z3.sat +assert model[x] == 1 and model[y] == -2 and model[z] == -2 diff --git a/support/testing/tests/package/test_z3/rootfs-overlay/root/z3test.smt2 b/support/testing/tests/package/test_z3/rootfs-overlay/root/z3test.smt2 new file mode 100644 index 0000000000..08df9e27a2 --- /dev/null +++ b/support/testing/tests/package/test_z3/rootfs-overlay/root/z3test.smt2 @@ -0,0 +1,8 @@ +; From https://smtlib.cs.uiowa.edu/examples.shtml +; Basic Boolean example +(set-option :print-success false) +(set-logic QF_UF) +(declare-const p Bool) +(assert (and p (not p))) +(check-sat) ; returns 'unsat' +(exit)