diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
29 files changed, 456 insertions, 144 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch b/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch new file mode 100644 index 0000000000..06a8498f3c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch @@ -0,0 +1,89 @@ +From ce0528cb48666843fed2ad10ece5ecb0ac0b8cf8 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Fri, 15 May 2020 12:38:49 +0900 +Subject: [PATCH] change dstat to python3. + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + dstat | 2 +- + examples/curstest | 2 +- + examples/devtest.py | 2 +- + examples/mmpipe.py | 2 +- + examples/mstat.py | 2 +- + examples/read.py | 2 +- + examples/tdbtest | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/dstat b/dstat +index 9359965..f250f06 100755 +--- a/dstat ++++ b/dstat +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + ### This program is free software; you can redistribute it and/or + ### modify it under the terms of the GNU General Public License +diff --git a/examples/curstest b/examples/curstest +index afc4e70..d720cca 100755 +--- a/examples/curstest ++++ b/examples/curstest +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + import curses, sys + + #c = curses.wrapper(s) +diff --git a/examples/devtest.py b/examples/devtest.py +index 0e9e969..e53babd 100755 +--- a/examples/devtest.py ++++ b/examples/devtest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + import sys + sys.path.insert(0, '/usr/share/dstat/') +diff --git a/examples/mmpipe.py b/examples/mmpipe.py +index 5c93567..f91515f 100755 +--- a/examples/mmpipe.py ++++ b/examples/mmpipe.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + import select, sys, os + + def readpipe(file, tmout = 0.001): +diff --git a/examples/mstat.py b/examples/mstat.py +index abf4d07..ac157e4 100755 +--- a/examples/mstat.py ++++ b/examples/mstat.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + ### Example2: simple sub-second monitor (ministat) + +diff --git a/examples/read.py b/examples/read.py +index 556b7ae..a925109 100755 +--- a/examples/read.py ++++ b/examples/read.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + ### Example 1: Direct accessing stats + ### This is a quick example showing how you can access dstat data +diff --git a/examples/tdbtest b/examples/tdbtest +index 528a8ea..ae7fef9 100755 +--- a/examples/tdbtest ++++ b/examples/tdbtest +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + import sys, tdb + + db = tdb.tdb('/var/cache/samba/connections.tdb') +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb index 2e37dd72eb..74af54ca53 100644 --- a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "asciidoc-native xmlto-native" -SRC_URI = "git://github.com/dagwieers/dstat.git" +SRC_URI = "git://github.com/dagwieers/dstat.git \ + file://0001-change-dstat-to-python3.patch \ + " SRCREV = "6f5db0aed26bf8cf2700d4ffe90a9bd3436ac728" diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch new file mode 100644 index 0000000000..96146a1957 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch @@ -0,0 +1,40 @@ +From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 30 Jul 2020 23:03:51 +0200 +Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports + it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There have been some PRs they were either rejected or some general suggestion +for more flags suggested. So + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + cmake/compilerFlags.cmake | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake +index 12caf42..455525e 100644 +--- a/cmake/compilerFlags.cmake ++++ b/cmake/compilerFlags.cmake +@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN + # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 + if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) + if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) +- add_compile_options(-fstack-clash-protection -fcf-protection) ++ # Gcc does support -fcf-protection on few arches only ++ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) ++ if (COMPILER_SUPPORTS_FCF_PROTECTION) ++ add_compile_options(-fcf-protection) ++ endif() ++ add_compile_options(-fstack-clash-protection) + endif() + + if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 +-- +2.21.3 + diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb index 97116ee2d1..ed1e8de5c2 100644 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb @@ -5,8 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" DEPENDS = "zlib expat" SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[md5sum] = "56d064517ae5903dd963b84514a121c1" -SRC_URI[sha256sum] = "f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081" +SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" + +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +inherit dos2unix +SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch" S = "${WORKDIR}/${BPN}-${PV}-Source" diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb index 9a8332836b..56bf515544 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb @@ -25,3 +25,10 @@ PACKAGECONFIG_remove_riscv32 = "unwind" PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure_append() { + # remove WORKDIR info to improve reproducibility + if [ -f "${B}/config.h" ] ; then + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + fi +} diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb index 0b4eac8897..8543c6f484 100644 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb +++ b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ " -SRC_URI[md5sum] = "f0fc5394286753eff657cf62b46d024b" -SRC_URI[sha256sum] = "11b4f99d28392e3e1aeb29bfd006a4f1f40e7fdd7a3f3444ee69014d415f09f2" +SRC_URI[md5sum] = "3207ece9fc8ceb787091de93838f5952" +SRC_URI[sha256sum] = "afe2ba08d2fa56adc3c774b6741587203a72140a255346e9947b8d2ee6c7d4b6" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb index 14718184bd..0cc8b31b3f 100755 --- a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb @@ -9,8 +9,6 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" RDEPENDS_${PN} += " \ - gcov \ - gcov-symlinks \ libjson-perl \ libperlio-gzip-perl \ perl \ @@ -46,6 +44,11 @@ RDEPENDS_${PN} += " \ perl-module-tie-hash \ " +RDEPENDS_${PN}_append_class-target = " \ + gcov \ + gcov-symlinks \ +" + SRC_URI = " \ http://downloads.sourceforge.net/ltp/${BP}.tar.gz \ file://0001-geninfo-Add-intermediate-text-format-support.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb index f638848d15..6ce318d0b5 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb @@ -4,11 +4,11 @@ HOMEPAGE = "http://eigen.tuxfamily.org/" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" -SRC_URI = "https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2;downloadfilename=${BP}.tar.bz2" -SRC_URI[md5sum] = "05b1f7511c93980c385ebe11bd3c93fa" -SRC_URI[sha256sum] = "9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce" +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" -S = "${WORKDIR}/eigen-eigen-323c052e1731" +SRCREV = "21ae2afd4edaa1b69782c67a54182d34efe43f9c" + +S = "${WORKDIR}/git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.1.bb index e9d34ee66a..004c93d0f9 100644 --- a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.1.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "git://github.com/librsync/librsync.git" -SRCREV = "028d9432d05ba4b75239e0ba35bcb36fbfc17e35" +SRCREV = "27f738650c20fef1285f11d85a34e5094a71c06f" S = "${WORKDIR}/git" DEPENDS = "popt" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb index e2b551bbc6..bc86810ecb 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb @@ -32,7 +32,7 @@ PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - blk-availability.service lvm2-pvscan@.service" + blk-availability.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" @@ -52,7 +52,11 @@ FILES_libdevmapper = " \ ${sbindir}/dmstats \ " -FILES_${PN} += "${libdir}/device-mapper/*.so" +FILES_${PN} += " \ + ${libdir}/device-mapper/*.so \ + ${systemd_system_unitdir}/lvm2-pvscan@.service \ +" + FILES_${PN}-scripts = " \ ${sbindir}/blkdeactivate \ ${sbindir}/fsadm \ diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch new file mode 100644 index 0000000000..2827bb8745 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch @@ -0,0 +1,40 @@ +From 04884263d1de8c427a7a15bd1cf6466ea65d3a0b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 25 May 2020 23:22:55 -0700 +Subject: [PATCH] add explicit dependency on libraries + +[snip] +gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist +collect2: error: ld returned 1 exit status +Makefile:36: recipe for target 'multipathd' failed +make[1]: *** [multipathd] Error 1 +make[1]: Leaving directory 'git/multipathd' +Makefile:29: recipe for target 'multipathd' failed +make: *** [multipathd] Error 2 +ln -sf libmpathpersist.so.0 libmpathpersist.so +[snip] + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index bea0a0b2..37a77129 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,8 @@ $(BUILDDIRS): + $(MAKE) -C $@ + + multipath multipathd mpathpersist libmpathpersist : libmultipath +-mpathpersist: libmpathpersist ++mpathpersist multipathd: libmpathpersist ++libdmmp libmultipath mpathpersist multipath multipathd: libmpathcmd + + DEPS_ON_MULTIPATH := \ + multipath \ +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 2795a8d091..8b0c89338f 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -44,6 +44,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0030-Always-use-devmapper.patch \ file://0031-Always-use-devmapper-for-kpartx.patch \ file://0001-fix-bug-of-do_compile-and-do_install.patch \ + file://0001-add-explicit-dependency-on-libraries.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" @@ -115,3 +116,4 @@ FILES_kpartx = "${base_sbindir}/kpartx \ " RDEPENDS_${PN} += "kpartx" +PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.2.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb index 2b236ba1eb..645b07b4ce 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb @@ -12,8 +12,8 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[md5sum] = "10df0100ebf4aa7bb4806428c11751eb" -SRC_URI[sha256sum] = "d8a25eea942ecee2d57b8e037eb4b28f030f818b78773b8fcb994ed5835d2ef6" +SRC_URI[md5sum] = "52137a960ae8b3ca6d7dab6767fe6e5f" +SRC_URI[sha256sum] = "6e3438f033a0ed07d3d74c30d0803cbda3d2366ba1601b7bbf9b16ac371f51b4" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Bug-1631576-Force-a-fixed-length-for-DSA-exponentiat.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Bug-1631576-Force-a-fixed-length-for-DSA-exponentiat.patch new file mode 100644 index 0000000000..517c277ae0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Bug-1631576-Force-a-fixed-length-for-DSA-exponentiat.patch @@ -0,0 +1,110 @@ +From 5942c26888ba12ad5e0d92fb62f23d7cde6dc159 Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait <ovidiu.panait@windriver.com> +Date: Mon, 13 Jul 2020 06:25:56 +0000 +Subject: [PATCH] Bug 1631576 - Force a fixed length for DSA exponentiation + r=pereida,bbrumley + +Differential Revision: https://phabricator.services.mozilla.com/D72011 + +Upstream-Status: Backport [https://hg.mozilla.org/projects/nss/rev/daa823a4a29bcef0fec33a379ec83857429aea2e] + +Authored-by: Robert Relyea <rrelyea@redhat.com> +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> +--- + nss/lib/freebl/dsa.c | 45 ++++++++++++++++++++++++++++++++++---------- + 1 file changed, 35 insertions(+), 10 deletions(-) + +diff --git a/nss/lib/freebl/dsa.c b/nss/lib/freebl/dsa.c +index aef3539..389c9de 100644 +--- a/nss/lib/freebl/dsa.c ++++ b/nss/lib/freebl/dsa.c +@@ -313,13 +313,14 @@ DSA_NewKeyFromSeed(const PQGParams *params, + + static SECStatus + dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest, +- const unsigned char *kb) ++ const unsigned char *kbytes) + { + mp_int p, q, g; /* PQG parameters */ + mp_int x, k; /* private key & pseudo-random integer */ + mp_int r, s; /* tuple (r, s) is signature) */ + mp_int t; /* holding tmp values */ + mp_int ar; /* holding blinding values */ ++ mp_digit fuzz; /* blinding multiplier for q */ + mp_err err = MP_OKAY; + SECStatus rv = SECSuccess; + unsigned int dsa_subprime_len, dsa_signature_len, offset; +@@ -373,6 +374,7 @@ dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest, + CHECK_MPI_OK(mp_init(&s)); + CHECK_MPI_OK(mp_init(&t)); + CHECK_MPI_OK(mp_init(&ar)); ++ + /* + ** Convert stored PQG and private key into MPI integers. + */ +@@ -380,14 +382,28 @@ dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest, + SECITEM_TO_MPINT(key->params.subPrime, &q); + SECITEM_TO_MPINT(key->params.base, &g); + SECITEM_TO_MPINT(key->privateValue, &x); +- OCTETS_TO_MPINT(kb, &k, dsa_subprime_len); ++ OCTETS_TO_MPINT(kbytes, &k, dsa_subprime_len); ++ ++ /* k blinding create a single value that has the high bit set in ++ * the mp_digit*/ ++ if (RNG_GenerateGlobalRandomBytes(&fuzz, sizeof(mp_digit)) != SECSuccess) { ++ PORT_SetError(SEC_ERROR_NEED_RANDOM); ++ rv = SECFailure; ++ goto cleanup; ++ } ++ fuzz |= 1ULL << ((sizeof(mp_digit) * PR_BITS_PER_BYTE - 1)); + /* + ** FIPS 186-1, Section 5, Step 1 + ** + ** r = (g**k mod p) mod q + */ +- CHECK_MPI_OK(mp_exptmod(&g, &k, &p, &r)); /* r = g**k mod p */ +- CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ ++ CHECK_MPI_OK(mp_mul_d(&q, fuzz, &t)); /* t = q*fuzz */ ++ CHECK_MPI_OK(mp_add(&k, &t, &t)); /* t = k+q*fuzz */ ++ /* length of t is now fixed, bits in k have been blinded */ ++ CHECK_MPI_OK(mp_exptmod(&g, &t, &p, &r)); /* r = g**t mod p */ ++ /* r is now g**(k+q*fuzz) == g**k mod p */ ++ CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ ++ + /* + ** FIPS 186-1, Section 5, Step 2 + ** +@@ -411,15 +427,24 @@ dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest, + /* Using mp_invmod on k directly would leak bits from k. */ + CHECK_MPI_OK(mp_mul(&k, &ar, &k)); /* k = k * ar */ + CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ +- CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ ++ /* k is now k*t*ar */ ++ CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ ++ /* k is now (k*t*ar)**-1 */ + CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ +- SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ ++ /* k is now (k*ar)**-1 */ ++ SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ + /* To avoid leaking secret bits here the addition is blinded. */ +- CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ +- CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ ++ CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ ++ /* x is now x*ar */ ++ CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ ++ /* x is now x*r*ar */ + CHECK_MPI_OK(mp_mulmod(&s, &ar, &q, &t)); /* t = s * ar mod q */ +- CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ +- CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ ++ /* t is now hash(M)*ar */ ++ CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ ++ /* s is now (HASH(M)+x*r)*ar */ ++ CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ ++ /* s is now (HASH(M)+x*r)*ar*(k*ar)**-1 = (k**-1)*(HASH(M)+x*r) */ ++ + /* + ** verify r != 0 and s != 0 + ** mentioned as optional in FIPS 186-1. +-- +2.18.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb index fba80ce2ab..c00bd34cb2 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb @@ -34,6 +34,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ file://riscv.patch \ file://0001-Enable-uint128-on-mips64.patch \ + file://0001-Bug-1631576-Force-a-fixed-length-for-DSA-exponentiat.patch \ " SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233" @@ -47,6 +48,10 @@ inherit siteinfo TD = "${S}/tentative-dist" TDS = "${S}/tentative-dist-staging" +# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a +# which caused -march conflicts in gcc +TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" + TARGET_CC_ARCH += "${LDFLAGS}" do_configure_prepend_libc-musl () { diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.49.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb index 670c704e6f..3a130f970c 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.49.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb @@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ file://remove-user-host-pwd-from-version.patch \ " -SRC_URI[md5sum] = "2a47a6bb4319357ea7b032c45283e79e" -SRC_URI[sha256sum] = "e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e" +SRC_URI[md5sum] = "f9ed44ef373abed04c9e4c8586260f9e" +SRC_URI[sha256sum] = "5cb57d958bf5c55a678c6a0f06821e0e5504d5a92e6a33240841fbca1db586b8" DEPENDS = "util-linux groff-native" @@ -172,9 +172,9 @@ FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" -FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp ${localstatedir}/run ${localstatedir}/volatile/run" +FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" FILES_${PN}-bin = "${bindir}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" do_install_append() { diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 5b663489f8..1c2f270e32 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -9,12 +9,11 @@ DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium li DEPENDS_append_libc-musl = " libexecinfo" LDFLAGS_append_libc-musl = " -lexecinfo" -SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ +SRCREV = "cc391370d8b4c07597617e0a771a9732f0802411" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https \ " -SRC_URI[md5sum] = "6da599c3a5cab2df37a70f8fba2f5438" -SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea556af1a" -S = "${WORKDIR}/Remmina-v${PV}" +S = "${WORKDIR}/git" inherit cmake features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index efe95b1019..33f5dccca2 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -13,15 +13,17 @@ RDEPENDS_${PN} = "rsync \ perl-module-getopt-std \ perl-module-file-path \ perl-module-file-stat \ + perl-module-file-spec \ perl-module-posix \ perl-module-fcntl \ perl-module-io-file \ perl-module-constant \ perl-module-overloading \ + perl-module-ipc-open3 \ " -SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4" -PV = "1.4.2+git${SRCPV}" +SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" +PV = "1.4.3+git${SRCPV}" SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ file://configure-fix-cmd_rsync.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch b/meta-openembedded/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch new file mode 100644 index 0000000000..adb9c4b06b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch @@ -0,0 +1,15 @@ +Fix error pointed out by gcc10 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/sigscheme/libgcroots/include/private/gc_priv.h ++++ b/sigscheme/libgcroots/include/private/gc_priv.h +@@ -2026,7 +2026,7 @@ void GC_err_puts(const char *s); + + # if defined(NEED_FIND_LIMIT) || \ + defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS) +-JMP_BUF GC_jmp_buf; ++extern JMP_BUF GC_jmp_buf; + + /* Set up a handler for address faults which will longjmp to */ + /* GC_jmp_buf; */ diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb index 0366ad85ae..507a341445 100644 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -6,6 +6,7 @@ SECTION = "inputmethods" SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \ file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \ + file://JMP_BUF_GC_jmp_buf.patch \ " SRC_URI_append_class-target = "\ file://uim-module-manager.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html new file mode 100644 index 0000000000..a02442ad97 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html @@ -0,0 +1,98 @@ +<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html> + + + +<head> + +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<meta http-equiv="Content-Language" content="en-us"> +<meta name="VI60_defaultClientScript" content="JavaScript"> +<meta name="GENERATOR" content="Microsoft FrontPage 12.0"> +<meta name="keywords" content="Unicode Standard, copyright"> +<meta name="ProgId" content="FrontPage.Editor.Document"> +<title>Unicode License Agreement</title> +<link rel="stylesheet" type="text/css" + +href="http://www.unicode.org/webscripts/standard_styles.css"> + +<style type="text/css"> +pre { + FONT-FAMILY: Arial, Geneva, sans-serif; +} +</style> + + +</head> + + +<body text="#330000"> + + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + + <!-- BEGIN CONTENTS --> + + <td> + + +<blockquote> +<h2><a name="License">UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</a></h2> + +<pre> +See <a href="https://www.unicode.org/copyright.html">Terms of Use</a> for definitions of Unicode Inc.'s +Data Files and Software. + +NOTICE TO USER: Carefully read the following legal agreement. +BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S +DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), +YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. +IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE +THE DATA FILES OR SOFTWARE. + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2019 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in https://www.unicode.org/copyright.html. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Unicode data files and any associated documentation +(the "Data Files") or Unicode software and any associated documentation +(the "Software") to deal in the Data Files or Software +without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, and/or sell copies of +the Data Files or Software, and to permit persons to whom the Data Files +or Software are furnished to do so, provided that either +(a) this copyright and permission notice appear with all copies +of the Data Files or Software, or +(b) this copyright and permission notice appear in associated +Documentation. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS +NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL +DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THE DATA FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in these Data Files or Software without prior +written authorization of the copyright holder. +</pre> + +</blockquote> + + + + </td> + + </tr> + + </table> +</body> +</html> diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb index 89ab565ce5..b29bb784e4 100644 --- a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb @@ -1,18 +1,15 @@ SUMMARY = "Unicode Character Database" HOMEPAGE = "https://unicode.org/ucd/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://unicode.org.license.html;beginline=42;endline=85;md5=67619d0c52706853c0256514e7fd04cd" +LIC_FILES_CHKSUM = "file://../license.html;beginline=42;endline=85;md5=ddcaebcc17ab633995f12c383599f377" SRC_URI = " \ https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ - https://www.unicode.org/license.html;name=license;subdir=${BP};downloadfilename=unicode.org.license.html \ + file://license.html \ " SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6" SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6" -SRC_URI[license.md5sum] = "f03bafb623258f85ff2032c1ce567b7c" -SRC_URI[license.sha256sum] = "983225207de8a707d0903a8d70fb7a4b28c5e0f64f2366e84a6192a2d618fed4" - inherit allarch do_configure[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb index da52bb5a36..d02cf5de8e 100644 --- a/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb @@ -2,11 +2,10 @@ SUMMARY = "RFC 3986 compliant URI parsing library" HOMEPAGE = "https://uriparser.github.io" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=fc3bbde670fc6e95392a0e23bf57bda0" +LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "9874b64f6f4ff656f3f69598e38f12b7" -SRC_URI[sha256sum] = "6cef39d6eaf1a48504ee0264ce85f078758057dafb1edd0a898183b55ff76014" +SRC_URI[sha256sum] = "095e8a358a9ccbbef9d1f10d40495ca0fcb3d4490a948ba6449b213a66e08ef0" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb index 938c0f9c26..ca970e59bb 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -11,9 +11,9 @@ SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17" SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d } RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)" -FILES_${PN} += "${base_libdir}/udev/rules.d/ \ +FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ \ ${datadir}/usb_modeswitch" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb index baad340908..6a5287af49 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb @@ -19,7 +19,7 @@ RDEPENDS_${PN} = "tcl" RRECOMMENDS_${PN} = "usb-modeswitch-data" do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} UDEVDIR=${D}/${nonarch_base_libdir}/udev install if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch deleted file mode 100644 index 64e0e8ed61..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier <pjtexier@koncepto.io> -Date: Thu, 23 Jan 2020 19:14:40 +0100 -Subject: [PATCH 1/2] zck.h: fix build on musl - -The ssize_t type requires the <sys/types.h> header. This fixes build with musl -libc: - -include/zck.h:68:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? - 68 | ssize_t zck_read(zckCtx *zck, char *dst, size_t dst_size) - | ^~~~~~~ - | size_t -include/zck.h:81:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? - 81 | ssize_t zck_write(zckCtx *zck, const char *src, const size_t src_size) - | ^~~~~~~ - | size_t - -Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23] - -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - include/zck.h.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/zck.h.in b/include/zck.h.in -index 91d2557..b847576 100644 ---- a/include/zck.h.in -+++ b/include/zck.h.in -@@ -5,6 +5,7 @@ - - #include <stdlib.h> - #include <stdbool.h> -+#include <sys/types.h> - - typedef enum zck_hash { - ZCK_HASH_SHA1, --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch deleted file mode 100644 index a1c95bf362..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 72c55e3da59eccdfea3778d11f83862b58af723d Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier <pjtexier@koncepto.io> -Date: Thu, 23 Jan 2020 22:42:40 +0100 -Subject: [PATCH 2/2] unzck: fix build with musl libc - -On musl libc "stdout" is a preprocessor macro whose expansion leads to -compilation errors. - -Fixes: - -| In file included from ../git/src/unzck.c:31: -| ../git/src/unzck.c: In function 'parse_opt': -| ../git/src/unzck.c:78:24: error: expected identifier before '(' token -| 78 | arguments->stdout = true; -| | ^~~~~~ -| ../git/src/unzck.c: In function 'main': -| ../git/src/unzck.c:141:20: error: expected identifier before '(' token -| 141 | if(!(arguments.stdout)) { -| | ^~~~~~ - -Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23] - -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - src/unzck.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/unzck.c b/src/unzck.c -index 8d6c62a..002492c 100644 ---- a/src/unzck.c -+++ b/src/unzck.c -@@ -58,7 +58,7 @@ struct arguments { - char *args[1]; - zck_log_type log_level; - bool dict; -- bool stdout; -+ bool stdOut; - bool exit; - }; - -@@ -75,7 +75,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { - arguments->log_level = ZCK_LOG_DDEBUG; - break; - case 'c': -- arguments->stdout = true; -+ arguments->stdOut = true; - break; - case 'V': - version(); -@@ -138,7 +138,7 @@ int main (int argc, char *argv[]) { - snprintf(out_name + strlen(base_name) - 4, 7, ".zdict"); - - int dst_fd = STDOUT_FILENO; -- if(!arguments.stdout) { -+ if(!arguments.stdOut) { - dst_fd = open(out_name, O_TRUNC | O_WRONLY | O_CREAT, 0666); - if(dst_fd < 0) { - dprintf(STDERR_FILENO, "Unable to open %s", out_name); --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb index f75412f49e..e041132b1c 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb @@ -4,13 +4,9 @@ AUTHOR = "Jonathan Dieter" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" -SRC_URI = " \ - git://github.com/zchunk/zchunk.git;protocol=https \ - file://0001-zck.h-fix-build-on-musl.patch \ - file://0002-unzck-fix-build-with-musl-libc.patch \ - " +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" -SRCREV = "c01bf12feede792982f165f52f4a6c573e3a8c17" +SRCREV = "f5593aa11584faa691c81b4898f0aaded47f8bf7" S = "${WORKDIR}/git" DEPENDS = "\ diff --git a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb index 3b846c1511..acd491498e 100644 --- a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb @@ -20,6 +20,6 @@ do_install_append() { } PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" +PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |