From 727ca56d1426171052ccdc39e33dd72adbbbe1cf Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 24 May 2022 16:32:39 +0200 Subject: [PATCH 001/102] package/linux-firmware: install all RTL_RTW88 blobs Rather than installing just the three blobs mentioned explicitly in the .mk file, use a wildcard to install all blobs. At the time of this writing, this matches the following: -rw-r--r-- 1 arnout arnout 29K Mar 9 13:28 rtw8723d_fw.bin -rw-r--r-- 1 arnout arnout 136K Mar 9 13:28 rtw8821c_fw.bin -rw-r--r-- 1 arnout arnout 148K Mar 9 13:28 rtw8822b_fw.bin -rw-r--r-- 1 arnout arnout 198K Mar 9 13:28 rtw8822c_fw.bin -rw-r--r-- 1 arnout arnout 142K Mar 9 13:28 rtw8822c_wow_fw.bin I.e. rtw8821c_fw.bin and rtw8822c_wow_fw.bin were missing. Although including all blobs nearly doubles the size, it still totals to just 660K which wouldn't warrant making more refined sub-options. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- package/linux-firmware/linux-firmware.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 0c725737d0..64d096df14 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -154,9 +154,7 @@ endif # rtw88 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88),y) LINUX_FIRMWARE_FILES += \ - rtw88/rtw8723d_fw.bin \ - rtw88/rtw8822b_fw.bin \ - rtw88/rtw8822c_fw.bin + rtw88/rtw*.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif From 75301bf98821ccea20e38abeef41a15f0462be04 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 30 May 2022 15:27:07 +0200 Subject: [PATCH 002/102] package/libstrophe: bump to version 0.12.0 It requires a patch to fix a build issue, which has been submitted upstream. Signed-off-by: Michael Vetter Signed-off-by: Thomas Petazzoni --- package/libstrophe/0001-fix-ssize_t.patch | 49 +++++++++++++++++++++++ package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 package/libstrophe/0001-fix-ssize_t.patch diff --git a/package/libstrophe/0001-fix-ssize_t.patch b/package/libstrophe/0001-fix-ssize_t.patch new file mode 100644 index 0000000000..39b456de57 --- /dev/null +++ b/package/libstrophe/0001-fix-ssize_t.patch @@ -0,0 +1,49 @@ +From f31ef9c35c9bba831510777d551c4179295b208f Mon Sep 17 00:00:00 2001 +From: Michael Vetter +Date: Mon, 30 May 2022 14:47:44 +0200 +Subject: [PATCH] Include sys/types.h for ssize_t +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When compiling on buildroot I get: +`src/tls.c:235:28: error: ‘ssize_t’ undeclared (first use in this +function); did you mean ‘size_t’? ` + +To have this POSIX type available we will need to include +`sys/types.h` on Linux. Unsure about other systems. + +Upstream: https://github.com/strophe/libstrophe/pull/207 +Signed-off-by: Michael Vetter +--- + src/rand.c | 1 + + src/tls.c | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/src/rand.c b/src/rand.c +index 061e85ee..25e4614a 100644 +--- a/src/rand.c ++++ b/src/rand.c +@@ -28,6 +28,7 @@ + #if __GLIBC_PREREQ(2, 25) + #define USE_GETRANDOM + #include ++#include + #include + #endif + #endif +diff --git a/src/tls.c b/src/tls.c +index 17d85dda..54746baa 100644 +--- a/src/tls.c ++++ b/src/tls.c +@@ -21,6 +21,10 @@ + #include + #include + ++#if defined(__linux__) ++#include ++#endif ++ + #include "strophe.h" + + #include "common.h" diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index 9551b191c6..66ff0e7e7e 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 feafee545403d26a44aa573d4adf327d6d07ad3f3466370634d22bbac5bd49ee libstrophe-0.11.0.tar.xz +sha256 8e44acb26018816f9856626bd5ff924a36cc612d2b3747ee634d626326b72df7 libstrophe-0.12.0.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 04ba0a69d0..f48d073770 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.11.0 +LIBSTROPHE_VERSION = 0.12.0 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf From 32f93b0ef2c602dfa1f5b243ba865d5b16e2fa33 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Mon, 30 May 2022 12:38:27 +0900 Subject: [PATCH 003/102] package/elf2flt: update RISC-V 64-bits support Remove the old elf2flt 0002-elf2flt-add-riscv-64-bits-support.patch patch file for riscv64 architecture and replace it with 3 patches: (1) The first patch fixes the data section alignment (2) The second patch fixes a bug with the handling of the eh_frame section causing text and data section overlap problems. (3) The third patch adds a simpler riscv64 flat bin relocation support. These 3 patches are submitted to the upstream elf2flt project as pull request #22: https://github.com/uclinux-dev/elf2flt/pull/22 Signed-off-by: Niklas Cassel Signed-off-by: Damien Le Moal Signed-off-by: Thomas Petazzoni --- ...tate-32-byte-alignment-for-.data-sec.patch | 81 +++++++++++++++++++ ...f2flt-fix-.eh_frame-section-handling.patch | 73 +++++++++++++++++ ...4-elf2flt-add-riscv-64-bits-support.patch} | 80 +++++++----------- 3 files changed, 181 insertions(+), 53 deletions(-) create mode 100644 package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch create mode 100644 package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch rename package/elf2flt/{0002-elf2flt-add-riscv-64-bits-support.patch => 0004-elf2flt-add-riscv-64-bits-support.patch} (52%) diff --git a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch new file mode 100644 index 0000000000..4df3ea5929 --- /dev/null +++ b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch @@ -0,0 +1,81 @@ +From 85ba5664eb368eb1cbd2c30b7cd574acd75edd4c Mon Sep 17 00:00:00 2001 +From: Niklas Cassel +Date: Mon, 4 Apr 2022 15:30:24 +0200 +Subject: [PATCH] elf2flt.ld: reinstate 32 byte alignment for .data section + +Commit 8a3e74446fe7 ("allow to build arm flat binaries") moved the +following commands: + . = ALIGN(0x20) ; + @SYMBOL_PREFIX@_etext = . ; +from the .text section to the top level in the SECTIONS node. + +The .text output section is being directed to a memory region using the +"> flatmem :text" output section attribute. Commands in the top level in +the SECTIONS node are not. + +This means that the ALIGN() command is no longer being appended to the +flatmem memory region, it will simply update the Location Counter. + +The heuristic for placing an output section is described here: +https://sourceware.org/binutils/docs-2.38/ld.html#Output-Section-Address + +"If an output memory region is set for the section then it is added to this +region and its address will be the next free address in that region." + +Since the .data section is being directed to the same memory region as the +.text section, this means that the Location Counter is not used when +assigning an address to the .data output section, it will simply use the +next free address. + +No longer directing these commands to the flatmem memory region means that +the .data output section is no longer aligned to a 32 byte boundary. + +Before commit 8a3e74446fe7 ("allow to build arm flat binaries"): +$ readelf -S busybox_unstripped.gdb | grep data + [ 3] .data PROGBITS 0000000000035ac0 00036ac0 +$ readelf -s busybox_unstripped.gdb | grep _etext + 19286: 0000000000035ac0 0 NOTYPE GLOBAL DEFAULT 1 _etext + +After commit 8a3e74446fe7 ("allow to build arm flat binaries"): +$ readelf -S busybox_unstripped.gdb | grep data + [ 3] .data PROGBITS 0000000000035ab0 00036ab0 +$ readelf -s busybox_unstripped.gdb | grep _etext + 19287: 0000000000035ac0 0 NOTYPE GLOBAL DEFAULT 3 _etext + +The .data output section has to be aligned to a 32 byte boundary, see the +FLAT_DATA_ALIGN 0x20 macro and its usage in fs/binfmt_flat.c: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/binfmt_flat.c?h=v5.17#n59 + +Readd an explicit ALIGN attribute on the .data section itself, since the +linker will obey this attribute regardless if being directed to a memory +region or not. Also remove the ALIGN() command before the .data section, +since this misleads the reader to think that the Location Counter is used +when assigning an address to the .data section, when it actually is not. + +Fixes: 8a3e74446fe7 ("allow to build arm flat binaries") +Signed-off-by: Niklas Cassel +--- + elf2flt.ld.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/elf2flt.ld.in b/elf2flt.ld.in +index 0df999d..e5aea14 100644 +--- a/elf2flt.ld.in ++++ b/elf2flt.ld.in +@@ -94,12 +94,9 @@ W_RODAT: *(.gnu.linkonce.r*) + *(.ARM.exidx* .gnu.linkonce.armexidx.*) + } > flatmem + @SYMBOL_PREFIX@__exidx_end = .; +- +- . = ALIGN(0x20) ; + @SYMBOL_PREFIX@_etext = . ; + +- .data : { +- . = ALIGN(0x4) ; ++ .data ALIGN(0x20): { + @SYMBOL_PREFIX@_sdata = . ; + @SYMBOL_PREFIX@__data_start = . ; + @SYMBOL_PREFIX@data_start = . ; +-- +2.35.1 + diff --git a/package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch b/package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch new file mode 100644 index 0000000000..e7e8c6f25b --- /dev/null +++ b/package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch @@ -0,0 +1,73 @@ +From 8b7fdb1dedfb8a6e858b46e5af33029fe0462ab8 Mon Sep 17 00:00:00 2001 +From: Damien Le Moal +Date: Tue, 10 May 2022 23:14:36 +0900 +Subject: [PATCH] elf2flt: fix .eh_frame section handling + +elf2flt.ld linker script positions the .eh_frame section in an output +section after the .text and .data output sections. + +However, when elf2flt.c is supplied the ELF linked using the elf2flt.ld +linker script, it only looks at the flags for each input section, and +then puts it in either a bFLT text, data or bss output section. + +Commit ba379d08bb7 ("elf2flt: fix for segfault on some ARM ELFs") +modified the section scanning loop of elf2flt main() function to put +read-only relocation data sections in the bFLT text output section so +that the .ARM.exidx section is placed in the .text flat output section. +Previously a read-only relocation data section would be put in the data +output section. + +On ARM, the .eh_frame section does not have the SEC_RELOC flag set, so +it will still end up in the data output section. However, on +architectures that generates the .eh_frame section with the SEC_RELOC +flag set, this section will now be placed in the text output section. + +The logic in elf2flt will handle all sections in order, and since the +input order is .text, .data, and .eh_frame, putting .eh_frame in text +output section does not work, since elf2flt.c has already put the .data +input section in the bFLT data output section. This leads to the +following print (example for riscv64 architecture): + +buildroot/output/host/riscv64-buildroot-linux-uclibc/bin/elf2flt: +ERROR: text=0x3bab8 overlaps data=0x33f60 ? + +The way that elf2flt is written, we cannot append to the text output +section after an input section has been added to the data output +section. It might be possible to change this, but that would require +moving all the code the was already placed in the data output section. + +Instead, let's allow putting a read-only relocation data section in the +text output section (so that .ARM.exidx will still be placed correctly), +but only if there has not yet been anything placed in the data output +section. + +That way .ARM.exidx will still be placed correctly, and .eh_frame will +be placed correctly in the .data output section, regardless if it has +flag SEC_RELOC set or not. + +Fixes: ba379d08bb7 ("elf2flt: fix for segfault on some ARM ELFs") +Signed-off-by: Damien Le Moal +Signed-off-by: Niklas Cassel +--- + elf2flt.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/elf2flt.c b/elf2flt.c +index 7ac0617..da25e93 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -1877,8 +1877,9 @@ int main(int argc, char *argv[]) + bfd_vma sec_vma; + + if ((s->flags & SEC_CODE) || +- ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == +- (SEC_DATA | SEC_READONLY | SEC_RELOC))) { ++ (((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == ++ (SEC_DATA | SEC_READONLY | SEC_RELOC)) && ++ !data_len)) { + vma = &text_vma; + len = &text_len; + } else if (s->flags & SEC_DATA) { +-- +2.35.1 + diff --git a/package/elf2flt/0002-elf2flt-add-riscv-64-bits-support.patch b/package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch similarity index 52% rename from package/elf2flt/0002-elf2flt-add-riscv-64-bits-support.patch rename to package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch index c530bc020d..15c191c83d 100644 --- a/package/elf2flt/0002-elf2flt-add-riscv-64-bits-support.patch +++ b/package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch @@ -1,4 +1,4 @@ -From 3879965dfda08a24e7d44ed76bbcc2f4a41df1fa Mon Sep 17 00:00:00 2001 +From 3f1f323feb5cf25d8c80861991d0360784f4d2e6 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Wed, 9 Sep 2020 17:31:33 +0900 Subject: [PATCH] elf2flt: add riscv 64-bits support @@ -6,32 +6,28 @@ Subject: [PATCH] elf2flt: add riscv 64-bits support Add support for riscv 64bits ISA by defining the relocation types R_RISCV_32_PCREL, R_RISCV_ADD32, R_RISCV_SUB32, R_RISCV_32 and R_RISCV_64. riscv64 support also needs the __global_pointer$ symbol to -be defined right after the relocation tables in the data section. -Furthermore, the .got and .got.plt sections must be reversed. These 2 -requirements are handled with runtime modifications of the default -linker script using the append_sed() function. -(1) For the .got.plt and .got sections order swap, append_sed() is used -to rename "(.got.plt)" to "(.got.tmp)" and to rename "(.got)" to -"(.got.plt)". A last call finalize the name swap by replacing -"(.got.tmp)" with "(.got)" -(2) For the global pointer synbol, a definition line starting with -"RISCV_GP" is added. The "RISCV_GP" string is removed if the target CPU -type is riscv64. The definition line is dropped for other CPU types. +be defined right after the relocation tables in the data section. To +define this symbol, the "RISCV_GP" line prefix is added. The "RISCV_GP" +string is removed if the target CPU type is riscv64 and the definition +line is dropped for other CPU types. -With these changes, buildroot/busybox builds and run on NOMMU -systems with kernel 5.13. Tested on Canaan Kendryte K210 boards. +With these changes, buildroot and busybox build and run on riscv NOMMU +systems with Linux kernel including patch 6045ab5fea4c +("binfmt_flat: do not stop relocating GOT entries prematurely on riscv") +fixing the binfmt_flat loader. Tested on QEMU and Canaan Kendryte K210 +boards. This patch is based on earlier work by Christoph Hellwig . Signed-off-by: Damien Le Moal --- - elf2flt.c | 23 +++++++++++++++++++++++ + elf2flt.c | 16 ++++++++++++++++ elf2flt.ld.in | 1 + - ld-elf2flt.c | 16 ++++++++++++++++ - 3 files changed, 40 insertions(+) + ld-elf2flt.c | 8 ++++++++ + 3 files changed, 25 insertions(+) diff --git a/elf2flt.c b/elf2flt.c -index ea6b5a1..7100c20 100644 +index da25e93..a03ea3a 100644 --- a/elf2flt.c +++ b/elf2flt.c @@ -81,6 +81,8 @@ const char *elf2flt_progname; @@ -52,14 +48,16 @@ index ea6b5a1..7100c20 100644 #else #error "Don't know how to support your CPU architecture??" #endif -@@ -821,6 +825,16 @@ output_relocs ( +@@ -812,6 +816,18 @@ output_relocs ( goto good_32bit_resolved_reloc; default: goto bad_resolved_reloc; +#elif defined(TARGET_riscv64) + case R_RISCV_32_PCREL: + case R_RISCV_ADD32: ++ case R_RISCV_ADD64: + case R_RISCV_SUB32: ++ case R_RISCV_SUB64: + continue; + case R_RISCV_32: + case R_RISCV_64: @@ -69,27 +67,11 @@ index ea6b5a1..7100c20 100644 #else default: /* The default is to assume that the -@@ -1841,6 +1855,15 @@ int main(int argc, char *argv[]) - if (!load_to_ram && !pfile) - load_to_ram = 1; - -+#if defined(TARGET_riscv64) -+ /* -+ * riscv only supports loading text and data contiguously. -+ * So fail if load_to_ram is false. -+ */ -+ if (!load_to_ram) -+ fatal("Loading to RAM ('-r' option) is required"); -+#endif -+ - fname = argv[argc-1]; - - if (pfile) { diff --git a/elf2flt.ld.in b/elf2flt.ld.in -index 0df999d..f1eed1f 100644 +index e5aea14..950849e 100644 --- a/elf2flt.ld.in +++ b/elf2flt.ld.in -@@ -109,6 +109,7 @@ W_RODAT: *(.gnu.linkonce.r*) +@@ -106,6 +106,7 @@ W_RODAT: *(.gnu.linkonce.r*) . = ALIGN(0x20) ; LONG(-1) . = ALIGN(0x20) ; @@ -98,32 +80,24 @@ index 0df999d..f1eed1f 100644 R_RODAT: *(.rodata1) R_RODAT: *(.rodata.*) diff --git a/ld-elf2flt.c b/ld-elf2flt.c -index 7cb02d5..1a503dd 100644 +index 7cb02d5..75ee1bb 100644 --- a/ld-elf2flt.c +++ b/ld-elf2flt.c -@@ -324,6 +324,22 @@ static int do_final_link(void) +@@ -324,6 +324,14 @@ static int do_final_link(void) append_option(&other_options, concat(got_offset, "=", buf, NULL)); } -+ if (streq(TARGET_CPU, "riscv64")) { -+ /* -+ * The .got section must come before the .got.plt section -+ * (gcc/ld bug ?). -+ */ -+ append_sed(&sed, "(.got.plt)", "(.got.tmp)"); -+ append_sed(&sed, "(.got.plt)", "(.got)"); -+ append_sed(&sed, "(.got.tmp)", "(.got.plt)"); -+ -+ /* The global pointer symbol is defined after the GOT. */ ++ /* riscv adds a global pointer symbol to the linker file with the ++ "RISCV_GP:" prefix. Remove the prefix for riscv64 architecture and ++ the entire line for other architectures. */ ++ if (streq(TARGET_CPU, "riscv64")) + append_sed(&sed, "^RISCV_GP:", ""); -+ } else { -+ /* Get rid of the global pointer definition. */ ++ else + append_sed(&sed, "^RISCV_GP:", NULL); -+ } + /* Locate the default linker script, if we don't have one provided. */ if (!linker_script) linker_script = concat(ldscriptpath, "/elf2flt.ld", NULL); -- -2.35.1 +2.36.1 From 3e50b5fe2632a3081fd3f6574a5e9525fa897fdb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 30 May 2022 21:05:09 +0200 Subject: [PATCH 004/102] package/elf2flt: update AUTORECONF comment The patch that causes the need for AUTORECONF = YES has been renamed a while ago, fix the corresponding comment. Signed-off-by: Thomas Petazzoni --- package/elf2flt/elf2flt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 11cacaf9e0..9230e3ce1a 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -11,7 +11,7 @@ ELF2FLT_LICENSE_FILES = LICENSE.TXT HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib -# 0003-elf2flt-handle-binutils-2.34.patch +# 0001-elf2flt-handle-binutils-2.34.patch HOST_ELF2FLT_AUTORECONF = YES # It is not exactly a host variant, but more a cross variant, which is From cecb262571a1754c0e88b7b6e6acece13db9c5d6 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Mon, 30 May 2022 12:38:28 +0900 Subject: [PATCH 005/102] board/riscv/nommu: add common Linux kernel patch for RISCV NOMMU builds Add the board/riscv/nommu directory to add a Linux kernel patch used for all RISC-V NOMMU builds (QEMU and Canaan Kendryte K210 SoC based boards). The patch is upstream and will be part of the upcoming 5.19 release. Signed-off-by: Damien Le Moal Signed-off-by: Thomas Petazzoni --- ...ot-stop-relocating-GOT-entries-prema.patch | 110 ++++++++++++++++++ board/riscv/nommu/patches/linux/readme.txt | 3 + 2 files changed, 113 insertions(+) create mode 100644 board/riscv/nommu/patches/linux/5.18/0001-binfmt_flat-do-not-stop-relocating-GOT-entries-prema.patch create mode 100644 board/riscv/nommu/patches/linux/readme.txt diff --git a/board/riscv/nommu/patches/linux/5.18/0001-binfmt_flat-do-not-stop-relocating-GOT-entries-prema.patch b/board/riscv/nommu/patches/linux/5.18/0001-binfmt_flat-do-not-stop-relocating-GOT-entries-prema.patch new file mode 100644 index 0000000000..e5513b729b --- /dev/null +++ b/board/riscv/nommu/patches/linux/5.18/0001-binfmt_flat-do-not-stop-relocating-GOT-entries-prema.patch @@ -0,0 +1,110 @@ +From 6045ab5fea4c849153ebeb0acb532da5f29d69c4 Mon Sep 17 00:00:00 2001 +From: Niklas Cassel +Date: Thu, 14 Apr 2022 11:10:18 +0200 +Subject: binfmt_flat: do not stop relocating GOT entries prematurely on riscv + +Upstream commit 6045ab5fea4c849153ebeb0acb532da5f29d69c4. + +bFLT binaries are usually created using elf2flt. + +The linker script used by elf2flt has defined the .data section like the +following for the last 19 years: + +.data : { + _sdata = . ; + __data_start = . ; + data_start = . ; + *(.got.plt) + *(.got) + FILL(0) ; + . = ALIGN(0x20) ; + LONG(-1) + . = ALIGN(0x20) ; + ... +} + +It places the .got.plt input section before the .got input section. +The same is true for the default linker script (ld --verbose) on most +architectures except x86/x86-64. + +The binfmt_flat loader should relocate all GOT entries until it encounters +a -1 (the LONG(-1) in the linker script). + +The problem is that the .got.plt input section starts with a GOTPLT header +(which has size 16 bytes on elf64-riscv and 8 bytes on elf32-riscv), where +the first word is set to -1. See the binutils implementation for riscv [1]. + +This causes the binfmt_flat loader to stop relocating GOT entries +prematurely and thus causes the application to crash when running. + +Fix this by skipping the whole GOTPLT header, since the whole GOTPLT header +is reserved for the dynamic linker. + +The GOTPLT header will only be skipped for bFLT binaries with flag +FLAT_FLAG_GOTPIC set. This flag is unconditionally set by elf2flt if the +supplied ELF binary has the symbol _GLOBAL_OFFSET_TABLE_ defined. +ELF binaries without a .got input section should thus remain unaffected. + +Tested on RISC-V Canaan Kendryte K210 and RISC-V QEMU nommu_virt_defconfig. + +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=bfd/elfnn-riscv.c;hb=binutils-2_38#l3275 + +Cc: +Signed-off-by: Niklas Cassel +Reviewed-by: Damien Le Moal +Link: https://lore.kernel.org/r/20220414091018.896737-1-niklas.cassel@wdc.com +Fixed-by: kernel test robot +Link: https://lore.kernel.org/lkml/202204182333.OIUOotK8-lkp@intel.com +Signed-off-by: Kees Cook +--- + fs/binfmt_flat.c | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c +index 6268981500112..dca0b6875f9c3 100644 +--- a/fs/binfmt_flat.c ++++ b/fs/binfmt_flat.c +@@ -440,6 +440,30 @@ static void old_reloc(unsigned long rl) + + /****************************************************************************/ + ++static inline u32 __user *skip_got_header(u32 __user *rp) ++{ ++ if (IS_ENABLED(CONFIG_RISCV)) { ++ /* ++ * RISC-V has a 16 byte GOT PLT header for elf64-riscv ++ * and 8 byte GOT PLT header for elf32-riscv. ++ * Skip the whole GOT PLT header, since it is reserved ++ * for the dynamic linker (ld.so). ++ */ ++ u32 rp_val0, rp_val1; ++ ++ if (get_user(rp_val0, rp)) ++ return rp; ++ if (get_user(rp_val1, rp + 1)) ++ return rp; ++ ++ if (rp_val0 == 0xffffffff && rp_val1 == 0xffffffff) ++ rp += 4; ++ else if (rp_val0 == 0xffffffff) ++ rp += 2; ++ } ++ return rp; ++} ++ + static int load_flat_file(struct linux_binprm *bprm, + struct lib_info *libinfo, int id, unsigned long *extra_stack) + { +@@ -789,7 +813,8 @@ static int load_flat_file(struct linux_binprm *bprm, + * image. + */ + if (flags & FLAT_FLAG_GOTPIC) { +- for (rp = (u32 __user *)datapos; ; rp++) { ++ rp = skip_got_header((u32 __user *) datapos); ++ for (; ; rp++) { + u32 addr, rp_val; + if (get_user(rp_val, rp)) + return -EFAULT; +-- +cgit + diff --git a/board/riscv/nommu/patches/linux/readme.txt b/board/riscv/nommu/patches/linux/readme.txt new file mode 100644 index 0000000000..ea754c9920 --- /dev/null +++ b/board/riscv/nommu/patches/linux/readme.txt @@ -0,0 +1,3 @@ +RISC-V NOMMU Common Support + +This directory provides Linux kernel patches common to all RISC-V NO-MMU builds. From 1b298db82fa7b108053f08110d50f4650fcc74ac Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Mon, 30 May 2022 12:38:29 +0900 Subject: [PATCH 006/102] configs/qemu_riscv64_nommu_virt_defconfig: new defconfig Add RISC-V 64-bit nommu defconfig for QEMU virt machine with MMU disabled. Unlike qemu_riscv64_virt, qemu_riscv64_nommu_virt does not use OpenSBI, since the kernel is running in machine mode (M-mode). After the build is complete, you can start QEMU using the launcher script: $ output/images/start-qemu.sh Signed-off-by: Niklas Cassel Signed-off-by: Damien Le Moal Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ board/qemu/riscv64-virt/readme.txt | 2 ++ configs/qemu_riscv64_nommu_virt_defconfig | 37 +++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 configs/qemu_riscv64_nommu_virt_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c33959fa45..435fa28478 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2153,6 +2153,9 @@ N: Nicolas Serafini F: package/exiv2/ F: package/ofono/ +N: Niklas Cassel +F: configs/qemu_riscv64_nommu_virt_defconfig + N: Nikolay Dimitrov F: board/embest/riotboard/ F: configs/riotboard_defconfig diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt index 747a9ea674..9e4cfc8c55 100644 --- a/board/qemu/riscv64-virt/readme.txt +++ b/board/qemu/riscv64-virt/readme.txt @@ -2,4 +2,6 @@ Run Linux in emulation with: qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig + qemu-system-riscv64 -M virt -bios none -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -nographic -cpu rv64,mmu=off # qemu_riscv64_nommu_virt_defconfig + The login prompt will appear in the terminal that started Qemu. diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig new file mode 100644 index 0000000000..bfee9e710a --- /dev/null +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -0,0 +1,37 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y + +# Patches +BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches" + +# Toolchain +BR2_PACKAGE_HOST_ELF2FLT=y +# BR2_USE_MMU is not set + +# Busybox with hush +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" + +# System +BR2_TARGET_GENERIC_GETTY=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18" +BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" +BR2_LINUX_KERNEL_IMAGE=y + +# Disable network scripts +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From d35ba174095b86a0cf724179f7d4e8d0e3d9c127 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Mon, 30 May 2022 21:19:54 +0200 Subject: [PATCH 007/102] package/python-serial: add host variant This will be needed by the upcoming python-kflash package. Signed-off-by: Damien Le Moal [Thomas: split from a larger patch from Damien Le Moal] Signed-off-by: Thomas Petazzoni --- package/python-serial/python-serial.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk index 249ea9d5a3..87cd9392f1 100644 --- a/package/python-serial/python-serial.mk +++ b/package/python-serial/python-serial.mk @@ -12,3 +12,4 @@ PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt PYTHON_SERIAL_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) From 8131ef6554aa34b388de33b6e340b125620c0c78 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Mon, 30 May 2022 12:38:30 +0900 Subject: [PATCH 008/102] package/python-kflash: new package Add the kflash Kendryte K210 UART ISP Utility as a host package to allow users to program their board boot ROM or SRAM with built images. The kflash utility is available through the pypi.org python package index. The project is homepage is: https://github.com/vowstar/kflash.py. Signed-off-by: Damien Le Moal Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in.host | 1 + package/python-kflash/Config.in.host | 7 +++++++ package/python-kflash/python-kflash.hash | 5 +++++ package/python-kflash/python-kflash.mk | 15 +++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/python-kflash/Config.in.host create mode 100644 package/python-kflash/python-kflash.hash create mode 100644 package/python-kflash/python-kflash.mk diff --git a/DEVELOPERS b/DEVELOPERS index 435fa28478..096ca94f4e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -630,6 +630,9 @@ N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ +N: Damien Le Moal +F: package/python-kflash/ + N: Daniel Nicoletti F: package/cutelyst/ diff --git a/package/Config.in.host b/package/Config.in.host index cd1c34b5a3..8d2a8f4801 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -72,6 +72,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-greenlet/Config.in.host" + source "package/python-kflash/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" diff --git a/package/python-kflash/Config.in.host b/package/python-kflash/Config.in.host new file mode 100644 index 0000000000..0be8c18f15 --- /dev/null +++ b/package/python-kflash/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_KFLASH + bool "host python-kflash" + depends on BR2_RISCV_64 && !BR2_USE_MMU + help + Kendryte UART ISP Utility - programming code to k210. + + https://github.com/vowstar/kflash.py diff --git a/package/python-kflash/python-kflash.hash b/package/python-kflash/python-kflash.hash new file mode 100644 index 0000000000..722c4e879b --- /dev/null +++ b/package/python-kflash/python-kflash.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/kflash/json +md5 85549bcc1faa0f2cd5ebe3b04759e7fa kflash-1.1.5.tar.gz +sha256 40a0976b52942c7a3bdfa2d9e2bdc8d7526cf6deb0759c8384281240c8fb404e kflash-1.1.5.tar.gz +# Locally computed sha256 checksums +sha256 c48133d7a08d743c2c01c6190fc1860f7d73777afa2199ed8d0a035b754d8bf9 LICENSE diff --git a/package/python-kflash/python-kflash.mk b/package/python-kflash/python-kflash.mk new file mode 100644 index 0000000000..adbf6b30b0 --- /dev/null +++ b/package/python-kflash/python-kflash.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-kflash +# +################################################################################ + +PYTHON_KFLASH_VERSION = 1.1.5 +PYTHON_KFLASH_SOURCE = kflash-$(PYTHON_KFLASH_VERSION).tar.gz +PYTHON_KFLASH_SITE = https://files.pythonhosted.org/packages/c4/b3/1c25a92922bfd3dbc05d972352c071167cad035c615f6f068f75c2f0fd01 +PYTHON_KFLASH_SETUP_TYPE = setuptools +PYTHON_KFLASH_LICENSE = MIT +PYTHON_KFLASH_LICENSE_FILES = LICENSE +HOST_PYTHON_KFLASH_DEPENDENCIES = host-python-pyelftools host-python-serial + +$(eval $(host-python-package)) From 53a23c3e5e286fb91ced437292792ecdd73a6324 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 24 May 2022 19:00:06 -0300 Subject: [PATCH 009/102] configs/imx6-sabresd: bump U-Boot and kernel Bump U-Boot to 2022.04 and kernel to 5.15.41 version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6-sabresd_defconfig | 4 ++-- configs/imx6-sabresd_qt5_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 19986f2cbb..c237c2dc7c 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -33,7 +33,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.41" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 38a86131dd..d962ac6897 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -30,7 +30,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -39,7 +39,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.41" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" From 935617e016ab3fee14af2d515b598591f7798298 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 22 May 2022 20:47:41 +0200 Subject: [PATCH 010/102] package/xmrig: enable for avmv7a Available since 2017: https://github.com/xmrig/xmrig/commit/aa4f8b6fa78eb8331b5927ba5315b926ac75ce9c We noticed it since its addition to the readme: https://github.com/xmrig/xmrig/commit/97869f3347a621d9dbf20210289ce10c68a5bd34 Added patch to fix build with gcc-4.8. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...0001-astrobwt-fix-build-with-gcc-4.8.patch | 40 +++++++++++++++++++ package/xmrig/Config.in | 4 +- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 package/xmrig/0001-astrobwt-fix-build-with-gcc-4.8.patch diff --git a/package/xmrig/0001-astrobwt-fix-build-with-gcc-4.8.patch b/package/xmrig/0001-astrobwt-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..694d7b203c --- /dev/null +++ b/package/xmrig/0001-astrobwt-fix-build-with-gcc-4.8.patch @@ -0,0 +1,40 @@ +From 72234ae73590fa93d837034a3fb48b71eb071a2a Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 22 May 2022 20:24:14 +0200 +Subject: [PATCH] astrobwt: fix build with gcc-4.8 + +Fixes build error: + +xmrig-6.17.0/src/crypto/astrobwt/sort_indices2.cpp:40:24: error: missing binary operator before token "(" + #if __has_cpp_attribute(unlikely) + +found with the buildroot toolchain +arm-none-linux-gnueabi-gcc (Sourcery CodeBench Lite 2014.05-29) 4.8.3 20140320 (prerelease) + +Inspired by +https://reviews.llvm.org/rG91c32fd8c8fa395971a028f7091273fa2c8f44e6 + +Patch sent upstream: https://github.com/xmrig/xmrig/pull/3057 + +Signed-off-by: Bernd Kuhls +--- + src/crypto/astrobwt/sort_indices2.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/crypto/astrobwt/sort_indices2.cpp b/src/crypto/astrobwt/sort_indices2.cpp +index 2d86d462..3a70f619 100644 +--- a/src/crypto/astrobwt/sort_indices2.cpp ++++ b/src/crypto/astrobwt/sort_indices2.cpp +@@ -36,6 +36,9 @@ + #define RESTRICT + #endif + ++#ifndef __has_cpp_attribute ++#define __has_cpp_attribute(x) 0 ++#endif + + #if __has_cpp_attribute(unlikely) + #define UNLIKELY(X) (X) [[unlikely]] +-- +2.30.2 + diff --git a/package/xmrig/Config.in b/package/xmrig/Config.in index c5c6b3e37b..4c70abec6f 100644 --- a/package/xmrig/Config.in +++ b/package/xmrig/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_XMRIG bool "xmrig" # archs officially supported by upstream - depends on BR2_aarch64 || BR2_x86_64 || BR2_i386 + depends on BR2_ARM_CPU_ARMV7A || BR2_aarch64 || BR2_x86_64 || BR2_i386 depends on BR2_USE_MMU # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv @@ -16,7 +16,7 @@ config BR2_PACKAGE_XMRIG https://xmrig.com comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++" - depends on BR2_aarch64 || BR2_x86_64 || BR2_i386 + depends on BR2_ARM_CPU_ARMV7A || BR2_aarch64 || BR2_x86_64 || BR2_i386 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ From 80907060476f1a8b3ed69da2c11e5d1dbe670d87 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 30 May 2022 22:20:48 +0200 Subject: [PATCH 011/102] package/xmrig: introduce BR2_PACKAGE_XMRIG_ARCH_SUPPORTS This allows to avoid duplicating the list of architectures supported by xmrig. Signed-off-by: Thomas Petazzoni --- package/xmrig/Config.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/xmrig/Config.in b/package/xmrig/Config.in index 4c70abec6f..4dd16fa2b0 100644 --- a/package/xmrig/Config.in +++ b/package/xmrig/Config.in @@ -1,7 +1,14 @@ +# archs officially supported by upstream +config BR2_PACKAGE_XMRIG_ARCH_SUPPORTS + bool + default y if BR2_ARM_CPU_ARMV7A + default y if BR2_aarch64 + default y if BR2_x86_64 + default y if BR2_i386 + config BR2_PACKAGE_XMRIG bool "xmrig" - # archs officially supported by upstream - depends on BR2_ARM_CPU_ARMV7A || BR2_aarch64 || BR2_x86_64 || BR2_i386 + depends on BR2_PACKAGE_XMRIG_ARCH_SUPPORTS depends on BR2_USE_MMU # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv @@ -16,7 +23,7 @@ config BR2_PACKAGE_XMRIG https://xmrig.com comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++" - depends on BR2_ARM_CPU_ARMV7A || BR2_aarch64 || BR2_x86_64 || BR2_i386 + depends on BR2_PACKAGE_XMRIG_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ From 9866e2e64ac12ba6ea1461c2c7410c42125d7aac Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 26 May 2022 14:37:33 +0300 Subject: [PATCH 012/102] package/wpewebkit: allow building for risc-v WPE WebKit works just fine on RISC-V. For the current stable version the build system automatically picks the LLint JavaScript interpreter, and the upcoming 2.38.x release series will include (and automatically enable) JIT support. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wpewebkit/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 36523bdb41..8e80c73302 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -7,6 +7,10 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS # Disabled on MIPS big endian due to sigbus default y if BR2_mipsel || BR2_mips64el # Disabled on PowerPC pending runtime testing + # RISC-V needs the g/imafd ISA. + default y if BR2_riscv && BR2_RISCV_ISA_RVI \ + && BR2_RISCV_ISA_RVM && BR2_RISCV_ISA_RVA \ + && BR2_RISCV_ISA_RVF && BR2_RISCV_ISA_RVD # Disabled on SuperH because of segfault depends on BR2_USE_MMU # libglib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 From c3c19e82b482538870906161dc72a3efa7ca1b20 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 26 May 2022 14:37:34 +0300 Subject: [PATCH 013/102] package/webkitgtk: allow building for risc-v WebKitGTK works just fine on RISC-V. For the current stable version the build system automatically picks the LLint JavaScript interpreter, and the upcoming 2.38.x release series will include (and automatically enable) JIT support. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/webkitgtk/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index bc8207d93b..052800c8cf 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -7,6 +7,10 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS # Disabled on MIPS big endian due to sigbus default y if BR2_mipsel || BR2_mips64el # Disabled on PowerPC pending runtime testing + # RISC-V needs the g/imafd ISA. + default y if BR2_riscv && BR2_RISCV_ISA_RVI \ + && BR2_RISCV_ISA_RVM && BR2_RISCV_ISA_RVA \ + && BR2_RISCV_ISA_RVF && BR2_RISCV_ISA_RVD # Disabled on SuperH because of segfault depends on BR2_USE_MMU # libglib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 From 63c5c26646ba31caef1a3f3bb16c49a11903e5a8 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:51 +0200 Subject: [PATCH 014/102] package/erlang-idna: bump version to 230a917 Remove the unicode_util_compat library, which is not needed for the erlang version packaged in Buildroot. Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-idna/erlang-idna.hash | 4 ++-- package/erlang-idna/erlang-idna.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/erlang-idna/erlang-idna.hash b/package/erlang-idna/erlang-idna.hash index 2200bbad8d..7ee4807195 100644 --- a/package/erlang-idna/erlang-idna.hash +++ b/package/erlang-idna/erlang-idna.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d57e20ee88018ff0431e0275e91ada5915782870c9981fc798bcd05589031d6f erlang-idna-6.0.0.tar.gz -sha256 95f5c9410a95332b0833c4606028ee00008cd8c497336e230df3144d1a720bda LICENSE +sha256 916b092cb8d35ca6e63ec183a674a28ff2f745ce05fd0c9c06da34875f6fe8d8 erlang-idna-230a917.tar.gz +sha256 95f5c9410a95332b0833c4606028ee00008cd8c497336e230df3144d1a720bda LICENSE diff --git a/package/erlang-idna/erlang-idna.mk b/package/erlang-idna/erlang-idna.mk index 27a32fb06d..4ef34e82bf 100644 --- a/package/erlang-idna/erlang-idna.mk +++ b/package/erlang-idna/erlang-idna.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_IDNA_VERSION = 6.0.0 +ERLANG_IDNA_VERSION = 230a917 ERLANG_IDNA_SITE = $(call github,benoitc,erlang-idna,$(ERLANG_IDNA_VERSION)) ERLANG_IDNA_LICENSE = MIT ERLANG_IDNA_LICENSE_FILES = LICENSE From 4504ec7d4df07ee957bcd60f0e7958278499f5ed Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:52 +0200 Subject: [PATCH 015/102] package/erlang-lager: bump version to 3.9.1 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-lager/erlang-lager.hash | 4 ++-- package/erlang-lager/erlang-lager.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/erlang-lager/erlang-lager.hash b/package/erlang-lager/erlang-lager.hash index 40291af392..282d112d3b 100644 --- a/package/erlang-lager/erlang-lager.hash +++ b/package/erlang-lager/erlang-lager.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c5bb4ba6f918e90d2e6671c3996d72c61f2a589b65c151b3df8011d046362981 erlang-lager-3.6.10.tar.gz -sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE +sha256 13316ba3006b174cf6b085ad13ed19ec0f618f10b83fc3530a072cdf4b50668b erlang-lager-3.9.1.tar.gz +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE diff --git a/package/erlang-lager/erlang-lager.mk b/package/erlang-lager/erlang-lager.mk index a698bce8d5..7ff27ec0f2 100644 --- a/package/erlang-lager/erlang-lager.mk +++ b/package/erlang-lager/erlang-lager.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_LAGER_VERSION = 3.6.10 +ERLANG_LAGER_VERSION = 3.9.1 ERLANG_LAGER_SITE = $(call github,erlang-lager,lager,$(ERLANG_LAGER_VERSION)) ERLANG_LAGER_LICENSE = Apache-2.0 ERLANG_LAGER_LICENSE_FILES = LICENSE From 820bd7dee55686244b0ef6f88322b84c698d3716 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:53 +0200 Subject: [PATCH 016/102] package/erlang-p1-utils: bump version to 1.0.23 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-utils/erlang-p1-utils.hash | 2 +- package/erlang-p1-utils/erlang-p1-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-utils/erlang-p1-utils.hash b/package/erlang-p1-utils/erlang-p1-utils.hash index dec7c26039..082622098e 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.hash +++ b/package/erlang-p1-utils/erlang-p1-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 234b88227f61ef03a6177d97ed062c62a22760b6fd189a5a24d2fd1599d95ac9 erlang-p1-utils-1.0.20.tar.gz +sha256 05f29bc55a51840c84f4055b89d4cc312078badc5571a5962f15348fa5d87015 erlang-p1-utils-1.0.23.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-utils/erlang-p1-utils.mk b/package/erlang-p1-utils/erlang-p1-utils.mk index 084382cd2b..5804c2531d 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.mk +++ b/package/erlang-p1-utils/erlang-p1-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_UTILS_VERSION = 1.0.20 +ERLANG_P1_UTILS_VERSION = 1.0.23 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) ERLANG_P1_UTILS_LICENSE = Apache-2.0 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt From 611e084a5ef947ef2558e766450b6271e48ba936 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:54 +0200 Subject: [PATCH 017/102] package/erlang-p1-cache-tab: bump version to 1.0.29 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash | 2 +- package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash index 85a92cf0b2..9f03bdbfae 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 32cb3a3017f53e66bd1c2b75f60a2c4a14f00f375582a3c511ea39266b2385b9 erlang-p1-cache-tab-1.0.25.tar.gz +sha256 b11299eebafab6f1f5670650c48b10d9fa607ab092b4be8a976982e3f2b37526 erlang-p1-cache-tab-1.0.29.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk index f3253d1cd7..046235f24c 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_CACHE_TAB_VERSION = 1.0.25 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.29 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION)) ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt From 541381a1340dd6935021ebf8053bc93109932df8 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:55 +0200 Subject: [PATCH 018/102] package/erlang-p1-tls: bump version to 1.1.13 The copyright year in the license file has been updated to 2022, hence the new hash for the license. Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-tls/erlang-p1-tls.hash | 4 ++-- package/erlang-p1-tls/erlang-p1-tls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/erlang-p1-tls/erlang-p1-tls.hash b/package/erlang-p1-tls/erlang-p1-tls.hash index 475223b986..32d90ef7a0 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.hash +++ b/package/erlang-p1-tls/erlang-p1-tls.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 97fd0a398751fc63b28df016e92a08ea98d083f7d5e3f32380a92de1ee86ca0e erlang-p1-tls-1.1.9.tar.gz -sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt +sha256 5377671fed74a61518a742bc52d73941039d6e3c6e192133c7feaf5a83e1275b erlang-p1-tls-1.1.13.tar.gz +sha256 a401e98a7eef1c741b3e8b1a46a21730b4a1bc7020e4ec1a8c2a44dbd7f0ba5d LICENSE.txt diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index 9e7d4c7c73..1f79bf90c1 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/package/erlang-p1-tls/erlang-p1-tls.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_TLS_VERSION = 1.1.9 +ERLANG_P1_TLS_VERSION = 1.1.13 ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION)) ERLANG_P1_TLS_LICENSE = Apache-2.0 ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt From b680798eaa882c78cdeb3e703e1e7a8b76df69e6 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:56 +0200 Subject: [PATCH 019/102] package/erlang-p1-stringprep: bump version to 1.0.27 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-stringprep/erlang-p1-stringprep.hash | 2 +- package/erlang-p1-stringprep/erlang-p1-stringprep.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash index e23cc4f38b..eec611829a 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 47f9f8ee901f47b7f62c5140ea09f113efe7fedd5e8ffb92d50f51c5e11fb67f erlang-p1-stringprep-1.0.23.tar.gz +sha256 cdc2ffa6ba2171f55b78e69cfce5dab6099cbb6bc6955d88c5c53b0cf24d13af erlang-p1-stringprep-1.0.27.tar.gz sha256 f44415631770cb818de6d92f3961fdfe6e407a5154f84b87cc06ac27323e919c LICENSE.ALL sha256 42aef2a1337ef1f45ae2832aa5aa268c79b2560fb1f3ebab519629372cb24ffe LICENSE.TCL sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index 580f4a9aa9..233be52c58 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 1.0.23 +ERLANG_P1_STRINGPREP_VERSION = 1.0.27 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt From 22db16694406d6b2156acd74d3a49fafae6d015c Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:57 +0200 Subject: [PATCH 020/102] package/erlang-p1-xml: bump version to 1.1.49 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-xml/erlang-p1-xml.hash | 2 +- package/erlang-p1-xml/erlang-p1-xml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-p1-xml/erlang-p1-xml.hash index f2a4ab83e0..379ca7ef88 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/package/erlang-p1-xml/erlang-p1-xml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 739f37a161a570071469ab1f3d8fc232f004ea616700fe7e46b6d8afa9d03a60 erlang-p1-xml-1.1.44.tar.gz +sha256 02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265 erlang-p1-xml-1.1.49.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk index 5730181ac6..eee2c74c03 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.mk +++ b/package/erlang-p1-xml/erlang-p1-xml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XML_VERSION = 1.1.44 +ERLANG_P1_XML_VERSION = 1.1.49 ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION)) ERLANG_P1_XML_LICENSE = Apache-2.0 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt From 9b00be972a50fa71835e3c976af421ac7e92cb51 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:58 +0200 Subject: [PATCH 021/102] package/erlang-p1-xmpp: bump version to 1.5.6 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-xmpp/Config.in | 1 + package/erlang-p1-xmpp/erlang-p1-xmpp.hash | 2 +- package/erlang-p1-xmpp/erlang-p1-xmpp.mk | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-p1-xmpp/Config.in index 6e40fed10a..c67dc832b7 100644 --- a/package/erlang-p1-xmpp/Config.in +++ b/package/erlang-p1-xmpp/Config.in @@ -4,6 +4,7 @@ comment "erlang-p1-xmpp needs a toolchain w/ C++" config BR2_PACKAGE_ERLANG_P1_XMPP bool "erlang-p1-xmpp" depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep + select BR2_PACKAGE_ERLANG_IDNA select BR2_PACKAGE_ERLANG_P1_XML select BR2_PACKAGE_ERLANG_P1_STRINGPREP select BR2_PACKAGE_ERLANG_P1_TLS diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash index d0a761fcac..fce23c09c6 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 65c73ffaf8faab5d6fc7d42ada0b5a380f20f3e46056ad98614d81922322d9a2 erlang-p1-xmpp-1.4.10.tar.gz +sha256 bde03ad371aad3e171ebe94a5b3b84daa4b8dd7ee37e9979ff373cd65370e725 erlang-p1-xmpp-1.5.6.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk index f903cb945d..fc63b5ffc2 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XMPP_VERSION = 1.4.10 +ERLANG_P1_XMPP_VERSION = 1.5.6 ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION)) ERLANG_P1_XMPP_LICENSE = Apache-2.0 ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt From ad440eacbbd4852e97cdda18aa5bdd16094063b7 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:07:59 +0200 Subject: [PATCH 022/102] package/erlang-p1-yaml: bump version to 1.0.32 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-yaml/erlang-p1-yaml.hash | 2 +- package/erlang-p1-yaml/erlang-p1-yaml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.hash b/package/erlang-p1-yaml/erlang-p1-yaml.hash index 955a000930..89123dfd83 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/package/erlang-p1-yaml/erlang-p1-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8f53308438e4d1613562acb586b4c4540569d8305097508c40e6f261fe4216cd erlang-p1-yaml-1.0.28.tar.gz +sha256 6d5c823dd895b736b98325d88893a63c054964d7bde9a8e150fc4df5f4165065 erlang-p1-yaml-1.0.32.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk index e42ff5fe38..6acb6fe059 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ b/package/erlang-p1-yaml/erlang-p1-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YAML_VERSION = 1.0.28 +ERLANG_P1_YAML_VERSION = 1.0.32 ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION)) ERLANG_P1_YAML_LICENSE = Apache-2.0 ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt From 93500eaa3f72c39507f0f4d3d20e9eaa6ed341be Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:00 +0200 Subject: [PATCH 023/102] package/erlang-p1-yconf: bump version to 1.0.12 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-yconf/erlang-p1-yconf.hash | 2 +- package/erlang-p1-yconf/erlang-p1-yconf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.hash b/package/erlang-p1-yconf/erlang-p1-yconf.hash index 97e71f85cd..990f08dce9 100644 --- a/package/erlang-p1-yconf/erlang-p1-yconf.hash +++ b/package/erlang-p1-yconf/erlang-p1-yconf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ab0f7462b8d03d18be1587fa9cfb227923055f765fca4459b4bb42ccef971329 erlang-p1-yconf-1.0.8.tar.gz +sha256 e88f74c3950630e0ca7be41cbe2332d3ca600241f37779a862bdcc46f9031877 erlang-p1-yconf-1.0.12.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.mk b/package/erlang-p1-yconf/erlang-p1-yconf.mk index 3e3a10ae15..682ca08ff2 100644 --- a/package/erlang-p1-yconf/erlang-p1-yconf.mk +++ b/package/erlang-p1-yconf/erlang-p1-yconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YCONF_VERSION = 1.0.8 +ERLANG_P1_YCONF_VERSION = 1.0.12 ERLANG_P1_YCONF_SITE = $(call github,processone,yconf,$(ERLANG_P1_YCONF_VERSION)) ERLANG_P1_YCONF_LICENSE = Apache-2.0 ERLANG_P1_YCONF_LICENSE_FILES = LICENSE From 0c1968df1100ab575f8aba35bdd7fabc3d57e000 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:01 +0200 Subject: [PATCH 024/102] package/erlang-p1-oauth2: bump version to 0.6.10 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-oauth2/erlang-p1-oauth2.hash | 2 +- package/erlang-p1-oauth2/erlang-p1-oauth2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash index a6d00aa96e..7a0304e86a 100644 --- a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash +++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c5cf0d2a9f5874c289cc6044945f4771a79007bda812e5269dea3a4c92fc8811 erlang-p1-oauth2-0.6.7.tar.gz +sha256 625e6d96a212cc2cf8a63c36ee698072791d85acbaae18e5820ba144cdaca869 erlang-p1-oauth2-0.6.10.tar.gz sha256 0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3 LICENSE diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk index d7dd45b252..50ac9fbda5 100644 --- a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk +++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_OAUTH2_VERSION = 0.6.7 +ERLANG_P1_OAUTH2_VERSION = 0.6.10 ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION)) ERLANG_P1_OAUTH2_LICENSE = MIT ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE From 0a059cfb899bcf4e7ce6688f60d41e9f2e0c7d11 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:02 +0200 Subject: [PATCH 025/102] package/erlang-p1-pkix: bump version to 1.0.8 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-pkix/erlang-p1-pkix.hash | 2 +- package/erlang-p1-pkix/erlang-p1-pkix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-pkix/erlang-p1-pkix.hash b/package/erlang-p1-pkix/erlang-p1-pkix.hash index b0ee7d58ba..c58dc5c2c5 100644 --- a/package/erlang-p1-pkix/erlang-p1-pkix.hash +++ b/package/erlang-p1-pkix/erlang-p1-pkix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3a39c4ca74f93efa0e4de4c37f9e4d073b1aeb142ad669f12588ad2b3c39724e erlang-p1-pkix-1.0.6.tar.gz +sha256 257171bec3fe495cd390c3a987131893a0a1a0b22e5973ac3cba9c354cb72324 erlang-p1-pkix-1.0.8.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-pkix/erlang-p1-pkix.mk b/package/erlang-p1-pkix/erlang-p1-pkix.mk index 12ae042138..a7ecb08ad9 100644 --- a/package/erlang-p1-pkix/erlang-p1-pkix.mk +++ b/package/erlang-p1-pkix/erlang-p1-pkix.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_PKIX_VERSION = 1.0.6 +ERLANG_P1_PKIX_VERSION = 1.0.8 ERLANG_P1_PKIX_SITE = $(call github,processone,pkix,$(ERLANG_P1_PKIX_VERSION)) ERLANG_P1_PKIX_LICENSE = Apache-2.0 ERLANG_P1_PKIX_LICENSE_FILES = LICENSE From d5b72f0d09a10691e6bdc80a4bebed51fdc29413 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:03 +0200 Subject: [PATCH 026/102] package/erlang-eimp: bump version to 1.0.21 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-eimp/erlang-eimp.hash | 2 +- package/erlang-eimp/erlang-eimp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-eimp/erlang-eimp.hash b/package/erlang-eimp/erlang-eimp.hash index 28d22be16d..5845815c60 100644 --- a/package/erlang-eimp/erlang-eimp.hash +++ b/package/erlang-eimp/erlang-eimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1a529fa6e8264d3cad43861db417a1e841b28c0601aa847857fa0d6a81935922 erlang-eimp-1.0.17.tar.gz +sha256 25e4e1178280d6fb98ee5e582ade393f7c5404c546638bcde86a6ebcb6757d90 erlang-eimp-1.0.21.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-eimp/erlang-eimp.mk b/package/erlang-eimp/erlang-eimp.mk index d066961cd3..27bb2203c2 100644 --- a/package/erlang-eimp/erlang-eimp.mk +++ b/package/erlang-eimp/erlang-eimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_EIMP_VERSION = 1.0.17 +ERLANG_EIMP_VERSION = 1.0.21 ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION)) ERLANG_EIMP_LICENSE = Apache-2.0 ERLANG_EIMP_LICENSE_FILES = LICENSE.txt From 0a02fb55404b9b6a0b98777fdb2dfa4403fd685e Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:04 +0200 Subject: [PATCH 027/102] package/erlang-p1-mqtree: bump version to 1.0.14 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-mqtree/erlang-p1-mqtree.hash | 2 +- package/erlang-p1-mqtree/erlang-p1-mqtree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-mqtree/erlang-p1-mqtree.hash b/package/erlang-p1-mqtree/erlang-p1-mqtree.hash index cf1a880cb8..b91a0cdaa0 100644 --- a/package/erlang-p1-mqtree/erlang-p1-mqtree.hash +++ b/package/erlang-p1-mqtree/erlang-p1-mqtree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4f86e272a97152d3f5166dad583dc1b5bda9582f6777f6294fb8328def8b2189 erlang-p1-mqtree-1.0.10.tar.gz +sha256 b0b5506f43fd2ef8f72b3d5f42ece4dd22d872f9be2a9120affb7c6ae047597f erlang-p1-mqtree-1.0.14.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-mqtree/erlang-p1-mqtree.mk b/package/erlang-p1-mqtree/erlang-p1-mqtree.mk index 19e31ef1b2..9e66bebbaa 100644 --- a/package/erlang-p1-mqtree/erlang-p1-mqtree.mk +++ b/package/erlang-p1-mqtree/erlang-p1-mqtree.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_MQTREE_VERSION = 1.0.10 +ERLANG_P1_MQTREE_VERSION = 1.0.14 ERLANG_P1_MQTREE_SITE = $(call github,processone,mqtree,$(ERLANG_P1_MQTREE_VERSION)) ERLANG_P1_MQTREE_LICENSE = Apache-2.0 ERLANG_P1_MQTREE_LICENSE_FILES = LICENSE From 4adef845d150ae09300b6722bfacfbd17fa2e47e Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:05 +0200 Subject: [PATCH 028/102] package/erlang-jose: bump version to 1.11.1 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-jose/erlang-jose.hash | 4 ++-- package/erlang-jose/erlang-jose.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/erlang-jose/erlang-jose.hash b/package/erlang-jose/erlang-jose.hash index 71a1543d92..75e6f0a041 100644 --- a/package/erlang-jose/erlang-jose.hash +++ b/package/erlang-jose/erlang-jose.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d55a9d3a1697833fed555a21f1aeb2727af88193995cb6ffa945d4b6749d0e8d erlang-jose-1.9.0.tar.gz -sha256 6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be LICENSE.md +sha256 87cdcb9df6f943c97772e5d90bed87555a72c8957ce2cb901df259050e18e7bb erlang-jose-1.11.1.tar.gz +sha256 6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be LICENSE.md diff --git a/package/erlang-jose/erlang-jose.mk b/package/erlang-jose/erlang-jose.mk index 43ed22a9f7..b31a60aa3e 100644 --- a/package/erlang-jose/erlang-jose.mk +++ b/package/erlang-jose/erlang-jose.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JOSE_VERSION = 1.9.0 +ERLANG_JOSE_VERSION = 1.11.1 ERLANG_JOSE_SITE = $(call github,potatosalad,erlang-jose,$(ERLANG_JOSE_VERSION)) ERLANG_JOSE_LICENSE = MIT ERLANG_JOSE_LICENSE_FILES = LICENSE.md From bfab22cb1727e8b3fbb07339feb18e322584bf3d Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:06 +0200 Subject: [PATCH 029/102] package/erlang-p1-acme: bump version to 1.0.16 and remove the unnecessary patch. Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- ...ipt-remove-extra-dependency-to-base6.patch | 26 ------------------- package/erlang-p1-acme/erlang-p1-acme.hash | 2 +- package/erlang-p1-acme/erlang-p1-acme.mk | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch diff --git a/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch b/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch deleted file mode 100644 index a27730e23c..0000000000 --- a/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a2422fdf4097d1f5f8c8f88bbe08b9a0f3c35fe6 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet -Date: Wed, 25 Nov 2020 22:38:22 +0100 -Subject: [PATCH] rebar.config.script: remove extra dependency to base64url - -Signed-off-by: Johan Oudinet ---- - rebar.config.script | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rebar.config.script b/rebar.config.script -index a63895e..41b2970 100644 ---- a/rebar.config.script -+++ b/rebar.config.script -@@ -62,7 +62,7 @@ Cfg2 = case IsRebar3 of - [{plugin_dir, filename:join([filename:dirname(SCRIPT),"plugins"])}, - {plugins, [override_deps_versions]}] ++ - ModCfg(CONFIG, [deps], fun(V) -> -- V ++ [{base64url, ".*", {git, "git://github.com/dvv/base64url.git", {tag, "v1.0"}}}] -+ V - end, []) - end, - --- -2.29.2 - diff --git a/package/erlang-p1-acme/erlang-p1-acme.hash b/package/erlang-p1-acme/erlang-p1-acme.hash index af13e88b1a..7cecb6dfc0 100644 --- a/package/erlang-p1-acme/erlang-p1-acme.hash +++ b/package/erlang-p1-acme/erlang-p1-acme.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e17ba49f45b72200470bc2f176b315bec1028d07a4817859052f98c0a7259632 erlang-p1-acme-1.0.9.tar.gz +sha256 58d4b7e97e677bd5a8aa3c1e52514a37cfa0985cad8b5f45cd05889843c4fdd9 erlang-p1-acme-1.0.16.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-acme/erlang-p1-acme.mk b/package/erlang-p1-acme/erlang-p1-acme.mk index 21c155e206..c9cd1c4f33 100644 --- a/package/erlang-p1-acme/erlang-p1-acme.mk +++ b/package/erlang-p1-acme/erlang-p1-acme.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ACME_VERSION = 1.0.9 +ERLANG_P1_ACME_VERSION = 1.0.16 ERLANG_P1_ACME_SITE = $(call github,processone,p1_acme,$(ERLANG_P1_ACME_VERSION)) ERLANG_P1_ACME_LICENSE = Apache-2.0 ERLANG_P1_ACME_LICENSE_FILES = LICENSE.txt From 117f85da8aaac1cea2c867036cf40fde32b3502c Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:07 +0200 Subject: [PATCH 030/102] package/erlang-p1-stun: bump version to 1.0.47 Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-stun/erlang-p1-stun.hash | 2 +- package/erlang-p1-stun/erlang-p1-stun.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-stun/erlang-p1-stun.hash b/package/erlang-p1-stun/erlang-p1-stun.hash index fb56b8f4e6..aef122b4a6 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/package/erlang-p1-stun/erlang-p1-stun.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 05d2f31f172883d2301a93cd141e6b930dfdd01e10b6aacf806becc3674973d8 erlang-p1-stun-1.0.39.tar.gz +sha256 f9b82949b54778a4b766dca5509eef4475e1dbc165a449974dbd0cc54c6f84a2 erlang-p1-stun-1.0.47.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk index f762e7f45c..ce117e20b5 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.mk +++ b/package/erlang-p1-stun/erlang-p1-stun.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STUN_VERSION = 1.0.39 +ERLANG_P1_STUN_VERSION = 1.0.47 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) ERLANG_P1_STUN_LICENSE = Apache-2.0 ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt From 6d296aa2da87ab0071d68c6ad9f81d084a4ad7dc Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:08 +0200 Subject: [PATCH 031/102] package/erlang-p1-sip: bump version to 1.0.47 The copyright year in the license file has been updated to 2022, hence the new license hash. Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-sip/erlang-p1-sip.hash | 4 ++-- package/erlang-p1-sip/erlang-p1-sip.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/erlang-p1-sip/erlang-p1-sip.hash b/package/erlang-p1-sip/erlang-p1-sip.hash index e52371e404..b20df00280 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.hash +++ b/package/erlang-p1-sip/erlang-p1-sip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b46349a7077d8e5f36a216ada4a5c0b51ef3d66005606beb0ea3962069f215a7 erlang-p1-sip-1.0.38.tar.gz -sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt +sha256 1de406bc59c30e2697b8b29cc0ad0e370e6f5a5d777d37e022d195586b80643d erlang-p1-sip-1.0.47.tar.gz +sha256 c835791cd41a32f8ef40e2255d141ab7faec2f28fab68bbd685c6110fb83be4e LICENSE.txt diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk index 2d2f0110c3..f0e999ec54 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = 1.0.38 +ERLANG_P1_SIP_VERSION = 1.0.47 ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION)) ERLANG_P1_SIP_LICENSE = Apache-2.0 ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt From 21273da96e57ae8f3ee2d7d7e0a381dd863bf584 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:09 +0200 Subject: [PATCH 032/102] package/erlang-p1-zlib: bump version to 1.0.10 The copyright year in the license file has been updated to 2022, hence the new license hash. Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/erlang-p1-zlib/erlang-p1-zlib.hash | 4 ++-- package/erlang-p1-zlib/erlang-p1-zlib.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.hash b/package/erlang-p1-zlib/erlang-p1-zlib.hash index 7ce58762f8..f48aba90ea 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.hash +++ b/package/erlang-p1-zlib/erlang-p1-zlib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0ac60336b2ddf55ac4f58934580cb8f02dba440d68feb607be312dd35d91269 erlang-p1-zlib-1.0.9.tar.gz -sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt +sha256 cef52f8f28229bf7229b53d225a6a9865acf5bdeaf16a40f81bbeb226615be99 erlang-p1-zlib-1.0.10.tar.gz +sha256 a401e98a7eef1c741b3e8b1a46a21730b4a1bc7020e4ec1a8c2a44dbd7f0ba5d LICENSE.txt diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk index 0e6ee298ef..fdffb6ed3e 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.mk +++ b/package/erlang-p1-zlib/erlang-p1-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ZLIB_VERSION = 1.0.9 +ERLANG_P1_ZLIB_VERSION = 1.0.10 ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION)) ERLANG_P1_ZLIB_LICENSE = Apache-2.0 ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt From 483b1105fd1ae94c6e76190e012b7c5f4f950167 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 19 May 2022 16:08:10 +0200 Subject: [PATCH 033/102] package/ejabberd: bump version to 21.12 And update the patches accordingly. Also add a patch to adjust the includes to find the corresponding libraries. Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- ...not-download-or-compile-dependencies.patch | 24 +- package/ejabberd/0003-correct-includes.patch | 1749 +++++++++++++++++ package/ejabberd/ejabberd.hash | 2 +- package/ejabberd/ejabberd.mk | 5 +- 4 files changed, 1765 insertions(+), 15 deletions(-) create mode 100644 package/ejabberd/0003-correct-includes.patch diff --git a/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch b/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch index ffacb6dafd..58213ed2e6 100644 --- a/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch +++ b/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch @@ -1,6 +1,6 @@ -From cb583beba1acba55112fbb4636c1c73d9ae691a0 Mon Sep 17 00:00:00 2001 +From bf3571da4a68a6a857ab7ad8256f8276b3687a38 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Fri, 20 Nov 2020 00:33:30 +0100 +Date: Fri, 13 May 2022 14:22:37 +0200 Subject: [PATCH] Makefile.in: do not download or compile dependencies Signed-off-by: Johan Oudinet @@ -9,27 +9,27 @@ Signed-off-by: Johan Oudinet 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index abd64835..06f876bb 100644 +index ab0e9d967..6e54168a7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -97,7 +97,7 @@ ifneq ($(INSTALLGROUP),) - G_USER=-g $(INSTALLGROUP) +@@ -139,7 +139,7 @@ else + endif endif -all: deps src +all: src - deps: deps/.got + deps: $(DEPSDIR)/.got -@@ -111,7 +111,7 @@ deps/.built: deps/.got - $(REBAR) configure-deps - $(REBAR) compile && :> deps/.built +@@ -153,7 +153,7 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got + $(CONFIGURE_DEPS) + $(REBAR) compile && :> $(DEPSDIR)/.built --src: deps/.built +-src: $(DEPSDIR)/.built +src: - $(REBAR) skip_deps=true compile + $(REBAR) $(SKIPDEPS) compile update: -- -2.29.2 +2.34.1 diff --git a/package/ejabberd/0003-correct-includes.patch b/package/ejabberd/0003-correct-includes.patch new file mode 100644 index 0000000000..4ff02b5741 --- /dev/null +++ b/package/ejabberd/0003-correct-includes.patch @@ -0,0 +1,1749 @@ +From 6d6b6441774b00a6903c79d9e9d14047969d40ae Mon Sep 17 00:00:00 2001 +From: Philipp Huebner +Date: Tue, 31 May 2022 10:30:52 +0200 +Subject: [PATCH] correct includes + +Many parts of ejabberd code were moved into their own projects and are +packaged separately by me. To make the build process work, several +includes must be adjusted for the corresponding libraries to be found. + +Author: Philipp Huebner +Original: https://salsa.debian.org/ejabberd-packaging-team/ejabberd/-/blob/master/debian/patches/src.includes.patch +Signed-off-by: Johan Oudinet +--- + src/ejabberd_auth.erl | 2 +- + src/ejabberd_auth_anonymous.erl | 2 +- + src/ejabberd_auth_jwt.erl | 2 +- + src/ejabberd_auth_mnesia.erl | 2 +- + src/ejabberd_auth_sql.erl | 2 +- + src/ejabberd_bosh.erl | 2 +- + src/ejabberd_c2s.erl | 2 +- + src/ejabberd_captcha.erl | 2 +- + src/ejabberd_http.erl | 2 +- + src/ejabberd_http_ws.erl | 2 +- + src/ejabberd_iq.erl | 2 +- + src/ejabberd_local.erl | 2 +- + src/ejabberd_oauth.erl | 2 +- + src/ejabberd_oauth_rest.erl | 2 +- + src/ejabberd_oauth_sql.erl | 2 +- + src/ejabberd_piefxis.erl | 4 ++-- + src/ejabberd_router.erl | 2 +- + src/ejabberd_router_multicast.erl | 2 +- + src/ejabberd_s2s.erl | 2 +- + src/ejabberd_s2s_in.erl | 2 +- + src/ejabberd_s2s_out.erl | 2 +- + src/ejabberd_service.erl | 2 +- + src/ejabberd_sm.erl | 2 +- + src/ejabberd_web.erl | 2 +- + src/ejabberd_web_admin.erl | 2 +- + src/ejabberd_websocket.erl | 2 +- + src/ejabberd_xmlrpc.erl | 2 +- + src/gen_iq_handler.erl | 2 +- + src/gen_pubsub_node.erl | 2 +- + src/gen_pubsub_nodetree.erl | 2 +- + src/jd2ejd.erl | 2 +- + src/misc.erl | 2 +- + src/mod_adhoc.erl | 2 +- + src/mod_admin_extra.erl | 2 +- + src/mod_admin_update_sql.erl | 2 +- + src/mod_announce.erl | 2 +- + src/mod_announce_mnesia.erl | 2 +- + src/mod_announce_sql.erl | 2 +- + src/mod_avatar.erl | 2 +- + src/mod_block_strangers.erl | 2 +- + src/mod_blocking.erl | 2 +- + src/mod_bosh.erl | 2 +- + src/mod_caps.erl | 2 +- + src/mod_carboncopy.erl | 2 +- + src/mod_client_state.erl | 2 +- + src/mod_configure.erl | 2 +- + src/mod_conversejs.erl | 2 +- + src/mod_delegation.erl | 2 +- + src/mod_disco.erl | 2 +- + src/mod_fail2ban.erl | 2 +- + src/mod_http_api.erl | 2 +- + src/mod_http_upload.erl | 2 +- + src/mod_http_upload_quota.erl | 2 +- + src/mod_jidprep.erl | 2 +- + src/mod_last.erl | 2 +- + src/mod_legacy_auth.erl | 2 +- + src/mod_mam.erl | 2 +- + src/mod_mam_mnesia.erl | 2 +- + src/mod_mam_sql.erl | 2 +- + src/mod_metrics.erl | 2 +- + src/mod_mix.erl | 2 +- + src/mod_mix_pam.erl | 2 +- + src/mod_mqtt_session.erl | 2 +- + src/mod_mqtt_ws.erl | 2 +- + src/mod_muc.erl | 2 +- + src/mod_muc_admin.erl | 2 +- + src/mod_muc_log.erl | 2 +- + src/mod_muc_mnesia.erl | 2 +- + src/mod_muc_room.erl | 2 +- + src/mod_muc_sql.erl | 2 +- + src/mod_multicast.erl | 2 +- + src/mod_offline.erl | 2 +- + src/mod_offline_mnesia.erl | 2 +- + src/mod_offline_sql.erl | 2 +- + src/mod_ping.erl | 2 +- + src/mod_pres_counter.erl | 2 +- + src/mod_privacy.erl | 2 +- + src/mod_privacy_mnesia.erl | 2 +- + src/mod_privacy_sql.erl | 2 +- + src/mod_private.erl | 2 +- + src/mod_private_mnesia.erl | 2 +- + src/mod_private_sql.erl | 2 +- + src/mod_privilege.erl | 2 +- + src/mod_proxy65_service.erl | 2 +- + src/mod_pubsub.erl | 2 +- + src/mod_push.erl | 2 +- + src/mod_push_keepalive.erl | 2 +- + src/mod_push_mnesia.erl | 2 +- + src/mod_push_sql.erl | 2 +- + src/mod_register.erl | 2 +- + src/mod_register_web.erl | 2 +- + src/mod_roster.erl | 2 +- + src/mod_roster_mnesia.erl | 2 +- + src/mod_roster_sql.erl | 2 +- + src/mod_s2s_dialback.erl | 2 +- + src/mod_service_log.erl | 2 +- + src/mod_shared_roster.erl | 2 +- + src/mod_shared_roster_ldap.erl | 2 +- + src/mod_shared_roster_mnesia.erl | 2 +- + src/mod_shared_roster_sql.erl | 2 +- + src/mod_sic.erl | 2 +- + src/mod_sip.erl | 2 +- + src/mod_sip_proxy.erl | 2 +- + src/mod_sip_registrar.erl | 2 +- + src/mod_stats.erl | 2 +- + src/mod_stream_mgmt.erl | 2 +- + src/mod_stun_disco.erl | 2 +- + src/mod_time.erl | 2 +- + src/mod_vcard.erl | 2 +- + src/mod_vcard_ldap.erl | 2 +- + src/mod_vcard_mnesia.erl | 2 +- + src/mod_vcard_sql.erl | 2 +- + src/mod_vcard_xupdate.erl | 2 +- + src/mod_version.erl | 2 +- + src/node_flat.erl | 2 +- + src/node_flat_sql.erl | 2 +- + src/nodetree_tree.erl | 2 +- + src/nodetree_tree_sql.erl | 2 +- + src/prosody2ejabberd.erl | 4 ++-- + src/pubsub_subscription.erl | 2 +- + src/pubsub_subscription_sql.erl | 2 +- + test/suite.hrl | 8 ++++---- + tools/xml_compress_gen.erl | 2 +- + 123 files changed, 128 insertions(+), 128 deletions(-) + +diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl +index 35e4921b7..7e3e05a4e 100644 +--- a/src/ejabberd_auth.erl ++++ b/src/ejabberd_auth.erl +@@ -48,7 +48,7 @@ + + -export([auth_modules/1, convert_to_scram/1]). + +--include_lib("xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). + -include("logger.hrl"). + + -define(SALT_LENGTH, 16). +diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl +index dd7ff28eb..ee56ec5b0 100644 +--- a/src/ejabberd_auth_anonymous.erl ++++ b/src/ejabberd_auth_anonymous.erl +@@ -45,7 +45,7 @@ + plain_password_required/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + start(Host) -> + ejabberd_hooks:add(sm_register_connection_hook, Host, +diff --git a/src/ejabberd_auth_jwt.erl b/src/ejabberd_auth_jwt.erl +index 6df742305..a8024d587 100644 +--- a/src/ejabberd_auth_jwt.erl ++++ b/src/ejabberd_auth_jwt.erl +@@ -36,7 +36,7 @@ + %% 'ejabberd_hooks' callback: + -export([check_decoded_jwt/5]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + %%%---------------------------------------------------------------------- +diff --git a/src/ejabberd_auth_mnesia.erl b/src/ejabberd_auth_mnesia.erl +index 168ee76f5..5e75ddae2 100644 +--- a/src/ejabberd_auth_mnesia.erl ++++ b/src/ejabberd_auth_mnesia.erl +@@ -37,7 +37,7 @@ + -export([need_transform/1, transform/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). + -include("ejabberd_auth.hrl"). + + -record(reg_users_counter, {vhost = <<"">> :: binary(), +diff --git a/src/ejabberd_auth_sql.erl b/src/ejabberd_auth_sql.erl +index 50cc1902e..29de0cd7c 100644 +--- a/src/ejabberd_auth_sql.erl ++++ b/src/ejabberd_auth_sql.erl +@@ -35,7 +35,7 @@ + remove_user/2, store_type/1, plain_password_required/1, + export/1, which_users_exists/2]). + +--include_lib("xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("ejabberd_auth.hrl"). +diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl +index e9d2f0c0a..0bcc9dac0 100644 +--- a/src/ejabberd_bosh.erl ++++ b/src/ejabberd_bosh.erl +@@ -43,7 +43,7 @@ + code_change/4]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include("bosh.hrl"). + +diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl +index 3218cce51..d09f3a9b5 100644 +--- a/src/ejabberd_c2s.erl ++++ b/src/ejabberd_c2s.erl +@@ -47,7 +47,7 @@ + reply/2, copy_state/2, set_timeout/2, route/2, format_reason/2, + host_up/1, host_down/1, send_ws_ping/1, bounce_message_queue/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_roster.hrl"). + -include("translate.hrl"). +diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl +index 343a8e54e..f3efd5026 100644 +--- a/src/ejabberd_captcha.erl ++++ b/src/ejabberd_captcha.erl +@@ -42,7 +42,7 @@ + host_up/1, host_down/1, + config_reloaded/0, process_iq/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + -include("translate.hrl"). +diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl +index d577a10d5..bc8e15620 100644 +--- a/src/ejabberd_http.erl ++++ b/src/ejabberd_http.erl +@@ -37,7 +37,7 @@ + -export([init/3]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include_lib("kernel/include/file.hrl"). + +diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl +index eb2100a42..632eaa5c9 100644 +--- a/src/ejabberd_http_ws.erl ++++ b/src/ejabberd_http_ws.erl +@@ -36,7 +36,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl +index 249c53294..2a0e1dce2 100644 +--- a/src/ejabberd_iq.erl ++++ b/src/ejabberd_iq.erl +@@ -34,7 +34,7 @@ + -export([init/1, handle_call/3, handle_cast/2, handle_info/2, + terminate/2, code_change/3]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_stacktrace.hrl"). + +diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl +index 6dfef9d01..80f1fdbda 100644 +--- a/src/ejabberd_local.erl ++++ b/src/ejabberd_local.erl +@@ -47,7 +47,7 @@ + + -include("logger.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_stacktrace.hrl"). + -include("translate.hrl"). + +diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl +index 9b2c517de..0197333ef 100644 +--- a/src/ejabberd_oauth.erl ++++ b/src/ejabberd_oauth.erl +@@ -54,7 +54,7 @@ + oauth_add_client_implicit/3, + oauth_remove_client/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + -include("ejabberd_web_admin.hrl"). +diff --git a/src/ejabberd_oauth_rest.erl b/src/ejabberd_oauth_rest.erl +index b968c9263..47d13f05e 100644 +--- a/src/ejabberd_oauth_rest.erl ++++ b/src/ejabberd_oauth_rest.erl +@@ -36,7 +36,7 @@ + + -include("ejabberd_oauth.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + init() -> + rest:start(ejabberd_config:get_myname()), +diff --git a/src/ejabberd_oauth_sql.erl b/src/ejabberd_oauth_sql.erl +index 25be737f0..11d4483a5 100644 +--- a/src/ejabberd_oauth_sql.erl ++++ b/src/ejabberd_oauth_sql.erl +@@ -37,7 +37,7 @@ + + -include("ejabberd_oauth.hrl"). + -include("ejabberd_sql_pt.hrl"). +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("logger.hrl"). + + init() -> +diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl +index d62efb300..fba76f62a 100644 +--- a/src/ejabberd_piefxis.erl ++++ b/src/ejabberd_piefxis.erl +@@ -38,9 +38,9 @@ + + -define(CHUNK_SIZE, 1024*20). %20k + +--include_lib("xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("mod_roster.hrl"). + +diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl +index 492beb6d3..ee2ddcba9 100644 +--- a/src/ejabberd_router.erl ++++ b/src/ejabberd_router.erl +@@ -69,7 +69,7 @@ + + -include("logger.hrl"). + -include("ejabberd_router.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_stacktrace.hrl"). + + -callback init() -> any(). +diff --git a/src/ejabberd_router_multicast.erl b/src/ejabberd_router_multicast.erl +index e97ccb837..7ef026fa1 100644 +--- a/src/ejabberd_router_multicast.erl ++++ b/src/ejabberd_router_multicast.erl +@@ -42,7 +42,7 @@ + terminate/2, code_change/3, update_to_in_wrapped/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(route_multicast, {domain = <<"">> :: binary() | '_', + pid = self() :: pid()}). +diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl +index 04490071c..0d345e947 100644 +--- a/src/ejabberd_s2s.erl ++++ b/src/ejabberd_s2s.erl +@@ -52,7 +52,7 @@ + -export([get_info_s2s_connections/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_commands.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl +index 8177a7333..fcffcb7b0 100644 +--- a/src/ejabberd_s2s_in.erl ++++ b/src/ejabberd_s2s_in.erl +@@ -41,7 +41,7 @@ + -export([stop_async/1, close/1, close/2, send/2, update_state/2, establish/1, + host_up/1, host_down/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + -type state() :: xmpp_stream_in:state(). +diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl +index f057705ed..4139b0fe7 100644 +--- a/src/ejabberd_s2s_out.erl ++++ b/src/ejabberd_s2s_out.erl +@@ -39,7 +39,7 @@ + -export([start/3, start_link/3, connect/1, close/1, close/2, stop_async/1, send/2, + route/2, establish/1, update_state/2, host_up/1, host_down/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl +index b854bcb2b..3cc939679 100644 +--- a/src/ejabberd_service.erl ++++ b/src/ejabberd_service.erl +@@ -35,7 +35,7 @@ + %% API + -export([send/2, close/1, close/2, stop_async/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl +index afb95c10b..e5011ed23 100644 +--- a/src/ejabberd_sm.erl ++++ b/src/ejabberd_sm.erl +@@ -85,7 +85,7 @@ + handle_info/2, terminate/2, code_change/3]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_commands.hrl"). + -include("ejabberd_sm.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl +index 5cfbb93aa..8a6b0fcd4 100644 +--- a/src/ejabberd_web.erl ++++ b/src/ejabberd_web.erl +@@ -33,7 +33,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl +index ee50a0031..f97357f2f 100644 +--- a/src/ejabberd_web_admin.erl ++++ b/src/ejabberd_web_admin.erl +@@ -35,7 +35,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl +index 5f9d284a6..db7c53768 100644 +--- a/src/ejabberd_websocket.erl ++++ b/src/ejabberd_websocket.erl +@@ -45,7 +45,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl +index 1a1ec63f4..a76216963 100644 +--- a/src/ejabberd_xmlrpc.erl ++++ b/src/ejabberd_xmlrpc.erl +@@ -39,7 +39,7 @@ + -include("ejabberd_http.hrl"). + -include("mod_roster.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, + {auth = noauth :: noauth | map(), +diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl +index 29057435d..4fee8caf7 100644 +--- a/src/gen_iq_handler.erl ++++ b/src/gen_iq_handler.erl +@@ -35,7 +35,7 @@ + -deprecated([{add_iq_handler, 6}, {handle, 5}, {iqdisc, 1}]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + -include("ejabberd_stacktrace.hrl"). + +diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl +index 3f83fe48f..5545d51de 100644 +--- a/src/gen_pubsub_node.erl ++++ b/src/gen_pubsub_node.erl +@@ -25,7 +25,7 @@ + + -module(gen_pubsub_node). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -type(host() :: mod_pubsub:host()). + -type(nodeId() :: mod_pubsub:nodeId()). +diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl +index b6b73b8cb..8c2a2a4fa 100644 +--- a/src/gen_pubsub_nodetree.erl ++++ b/src/gen_pubsub_nodetree.erl +@@ -36,7 +36,7 @@ + ServerHost :: binary(), + Opts :: [any()]) -> atom(). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -callback terminate(Host :: host(), ServerHost :: binary()) -> atom(). + +diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl +index 279dd6e0d..ec0b2f083 100644 +--- a/src/jd2ejd.erl ++++ b/src/jd2ejd.erl +@@ -31,7 +31,7 @@ + -export([import_file/1, import_dir/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%---------------------------------------------------------------------- + %%% API +diff --git a/src/misc.erl b/src/misc.erl +index 474fad615..489052bd1 100644 +--- a/src/misc.erl ++++ b/src/misc.erl +@@ -50,7 +50,7 @@ + {encode_base64, 1}]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("kernel/include/file.hrl"). + + -type distance_cache() :: #{{string(), string()} => non_neg_integer()}. +diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl +index 73c7d82af..6cbc99aec 100644 +--- a/src/mod_adhoc.erl ++++ b/src/mod_adhoc.erl +@@ -39,7 +39,7 @@ + mod_options/1, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl +index 9834acf01..e199f7d30 100644 +--- a/src/mod_admin_extra.erl ++++ b/src/mod_admin_extra.erl +@@ -85,7 +85,7 @@ + -include("mod_roster.hrl"). + -include("mod_privacy.hrl"). + -include("ejabberd_sm.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%% + %%% gen_mod +diff --git a/src/mod_admin_update_sql.erl b/src/mod_admin_update_sql.erl +index 02beb4bf8..9225d2bf0 100644 +--- a/src/mod_admin_update_sql.erl ++++ b/src/mod_admin_update_sql.erl +@@ -37,7 +37,7 @@ + + -include("logger.hrl"). + -include("ejabberd_commands.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_announce.erl b/src/mod_announce.erl +index 21213615c..d5fb38596 100644 +--- a/src/mod_announce.erl ++++ b/src/mod_announce.erl +@@ -51,7 +51,7 @@ + announce_all_hosts_motd_delete/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_announce_mnesia.erl b/src/mod_announce_mnesia.erl +index 068406e01..074bebc90 100644 +--- a/src/mod_announce_mnesia.erl ++++ b/src/mod_announce_mnesia.erl +@@ -31,7 +31,7 @@ + get_motd/1, is_motd_user/2, set_motd_user/2, import/3]). + -export([need_transform/1, transform/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_announce_sql.erl b/src/mod_announce_sql.erl +index bc79fc77a..4c3052f16 100644 +--- a/src/mod_announce_sql.erl ++++ b/src/mod_announce_sql.erl +@@ -32,7 +32,7 @@ + get_motd/1, is_motd_user/2, set_motd_user/2, import/3, + export/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("logger.hrl"). +diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl +index 09329853d..9f5e54e22 100644 +--- a/src/mod_avatar.erl ++++ b/src/mod_avatar.erl +@@ -31,7 +31,7 @@ + -export([pubsub_publish_item/6, vcard_iq_convert/1, vcard_iq_publish/1, + get_sm_features/5]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("pubsub.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl +index 92f52236d..59cd8cce5 100644 +--- a/src/mod_block_strangers.erl ++++ b/src/mod_block_strangers.erl +@@ -34,7 +34,7 @@ + + -export([filter_packet/1, filter_offline_msg/1, filter_subscription/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl +index 7d4b1bff5..853d40fe4 100644 +--- a/src/mod_blocking.erl ++++ b/src/mod_blocking.erl +@@ -33,7 +33,7 @@ + disco_features/5, mod_options/1, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_bosh.erl b/src/mod_bosh.erl +index 37a7fa809..ce57faac2 100644 +--- a/src/mod_bosh.erl ++++ b/src/mod_bosh.erl +@@ -40,7 +40,7 @@ + + -include("logger.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include("bosh.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_caps.erl b/src/mod_caps.erl +index bc48dac6f..fd3b3a1ad 100644 +--- a/src/mod_caps.erl ++++ b/src/mod_caps.erl +@@ -54,7 +54,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_caps.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl +index a4e3a7999..e53b573c8 100644 +--- a/src/mod_carboncopy.erl ++++ b/src/mod_carboncopy.erl +@@ -42,7 +42,7 @@ + -export([list/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -type direction() :: sent | received. +diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl +index 3585ec3a4..5ac4ad845 100644 +--- a/src/mod_client_state.erl ++++ b/src/mod_client_state.erl +@@ -42,7 +42,7 @@ + c2s_copy_session/2, c2s_session_resumed/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(CSI_QUEUE_MAX, 100). +diff --git a/src/mod_configure.erl b/src/mod_configure.erl +index 32c7ebb31..b6ab8cdfe 100644 +--- a/src/mod_configure.erl ++++ b/src/mod_configure.erl +@@ -39,7 +39,7 @@ + depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sm.hrl"). + -include("translate.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). +diff --git a/src/mod_conversejs.erl b/src/mod_conversejs.erl +index 8683d60ab..2d3dfb63b 100644 +--- a/src/mod_conversejs.erl ++++ b/src/mod_conversejs.erl +@@ -32,7 +32,7 @@ + -export([start/2, stop/1, reload/3, process/2, depends/2, + mod_opt_type/1, mod_options/1, mod_doc/0]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_delegation.erl b/src/mod_delegation.erl +index 3ae3b8a51..93c1e78d6 100644 +--- a/src/mod_delegation.erl ++++ b/src/mod_delegation.erl +@@ -42,7 +42,7 @@ + disco_local_identity/5, disco_sm_identity/5]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -type route_type() :: ejabberd_sm | ejabberd_local. +diff --git a/src/mod_disco.erl b/src/mod_disco.erl +index deb9d15a2..c8788a77c 100644 +--- a/src/mod_disco.erl ++++ b/src/mod_disco.erl +@@ -42,7 +42,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + -include("mod_roster.hrl"). + +diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl +index 8751653d8..901f71fc2 100644 +--- a/src/mod_fail2ban.erl ++++ b/src/mod_fail2ban.erl +@@ -42,7 +42,7 @@ + -include_lib("stdlib/include/ms_transform.hrl"). + -include("ejabberd_commands.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(CLEAN_INTERVAL, timer:minutes(10)). +diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl +index 427833584..6ee1fcb72 100644 +--- a/src/mod_http_api.erl ++++ b/src/mod_http_api.erl +@@ -32,7 +32,7 @@ + -export([start/2, stop/1, reload/3, process/2, depends/2, + mod_options/1, mod_doc/0]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl +index 1ff94eb4a..ce1a667e2 100644 +--- a/src/mod_http_upload.erl ++++ b/src/mod_http_upload.erl +@@ -87,7 +87,7 @@ + expand_host/2]). + + -include("ejabberd_http.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl +index 5ed7fcefb..4fc591ca5 100644 +--- a/src/mod_http_upload_quota.erl ++++ b/src/mod_http_upload_quota.erl +@@ -51,7 +51,7 @@ + %% ejabberd_hooks callback. + -export([handle_slot_request/6]). + +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + -include_lib("kernel/include/file.hrl"). +diff --git a/src/mod_jidprep.erl b/src/mod_jidprep.erl +index c666f8544..b533a2f4f 100644 +--- a/src/mod_jidprep.erl ++++ b/src/mod_jidprep.erl +@@ -41,7 +41,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%-------------------------------------------------------------------- + %% gen_mod callbacks. +diff --git a/src/mod_last.erl b/src/mod_last.erl +index a7d36c791..649a94698 100644 +--- a/src/mod_last.erl ++++ b/src/mod_last.erl +@@ -38,7 +38,7 @@ + register_user/2, depends/2, privacy_check_packet/4]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("mod_last.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_legacy_auth.erl b/src/mod_legacy_auth.erl +index 2b29b4cd2..ba13a24a8 100644 +--- a/src/mod_legacy_auth.erl ++++ b/src/mod_legacy_auth.erl +@@ -29,7 +29,7 @@ + %% hooks + -export([c2s_unauthenticated_packet/2, c2s_stream_features/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -type c2s_state() :: ejabberd_c2s:state(). +diff --git a/src/mod_mam.erl b/src/mod_mam.erl +index 9bf154f58..444655727 100644 +--- a/src/mod_mam.erl ++++ b/src/mod_mam.erl +@@ -45,7 +45,7 @@ + is_empty_for_user/2, is_empty_for_room/3, check_create_room/4, + process_iq/3, store_mam_message/7, make_id/0, wrap_as_mucsub/2, select/7]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_muc_room.hrl"). + -include("ejabberd_commands.hrl"). +diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl +index d21d0e6ce..9dfc6d9e0 100644 +--- a/src/mod_mam_mnesia.erl ++++ b/src/mod_mam_mnesia.erl +@@ -32,7 +32,7 @@ + is_empty_for_user/2, is_empty_for_room/3]). + + -include_lib("stdlib/include/ms_transform.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_mam.hrl"). + +diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl +index 269b4c963..b81da5b0c 100644 +--- a/src/mod_mam_sql.erl ++++ b/src/mod_mam_sql.erl +@@ -33,7 +33,7 @@ + is_empty_for_user/2, is_empty_for_room/3, select_with_mucsub/6]). + + -include_lib("stdlib/include/ms_transform.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_mam.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_metrics.erl b/src/mod_metrics.erl +index d42f79112..de32aebef 100644 +--- a/src/mod_metrics.erl ++++ b/src/mod_metrics.erl +@@ -29,7 +29,7 @@ + -behaviour(gen_mod). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -export([start/2, stop/1, mod_opt_type/1, mod_options/1, depends/2, reload/3]). +diff --git a/src/mod_mix.erl b/src/mod_mix.erl +index 002ef5696..57de16a7a 100644 +--- a/src/mod_mix.erl ++++ b/src/mod_mix.erl +@@ -41,7 +41,7 @@ + process_mam_query/1, + process_pubsub_query/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/mod_mix_pam.erl b/src/mod_mix_pam.erl +index 1fa5c1861..e27578028 100644 +--- a/src/mod_mix_pam.erl ++++ b/src/mod_mix_pam.erl +@@ -33,7 +33,7 @@ + remove_user/2, + process_iq/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_mqtt_session.erl b/src/mod_mqtt_session.erl +index ca025e3d2..a541e1fb0 100644 +--- a/src/mod_mqtt_session.erl ++++ b/src/mod_mqtt_session.erl +@@ -28,7 +28,7 @@ + + -include("logger.hrl"). + -include("mqtt.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, {vsn = ?VSN :: integer(), + version :: undefined | mqtt_version(), +diff --git a/src/mod_mqtt_ws.erl b/src/mod_mqtt_ws.erl +index 01f182d30..b0a2ecdbd 100644 +--- a/src/mod_mqtt_ws.erl ++++ b/src/mod_mqtt_ws.erl +@@ -29,7 +29,7 @@ + -export([init/1, handle_call/3, handle_cast/2, handle_info/2, + terminate/2, code_change/3, format_status/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_muc.erl b/src/mod_muc.erl +index b2ebc5c61..59c856466 100644 +--- a/src/mod_muc.erl ++++ b/src/mod_muc.erl +@@ -77,7 +77,7 @@ + mod_opt_type/1, mod_options/1, depends/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc.hrl"). + -include("mod_muc_room.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl +index ce4665d7e..ef3f5dcc3 100644 +--- a/src/mod_muc_admin.erl ++++ b/src/mod_muc_admin.erl +@@ -44,7 +44,7 @@ + web_page_host/3, mod_options/1, get_commands_spec/0, find_hosts/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc.hrl"). + -include("mod_muc_room.hrl"). + -include("ejabberd_http.hrl"). +diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl +index 8bcbc8bc0..36d9a5206 100644 +--- a/src/mod_muc_log.erl ++++ b/src/mod_muc_log.erl +@@ -42,7 +42,7 @@ + mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc_room.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl +index c822acc68..3847add23 100644 +--- a/src/mod_muc_mnesia.erl ++++ b/src/mod_muc_mnesia.erl +@@ -44,7 +44,7 @@ + + -include("mod_muc.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + + -record(state, {}). +diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl +index e8b0d1bce..7b1f5ff4c 100644 +--- a/src/mod_muc_room.erl ++++ b/src/mod_muc_room.erl +@@ -68,7 +68,7 @@ + code_change/4]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + -include("mod_muc_room.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl +index 1310cde7b..2c8b87d7e 100644 +--- a/src/mod_muc_sql.erl ++++ b/src/mod_muc_sql.erl +@@ -42,7 +42,7 @@ + -export([set_affiliation/6, set_affiliations/4, get_affiliation/5, + get_affiliations/3, search_affiliation/4]). + +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_muc.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl +index fa076da70..b9ea7ce32 100644 +--- a/src/mod_multicast.erl ++++ b/src/mod_multicast.erl +@@ -45,7 +45,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(multicastc, {rserver :: binary(), + response, +diff --git a/src/mod_offline.erl b/src/mod_offline.erl +index 1d367eb72..2a7a623e2 100644 +--- a/src/mod_offline.erl ++++ b/src/mod_offline.erl +@@ -69,7 +69,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/mod_offline_mnesia.erl b/src/mod_offline_mnesia.erl +index a3c902fb3..4cb328d2a 100644 +--- a/src/mod_offline_mnesia.erl ++++ b/src/mod_offline_mnesia.erl +@@ -32,7 +32,7 @@ + remove_all_messages/2, count_messages/2, import/1]). + -export([need_transform/1, transform/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_offline.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl +index 4e8441b7f..9d4170725 100644 +--- a/src/mod_offline_sql.erl ++++ b/src/mod_offline_sql.erl +@@ -32,7 +32,7 @@ + read_message/3, remove_message/3, read_all_messages/2, + remove_all_messages/2, count_messages/2, import/1, export/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_offline.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_ping.erl b/src/mod_ping.erl +index f233b2ae8..b528040d1 100644 +--- a/src/mod_ping.erl ++++ b/src/mod_ping.erl +@@ -35,7 +35,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("translate.hrl"). + +diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl +index 77f42961f..066e5ce4f 100644 +--- a/src/mod_pres_counter.erl ++++ b/src/mod_pres_counter.erl +@@ -32,7 +32,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(pres_counter, + {dir, start, count, logged = false}). +diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl +index 5ac26c2f5..e8971af65 100644 +--- a/src/mod_privacy.erl ++++ b/src/mod_privacy.erl +@@ -41,7 +41,7 @@ + mod_opt_type/1, mod_options/1, depends/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl +index 2f9cb0027..d90f30eb8 100644 +--- a/src/mod_privacy_mnesia.erl ++++ b/src/mod_privacy_mnesia.erl +@@ -32,7 +32,7 @@ + remove_list/3, use_cache/1, import/1]). + -export([need_transform/1, transform/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_privacy_sql.erl b/src/mod_privacy_sql.erl +index b27442724..234e59061 100644 +--- a/src/mod_privacy_sql.erl ++++ b/src/mod_privacy_sql.erl +@@ -34,7 +34,7 @@ + + -export([item_to_raw/1, raw_to_item/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_private.erl b/src/mod_private.erl +index 436aae222..56bfd4b07 100644 +--- a/src/mod_private.erl ++++ b/src/mod_private.erl +@@ -40,7 +40,7 @@ + -export([get_commands_spec/0, bookmarks_to_pep/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + -include("ejabberd_commands.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_private_mnesia.erl b/src/mod_private_mnesia.erl +index b5617d96e..fd4ba657b 100644 +--- a/src/mod_private_mnesia.erl ++++ b/src/mod_private_mnesia.erl +@@ -31,7 +31,7 @@ + use_cache/1, import/3]). + -export([need_transform/1, transform/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_private_sql.erl b/src/mod_private_sql.erl +index 08a13e8a4..511cd5c63 100644 +--- a/src/mod_private_sql.erl ++++ b/src/mod_private_sql.erl +@@ -29,7 +29,7 @@ + -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2, + import/3, export/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("logger.hrl"). +diff --git a/src/mod_privilege.erl b/src/mod_privilege.erl +index 353a8da27..50be843ac 100644 +--- a/src/mod_privilege.erl ++++ b/src/mod_privilege.erl +@@ -41,7 +41,7 @@ + process_presence_out/1, process_presence_in/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -type roster_permission() :: both | get | set. +diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl +index 78a8d85d2..98d9987db 100644 +--- a/src/mod_proxy65_service.erl ++++ b/src/mod_proxy65_service.erl +@@ -38,7 +38,7 @@ + delete_listener/1, route/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + -include("ejabberd_stacktrace.hrl"). + +diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl +index 76092f1c6..0b55cd7fc 100644 +--- a/src/mod_pubsub.erl ++++ b/src/mod_pubsub.erl +@@ -40,7 +40,7 @@ + -protocol({xep, 248, '0.2'}). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("pubsub.hrl"). + -include("mod_roster.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_push.erl b/src/mod_push.erl +index 5477c5792..eab812226 100644 +--- a/src/mod_push.erl ++++ b/src/mod_push.erl +@@ -51,7 +51,7 @@ + + -include("ejabberd_commands.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PUSH_CACHE, push_cache). +diff --git a/src/mod_push_keepalive.erl b/src/mod_push_keepalive.erl +index e0e83f1e1..c57f2404a 100644 +--- a/src/mod_push_keepalive.erl ++++ b/src/mod_push_keepalive.erl +@@ -36,7 +36,7 @@ + c2s_handle_cast/2, c2s_handle_info/2, c2s_stanza/3]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PUSH_BEFORE_TIMEOUT_PERIOD, 120000). % 2 minutes. +diff --git a/src/mod_push_mnesia.erl b/src/mod_push_mnesia.erl +index 665ab48f2..0e17d11f2 100644 +--- a/src/mod_push_mnesia.erl ++++ b/src/mod_push_mnesia.erl +@@ -35,7 +35,7 @@ + + -include_lib("stdlib/include/ms_transform.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_push.hrl"). + + %%%------------------------------------------------------------------- +diff --git a/src/mod_push_sql.erl b/src/mod_push_sql.erl +index c024a12d1..a87f33f47 100644 +--- a/src/mod_push_sql.erl ++++ b/src/mod_push_sql.erl +@@ -31,7 +31,7 @@ + lookup_sessions/3, lookup_sessions/2, lookup_sessions/1, + delete_session/3, delete_old_sessions/2, export/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("mod_push.hrl"). +diff --git a/src/mod_register.erl b/src/mod_register.erl +index b85efd57c..890852821 100644 +--- a/src/mod_register.erl ++++ b/src/mod_register.erl +@@ -40,7 +40,7 @@ + -deprecated({try_register, 4}). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl +index 0cf4bcff8..43a123ead 100644 +--- a/src/mod_register_web.erl ++++ b/src/mod_register_web.erl +@@ -34,7 +34,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/mod_roster.erl b/src/mod_roster.erl +index 94cae4950..8c9206e4b 100644 +--- a/src/mod_roster.erl ++++ b/src/mod_roster.erl +@@ -54,7 +54,7 @@ + depends/2, set_item_and_notify_clients/3]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_roster.hrl"). + -include("ejabberd_http.hrl"). + -include("ejabberd_web_admin.hrl"). +diff --git a/src/mod_roster_mnesia.erl b/src/mod_roster_mnesia.erl +index fa1d52f7c..ced28ce60 100644 +--- a/src/mod_roster_mnesia.erl ++++ b/src/mod_roster_mnesia.erl +@@ -37,7 +37,7 @@ + + -include("mod_roster.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_roster_sql.erl b/src/mod_roster_sql.erl +index ebfcde463..3510b4624 100644 +--- a/src/mod_roster_sql.erl ++++ b/src/mod_roster_sql.erl +@@ -38,7 +38,7 @@ + -include("mod_roster.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl +index 05747e3bc..e2bdc847e 100644 +--- a/src/mod_s2s_dialback.erl ++++ b/src/mod_s2s_dialback.erl +@@ -33,7 +33,7 @@ + s2s_in_features/2, s2s_out_init/2, s2s_out_closed/2, + s2s_out_tls_verify/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl +index f5f23eeb0..e8beaac9a 100644 +--- a/src/mod_service_log.erl ++++ b/src/mod_service_log.erl +@@ -34,7 +34,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, _Opts) -> + ejabberd_hooks:add(user_send_packet, Host, ?MODULE, +diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl +index 13ff90466..46fbbd535 100644 +--- a/src/mod_shared_roster.erl ++++ b/src/mod_shared_roster.erl +@@ -43,7 +43,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("mod_roster.hrl"). + +diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl +index 08fbe8793..8f6cff118 100644 +--- a/src/mod_shared_roster_ldap.erl ++++ b/src/mod_shared_roster_ldap.erl +@@ -43,7 +43,7 @@ + depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_roster.hrl"). + -include("eldap.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_shared_roster_mnesia.erl b/src/mod_shared_roster_mnesia.erl +index 484df0cd5..60a45941a 100644 +--- a/src/mod_shared_roster_mnesia.erl ++++ b/src/mod_shared_roster_mnesia.erl +@@ -37,7 +37,7 @@ + -include("mod_roster.hrl"). + -include("mod_shared_roster.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_shared_roster_sql.erl b/src/mod_shared_roster_sql.erl +index 0d44dce69..0aacf03e8 100644 +--- a/src/mod_shared_roster_sql.erl ++++ b/src/mod_shared_roster_sql.erl +@@ -35,7 +35,7 @@ + add_user_to_group/3, remove_user_from_group/3, import/3, + export/1]). + +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_roster.hrl"). + -include("mod_shared_roster.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_sic.erl b/src/mod_sic.erl +index 4eeb8fd08..2ad4ce5a6 100644 +--- a/src/mod_sic.erl ++++ b/src/mod_sic.erl +@@ -35,7 +35,7 @@ + process_sm_iq/1, mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_sip.erl b/src/mod_sip.erl +index 6ea2a408f..3bc901035 100644 +--- a/src/mod_sip.erl ++++ b/src/mod_sip.erl +@@ -55,7 +55,7 @@ mod_doc() -> + locate/1, mod_opt_type/1, mod_options/1, depends/2, + mod_doc/0]). + +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl +index ddfefb1ad..e1c8a734f 100644 +--- a/src/mod_sip_proxy.erl ++++ b/src/mod_sip_proxy.erl +@@ -39,7 +39,7 @@ + code_change/4]). + + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + -define(SIGN_LIFETIME, 300). %% in seconds. + +diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl +index 5079aebf0..73a5a5168 100644 +--- a/src/mod_sip_registrar.erl ++++ b/src/mod_sip_registrar.erl +@@ -41,7 +41,7 @@ + terminate/2, code_change/3]). + + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + -define(CALL_TIMEOUT, timer:seconds(30)). + -define(DEFAULT_EXPIRES, 3600). +diff --git a/src/mod_stats.erl b/src/mod_stats.erl +index c61fe6175..b73227582 100644 +--- a/src/mod_stats.erl ++++ b/src/mod_stats.erl +@@ -35,7 +35,7 @@ + mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl +index f60f6722b..b5d2def60 100644 +--- a/src/mod_stream_mgmt.erl ++++ b/src/mod_stream_mgmt.erl +@@ -37,7 +37,7 @@ + %% adjust pending session timeout / access queue + -export([get_resume_timeout/1, set_resume_timeout/2, queue_find/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include_lib("p1_utils/include/p1_queue.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_stun_disco.erl b/src/mod_stun_disco.erl +index 6e7592453..203ac735e 100644 +--- a/src/mod_stun_disco.erl ++++ b/src/mod_stun_disco.erl +@@ -55,7 +55,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(STUN_MODULE, ejabberd_stun). + +diff --git a/src/mod_time.erl b/src/mod_time.erl +index 4ec3cd64e..9b2072ad5 100644 +--- a/src/mod_time.erl ++++ b/src/mod_time.erl +@@ -36,7 +36,7 @@ + mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl +index 8e0d32a4a..e4687c61e 100644 +--- a/src/mod_vcard.erl ++++ b/src/mod_vcard.erl +@@ -44,7 +44,7 @@ + -export([route/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + -include("translate.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl +index bc6e7ebca..955489475 100644 +--- a/src/mod_vcard_ldap.erl ++++ b/src/mod_vcard_ldap.erl +@@ -40,7 +40,7 @@ + + -include("logger.hrl"). + -include("eldap.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PROCNAME, ejabberd_mod_vcard_ldap). +diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl +index ad4be701c..d0dafc10d 100644 +--- a/src/mod_vcard_mnesia.erl ++++ b/src/mod_vcard_mnesia.erl +@@ -33,7 +33,7 @@ + -export([need_transform/1, transform/1]). + -export([mod_opt_type/1, mod_options/1, mod_doc/0]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl +index 620c1b4b5..8e8ea10ff 100644 +--- a/src/mod_vcard_sql.erl ++++ b/src/mod_vcard_sql.erl +@@ -32,7 +32,7 @@ + search_fields/1, search_reported/1, import/3, export/1]). + -export([is_search_supported/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl +index 59ebc7f71..fd75decd4 100644 +--- a/src/mod_vcard_xupdate.erl ++++ b/src/mod_vcard_xupdate.erl +@@ -37,7 +37,7 @@ + -export([compute_hash/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(VCARD_XUPDATE_CACHE, vcard_xupdate_cache). +diff --git a/src/mod_version.erl b/src/mod_version.erl +index 9aa93829d..aa89e8253 100644 +--- a/src/mod_version.erl ++++ b/src/mod_version.erl +@@ -35,7 +35,7 @@ + mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/node_flat.erl b/src/node_flat.erl +index 55dea0d8d..0dada8e22 100644 +--- a/src/node_flat.erl ++++ b/src/node_flat.erl +@@ -34,7 +34,7 @@ + -author('christophe.romain@process-one.net'). + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -export([init/3, terminate/2, options/0, features/0, + create_node_permission/6, create_node/2, delete_node/1, +diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl +index f9c8a209d..9d33f0376 100644 +--- a/src/node_flat_sql.erl ++++ b/src/node_flat_sql.erl +@@ -35,7 +35,7 @@ + + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("translate.hrl"). + +diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl +index 853c1fb93..28ad2520d 100644 +--- a/src/nodetree_tree.erl ++++ b/src/nodetree_tree.erl +@@ -41,7 +41,7 @@ + -include_lib("stdlib/include/ms_transform.hrl"). + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -export([init/3, terminate/2, options/0, set_node/1, +diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl +index 402c50901..d5f82c88c 100644 +--- a/src/nodetree_tree_sql.erl ++++ b/src/nodetree_tree_sql.erl +@@ -39,7 +39,7 @@ + + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("translate.hrl"). + +diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl +index 3992a4034..d0d186015 100644 +--- a/src/prosody2ejabberd.erl ++++ b/src/prosody2ejabberd.erl +@@ -27,8 +27,8 @@ + %% API + -export([from_dir/1]). + +--include_lib("xmpp/include/scram.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_roster.hrl"). + -include("mod_offline.hrl"). +diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl +index 92d6d314d..716a29962 100644 +--- a/src/pubsub_subscription.erl ++++ b/src/pubsub_subscription.erl +@@ -38,7 +38,7 @@ + read_subscription/3, write_subscription/4]). + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PUBSUB_DELIVER, <<"pubsub#deliver">>). +diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl +index c36934f50..8eb6f4db1 100644 +--- a/src/pubsub_subscription_sql.erl ++++ b/src/pubsub_subscription_sql.erl +@@ -34,7 +34,7 @@ + get_options_xform/2, parse_options_xform/1]). + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PUBSUB_DELIVER, <<"pubsub#deliver">>). +diff --git a/test/suite.hrl b/test/suite.hrl +index d8ea3e23b..9c6bc3f42 100644 +--- a/test/suite.hrl ++++ b/test/suite.hrl +@@ -1,8 +1,8 @@ + -include_lib("common_test/include/ct.hrl"). +--include_lib("fast_xml/include/fxml.hrl"). +--include_lib("xmpp/include/jid.hrl"). +--include_lib("xmpp/include/ns.hrl"). +--include_lib("xmpp/include/xmpp_codec.hrl"). ++-include_lib("p1_xml/include/fxml.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/ns.hrl"). ++-include_lib("p1_xmpp/include/xmpp_codec.hrl"). + -include("mod_proxy65.hrl"). + + -define(STREAM_TRAILER, <<"">>). +diff --git a/tools/xml_compress_gen.erl b/tools/xml_compress_gen.erl +index 5b43c5925..087a6c13b 100644 +--- a/tools/xml_compress_gen.erl ++++ b/tools/xml_compress_gen.erl +@@ -24,7 +24,7 @@ + -module(xml_compress_gen). + -author("pawel@process-one.net"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %% API + -export([archive_analyze/3, process_stats/1, gen_code/3]). +-- +2.35.3 + diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash index 0d57ada5bb..53a7402f77 100644 --- a/package/ejabberd/ejabberd.hash +++ b/package/ejabberd/ejabberd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9e922b938458ae9d72d4e5fdd2d08a1fbad651aae47c9a9d15b79d0bbd1e11f8 ejabberd-20.07.tgz +sha256 b6e6739947d3678525b14ee280cedb1a04280c83ea17a4741795aac99fbdad47 ejabberd-21.12.tgz sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 2b23701ddf..5b8ed3edd0 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -4,7 +4,7 @@ # ################################################################################ -EJABBERD_VERSION = 20.07 +EJABBERD_VERSION = 21.12 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION) EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception @@ -16,7 +16,8 @@ EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \ erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp -# 0001-remove-make-targets-for-deps.patch updates Makefile.in +# 0001-Makefile.in-do-not-download-or-compile-dependencies.patch +# updates Makefile.in EJABBERD_USE_AUTOCONF = YES EJABBERD_AUTORECONF = YES From 4141e017e199b4da088c33ce1f301d160ad23ed2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 19:45:53 -0600 Subject: [PATCH 034/102] package/wireshark: drop !BR2_arc dependency This is no longer a qt dependency as of: 16ffc6549465cb5d68b751f10603e8b0363bf9b0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/wireshark/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index fdeb9da259..cd92beb1d1 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -25,7 +25,6 @@ config BR2_PACKAGE_WIRESHARK_GUI depends on BR2_HOST_GCC_AT_LEAST_5 # qt5 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qt5 - depends on !BR2_arc # qt5 depends on BR2_PACKAGE_HAS_UDEV # qt5 input select BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime @@ -39,7 +38,6 @@ config BR2_PACKAGE_WIRESHARK_GUI Enable Qt5 GUI comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, host gcc >= 5.0, gcc >= 5.0" - depends on !BR2_arc depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 From dd018f78de99ea78633694dba011f155849dde32 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 27 May 2022 12:33:35 +0200 Subject: [PATCH 035/102] package/rtl8723ds: new package This package adds a driver for Realtek RTL8723DS wifi chip. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8723ds/Config.in | 10 ++++++++++ package/rtl8723ds/rtl8723ds.mk | 23 +++++++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 package/rtl8723ds/Config.in create mode 100644 package/rtl8723ds/rtl8723ds.mk diff --git a/DEVELOPERS b/DEVELOPERS index 096ca94f4e..fe840f33f5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -181,6 +181,7 @@ F: package/python-web2py/ F: package/qt5/qt5coap/ F: package/qt5/qt5knx/ F: package/qt5/qt5mqtt/ +F: package/rtl8723ds/ F: package/sam-ba/ F: package/sshguard/ F: package/sunwait/ diff --git a/package/Config.in b/package/Config.in index 8892134133..4ab61713e0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -566,6 +566,7 @@ endmenu source "package/rtl8189fs/Config.in" source "package/rtl8723bs/Config.in" source "package/rtl8723bu/Config.in" + source "package/rtl8723ds/Config.in" source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" source "package/sane-backends/Config.in" diff --git a/package/rtl8723ds/Config.in b/package/rtl8723ds/Config.in new file mode 100644 index 0000000000..ef7dd39a68 --- /dev/null +++ b/package/rtl8723ds/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_RTL8723DS + bool "rtl8723ds" + depends on BR2_LINUX_KERNEL + help + rtl8723bs wifi driver + + https://github.com/lwfinger/rtl8723ds + +comment "rtl8723ds needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk new file mode 100644 index 0000000000..da25ffe9a7 --- /dev/null +++ b/package/rtl8723ds/rtl8723ds.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# rtl8723ds +# +################################################################################ + +RTL8723DS_VERSION = 76146e85847beb2427b1d4958fa275822f2b04ab +RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) +RTL8723DS_LICENSE = GPL-2.0 + +RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_RTL8723DS=m \ + KVER=$(LINUX_VERSION_PROBED) \ + KSRC=$(LINUX_DIR) + +define RTL8723DS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) From 4bb884a3c61c6b71e33f69453a90eb2a367f64b7 Mon Sep 17 00:00:00 2001 From: Dimitar Tomov Date: Wed, 1 Jun 2022 22:47:46 +0300 Subject: [PATCH 036/102] package/wolftpm: new package wolfTPM is an open-source TPM 2.0 stack with backward API compatibility, designed for embedded use. It is highly portable, and has native support for Linux. wolfTPM has a compact code size with low resource usage. Signed-off-by: Dimitar Tomov [Thomas: - Fix ordering in the DEVELOPERS file, use full name - Add missing !BR2_STATIC_LIBS dependency - Use "select" and not "select on" - Make sure wolftpm-config script gets post-processed by using _CONFIG_SCRIPTS - Add missing --with-wolfcrypt option. - Rename WOLFTPM_CONFIG_RPATH to WOLFTPM_TOUCH_CONFIG_RPATH and use mkdir -p to make the hook re-executable] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/wolftpm/Config.in | 16 ++++++++++++++++ package/wolftpm/wolftpm.hash | 2 ++ package/wolftpm/wolftpm.mk | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 package/wolftpm/Config.in create mode 100644 package/wolftpm/wolftpm.hash create mode 100644 package/wolftpm/wolftpm.mk diff --git a/DEVELOPERS b/DEVELOPERS index fe840f33f5..7bc0e0632c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -729,6 +729,9 @@ F: package/s6/ F: package/skalibs/ F: support/testing/tests/boot/test_edk2.py +N: Dimitar Tomov +F: package/wolftpm/ + N: Dimitrios Siganos F: package/wireless-regdb/ diff --git a/package/Config.in b/package/Config.in index 4ab61713e0..8f1a7d4e9f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1433,6 +1433,7 @@ menu "Crypto" source "package/trousers/Config.in" source "package/ustream-ssl/Config.in" source "package/wolfssl/Config.in" + source "package/wolftpm/Config.in" endmenu menu "Database" diff --git a/package/wolftpm/Config.in b/package/wolftpm/Config.in new file mode 100644 index 0000000000..0fe094f277 --- /dev/null +++ b/package/wolftpm/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_WOLFTPM + bool "wolftpm" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_WOLFSSL + select BR2_PACKAGE_WOLFSSL_ALL + help + wolfTPM is a portable, open-source TPM 2.0 stack with + backward API compatibility, designed for embedded use. + No external dependencies, compact code size with low + resource usage. + + https://www.wolfssl.com/ + +comment "wolftpm needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/wolftpm/wolftpm.hash b/package/wolftpm/wolftpm.hash new file mode 100644 index 0000000000..6dbf143ffe --- /dev/null +++ b/package/wolftpm/wolftpm.hash @@ -0,0 +1,2 @@ +# Hash from https://github.com/wolfSSL/wolfTPM/archive/refs/tags/v2.3.1.tar.gz +sha256 f0d7c095491ac2cc9e44aa4ac3c22febf15942ef080431d8b43a9d0312ca6567 wolftpm-2.3.1.tar.gz diff --git a/package/wolftpm/wolftpm.mk b/package/wolftpm/wolftpm.mk new file mode 100644 index 0000000000..ea01eaad6b --- /dev/null +++ b/package/wolftpm/wolftpm.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# wolftpm +# +################################################################################ + +WOLFTPM_VERSION = 2.3.1 +WOLFTPM_SITE = $(call github,wolfSSL,wolfTPM,v$(WOLFTPM_VERSION)) +WOLFTPM_INSTALL_STAGING = YES +WOLFTPM_LICENSE = GPL-2.0+ +WOLFTPM_LICENSE_FILES = LICENSE +WOLFTPM_CPE_ID_VENDOR = wolfssl +WOLFTPM_DEPENDENCIES = host-pkgconf +WOLFTPM_CONFIG_SCRIPTS = wolftpm-config + +# wolfTPM's source code is released without a configure script, +# therefore we need autoreconf +WOLFTPM_AUTORECONF = YES + +WOLFTPM_CONF_OPTS = \ + --disable-examples \ + --enable-devtpm \ + --with-wolfcrypt=$(STAGING_DIR)/usr + +# Fix for missing config.rpath in the codebase +define WOLFTPM_TOUCH_CONFIG_RPATH + mkdir -p $(@D)/build-aux + touch $(@D)/build-aux/config.rpath +endef +WOLFTPM_PRE_CONFIGURE_HOOKS += WOLFTPM_TOUCH_CONFIG_RPATH + +$(eval $(autotools-package)) From 549f5f07785448c94454bdedf57b39304ac67e43 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Jun 2022 22:51:21 +0200 Subject: [PATCH 037/102] package/wolftpm: add missing license file hash Signed-off-by: Thomas Petazzoni --- package/wolftpm/wolftpm.hash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/wolftpm/wolftpm.hash b/package/wolftpm/wolftpm.hash index 6dbf143ffe..b9a9628b68 100644 --- a/package/wolftpm/wolftpm.hash +++ b/package/wolftpm/wolftpm.hash @@ -1,2 +1,4 @@ # Hash from https://github.com/wolfSSL/wolfTPM/archive/refs/tags/v2.3.1.tar.gz sha256 f0d7c095491ac2cc9e44aa4ac3c22febf15942ef080431d8b43a9d0312ca6567 wolftpm-2.3.1.tar.gz +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE From 1713777f3a3e0d3c223cf29869db86c4df99892f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Jun 2022 23:04:57 +0200 Subject: [PATCH 038/102] package/wolfssl: post-process wolfssl-config script The wolfssl package installs $(STAGING_DIR)/usr/bin/wolfssl-config, which needs to be post-processed to return correct results. Use _CONFIG_SCRIPTS to achieve this. Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index bfb54445e4..58b6f296ab 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -11,7 +11,7 @@ WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ WOLFSSL_LICENSE_FILES = COPYING LICENSING WOLFSSL_CPE_ID_VENDOR = wolfssl - +WOLFSSL_CONFIG_SCRIPTS = wolfssl-config WOLFSSL_DEPENDENCIES = host-pkgconf # wolfssl's source code is released without a configure From 35a3b4b26c8042d67f97791e3004f953c87987ef Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 31 May 2022 22:25:59 +0200 Subject: [PATCH 039/102] package/libnss: bump version to 3.79 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 0c06495f5e..f7da9ccfdc 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_78_RTM/src/SHA256SUMS -sha256 f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800 nss-3.78.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_79_RTM/src/SHA256SUMS +sha256 ebdf2d6a96613b6fe70ad579e9f983e0e94e0110171cfb2999db633d3394a514 nss-3.79.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 540092dfcf..1ef9abc0ab 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.78 +LIBNSS_VERSION = 3.79 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 From 9d7be48e86f2f5a31cc6de986ff06786cad5e829 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 31 May 2022 22:40:34 +0200 Subject: [PATCH 040/102] package/harfbuzz: bump to version 4.3.0 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index f3ba228353..29ef89719d 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bd17916513829aeff961359a5ccebba6de2f4bf37a91faee3ac29c120e3d7ee1 harfbuzz-4.2.1.tar.xz +sha256 a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530 harfbuzz-4.3.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 38ed34ab70..8abce91537 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 4.2.1 +HARFBUZZ_VERSION = 4.3.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 2cf8ac37e108e2696426388c2e340f0110a8d973 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 May 2022 17:52:14 +0200 Subject: [PATCH 041/102] package/kodi-peripheral-joystick: bump version to 19.0.3-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 176f4be24d..5ac4247cbf 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3188d2007449fb1bf52be923fcb4f7da3bd8e60a8644a7ae5635a0ea53a21368 kodi-peripheral-joystick-19.0.2-Matrix.tar.gz +sha256 0a595933998565902f112f0d476ada1cd732a1961ed10b8a2b9a52ed8bd8c652 kodi-peripheral-joystick-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index f56041c544..1b2b3f4984 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.2-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.3-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From 6efd6bec01fa64384e90b0d5cfc951d7cc3bf31d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 May 2022 17:52:15 +0200 Subject: [PATCH 042/102] package/kodi-pvr-stalker: bump version to 19.0.3-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 2eae79d371..ad47f02bd8 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ca472c4f43f77d7badca3fbe174f5877e6b3ff63407da09f690d8146ec737b59 kodi-pvr-stalker-19.0.2-Matrix.tar.gz +sha256 c0d71dad5fdbc334ea8b0b66f5155c72b6f59a76c268a1de71edb837688ebf81 kodi-pvr-stalker-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index efa293a40d..bda1c8ff75 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 19.0.2-Matrix +KODI_PVR_STALKER_VERSION = 19.0.3-Matrix KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md From 0ca7ed66f51b7dd1b037ae444654cccc391c3035 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 May 2022 17:52:16 +0200 Subject: [PATCH 043/102] package/kodi-pvr-mythtv: bump version to 19.0.9-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index d7a8657da0..361aa6ce92 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2aca8c87b2f6d19fc385a4b5bde45637a4e6f417d0b43e514980d1cf26404ce7 kodi-pvr-mythtv-19.0.8-Matrix.tar.gz +sha256 8f872c1c395c4688759271d60bcfbe5a652490eed723582fe60662d265ea900f kodi-pvr-mythtv-19.0.9-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index d3110aed68..4d041dc8f0 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.8-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.9-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From dac6e3011883ce3b35cbf64ec156186153bf0032 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 31 May 2022 12:59:00 +0200 Subject: [PATCH 044/102] package/nettle: add build support for host Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/nettle/nettle.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index 3dbd0cb94b..bc3708ca94 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -27,3 +27,4 @@ NETTLE_CONF_OPTS += --disable-arm-neon endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From f31696e1a114883c363bf7bf3bde5bff89de6fac Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 31 May 2022 12:59:01 +0200 Subject: [PATCH 045/102] package/libtasn1: add build support for host Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libtasn1/libtasn1.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk index ba86081df9..11ab223962 100644 --- a/package/libtasn1/libtasn1.mk +++ b/package/libtasn1/libtasn1.mk @@ -29,3 +29,4 @@ endef LIBTASN1_POST_INSTALL_TARGET_HOOKS += LIBTASN1_REMOVE_PROGS $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 4ec71b97cf040a2a04901432fbdb379c61ebd2a0 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 31 May 2022 12:59:03 +0200 Subject: [PATCH 046/102] package/gnutls: add build support for host Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.mk | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index f7f3e046e9..ac83bb35d3 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -41,6 +41,31 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ gl_cv_func_gettimeofday_clobber=no GNUTLS_INSTALL_STAGING = YES +HOST_GNUTLS_DEPENDENCIES = host-pkgconf host-libtasn1 host-libunistring host-nettle +HOST_GNUTLS_CONF_OPTS = \ + --disable-doc \ + --disable-guile \ + --disable-libdane \ + --disable-rpath \ + --disable-tests \ + --without-included-unistring \ + --without-libcrypto-prefix \ + --without-libdl-prefix \ + --without-libev-prefix \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-libpthread-prefix \ + --without-libseccomp-prefix \ + --without-librt-prefix \ + --without-libz-prefix \ + --without-tpm \ + --disable-openssl-compatibility \ + --without-libbrotli \ + --without-idn \ + --without-p11-kit \ + --without-zlib \ + --without-libzstd + ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y) GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library) GNUTLS_LICENSE_FILES += doc/COPYING @@ -103,3 +128,4 @@ endif GNUTLS_CONF_ENV += LIBS="$(GNUTLS_LIBS)" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From a4db0560ac13aa7a927b8fb876a14c21cddf98d9 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 31 May 2022 12:59:05 +0200 Subject: [PATCH 047/102] boot/uboot: bump to 2022.04 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 953c36135e..d525faea1c 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2022.01" + bool "2022.04" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2022.04" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 9171a794a1..a8bd817900 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 +sha256 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 u-boot-2022.04.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt From a3a1da05fcc36dc256ebae98c5498ae384a65aff Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Wed, 1 Jun 2022 23:32:22 +0200 Subject: [PATCH 048/102] boot/uboot: add BR2_TARGET_UBOOT_NEEDS_GNUTLS option Since U-Boot 2022.04 a host dependency to gnutls is required if the U-Boot board configuration has CONFIG_TOOLS_MKEFICAPSULE enabled. So introduce a new BR U-Boot config option BR2_TARGET_UBOOT_NEEDS_GNUTLS to solve this problem. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index d525faea1c..91d98c7e63 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -182,6 +182,14 @@ config BR2_TARGET_UBOOT_NEEDS_LZOP the case when the board configuration has CONFIG_SPL_LZO enabled. +config BR2_TARGET_UBOOT_NEEDS_GNUTLS + bool "U-Boot needs gnutls" + help + Select this option if your U-Boot board configuration + requires gnutls to be available on the host. This is + typically the case when the board configuration has + CONFIG_TOOLS_MKEFICAPSULE enabled. + config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 bool "U-Boot needs ATF BL31" depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index cb26fc8d3e..5808e30818 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -227,6 +227,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y) UBOOT_DEPENDENCIES += host-lzop endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_GNUTLS),y) +UBOOT_DEPENDENCIES += host-gnutls +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE From 90712c01237cf42ba43c2d489c0357c6930cc54a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 19 May 2022 12:35:35 +0200 Subject: [PATCH 049/102] package/libressl: bump to version 3.5.3 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index c3590798db..7a7638b2db 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 56feab8e21c3fa6549f8b7d7511658b8e98518162838a795314732654adf3e5f libressl-3.5.2.tar.gz +sha256 3ab5e5eaef69ce20c6b170ee64d785b42235f48f2e62b095fca5d7b6672b8b28 libressl-3.5.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index a52a15c676..85d1fe5e3a 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.5.2 +LIBRESSL_VERSION = 3.5.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From 9ac8fb266e9dd8c94ba89c9501571d9021fd838d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 25 May 2022 19:08:43 +0200 Subject: [PATCH 050/102] package/intel-mediadriver: bump version to 22.4.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 6ca3867908..92346e9dae 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5589d4e0142ae957d58798e3fba08d9e5e096e92eed422d40a82d45a14e6042f intel-media-22.4.1.tar.gz +sha256 e8e7faeb40e523b0daf61336853e09f59f810598093d65737cd119107cf933f8 intel-media-22.4.2.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index e44330245b..9f500346e6 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.4.1 +INTEL_MEDIADRIVER_VERSION = 22.4.2 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 From ca3acb36121f50ea3125814153b8bc384d5bdf89 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 23 May 2022 15:46:45 -0700 Subject: [PATCH 051/102] package/python-sip: bump to version 4.19.25 This version is the minimum version needed to support newer versions of PyQT. Changes: - Update the URL as this version is not hosted on sourceforge. - Add --no-stubs to prevent the error: No such file or directory: sip.pyi - Add 0001-remove-join-from-sip-h-files-string.patch to prevent python-sip from attempting to copy the entire hosts /usr directory when installing. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...-remove-join-from-sip-h-files-string.patch | 33 +++++++++++++++++++ package/python-sip/python-sip.hash | 10 +++--- package/python-sip/python-sip.mk | 6 ++-- 3 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 package/python-sip/0001-remove-join-from-sip-h-files-string.patch diff --git a/package/python-sip/0001-remove-join-from-sip-h-files-string.patch b/package/python-sip/0001-remove-join-from-sip-h-files-string.patch new file mode 100644 index 0000000000..e7a0d606e9 --- /dev/null +++ b/package/python-sip/0001-remove-join-from-sip-h-files-string.patch @@ -0,0 +1,33 @@ +From 009e5cf0750134ed5403aae23ef53a177764ca04 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Wed, 29 Dec 2021 13:49:15 -0800 +Subject: [PATCH] remove join from sip_h.files string + +When cross compiling, the configure system appends the hosts /usr/ directory +to the path of which to find files that python-sip will install. This leads to +python-sip attempting to install everything under the hosts /usr directory into +the targets /usr/include/python directory. + +Remove the .join() in the sip_h.files string to prevent the above issue. + +Signed-off-by: Adam Duskett +--- + configure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.py b/configure.py +index 25bcaa7..fc8f2dc 100644 +--- a/configure.py ++++ b/configure.py +@@ -408,7 +408,7 @@ def create_makefiles(macros): + # There will only be one element. + files, path = gen_installs[0] + pro.write("\n") +- pro.write("sip_h.files = %s\n" % " ".join(files)) ++ pro.write("sip_h.files = %s\n" % files) + pro.write("sip_h.path = %s\n" % quote(path)) + pro.write("INSTALLS += sip_h\n") + +-- +2.33.1 + diff --git a/package/python-sip/python-sip.hash b/package/python-sip/python-sip.hash index 6adf44d410..0108924cdc 100644 --- a/package/python-sip/python-sip.hash +++ b/package/python-sip/python-sip.hash @@ -1,7 +1,5 @@ -# From https://sourceforge.net/projects/pyqt/files/sip/sip-4.18/ -md5 78724bf2a79878201c3bc81a1d8248ea sip-4.18.tar.gz # Locally calculated: -sha256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 sip-4.18.tar.gz -sha256 accecbfda71ad4497bce0d451796706e734e405e5ecf3b3f9ee0cc68300a3d9c LICENSE -sha256 7ebb61006e46b9e9340dd135d5f4afbbcb1d1d6c6709f74473b35929007b9aeb LICENSE-GPL2 -sha256 63cb5f5c1ea39b732c495f354f971e40f6db84c567ca5573a68bb65af07741f8 LICENSE-GPL3 +sha256 b39d93e937647807bac23579edbff25fe46d16213f708370072574ab1f1b4211 sip-4.19.25.tar.gz +sha256 accecbfda71ad4497bce0d451796706e734e405e5ecf3b3f9ee0cc68300a3d9c LICENSE +sha256 7ebb61006e46b9e9340dd135d5f4afbbcb1d1d6c6709f74473b35929007b9aeb LICENSE-GPL2 +sha256 63cb5f5c1ea39b732c495f354f971e40f6db84c567ca5573a68bb65af07741f8 LICENSE-GPL3 diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 01ccb1ddd5..3e015fa16c 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_SIP_VERSION = 4.18 +PYTHON_SIP_VERSION = 4.19.25 PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz -PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON_SIP_VERSION) +PYTHON_SIP_SITE = https://www.riverbankcomputing.com/static/Downloads/sip/$(PYTHON_SIP_VERSION) PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 - PYTHON_SIP_DEPENDENCIES = python3 qt5base HOST_PYTHON_SIP_DEPENDENCIES = host-python3 @@ -34,6 +33,7 @@ define PYTHON_SIP_CONFIGURE_CMDS --incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ + --no-stubs \ --use-qmake && \ $(HOST_DIR)/bin/qmake) endef From b36ce7eda010226ccc3bc8be560def3a0183ff11 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 23 May 2022 15:46:46 -0700 Subject: [PATCH 052/102] package/python-pyqt5: bump to version 5.15.6 - Change the site from sourceforge to pypi. - Remove upstream or uneeded patches. - Change qtdetail.out to qtcore, as the qtdetail.out file is now QtCore.out - Remove the QtWebEngineCore module, as the module has been moved to a separat PyQtWebEngine package. - Add the --assume-shared option as Buildroot forces QT5 to be built as a shared library. - Parallel install is not supported, as some install targets depend on previously installed targets first. Tested with test-pkg -p python-pyqt5 -a in an ubuntu 20.04 container. 45 builds, 10 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .../0001-configure-skip-qtdetail.patch | 37 +++++++++------ .../0002-fix-QtCoremod.sip-syntax-error.patch | 29 ++++++++++++ package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 ----------- ...uttonHint-and-WindowCancelButtonHint.patch | 27 ----------- ...drop-qttest-qtestmouse-waitforevents.patch | 32 ------------- package/python-pyqt5/python-pyqt5.hash | 10 ++-- package/python-pyqt5/python-pyqt5.mk | 47 +++++++++---------- 7 files changed, 78 insertions(+), 132 deletions(-) create mode 100644 package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch delete mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch delete mode 100644 package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch diff --git a/package/python-pyqt5/0001-configure-skip-qtdetail.patch b/package/python-pyqt5/0001-configure-skip-qtdetail.patch index 2e7b331ed6..b82f89e004 100644 --- a/package/python-pyqt5/0001-configure-skip-qtdetail.patch +++ b/package/python-pyqt5/0001-configure-skip-qtdetail.patch @@ -1,4 +1,8 @@ -Do not run qtdetail +From 7ed5e15f2de747e383ba7eee66b646a7a66e6654 Mon Sep 17 00:00:00 2001 +From: Sergey Kostanbaev +Date: Wed, 29 Dec 2021 12:30:12 -0800 +Subject: [PATCH] Do not run qtdetail + qtdetail is a tool that generates qtdetail.out. Since this program is cross-compiled, it's not possible to run it on the host. @@ -11,19 +15,24 @@ file is kept, and that qtdetail is not executed. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Sergey Kostanbaev ---- -Index: PyQt5_gpl-5.7/configure.py -=================================================================== ---- PyQt5_gpl-5.7.orig/configure.py -+++ PyQt5_gpl-5.7/configure.py -@@ -672,10 +672,6 @@ int main(int argc, char **argv) - if cmd is None: - error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") +Signed-off-by: Adam Duskett +Refresh for 5.15.6 + +diff --git a/configure.py b/configure.py +index daa0f94..32f5b21 100644 +--- a/configure.py ++++ b/configure.py +@@ -2455,10 +2455,6 @@ def run_test_program(mname, test, verbose): -- # Create the output file, first making sure it doesn't exist. -- remove_file(out_file) -- run_command(cmd, verbose) + out_file = 'cfgtest_' + mname + '.out' + +- # Create the output file, first making sure it doesn't exist. +- remove_file(out_file) +- run_command(test + ' ' + out_file, verbose) - - if not os.access(out_file, os.F_OK): - error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file)) + if not os.access(out_file, os.F_OK): + error("%s failed to create %s. Make sure your Qt installation is correct." % (test, out_file)) +-- +2.33.1 + diff --git a/package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch b/package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch new file mode 100644 index 0000000000..d83c5e525a --- /dev/null +++ b/package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch @@ -0,0 +1,29 @@ +From d004e17cd92f660cb386d91e14729a03cab087d4 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Sun, 22 May 2022 13:23:27 -0700 +Subject: [PATCH] fix QtCoremod.sip syntax error + +Fixes PyQt5/bindings/QtCore/QtCoremod.sip:23: syntax error from the +python-sip-4 package. + +Signed-off-by: Adam Duskett +--- + sip/QtCore/QtCoremod.sip | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip +index b525bc5..1e2b8ba 100644 +--- a/sip/QtCore/QtCoremod.sip ++++ b/sip/QtCore/QtCoremod.sip +@@ -20,7 +20,7 @@ + // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +-%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True, py_ssize_t_clean=True) ++%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) + + %Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0 Qt_5_14_0 Qt_5_15_0} + +-- +2.36.1 + diff --git a/package/python-pyqt5/0002-fix-qt-5.6.2.patch b/package/python-pyqt5/0002-fix-qt-5.6.2.patch deleted file mode 100644 index fd2f9d9069..0000000000 --- a/package/python-pyqt5/0002-fix-qt-5.6.2.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix the build with Qt 5.6.{2,3} - -Building PyQt 5.7 with versions of Qt older than Qt 5.7 is supposed to -work, but currently fails in practice. In fact, this is due to the -fact that the %Timeline variable in QtCoremod.sip didn't contain the -5.6.{2,3} Qt versions, so if this version was used, PyQt was assuming it -was the later version 5.7, and therefore started enabling APIs only -available in Qt 5.7, causing build failures when building against Qt -5.6.{2,3}. - -Adding Qt_5_6_2 and Qt_5_6_3 to the timeline fixes this problem. This -fix was suggested by Phil Thompson . - -Signed-off-by: Thomas Petazzoni - -Index: PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip -=================================================================== ---- PyQt5_gpl-5.7.orig/sip/QtCore/QtCoremod.sip 2016-07-25 15:55:37.000000000 +0200 -+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip 2016-10-26 15:45:43.577153825 +0200 -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_7_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} - diff --git a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch deleted file mode 100644 index 146cce0348..0000000000 --- a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Mon, 30 Jan 2017 18:28:15 +0100 -Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from - qnamespace.sip as they are removed from qt5.8 - -Signed-off-by: Zoltan Gyarmati ---- - sip/QtCore/qnamespace.sip | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip -index 2db83b7..559f410 100644 ---- a/sip/QtCore/qnamespace.sip -+++ b/sip/QtCore/qnamespace.sip -@@ -209,8 +209,6 @@ namespace Qt - WindowContextHelpButtonHint, - WindowShadeButtonHint, - WindowStaysOnTopHint, -- WindowOkButtonHint, -- WindowCancelButtonHint, - WindowStaysOnBottomHint, - WindowCloseButtonHint, - MacWindowToolBarButtonHint, --- -2.7.4 - diff --git a/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch b/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch deleted file mode 100644 index 352be9aee0..0000000000 --- a/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch +++ /dev/null @@ -1,32 +0,0 @@ -Drop waitForEvents() method from qtestmouse - -This method was dropped in Qt 5.11: - - https://github.com/qt/qtbase/commit/75e583b3fcbdbbb999633eb5f2267720dd695cfa - -However, Python PyQt5 still generates a wrapper for it, causing a -build failure. The upstream PyQt5 maintainers have not kept -waitForEvents() support for older Qt versions, and instead entirely -dropped it unconditionally. This can be verified by diffing PyQt 5.10 -and PyQt 5.11. We take the same approach, and drop waitForEvents() -unconditionally, even when PyQt5 is built against the older Qt 5.6. - -Fedora is using a similar solution: -https://src.fedoraproject.org/rpms/python-qt5/c/47fb7fdc5d16582772f9c3fc8a6a674a41a7f605?branch=master. - -This patch can be dropped when PyQt5 is bumped to its 5.11 version. - -Signed-off-by: Thomas Petazzoni - -Index: b/sip/QtTest/qtestmouse.sip -=================================================================== ---- a/sip/QtTest/qtestmouse.sip -+++ b/sip/QtTest/qtestmouse.sip -@@ -41,7 +41,6 @@ - void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); -- void waitForEvents() /ReleaseGIL/; - void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); - void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); diff --git a/package/python-pyqt5/python-pyqt5.hash b/package/python-pyqt5/python-pyqt5.hash index 8ef467a27b..d1b7adf8c1 100644 --- a/package/python-pyqt5/python-pyqt5.hash +++ b/package/python-pyqt5/python-pyqt5.hash @@ -1,6 +1,6 @@ -# md5 from http://http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7, sha256 locally computed -md5 e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz -sha256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 PyQt5_gpl-5.7.tar.gz +# From https://pypi.org/pypi/PyQt5/json +md5 0c7fca60aa6ee13c235f68576d9c7bed PyQt5-5.15.6.tar.gz -# Hash for license file -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE +# Locally calculated +sha256 80343bcab95ffba619f2ed2467fd828ffeb0a251ad7225be5fc06dcc333af452 PyQt5-5.15.6.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index af32f63796..54b7f201b8 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYQT5_VERSION = 5.7 -PYTHON_PYQT5_SOURCE = PyQt5_gpl-$(PYTHON_PYQT5_VERSION).tar.gz -PYTHON_PYQT5_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$(PYTHON_PYQT5_VERSION) +PYTHON_PYQT5_VERSION = 5.15.6 +PYTHON_PYQT5_SOURCE = PyQt5-$(PYTHON_PYQT5_VERSION).tar.gz +PYTHON_PYQT5_SITE = https://files.pythonhosted.org/packages/3b/27/fd81188a35f37be9b3b4c2db1654d9439d1418823916fe702ac3658c9c41 PYTHON_PYQT5_LICENSE = GPL-3.0 PYTHON_PYQT5_LICENSE_FILES = LICENSE @@ -91,13 +91,6 @@ PYTHON_PYQT5_DEPENDENCIES += qt5webchannel PYTHON_PYQT5_MODULES += QtWebChannel endif -ifeq ($(BR2_PACKAGE_QT5WEBENGINE),y) -PYTHON_PYQT5_DEPENDENCIES += qt5webengine -PYTHON_PYQT5_MODULES += \ - QtWebEngineCore \ - $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtWebEngineWidgets) -endif - ifeq ($(BR2_PACKAGE_QT5WEBKIT),y) PYTHON_PYQT5_DEPENDENCIES += qt5webkit PYTHON_PYQT5_MODULES += \ @@ -120,27 +113,27 @@ PYTHON_PYQT5_DEPENDENCIES += qt5xmlpatterns PYTHON_PYQT5_MODULES += QtXmlPatterns endif -PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source +PYTHON_PYQT5_QTCORE_LICENSE = Open Source -PYTHON_PYQT5_QTDETAIL_TYPE = shared +PYTHON_PYQT5_QTCORE_TYPE = shared # Turn off features that aren't available in current qt configuration -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) +PYTHON_PYQT5_QTCORE_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) +PYTHON_PYQT5_QTCORE_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) +PYTHON_PYQT5_QTCORE_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) -define PYTHON_PYQT5_QTDETAIL - echo $(1) >> $(2)/qtdetail.out +define PYTHON_PYQT5_QTCORE + echo $(1) >> $(2)/cfgtest_QtCore.out endef -# Since we can't run generate qtdetail.out by running qtdetail on target device +# Since we can't run generate cfgtest_QtCore.out by running qtdetail on target device # we must generate the configuration. -define PYTHON_PYQT5_GENERATE_QTDETAIL - $(RM) -f $(1)/qtdetail.out - $(call PYTHON_PYQT5_QTDETAIL,$(PYTHON_PYQT5_QTDETAIL_LICENSE),$(1)) - $(call PYTHON_PYQT5_QTDETAIL,$(PYTHON_PYQT5_QTDETAIL_TYPE),$(1)) - $(foreach f,$(PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES), - $(call PYTHON_PYQT5_QTDETAIL,$(f),$(1)) \ +define PYTHON_PYQT5_GENERATE_QTCORE + $(RM) -f $(1)/cfgtest_QtCore.out + $(call PYTHON_PYQT5_QTCORE,$(PYTHON_PYQT5_QTCORE_LICENSE),$(1)) + $(call PYTHON_PYQT5_QTCORE,$(PYTHON_PYQT5_QTCORE_TYPE),$(1)) + $(foreach f,$(PYTHON_PYQT5_QTCORE_DISABLE_FEATURES), + $(call PYTHON_PYQT5_QTCORE,$(f),$(1)) \ ) endef @@ -158,10 +151,11 @@ PYTHON_PYQT5_CONF_OPTS = \ --no-designer-plugin \ --no-docstrings \ --no-sip-files \ + --assume-shared \ $(foreach module,$(PYTHON_PYQT5_MODULES),--enable=$(module)) define PYTHON_PYQT5_CONFIGURE_CMDS - $(call PYTHON_PYQT5_GENERATE_QTDETAIL,$(@D)) + $(call PYTHON_PYQT5_GENERATE_QTCORE,$(@D)) (cd $(@D); \ $(TARGET_MAKE_ENV) \ $(TARGET_CONFIGURE_OPTS) \ @@ -177,7 +171,8 @@ endef # __init__.py is needed to import PyQt5 # __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set define PYTHON_PYQT5_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install + # Parallel install is not supported. + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) install touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py $(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2 endef From 5cc1bb317d558893e0bc188530222d46e9478ad6 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Sun, 22 May 2022 19:41:33 +0200 Subject: [PATCH 053/102] package/python-esptool: bump version to 4.0 Signed-off-by: Bartosz Bilas Signed-off-by: Thomas Petazzoni --- package/python-esptool/python-esptool.hash | 4 ++-- package/python-esptool/python-esptool.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index ac8f6972d7..354955b2f3 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 ac499eaa99df9b536a98a6f99644f8f6 esptool-3.3.tar.gz -sha256 39b92e1848e352183188f149f3e876cde4b8a1c095551e7e545a28e5c11eea13 esptool-3.3.tar.gz +md5 4e36d267401de7ef80ed84c141d8d41d esptool-4.0.tar.gz +sha256 bf6ed90864a02da70fe20132ab589e892ec0af7437df9e0bc4844afd2fc2dac0 esptool-4.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 28b5075e72..de7669d057 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 3.3 +PYTHON_ESPTOOL_VERSION = 4.0 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/63/85/1a7f65d3f89c112c721c6ec013ecd948112df17640e453ddeb1921b05aab +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/2d/91/76dac7a2c87172ee01e3e6e9ee17afb0b732065d49b476fef65c1ff8a386 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE From da643b87eb75d115d32311bf562acc5b21053452 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 25 May 2022 16:59:13 +0300 Subject: [PATCH 054/102] package/seatd: bump to version 0.7.0 Update seatd to version 0.7.0, which includes a flurry of small fixes and removes usage of the SEATD_SOCK and SEATD_LOGLEVEL environment variables (the latter replaced by a command line switch). Release notes: https://git.sr.ht/~kennylevinsen/seatd/refs/0.7.0 The -Dlibseat-logind= option now needs the "systemd" value when the logind backend is systemd-logind, this patch adapts usage of the build option accordingly. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/seatd/seatd.hash | 2 +- package/seatd/seatd.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index 88793b6dd5..7500036e5b 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 3d4ac288114219ba7721239cafee7bfbeb7cf8e1e7fd653602a369e4ad050bd8 0.6.4.tar.gz +sha256 210ddf8efa1149cde4dd35908bef8e9e63c2edaa0cdb5435f2e6db277fafff3c 0.7.0.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 5382cad39b..96caf63b30 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.6.4 +SEATD_VERSION = 0.7.0 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT @@ -17,7 +17,7 @@ SEATD_CONF_OPTS += \ -Dwerror=false ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) -SEATD_CONF_OPTS += -Dlibseat-logind=enabled +SEATD_CONF_OPTS += -Dlibseat-logind=systemd SEATD_DEPENDENCIES += systemd else SEATD_CONF_OPTS += -Dlibseat-logind=disabled From c0646f72b23f3437bec90efae82242e6d07695fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 22 May 2022 16:30:27 +0200 Subject: [PATCH 055/102] package/kodi-vfs-libarchive: bump version to 19.2.0-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash | 2 +- package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index f3a2c8fcef..c0468517f2 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1360154d86bc73fc6f01f546d7b09a92968653cf05b037b0cd80a825d95a9187 kodi-vfs-libarchive-19.0.1-Matrix.tar.gz +sha256 957c76d3327b618396d9530394b235cebb73090b53afdeb2bd0d87f9677622d9 kodi-vfs-libarchive-19.2.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index eac02d7442..1f79bad71f 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = 19.0.1-Matrix +KODI_VFS_LIBARCHIVE_VERSION = 19.2.0-Matrix KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md From d6f2af555fbc595b22fda1c737ab192a57e7b5a6 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 29 May 2022 02:23:20 +0200 Subject: [PATCH 056/102] package/libfuse3: bump to version 3.11.0 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index cce2b11171..2fb5f329e3 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 e73f75e58da59a0e333d337c105093c496c0fd7356ef3a5a540f560697c9c4e6 libfuse3-3.10.5.tar.gz +sha256 25a00226d2d449c15b2f08467d6d5ebbb2a428260c4ab773721c32adbc6da072 libfuse3-3.11.0.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index 1dbe918c5b..b3e3176708 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.10.5 +LIBFUSE3_VERSION = 3.11.0 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From 85179d80c349008405f3213cf835f9be7c84de94 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 29 May 2022 02:23:56 +0200 Subject: [PATCH 057/102] package/libnspr: bump to version 4.34 Unfortunately local patch is still pending upstream. I've just pinged them: https://bugzilla.mozilla.org/show_bug.cgi?id=1765100 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnspr/libnspr.hash | 4 ++-- package/libnspr/libnspr.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index 0064a9b279..4795b52aaf 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.33/src/SHA256SUMS -sha256 b23ee315be0e50c2fb1aa374d17f2d2d9146a835b1a79c1918ea15d075a693d7 nspr-4.33.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.34/src/SHA256SUMS +sha256 beef011cd15d8f40794984d17014366513cec5719bf1a78f5e8a3e3a1cebf99c nspr-4.34.tar.gz # Locally calculated sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 7491d18884..5d64d110ef 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.33 +LIBNSPR_VERSION = 4.34 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr From 463e66ff9361b037935a92a2b888e026c1fec3d7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 13:31:39 -0600 Subject: [PATCH 058/102] package/bpftool: bump to version 6.8.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index 2e414b8eb8..5fbc25adb7 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e4ce219d3b87dd70d8dbfb8f02bd356f70c010f739f17baca1c8912199a8a72b bpftool-v6.7.0-br1.tar.gz +sha256 f8f8cabc001823d270898ea3a635d1eb88e067bc24eed06f74e58d2650b32312 bpftool-v6.8.0-br1.tar.gz sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk index 8742917253..bb1e4ccdff 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = v6.7.0 +BPFTOOL_VERSION = v6.8.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES From 9fb0f1cecac8639ec310ac9325a71aed4668c361 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 14:15:50 -0600 Subject: [PATCH 059/102] package/python-itsdangerous: bump to version 2.1.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-itsdangerous/python-itsdangerous.hash | 4 ++-- package/python-itsdangerous/python-itsdangerous.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-itsdangerous/python-itsdangerous.hash b/package/python-itsdangerous/python-itsdangerous.hash index dad4ec0800..071544e5bd 100644 --- a/package/python-itsdangerous/python-itsdangerous.hash +++ b/package/python-itsdangerous/python-itsdangerous.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/itsdangerous/json -md5 996b9763d1b4bd0edd6eb86f0a490629 itsdangerous-2.0.1.tar.gz -sha256 9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 itsdangerous-2.0.1.tar.gz +md5 c1bc730ddf53b8374eaa823f24eb6438 itsdangerous-2.1.2.tar.gz +sha256 5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a itsdangerous-2.1.2.tar.gz # Locally computed sha256 checksums sha256 63af09891b6be8ad1a4252ed43af0f4efba7fc948e228367bed7f3c5ae0b09d7 LICENSE.rst sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk index c53bc6b9ba..d7a1344e0a 100644 --- a/package/python-itsdangerous/python-itsdangerous.mk +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ITSDANGEROUS_VERSION = 2.0.1 +PYTHON_ITSDANGEROUS_VERSION = 2.1.2 PYTHON_ITSDANGEROUS_SOURCE = itsdangerous-$(PYTHON_ITSDANGEROUS_VERSION).tar.gz -PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/58/66/d6c5859dcac92b442626427a8c7a42322068c5cd5d4a463ce78b93f730b7 +PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/7f/a1/d3fb83e7a61fa0c0d3d08ad0a94ddbeff3731c05212617dff3a94e097f08 PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst docs/license.rst From e149215669fd46b4dc7354bcf1c70e58eb8e52bc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 14:19:16 -0600 Subject: [PATCH 060/102] package/python-click: bump to version 8.1.3 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-click/python-click.hash | 6 +++--- package/python-click/python-click.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-click/python-click.hash b/package/python-click/python-click.hash index fb6e457ad5..81d19c419e 100644 --- a/package/python-click/python-click.hash +++ b/package/python-click/python-click.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/click/json -md5 53692f62cb99a1a10c59248f1776d9c0 click-7.1.2.tar.gz -sha256 d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a click-7.1.2.tar.gz -# Locally computed sha256 +md5 a804b085de7a3ff96968e38e0f6f2e05 click-8.1.3.tar.gz +sha256 7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e click-8.1.3.tar.gz +# Locally computed sha256 checksums sha256 9a8ad106a394e853bfe21f42f4e72d592819a22805d991b5f3275029292b658d LICENSE.rst diff --git a/package/python-click/python-click.mk b/package/python-click/python-click.mk index a829257f5e..6444d0148e 100644 --- a/package/python-click/python-click.mk +++ b/package/python-click/python-click.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CLICK_VERSION = 7.1.2 +PYTHON_CLICK_VERSION = 8.1.3 PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz -PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/27/6f/be940c8b1f1d69daceeb0032fee6c34d7bd70e3e649ccac0951500b4720e +PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/59/87/84326af34517fca8c58418d148f2403df25303e02736832403587318e9e8 PYTHON_CLICK_LICENSE = BSD-3-Clause PYTHON_CLICK_LICENSE_FILES = LICENSE.rst PYTHON_CLICK_SETUP_TYPE = setuptools From 404663f49647cba935c37b418ed8317bf7d29588 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 14:24:22 -0600 Subject: [PATCH 061/102] package/python-flask-wtf: bump to version 1.0.1 License moved and hash changed due to rename and removal of authors: https://github.com/wtforms/flask-wtf/commit/d37c22b42202ccf4c8f96c445ceafe72c4c5ed46 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-flask-wtf/python-flask-wtf.hash | 6 +++--- package/python-flask-wtf/python-flask-wtf.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-flask-wtf/python-flask-wtf.hash b/package/python-flask-wtf/python-flask-wtf.hash index 848d6d7783..01e4290950 100644 --- a/package/python-flask-wtf/python-flask-wtf.hash +++ b/package/python-flask-wtf/python-flask-wtf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-wtf/json -md5 920a5a476ecfb751952b5048cc05fcf8 Flask-WTF-0.15.1.tar.gz -sha256 ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc Flask-WTF-0.15.1.tar.gz +md5 d86dbc0befe30fd577a623a51689b900 Flask-WTF-1.0.1.tar.gz +sha256 34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9 Flask-WTF-1.0.1.tar.gz # Locally computed sha256 checksums -sha256 a075f8d98acfdb05dd98716242b9e2c1b3ab98722926b3c4cf6c916ac14e8350 LICENSE +sha256 d5f19036451578cb36eeef04c99ebf7d7ca2e70dcf043636519bc420e15a7c62 LICENSE.rst diff --git a/package/python-flask-wtf/python-flask-wtf.mk b/package/python-flask-wtf/python-flask-wtf.mk index e2078103f5..97291e1b26 100644 --- a/package/python-flask-wtf/python-flask-wtf.mk +++ b/package/python-flask-wtf/python-flask-wtf.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_FLASK_WTF_VERSION = 0.15.1 +PYTHON_FLASK_WTF_VERSION = 1.0.1 PYTHON_FLASK_WTF_SOURCE = Flask-WTF-$(PYTHON_FLASK_WTF_VERSION).tar.gz -PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/9c/b5/4b48cece7b31aac2beab115330c2978ef4deee3aeb0dd1037c9b7a71b8c3 +PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/d9/38/d4798dd05be711d666e1befb08b1d3db57bd146d1a14d15657f60c88b446 PYTHON_FLASK_WTF_LICENSE = BSD-3-Clause -PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE +PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE.rst PYTHON_FLASK_WTF_SETUP_TYPE = setuptools $(eval $(python-package)) From d2fc8442ebc20b2baf90e684c43fb9bc78fe838d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 14:28:05 -0600 Subject: [PATCH 062/102] package/python-flask-sqlalchemy: bump to version 2.5.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-flask-sqlalchemy/python-flask-sqlalchemy.hash | 6 +++--- package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash index f1fe9775f5..4c2a701eb3 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 1f5781cf3e1a2b1aabda47a5b20d2073 Flask-SQLAlchemy-2.4.1.tar.gz -sha256 6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d Flask-SQLAlchemy-2.4.1.tar.gz +md5 dcb6b62248ced71dab183f2cb2778583 Flask-SQLAlchemy-2.5.1.tar.gz +sha256 2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912 Flask-SQLAlchemy-2.5.1.tar.gz # Locally computed sha256 checksums -sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst +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 c6d0094b41..b1d00ad6c0 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.4.1 +PYTHON_FLASK_SQLALCHEMY_VERSION = 2.5.1 PYTHON_FLASK_SQLALCHEMY_SOURCE = Flask-SQLAlchemy-$(PYTHON_FLASK_SQLALCHEMY_VERSION).tar.gz -PYTHON_FLASK_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/52/7a/35bacbedafdc652d5198b80eb22eacccae0c97a49740a45da828b05cc37b +PYTHON_FLASK_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/35/f0/39dd2d8e7e5223f78a5206d7020dc0e16718a964acfb3564d89e9798ab9b PYTHON_FLASK_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_FLASK_SQLALCHEMY_LICENSE = BSD-3-Clause PYTHON_FLASK_SQLALCHEMY_LICENSE_FILES = LICENSE.rst From 72f333fa744c8b3dbecfba58cf657b52e27e3e7b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 14:32:35 -0600 Subject: [PATCH 063/102] package/python-flask-login: bump to version 0.6.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-flask-login/python-flask-login.hash | 9 ++++----- package/python-flask-login/python-flask-login.mk | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/python-flask-login/python-flask-login.hash b/package/python-flask-login/python-flask-login.hash index 9ff1f82a09..d11e37cce8 100644 --- a/package/python-flask-login/python-flask-login.hash +++ b/package/python-flask-login/python-flask-login.hash @@ -1,6 +1,5 @@ -# From https://pypi.org/project/Flask-Login/#copy-hash-modal-8bb2ac58-b80a-4793-84d4-4f32b92976d9 -md5 a2d94aa6ae935345ebc68eb3cbb5fccd Flask-Login-0.5.0.tar.gz -sha256 6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b Flask-Login-0.5.0.tar.gz - -# License files +# md5, sha256 from https://pypi.org/pypi/flask-login/json +md5 0a1576eab473c2a8bb576348333d5ef5 Flask-Login-0.6.1.tar.gz +sha256 1306d474a270a036d6fd14f45640c4d77355e4f1c67ca4331b372d3448997b8c Flask-Login-0.6.1.tar.gz +# Locally computed sha256 checksums sha256 7a9dfb9c5da204ed1370f3b62c13e2992a12da1da707f47e156897eeb4344e5b LICENSE diff --git a/package/python-flask-login/python-flask-login.mk b/package/python-flask-login/python-flask-login.mk index efb63b262b..9a11fde542 100644 --- a/package/python-flask-login/python-flask-login.mk +++ b/package/python-flask-login/python-flask-login.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_LOGIN_VERSION = 0.5.0 +PYTHON_FLASK_LOGIN_VERSION = 0.6.1 PYTHON_FLASK_LOGIN_SOURCE = Flask-Login-$(PYTHON_FLASK_LOGIN_VERSION).tar.gz -PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/f9/01/f6c0a3a654ca125cf9cd273314c03a8bc6a47bf861765c8c1d375e15a28d +PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/3c/0a/e376d599eb6a8999b803a8d390e32451e43a346dbe540350dad48be0069c PYTHON_FLASK_LOGIN_LICENSE = MIT PYTHON_FLASK_LOGIN_LICENSE_FILES = LICENSE PYTHON_FLASK_LOGIN_SETUP_TYPE = setuptools From 16bfb1a3c45656da85aca892125b032befbbdbe4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 16:02:53 -0600 Subject: [PATCH 064/102] package/python-flask-expects-json: bump to version 1.7.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-flask-expects-json/python-flask-expects-json.hash | 4 ++-- .../python-flask-expects-json/python-flask-expects-json.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flask-expects-json/python-flask-expects-json.hash b/package/python-flask-expects-json/python-flask-expects-json.hash index c023222fd7..e465bcb56a 100644 --- a/package/python-flask-expects-json/python-flask-expects-json.hash +++ b/package/python-flask-expects-json/python-flask-expects-json.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-expects-json/json -md5 c1fb8ede58db312d7923212dc97b8ab4 flask-expects-json-1.5.0.tar.gz -sha256 0087dc3d089f1ac75a1fc0f259f4dbd02bbb9c356e92e1a080f2309e2f75d053 flask-expects-json-1.5.0.tar.gz +md5 3a77c4059f21e6e37e652c9dbbdc2e7c flask-expects-json-1.7.0.tar.gz +sha256 4ef186a86f10572a21af82e549546deda024326628b4a96cd14d3a0f71754d62 flask-expects-json-1.7.0.tar.gz # Locally computed sha256 checksums sha256 06154a99fdc664107294a0a5e7e68f776078d075408dd32bbeaa7340fdd39e73 LICENSE.txt diff --git a/package/python-flask-expects-json/python-flask-expects-json.mk b/package/python-flask-expects-json/python-flask-expects-json.mk index 487f15d4e5..55c9bc9571 100644 --- a/package/python-flask-expects-json/python-flask-expects-json.mk +++ b/package/python-flask-expects-json/python-flask-expects-json.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_EXPECTS_JSON_VERSION = 1.5.0 +PYTHON_FLASK_EXPECTS_JSON_VERSION = 1.7.0 PYTHON_FLASK_EXPECTS_JSON_SOURCE = flask-expects-json-$(PYTHON_FLASK_EXPECTS_JSON_VERSION).tar.gz -PYTHON_FLASK_EXPECTS_JSON_SITE = https://files.pythonhosted.org/packages/4c/4a/9d9d050af700fb3feebd1f8466e73d65ce8b4709f27773e07100b0993451 +PYTHON_FLASK_EXPECTS_JSON_SITE = https://files.pythonhosted.org/packages/12/a5/b27cf21d62c2b5a0a32e2f92bde9658e74c34fcc2e004bb0d591f1bf7627 PYTHON_FLASK_EXPECTS_JSON_SETUP_TYPE = setuptools PYTHON_FLASK_EXPECTS_JSON_LICENSE = MIT PYTHON_FLASK_EXPECTS_JSON_LICENSE_FILES = LICENSE.txt From ef070f06c6db92f402600aad5c9ccf718698269a Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 29 May 2022 19:22:35 +0200 Subject: [PATCH 065/102] package/sysklogd: bump version to v2.4.0 NEWS - Support for setting secure mode from the .conf file - Support for running in containers, mainly disables kernel logging - Support for running external scripts on log rotation, incl. SIGUSR2 to initiate log rotation - Fixes for 8-bit data logging, use `-8` to allow - Fixes for malformed wall messages See ChangeLog[1] for details, or the release notes[2] on GitHub. [1]: https://github.com/troglobit/sysklogd/blob/master/ChangeLog.md [2]: https://github.com/troglobit/sysklogd/releases/tag/v2.4.0 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/sysklogd/sysklogd.hash | 2 +- package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 19405a9877..16a8bb4609 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 9a410b484713d9600c820d8113f2d80cb14708328c908b1a28e8b7b31fd54f57 sysklogd-2.3.0.tar.gz +sha256 1d9ed88a772af95c8b46c9e92ddc5bf4a76ac233ec5850f084290b80df7e02c4 sysklogd-2.4.0.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 20ce9d60e3..d6db71e50c 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.3.0 +SYSKLOGD_VERSION = 2.4.0 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE From c6310ae23228b5061c8852f79e547d2a11b62b2b Mon Sep 17 00:00:00 2001 From: Koen Martens Date: Sun, 5 Jun 2022 18:09:02 +0200 Subject: [PATCH 066/102] package/linuxconsoletools: bump version to 1.8.1 Upstream has released a new version. In this version, they have chosen to copy the conditional compilation of tools, however they have chosen to use DISABLE_* flags instead of ENABLE_* flags. Therefore, the logic in our .mk file has been reversed: when an option is *NOT* selected, we set the corresponding DISABLE_* flag. As a corollary, the patch to add conditional compilation in the upstream Makefile is no longer needed and is removed in this commit. Tested compilation by running `./utils/test-pkg -a` with a configuration that enables all options tools. Signed-off-by: Koen Martens Tested-by: Koen Martens Signed-off-by: Thomas Petazzoni --- .../0001-conditional-build.patch | 58 ------------------- .../linuxconsoletools/linuxconsoletools.hash | 2 +- .../linuxconsoletools/linuxconsoletools.mk | 18 +++--- 3 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 package/linuxconsoletools/0001-conditional-build.patch diff --git a/package/linuxconsoletools/0001-conditional-build.patch b/package/linuxconsoletools/0001-conditional-build.patch deleted file mode 100644 index 9f462a6436..0000000000 --- a/package/linuxconsoletools/0001-conditional-build.patch +++ /dev/null @@ -1,58 +0,0 @@ -Selectively build groups of tools (inputattach, -joystick tools and/or force-feedback tools). - -Signed-off-by: Koen Martens - -diff -Naur a/utils/Makefile b/utils/Makefile ---- a/utils/Makefile 2016-04-19 23:28:36.000000000 +0200 -+++ b/utils/Makefile 2017-06-19 08:54:20.152184000 +0200 -@@ -27,8 +27,26 @@ - - CFLAGS ?= -g -O2 -Wall - --PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \ -- ffcfstress jscal-restore jscal-store evdev-joystick -+PROGRAMS = -+ -+ifdef ENABLE_INPUTATTACH -+PROGRAMS += inputattach -+endif -+ -+ifdef ENABLE_JOYSTICK -+PROGRAMS += jstest -+PROGRAMS += jscal -+PROGRAMS += jscal-restore -+PROGRAMS += jscal-store -+PROGRAMS += evdev-joystick -+endif -+ -+ifdef ENABLE_FORCEFEEDBACK -+PROGRAMS += fftest -+PROGRAMS += ffmvforce -+PROGRAMS += ffset -+PROGRAMS += ffcfstress -+endif - - PREFIX ?= /usr/local - -@@ -79,13 +97,20 @@ - 80-stelladaptor-joystick.rules: 80-stelladaptor-joystick.rules.in - sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@ - -+INSTALL_DEP = compile -+ifdef ENABLE_JOYSTICK -+INSTALL_DEP += 80-stelladaptor-joystick.rules -+endif -+ - install: compile 80-stelladaptor-joystick.rules - install -d $(DESTDIR)$(PREFIX)/bin - install $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin -+ifdef ENABLE_JOYSTICK - install -d $(DESTDIR)$(PREFIX)/share/joystick - install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick - install -d $(DESTDIR)/lib/udev/rules.d - install js-set-enum-leds $(DESTDIR)/lib/udev - install -m 644 80-stelladaptor-joystick.rules $(DESTDIR)/lib/udev/rules.d -+endif - - .PHONY: compile clean distclean install diff --git a/package/linuxconsoletools/linuxconsoletools.hash b/package/linuxconsoletools/linuxconsoletools.hash index 889f6d1d6c..8e4099f163 100644 --- a/package/linuxconsoletools/linuxconsoletools.hash +++ b/package/linuxconsoletools/linuxconsoletools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547 linuxconsoletools-1.7.1.tar.bz2 +sha256 4da29745c782b7db18f5f37c49e77bf163121dd3761e2fc7636fa0cbf35c2456 linuxconsoletools-1.8.1.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/linuxconsoletools/linuxconsoletools.mk b/package/linuxconsoletools/linuxconsoletools.mk index 306a5b1fa0..a97618c832 100644 --- a/package/linuxconsoletools/linuxconsoletools.mk +++ b/package/linuxconsoletools/linuxconsoletools.mk @@ -4,24 +4,24 @@ # ################################################################################ -LINUXCONSOLETOOLS_VERSION = 1.7.1 +LINUXCONSOLETOOLS_VERSION = 1.8.1 LINUXCONSOLETOOLS_SOURCE = linuxconsoletools-$(LINUXCONSOLETOOLS_VERSION).tar.bz2 LINUXCONSOLETOOLS_SITE = https://downloads.sourceforge.net/project/linuxconsole LINUXCONSOLETOOLS_LICENSE = GPL-2.0+ LINUXCONSOLETOOLS_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH),y) -LINUXCONSOLETOOLS_MAKE_OPTS += ENABLE_INPUTATTACH=1 +ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH),y) +LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_INPUTATTACH=1 endif -ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK),y) -LINUXCONSOLETOOLS_MAKE_OPTS += ENABLE_JOYSTICK=1 +ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK),y) +LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_JOYSTICK=1 endif -ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y) -LINUXCONSOLETOOLS_MAKE_OPTS += \ - ENABLE_FORCEFEEDBACK=1 \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y) +LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_FORCEFEEDBACK=1 +else +LINUXCONSOLETOOLS_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -std=gnu99" LINUXCONSOLETOOLS_DEPENDENCIES += sdl2 host-pkgconf endif From e04f1b015989ff924384861cb2872f84eade4155 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 31 May 2022 21:46:15 +0200 Subject: [PATCH 067/102] package/rauc: fix build Fix the following build failure raised since bump to version 1.5 in commit 41bbe8df540e2c630ad04f8db7383a7e7705f368 and https://github.com/rauc/rauc/commit/be55282d71d967dcc0cf48303f8245cbc8fff053: In file included from /nvmedata/autobuild/instance-22/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:62, from src/verity_hash.c:26: src/verity_hash.c: In function 'verify_zero': src/verity_hash.c:69:55: error: expected ')' before 'PRIu64' 69 | g_message("Spare area is not zeroed at position %" PRIu64 ".", | ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/1a093c0e194a061836884419d2f50506105db01e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...src-verify_hash.c-include-inttypes.h.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch diff --git a/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch b/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch new file mode 100644 index 0000000000..916c8cca0b --- /dev/null +++ b/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch @@ -0,0 +1,38 @@ +From b19a9c26d88a913417e77aaf60c72cdbf393d1f6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 31 May 2022 21:22:36 +0200 +Subject: [PATCH] src/verify_hash.c: include inttypes.h + +Include inttypes.h to avoid the following build failure: + +In file included from /nvmedata/autobuild/instance-22/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:62, + from src/verity_hash.c:26: +src/verity_hash.c: In function 'verify_zero': +src/verity_hash.c:69:55: error: expected ')' before 'PRIu64' + 69 | g_message("Spare area is not zeroed at position %" PRIu64 ".", + | ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/1a093c0e194a061836884419d2f50506105db01e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rauc/rauc/pull/914] +--- + src/verity_hash.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/verity_hash.c b/src/verity_hash.c +index db82a78..3b2c2a0 100644 +--- a/src/verity_hash.c ++++ b/src/verity_hash.c +@@ -19,6 +19,7 @@ + */ + + #include ++#include + #include + #include + #include +-- +2.35.1 + From 3a6c130754d80005d3212ea7426599fe3a679ad6 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 4 Jun 2022 13:54:58 +0200 Subject: [PATCH 068/102] package/rauc: bump to version 1.7 Drop patch that is already in upstream. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...src-verify_hash.c-include-inttypes.h.patch | 38 ------------------- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch diff --git a/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch b/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch deleted file mode 100644 index 916c8cca0b..0000000000 --- a/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b19a9c26d88a913417e77aaf60c72cdbf393d1f6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 31 May 2022 21:22:36 +0200 -Subject: [PATCH] src/verify_hash.c: include inttypes.h - -Include inttypes.h to avoid the following build failure: - -In file included from /nvmedata/autobuild/instance-22/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:62, - from src/verity_hash.c:26: -src/verity_hash.c: In function 'verify_zero': -src/verity_hash.c:69:55: error: expected ')' before 'PRIu64' - 69 | g_message("Spare area is not zeroed at position %" PRIu64 ".", - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/1a093c0e194a061836884419d2f50506105db01e - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/rauc/rauc/pull/914] ---- - src/verity_hash.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/verity_hash.c b/src/verity_hash.c -index db82a78..3b2c2a0 100644 ---- a/src/verity_hash.c -+++ b/src/verity_hash.c -@@ -19,6 +19,7 @@ - */ - - #include -+#include - #include - #include - #include --- -2.35.1 - diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index f6c1446de4..677d358158 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against # https://github.com/rauc/rauc/releases/download/v1.6/rauc-1.6.tar.xz.asc -sha256 86013788dd02321b7c3f913ad3a1f8802afbc784ec076fa278524a9e1ef9e7b0 rauc-1.6.tar.xz +sha256 8b7d37cc1eb57df4f03de3c943dd7be290b78d47be28881e8b1f070e1d5e55df rauc-1.7.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 0520b30521..90b2317d4b 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.6 +RAUC_VERSION = 1.7 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From 9e59c4ab3883b4dc8b3a9b269524e62415780966 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 4 Jun 2022 13:55:00 +0200 Subject: [PATCH 069/102] package/rauc: add option to enable/disable streaming support RAUC 1.7 introduces streaming update support. Make this configurable and add required dependency to libnl. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/rauc/Config.in | 10 ++++++++++ package/rauc/rauc.mk | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index 1170e50845..7451b29a55 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -40,6 +40,16 @@ config BR2_PACKAGE_RAUC_NETWORK This option enables support for updating firmware over the network using libcurl. +if BR2_PACKAGE_RAUC_NETWORK + +config BR2_PACKAGE_RAUC_STREAMING + bool "streaming update support" + select BR2_PACKAGE_LIBNL + help + This option enables support for streaming update mode. + +endif + config BR2_PACKAGE_RAUC_JSON bool "JSON output support" select BR2_PACKAGE_JSON_GLIB diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 90b2317d4b..8bfb0b79ba 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -52,6 +52,13 @@ else RAUC_CONF_OPTS += --disable-json endif +ifeq ($(BR2_PACKAGE_RAUC_STREAMING),y) +RAUC_CONF_OPTS += --enable-streaming +RAUC_DEPENDENCIES += libnl +else +RAUC_CONF_OPTS += --disable-streaming +endif + HOST_RAUC_DEPENDENCIES = \ host-pkgconf \ host-openssl \ From 13973bc45e89926568e331e0bce951fc63f7515a Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Fri, 3 Jun 2022 09:40:03 -0400 Subject: [PATCH 070/102] package/unbound: bump version to 1.16.0 Signed-off-by: Kyle Harding Signed-off-by: Thomas Petazzoni --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 99caf7dd3d..68087cc28e 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 -sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.16.0.tar.gz.sha256 +sha256 6701534c938eb019626601191edc6d012fc534c09d2418d5b92827db0cbe48a5 unbound-1.16.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 782ed2b049..988508576b 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.15.0 +UNBOUND_VERSION = 1.16.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause From fc86dfc5c8d122349377550016d0e41fed7322f5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 3 Jun 2022 17:11:23 +0200 Subject: [PATCH 071/102] package/kodi-pvr-mythtv: bump version to 19.0.10-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 361aa6ce92..4a261835e0 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8f872c1c395c4688759271d60bcfbe5a652490eed723582fe60662d265ea900f kodi-pvr-mythtv-19.0.9-Matrix.tar.gz +sha256 397de3c9b0351079097f70d5e78930503aef2ec1ffb459ac1144b6a0051f2ba9 kodi-pvr-mythtv-19.0.10-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 4d041dc8f0..c4c393088c 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.9-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.10-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From d8c5d9b53437741c79cd3d759de1fe81af9055fd Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 2 Jun 2022 11:00:11 +0200 Subject: [PATCH 072/102] package/python-pillow: enable host variant This commit enables the host variant of the python-pillow package, as it is needed as a dependency to build some specific versions of OP-TEE. Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 1105326799..2abe5e04ef 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -72,3 +72,4 @@ PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif $(eval $(python-package)) +$(eval $(host-python-package)) From edfa431c9b7b53dbbb3063bd5efd88aac84b1c6e Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 2 Jun 2022 11:00:12 +0200 Subject: [PATCH 073/102] boot/optee-os: add support to build with python-pillow Some specific versions of OP-TEE need the python-pillow module on the host to build support for the TUI (Trusted User Interface) feature. To allow building such OP-TEE versions, this commit adds the option BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_PILLOW which when enabled ensures that host-python-pillow is built before OP-TEE. Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- boot/optee-os/Config.in | 7 +++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index fb8a189a75..0be6e68b0c 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -72,6 +72,13 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY python-cryptography. Select this option if optee-os needs python-cryptography to be built. +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_PILLOW + bool "OP-TEE OS needs host-python-pillow" + help + Some specific OP-TEE OS versions may use python-pillow to + build the Trusted User Interface feature. Select this + option if optee-os need python-pillow to be built. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 5313a1badc..88f14b48e4 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -29,6 +29,10 @@ else OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex endif +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_PILLOW),y) +OPTEE_OS_DEPENDENCIES += host-python-pillow +endif + ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) OPTEE_OS_DEPENDENCIES += host-dtc endif From 811e3d852380b6b5bf67f3349a4e5ef78ae103ea Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 2 Jun 2022 23:01:30 -0600 Subject: [PATCH 074/102] package/meson: bump to version 0.62.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 2037c46bbc..33bd8b6eb9 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.62.1/meson-0.62.1.tar.gz.asc -sha256 a0f5caa1e70da12d5e63aa6a9504273759b891af36c8d87de381a4ed1380e845 meson-0.62.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.62.2/meson-0.62.2.tar.gz.asc +sha256 a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0 meson-0.62.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 6d55f19402..8bc7848705 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.62.1 +MESON_VERSION = 0.62.2 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From 53cf107505f5f831e4ebc1b70af172520af0ebfc Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Tue, 31 May 2022 14:55:57 +0200 Subject: [PATCH 075/102] package/gcnano-binaries: bump version to 969d115185 Update to last version of gcnano-binaries compatible with kernel from StMicroelectronics version 5.10 Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- package/gcnano-binaries/gcnano-binaries.hash | 4 ++-- package/gcnano-binaries/gcnano-binaries.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index e3efc82fc5..d4ad96672a 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 afec2ba2f524821452d561b56afd2fc241293ea4a6e8598d1663f58e5d16800f gcnano-binaries-1534c3eaabb5ae545a8f97e95f853531365a13fc.tar.gz -sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA +sha256 32d91d6ce6e6551cb7ad0eee4698041fdeb10a4f216e6564adb06408476edc38 gcnano-binaries-969d11518529bb70a132909b02ddcc5736c92d91.tar.gz +sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index f6adc36dbd..affe0a6063 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -8,8 +8,8 @@ GCNANO_BINARIES_LIB_VERSION = 6.4 GCNANO_BINARIES_LIB_REVISION = 3 GCNANO_BINARIES_LIB_FULL_VERSION = $(GCNANO_BINARIES_LIB_VERSION).$(GCNANO_BINARIES_LIB_REVISION) GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION)-20200902 -GCNANO_BINARIES_VERSION = 1534c3eaabb5ae545a8f97e95f853531365a13fc +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION)-20210726 +GCNANO_BINARIES_VERSION = 969d11518529bb70a132909b02ddcc5736c92d91 GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms From e82a1c49bce61143c963c72f4674c6ebcefca5ba Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 30 May 2022 00:32:43 +0200 Subject: [PATCH 076/102] package/python-rpi-ws281x: bump to version 4.3.4 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-rpi-ws281x/python-rpi-ws281x.hash | 4 ++-- package/python-rpi-ws281x/python-rpi-ws281x.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-rpi-ws281x/python-rpi-ws281x.hash b/package/python-rpi-ws281x/python-rpi-ws281x.hash index 06b2d18607..ffdd826b6f 100644 --- a/package/python-rpi-ws281x/python-rpi-ws281x.hash +++ b/package/python-rpi-ws281x/python-rpi-ws281x.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/rpi-ws281x/json -md5 333dacfc58058d5f485f9af74551c70e rpi_ws281x-4.3.0.tar.gz -sha256 0b9549687ab7117acbc4bac0e92742fd2c8290fd204514d72fed91c06ba2e805 rpi_ws281x-4.3.0.tar.gz +md5 016e1f03f9168ef03d4baf074aa60f03 rpi_ws281x-4.3.4.tar.gz +sha256 072eff1787e579d1710381b27c467709e3aab28ac579c7a47d7cc87398496f28 rpi_ws281x-4.3.4.tar.gz # Locally computed sha256 checksums sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 LICENSE sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 lib/LICENSE diff --git a/package/python-rpi-ws281x/python-rpi-ws281x.mk b/package/python-rpi-ws281x/python-rpi-ws281x.mk index b711039615..73befeb56e 100644 --- a/package/python-rpi-ws281x/python-rpi-ws281x.mk +++ b/package/python-rpi-ws281x/python-rpi-ws281x.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPI_WS281X_VERSION = 4.3.0 +PYTHON_RPI_WS281X_VERSION = 4.3.4 PYTHON_RPI_WS281X_SOURCE = rpi_ws281x-$(PYTHON_RPI_WS281X_VERSION).tar.gz -PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/cd/b3/eb7ac93376952f165577707ec756f40c9537ed53c59fcbc3290c357370e0 +PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/e2/d4/75fcc4f3412b9b16e39e6cd6156f2e171fe7b2e79057be17d1acf38fded4 PYTHON_RPI_WS281X_SETUP_TYPE = setuptools PYTHON_RPI_WS281X_LICENSE = BSD-2-Clause PYTHON_RPI_WS281X_LICENSE_FILES = LICENSE lib/LICENSE From 9d97ca0a5ebccabc7b5e605ade4ccbcc19668ca1 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 30 May 2022 00:32:46 +0200 Subject: [PATCH 077/102] package/python-aioblescan: bump to version 0.2.13 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-aioblescan/python-aioblescan.hash | 4 ++-- package/python-aioblescan/python-aioblescan.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioblescan/python-aioblescan.hash b/package/python-aioblescan/python-aioblescan.hash index 2592aace33..9a40ca4560 100644 --- a/package/python-aioblescan/python-aioblescan.hash +++ b/package/python-aioblescan/python-aioblescan.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioblescan/json -md5 f59934c040a817192fcd3e713633cf20 aioblescan-0.2.8.tar.gz -sha256 2b048f5fe6e85b18fe306bdb63307705f3d1139563d3187d751b8657065a5bd9 aioblescan-0.2.8.tar.gz +md5 0601cf9335e5d89166a88f53597c79bf aioblescan-0.2.13.tar.gz +sha256 28632e32c8180ea4b792f4cf9b88968dd100f4d3cee0cf16d27c193cf954422a aioblescan-0.2.13.tar.gz # Locally computed sha256 checksums sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/package/python-aioblescan/python-aioblescan.mk b/package/python-aioblescan/python-aioblescan.mk index 8a9db927ac..f0e277d528 100644 --- a/package/python-aioblescan/python-aioblescan.mk +++ b/package/python-aioblescan/python-aioblescan.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOBLESCAN_VERSION = 0.2.8 +PYTHON_AIOBLESCAN_VERSION = 0.2.13 PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz -PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/d2/10/b8b496903f33935c99f3602200d44ccc0b0a57b87e5fa65b89466c1b1f31 +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/bd/04/c6798c76704d57da22f19c2e47485821d4b23144ef75f9c0e18dbfe47565 PYTHON_AIOBLESCAN_SETUP_TYPE = setuptools PYTHON_AIOBLESCAN_LICENSE = MIT PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt From f27ea50528755b5f353e3db124dee535645dcf09 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 30 May 2022 00:32:47 +0200 Subject: [PATCH 078/102] package/graphicsmagick: bump to version 1.3.38 License file hash is changed, due to a copyright year change: - Copyright (C) 2002-2021 GraphicsMagick Group + Copyright (C) 2002-2022 GraphicsMagick Group Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/graphicsmagick/graphicsmagick.hash | 4 ++-- package/graphicsmagick/graphicsmagick.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/graphicsmagick/graphicsmagick.hash b/package/graphicsmagick/graphicsmagick.hash index cf6d224216..80130da5d6 100644 --- a/package/graphicsmagick/graphicsmagick.hash +++ b/package/graphicsmagick/graphicsmagick.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 90dc22f1a7bd240e4c9065a940962bf13da43c99bcc36cb111cc3c1a0d7477d4 GraphicsMagick-1.3.37.tar.xz -sha256 8a4d960c5a3e453ee21e459e1794c7a0c85559825d3363a8d3b510b3344fdad4 Copyright.txt +sha256 d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675 GraphicsMagick-1.3.38.tar.xz +sha256 0a20e661de942ebe115a354d0ec6d1d42b93856ea765f813f350a5ce5024cdb7 Copyright.txt diff --git a/package/graphicsmagick/graphicsmagick.mk b/package/graphicsmagick/graphicsmagick.mk index 38743487eb..dbaa8ddf70 100644 --- a/package/graphicsmagick/graphicsmagick.mk +++ b/package/graphicsmagick/graphicsmagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRAPHICSMAGICK_VERSION = 1.3.37 +GRAPHICSMAGICK_VERSION = 1.3.38 GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION) GRAPHICSMAGICK_LICENSE = MIT From 9866182c39b133e0f7b116a1cb9b1626e572bd47 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 30 May 2022 00:32:44 +0200 Subject: [PATCH 079/102] package/python-pyjwt: bump to version 2.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hash of the license file is changed due to a copyright year change: -Copyright (c) 2015 José Padilla +Copyright (c) 2015-2022 José Padilla Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-pyjwt/python-pyjwt.hash | 6 +++--- package/python-pyjwt/python-pyjwt.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index 5ea6c0cd50..d51df02be1 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 60cf2d463157bf21eb37be0430521036 PyJWT-2.3.0.tar.gz -sha256 b888b4d56f06f6dcd777210c334e69c737be74755d3e5e9ee3fe67dc18a0ee41 PyJWT-2.3.0.tar.gz +md5 665f444d7805e36826bb09ce6434e73a PyJWT-2.4.0.tar.gz +sha256 d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba PyJWT-2.4.0.tar.gz # Locally computed sha256 checksums -sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE +sha256 797a7a20231d4c433e9f1911db1731d06b5828b98f499819a034f7c0f56f5ce5 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index ba8130e7ca..53cc50b650 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 2.3.0 +PYTHON_PYJWT_VERSION = 2.4.0 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/1d/8e/01bdcfdbb352daaba8ea406d9df149c5bba7dbf70f908d4fa4c269fe6a08 +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/d8/6b/6287745054dbcccf75903630346be77d4715c594402cec7c2518032416c2 PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE From 56ba3990c98ac715fd0779307a88c358684f553e Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 30 May 2022 16:19:19 +0300 Subject: [PATCH 080/102] package/libsoup: bump to version 2.74.2 Version 2.74.1 included a flurry of build fixes, while version 2.74.3 is able to detect whether the library is being loaded in a process where libsoup3 is also present. The latter will come in handy for migrating Buildroot to libsoup3. Release notes: https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.1.news https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.2.news Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/libsoup/libsoup.hash | 4 ++-- package/libsoup/libsoup.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 95c1c26eb4..b89ed7864e 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.0.sha256sum -sha256 33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e libsoup-2.74.0.tar.xz +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.2.sha256sum +sha256 f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159 libsoup-2.74.2.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 1a26714992..dcd7ff459e 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSOUP_VERSION_MAJOR = 2.74 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).2 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ From 707d6e124d5853d57f80dd456cf1ecb9d41115c9 Mon Sep 17 00:00:00 2001 From: Andrey Nechypurenko Date: Mon, 30 May 2022 15:22:39 +0200 Subject: [PATCH 081/102] package/cmake: bump version to 3.22.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 3.20 is the first one where the following issue is fixed: https://gitlab.kitware.com/cmake/cmake/-/issues/18299 Was affected by this bug and decide to bump the version to the latest stable The Copyright.txt changed with minor changes (see below) and therefore its hash is updated. @@ -1,5 +1,5 @@ CMake - Cross Platform Makefile Generator -Copyright 2000-2020 Kitware, Inc. and Contributors +Copyright 2000-2021 Kitware, Inc. and Contributors All rights reserved. Redistribution and use in source and binary forms, with or without @@ -65,8 +65,8 @@ * Jan Woetzel * Julien Schueller * Kelly Thompson -* Laurent Montel * Konstantin Podsvirov +* Laurent Montel * Mario Bensi * Martin Gräßlin * Mathieu Malaterre Signed-off-by: Andrey Nechypurenko Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.hash | 6 +++--- package/cmake/cmake.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index da514a6d6b..43b5efb0f0 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt -sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz +# From https://cmake.org/files/v3.22/cmake-3.22.3-SHA-256.txt +sha256 9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 cmake-3.22.3.tar.gz # Locally calculated -sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt +sha256 f1a4326266aada65b307dac05161a9d02d3dba4fb08b50cb26e3c24cc8a86e97 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 4177b119ab..053658fad6 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.18 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 +CMAKE_VERSION_MAJOR = 3.22 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From 09bd6d0c2f0a301274d8b692eec894c8750eb53e Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Tue, 31 May 2022 20:54:44 +0200 Subject: [PATCH 082/102] package/python-falcon: bump to version 3.1.0 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-falcon/python-falcon.hash | 4 ++-- package/python-falcon/python-falcon.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index 979419c25a..d4e99a6998 100644 --- a/package/python-falcon/python-falcon.hash +++ b/package/python-falcon/python-falcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/falcon/json -md5 4a70cfeeacb453f5fd7eb791bdd3ac01 falcon-3.0.1.tar.gz -sha256 c41d84db325881a870e8b7129d5ecfd972fa4323cf77b7119a1d2a21966ee681 falcon-3.0.1.tar.gz +md5 0172450908573a4449a5937810d512b9 falcon-3.1.0.tar.gz +sha256 f2760bd18c16393a6fb5e55f371f67921edb72febe693a82b3c5e82195d087b7 falcon-3.1.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk index 1f400f9a1f..01b5eca4a2 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 3.0.1 +PYTHON_FALCON_VERSION = 3.1.0 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/63/22/6a9009c53ad78e65d88a44db8eccc7f39c6f54fc05fb43b1e9cbbc481d06 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/36/53/4fd90c6c841bc2e4be29ab92c65e5406df9096c421f138bef9d95d43afc9 PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE From 5a366fcdb102c3a33e3a7e7c658559d5bc35785c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 16 May 2022 19:12:20 +0200 Subject: [PATCH 083/102] package/dovecot: bump version to 2.3.19 Release notes: https://dovecot.org/list/dovecot-news/2022-May/000473.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index e70b266d92..1862d97eef 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 dovecot-2.3.18.tar.gz +sha256 0173f693d441b6248b8a62aa5fd690021a1f04a12902653e0bf2e5b012fe437b dovecot-2.3.19.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 053462c6dd..4a4d7a6989 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).18 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).19 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From ade95519e177c80956cad491357c2f60d0de5fff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 16 May 2022 19:12:21 +0200 Subject: [PATCH 084/102] package/dovecot-pigeonhole: bump version to 0.5.19 Release notes: https://dovecot.org/list/dovecot-news/2022-May/000475.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index f3a5890151..635e221481 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 dovecot-2.3-pigeonhole-0.5.18.tar.gz +sha256 10b923efcc6f3c4d92ecdbb780e12a5c33e6d0fdbe3aba5fcd3ecde4179c730c dovecot-2.3-pigeonhole-0.5.19.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 62d9909cf5..c25cd60b21 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.18 +DOVECOT_PIGEONHOLE_VERSION = 0.5.19 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From b461b6562789f5889fceb3139d2c7668d2e7417b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 16 May 2022 19:17:18 +0200 Subject: [PATCH 085/102] package/intel-gmmlib: bump version to 22.1.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 5e48238448..7fb0fd0f4f 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334 intel-gmmlib-22.1.2.tar.gz +sha256 81dbb4ddec98bb18c3a038cd40222046ae7f5b24b2d5acbfb2400f39f02f2aaf intel-gmmlib-22.1.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 25cc733e0c..db83671796 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.1.2 +INTEL_GMMLIB_VERSION = 22.1.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 19736185d498787e3dfee8e95287ff63523b20ea Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 16 May 2022 16:06:57 -0600 Subject: [PATCH 086/102] package/libbpf: bump to version 0.8.0 License hash changed due to year/owner addition: https://github.com/libbpf/libbpf/commit/9c44c8a8e01cf86bc801c3b72324358d5ea99e50 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libbpf/libbpf.hash | 4 ++-- package/libbpf/libbpf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 06adc09885..23908ded7c 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361 libbpf-0.7.0.tar.gz +sha256 f4480242651a93c101ece320030f6b2b9b437f622f807719c13cb32569a6d65a libbpf-0.8.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE -sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +sha256 e1638b9a0c68ca90fad3df1d6b4e430804d2fbdc15e58d02cffddfae38953bbf LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index f50a82b581..987d1145f1 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 0.7.0 +LIBBPF_VERSION = 0.8.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From e3245e3eba03f9ec64597afbebdeb90dd3064b26 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:55:54 +0200 Subject: [PATCH 087/102] package/x11r7/xserver_xorg-server: bump version to 21.1.3 Release notes: https://lists.x.org/archives/xorg-announce/2022-January/003127.html Removed patch which was applied upstream: https://gitlab.freedesktop.org/xorg/xserver/-/commit/9c66d910cae107cbcda02a8502ac5324a6eca052 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...error-when-built-without-logind-plat.patch | 90 ------------------- .../xserver_xorg-server.hash | 6 +- .../xserver_xorg-server.mk | 2 +- 3 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch diff --git a/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch b/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch deleted file mode 100644 index 164c0039bd..0000000000 --- a/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 17b6ab4d8cecf55a3784dbefbef9bfcf84ee3b1b Mon Sep 17 00:00:00 2001 -From: Jocelyn Falempe -Date: Thu, 16 Dec 2021 15:46:43 +0100 -Subject: [PATCH] Fix compilation error when built without logind/platform bus - -This was introduced by commit 8eb1396d - -Signed-off-by: Jocelyn Falempe -[Peter: from https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/827] -Signed-off-by: Peter Korsgaard ---- - hw/xfree86/common/xf86Events.c | 9 +-------- - hw/xfree86/os-support/linux/systemd-logind.c | 16 +++++++++++----- - include/systemd-logind.h | 4 ++-- - 3 files changed, 14 insertions(+), 15 deletions(-) - -diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c -index 6076efa80..395bbc7b3 100644 ---- a/hw/xfree86/common/xf86Events.c -+++ b/hw/xfree86/common/xf86Events.c -@@ -383,14 +383,7 @@ xf86VTLeave(void) - xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]); - - if (systemd_logind_controls_session()) { -- for (i = 0; i < xf86_num_platform_devices; i++) { -- if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) { -- int major, minor; -- major = xf86_platform_odev_attributes(i)->major; -- minor = xf86_platform_odev_attributes(i)->minor; -- systemd_logind_drop_master(major, minor); -- } -- } -+ systemd_logind_drop_master(); - } - - if (!xf86VTSwitchAway()) -diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c -index 35d5cc75b..f6a223a55 100644 ---- a/hw/xfree86/os-support/linux/systemd-logind.c -+++ b/hw/xfree86/os-support/linux/systemd-logind.c -@@ -308,13 +308,19 @@ cleanup: - * and ensure the drm_drop_master is done before - * VT_RELDISP when switching VT - */ --void systemd_logind_drop_master(int _major, int _minor) -+void systemd_logind_drop_master(void) - { -- struct systemd_logind_info *info = &logind_info; -- dbus_int32_t major = _major; -- dbus_int32_t minor = _minor; -+ int i; -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) { -+ dbus_int32_t major, minor; -+ struct systemd_logind_info *info = &logind_info; - -- systemd_logind_ack_pause(info, minor, major); -+ major = xf86_platform_odev_attributes(i)->major; -+ minor = xf86_platform_odev_attributes(i)->minor; -+ systemd_logind_ack_pause(info, minor, major); -+ } -+ } - } - - static DBusHandlerResult -diff --git a/include/systemd-logind.h b/include/systemd-logind.h -index a8af2b96d..5c04d0130 100644 ---- a/include/systemd-logind.h -+++ b/include/systemd-logind.h -@@ -33,7 +33,7 @@ int systemd_logind_take_fd(int major, int minor, const char *path, Bool *paus); - void systemd_logind_release_fd(int major, int minor, int fd); - int systemd_logind_controls_session(void); - void systemd_logind_vtenter(void); --void systemd_logind_drop_master(int major, int minor); -+void systemd_logind_drop_master(void); - #else - #define systemd_logind_init() - #define systemd_logind_fini() -@@ -41,7 +41,7 @@ void systemd_logind_drop_master(int major, int minor); - #define systemd_logind_release_fd(major, minor, fd) close(fd) - #define systemd_logind_controls_session() 0 - #define systemd_logind_vtenter() --#define systemd_logind_drop_master(major, minor) -+#define systemd_logind_drop_master() - #endif - - #endif --- -2.20.1 - diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 6008661db1..b5635b9afa 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-December/003125.html -sha256 c20bf46a9fe8e74bf4e75430637e58d49a02d806609dc161462bceb1ef7e8db0 xorg-server-21.1.2.tar.xz -sha512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def xorg-server-21.1.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-January/003127.html +sha256 61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5 xorg-server-21.1.3.tar.xz +sha512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b xorg-server-21.1.3.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 0cadba92a3..0f1779dcab 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.2 +XSERVER_XORG_SERVER_VERSION = 21.1.3 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From bd0a0da7dfd6dee5e0125e04a361fd8051a2a3cd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:55:56 +0200 Subject: [PATCH 088/102] package/x11r7/xdriver_xf86-video-amdgpu: bump version to 22.0.0 Release notes: https://lists.x.org/archives/xorg/2022-February/060928.html Reformatted license hash. Switched tarball to upstream-provided .xz format. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-video-amdgpu.hash | 10 ++++------ .../xdriver_xf86-video-amdgpu.mk | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index 4bbfb0de71..c45ae59ee4 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-October/003026.html -md5 55ad19b858e186a2cf4e91ed832c05e7 xf86-video-amdgpu-19.1.0.tar.bz2 -sha1 044a97ea2f36dd3d2d4844bb503dd4e2b2854d56 xf86-video-amdgpu-19.1.0.tar.bz2 -sha256 4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d xf86-video-amdgpu-19.1.0.tar.bz2 -sha512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173 xf86-video-amdgpu-19.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg/2022-February/060928.html +sha256 9d23fb602915dc3ccde92aa4d1e9485e7e54eaae2f41f485e55eb20761778266 xf86-video-amdgpu-22.0.0.tar.xz +sha512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a xf86-video-amdgpu-22.0.0.tar.xz # Locally computed -sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING +sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index e7196956a3..23452fe417 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 19.1.0 -XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 22.0.0 +XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.xz XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING From 81f2dd7b489b73985c13db91ae958833ae84cb4f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:55:57 +0200 Subject: [PATCH 089/102] package/x11r7/xdriver_xf86-video-amdgpu: needs libgbm The package depends on gbm: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/blob/master/configure.ac#L75 This dependency was always there. However, previously it was implicit from the mesa3d dependencies. Since we made libgbm a virtual package, it is possible that libgbm is selected in another way. Note that the original dependencies would always for libgbm in mesa3d, so this was not causing any build failures. Also explicitly add libgbm to _DEPENDENCIES. Previously, this was implied by the mesa3d dependency in xserver, but this is no longer true for other gbm providers. For details see http://lists.busybox.net/pipermail/buildroot/2022-April/641451.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-amdgpu/Config.in | 8 +++----- .../xdriver_xf86-video-amdgpu.mk | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in index c42255f55c..fb23fc1fdf 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in +++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU bool "xf86-video-amdgpu" depends on BR2_USE_MMU # libdrm - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_AMDGPU select BR2_PACKAGE_LIBEPOXY @@ -11,7 +10,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU help AMD GPU video driver -comment "xf86-video-amdgpu needs egl/opengl support from mesa3d" +comment "xf86-video-amdgpu needs GBM" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on !BR2_PACKAGE_HAS_LIBGBM diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index 23452fe417..adba21dd62 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -11,6 +11,7 @@ XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ libdrm \ + libgbm \ xlib_libXcomposite \ xorgproto \ xserver_xorg-server From 82fb054745f8b3fa126be6b5b5506fca0ea999ea Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:55:59 +0200 Subject: [PATCH 090/102] package/x11r7/xdriver_xf86-video-ati: switch dependency from mesa3d to libgbm The package depends on gbm and not mesa3d: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/blob/master/configure.ac#L155 Remove the dependency to BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON in order to prevent a circular dependency here. This option will be removed in a follow-patch anyway because Mesa3D will drop DRI drivers in version 22.x. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-ati/Config.in | 7 +++---- .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in index 1246014dca..81255d5a4c 100644 --- a/package/x11r7/xdriver_xf86-video-ati/Config.in +++ b/package/x11r7/xdriver_xf86-video-ati/Config.in @@ -1,15 +1,14 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI bool "xf86-video-ati" depends on BR2_i386 || BR2_x86_64 # DRI radeon r100 driver - depends on BR2_PACKAGE_MESA3D + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_RADEON - select BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON select BR2_PACKAGE_XLIB_LIBXCOMPOSITE select BR2_PACKAGE_XORGPROTO help ATI video driver -comment "xf86-video-ati needs mesa3d" +comment "xf86-video-ati needs GBM" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_MESA3D + depends on !BR2_PACKAGE_HAS_LIBGBM diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index edb8b11add..e7f5852811 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -11,6 +11,7 @@ XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ libdrm \ + libgbm \ xlib_libXcomposite \ xorgproto \ xserver_xorg-server From 05b6f15ae82d926b016c32e0f60bfd0b4463f27e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:00 +0200 Subject: [PATCH 091/102] package/x11r7/xdriver_xf86-video-imx-viv: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Also fix a typo in the Config.in help text while being at it. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-imx-viv/Config.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in index 13cee14deb..984f63d6d3 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in +++ b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in @@ -1,10 +1,9 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV bool "xf86-video-imx-viv" + depends on BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 depends on BR2_PACKAGE_IMX_GPU_G2D depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - select BR2_PACKAGE_MESA3D # Needed in order to compile xorg with glx/dri - select BR2_PACKAGE_MESA3D_DRI_DRIVER select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help @@ -26,7 +25,12 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV Don't forget to load galcore.ko and create /dev/galcore before using this driver (else, Xorg will exit with an - obscur message like "Segmentation fault at address 0xc"). + obscure message like "Segmentation fault at address 0xc"). + +comment "xf86-video-imx-viv needs an OpenGL backend" + depends on BR2_arm + depends on !BR2_PACKAGE_HAS_LIBGL + depends on BR2_TOOLCHAIN_HAS_SYNC_1 comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output" depends on BR2_arm From 2967e28aa24ccfdf602638c9553314aea36dfdc0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:01 +0200 Subject: [PATCH 092/102] package/x11r7/xdriver_xf86-video-intel: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index d911234c92..879abdd74d 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -31,12 +31,17 @@ XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -# X.org server support for DRI depends on a Mesa3D DRI driver -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) +# DRI support is provided by xserver_xorg-server if libgl is enabled +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += \ --enable-dri2 \ --enable-dri3 \ --enable-uxa +else +XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += \ + --disable-dri2 \ + --disable-dri3 \ + --disable-uxa endif $(eval $(autotools-package)) From 23701ada51a3fd62786942ac865329235c1f2686 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:02 +0200 Subject: [PATCH 093/102] package/x11r7/xdriver_xf86-video-mach64: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk index eee8fec2e8..7b4fa80834 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_MACH64_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --disable-dri endif From 1bf8497621bf43570e9fb6e2295a9fdbea9f59db Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:03 +0200 Subject: [PATCH 094/102] package/x11r7/xdriver_xf86-video-mga: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA=y Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-mga/Config.in | 4 ---- .../x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in index 15fb3b9f87..bac5e62442 100644 --- a/package/x11r7/xdriver_xf86-video-mga/Config.in +++ b/package/x11r7/xdriver_xf86-video-mga/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA bool "xf86-video-mga" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help Matrox video driver - -comment "xf86-video-mga needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 3c668a5c98..24f2da2cce 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri endif From 34d157af56c74cd69bd6a6472d1e2f571161a8d7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:04 +0200 Subject: [PATCH 095/102] package/x11r7/xdriver_xf86-video-nouveau: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-nouveau/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-nouveau/Config.in b/package/x11r7/xdriver_xf86-video-nouveau/Config.in index c9fd2e3d2f..5b266b1b4a 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/Config.in +++ b/package/x11r7/xdriver_xf86-video-nouveau/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU bool "xf86-video-nouveau" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU + depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_NOUVEAU select BR2_PACKAGE_XORGPROTO @@ -10,5 +9,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU http://nouveau.freedesktop.org -comment "xf86-video-nouveau needs mesa3d" - depends on !BR2_PACKAGE_MESA3D +comment "xf86-video-nouveau needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL From 62d9c9687818ebc68437cf984aedba02014fcda7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:05 +0200 Subject: [PATCH 096/102] package/x11r7/xdriver_xf86-video-openchrome: switch source to git repo No functional changes here, the commit used equals version 0.6.0: https://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=5e158c76eb3a0fb0db207229697139f8da2faaae A follow-up bump will fix build errors with gcc-10. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-video-openchrome.hash | 7 ++----- .../xdriver_xf86-video-openchrome.mk | 7 ++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash index 57cc9aca9c..8c1c5ac91b 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash @@ -1,6 +1,3 @@ -# From https://lists.x.org/archives/xorg-announce/2017-March/002781.html -md5 c87f164739729b00f7e1a9934420c22d xf86-video-openchrome-0.6.0.tar.bz2 -sha1 2077181ded4d86e9cbe6d3e9b1245339692e848d xf86-video-openchrome-0.6.0.tar.bz2 -sha256 da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75 xf86-video-openchrome-0.6.0.tar.bz2 # Locally computed -sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING +sha256 05beeaff42ffbe41f37dbed0d6fe94d1829a9dd847cdab4068d107cfc485a62b xdriver_xf86-video-openchrome-5e158c76eb3a0fb0db207229697139f8da2faaae-br1.tar.gz +sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk index db9e11f6da..0e04f59466 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk @@ -4,11 +4,12 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.6.0 -XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://xorg.freedesktop.org/archive/individual/driver +XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 5e158c76eb3a0fb0db207229697139f8da2faaae +XDRIVER_XF86_VIDEO_OPENCHROME_SITE = https://anongit.freedesktop.org/git/openchrome/xf86-video-openchrome.git +XDRIVER_XF86_VIDEO_OPENCHROME_SITE_METHOD = git XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE_FILES = COPYING +XDRIVER_XF86_VIDEO_OPENCHROME_AUTORECONF = YES XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \ xserver_xorg-server \ From 209a0d691909fd50aee9629b5b55ba83dc3edc0e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:06 +0200 Subject: [PATCH 097/102] package/x11r7/xdriver_xf86-video-openchrome: bump version to 0.6.225 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-video-openchrome.hash | 2 +- .../xdriver_xf86-video-openchrome.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash index 8c1c5ac91b..d8cc080a32 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 05beeaff42ffbe41f37dbed0d6fe94d1829a9dd847cdab4068d107cfc485a62b xdriver_xf86-video-openchrome-5e158c76eb3a0fb0db207229697139f8da2faaae-br1.tar.gz +sha256 037bebbe31bcca2b4f3adeefccd2a64a30e2924946a6c6646c5829f7362212ec xdriver_xf86-video-openchrome-ab03de703b91c7e0fd3e4d1ca06ad5add7f077a1-br1.tar.gz sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk index 0e04f59466..e8001004bc 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 5e158c76eb3a0fb0db207229697139f8da2faaae +XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = ab03de703b91c7e0fd3e4d1ca06ad5add7f077a1 XDRIVER_XF86_VIDEO_OPENCHROME_SITE = https://anongit.freedesktop.org/git/openchrome/xf86-video-openchrome.git XDRIVER_XF86_VIDEO_OPENCHROME_SITE_METHOD = git XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT From d4dd30d15e696e79d228149f7ec15e753da1e0ae Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:07 +0200 Subject: [PATCH 098/102] package/x11r7/xdriver_xf86-video-openchrome: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-openchrome/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in index a93d14376b..f95e959f69 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in +++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME bool "xf86-video-openchrome" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCOMPOSITE @@ -12,5 +12,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME https://www.freedesktop.org/wiki/Openchrome/ -comment "xf86-video-openchrome needs a DRI driver from mesa3d" - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER +comment "xf86-video-openchrome needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL From ab77b8742d4236451fba34943b168d94470c0e32 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:08 +0200 Subject: [PATCH 099/102] package/x11r7/xdriver_xf86-video-r128: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 690041d4c6..1931dbecd7 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -11,7 +11,9 @@ XDRIVER_XF86_VIDEO_R128_LICENSE = MIT XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --disable-dri endif From 76749acd842b670d71fce0b48ed12ce306c56847 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:09 +0200 Subject: [PATCH 100/102] package/x11r7/xdriver_xf86-video-sis: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS=y Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-sis/Config.in | 4 ---- .../x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in index db01cf2afe..8e00589a76 100644 --- a/package/x11r7/xdriver_xf86-video-sis/Config.in +++ b/package/x11r7/xdriver_xf86-video-sis/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS bool "xf86-video-sis" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help SiS and XGI video driver - -comment "xf86-video-sis needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index f96b0a9d0e..0417f8ae71 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -11,7 +11,9 @@ XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += --disable-dri endif From 59e91d4fdcdd53c13173bb28ca57827a0b3b4e65 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:10 +0200 Subject: [PATCH 101/102] package/x11r7/xdriver_xf86-video-savage: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE=y Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-savage/Config.in | 4 ---- .../xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in index bc6ca52370..ab6fd89845 100644 --- a/package/x11r7/xdriver_xf86-video-savage/Config.in +++ b/package/x11r7/xdriver_xf86-video-savage/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE bool "xf86-video-savage" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help S3 Savage video driver - -comment "xf86-video-savage needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index 102aa2c48e..9e5bf61997 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_SAVAGE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --disable-dri endif From 110033aadecf327ce8706f08d15e2fec8d6defd8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:11 +0200 Subject: [PATCH 102/102] package/x11r7/xdriver_xf86-video-tdfx: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX=y Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-tdfx/Config.in | 4 ---- .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in index 959dc31049..14b8f0ad9e 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in +++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX bool "xf86-video-tdfx" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help 3Dfx video driver - -comment "xf86-video-tdfx needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 14c40e4d89..e687876843 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -15,7 +15,9 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri endif