From 32b11995a9447d927862951d29db38455f9e0205 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 31 Mar 2021 13:37:05 -0500 Subject: meta-openembedded: subtree update:98175fd0cc..da393545a2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aditya.Tayade (1): neon: Add ptest Andreas Müller (9): udisks2: upgrade 2.9.1 -> 2.9.2 / replace '_git' by version in recipe-name poppler: upgrade 21.02.0 -> 21.03.0 xfce4-panel: upgrade 4.16.1 -> 4.16.2 xfce4-cpugraph-plugin: upgrade 1.2.1 -> 1.2.3 xfce4-time-out-plugin: upgrade 1.1.1 -> 1.1.2 mousepad: upgrade 0.5.2 -> 0.5.3 xfce4-panel-profiles: 1.0.12 -> 1.0.13 thunar: upgrade 4.16.2 -> 4.16.4 xfce4-taskmanager: upgrade 1.4.0 -> 1.4.2 Andrei Gherzan (6): python3-pep8: Fix HOMEPAGE python3-mccabe: Fix HOMEPAGE python3-ifaddr: Integrate a dependency of pysonos python3-pysonos: Integrate the SONOS control HomeAssistant module python3-aiohue: Integrate the hue control python module packagegroup-meta-python: Add new modules (aiohue, ifaddr, pysonos) Andrej Valek (1): jsoncpp: Upgrade to 1.9.4 Bartosz Golaszewski (11): pystemd: satisfy runtime dependencies python3-pythonping: new package python3-wpa-supplicant: new package python3-txdbus: new package python3-wpa-supplicant: add runtime dependencies python3-wpa-supplicant: fix importing the cli submodule python3-wpa-supplicant: replace DESCRIPTION with SUMMARY libgpiod: update v1.6.2 -> v1.6.3 python3-txdbus: add missing runtime dependencies python3-jmespath: new package python3-docutils: new package Ben Gampe (1): python3-h11: new package Carlos Rafael Giani (1): pipewire: Upgrade to 0.3.24 Changqing Li (2): php: allow php as empty openldap: upgrade 2.4.57 -> 2.4.58 Clément Péron (2): grpc: move grpc plugins to a new grpc-compiler package nodejs: 12.20.2 -> 12.21.0 Colin McAllister (1): python3-gpsd-py3: Added recipe Daniel Wagenknecht (1): gnome-keyring: set file capabilities in pkg_postinst Denys Dmytriyenko (1): glmark2: also depend on wayland-protocols when wayland distro feature is on Devon Pringle (1): python3-pastedeploy: Add recipe Fabio Berton (1): python3-requests: Support idna version 3.1 INC@Cisco) (2): bpftool: remove recipe from blacklist bpftool: improve reproducibility Jan Kaisrlik (1): abseil-cpp: reorder content of packages Joshua Watt (1): classes: Add Android sparse image class Kai Kang (8): python3-pillow: 8.1.0 -> 8.1.2 xfce4-cpufreq-plugin: 1.2.2 -> 1.2.5 exo: 4.16.0 -> 4.16.1 xfce4-netload-plugin: 1.3.2 -> 1.4.0 xfce4-genmon-plugin: 4.1.0 -> 4.1.1 xfce4-weather-plugin: 0.10.2 -> 0.11.0 xfce4-systemload-plugin: 1.2.4 -> 1.3.0 xfce4-taskmanager: 1.4.2 -> 1.5.2 Khem Raj (63): nss: Disable Werror open-vm-tools: Do not use volatile qualifier dconf-editor: Fix build with vala 0.50.4 libbacktrace: Add recipe libleak: Add recipe packagegroup-meta-oe: Add libleak to packagegroup-meta-oe-extended mongodb: Upgrade to 4.4.4 packagegroup-meta-python: Add python3-semantic-version python3-grpcio: Upgrade to 1.36.1 python3-grpcio: Fix build on mips and musl mpv: Link libatomic on riscv64 glog: Link with libexecinfo on musl musl-nscd: Make lex syntax posix'y libbpf: Depend on virtual/kernel:do_shared_workdir waf-cross-answers: Add powerpc64le version python3-grpcio,python3-grpcio-tools: Disable for ppc64le openh264: Disable building for ppc64le ufs-utils: Upgrade to 1.9 libhugetlbfs: Fix ARCH setting for ppc64 LE nodejs: Set correct nodejs arch for ppc64le libnma: Disbale vapi xrdp: Upgrade to 0.9.15 ply: upgrade to latest ply: Disable on ppc64 ltrace: Fix build on ppc64le/musl oprofile: Fix build on musl gperftools: Update SRCREV to point to 2.9.1 release mongodb: Fix cross build on ppc64le abseil-cpp: Fix build on musl and ppc64 mariadb: Fix build on musl/ppc mongodb: Fix build on ppc64le breakpad: Upgrade to latest ssiapi: Disable for ppc64 kexec-tools-klibc: Use SITEINFO_BITS to construct includepath breakpad: Exclude for ppc64 python3-grpcio,python3-grpcio-tools: Enable build on ppc64/glibc breakpad: Do not fallback to android implementation for getcontext/setcontext on musl oprofile: Upgrade to 1.4.0 release vboxguestdrivers: Add __divmoddi4 builtin support links-x11,links: Upgrade to 2.22 layers: Drop gatesgarth from LAYERSERIES_COMPAT xxhash: Remove recipe gsound: Use () instead of {} for makefile variable in gsound_play_VALAFLAGS pipewire: Package systemd unit file for pipewire-media-session packagegroup-meta-python: Add new package python3-pythonping python3-spidev: Remove recipe for 3.2 python3-werkzeug: Clarify BSD license type python3-werkzeug: Delete recipe for 1.0.0 python3-hexdump: Move cleanup_hexfile into install_append cryptsetup: DEPEND on renamed util-linux-libuuid tracker-miners: Check for commercial license to enable ffmpeg gnome-settings-daemon: Do not generate meson.native libb64: Add recipe sysdig: Upgrade to 0.27.1 sysdig: Depend on system libb64 gimp: Disable vector iconn on rv32/musl libcamera: Update the patch to upstreamed one flashrom: Add remaining RISCV support mpd: Check for commercial in LICENSE_FLAGS_WHITELIST mpv: Exclude from world if commercial is not in inclusion list sox: Exclude from world if commercial is not in inclusion list vlc: Exclude from world if commercial is not in inclusion list sox: Remove LICENSE_FLAGS = "commercial" Leon Anavi (74): python3-elementpath: Upgrade 2.1.4 -> 2.2.0 python3-twisted: Upgrade 20.3.0 -> 21.2.0 python3-ipython: Upgrade 7.20.0 -> 7.21.0 python3-yamlloader: Upgrade 0.5.5 -> 1.0.0 python3-astroid: Upgrade 2.5 -> 2.5.1 python3-portion: Upgrade 2.1.4 -> 2.1.5 python3-pandas: Upgrade 1.2.2 -> 1.2.3 python3-ruamel-yaml: Upgrade 0.16.12 -> 0.16.13 python3-prettytable: Upgrade 2.0.0 -> 2.1.0 python3-huey: Upgrade 2.3.0 -> 2.3.1 python3-pychromecast: Upgrade 8.1.0 -> 9.1.1 python3-incremental: Upgrade 17.5.0 -> 21.3.0 python3-waitress: Upgrade 1.4.4 -> 2.0.0 python3-pako: Upgrade 0.3.0 -> 0.3.1 python3-pyscaffold: Upgrade 3.3.1 -> 4.0 python3-croniter: Upgrade 1.0.6 -> 1.0.8 python3-prompt-toolkit: Upgrade 3.0.16 -> 3.0.17 python3-pymisp: Upgrade 2.4.138 -> 2.4.140 python3-jsonpatch: Upgrade 1.31 -> 1.32 python3-jsonpointer: Upgrade 2.0 -> 2.1 python3-configargparse: Upgrade 1.3 -> 1.4 python3-luma-core: Upgrade 2.2.0 -> 2.3.1 python3-pycodestyle: Upgrade 2.6.0 -> 2.7.0 python3-bitarray: Upgrade 1.7.0 -> 1.7.1 python3-alembic: Upgrade 1.5.5 -> 1.5.7 python3-pyflakes: Upgrade 2.2.0 -> 2.3.0 python3-autobahn: Upgrade 21.2.2 -> 21.3.1 python3-pulsectl: Upgrade 21.2.0 -> 21.3.4 python3-configparser: Upgrade 5.0.1 -> 5.0.2 python3-defusedxml: Upgrade 0.6.0 -> 0.7.1 python3-twine: Upgrade 3.3.0 -> 3.4.0 python3-socketio: Upgrade 5.0.4 -> 5.1.0 python3-soupsieve: Upgrade 2.2 -> 2.2.1 python3-cassandra-driver: Upgrade 3.24.0 -> 3.25.0 python3-urllib3: Upgrade 1.26.3 -> 1.26.4 python3-bitarray: Upgrade 1.7.1 -> 1.8.0 python3-pyscaffold: Upgrade 4.0 -> 4.0.1 python3-flask-migrate: Upgrade 2.6.0 -> 2.7.0 python3-grpcio-tools: Upgrade 1.35.0 -> 1.36.1 python3-humanize: Upgrade 3.2.0 -> 3.3.0 python3-regex: Upgrade 2020.11.13 -> 2021.3.17 python3-twine: Upgrade 3.4.0 -> 3.4.1 python3-isort: Upgrade 5.7.0 -> 5.8.0 python3-sqlalchemy: Upgrade 1.3.23 -> 1.4.2 python3-scrypt: Upgrade 0.8.6 -> 0.8.17 python3-colorlog: Upgrade 4.7.2 -> 4.8.0 python3-croniter: Upgrade 1.0.8 -> 1.0.9 python3-pyperf: Upgrade 2.1.0 -> 2.2.0 python3-lazy-object-proxy: Upgrade 1.5.2 -> 1.6.0 python3-prompt-toolkit: Upgrade 3.0.17 -> 3.0.18 python3-configshell-fb: Upgrade 1.1.28 -> 1.1.29 python3-backports-functools-lru-cache: Upgrade 1.6.1 -> 1.6.3 python3-pytest-helpers-namespace: Upgrade 2019.1.8 -> 2021.3.24 python3-elementpath: Upgrade 2.2.0 -> 2.2.1 python3-alembic: Upgrade 1.5.7 -> 1.5.8 python3-rfc3339-validator: Upgrade 0.1.2 -> 0.1.3 python3-pyflakes: Upgrade 2.3.0 -> 2.3.1 python3-pint: Upgrade 0.16.1 -> 0.17 python3-flask-sqlalchemy: Upgrade 2.4.4 -> 2.5.1 python3-django: Upgrade 3.1.1 -> 3.1.7 python3-djangorestframework: Upgrade 3.12.2 -> 3.12.3 python3-ruamel-yaml: Upgrade 0.16.13 -> 0.17.0 python3-bitarray: Upgrade 1.8.0 -> 1.8.1 python3-sqlalchemy: Upgrade 1.4.2 -> 1.4.3 python3-xmlschema: Upgrade 1.5.1 -> 1.5.3 python3-croniter: Upgrade 1.0.9 -> 1.0.10 python3-astroid: Upgrade 2.5.1 -> 2.5.2 python3-pyroute2: Upgrade 0.5.14 -> 0.5.15 python3-coverage: Upgrade 5.4 -> 5.5 python3-gunicorn: Upgrade 20.0.4 -> 20.1.0 python3-djangorestframework: Upgrade 3.12.3 -> 3.12.4 python3-ipython: Upgrade 7.21.0 -> 7.22.0 python3-openpyxl: Upgrade 3.0.6 -> 3.0.7 python3-ruamel-yaml: Upgrade 0.17.0 -> 0.17.2 Luca Boccassi (3): cryptsetup: depend on new util-linux-uuid to break cycle dbus-broker: upgrade 26 -> 27 dbus-broker: upgrade 27 -> 28 Marius Kriegerowski (1): tmate: add recipe version 2.4.0 Martin Jansa (11): glog: fix searching for Libunwind ceres-solver: prevent fetching git hook during do_configure packagegroup-meta-oe: include abseil-cpp for all architectures packagegroup-meta-oe: include nodejs without meta-python2 conditional packagegroup-meta-oe: move the packages depending on meta-python2 to separate packages mysql-python, lio-utils, openlmi-tools: add conditional PNBLACKLIST like meta-python2 does conf/layer.conf: include .bbappend files in BBFILES_DYNAMIC open-vm-tools: move to meta-networking packagegroup-meta-{oe,multimedia}: move pipewire to the right packagegroup packagegroup-meta-multimedia: include projucer only with x11 in DISTRO_FEATURES packagegroup-meta-multimedia: include vlc only with x11 in DISTRO_FEATURES Matteo Croce (1): libbpf: use pkg-config Michael Vetter (1): jasper: upgrade 2.0.25 -> 2.0.26 Ming Liu (1): atftp: move atftpd.init from files to atftp subdirectory Mingli Yu (6): geoip: Switch to use the main branch geoip-perl: Switch to use the main branch bridge-utils: Switch to use the main branch netkit-telnet: Update SRC_URI quagga: Update SRC_URI hostapd: fix CVE-2019-5061 Nisha Parrakat (1): neon: use pkg-config instead of xml2-config to configure Oleksandr Kravchuk (10): ipset: update to 7.11 libnice: update to 0.1.18 nbdkit: update to 1.25.3 python3-bitarray: update to 1.7.0 python3-google-api-python-client: update to 2.0.2 python3-jsonpatch: update to 1.31 python3-websocket-client: update to 0.58.0 python3-robotframework: update to 4.0 python3-sentry-sdk: update to 1.0.0 aom: update to 3.0.0 Peace Lee (2): guider: Upgrade 3.9.7 -> 3.9.8 guider: Upgrade 3.9.7 -> 3.9.8 Persian Prince (1): tinymembench: Correct PV Philip Balister (1): fftw: Add support for ptest. Randy MacLeod (6): gperftools: upgrade 2.8.1 -> 2.9.1 zabbix: upgrade 4.4.6 -> 5.2.5 nss: upgrade 3.60.1 -> 3.62 xterm: upgrade 362 -> 366 zstd: remove the recipe since it moved to oe-core tclap: upgrade 1.2.2 -> 1.4.0 Ross Burton (3): libxmlb: upgrade to 0.3.0 flashrom: recipe cleanup openjpeg: add native/nativesdk class extension Sakib Sajal (1): grpc: upgrade 1.36.1 -> 1.36.2 Sam Van Den Berge (1): libiio: fix build when python bindings are enabled Sana Kazi (1): mdns: Whitelisted CVE-2007-0613 for mdns Stefan Schmidt (2): musl-rpmatch_git.bb: add new recipe to provide rpmatch() for musl libc builds plymouth_0.9.5.bb: allow building with musl libc Valentin Longchamp (1): libssh: add gcrypt to PACKAGECONFIG Wang Mingyu (3): czmq: Conflict resolution for sha1.h python3-lxml: upgrade 4.6.2 -> 4.6.3 python3-zopeinterface: upgrade 5.2.0 -> 5.3.0 Yann Dirson (1): mpv: remove explicit LICENSE_FLAGS Yi Fan Yu (2): librelp: update 1.6.0 -> 1.10.0 rsyslog: Fix rsyslog systemd service not starting Yi Zhao (2): quagga: do not set PIDFile in service files tclap: add pkg-config file Zang Ruochen (1): gtkwave: upgrade 3.3.104 -> 3.3.108 zangrc (15): dovecot: upgrade 2.3.13 -> 2.3.14 fetchmail: upgrade 6.4.16 -> 6.4.17 dialog: upgrade 1.3-20210117 -> 1.3-20210306 fio: upgrade 3.25 -> 3.26 xorriso: upgrade 1.5.3 -> 1.5.5 iscsi-initiator-utils: upgrade 2.1.3 -> 2.1.4 mosquitto: upgrade 2.0.8 -> 2.0.9 nbdkit: upgrade 1.25.3 -> 1.25.4 wireguard-tools: upgrade 1.0.20210223 -> 1.0.20210315 wireshark: upgrade 3.4.3 -> 3.4.4 live555: upgrade 20210129 -> 20210322 mg: upgrade 20200723 -> 20210314 nanopb: upgrade 0.4.4 -> 0.4.5 nss: upgrade 3.62 -> 3.63 uriparser: upgrade 0.9.4 -> 0.9.5 zhengruoqin (12): phpmyadmin: upgrade 5.0.4 -> 5.1.0 uthash: upgrade 2.2.0 -> 2.3.0 gd: upgrade 2.3.1 -> 2.3.2 openocd: upgrade 0.10 -> 0.11 satyr: upgrade 0.36 -> 0.37 libcrypt-openssl-guess-perl: upgrade 0.11 -> 0.12 cryptsetup: upgrade 2.3.4 -> 2.3.5 glmark2: upgrade 20201114 -> 2021.02 grpc: upgrade 1.36.2 -> 1.36.3 dialog: upgrade 1.3-20210306 -> 1.3-20210319 grpc: upgrade 1.36.3 -> 1.36.4 libgee: upgrade 0.20.3 -> 0.20.4 Signed-off-by: Andrew Geissler Change-Id: I0b18d7c12586e6038d002f02ed87f38e25bc5080 --- .../libb64/0001-example-Do-not-run-the-tests.patch | 27 ++++++++ .../libb64/0002-use-BUFSIZ-as-buffer-size.patch | 57 ++++++++++++++++ .../libb64/libb64/0003-fix-integer-overflows.patch | 77 ++++++++++++++++++++++ .../libb64/libb64/0004-Fix-off-by-one-error.patch | 26 ++++++++ .../0005-make-overriding-CFLAGS-possible.patch | 40 +++++++++++ ...do-not-export-the-CHARS_PER_LINE-variable.patch | 27 ++++++++ ...encoder-decoder-state-in-the-constructors.patch | 44 +++++++++++++ .../meta-oe/recipes-support/libb64/libb64_1.2.1.bb | 39 +++++++++++ 8 files changed, 337 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libb64/libb64/0003-fix-integer-overflows.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libb64/libb64/0004-Fix-off-by-one-error.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libb64/libb64/0005-make-overriding-CFLAGS-possible.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libb64/libb64/0006-do-not-export-the-CHARS_PER_LINE-variable.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libb64/libb64/0007-initialize-encoder-decoder-state-in-the-constructors.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libb64/libb64_1.2.1.bb (limited to 'meta-openembedded/meta-oe/recipes-support/libb64') diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch new file mode 100644 index 000000000..ea3ddfb64 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch @@ -0,0 +1,27 @@ +From 68f66d1583be670eb8d5f3f38dbd5dd1d63b733c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Mar 2021 21:41:04 -0700 +Subject: [PATCH] example: Do not run the tests + +Upstream-Status: Inappropritate [Cross-compile specific] +Signed-off-by: Khem Raj +--- + examples/Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index d9667a5..554b346 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -33,11 +33,8 @@ depend: $(SOURCES) + makedepend -f- $(CFLAGS) $(SOURCES) 2> /dev/null 1> depend + + test-c-example1: c-example1 +- ./c-example1 + + test-c-example2: c-example2 +- ./c-example2 loremgibson.txt encoded.txt decoded.txt +- diff -q loremgibson.txt decoded.txt + + test: test-c-example1 test-c-example2 + diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch new file mode 100644 index 000000000..10ec8e14a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch @@ -0,0 +1,57 @@ +From ee03e265804a07a0da5028b86960031bd7ab86b2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Mar 2021 22:01:13 -0700 +Subject: [PATCH] use BUFSIZ as buffer size + +Author: Jakub Wilk +Bug: http://sourceforge.net/tracker/?func=detail&atid=785907&aid=3591336&group_id=152942 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + include/b64/decode.h | 3 ++- + include/b64/encode.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/b64/decode.h b/include/b64/decode.h +index 12b16ea..e9019f3 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_DECODE_H + #define BASE64_DECODE_H + ++#include + #include + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_decodestate _state; + int _buffersize; + +- decoder(int buffersize_in = BUFFERSIZE) ++ decoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + {} + +diff --git a/include/b64/encode.h b/include/b64/encode.h +index 5d807d9..e7a7035 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_ENCODE_H + #define BASE64_ENCODE_H + ++#include + #include + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_encodestate _state; + int _buffersize; + +- encoder(int buffersize_in = BUFFERSIZE) ++ encoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + {} + diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0003-fix-integer-overflows.patch b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0003-fix-integer-overflows.patch new file mode 100644 index 000000000..8854bb6af --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0003-fix-integer-overflows.patch @@ -0,0 +1,77 @@ +From 7b30fbc3d47dfaf38d8ce8b8949a69d2984dac76 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Mar 2021 22:06:03 -0700 +Subject: [PATCH] fix integer overflows + +Author: Jakub Wilk +Bug: http://sourceforge.net/tracker/?func=detail&aid=3591129&group_id=152942&atid=785907 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/cdecode.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/cdecode.c b/src/cdecode.c +index a6c0a42..4e47e9f 100644 +--- a/src/cdecode.c ++++ b/src/cdecode.c +@@ -9,10 +9,11 @@ For details, see http://sourceforge.net/projects/libb64 + + int base64_decode_value(char value_in) + { +- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; ++ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; + static const char decoding_size = sizeof(decoding); ++ if (value_in < 43) return -1; + value_in -= 43; +- if (value_in < 0 || value_in >= decoding_size) return -1; ++ if (value_in > decoding_size) return -1; + return decoding[(int)value_in]; + } + +@@ -26,7 +27,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + { + const char* codechar = code_in; + char* plainchar = plaintext_out; +- char fragment; ++ int fragment; + + *plainchar = state_in->plainchar; + +@@ -42,7 +43,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + state_in->plainchar = *plainchar; + return plainchar - plaintext_out; + } +- fragment = (char)base64_decode_value(*codechar++); ++ fragment = base64_decode_value(*codechar++); + } while (fragment < 0); + *plainchar = (fragment & 0x03f) << 2; + case step_b: +@@ -53,7 +54,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + state_in->plainchar = *plainchar; + return plainchar - plaintext_out; + } +- fragment = (char)base64_decode_value(*codechar++); ++ fragment = base64_decode_value(*codechar++); + } while (fragment < 0); + *plainchar++ |= (fragment & 0x030) >> 4; + *plainchar = (fragment & 0x00f) << 4; +@@ -65,7 +66,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + state_in->plainchar = *plainchar; + return plainchar - plaintext_out; + } +- fragment = (char)base64_decode_value(*codechar++); ++ fragment = base64_decode_value(*codechar++); + } while (fragment < 0); + *plainchar++ |= (fragment & 0x03c) >> 2; + *plainchar = (fragment & 0x003) << 6; +@@ -77,7 +78,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + state_in->plainchar = *plainchar; + return plainchar - plaintext_out; + } +- fragment = (char)base64_decode_value(*codechar++); ++ fragment = base64_decode_value(*codechar++); + } while (fragment < 0); + *plainchar++ |= (fragment & 0x03f); + } diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0004-Fix-off-by-one-error.patch b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0004-Fix-off-by-one-error.patch new file mode 100644 index 000000000..e19dbad08 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0004-Fix-off-by-one-error.patch @@ -0,0 +1,26 @@ +From 8144fd9e02bd5ccd1e080297b19a1e9eb4d3ff96 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Mar 2021 22:07:15 -0700 +Subject: [PATCH] Fix off by one error + +Launchpad bug #1501176 reported by William McCall on 2015-09-30 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/cdecode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cdecode.c b/src/cdecode.c +index 4e47e9f..45da4e1 100644 +--- a/src/cdecode.c ++++ b/src/cdecode.c +@@ -13,7 +13,7 @@ int base64_decode_value(char value_in) + static const char decoding_size = sizeof(decoding); + if (value_in < 43) return -1; + value_in -= 43; +- if (value_in > decoding_size) return -1; ++ if (value_in >= decoding_size) return -1; + return decoding[(int)value_in]; + } + diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0005-make-overriding-CFLAGS-possible.patch b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0005-make-overriding-CFLAGS-possible.patch new file mode 100644 index 000000000..e93015ee4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0005-make-overriding-CFLAGS-possible.patch @@ -0,0 +1,40 @@ +From a7914d5ffee6ffdfb3f2b8ebcc22c8367d078301 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Mar 2021 22:08:43 -0700 +Subject: [PATCH] make overriding CFLAGS possible + +Author: Jakub Wilk + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + base64/Makefile | 2 +- + src/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/base64/Makefile b/base64/Makefile +index 30a2c5c..783a248 100644 +--- a/base64/Makefile ++++ b/base64/Makefile +@@ -3,7 +3,7 @@ BINARIES = base64 + # Build flags (uncomment one) + ############################# + # Release build flags +-CFLAGS += -O3 ++CFLAGS ?= -O3 + ############################# + # Debug build flags + #CFLAGS += -g +diff --git a/src/Makefile b/src/Makefile +index 28b2382..48801fc 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -3,7 +3,7 @@ LIBRARIES = libb64.a + # Build flags (uncomment one) + ############################# + # Release build flags +-CFLAGS += -O3 ++CFLAGS ?= -O3 + ############################# + # Debug build flags + #CFLAGS += -g diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0006-do-not-export-the-CHARS_PER_LINE-variable.patch b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0006-do-not-export-the-CHARS_PER_LINE-variable.patch new file mode 100644 index 000000000..9ba08c87e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0006-do-not-export-the-CHARS_PER_LINE-variable.patch @@ -0,0 +1,27 @@ +From a1b9bb4af819ed389675f16e4a521efeda4cc3f3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Mar 2021 22:10:48 -0700 +Subject: [PATCH] do not export the CHARS_PER_LINE variable + +The library exports a variable named "CHARS_PER_LINE". This is a generic name that could conflict with a name in user's code. +Please either rename the variable or make it static. + +Upstream-Status: Submitted [http://sourceforge.net/tracker/?func=detail&aid=3591420&group_id=152942&atid=785907] +Signed-off-by: Khem Raj +--- + src/cencode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cencode.c b/src/cencode.c +index 03ba5b6..3df62a8 100644 +--- a/src/cencode.c ++++ b/src/cencode.c +@@ -7,7 +7,7 @@ For details, see http://sourceforge.net/projects/libb64 + + #include + +-const int CHARS_PER_LINE = 72; ++static const int CHARS_PER_LINE = 72; + + void base64_init_encodestate(base64_encodestate* state_in) + { diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0007-initialize-encoder-decoder-state-in-the-constructors.patch b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0007-initialize-encoder-decoder-state-in-the-constructors.patch new file mode 100644 index 000000000..fdf8339be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64/0007-initialize-encoder-decoder-state-in-the-constructors.patch @@ -0,0 +1,44 @@ +From c1ba44d83cc7d9d756cfb063717852eae9d03328 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Mar 2021 22:12:41 -0700 +Subject: [PATCH] initialize encoder/decoder state in the constructors + +Author: Jakub Wilk + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + include/b64/decode.h | 4 +++- + include/b64/encode.h | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/include/b64/decode.h b/include/b64/decode.h +index e9019f3..aefb7bc 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -25,7 +25,9 @@ namespace base64 + + decoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) +- {} ++ { ++ base64_init_decodestate(&_state); ++ } + + int decode(char value_in) + { +diff --git a/include/b64/encode.h b/include/b64/encode.h +index e7a7035..33848b3 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -25,7 +25,9 @@ namespace base64 + + encoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) +- {} ++ { ++ base64_init_encodestate(&_state); ++ } + + int encode(char value_in) + { diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64_1.2.1.bb b/meta-openembedded/meta-oe/recipes-support/libb64/libb64_1.2.1.bb new file mode 100644 index 000000000..64a34fece --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64_1.2.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Base64 Encoding/Decoding Routines" +DESCRIPTION = "base64 encoding/decoding library - runtime library \ +libb64 is a library of ANSI C routines for fast encoding/decoding data into \ +and from a base64-encoded format" +HOMEPAGE = "http://libb64.sourceforge.net/" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ce551aad762074c7ab618a0e07a8dca3" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${BP}.zip \ + file://0001-example-Do-not-run-the-tests.patch \ + file://0002-use-BUFSIZ-as-buffer-size.patch \ + file://0003-fix-integer-overflows.patch \ + file://0004-Fix-off-by-one-error.patch \ + file://0005-make-overriding-CFLAGS-possible.patch \ + file://0006-do-not-export-the-CHARS_PER_LINE-variable.patch \ + file://0007-initialize-encoder-decoder-state-in-the-constructors.patch \ + " +SRC_URI[sha256sum] = "20106f0ba95cfd9c35a13c71206643e3fb3e46512df3e2efb2fdbf87116314b2" + +PARALLEL_MAKE = "" + +CFLAGS += "-fPIC" + +do_configure () { + : +} + +do_compile () { + oe_runmake + ${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,${BPN}.so.0 src/*.o -o src/${BPN}.so.0 +} + +do_install () { + install -d ${D}${includedir}/b64 + install -Dm 0644 ${B}/src/libb64.a ${D}${libdir}/libb64.a + install -Dm 0644 ${B}/src/libb64.so.0 ${D}${libdir}/libb64.so.0 + ln -s libb64.so.0 ${D}${libdir}/libb64.so + install -Dm 0644 ${S}/include/b64/*.h ${D}${includedir}/b64/ +} -- cgit v1.2.3