[oe] [meta-networking][PATCH] corosync: update corosync.conf to 3.x
From: Mingli Yu Update corosync.conf to make it valid after corosync upgrades to 3.x. Reference: https://sources.debian.org/data/main/c/corosync/3.0.3-2/debian/patches/Make-the-example-config-valid.patch Signed-off-by: Mingli Yu --- .../corosync/corosync/corosync.conf | 85 ++- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/meta-networking/recipes-extended/corosync/corosync/corosync.conf b/meta-networking/recipes-extended/corosync/corosync/corosync.conf index 6aef9de95..744a30ff5 100644 --- a/meta-networking/recipes-extended/corosync/corosync/corosync.conf +++ b/meta-networking/recipes-extended/corosync/corosync/corosync.conf @@ -1,58 +1,61 @@ -# Starting point for cluster with pacemaker/openais -compatibility: none - -corosync { -user: root -group: root -} - -aisexec { - with Pacemaker - user: root - group: root -} - -service { - name: pacemaker - ver: 1 -} - +# Please read the corosync.conf.5 manual page totem { version: 2 - secauth: off - threads: 0 - interface { - ringnumber: 0 - # Cluster network address - bindnetaddr: 192.168.10.0 - # Should be fine in most cases, don't forget to allow - # packets for this address/port in netfilter if there - # is restrictive policy set for cluster network - mcastaddr: 226.94.1.1 - mcastport: 5405 - } + + # Set name of the cluster + cluster_name: testCluster + + # crypto_cipher and crypto_hash: Used for mutual node authentication. + # If you choose to enable this, then do remember to create a shared + # secret with "corosync-keygen". + # enabling crypto_cipher, requires also enabling of crypto_hash. + # crypto works only with knet transport + crypto_cipher: none + crypto_hash: none } logging { + # Log the source file and line where messages are being + # generated. When in doubt, leave off. Potentially useful for + # debugging. fileline: off - to_stderr: no + # Log to standard error. When in doubt, set to yes. Useful when + # running in the foreground (when invoking "corosync -f") + to_stderr: yes + # Log to a log file. When set to "no", the "logfile" option + # must not be set. to_logfile: yes - to_syslog: yes logfile: /var/log/cluster/corosync.log + # Log to the system log daemon. When in doubt, set to yes. + to_syslog: yes + # Log debug messages (very verbose). When in doubt, leave off. debug: off - timestamp: on + # Log messages with time stamps. When in doubt, set to hires (or on) + #timestamp: hires logger_subsys { - subsys: AMF + subsys: QUORUM debug: off } } -amf { - mode: disabled -} - quorum { - # Quorum for the Pacemaker Cluster Resource Manager + # Enable and configure quorum subsystem (default: off) + # see also corosync.conf.5 and votequorum.5 provider: corosync_votequorum - expected_votes: 1 +} + +nodelist { + # Change/uncomment/add node sections to match cluster configuration + + node { + # Hostname of the node + name: node1 + # Cluster membership node identifier + nodeid: 1 + # Address of first link + ring0_addr: 127.0.0.1 + # When knet transport is used it's possible to define up to 8 links + #ring1_addr: 192.168.1.1 + } + # ... } -- 2.24.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] nmap: make ndiff support python3
From: Mingli Yu The ndiff is python2 compatible now, backport a patch from debian to make ndiff port to python3. Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch Signed-off-by: Mingli Yu --- .../files/0001-Make-ndiff-support-python3.patch| 1720 ...configure.ac-make-ndiff-depend-on-python3.patch | 48 + meta-oe/recipes-security/nmap/nmap_7.80.bb | 12 +- 3 files changed, 1778 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch create mode 100644 meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch diff --git a/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch b/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch new file mode 100644 index 000..2ca18b0 --- /dev/null +++ b/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch @@ -0,0 +1,1720 @@ +From bbbf474b2ebdbdac4d557e3351210f3fe2175c33 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 14 Feb 2020 10:09:55 + +Subject: [PATCH] Make ndiff support python3 + +Backport a patch from debian to make ndiff support +python3. + +Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + Makefile.in | 12 +- + ndiff/ndiff.py| 495 +- + ndiff/ndifftest.py| 94 +++ + ndiff/scripts/ndiff | 14 +- + ndiff/setup.py| 34 +-- + ndiff/test-scans/anonymize.py | 18 +- + 6 files changed, 333 insertions(+), 334 deletions(-) + mode change 100644 => 100755 ndiff/setup.py + +diff --git a/Makefile.in b/Makefile.in +index eee8863..32f86ba 100644 +--- a/Makefile.in b/Makefile.in +@@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@ + NDIFFDIR = @NDIFFDIR@ + NPINGDIR = @NPINGDIR@ + PYTHON = @PYTHON@ ++PYTHON3 = /usr/bin/env python3 + DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" + # With GCC, add extra security checks to source code. + # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html +@@ -260,7 +261,7 @@ clean-zenmap: + rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc + + clean-ndiff: +- -cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all ++ -cd $(NDIFFDIR) && $(PYTHON3) setup.py clean --all + + clean-nping: + -cd $(NPINGDIR) && $(MAKE) clean +@@ -368,6 +369,7 @@ tests/check_dns: $(OBJS) + # this as the location of the interpreter whenever we're not doing a + # local installation. + DEFAULT_PYTHON_PATH = /usr/bin/env python ++DEFAULT_PYTHON3_PATH = /usr/bin/env python3 + + build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py + # When DESTDIR is defined, assume we're building an executable +@@ -388,13 +390,13 @@ install-zenmap: $(ZENMAPDIR)/setup.py + ln -sf zenmap $(DESTDIR)$(bindir)/xnmap + + build-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON3_PATH)") + + build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@ + @cd $(NPINGDIR) && $(MAKE) + + install-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") + + NSE_FILES = scripts/script.db scripts/*.nse + NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc +@@ -443,7 +445,7 @@ uninstall-zenmap: + rm -f $(DESTDIR)$(bindir)/xnmap + + uninstall-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py uninstall ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py uninstall + + uninstall-ncat: + @cd $(NCATDIR) && $(MAKE) uninstall +@@ -458,7 +460,7 @@ check-ncat: + @cd $(NCATDIR) && $(MAKE) check + + check-ndiff: +- @cd $(NDIFFDIR) && $(PYTHON) ndifftest.py ++ @cd $(NDIFFDIR) && $(PYTHON3) ndifftest.py + + check-nsock: + @cd $(NSOCKDIR)/src && $(MAKE) check +diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py +index 043273f..abbd1c5 100755 +--- a/ndiff/ndiff.py b/ndiff/ndiff.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Ndiff + # +@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x] + import xml.sax + import xml.sax.saxutils + import xml.dom.minidom +-from StringIO import StringIO ++from io import StringIO + + verbose = False + +-NDIFF_XML_VERSION = u"1" ++NDIFF_XML_VERSION = "1" + + + class OverrideEntityResolver(xml.sax.handler.EntityResolver): +@@ -78,35
[oe] [meta-oe][PATCH] iozone3: Upgrade to 489
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-benchmark/iozone3/{iozone3_488.bb => iozone3_489.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-benchmark/iozone3/{iozone3_488.bb => iozone3_489.bb} (97%) diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb similarity index 97% rename from meta-oe/recipes-benchmark/iozone3/iozone3_488.bb rename to meta-oe/recipes-benchmark/iozone3/iozone3_489.bb index 222a956..e4b7e4f 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb @@ -11,8 +11,8 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://0001-let-system-headers-provide-pread64.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "d60a69e44cda8436f4f94d860958efc2" -SRC_URI[sha256sum] = "960265163d93f15f7ad352f726d4837c5dd794fff357c743fdb56cbcf4abca04" +SRC_URI[md5sum] = "e863281987689cd6d9729e535637b77d" +SRC_URI[sha256sum] = "6155850d1019f2450dc926bbdb5a24abf423ee3bb928ab1e68569cf60a908584" UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mcelog: Upgrade to 168
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-support/mcelog/{mcelog_166.bb => mcelog_168.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/mcelog/{mcelog_166.bb => mcelog_168.bb} (95%) diff --git a/meta-oe/recipes-support/mcelog/mcelog_166.bb b/meta-oe/recipes-support/mcelog/mcelog_168.bb similarity index 95% rename from meta-oe/recipes-support/mcelog/mcelog_166.bb rename to meta-oe/recipes-support/mcelog/mcelog_168.bb index 3b4ea1f..e2ef6ea 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_166.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_168.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; file://run-ptest \ " -SRCREV = "ee90ff20ce6a4d5e016aa249ce8b37f359f9fda4" +SRCREV = "078d593b8b0c7d44afdd439aacfad6682913038f" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libteam: Upgrade to 1.30
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-support/libteam/{libteam_1.29.bb => libteam_1.30.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/libteam/{libteam_1.29.bb => libteam_1.30.bb} (95%) diff --git a/meta-oe/recipes-support/libteam/libteam_1.29.bb b/meta-oe/recipes-support/libteam/libteam_1.30.bb similarity index 95% rename from meta-oe/recipes-support/libteam/libteam_1.29.bb rename to meta-oe/recipes-support/libteam/libteam_1.30.bb index 4ccc280..9cd02b0 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.29.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.30.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/jpirko/libteam \ file://0001-team_basic_test.py-use-python3-interpreter.patch \ file://run-ptest \ " -SRCREV = "e897f02bf2403d4859a99e090e34ea768b4c0540" +SRCREV = "471fb50d206e5a3f2eef9e4247329b51edc5c493" S = "${WORKDIR}/git" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] log4cplus: remove gold linker setting
From: Mingli Yu After commit[3a7abb175 log4cplus: Fix build with gold linker] applied, with below logic in conf/local.conf MACHINE ??= "qemumips64" MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" require conf/multilib.conf There comes below configure error: $ bitbake libn32-log4cplus | checking for the pthreads library -lpthread... no | configure: error: Requested threads support but no threads were found. Actually the logic[CXXFLAGS += "-fuse-ld=gold"] is not needed in commit[3a7abb175 log4cplus: Fix build with gold linker], so remove it to fix the above configure error. Signed-off-by: Mingli Yu --- meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb index b396cabf3..566de2853 100644 --- a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb +++ b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb @@ -18,5 +18,3 @@ UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" inherit autotools pkgconfig BBCLASSEXTEND = "native" - -CXXFLAGS += "-fuse-ld=gold" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] log4cplus: remove gold linker setting
From: Mingli Yu After commit[3a7abb175 log4cplus: Fix build with gold linker] applied, with below logic in conf/local.conf MACHINE ??= "qemumips64" MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" require conf/multilib.conf There comes below build error: $ libn32-log4cplus | checking for the pthreads library -lpthread... no | configure: error: Requested threads support but no threads were found. Actually the logic[CXXFLAGS += "-fuse-ld=gold"] is not needed in commit[3a7abb175 log4cplus: Fix build with gold linker], so remove it to fix the above build error. Signed-off-by: Mingli Yu --- meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb index b396cabf3..566de2853 100644 --- a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb +++ b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb @@ -18,5 +18,3 @@ UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" inherit autotools pkgconfig BBCLASSEXTEND = "native" - -CXXFLAGS += "-fuse-ld=gold" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libseccomp: import from meta-security
From: Mingli Yu Signed-off-by: Mingli Yu --- .../recipes-security/libseccomp/files/run-ptest| 4 +++ .../libseccomp/libseccomp_2.4.1.bb | 41 ++ 2 files changed, 45 insertions(+) create mode 100644 meta-oe/recipes-security/libseccomp/files/run-ptest create mode 100644 meta-oe/recipes-security/libseccomp/libseccomp_2.4.1.bb diff --git a/meta-oe/recipes-security/libseccomp/files/run-ptest b/meta-oe/recipes-security/libseccomp/files/run-ptest new file mode 100644 index 000..54b4a63 --- /dev/null +++ b/meta-oe/recipes-security/libseccomp/files/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh + +cd tests +./regression -a diff --git a/meta-oe/recipes-security/libseccomp/libseccomp_2.4.1.bb b/meta-oe/recipes-security/libseccomp/libseccomp_2.4.1.bb new file mode 100644 index 000..dba1be5 --- /dev/null +++ b/meta-oe/recipes-security/libseccomp/libseccomp_2.4.1.bb @@ -0,0 +1,41 @@ +SUMMARY = "interface to seccomp filtering mechanism" +DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." +SECTION = "security" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" + +SRCREV = "fb43972ea1aab24f2a70193fb7445c2674f594e3" + +SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.4 \ + file://run-ptest \ +" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig ptest + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = "--enable-python, --disable-python, python" + +do_compile_ptest() { +oe_runmake -C tests check-build +} + +do_install_ptest() { +install -d ${D}${PTEST_PATH}/tests +install -d ${D}${PTEST_PATH}/tools +for file in $(find tests/* -executable -type f); do +install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests +done +for file in $(find tests/*.tests -type f); do +install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests +done +for file in $(find tools/* -executable -type f); do +install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools +done +} + +FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*" +FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" + +RDEPENDS_${PN}-ptest = "bash" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-filesystems][PATCH] ostree: import from meta-overc
From: Mingli Yu Signed-off-by: Mingli Yu --- ...llow-updating-files-in-the-boot-directory.patch | 230 +++ ...reate-boot-symlink-based-on-relative-path.patch | 27 ++ ...ploy-using-etc-in-runtime-as-merge-source.patch | 41 +++ ...decrypt-password-of-remote-repository-uri.patch | 313 + ...the-issue-of-cannot-get-the-config-entrie.patch | 30 ++ ...only-deal-with-boot-efi-EFI-BOOT-grub.cfg.patch | 26 ++ ...re-boot-support-for-no-change-to-grub.cfg.patch | 96 +++ ...1-retrieve-correct-boot-prefix-at-runtime.patch | 26 ++ ...gex-of-ostree-system-generator-for-pulsar.patch | 52 ...oot-add-bootdir-to-the-generated-uEnv.txt.patch | 53 ...-add-non-default-for-bootdirs-to-uEnv.txt.patch | 28 ++ .../ostree/ostree_swap_bootentry_atomically.patch | 71 + .../recipes-support/ostree/ostree/sample.conf | 11 + .../recipes-support/ostree/ostree/system-export.sh | 39 +++ .../recipes-support/ostree/ostree/test.patch | 16 ++ .../recipes-support/ostree/ostree/tmp_fix.patch| 18 ++ .../ostree/ostree/using-bash-specifically.patch| 12 + .../recipes-support/ostree/ostree_git.bb | 124 18 files changed, 1213 insertions(+) create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0001-Allow-updating-files-in-the-boot-directory.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0001-create-boot-symlink-based-on-relative-path.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0001-deploy-using-etc-in-runtime-as-merge-source.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0001-encrypt-decrypt-password-of-remote-repository-uri.patch create mode 100755 meta-filesystems/recipes-support/ostree/ostree/0001-ostree-fix-the-issue-of-cannot-get-the-config-entrie.patch create mode 100755 meta-filesystems/recipes-support/ostree/ostree/0001-ostree-only-deal-with-boot-efi-EFI-BOOT-grub.cfg.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0001-ostree-secure-boot-support-for-no-change-to-grub.cfg.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0001-retrieve-correct-boot-prefix-at-runtime.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0001-tweak-regex-of-ostree-system-generator-for-pulsar.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0002-u-boot-add-bootdir-to-the-generated-uEnv.txt.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/0003-uboot-add-non-default-for-bootdirs-to-uEnv.txt.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/ostree_swap_bootentry_atomically.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/sample.conf create mode 100755 meta-filesystems/recipes-support/ostree/ostree/system-export.sh create mode 100644 meta-filesystems/recipes-support/ostree/ostree/test.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/tmp_fix.patch create mode 100644 meta-filesystems/recipes-support/ostree/ostree/using-bash-specifically.patch create mode 100755 meta-filesystems/recipes-support/ostree/ostree_git.bb diff --git a/meta-filesystems/recipes-support/ostree/ostree/0001-Allow-updating-files-in-the-boot-directory.patch b/meta-filesystems/recipes-support/ostree/ostree/0001-Allow-updating-files-in-the-boot-directory.patch new file mode 100644 index 000..006366c --- /dev/null +++ b/meta-filesystems/recipes-support/ostree/ostree/0001-Allow-updating-files-in-the-boot-directory.patch @@ -0,0 +1,230 @@ +From f4ffbffaebcd4dd2a4749fdd1c7139a04ac23189 Mon Sep 17 00:00:00 2001 +From: Gatis Paeglis +Date: Mon, 22 Aug 2016 11:32:16 +0200 +Subject: [PATCH 1/2] Allow updating files in the /boot directory + +This patch adds support for copying (or hardlinking on +single partition systems) all files from the deployment's +/usr/lib/ostree-boot directory to the relevant +/boot/ostree/$os-$bootcsum/ directory. This feature can +be enabled by 'touch .ostree-bootcsumdir-source' in +/usr/lib/ostree-boot. +--- + src/libostree/ostree-sysroot-deploy.c | 132 -- + tests/test-bootdir-update.sh | 37 + + 2 files changed, 162 insertions(+), 7 deletions(-) + create mode 100755 tests/test-bootdir-update.sh + +--- a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c +@@ -175,6 +175,43 @@ dirfd_copy_attributes_and_xattrs (int + return TRUE; + } + ++hardlink_or_copy_at (int src_dfd, ++ const char *src_subpath, ++ int dest_dfd, ++ const char *dest_subpath, ++ OstreeSysrootDebugFlags flags, ++ GCancellable *cancellable, ++ GError **error); ++hardlink_or_copy_at (int src_dfd, ++ const char *src_subpath, ++
[oe] [meta-oe][PATCH 2/4] makedumpfile: Upgrade to 1.6.6
From: Mingli Yu Rebase two patches. Signed-off-by: Mingli Yu --- ...makedumpfile-replace-hardcode-CFLAGS.patch | 41 ++- ...ort-only-46-bit-for-MAX_PHYSMEM_BITS.patch | 23 +++ ...umpfile_1.6.5.bb => makedumpfile_1.6.6.bb} | 4 +- 3 files changed, 38 insertions(+), 30 deletions(-) rename meta-oe/recipes-kernel/makedumpfile/{makedumpfile_1.6.5.bb => makedumpfile_1.6.6.bb} (92%) diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index a47806526..c0f82f321 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -1,4 +1,4 @@ -From 8eeb1b15608ce1a9a1f0d5417938fd6da4504406 Mon Sep 17 00:00:00 2001 +From af97e2ad643334b4c7c3d66f971ce9ebb2b596af Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 21 Jul 2016 18:06:21 +0800 Subject: [PATCH] makedumpfile: replace hardcode CFLAGS @@ -13,30 +13,28 @@ Subject: [PATCH] makedumpfile: replace hardcode CFLAGS Upstream-Status: Inappropriate[oe specific] Signed-off-by: Mingli Yu - --- - Makefile | 46 +++--- - 1 file changed, 23 insertions(+), 23 deletions(-) + Makefile | 45 +++-- + 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile -index 612b9d0..f6d6265 100644 +index 1fdb628..5dce589 100644 --- a/Makefile +++ b/Makefile -@@ -8,13 +8,6 @@ ifeq ($(strip $CC),) +@@ -8,12 +8,6 @@ ifeq ($(strip $CC),) CC= gcc endif --CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ ---D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ ---DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"' --CFLAGS_ARCH = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ -- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +-CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ +- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +-CFLAGS := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"' +-CFLAGS_ARCH := $(CFLAGS_BASE) -# LDFLAGS = -L/usr/local/lib -I/usr/local/include - HOST_ARCH := $(shell uname -m) # Use TARGET as the target architecture if specified. # Defaults to uname -m -@@ -22,29 +15,36 @@ ifeq ($(strip($TARGET)),) +@@ -21,29 +15,36 @@ ifeq ($(strip($TARGET)),) TARGET := $(HOST_ARCH) endif @@ -72,18 +70,18 @@ index 612b9d0..f6d6265 100644 endif +CFLAGS_ARCH += $(CFLAGS) \ -+ -D_FILE_OFFSET_BITS=64 \ -+ -D_LARGEFILE_SOURCE \ -+ -D_LARGEFILE64_SOURCE ++ -D_FILE_OFFSET_BITS=64 \ ++ -D_LARGEFILE_SOURCE \ ++ -D_LARGEFILE64_SOURCE + +CFLAGS_COMMON = $(CFLAGS_ARCH) \ -+ -DVERSION='"$(VERSION)"' \ -+ -DRELEASE_DATE='"$(DATE)"' ++ -DVERSION='"$(VERSION)"' \ ++ -DRELEASE_DATE='"$(DATE)"' + SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) -@@ -53,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) +@@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz ifneq ($(LINKTYPE), dynamic) @@ -104,7 +102,7 @@ index 612b9d0..f6d6265 100644 endif LIBS := -lpthread $(LIBS) -@@ -71,14 +71,14 @@ LIBS := -lpthread $(LIBS) +@@ -82,14 +83,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -121,7 +119,7 @@ index 612b9d0..f6d6265 100644 echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 mv temp.8 makedumpfile.8 -@@ -89,7 +89,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) +@@ -100,7 +101,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz eppic_makedumpfile.so: extension_eppic.c @@ -130,3 +128,6 @@ index 612b9d0..f6d6265 100644 clean: rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz +-- +2.21.0 + diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch index 156b4d57d..1707df3e3 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch +++
[oe] [meta-oe][PATCH 3/4] hwloc: Upgrade to 1.11.13
From: Mingli Yu Signed-off-by: Mingli Yu --- .../hwloc/{hwloc_1.11.12.bb => hwloc_1.11.13.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-extended/hwloc/{hwloc_1.11.12.bb => hwloc_1.11.13.bb} (89%) diff --git a/meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb b/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb similarity index 89% rename from meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb rename to meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb index 4f5b248c4..7231484fe 100644 --- a/meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb +++ b/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb @@ -8,8 +8,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" SRC_URI = "https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2; -SRC_URI[md5sum] = "c2a2e4e23eeb719ed31a755684697cf9" -SRC_URI[sha256sum] = "ddfb7b9b4571551165b0fd824a340e58814c8c2b4af64c818579d4bc695a417d" +SRC_URI[md5sum] = "3c792e23c209e9e1bafe9bdbc613d401" +SRC_URI[sha256sum] = "a4494b7765f517c0990d1c7f09d98cb87755bb6b841e4e2cbfebca1b14bac9c8" UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v1.11/; -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/4] crash: Upgrade to 7.2.6
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-kernel/crash/{crash_7.2.5.bb => crash_7.2.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-kernel/crash/{crash_7.2.5.bb => crash_7.2.6.bb} (98%) diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.5.bb b/meta-oe/recipes-kernel/crash/crash_7.2.6.bb similarity index 98% rename from meta-oe/recipes-kernel/crash/crash_7.2.5.bb rename to meta-oe/recipes-kernel/crash/crash_7.2.6.bb index e124db19c..a8bfe27da 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.2.5.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.2.6.bb @@ -26,7 +26,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git \ file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ " -SRCREV = "c0a2fc9d322cf0c5f569ce54e9201d2f586edb0c" +SRCREV = "4076ebea6626e3f0a20150602c6ffab999ea5c90" SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 4/4] iperf3: Upgrade to 3.7
From: Mingli Yu * Licence-Update: - Copyright years are updated to 2019 * Remove automake-foreign.patch as the logic included in the new version * Rebase 0002-Remove-pg-from-profile_CFLAGS.patch to new version Signed-off-by: Mingli Yu --- .../0002-Remove-pg-from-profile_CFLAGS.patch| 15 --- .../iperf3/iperf3/automake-foreign.patch| 17 - .../iperf3/{iperf3_3.6.bb => iperf3_3.7.bb} | 5 ++--- 3 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch rename meta-oe/recipes-benchmark/iperf3/{iperf3_3.6.bb => iperf3_3.7.bb} (84%) diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch index 06eb41ac0..959e29389 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch @@ -1,31 +1,32 @@ -From 6db0e28f906bc3784019dfb5bb011237a8034fda Mon Sep 17 00:00:00 2001 +From 3ae408402635ea21ad90cd722c99ae3334376c91 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 14 Jul 2017 13:00:16 -0700 -Subject: [PATCH 2/2] Remove -pg from profile_CFLAGS +Subject: [PATCH] Remove -pg from profile_CFLAGS musl fails to link with missing gcrt1.o Signed-off-by: Khem Raj +Signed-off-by: Mingli Yu --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 23b0c72..6268145 100644 +index 5be8562..3881aa6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g +@@ -58,9 +58,9 @@ if ENABLE_PROFILING iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) + $(libiperf_la_SOURCES) -iperf3_profile_CFLAGS = -pg -g +iperf3_profile_CFLAGS = -g iperf3_profile_LDADD= libiperf.la -iperf3_profile_LDFLAGS = -pg -g +iperf3_profile_LDFLAGS = -g + endif # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c -- -2.13.3 +2.21.0 diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch deleted file mode 100644 index 06c394e5c..0 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch +++ /dev/null @@ -1,17 +0,0 @@ -Pass the 'foreign' option to automake to enable iperf3 to build. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Chunrong Guo - a/configure.ac 2015-10-19 02:49:30.471867352 -0500 -+++ b/configure.ac 2015-10-19 02:46:36.207873572 -0500 -@@ -33,7 +33,7 @@ - - - # Initialize the automake system --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(src/iperf_config.h) - diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb similarity index 84% rename from meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb rename to meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb index 4e11d8233..6686a814f 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb @@ -9,16 +9,15 @@ SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues; AUTHOR = "ESNET , Lawrence Berkeley National Laboratory " LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a9a036136b748453e839c0eb8906ef2e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9088fe7ffdccd042f7645f1012d7f70" DEPENDS = "openssl" SRC_URI = "git://github.com/esnet/iperf.git \ - file://automake-foreign.patch \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ " -SRCREV = "88f3ad87f38762081a6d7127890ff5c3a052b06a" +SRCREV = "dfcea9f6a09ead01089a3c9d20c7032f2c0af2c1" S = "${WORKDIR}/git" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] log4cplus: Upgrade to 2.0.4
From: Mingli Yu Signed-off-by: Mingli Yu --- .../log4cplus/{log4cplus_2.0.3.bb => log4cplus_2.0.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-devtools/log4cplus/{log4cplus_2.0.3.bb => log4cplus_2.0.4.bb} (81%) diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.3.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb similarity index 81% rename from meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.3.bb rename to meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb index 56c62f1f2..d86521aba 100644 --- a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.3.bb +++ b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb @@ -7,8 +7,8 @@ LICENSE = "Apache-2.0 & BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "20a87090cd8ec34ea11b3e59954234cb" -SRC_URI[sha256sum] = "2d8f627aa6417e6c6a100bc09dc407684ca4605c929defc1690ee7d6a575ce6a" +SRC_URI[md5sum] = "2b5b7bc294698bf30a315a259ef9eec2" +SRC_URI[sha256sum] = "196eedbc7f2dd792dae721b1159c7ac132255bb368226353c24d4d5fa7c7797a" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/; UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] fio: Upgrade to 3.15
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-benchmark/fio/{fio_3.12.bb => fio_3.15.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-benchmark/fio/{fio_3.12.bb => fio_3.15.bb} (96%) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.12.bb b/meta-oe/recipes-benchmark/fio/fio_3.15.bb similarity index 96% rename from meta-oe/recipes-benchmark/fio/fio_3.12.bb rename to meta-oe/recipes-benchmark/fio/fio_3.15.bb index e85e7c709..c44075cdb 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.12.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.15.bb @@ -22,7 +22,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" # rev for v3.8 -SRCREV = "16500b5a0b03ee0142d592bb74a46943a223b06e" +SRCREV = "01bf5128d0581e267383f280c6a1dcd26517240f" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ " -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH] python-lxml: replace -Og with -O for mips64-32
From: Mingli Yu With below logic in local.conf: MACHINE ??= "qemumips64" MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" require conf/multilib.conf DEBUG_BUILD = "1" $ bitbake lib32-python-lxml [snip] | {standard input}: Assembler messages: | {standard input}:1488805: Error: branch out of range | Compile failed: command 'mips-pokymllib32-linux-gcc' failed with exit status 1 | creating tmp | cc -I/yocto/builds//tmp/work/mips-pokymllib32-linux/lib32-python-lxml/4.3.4-r0/lib32-recipe-sysroot/usr/include/libxml2 -I/usr/include/libxml2 -c /tmp/xmlXPathInitPZiWuM.c -o tmp/xmlXPathInitPZiWuM.o | unable to execute 'cc': No such file or directory [snip] When DEBUG_BUILD enabled, -Og pass to compiler, replace -Og with -O to fix the above compile error. Signed-off-by: Mingli Yu --- meta-python/recipes-devtools/python/python-lxml.inc | 12 1 file changed, 12 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-lxml.inc b/meta-python/recipes-devtools/python/python-lxml.inc index d67c17883..dd73a412b 100644 --- a/meta-python/recipes-devtools/python/python-lxml.inc +++ b/meta-python/recipes-devtools/python/python-lxml.inc @@ -33,6 +33,18 @@ DISTUTILS_INSTALL_ARGS += " \ inherit pypi +# {standard input}: Assembler messages: +# {standard input}:1488805: Error: branch out of range +DEBUG_OPTIMIZATION_remove_mips = " -Og" +DEBUG_OPTIMIZATION_append_mips = " -O" +BUILD_OPTIMIZATION_remove_mips = " -Og" +BUILD_OPTIMIZATION_append_mips = " -O" + +DEBUG_OPTIMIZATION_remove_mipsel = " -Og" +DEBUG_OPTIMIZATION_append_mipsel = " -O" +BUILD_OPTIMIZATION_remove_mipsel = " -Og" +BUILD_OPTIMIZATION_append_mipsel = " -O" + do_configure_prepend() { sed -i -e 's/--version/--modversion/' ${B}/setupinfo.py } -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mozjs: Fix do_patch error for mips64-n32
From: Mingli Yu After mozjs upgrade to 60.5.2 in below commit: 9ca3aad9c mozjs: Upgrade to version 60.x With below logic in local.conf: MACHINE ??= "qemumips64" MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" require conf/multilib.conf $ bitbake libn32-mozjs -cpatch | NOTE: Applying patch '0001-fix-compiling-failure-on-mips64-n32-bsp.patch' (../layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch) | ERROR: Command Error: 'quilt --quiltrc TOPDIR/tmp/work/mips64-n32-wrsmllibn32-linux-gnun32/libn32-mozjs/60.5.2-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: | Applying patch 0001-fix-compiling-failure-on-mips64-n32-bsp.patch | patching file build/moz.configure/init.configure | patching file js/src/jit/mips-shared/Architecture-mips-shared.h | Hunk #1 succeeded at 28 with fuzz 2 (offset 2 lines). | Hunk #2 FAILED at 95. | 1 out of 2 hunks FAILED -- rejects in file js/src/jit/mips-shared/Architecture-mips-shared.h | patching file python/mozbuild/mozbuild/configure/constants.py | Patch 0001-fix-compiling-failure-on-mips64-n32-bsp.patch does not apply (enforce with -f) Rework 0001-fix-compiling-failure-on-mips64-n32-bsp.patch to fix the above do_patch error. Signed-off-by: Mingli Yu --- ...1-fix-compiling-failure-on-mips64-n32-bsp.patch | 36 ++ 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch index a36478b..b882d76 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch @@ -1,6 +1,6 @@ -From 5ad700c92224193bfc789f7d53af38fc6f8b8904 Mon Sep 17 00:00:00 2001 +From f2f8be496c8e34b4d909b688a95c6f8565201081 Mon Sep 17 00:00:00 2001 From: Hongxu Jia -Date: Thu, 19 Jul 2018 17:31:35 +0800 +Date: Wed, 19 Jun 2019 14:30:44 +0800 Subject: [PATCH] fix compiling failure on mips64-n32 bsp - Tweak mips64-n32 with mips32 @@ -16,15 +16,18 @@ Subject: [PATCH] fix compiling failure on mips64-n32 bsp Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia +Signed-off-by: Mingli Yu --- build/moz.configure/init.configure| 5 - js/src/jit/mips-shared/Architecture-mips-shared.h | 4 +++- python/mozbuild/mozbuild/configure/constants.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 648ac2d..d0bcaf8 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -650,7 +650,10 @@ def split_triplet(triplet, allow_unknown +@@ -650,7 +650,10 @@ def split_triplet(triplet, allow_unknown=False): canonical_cpu = 'mips32' endianness = 'little' if 'el' in cpu else 'big' elif cpu in ('mips64', 'mips64el'): @@ -36,26 +39,30 @@ Signed-off-by: Hongxu Jia endianness = 'little' if 'el' in cpu else 'big' elif cpu.startswith('aarch64'): canonical_cpu = 'aarch64' +diff --git a/js/src/jit/mips-shared/Architecture-mips-shared.h b/js/src/jit/mips-shared/Architecture-mips-shared.h +index e95ffd4..caf83f7 100644 --- a/js/src/jit/mips-shared/Architecture-mips-shared.h +++ b/js/src/jit/mips-shared/Architecture-mips-shared.h -@@ -26,6 +26,8 @@ - #define USES_O32_ABI - #elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || defined(JS_SIMULATOR_MIPS64) +@@ -28,6 +28,8 @@ + #elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || \ + defined(JS_SIMULATOR_MIPS64) #define USES_N64_ABI +#elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABIN32)) +#define USES_N32_ABI #else #error "Unsupported ABI" #endif -@@ -93,7 +95,7 @@ class Registers - ta1 = t5, - ta2 = t6, - ta3 = t7, +@@ -94,7 +96,7 @@ class Registers { + ta1 = t5, + ta2 = t6, + ta3 = t7, -#elif defined(USES_N64_ABI) +#elif defined(USES_N64_ABI) || defined(USES_N32_ABI) - a4 = r8, - a5 = r9, - a6 = r10, + a4 = r8, + a5 = r9, + a6 = r10, +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index 1067b6a..e0f0405 100644 --- a/python/mozbuild/mozbuild/configure/constants.py +++ b/python/mozbuild/mozbuild/configure/constants.py @@ -90,8 +90,8 @@ CPU_preprocessor_checks = OrderedDict(( @@ -68,3 +75,6 @@ Signed-off-by: Hongxu Jia ('sh4', '__sh__'), )) +-- +2.7.4 + -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org
[oe] [meta-oe][PATCH] mariadb: Upgrade to 10.3.16
From: Mingli Yu License-Update: The address of Free Software Foundation updated Bug fixes: MDEV-19490: show tables fails when selecting the information_schema database MDEV-19541: InnoDB crashes when trying to recover a corrupted page More details check: https://jira.mariadb.org/browse/MDEV-19490 https://jira.mariadb.org/browse/MDEV-19541 Signed-off-by: Mingli Yu --- ...ariadb-native_10.3.15.bb => mariadb-native_10.3.16.bb} | 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 8 .../mysql/{mariadb_10.3.15.bb => mariadb_10.3.16.bb} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.3.15.bb => mariadb-native_10.3.16.bb} (100%) rename meta-oe/recipes-dbs/mysql/{mariadb_10.3.15.bb => mariadb_10.3.16.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.15.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.3.15.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index eed23d28a..9a398b308 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -2,9 +2,9 @@ SUMMARY = "A robust, scalable, and reliable SQL server" HOMEPAGE = "http://mariadb.org; SECTION = "libs" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LIC_FILES_CHKSUM = "file://COPYING;md5=b1becf0cfa3366e0f4d854d1d264f311" -SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN}-${PV}.tar.gz \ +SRC_URI = "https://downloads.mariadb.com/MariaDB/${BPN}-${PV}/source/${BPN}-${PV}.tar.gz \ file://my.cnf \ file://mysqld.service \ file://install_db.service \ @@ -19,8 +19,8 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN} file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ " -SRC_URI[md5sum] = "08edd8b5060a181e6dd3c6aac23218cd" -SRC_URI[sha256sum] = "27f391a54d544f93850d4edfb3ef1b4cf24f8e27e61e51727b0e7d31bb4d6968" +SRC_URI[md5sum] = "11220d0b94c5c24caa2e1e9eaba38e31" +SRC_URI[sha256sum] = "39e9723eaf620afd99b0925b2c2a5a50a89110ba50040adf14cce7cf89e5e21b" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases; diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.3.15.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.3.15.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] kea: replace -Og with -O
From: Mingli Yu With below logic in local.conf: MACHINE ??= "qemumips64" MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" require conf/multilib.conf DEBUG_BUILD = "1" $ bitbake lib32-kea [snip] {standard input}: Assembler messages: {standard input}:305030: Error: branch out of range {standard input}:305041: Error: branch out of range {standard input}:305432: Error: branch out of range {standard input}:305443: Error: branch out of range Makefile:707: recipe for target 'dhcp4_parser.lo' failed make[6]: *** [dhcp4_parser.lo] Error 1 [snip] When DEBUG_BUILD enabled, -Og pass to compiler, replace -Og with -O to fix the above compile error. Signed-off-by: Mingli Yu --- meta-networking/recipes-connectivity/kea/kea_1.5.0.bb | 10 ++ 1 file changed, 10 insertions(+) diff --git a/meta-networking/recipes-connectivity/kea/kea_1.5.0.bb b/meta-networking/recipes-connectivity/kea/kea_1.5.0.bb index 9210ac1bc..fb166df60 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.5.0.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.5.0.bb @@ -23,6 +23,16 @@ inherit autotools systemd SYSTEMD_SERVICE_${PN} = "kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service" SYSTEMD_AUTO_ENABLE = "disable" +DEBUG_OPTIMIZATION_remove_mips = " -Og" +DEBUG_OPTIMIZATION_append_mips = " -O" +BUILD_OPTIMIZATION_remove_mips = " -Og" +BUILD_OPTIMIZATION_append_mips = " -O" + +DEBUG_OPTIMIZATION_remove_mipsel = " -Og" +DEBUG_OPTIMIZATION_append_mipsel = " -O" +BUILD_OPTIMIZATION_remove_mipsel = " -Og" +BUILD_OPTIMIZATION_append_mipsel = " -O" + do_configure_prepend_class-target() { mkdir -p ${B}/src/lib/log/compiler/ ln -sf ${STAGING_BINDIR_NATIVE}/kea-msg-compiler ${B}/src/lib/log/compiler/kea-msg-compiler -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] hwloc: Upgrade to 1.11.12
From: Mingli Yu Signed-off-by: Mingli Yu --- .../hwloc/{hwloc_1.11.10.bb => hwloc_1.11.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-extended/hwloc/{hwloc_1.11.10.bb => hwloc_1.11.12.bb} (89%) diff --git a/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb b/meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb similarity index 89% rename from meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb rename to meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb index 5f4155ea5..4f5b248c4 100644 --- a/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb +++ b/meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb @@ -8,8 +8,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" SRC_URI = "https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2; -SRC_URI[md5sum] = "0981a01935982aa7e850a96e0c3057b0" -SRC_URI[sha256sum] = "2be808383d8337846fe77ce49c7ad3336fb6857505494d85c0ac03f22c5bd1e7" +SRC_URI[md5sum] = "c2a2e4e23eeb719ed31a755684697cf9" +SRC_URI[sha256sum] = "ddfb7b9b4571551165b0fd824a340e58814c8c2b4af64c818579d4bc695a417d" UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v1.11/; -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2] kea: Upgrade to 1.5.0
From: Mingli Yu * License-Update: below text added The ext/coroutine code is externally maintained and distributed under the Boost Software License, Version 1.0. (See its accompanying file LICENSE_1_0.txt.) * There is a new added logic in 1.5.0 to use AC_TRY_RUN to detect usable C++11 regex in below commit: 39ab2f5d15 [5680] Added sanitizeString() function to libutil Use AC_COMPILE_IFELSE instead to fix below do_configure error: | checking for usuable C++11 regex... configure: error: in '/builddir/upgrade1/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build': | configure: error: cannot run test program while cross compiling * Remove 0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch as the logic is already included in 1.5.0. Signed-off-by: Mingli Yu --- ...-of-overloaded-distance-is-ambiguous.patch | 89 --- .../kea/files/0001-remove-AC_TRY_RUN.patch| 34 +++ .../kea/{kea_1.4.0.bb => kea_1.5.0.bb}| 8 +- 3 files changed, 38 insertions(+), 93 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch create mode 100644 meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch rename meta-networking/recipes-connectivity/kea/{kea_1.4.0.bb => kea_1.5.0.bb} (86%) diff --git a/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch b/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch deleted file mode 100644 index fb16ecbf9..0 --- a/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 8ea2ee451a1af7c5b5c8f4b36c1f77d2064d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Sep 2018 13:02:35 -0700 -Subject: [PATCH] Fix error: call of overloaded distance is ambiguous -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The boost::iterators::distance function template is an adapted version -of std::distance for the Boost iterator traversal in 2.68 it has started -to fail with argument dependent lookup and compiler is erroring out - -with - -error: call of overloaded ‘distance' - -boost implementation of distance is protected against being found by ADL - -The way function is called in libdhcp means it will be found via ADL and -all namespaces will be considered which is providing problematic since -its getting it from both std:: and boost:: namespaces - -so let it not rely on ADL by qualifying then calls with std:: namespace - -Upstream-Status: Submitted [https://github.com/isc-projects/kea/pull/103] -Signed-off-by: Khem Raj - src/lib/dhcp/libdhcp++.cc | 12 ++-- - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc -index 330c02b..ced705d 100644 a/src/lib/dhcp/libdhcp++.cc -+++ b/src/lib/dhcp/libdhcp++.cc -@@ -419,14 +419,14 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf, - // We previously did the lookup only for dhcp6 option space, but with the - // addition of S46 options, we now do it for every space. - range = idx.equal_range(opt_type); --num_defs = distance(range.first, range.second); -+num_defs = std::distance(range.first, range.second); - - // Standard option definitions do not include the definition for - // our option or we're searching for non-standard option. Try to - // find the definition among runtime option definitions. - if (num_defs == 0) { - range = runtime_idx.equal_range(opt_type); --num_defs = distance(range.first, range.second); -+num_defs = std::distance(range.first, range.second); - } - - OptionPtr opt; -@@ -538,14 +538,14 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf, - // may be standard options in other spaces (e.g. radius). So we now do - // the lookup for every space. - range = idx.equal_range(opt_type); --num_defs = distance(range.first, range.second); -+num_defs = std::distance(range.first, range.second); - - // Standard option definitions do not include the definition for - // our option or we're searching for non-standard option. Try to - // find the definition among runtime option definitions. - if (num_defs == 0) { - range = runtime_idx.equal_range(opt_type); --num_defs = distance(range.first, range.second); -+num_defs = std::distance(range.first, range.second); - } - - // Check if option unpacking must be deferred -@@ -638,7 +638,7 @@ size_t LibDHCP::unpackVendorOptions6(const uint32_t vendor_id, - idx->equal_range(opt_type); - // Get the number of returned
[oe] [meta-networking][PATCH] kea: Upgrade to 1.5.0
From: Mingli Yu * License-Update: below text added The ext/coroutine code is externally maintained and distributed under the Boost Software License, Version 1.0. (See its accompanying file LICENSE_1_0.txt.) * There is a new added logic in 1.5.0 to use AC_TRY_RUN to detect usable C++11 regex in below commit: 39ab2f5d15 [5680] Added sanitizeString() function to libutil Use AC_COMPILE_IFELSE instead to fix below do_configure error: | checking for usuable C++11 regex... configure: error: in '/builddir/upgrade1/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build': | configure: error: cannot run test program while cross compiling Signed-off-by: Mingli Yu --- .../kea/files/0001-remove-AC_TRY_RUN.patch| 34 +++ .../kea/{kea_1.4.0.bb => kea_1.5.0.bb}| 8 ++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch rename meta-networking/recipes-connectivity/kea/{kea_1.4.0.bb => kea_1.5.0.bb} (86%) diff --git a/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch b/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch new file mode 100644 index 0..d7ca9ff8f --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch @@ -0,0 +1,34 @@ +From 9d6b8321c5b46199baca907f3d42bdcaaf1958a8 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 23 May 2019 23:59:42 -0700 +Subject: [PATCH] remove AC_TRY_RUN + +AC_TRY_RUN doesn't work in cross compile env, +use AC_COMPILE_IFELSE instead to fix below configure +error: + | checking for usuable C++11 regex... configure: error: in `/builddir/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build': + | configure: error: cannot run test program while cross compiling + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c880b77..dd40c7c 100644 +--- a/configure.ac b/configure.ac +@@ -580,7 +580,7 @@ AC_TRY_COMPILE([ + AC_MSG_RESULT(no)) + + AC_MSG_CHECKING(for usuable C++11 regex) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([ + #include + #include + int main() { +-- +2.21.0 + diff --git a/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb b/meta-networking/recipes-connectivity/kea/kea_1.5.0.bb similarity index 86% rename from meta-networking/recipes-connectivity/kea/kea_1.4.0.bb rename to meta-networking/recipes-connectivity/kea/kea_1.5.0.bb index 67de07b31..9210ac1bc 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.5.0.bb @@ -3,20 +3,20 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org; SECTION = "connectivity" LICENSE = "MPL-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=1666a9c4bb55adbc8939d85643096bd3" +LIC_FILES_CHKSUM = "file://COPYING;md5=2ed44ce4e0bbfdc1abfa6bf949b7ba3a" DEPENDS += "kea-native" SRC_URI = "\ http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://0003-Makefile.am-update-hooksdir-for-lease_cmds.patch \ -file://0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch \ +file://0001-remove-AC_TRY_RUN.patch \ file://kea-dhcp4.service \ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \ " -SRC_URI[md5sum] = "26eedd749101642757d788431605aaa5" -SRC_URI[sha256sum] = "c0f8ecb93657adfc5ab970c91706754e601084828493f053f159661d21b31128" +SRC_URI[md5sum] = "591d38e5fcc0251a8812e8bb1337578a" +SRC_URI[sha256sum] = "edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec" inherit autotools systemd -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mariadb: Upgrade to 10.3.15
From: Mingli Yu Fixes for the following security vulnerabilities: CVE-2019-2614 CVE-2019-2627 CVE-2019-2628 Signed-off-by: Mingli Yu --- .../{mariadb-native_10.3.13.bb => mariadb-native_10.3.15.bb} | 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 4 ++-- .../mysql/{mariadb_10.3.13.bb => mariadb_10.3.15.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.3.13.bb => mariadb-native_10.3.15.bb} (100%) rename meta-oe/recipes-dbs/mysql/{mariadb_10.3.13.bb => mariadb_10.3.15.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.13.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.15.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.3.13.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.3.15.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index fca74d448..eed23d28a 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,8 +19,8 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN} file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ " -SRC_URI[md5sum] = "603ce42e35b9a688f2cca05275acb5cb" -SRC_URI[sha256sum] = "b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a" +SRC_URI[md5sum] = "08edd8b5060a181e6dd3c6aac23218cd" +SRC_URI[sha256sum] = "27f391a54d544f93850d4edfb3ef1b4cf24f8e27e61e51727b0e7d31bb4d6968" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases; diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.3.13.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.3.15.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.3.13.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.3.15.bb -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH v2 2/2] libdbd-mysql-perl: Upgrade to 4.050
From: Mingli Yu Update homepage and make SRC_URI to fetch from git. Remove one backported patch. Add libdev-checklib-perl-native to DEPENDS as the new libdbd-mysql-perl depends on another module (Devel::CheckLib) at configure time. Signed-off-by: Mingli Yu --- .../0001-Use-API-function-for-reconnect.patch | 53 --- ...rl_4.043.bb => libdbd-mysql-perl_4.050.bb} | 14 ++--- 2 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch rename meta-oe/recipes-devtools/perl/{libdbd-mysql-perl_4.043.bb => libdbd-mysql-perl_4.050.bb} (57%) diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch deleted file mode 100644 index 60d88c3d1..0 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch +++ /dev/null @@ -1,53 +0,0 @@ -From edb6b202b7e233864aa5dd84532646c50097b0b8 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 4 Mar 2019 00:49:17 -0800 -Subject: [PATCH] Use API function for reconnect - -For configuring reconnect functionality use standard API function -MYSQL_OPT_RECONNECT instead of direct modification of internal structures -which does not work for MariaDB. Fixes compilation with MariaDB 10.2.6+. - -Upstream-Status: Backport [https://github.com/perl5-dbi/DBD-mysql/commit/0b1884f4153d3de0a91bae4d3b3cc1771ffdf4f3] - -Signed-off-by: Mingli Yu - dbdimp.c | 16 ++-- - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/dbdimp.c b/dbdimp.c -index 9b8b313..3bed213 100644 a/dbdimp.c -+++ b/dbdimp.c -@@ -1979,6 +1979,16 @@ MYSQL *mysql_dr_connect( - - if (result) - { -+ /* -+we turn off Mysql's auto reconnect and handle re-connecting ourselves -+so that we can keep track of when this happens. -+ */ -+#if MYSQL_VERSION_ID >= 50013 -+ my_bool reconnect = FALSE; -+ mysql_options(result, MYSQL_OPT_RECONNECT, ); -+#else -+ result->reconnect = 0; -+#endif - #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION - /* connection succeeded. */ - /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs -@@ -1992,12 +2002,6 @@ MYSQL *mysql_dr_connect( - imp_dbh->async_query_in_flight = NULL; - } - #endif -- -- /* --we turn off Mysql's auto reconnect and handle re-connecting ourselves --so that we can keep track of when this happens. -- */ -- result->reconnect=0; - } - else { - /* --- -2.17.1 - diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb similarity index 57% rename from meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb rename to meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb index e185f48f7..049dc665d 100644 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb @@ -6,21 +6,17 @@ with the MySQL relational database management system. Most functions \ provided by this programming API are supported. Some rarely used \ functions are missing, mainly because no-one ever requested them. \ " -HOMEPAGE = "http://search.cpan.org/~michielb/DBD-mysql-4.036/lib/DBD/mysql.pm; +HOMEPAGE = "https://github.com/perl5-dbi/DBD-mysql; SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" -DEPENDS += "libdbi-perl-native libmysqlclient" +DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient" LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" -SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${PV}.tar.gz \ - file://0001-Use-API-function-for-reconnect.patch \ -" - -SRC_URI[md5sum] = "4a00dd7f1c057931147c65dfc4901c36" -SRC_URI[sha256sum] = "629f865e8317f52602b2f2efd2b688002903d2e4bbcba5427cb6188b043d6f99" +SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" +SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https" -S = "${WORKDIR}/DBD-mysql-${PV}" +S = "${WORKDIR}/git" inherit cpan -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH v2 1/2] libdev-checklib-perl: add new recipe
From: Mingli Yu It provides the perl module (Devel::CheckLib) which may needed by other package which uses it to check libs. Signed-off-by: Mingli Yu --- ...CheckLib.pm-don-t-execute-the-binary.patch | 46 +++ .../perl/libdev-checklib-perl_1.13.bb | 21 + 2 files changed, 67 insertions(+) create mode 100644 meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch create mode 100644 meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch b/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch new file mode 100644 index 0..78a7e63b9 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch @@ -0,0 +1,46 @@ +From d111fd85b25466f7829ccee34493aa0e3b551308 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Tue, 23 Apr 2019 19:13:19 -0700 +Subject: [PATCH] CheckLib.pm: don't execute the binary + +Don't execute the binary in build env as the +binary which is generated in cross compile env +may fail when executed in build env. + +And it's enough to verify the libs via successully +generate the binary which links the libs as below. + $ /yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc \ + -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security \ + -Werror=format-security --sysroot=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot \ + -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/perl/5.28.1-r1=/usr/src/debug/perl/5.28.1-r1 \ + -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/perl/5.28.1-r1=/usr/src/debug/perl/5.28.1-r1 \ + -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot= -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot-native= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 assertlibEhx19yuY.c -L/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot/usr/lib -lcrypto -fstack-protector-strong -o assertlibCOw_eujb + +Execute the binary in cross compile env as below +and use the return status to determine the lib's +checking status is not appropriate in cross compile env. + $ /yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/git/assertlibCOw_eujb + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Mingli Yu +--- + lib/Devel/CheckLib.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Devel/CheckLib.pm b/lib/Devel/CheckLib.pm +index e45cfb4..d228bb5 100644 +--- a/lib/Devel/CheckLib.pm b/lib/Devel/CheckLib.pm +@@ -424,7 +424,7 @@ sub assert_lib { + my $absexefile = File::Spec->rel2abs($exefile); + $absexefile = '"'.$absexefile.'"' if $absexefile =~ m/\s/; + if (!$not_execute && system($absexefile) != 0) { +-push @wrongresult, $lib; ++print "Checking the lib $lib\n"; + } + else { + if ($analyze_binary) { +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb new file mode 100644 index 0..f5bdb2087 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb @@ -0,0 +1,21 @@ +SUMMARY = "A Perl module that checks whether a particular C library and its headers are available" +DESCRIPTION = "This module provides a way of checking whether a particular library \ +and its headers are available, by attempting to compile a simple program and \ +link against it." +HOMEPAGE = "https://metacpan.org/pod/Devel::CheckLib; +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://README;md5=7911cdbb572d25c5f2e2ea17f669efc2" + +SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV}.tar.gz \ + file://0001-CheckLib.pm-don-t-execute-the-binary.patch \ +" +SRC_URI[md5sum] = "930216c5abc0f016df8a7539d48c891a" +SRC_URI[sha256sum] = "24adfd908705dfac4bb320711763f37126b75cf54b3566c2c27c7cdef9c429a8" + +S = "${WORKDIR}/Devel-CheckLib-${PV}" + +inherit cpan + +BBCLASSEXTEND="native" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] rrdtool: Upgrade to 1.7.1
From: Mingli Yu Backport 3 patches to fix below error: ERROR: rrdtool-1.7.1-r0 do_package: SYSTEMD_SERVICE_rrdcached value rrdcached.socket does not exist Signed-off-by: Mingli Yu --- ...rrdcached-default-lsb.in-to-tarball-.patch | 45 + ...-files-via-EXTRA_DIST-fixes-956-some.patch | 93 +++ ...-to-make-target-etc-rrdcached.socket.patch | 51 ++ .../{rrdtool_1.7.0.bb => rrdtool_1.7.1.bb}| 7 +- 4 files changed, 194 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch create mode 100644 meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch create mode 100644 meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch rename meta-oe/recipes-extended/rrdtool/{rrdtool_1.7.0.bb => rrdtool_1.7.1.bb} (93%) diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch new file mode 100644 index 0..701ab2c5b --- /dev/null +++ b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch @@ -0,0 +1,45 @@ +From 35aae13a34728e14150706b2a4b1a57fabe00e98 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker +Date: Mon, 4 Feb 2019 16:25:06 +0100 +Subject: [PATCH 1/3] add missing etc/rrdcached-default-lsb.in to tarball - + fixes #956 + +Add missing etc/rrdcached-default-lsb.in to tarball - fixes #956 + +Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/35aae13a34728e14150706b2a4b1a57fabe00e98] + +Signed-off-by: Mingli Yu +--- + Makefile.am | 2 +- + Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5a15db6c..6bec092e 100644 +--- a/Makefile.am b/Makefile.am +@@ -20,7 +20,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ + rrdtool.spec favicon.ico bootstrap \ + libtool \ + m4/snprintf.m4 \ +- etc/rrdcached-default-redhat etc/rrdcached-init-redhat \ ++ etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \ + win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ + win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ + win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \ +diff --git a/Makefile.in b/Makefile.in +index 607193c1..c9b1939f 100644 +--- a/Makefile.in b/Makefile.in +@@ -432,7 +432,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ + rrdtool.spec favicon.ico bootstrap \ + libtool \ + m4/snprintf.m4 \ +- etc/rrdcached-default-redhat etc/rrdcached-init-redhat \ ++ etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \ + win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ + win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ + win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \ +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch new file mode 100644 index 0..0385ae6d6 --- /dev/null +++ b/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch @@ -0,0 +1,93 @@ +From 3e469b4c4b5c219469b0be299ce75c4fac09afc9 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker +Date: Mon, 4 Feb 2019 17:17:25 +0100 +Subject: [PATCH 2/3] properly add etc files via EXTRA_DIST - fixes #956 some more + +Add etc files via EXTRA_DIST - fixes #956 some more + +Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/3e469b4c4b5c219469b0be299ce75c4fac09afc9] + +Signed-off-by: Mingli Yu +--- + Makefile.am | 3 +-- + Makefile.in | 5 ++--- + etc/Makefile.am | 3 +++ + etc/Makefile.in | 3 +++ + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 6bec092e..c3e2c303 100644 +--- a/Makefile.am b/Makefile.am +@@ -5,7 +5,7 @@ RSYNC = rsync --rsh=ssh + + # build the following subdirectories + +-SUBDIRS = po src bindings tests ++SUBDIRS = po src bindings tests etc + + if BUILD_DOCS + SUBDIRS += doc +@@ -20,7 +20,6 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ + rrdtool.spec favicon.ico bootstrap \ + libtool \ + m4/snprintf.m4 \ +-
[oe] [meta-oe][PATCH 2/2] libdbd-mysql-perl: Upgrade to 4.050
From: Mingli Yu Update homepage and make SRC_URI to fetch from git. Remove one backported patch. Add libdev-checklib-perl-native to DEPENDS as the new libdbd-mysql-perl depends on another module (Devel::CheckLib) at configure time. Signed-off-by: Mingli Yu --- .../0001-Use-API-function-for-reconnect.patch | 53 --- ...rl_4.043.bb => libdbd-mysql-perl_4.050.bb} | 14 ++--- 2 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch rename meta-oe/recipes-devtools/perl/{libdbd-mysql-perl_4.043.bb => libdbd-mysql-perl_4.050.bb} (57%) diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch deleted file mode 100644 index 60d88c3d1..0 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch +++ /dev/null @@ -1,53 +0,0 @@ -From edb6b202b7e233864aa5dd84532646c50097b0b8 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 4 Mar 2019 00:49:17 -0800 -Subject: [PATCH] Use API function for reconnect - -For configuring reconnect functionality use standard API function -MYSQL_OPT_RECONNECT instead of direct modification of internal structures -which does not work for MariaDB. Fixes compilation with MariaDB 10.2.6+. - -Upstream-Status: Backport [https://github.com/perl5-dbi/DBD-mysql/commit/0b1884f4153d3de0a91bae4d3b3cc1771ffdf4f3] - -Signed-off-by: Mingli Yu - dbdimp.c | 16 ++-- - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/dbdimp.c b/dbdimp.c -index 9b8b313..3bed213 100644 a/dbdimp.c -+++ b/dbdimp.c -@@ -1979,6 +1979,16 @@ MYSQL *mysql_dr_connect( - - if (result) - { -+ /* -+we turn off Mysql's auto reconnect and handle re-connecting ourselves -+so that we can keep track of when this happens. -+ */ -+#if MYSQL_VERSION_ID >= 50013 -+ my_bool reconnect = FALSE; -+ mysql_options(result, MYSQL_OPT_RECONNECT, ); -+#else -+ result->reconnect = 0; -+#endif - #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION - /* connection succeeded. */ - /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs -@@ -1992,12 +2002,6 @@ MYSQL *mysql_dr_connect( - imp_dbh->async_query_in_flight = NULL; - } - #endif -- -- /* --we turn off Mysql's auto reconnect and handle re-connecting ourselves --so that we can keep track of when this happens. -- */ -- result->reconnect=0; - } - else { - /* --- -2.17.1 - diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb similarity index 57% rename from meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb rename to meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb index e185f48f7..049dc665d 100644 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb @@ -6,21 +6,17 @@ with the MySQL relational database management system. Most functions \ provided by this programming API are supported. Some rarely used \ functions are missing, mainly because no-one ever requested them. \ " -HOMEPAGE = "http://search.cpan.org/~michielb/DBD-mysql-4.036/lib/DBD/mysql.pm; +HOMEPAGE = "https://github.com/perl5-dbi/DBD-mysql; SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" -DEPENDS += "libdbi-perl-native libmysqlclient" +DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient" LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" -SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${PV}.tar.gz \ - file://0001-Use-API-function-for-reconnect.patch \ -" - -SRC_URI[md5sum] = "4a00dd7f1c057931147c65dfc4901c36" -SRC_URI[sha256sum] = "629f865e8317f52602b2f2efd2b688002903d2e4bbcba5427cb6188b043d6f99" +SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" +SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https" -S = "${WORKDIR}/DBD-mysql-${PV}" +S = "${WORKDIR}/git" inherit cpan -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] libdev-checklib-perl: add new recipe
From: Mingli Yu It provides the perl module (Devel::CheckLib) which may needed by other package which uses it to check libs. Signed-off-by: Mingli Yu --- ...CheckLib.pm-don-t-execute-the-binary.patch | 46 +++ .../perl/libdev-checklib-perl_1.13.bb | 21 + 2 files changed, 67 insertions(+) create mode 100644 meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch create mode 100644 meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch b/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch new file mode 100644 index 0..223aa6751 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch @@ -0,0 +1,46 @@ +From d111fd85b25466f7829ccee34493aa0e3b551308 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Tue, 23 Apr 2019 19:13:19 -0700 +Subject: [PATCH] CheckLib.pm: don't execute the binary + +Don't execute the binary in build env as the +binary which is generated in cross compile env +may fail when executed in build env. + +Any it's enough to verify the libs via successully +generate the binary which links the libs as below. + $ /yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc \ + -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security \ + -Werror=format-security --sysroot=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot \ + -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/perl/5.28.1-r1=/usr/src/debug/perl/5.28.1-r1 \ + -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/perl/5.28.1-r1=/usr/src/debug/perl/5.28.1-r1 \ + -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot= -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot-native= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 assertlibEhx19yuY.c -L/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot/usr/lib -lcrypto -fstack-protector-strong -o assertlibCOw_eujb + +Execute the binary in cross compile env as below +and use the return status to determine the lib's +checking status is not appropriate in cross compile env. + $ /yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/git/assertlibCOw_eujb + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Mingli Yu +--- + lib/Devel/CheckLib.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Devel/CheckLib.pm b/lib/Devel/CheckLib.pm +index e45cfb4..d228bb5 100644 +--- a/lib/Devel/CheckLib.pm b/lib/Devel/CheckLib.pm +@@ -424,7 +424,7 @@ sub assert_lib { + my $absexefile = File::Spec->rel2abs($exefile); + $absexefile = '"'.$absexefile.'"' if $absexefile =~ m/\s/; + if (!$not_execute && system($absexefile) != 0) { +-push @wrongresult, $lib; ++print "Checking the lib $lib\n"; + } + else { + if ($analyze_binary) { +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb new file mode 100644 index 0..f5bdb2087 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb @@ -0,0 +1,21 @@ +SUMMARY = "A Perl module that checks whether a particular C library and its headers are available" +DESCRIPTION = "This module provides a way of checking whether a particular library \ +and its headers are available, by attempting to compile a simple program and \ +link against it." +HOMEPAGE = "https://metacpan.org/pod/Devel::CheckLib; +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://README;md5=7911cdbb572d25c5f2e2ea17f669efc2" + +SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV}.tar.gz \ + file://0001-CheckLib.pm-don-t-execute-the-binary.patch \ +" +SRC_URI[md5sum] = "930216c5abc0f016df8a7539d48c891a" +SRC_URI[sha256sum] = "24adfd908705dfac4bb320711763f37126b75cf54b3566c2c27c7cdef9c429a8" + +S = "${WORKDIR}/Devel-CheckLib-${PV}" + +inherit cpan + +BBCLASSEXTEND="native" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] hwdata: Upgrade to 0.322
From: Mingli Yu Correct the PV to reflect the real release version. Signed-off-by: Mingli Yu --- meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb index 8e8dbf5c8..58a060706 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.316+git${SRCPV}" -SRCREV = "803819aef862ded2ce0737cd3cf642c633b68c35" +PV = "0.322" +SRCREV = "a65d28807d8f2446faa4734c758d1607f0a56ded" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] hostapd: Upgrade to 2.8
From: Mingli Yu License-Update: Copyright year updated to 2019. Remove 8 backported patches. Signed-off-by: Mingli Yu --- ...d-key-reinstallation-in-FT-handshake.patch | 177 ...lation-of-an-already-in-use-group-ke.patch | 253 -- ...n-of-GTK-IGTK-reinstallation-of-WNM-.patch | 187 - ...event-installation-of-an-all-zero-TK.patch | 82 -- ...TK-rekeying-to-generate-a-new-ANonce.patch | 67 - ...6-TDLS-Reject-TPK-TK-reconfiguration.patch | 135 -- ...multiple-Reassociation-Response-fram.patch | 85 -- .../hostapd/hostapd-CVE-2018-14526.patch | 44 --- .../{hostapd_2.6.bb => hostapd_2.8.bb}| 14 +- 9 files changed, 3 insertions(+), 1041 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/0004-Prevent-installation-of-an-all-zero-TK.patch delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/0006-TDLS-Reject-TPK-TK-reconfiguration.patch delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/0007-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/hostapd-CVE-2018-14526.patch rename meta-oe/recipes-connectivity/hostapd/{hostapd_2.6.bb => hostapd_2.8.bb} (64%) diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch deleted file mode 100644 index 5535a3c5a..0 --- a/meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 044ae35c5694c39a4aca2a33502cc3897e88f79e Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef -Date: Fri, 14 Jul 2017 15:15:35 +0200 -Subject: [PATCH 1/7] hostapd: Avoid key reinstallation in FT handshake - -Do not reinstall TK to the driver during Reassociation Response frame -processing if the first attempt of setting the TK succeeded. This avoids -issues related to clearing the TX/RX PN that could result in reusing -same PN values for transmitted frames (e.g., due to CCM nonce reuse and -also hitting replay protection on the receiver) and accepting replayed -frames on RX side. - -This issue was introduced by the commit -0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in -authenticator') which allowed wpa_ft_install_ptk() to be called multiple -times with the same PTK. While the second configuration attempt is -needed with some drivers, it must be done only if the first attempt -failed. - -Signed-off-by: Mathy Vanhoef - -Upstream-Status: Backport -Signed-off-by: Zheng Ruoqin - src/ap/ieee802_11.c | 16 +--- - src/ap/wpa_auth.c| 11 +++ - src/ap/wpa_auth.h| 3 ++- - src/ap/wpa_auth_ft.c | 10 ++ - src/ap/wpa_auth_i.h | 1 + - 5 files changed, 37 insertions(+), 4 deletions(-) - -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index 4e04169..333035f 100644 a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd, - { - struct ieee80211_ht_capabilities ht_cap; - struct ieee80211_vht_capabilities vht_cap; -+ int set = 1; - - /* -* Remove the STA entry to ensure the STA PS state gets cleared and -@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd, -* FT-over-the-DS, where a station re-associates back to the same AP but -* skips the authentication flow, or if working with a driver that -* does not support full AP client state. -+ * -+ * Skip this if the STA has already completed FT reassociation and the -+ * TK has been configured since the TX/RX PN must not be reset to 0 for -+ * the same key. -*/ -- if (!sta->added_unassoc) -+ if (!sta->added_unassoc && -+ (!(sta->flags & WLAN_STA_AUTHORIZED) || -+ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) { - hostapd_drv_sta_remove(hapd, sta->addr); -+ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED); -+ set = 0; -+ } - - #ifdef CONFIG_IEEE80211N - if (sta->flags & WLAN_STA_HT) -@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd, - sta->flags & WLAN_STA_VHT ? _cap : NULL, -
[oe] [meta-oe][PATCH v2] indent: Upgrade to 2.2.12
From: Mingli Yu Add two patches to fix the build error. Add -Wno-error=unused-value for native build to silence below error: | In file included from ../../indent-2.2.12/src/indent.h:60:0, from ../../indent-2.2.12/src/indent.c:77: | ../../indent-2.2.12/src/indent.c: In function 'main': | ../../indent-2.2.12/src/libgettext.h:88:5: error: statement with no effect [-Werror=unused-value] ((void) (Domainname), (const char *) (Dirname)) ^ | ../../indent-2.2.12/src/indent.c:1064:5: note: in expansion of macro 'bindtextdomain' bindtextdomain(PACKAGE, LOCALEDIR); Signed-off-by: Mingli Yu --- ...01-Makefile.am-remove-regression-dir.patch | 67 +++ ...ent.c-correct-the-check-for-locale.h.patch | 40 +++ .../{indent_2.2.10.bb => indent_2.2.12.bb}| 11 ++- 3 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch create mode 100644 meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch rename meta-oe/recipes-extended/indent/{indent_2.2.10.bb => indent_2.2.12.bb} (65%) diff --git a/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch b/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch new file mode 100644 index 0..357d77d83 --- /dev/null +++ b/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch @@ -0,0 +1,67 @@ +From 27bda5ee884e79d6d0e76955124d2b0c5798d6cf Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 25 Feb 2019 00:34:17 -0800 +Subject: [PATCH] Makefile.am: remove regression dir + +Remove regression dir to fix below do_compile +error: +| Making all in regression +| /bin/sh: line 20: cd: regression: No such file or directory +| Makefile:451: recipe for target 'all-recursive' failed + +BTW, it should be safe not to cover regression dir +as there is no Makefile.in under ${S}/regression +and the content of ${S}/regression/Makefile as below. +- +all: + +install: + +check: +./TEST + +distclean: clean + +maintainer-clean: clean + +distdir: + +clean: +@rm -rf output + +.PHONY: all install +- + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + Makefile.am | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ba37a42..548fea7 100644 +--- a/Makefile.am b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + AUTOMAKE_OPTIONS = no-texinfo.tex + +-SUBDIRS = intl src doc po man regression ++SUBDIRS = intl src doc po man + + BUILT_SOURCES = + +@@ -13,8 +13,7 @@ EXTRA_DIST = README.md \ + aclocal/UTIMBUF.m4 \ + miscel/Makefile.mingw32 \ + miscel/README.vc++ \ +- bootstrap \ +- regression ++ bootstrap + + DISTCLEANFILES=config/config.cache config/config.log config.h + +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch b/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch new file mode 100644 index 0..7df7ecb38 --- /dev/null +++ b/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch @@ -0,0 +1,40 @@ +From 75369ce004ec0f5e46a432fa1dac8cfc7ae1ef8d Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Sun, 24 Feb 2019 22:35:08 -0800 +Subject: [PATCH] src/indent.c: correct the check for locale.h + +Adjust to check HAVE_LC_MESSAGES or HAVE_LOCALE_H +to determine whether include locale.h or not to +fix below issue: + +| ../../indent-2.2.12/src/indent.c: In function 'main': +| ../../indent-2.2.12/src/indent.c:1062:5: error: implicit declaration of function 'setlocale'; did you mean 'setstate'? [-Werror=implicit-function-declaration] +| setlocale(LC_ALL, ""); +| ^ +| setstate +| ../../indent-2.2.12/src/indent.c:1062:5: error: nested extern declaration of 'setlocale' [-Werror=nested-externs] +| ../../indent-2.2.12/src/indent.c:1062:15: error: 'LC_ALL' undeclared (first use in this function) + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + src/indent.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/indent.c b/src/indent.c +index 4d666e2..0c2780b 100644 +--- a/src/indent.c b/src/indent.c +@@ -71,7 +71,7 @@ + #include + #include + #include +-#ifdef HAVE_LOCALE_H ++#if defined(HAVE_LC_MESSAGES) || defined(HAVE_LOCALE_H) + #include + #endif + #include "indent.h" +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/indent/indent_2.2.10.bb b/meta-oe/recipes-extended/indent/indent_2.2.12.bb similarity index 65% rename from meta-oe/recipes-extended/indent/indent_2.2.10.bb rename to
[oe] [meta-oe][PATCH] hwdata: Upgrade to 0.322
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb index 8e8dbf5c8..f04e5c8d4 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.316+git${SRCPV}" -SRCREV = "803819aef862ded2ce0737cd3cf642c633b68c35" +PV = "0.322+git${SRCPV}" +SRCREV = "a65d28807d8f2446faa4734c758d1607f0a56ded" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] iscsi-initiator-utils: Fix 32bit build issues with Werror=format-truncation
From: Mingli Yu Backport a patch to fix 32bit build issues with string length overflow as below: | idbm.c:679:27: error: '%d' directive output may be truncated writing between 1 and 10 bytes into a region of size 8 [-Werror=format-truncation=] | snprintf(passwd_len, 8, "%d", (int)strlen(value)); \ Signed-off-by: Mingli Yu --- ...-build-issues-with-string-length-overflow.patch | 115 + .../iscsi-initiator-utils_2.0.876.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch new file mode 100644 index 000..f945c63 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch @@ -0,0 +1,115 @@ +From 24ce8f62e042e69497e1299212504c356179e15b Mon Sep 17 00:00:00 2001 +From: Lee Duncan +Date: Tue, 6 Nov 2018 11:16:06 -0800 +Subject: [PATCH] Fix i586 build issues with string length overflow. + +Gcc7 warns of possible string print overflow, on i586, +when printing password length (via a macro), generating +errors like: + +[ 59s] ^~~~ +[ 59s] In file included from /usr/include/stdio.h:862:0, +[ 59s] from idbm.h:27, +[ 59s] from context.h:22, +[ 59s] from idbm.c:59: +[ 59s] /usr/include/bits/stdio2.h:64:10: note: +'__builtin___snprintf_chk' output between 2 and 11 bytes into a +destination of size 8 +[ 59s]return __builtin___snprintf_chk (__s, __n, +__USE_FORTIFY_LEVEL - 1, +[ 59s] ^~ +~~ +[ 59s] __bos (__s), __fmt, __va_arg_pack ()); +[ 59s] ~ +[ 59s] cc1: all warnings being treated as errors +[ 59s] make[1]: *** [: idbm.o] Error 1 +[ 59s] make[1]: Leaving directory + +The fix is to limit the size of the string printed, so that no +overflow is possible. + +The print macros in usr/idbm.c were updated, as well, to match +the newer version in libopeniscsiusr/idbm.c, also to help the +i586 build. + +Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi/commit/24ce8f62e042e69497e1299212504c356179e15b] + +Signed-off-by: Mingli Yu +--- + libopeniscsiusr/idbm.c | 2 +- + usr/idbm.c | 11 ++- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c +index 7724de2..055dd9a 100644 +--- a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c +@@ -676,7 +676,7 @@ updated: + if (!passwd_done && !strcmp(#_param, name)) { \ + passwd_done = 1; \ + name = #_param "_length"; \ +- snprintf(passwd_len, 8, "%d", (int)strlen(value)); \ ++ snprintf(passwd_len, 8, "%.7d", (int)strlen(value) & 0x); \ + value = passwd_len; \ + goto setup_passwd_len; \ + } +diff --git a/usr/idbm.c b/usr/idbm.c +index a0207e2..89a6c27 100644 +--- a/usr/idbm.c b/usr/idbm.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "idbm.h" + #include "idbm_fields.h" +@@ -65,7 +66,7 @@ static struct idbm *db; + #define __recinfo_int(_key, _info, _rec, _name, _show, _n, _mod) do { \ + _info[_n].type = TYPE_INT; \ + strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ +- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ ++ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIi32, _rec->_name); \ + _info[_n].data = &_rec->_name; \ + _info[_n].data_len = sizeof(_rec->_name); \ + _info[_n].visible = _show; \ +@@ -76,7 +77,7 @@ static struct idbm *db; + #define __recinfo_uint8(_key, _info, _rec, _name, _show, _n, _mod) do { \ + _info[_n].type = TYPE_UINT8; \ + strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ +- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ ++ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu8, _rec->_name); \ + _info[_n].data = &_rec->_name; \ + _info[_n].data_len = sizeof(_rec->_name); \ + _info[_n].visible = _show; \ +@@ -87,7 +88,7 @@ static struct idbm *db; + #define __recinfo_uint16(_key, _info, _rec, _name, _show, _n, _mod) do { \ + _info[_n].type = TYPE_UINT16; \ + strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ +- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ ++ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu16, _rec->_name); \ + _info[_n].data = &_rec->_name; \ + _info[_n].data_len = sizeof(_rec->_name); \ + _info[_n].visible = _show; \ +@@ -98,7 +99,7 @@ static
[oe] [meta-oe][PATCH] mariadb: fix atomic support on arm
From: Mingli Yu Check to link with libatomic to enable C11 atomics support to fix below build error on arm: | /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base::store(unsigned long long, std::memory_order)': | /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8' Signed-off-by: Mingli Yu --- meta-oe/recipes-dbs/mysql/mariadb.inc | 2 +- .../mysql/mariadb/fix-arm-atomic.patch| 34 +++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 00a9d668c..fca74d448 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -17,6 +17,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN} file://0001-disable-ucontext-on-musl.patch \ file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ + file://fix-arm-atomic.patch \ " SRC_URI[md5sum] = "603ce42e35b9a688f2cca05275acb5cb" SRC_URI[sha256sum] = "b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a" @@ -63,7 +64,6 @@ PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb" # https://mariadb.atlassian.net/browse/MDEV-5982 TARGET_CFLAGS += "-fuse-ld=bfd" LDFLAGS += " -pthread" -LDFLAGS_append_armv5 = " -latomic" BUILD_CFLAGS += "-fuse-ld=bfd" BUILD_CXXFLAGS += "-fuse-ld=bfd" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch new file mode 100644 index 0..34d31148b --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch @@ -0,0 +1,34 @@ +From ffaaf4d43ebf2ef6d0229a60f407c1f5a06e5c53 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 15 Mar 2019 01:46:05 -0700 +Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm + +Check to link with libatomic to enable C11 atomics support +to fix below build error on arm: +| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base::store(unsigned long long, std::memory_order)': +| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8' + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + storage/rocksdb/build_rocksdb.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake +index c36c761..2b539ff 100644 +--- a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake +@@ -424,6 +424,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) + + ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) + target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) ++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) ++ TARGET_LINK_LIBRARIES(rocksdblib atomic) ++ENDIF() + IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -frtti") + endif() +-- +2.17.1 + -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/3 v3] librelp: Upgrade to 1.4.0
From: Mingli Yu Remove one backported patch. Add openssl to Depends. Signed-off-by: Mingli Yu --- .../librelp/0001-testbench-improvements.patch | 164 -- .../{librelp_1.2.18.bb => librelp_1.4.0.bb} | 5 +- 2 files changed, 2 insertions(+), 167 deletions(-) delete mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} (66%) diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch deleted file mode 100644 index 6b60bd748..0 --- a/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 1e6be18ed243dc562ff2976b46850bfd2e576664 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards -Date: Thu, 15 Nov 2018 12:23:41 +0100 -Subject: [PATCH] testbench improvements - -Most importantly, the test receiver process is now terminated -gracefully. Without that, gcov can never pick up correct -coverage data. - -Upstream-Status: Backport[https://github.com/rsyslog/librelp/commit/1e6be18ed243dc562ff2976b46850bfd2e576664] - -Signed-off-by: Mingli Yu - src/tcp.c | 4 ++-- - tests/Makefile.am | 3 ++- - tests/receive.c | 29 +++-- - tests/selftest_receive_usage.sh | 5 + - tests/test-framework.sh | 4 ++-- - 5 files changed, 38 insertions(+), 7 deletions(-) - create mode 100755 tests/selftest_receive_usage.sh - -diff --git a/src/tcp.c b/src/tcp.c -index f10a720..0ea92ea 100644 a/src/tcp.c -+++ b/src/tcp.c -@@ -3027,7 +3027,7 @@ relpTcpConnect(relpTcp_t *const pThis, - struct addrinfo hints; - struct addrinfo *reslocal = NULL; - struct pollfd pfd; -- char errmsg[1024]; -+ char errmsg[1424]; - int so_error; - socklen_t len = sizeof so_error; - int r; -@@ -3067,7 +3067,7 @@ relpTcpConnect(relpTcp_t *const pThis, - } - if(connect(pThis->sock, res->ai_addr, res->ai_addrlen) == -1) { - if(errno != EINPROGRESS) { -- char errStr[1024]; -+ char errStr[1200]; - _relpEngine_strerror_r(errno, errStr, sizeof(errStr)); - snprintf(errmsg, sizeof(errmsg), "error connecting: '%s'", errStr); - callOnErr(pThis, errmsg, RELP_RET_IO_ERR); -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 64deb19..51fd78f 100644 a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -25,7 +25,8 @@ TESTS= basic.sh \ - long-msg.sh \ - oversize-msg-abort-errmsg.sh \ - oversize-msg-accept-errmsg.sh \ -- truncate-oversize-msg.sh -+ truncate-oversize-msg.sh \ -+ selftest_receive_usage.sh - # OpenSSL tests only! - if ENABLE_TLS_OPENSSL - TESTS += tls-wrong-permittedPeer.sh \ -diff --git a/tests/receive.c b/tests/receive.c -index e56e59c..4b69c99 100644 a/tests/receive.c -+++ b/tests/receive.c -@@ -1,6 +1,7 @@ - /* A minimal RELP receiver using librelp - * - * Copyright 2014 Mathias Nyman -+ * Copyright 2018 Adiscon GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. -@@ -24,6 +25,7 @@ - #include - #include - #include -+#include - #include "librelp.h" - - #define TRY(f) if(f != RELP_RET_OK) { fprintf(stderr, "receive.c: FAILURE in '%s'\n", #f); ret = 1; goto done; } -@@ -31,6 +33,24 @@ - static FILE *errFile = NULL; - static relpEngine_t *pRelpEngine; - -+static void -+hdlr_enable(int sig, void (*hdlr)()) -+{ -+ struct sigaction sigAct; -+ memset(, 0, sizeof (sigAct)); -+ sigemptyset(_mask); -+ sigAct.sa_handler = hdlr; -+ sigaction(sig, , NULL); -+} -+ -+void -+terminate(int sig) -+{ -+ fprintf(stderr, "terminating on signal %d\n", sig); -+ relpEngineSetStop(pRelpEngine); -+} -+ -+ - static void __attribute__((format(printf, 1, 2))) - dbgprintf(char *fmt, ...) - { -@@ -237,6 +257,8 @@ int main(int argc, char *argv[]) { - } - } - -+ hdlr_enable(SIGTERM, terminate); -+ - TRY(relpEngineConstruct()); - TRY(relpEngineSetDbgprint(pRelpEngine, verbose ? dbgprintf : NULL)); - TRY(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*) "syslog", eRelpCmdState_Required)); -@@ -294,11 +316,14 @@ int main(int argc, char *argv[]) { - fclose(fp); - } - -- TRY(relpEngineRun(pRelpEngine)); /* Abort with ctrl-c */ -+ TRY(relpEngineRun(pRelpEngine)); /* Abort via SIGHUP */ - -- TRY(relpEngineSetStop(pRelpEngine)); - TRY(relpEngineDestruct()); - -+ if(pidFileName != NULL) { -+ unlink(pidFileName); -+ } -+ - done: - return ret; - } -diff --git a/tests/selftest_receive_usage.sh b/tests/selftest_receive_usage.sh
[oe] [meta-oe][PATCH 2/3 v2] librelp: Upgrade to 1.4.0
From: Mingli Yu Remove one backported patch. Signed-off-by: Mingli Yu --- .../librelp/0001-testbench-improvements.patch | 164 -- .../{librelp_1.2.18.bb => librelp_1.4.0.bb} | 3 +- 2 files changed, 1 insertion(+), 166 deletions(-) delete mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} (76%) diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch deleted file mode 100644 index 6b60bd748..0 --- a/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 1e6be18ed243dc562ff2976b46850bfd2e576664 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards -Date: Thu, 15 Nov 2018 12:23:41 +0100 -Subject: [PATCH] testbench improvements - -Most importantly, the test receiver process is now terminated -gracefully. Without that, gcov can never pick up correct -coverage data. - -Upstream-Status: Backport[https://github.com/rsyslog/librelp/commit/1e6be18ed243dc562ff2976b46850bfd2e576664] - -Signed-off-by: Mingli Yu - src/tcp.c | 4 ++-- - tests/Makefile.am | 3 ++- - tests/receive.c | 29 +++-- - tests/selftest_receive_usage.sh | 5 + - tests/test-framework.sh | 4 ++-- - 5 files changed, 38 insertions(+), 7 deletions(-) - create mode 100755 tests/selftest_receive_usage.sh - -diff --git a/src/tcp.c b/src/tcp.c -index f10a720..0ea92ea 100644 a/src/tcp.c -+++ b/src/tcp.c -@@ -3027,7 +3027,7 @@ relpTcpConnect(relpTcp_t *const pThis, - struct addrinfo hints; - struct addrinfo *reslocal = NULL; - struct pollfd pfd; -- char errmsg[1024]; -+ char errmsg[1424]; - int so_error; - socklen_t len = sizeof so_error; - int r; -@@ -3067,7 +3067,7 @@ relpTcpConnect(relpTcp_t *const pThis, - } - if(connect(pThis->sock, res->ai_addr, res->ai_addrlen) == -1) { - if(errno != EINPROGRESS) { -- char errStr[1024]; -+ char errStr[1200]; - _relpEngine_strerror_r(errno, errStr, sizeof(errStr)); - snprintf(errmsg, sizeof(errmsg), "error connecting: '%s'", errStr); - callOnErr(pThis, errmsg, RELP_RET_IO_ERR); -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 64deb19..51fd78f 100644 a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -25,7 +25,8 @@ TESTS= basic.sh \ - long-msg.sh \ - oversize-msg-abort-errmsg.sh \ - oversize-msg-accept-errmsg.sh \ -- truncate-oversize-msg.sh -+ truncate-oversize-msg.sh \ -+ selftest_receive_usage.sh - # OpenSSL tests only! - if ENABLE_TLS_OPENSSL - TESTS += tls-wrong-permittedPeer.sh \ -diff --git a/tests/receive.c b/tests/receive.c -index e56e59c..4b69c99 100644 a/tests/receive.c -+++ b/tests/receive.c -@@ -1,6 +1,7 @@ - /* A minimal RELP receiver using librelp - * - * Copyright 2014 Mathias Nyman -+ * Copyright 2018 Adiscon GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. -@@ -24,6 +25,7 @@ - #include - #include - #include -+#include - #include "librelp.h" - - #define TRY(f) if(f != RELP_RET_OK) { fprintf(stderr, "receive.c: FAILURE in '%s'\n", #f); ret = 1; goto done; } -@@ -31,6 +33,24 @@ - static FILE *errFile = NULL; - static relpEngine_t *pRelpEngine; - -+static void -+hdlr_enable(int sig, void (*hdlr)()) -+{ -+ struct sigaction sigAct; -+ memset(, 0, sizeof (sigAct)); -+ sigemptyset(_mask); -+ sigAct.sa_handler = hdlr; -+ sigaction(sig, , NULL); -+} -+ -+void -+terminate(int sig) -+{ -+ fprintf(stderr, "terminating on signal %d\n", sig); -+ relpEngineSetStop(pRelpEngine); -+} -+ -+ - static void __attribute__((format(printf, 1, 2))) - dbgprintf(char *fmt, ...) - { -@@ -237,6 +257,8 @@ int main(int argc, char *argv[]) { - } - } - -+ hdlr_enable(SIGTERM, terminate); -+ - TRY(relpEngineConstruct()); - TRY(relpEngineSetDbgprint(pRelpEngine, verbose ? dbgprintf : NULL)); - TRY(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*) "syslog", eRelpCmdState_Required)); -@@ -294,11 +316,14 @@ int main(int argc, char *argv[]) { - fclose(fp); - } - -- TRY(relpEngineRun(pRelpEngine)); /* Abort with ctrl-c */ -+ TRY(relpEngineRun(pRelpEngine)); /* Abort via SIGHUP */ - -- TRY(relpEngineSetStop(pRelpEngine)); - TRY(relpEngineDestruct()); - -+ if(pidFileName != NULL) { -+ unlink(pidFileName); -+ } -+ - done: - return ret; - } -diff --git a/tests/selftest_receive_usage.sh b/tests/selftest_receive_usage.sh -new file mode 100755 -index
[oe] [meta-oe][PATCH 3/3] krb5: Upgrade to 1.17
From: Mingli Yu License-Update: Copyright year updated to 2019. Remove one backported patch. Fix below do_package issue: ERROR: krb5-1.17-r0 do_package: QA Issue: krb5: Files/directories were installed but not shipped in any package: /usr/lib/krb5/plugins/preauth/spake.so Signed-off-by: Mingli Yu --- ...ord-attributes-for-S4U2Self-requests.patch | 80 --- .../krb5/{krb5_1.16.2.bb => krb5_1.17.bb} | 9 ++- 2 files changed, 5 insertions(+), 84 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/krb5/krb5/0001-Ignore-password-attributes-for-S4U2Self-requests.patch rename meta-oe/recipes-connectivity/krb5/{krb5_1.16.2.bb => krb5_1.17.bb} (95%) diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Ignore-password-attributes-for-S4U2Self-requests.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Ignore-password-attributes-for-S4U2Self-requests.patch deleted file mode 100644 index 8d1e14358..0 --- a/meta-oe/recipes-connectivity/krb5/krb5/0001-Ignore-password-attributes-for-S4U2Self-requests.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 6fad7d45701234c8e81300d50dd5b8037d846d11 Mon Sep 17 00:00:00 2001 -From: Isaac Boukris -Date: Wed, 27 Feb 2019 23:59:59 -0800 -Subject: [PATCH] Ignore password attributes for S4U2Self requests - -For consistency with Windows KDCs, allow protocol transition to work -even if the password has expired or needs changing. - -Also, when looking up an enterprise principal with an AS request, -treat ERR_KEY_EXP as confirmation that the client is present in the -realm. - -[ghud...@mit.edu: added comment in kdc_process_s4u2self_req(); edited -commit message] - -ticket: 8763 (new) -tags: pullup -target_version: 1.17 - -Upsteam-Status: Backport [https://github.com/krb5/krb5/commit/5e6d1796106df8ba6bc1973ee0917c170d929086] -CVE: CVE-2018-20217 - -Signed-off-by: Wenlin Kang - src/kdc/kdc_util.c | 5 + - src/lib/krb5/krb/s4u_creds.c | 2 +- - src/tests/gssapi/t_s4u.py| 8 - 3 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c -index 754570c..034c979 100644 a/src/kdc/kdc_util.c -+++ b/src/kdc/kdc_util.c -@@ -1574,6 +1574,11 @@ kdc_process_s4u2self_req(kdc_realm_t *kdc_active_realm, - - memset(_server, 0, sizeof(no_server)); - -+/* Ignore password expiration and needchange attributes (as Windows -+ * does), since S4U2Self is not password authentication. */ -+princ->pw_expiration = 0; -+clear(princ->attributes, KRB5_KDB_REQUIRES_PWCHANGE); -+ - code = validate_as_request(kdc_active_realm, request, *princ, -no_server, kdc_time, status, _data); - if (code) { -diff --git a/src/lib/krb5/krb/s4u_creds.c b/src/lib/krb5/krb/s4u_creds.c -index 91c02aa..2037984 100644 a/src/lib/krb5/krb/s4u_creds.c -+++ b/src/lib/krb5/krb/s4u_creds.c -@@ -117,7 +117,7 @@ s4u_identify_user(krb5_context context, - code = k5_get_init_creds(context, , client, NULL, NULL, 0, NULL, - opts, krb5_get_as_key_noop, , _master, - NULL); --if (code == 0 || code == KRB5_PREAUTH_FAILED) { -+if (!code || code == KRB5_PREAUTH_FAILED || code == KRB5KDC_ERR_KEY_EXP) { - *canon_user = userid.user; - userid.user = NULL; - code = 0; -diff --git a/src/tests/gssapi/t_s4u.py b/src/tests/gssapi/t_s4u.py -index 3da6544..ba0469e 100755 a/src/tests/gssapi/t_s4u.py -+++ b/src/tests/gssapi/t_s4u.py -@@ -20,6 +20,14 @@ pservice2 = 'p:' + service2 - # Get forwardable creds for service1 in the default cache. - realm.kinit(service1, None, ['-f', '-k']) - -+# Try S4U2Self for user with a restricted password. -+realm.run([kadminl, 'modprinc', '+needchange', realm.user_princ]) -+realm.run(['./t_s4u', 'e:user', '-']) -+realm.run([kadminl, 'modprinc', '-needchange', -+ '-pwexpire', '1/1/2000', realm.user_princ]) -+realm.run(['./t_s4u', 'e:user', '-']) -+realm.run([kadminl, 'modprinc', '-pwexpire', 'never', realm.user_princ]) -+ - # Try krb5 -> S4U2Proxy with forwardable user creds. This should fail - # at the S4U2Proxy step since the DB2 back end currently has no - # support for allowing it. --- -2.17.1 - diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.17.bb similarity index 95% rename from meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb rename to meta-oe/recipes-connectivity/krb5/krb5_1.17.bb index 1d3ef8a34..e29c52783 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.17.bb @@ -14,7 +14,7 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n HOMEPAGE = "http://web.mit.edu/Kerberos/; SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=7f95bc3d8d0351aa481d56d5e9de20c3" +LIC_FILES_CHKSUM =
[oe] [meta-oe][PATCH 2/3] librelp: Upgrade to 1.4.0
From: Mingli Yu Signed-off-by: Mingli Yu --- .../rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} (100%) diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb similarity index 100% rename from meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb rename to meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/3] crash: Upgrade to 7.2.5
From: Mingli Yu Signed-off-by: Mingli Yu --- .../recipes-kernel/crash/{crash_7.2.4.bb => crash_7.2.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-kernel/crash/{crash_7.2.4.bb => crash_7.2.5.bb} (97%) diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.4.bb b/meta-oe/recipes-kernel/crash/crash_7.2.5.bb similarity index 97% rename from meta-oe/recipes-kernel/crash/crash_7.2.4.bb rename to meta-oe/recipes-kernel/crash/crash_7.2.5.bb index c72b1a321..0b2335682 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.2.4.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.2.5.bb @@ -25,8 +25,8 @@ SRC_URI = "https://github.com/crash-utility/${BPN}/archive/${PV}.tar.gz;download file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ " -SRC_URI[md5sum] = "4f66eb0e9a82ff83de06ac2b37501f5c" -SRC_URI[sha256sum] = "85ca2e93f1ee628ef2499ab9c78623f8b04500bdf7378c09de19283f6a7a698f" +SRC_URI[md5sum] = "3f6e18d38821bb326700f1d6d43bcaec" +SRC_URI[sha256sum] = "114a83ca27c91e4321f6399d637a9d2270f72b9327e56d687c5fb139e903069b" SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mysql-python: fix compilation with MariaDB 10.3.13
From: Mingli Yu Use standard API function MYSQL_OPT_RECONNECT instead of direct modification of internal structures which does not work for MariaDB to fix below compile issue. | _mysql.c: In function '_mysql_ConnectionObject_ping': | _mysql.c:2005:41: error: 'MYSQL' {aka 'struct st_mysql'} has no member named 'reconnect' Signed-off-by: Mingli Yu --- ...ompilation-with-MariaDB-with-10.3.13.patch | 39 +++ .../recipes-dbs/mysql/mysql-python_1.2.5.bb | 4 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch diff --git a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch b/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch new file mode 100644 index 0..b816618c7 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch @@ -0,0 +1,39 @@ +From 45436592aa64308b2ab46f84c6107c6d7de0a3ec Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 6 Mar 2019 00:16:17 -0800 +Subject: [PATCH] _mysql.c: fix compilation with MariaDB 10.3.13 + +Use standard API function MYSQL_OPT_RECONNECT +instead of direct modification of internal structures +which does not work for MariaDB. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + _mysql.c | 9 - + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/_mysql.c b/_mysql.c +index f081346..2262e9e 100644 +--- a/_mysql.c b/_mysql.c +@@ -2002,7 +2002,14 @@ _mysql_ConnectionObject_ping( + int r, reconnect = -1; + if (!PyArg_ParseTuple(args, "|I", )) return NULL; + check_connection(self); +- if ( reconnect != -1 ) self->connection.reconnect = reconnect; ++ if ( reconnect != -1 ) { ++ #if MYSQL_VERSION_ID >= 50013 ++ my_bool recon = reconnect; ++ mysql_options(>connection, MYSQL_OPT_RECONNECT, ); ++ #else ++ self->connection.reconnect = reconnect; ++ #endif ++} + Py_BEGIN_ALLOW_THREADS + r = mysql_ping(&(self->connection)); + Py_END_ALLOW_THREADS +-- +2.17.1 + diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb index ac0df4f06..f2faec1c1 100644 --- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb +++ b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb @@ -8,7 +8,9 @@ DEPENDS = "mysql5" SRCNAME = "MySQL-python" -SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip; +SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \ + file://0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch \ +" SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c" SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] mariadb: Upgrade to 10.3.13
From: Mingli Yu Per https://mariadb.org/about/maintenance-policy/, mariadb 5.5.x series only supported until next year April 2020, so upgrade it to 10.3.13. Remove some deprecated patches, add some new patches to fix build failure and rework two patches to avoid fuzz warnings. Signed-off-by: Mingli Yu --- ...ve_5.5.62.bb => mariadb-native_10.3.13.bb} | 1 + meta-oe/recipes-dbs/mysql/mariadb.inc | 29 ++-- .../0001-disable-ucontext-on-musl.patch | 8 +- .../mariadb/change-cc-to-cc-version.patch | 26 --- .../configure.cmake-fix-valgrind.patch| 27 ++- .../mariadb/fix-a-building-failure.patch | 16 +- .../mysql/mariadb/fix-cmake-module-path.patch | 29 .../mariadb/fix-mysqlclient-r-version.patch | 160 -- .../mysql/mariadb/remove-bad-path.patch | 18 -- ...Lists.txt-fix-gen_lex_hash-not-found.patch | 65 +++ ...akeLists.txt-fix-do_populate_sysroot.patch | 34 .../{mariadb_5.5.62.bb => mariadb_10.3.13.bb} | 2 +- 12 files changed, 145 insertions(+), 270 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_5.5.62.bb => mariadb-native_10.3.13.bb} (88%) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch rename meta-oe/recipes-dbs/mysql/{mariadb_5.5.62.bb => mariadb_10.3.13.bb} (88%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.13.bb similarity index 88% rename from meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.3.13.bb index 4ce960d7d..e1a038dfa 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.13.bb @@ -13,6 +13,7 @@ do_install() { install -d ${D}${bindir} install -m 0755 sql/gen_lex_hash ${D}${bindir}/ +install -m 0755 sql/gen_lex_token ${D}${bindir}/ install -m 0755 extra/comp_err ${D}${bindir}/ install -m 0755 scripts/comp_sql ${D}${bindir}/ } diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 8ca5b2ba4..65f98bd3b 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -4,10 +4,7 @@ SECTION = "libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ - file://fix-cmake-module-path.patch \ - file://remove-bad-path.patch \ - file://fix-mysqlclient-r-version.patch \ +SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN}-${PV}.tar.gz \ file://my.cnf \ file://mysqld.service \ file://install_db.service \ @@ -15,11 +12,12 @@ SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ file://mysql-systemd-start \ file://configure.cmake-fix-valgrind.patch \ file://fix-a-building-failure.patch \ - file://change-cc-to-cc-version.patch \ + file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ + file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://0001-disable-ucontext-on-musl.patch \ " -SRC_URI[md5sum] = "6375d577e9539b839f44d857e70f82b9" -SRC_URI[sha256sum] = "56a365af71b8a9ec8bfee0801e2dec95011da8ee7507986ca329be11296411db" +SRC_URI[md5sum] = "603ce42e35b9a688f2cca05275acb5cb" +SRC_URI[sha256sum] = "b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases; @@ -120,6 +118,11 @@ do_compile_prepend_class-target () { echo "#endif" >>${B}/include/openssl/kssl.h fi fi +# workaround to handle out-of-source build from source package +yacc_files="sql_yacc.hh sql_yacc.cc sql_yacc_ora.hh sql_yacc_ora.cc" +for yacc_file in ${yacc_files}; do +cp ${S}/sql/${yacc_file} ${B}/sql/${yacc_file} +done } SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" @@ -181,13 +184,13 @@ RDEPENDS_${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \ RDEPENDS_${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \ perl-module-file-basename perl-module-file-path perl-module-sys-hostname \ perl-module-file-copy perl-module-file-temp perl-module-posix \ -${PN}-client libdbi-perl libdbd-mysql-perl" +${PN}-client ${PN}-setupdb libdbi-perl
[oe] [meta-oe][PATCH 2/2] libdbd-mysql-perl: fix do_compile failure
From: Mingli Yu After mariadb upgrade to 10.3.13, there comes below do_compile failure for libdbd-mysql-perl: | dbdimp.c: In function 'mysql_dr_connect': | dbdimp.c:2000:13: error: 'MYSQL' {aka 'struct st_mysql'} has no member named 'reconnect' |result->reconnect=0; Backport a patch to fix it. Signed-off-by: Mingli Yu --- .../0001-Use-API-function-for-reconnect.patch | 53 +++ .../perl/libdbd-mysql-perl_4.043.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch new file mode 100644 index 0..60d88c3d1 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch @@ -0,0 +1,53 @@ +From edb6b202b7e233864aa5dd84532646c50097b0b8 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 4 Mar 2019 00:49:17 -0800 +Subject: [PATCH] Use API function for reconnect + +For configuring reconnect functionality use standard API function +MYSQL_OPT_RECONNECT instead of direct modification of internal structures +which does not work for MariaDB. Fixes compilation with MariaDB 10.2.6+. + +Upstream-Status: Backport [https://github.com/perl5-dbi/DBD-mysql/commit/0b1884f4153d3de0a91bae4d3b3cc1771ffdf4f3] + +Signed-off-by: Mingli Yu +--- + dbdimp.c | 16 ++-- + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/dbdimp.c b/dbdimp.c +index 9b8b313..3bed213 100644 +--- a/dbdimp.c b/dbdimp.c +@@ -1979,6 +1979,16 @@ MYSQL *mysql_dr_connect( + + if (result) + { ++ /* ++we turn off Mysql's auto reconnect and handle re-connecting ourselves ++so that we can keep track of when this happens. ++ */ ++#if MYSQL_VERSION_ID >= 50013 ++ my_bool reconnect = FALSE; ++ mysql_options(result, MYSQL_OPT_RECONNECT, ); ++#else ++ result->reconnect = 0; ++#endif + #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION + /* connection succeeded. */ + /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs +@@ -1992,12 +2002,6 @@ MYSQL *mysql_dr_connect( + imp_dbh->async_query_in_flight = NULL; + } + #endif +- +- /* +-we turn off Mysql's auto reconnect and handle re-connecting ourselves +-so that we can keep track of when this happens. +- */ +- result->reconnect=0; + } + else { + /* +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb index bd8ba780a..e185f48f7 100644 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb @@ -15,6 +15,7 @@ DEPENDS += "libdbi-perl-native libmysqlclient" LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${PV}.tar.gz \ + file://0001-Use-API-function-for-reconnect.patch \ " SRC_URI[md5sum] = "4a00dd7f1c057931147c65dfc4901c36" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] indent: Upgrade to 2.2.12
From: Mingli Yu Add two patches to fix the build error. Signed-off-by: Mingli Yu --- ...01-Makefile.am-remove-regression-dir.patch | 67 +++ ...ent.c-correct-the-check-for-locale.h.patch | 40 +++ .../{indent_2.2.10.bb => indent_2.2.12.bb}| 9 ++- 3 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch create mode 100644 meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch rename meta-oe/recipes-extended/indent/{indent_2.2.10.bb => indent_2.2.12.bb} (68%) diff --git a/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch b/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch new file mode 100644 index 0..357d77d83 --- /dev/null +++ b/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch @@ -0,0 +1,67 @@ +From 27bda5ee884e79d6d0e76955124d2b0c5798d6cf Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 25 Feb 2019 00:34:17 -0800 +Subject: [PATCH] Makefile.am: remove regression dir + +Remove regression dir to fix below do_compile +error: +| Making all in regression +| /bin/sh: line 20: cd: regression: No such file or directory +| Makefile:451: recipe for target 'all-recursive' failed + +BTW, it should be safe not to cover regression dir +as there is no Makefile.in under ${S}/regression +and the content of ${S}/regression/Makefile as below. +- +all: + +install: + +check: +./TEST + +distclean: clean + +maintainer-clean: clean + +distdir: + +clean: +@rm -rf output + +.PHONY: all install +- + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + Makefile.am | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ba37a42..548fea7 100644 +--- a/Makefile.am b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + AUTOMAKE_OPTIONS = no-texinfo.tex + +-SUBDIRS = intl src doc po man regression ++SUBDIRS = intl src doc po man + + BUILT_SOURCES = + +@@ -13,8 +13,7 @@ EXTRA_DIST = README.md \ + aclocal/UTIMBUF.m4 \ + miscel/Makefile.mingw32 \ + miscel/README.vc++ \ +- bootstrap \ +- regression ++ bootstrap + + DISTCLEANFILES=config/config.cache config/config.log config.h + +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch b/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch new file mode 100644 index 0..7df7ecb38 --- /dev/null +++ b/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch @@ -0,0 +1,40 @@ +From 75369ce004ec0f5e46a432fa1dac8cfc7ae1ef8d Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Sun, 24 Feb 2019 22:35:08 -0800 +Subject: [PATCH] src/indent.c: correct the check for locale.h + +Adjust to check HAVE_LC_MESSAGES or HAVE_LOCALE_H +to determine whether include locale.h or not to +fix below issue: + +| ../../indent-2.2.12/src/indent.c: In function 'main': +| ../../indent-2.2.12/src/indent.c:1062:5: error: implicit declaration of function 'setlocale'; did you mean 'setstate'? [-Werror=implicit-function-declaration] +| setlocale(LC_ALL, ""); +| ^ +| setstate +| ../../indent-2.2.12/src/indent.c:1062:5: error: nested extern declaration of 'setlocale' [-Werror=nested-externs] +| ../../indent-2.2.12/src/indent.c:1062:15: error: 'LC_ALL' undeclared (first use in this function) + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + src/indent.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/indent.c b/src/indent.c +index 4d666e2..0c2780b 100644 +--- a/src/indent.c b/src/indent.c +@@ -71,7 +71,7 @@ + #include + #include + #include +-#ifdef HAVE_LOCALE_H ++#if defined(HAVE_LC_MESSAGES) || defined(HAVE_LOCALE_H) + #include + #endif + #include "indent.h" +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/indent/indent_2.2.10.bb b/meta-oe/recipes-extended/indent/indent_2.2.12.bb similarity index 68% rename from meta-oe/recipes-extended/indent/indent_2.2.10.bb rename to meta-oe/recipes-extended/indent/indent_2.2.12.bb index d25e8e317..eda388e37 100644 --- a/meta-oe/recipes-extended/indent/indent_2.2.10.bb +++ b/meta-oe/recipes-extended/indent/indent_2.2.12.bb @@ -11,9 +11,12 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "virtual/gettext" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "be35ea62705733859fbf8caf816d8959" -SRC_URI[sha256sum] = "8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639" +SRC_URI =
[oe] [meta-oe][PATCH 2/2] upower: add REQUIRED_DISTRO_FEATURES for polkit
From: Mingli Yu After below commits to add polkit as a required distro feature: 97a1a55 polkit: add polkit as a required distro feature c049e02 polkit: inherit distro_features_check Need to add REQUIRED_DISTRO_FEATURES for polkit to fix below error for these packages which depend on polkit: $ bitbake upower ERROR: Nothing PROVIDES 'polkit' (but /build/layers/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb DEPENDS on or otherwise requires it) Signed-off-by: Mingli Yu --- meta-oe/recipes-support/upower/upower_0.99.7.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/upower/upower_0.99.7.bb b/meta-oe/recipes-support/upower/upower_0.99.7.bb index 2cf3163..3fd91e9 100644 --- a/meta-oe/recipes-support/upower/upower_0.99.7.bb +++ b/meta-oe/recipes-support/upower/upower_0.99.7.bb @@ -11,7 +11,9 @@ SRC_URI = " \ SRC_URI[md5sum] = "236bb439d9ff1151450b3d8582399532" SRC_URI[sha256sum] = "24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401" -inherit autotools pkgconfig gettext gobject-introspection systemd +inherit autotools pkgconfig gettext gobject-introspection systemd distro_features_check + +REQUIRED_DISTRO_FEATURES = "polkit" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] udisks2: add REQUIRED_DISTRO_FEATURES for polkit
From: Mingli Yu After below commits to add polkit as a required distro feature: 97a1a55 polkit: add polkit as a required distro feature c049e02 polkit: inherit distro_features_check Need to add REQUIRED_DISTRO_FEATURES for polkit to fix below error for these packages which depend on polkit: $ bitbake udisk2 ERROR: Nothing PROVIDES 'polkit' (but /build/layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb DEPENDS on or otherwise requires it) Signed-off-by: Mingli Yu --- meta-oe/recipes-support/udisks/udisks2_2.7.8.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb b/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb index 64b338f..95f8e22 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb @@ -27,7 +27,9 @@ S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -inherit autotools systemd gtk-doc gobject-introspection +inherit autotools systemd gtk-doc gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "polkit" EXTRA_OECONF = "--disable-man --disable-gtk-doc" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] cryptsetup: Upgrade to 2.1.0
From: Mingli Yu Instead of hardcoding the version in SRC_URI, get the version for the folder of the source dynamically in SRC_URI. Signed-off-by: Mingli Yu --- .../cryptsetup/{cryptsetup_2.0.4.bb => cryptsetup_2.1.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.0.4.bb => cryptsetup_2.1.0.bb} (83%) diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb similarity index 83% rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb index cc7bc6e01..cf1d22242 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb @@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" DEPENDS = "util-linux libdevmapper popt libgcrypt json-c" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz" -SRC_URI[md5sum] = "ed42b31f67d05b05e392d1943d467b8d" -SRC_URI[sha256sum] = "9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" +SRC_URI[md5sum] = "41d8b985ef69242852b93e95d53e8e28" +SRC_URI[sha256sum] = "a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897" inherit autotools gettext pkgconfig -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] vim: improve reproducibility
From: Mingli Yu Clear all_cflags, all_lflags, compiled_user and compiled_sys to avoid introducing build info to improve reproducibility as below: WARNING: vim-8.1.0347-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/vim/8.1.0347-r0/packages-split/vim/usr/bin/vim.vim in package contained reference to tmpdir [buildpaths] Signed-off-by: Mingli Yu --- ...src-Makefile-improve-reproducibility.patch | 46 +++ meta-oe/recipes-support/vim/vim_8.1.0347.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch diff --git a/meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch b/meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch new file mode 100644 index 0..63a7b78f1 --- /dev/null +++ b/meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch @@ -0,0 +1,46 @@ +From 133ab27cdb17ca20ef6b0304cf30621d2bcbe757 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 31 Jan 2019 21:32:26 -0800 +Subject: [PATCH] src/Makefile: improve reproducibility + +Clear all_cflags, all_lflags, compiled_user +and compiled_sys to avoid introducing build +info to improve reproducibility as below: + +WARNING: vim-8.1.0347-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/vim/8.1.0347-r0/packages-split/vim/usr/bin/vim.vim in package contained reference to tmpdir [buildpaths] + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu +--- + src/Makefile | 14 -- + 1 file changed, 4 insertions(+), 10 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index f2fafa4dc..7148d4bd9 100644 +--- a/src/Makefile b/src/Makefile +@@ -2845,16 +2845,10 @@ auto/pathdef.c: Makefile auto/config.mk + -@echo '#include "vim.h"' >> $@ + -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ + -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@ +- -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ +- -@if test -n "$(COMPILEDBY)"; then \ +- echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ +- else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi +- -@echo '";' >> $@ +- -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@ +- -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi +- -@echo '";' >> $@ ++ -@echo 'char_u *all_cflags = (char_u *)"";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_lflags = (char_u *)"";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *compiled_user = (char_u *)"";' >> $@ ++ -@echo 'char_u *compiled_sys = (char_u *)"";' >> $@ + -@sh $(srcdir)/pathdef.sh + + GUI_GTK_RES_INPUTS = \ +-- +2.17.1 + diff --git a/meta-oe/recipes-support/vim/vim_8.1.0347.bb b/meta-oe/recipes-support/vim/vim_8.1.0347.bb index 46d229e03..4de4d8e38 100644 --- a/meta-oe/recipes-support/vim/vim_8.1.0347.bb +++ b/meta-oe/recipes-support/vim/vim_8.1.0347.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;endline=287;md5=f1f82b42360 SRC_URI = "git://github.com/vim/vim.git \ file://disable_acl_header_check.patch;patchdir=.. \ file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \ + file://0001-src-Makefile-improve-reproducibility.patch;patchdir=.. \ " SRCREV = "f1c118be93184e8e57e3e80b1b3383f464ed649e" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] openldap: improve reproducibility
From: Mingli Yu Rework remove-user-host-pwd-from-version.patch to fix below buildpath warning: | WARNING: openldap-2.4.46-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/openldap/2.4.46-r0/packages-split/openldap-bin/usr/bin/ldappasswd in package contained reference to tmpdir [buildpaths] Signed-off-by: Mingli Yu --- .../openldap/openldap/remove-user-host-pwd-from-version.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch index 4eb389797..ac18f0830 100644 --- a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch +++ b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch @@ -11,7 +11,7 @@ diff -ru openldap-2.4.46.orig/build/mkversion openldap-2.4.46/build/mkversion + DATE=$(date -d@$SOURCE_DATE_EPOCH +' %b %d %Y ') + TIME=$(date -d@$SOURCE_DATE_EPOCH +' %H:%M:%S ') +else -+ WHOWHERE="$USER@$(uname -n):$(pwd)" ++ WHOWHERE="openldap" + DATE='" __DATE__ "' + TIME='" __TIME__ "' +fi -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] openldap: improve reproducibility
From: Mingli Yu Rework remove-user-host-pwd-from-version.patch to fix below buildpath warning: | WARNING: openldap-2.4.46-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/openldap/2.4.46-r0/packages-split/openldap-bin/usr/bin/ldappasswd in package contained reference to tmpdir [buildpaths] Signed-off-by: Mingli Yu --- .../openldap/openldap/remove-user-host-pwd-from-version.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch index 4eb389797..ac18f0830 100644 --- a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch +++ b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch @@ -11,7 +11,7 @@ diff -ru openldap-2.4.46.orig/build/mkversion openldap-2.4.46/build/mkversion + DATE=$(date -d@$SOURCE_DATE_EPOCH +' %b %d %Y ') + TIME=$(date -d@$SOURCE_DATE_EPOCH +' %H:%M:%S ') +else -+ WHOWHERE="$USER@$(uname -n):$(pwd)" ++ WHOWHERE="openldap" + DATE='" __DATE__ "' + TIME='" __TIME__ "' +fi -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] libteam: Upgrade to 1.28
From: Mingli Yu Remove the useless checksum lines as the source is git repo, not the tar file. Signed-off-by: Mingli Yu --- .../libteam/{libteam_1.27.bb => libteam_1.28.bb} | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) rename meta-oe/recipes-support/libteam/{libteam_1.27.bb => libteam_1.28.bb} (84%) diff --git a/meta-oe/recipes-support/libteam/libteam_1.27.bb b/meta-oe/recipes-support/libteam/libteam_1.28.bb similarity index 84% rename from meta-oe/recipes-support/libteam/libteam_1.27.bb rename to meta-oe/recipes-support/libteam/libteam_1.28.bb index 442592de9..b80bb4efa 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.27.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.28.bb @@ -13,10 +13,7 @@ SRC_URI = "git://github.com/jpirko/libteam \ file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ file://run-ptest \ " -SRCREV = "91a928a56a501daac5ce8b3c16bd9943661f1d16" - -SRC_URI[md5sum] = "565114d70c41bff6093d8e57be284e8a" -SRC_URI[sha256sum] = "d65286379141db141bea33424ec0507bb0f827a0bf03d9c65004bb593e3d5545" +SRCREV = "903950c7fcf28c32f4b62d9d1c07c0234e8378a2" S = "${WORKDIR}/git" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] libdbi-perl: Upgrade to 1.642
From: Mingli Yu Signed-off-by: Mingli Yu --- .../perl/{libdbi-perl_1.641.bb => libdbi-perl_1.642.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-devtools/perl/{libdbi-perl_1.641.bb => libdbi-perl_1.642.bb} (88%) diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb similarity index 88% rename from meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb rename to meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb index 24a1245fc..3c031646b 100644 --- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb +++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb @@ -16,8 +16,8 @@ RDEPENDS_${PN} = " perl-module-carp \ LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz; -SRC_URI[md5sum] = "e77fd37fcf77fc88fde029c1b75ded54" -SRC_URI[sha256sum] = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1" +SRC_URI[md5sum] = "f2ba18b5cea1c8cb322a62be0a847f3d" +SRC_URI[sha256sum] = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d" S = "${WORKDIR}/DBI-${PV}" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] vsftpd: allow getdents64 in the seccomp sandbox
From: Mingli Yu seccomp is activated by default in vsftpd and this has caused compatibility issues with some kernel versions. This was fixed as one can see as https://bugzilla.redhat.com/show_bug.cgi?id=845980, but can still cause issues with newer kernels with kernel 4.18+. And there is even a patch 0034-Turn-off-seccomp-sandbox-because-it-is-too-strict.patch in fedora[https://dl.fedoraproject.org/pub/fedora/linux/releases/29/Everything/source/tree/Packages/v/vsftpd-3.0.3-28.fc29.src.rpm] turning off seccomp sandbox for vsftpd by default as below which means fedora doesn't limit the syscall any more by default. [snip] - tunable_seccomp_sandbox = 1; + tunable_seccomp_sandbox = 0; tunable_allow_writeable_chroot = 0; tunable_accept_timeout = 60; [snip] Refresh 0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch to allow one more syscall getdents64 in the seccomp sandbox apart from the previous one in below commit: fbffcf3f3 vsftpd: allow sysinfo() in the seccomp sandbox before this patch: root@qemux86-64:~# tnftp 127.0.0.1 Connected to 127.0.0.1. 220 (vsFTPd 3.0.3) Name (127.0.0.1:root): anonymous 331 Please specify the password. Password: 230 Login successful. Remote system type is UNIX. Using binary mode to transfer files. ftp> dir 229 Entering Extended Passive Mode (|||8352|) 150 Here comes the directory listing. 500 OOPS: priv_sock_get_cmd ftp> after this patch: root@qemux86-64:~# tnftp 127.0.0.1 Connected to 127.0.0.1. 220 (vsFTPd 3.0.3) Name (127.0.0.1:root): anonymous 331 Please specify the password. Password: 230 Login successful. Remote system type is UNIX. Using binary mode to transfer files. ftp> dir 229 Entering Extended Passive Mode (|||22610|) 150 Here comes the directory listing. 226 Directory send OK. ftp> Reference: https://wiki.archlinux.org/index.php/Very_Secure_FTP_Daemon#vsftpd:_Error_500_with_kernel_4.18+ Signed-off-by: Mingli Yu --- ...low-syscalls-in-the-seccomp-sandbox.patch} | 33 ++- .../recipes-daemons/vsftpd/vsftpd_3.0.3.bb| 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) rename meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/{0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch => 0001-vsftpd-allow-syscalls-in-the-seccomp-sandbox.patch} (47%) diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-syscalls-in-the-seccomp-sandbox.patch similarity index 47% rename from meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch rename to meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-syscalls-in-the-seccomp-sandbox.patch index c6c0f80a1..7573c967f 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-syscalls-in-the-seccomp-sandbox.patch @@ -1,15 +1,13 @@ -From 9c4826c19f04da533886209361a2caddf582d65c Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Tue, 6 Sep 2016 17:17:44 +0800 -Subject: [PATCH] vsftpd: allow sysinfo() in the seccomp sandbox +From dd353303f62d1dfe32cb000e482616b021708fbe Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 29 Nov 2018 00:47:34 -0800 +Subject: [PATCH] vsftpd: allow syscalls in the seccomp sandbox -Upstream-Status: Pending - -* Allow sysinfo() in the seccomp sandbox otherwise - comes below OOPS: priv_sock_get_cmd as the syscall - sysinfo() not allowed +* Allow sysinfo() and getdents64 in the seccomp + sandbox otherwise comes below OOPS: priv_sock_get_cmd + as the syscall sysinfo() and getdents64 not allowed -tnftp 192.168.1.1 +root@qemux86-64:~# tnftp 192.168.1.1 Connected to 192.168.1.1. 220 (vsFTPd 3.0.3) Name (192.168.1.1:root): anonymous @@ -23,21 +21,26 @@ Interactive mode off. ftp> mget small* OOPS: priv_sock_get_cmd -Signed-off-by: Mingli Yu +Upstream-Status: Pending +Signed-off-by: Mingli Yu --- - seccompsandbox.c | 1 + - 1 file changed, 1 insertion(+) + seccompsandbox.c | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/seccompsandbox.c b/seccompsandbox.c -index 2c350a9..67d9ca5 100644 +index 2c350a9..377c50e 100644 --- a/seccompsandbox.c +++ b/seccompsandbox.c -@@ -409,6 +409,7 @@ seccomp_sandbox_setup_postlogin(const struct vsf_session* p_sess) +@@ -409,6 +409,8 @@ seccomp_sandbox_setup_postlogin(const struct vsf_session* p_sess) allow_nr(__NR_getcwd); allow_nr(__NR_chdir); allow_nr(__NR_getdents); ++ allow_nr(__NR_getdents64); + allow_nr(__NR_sysinfo); /* Misc */ allow_nr(__NR_umask); +-- +2.17.1 + diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index 2e3e0e884..df0d7f455 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++
[oe] [meta-oe][PATCH] librelp: Upgrade to 1.2.18
From: Mingli Yu * Correct the homepage * Remove two backported patches * Backport 0001-testbench-improvements.patch to fix the below error: | ../../git/src/tcp.c:3072:57: error: '%s' directive output may be truncated writing up to 1023 bytes into a region of size 1005 [-Werror=format-truncation=] | snprintf(errmsg, sizeof(errmsg), "error connecting: '%s'", errStr); Signed-off-by: Mingli Yu --- ...src-tcp.c-fix-jump-misses-init-error.patch | 71 ...c-tcp.c-increase-the-size-of-szHname.patch | 53 -- .../librelp/0001-testbench-improvements.patch | 164 ++ .../{librelp_1.2.16.bb => librelp_1.2.18.bb} | 7 +- 4 files changed, 167 insertions(+), 128 deletions(-) delete mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch delete mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch create mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.16.bb => librelp_1.2.18.bb} (54%) diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch deleted file mode 100644 index 68b686346..0 --- a/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 3e5a0cb440c788e2383e40ab23ac1cf01d96961b Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Tue, 24 Jul 2018 01:30:25 -0700 -Subject: [PATCH] src/tcp.c: fix jump-misses-init error - -Fix below jump-misses-init error - -| In file included from ../../git/src/tcp.c:51: -| ../../git/src/tcp.c: In function 'relpTcpConnect': -| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init] -|goto finalize_it; \ -|^~~~ -| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE' -|ABORT_FINALIZE(RELP_RET_IO_ERR); -|^~ -| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here -| finalize_it: -| ^~~ -| ../../git/src/tcp.c:1991:6: note: 'r' declared here -| int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, _error, ); -| ^ -| In file included from ../../git/src/tcp.c:51: -| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init] -|goto finalize_it; \ -|^~~~ -| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE' -|ABORT_FINALIZE(RELP_RET_IO_ERR); -|^~ -| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here -| finalize_it: -| ^~~ -| ../../git/src/tcp.c:1989:12: note: 'len' declared here -| socklen_t len = sizeof so_error; -| ^~~ - -Upstream-Status: Submitted[https://github.com/rsyslog/librelp/pull/117] - -Signed-off-by: Mingli Yu - src/tcp.c | 7 --- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/tcp.c b/src/tcp.c -index f35eb84..fb34dc7 100644 a/src/tcp.c -+++ b/src/tcp.c -@@ -1936,6 +1936,9 @@ relpTcpConnect(relpTcp_t *const pThis, - struct addrinfo hints; - struct addrinfo *reslocal = NULL; - struct pollfd pfd; -+ int so_error; -+ socklen_t len = sizeof so_error; -+ int r; - - ENTER_RELPFUNC; - RELPOBJ_assert(pThis, Tcp); -@@ -1985,10 +1988,8 @@ relpTcpConnect(relpTcp_t *const pThis, - ABORT_FINALIZE(RELP_RET_TIMED_OUT); - } - -- int so_error; -- socklen_t len = sizeof so_error; - -- int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, _error, ); -+ r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, _error, ); - if (r == -1 || so_error != 0) { - pThis->pEngine->dbgprint("socket has an error %d\n", so_error); - ABORT_FINALIZE(RELP_RET_IO_ERR); --- -2.17.1 - diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch deleted file mode 100644 index 5a62e1584..0 --- a/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d8950ad273d79ec516468289adbd427e681dbc66 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 30 Jul 2018 01:22:56 -0700 -Subject: [PATCH] src/tcp.c: increase the size of szHname - -Increase the size of szHname to fix below -error: -| ../../git/src/tcp.c: In function 'relpTcpSetRemHost': -| ../../git/src/tcp.c:352:57: error: '%s' directive output may be truncated writing up to 1024 bytes into a region of size 1011 [-Werror=format-truncation=] -| snprintf((char*)szHname, NI_MAXHOST, "[MALICIOUS:IP=%s]", szIP); -| ^~ -| In file included from
[oe] [meta-oe][PATCH] krb5: Upgrade to 1.16.2
From: Mingli Yu Signed-off-by: Mingli Yu --- .../krb5/{krb5_1.16.1.bb => krb5_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-connectivity/krb5/{krb5_1.16.1.bb => krb5_1.16.2.bb} (98%) diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.16.1.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb similarity index 98% rename from meta-oe/recipes-connectivity/krb5/krb5_1.16.1.bb rename to meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb index 11748cbd0..c770f7bbe 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.16.1.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb @@ -31,8 +31,8 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://krb5-kdc.service \ file://krb5-admin-server.service \ " -SRC_URI[md5sum] = "848e9b80d6798e3f3df24b83c407" -SRC_URI[sha256sum] = "214ffe394e3ad0c730564074ec44f1da119159d94281bbec541dc29168d21117" +SRC_URI[md5sum] = "ffd52595e969fb700d37313606e4dc3d" +SRC_URI[sha256sum] = "9f721e1fe593c219174740c71de514c7228a97d23eb7be7597b2ae14e487f027" CVE_PRODUCT = "kerberos" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] fio: Upgrade to 3.12
From: Mingli Yu Refresh 0001-update-the-interpreter-paths.patch as the folder unit_tests/ is renamed to t/ in below commit: c44d2c6e Move steady state unit test to t/ Signed-off-by: Mingli Yu --- .../fio/files/0001-update-the-interpreter-paths.patch | 8 meta-oe/recipes-benchmark/fio/{fio_3.8.bb => fio_3.12.bb} | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename meta-oe/recipes-benchmark/fio/{fio_3.8.bb => fio_3.12.bb} (96%) diff --git a/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch b/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch index 276a24d89..327b9f5b7 100644 --- a/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch +++ b/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch @@ -16,7 +16,7 @@ Signed-off-by: Mingli Yu tools/hist/fiologparser_hist.py | 2 +- tools/hist/half-bins.py | 2 +- tools/plot/fio2gnuplot | 2 +- - unit_tests/steadystate_tests.py | 2 +- + t/steadystate_tests.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv @@ -79,10 +79,10 @@ index 4d1815cf..509141af 100755 # Note: this script is python2 and python3 compatible. # # Copyright (C) 2013 eNovance SAS -diff --git a/unit_tests/steadystate_tests.py b/unit_tests/steadystate_tests.py +diff --git a/t/steadystate_tests.py b/t/steadystate_tests.py index 50254dcc..95e7dfde 100755 a/unit_tests/steadystate_tests.py -+++ b/unit_tests/steadystate_tests.py +--- a/t/steadystate_tests.py b/t/steadystate_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!/usr/bin/env python diff --git a/meta-oe/recipes-benchmark/fio/fio_3.8.bb b/meta-oe/recipes-benchmark/fio/fio_3.12.bb similarity index 96% rename from meta-oe/recipes-benchmark/fio/fio_3.8.bb rename to meta-oe/recipes-benchmark/fio/fio_3.12.bb index 5bc48b052..2deb42db9 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.8.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.12.bb @@ -21,7 +21,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" # rev for v3.8 -SRCREV = "bfd986752ad053175423ffe3bbbeb07803f8ad4a" +SRCREV = "16500b5a0b03ee0142d592bb74a46943a223b06e" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ " -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] log4cplus: Upgrade to 2.0.2
From: Mingli Yu Signed-off-by: Mingli Yu --- .../log4cplus/{log4cplus_2.0.1.bb => log4cplus_2.0.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-devtools/log4cplus/{log4cplus_2.0.1.bb => log4cplus_2.0.2.bb} (81%) diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.1.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.2.bb similarity index 81% rename from meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.1.bb rename to meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.2.bb index aef5978bd..d17d15c92 100644 --- a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.1.bb +++ b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.2.bb @@ -7,8 +7,8 @@ LICENSE = "Apache-2.0 & BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "2b4054b2d66c0ef0e4091df26ce8aad4" -SRC_URI[sha256sum] = "772b268142e1c02dd346880fff06f38f693e9458d6390ce0b493395d0ca01714" +SRC_URI[md5sum] = "b3bbeb2dc3e170768430cf87583016f8" +SRC_URI[sha256sum] = "10539f2315271d370c7bc6a2b4808cbe369279837f4539ce5c789e456489fc62" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/; UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] iozone3: Upgrade to 484
From: Mingli Yu Signed-off-by: Mingli Yu --- .../iozone3/{iozone3_482.bb => iozone3_484.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-benchmark/iozone3/{iozone3_482.bb => iozone3_484.bb} (96%) diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_482.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_484.bb similarity index 96% rename from meta-oe/recipes-benchmark/iozone3/iozone3_482.bb rename to meta-oe/recipes-benchmark/iozone3/iozone3_484.bb index db79dff0a..f218b87e9 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_482.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_484.bb @@ -10,8 +10,8 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://parallelism.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "31ca1d3d28bc375c20a2808217cf212c" -SRC_URI[sha256sum] = "2733feb63c96f77177c68f3d938f2294d5394d8554b2767c45cbe138b2f3ae30" +SRC_URI[md5sum] = "aa6b88ab83793cb6809ca06949a6ab01" +SRC_URI[sha256sum] = "e816e6ae2f02003f2a6d19d47fcd9a50fdd8078da4f35fe3d4b9caf91c3d7216" UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mcelog: Upgrade to 161
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-support/mcelog/{mcelog_160.bb => mcelog_161.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/mcelog/{mcelog_160.bb => mcelog_161.bb} (95%) diff --git a/meta-oe/recipes-support/mcelog/mcelog_160.bb b/meta-oe/recipes-support/mcelog/mcelog_161.bb similarity index 95% rename from meta-oe/recipes-support/mcelog/mcelog_160.bb rename to meta-oe/recipes-support/mcelog/mcelog_161.bb index 8946134cd..dfca3855b 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_160.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_161.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; file://run-ptest \ " -SRCREV = "10b832edec31d48adf414709dec9327354310f52" +SRCREV = "6ed93e30f83519b0ab71f8ecd156b8ff0b2912b6" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libestr: Upgrade to 0.1.11
From: Mingli Yu Signed-off-by: Mingli Yu --- .../libestr/{libestr_0.1.10.bb => libestr_0.1.11.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/libestr/{libestr_0.1.10.bb => libestr_0.1.11.bb} (71%) diff --git a/meta-oe/recipes-support/libestr/libestr_0.1.10.bb b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb similarity index 71% rename from meta-oe/recipes-support/libestr/libestr_0.1.10.bb rename to meta-oe/recipes-support/libestr/libestr_0.1.11.bb index abce8f3d3..ff61dd8fd 100644 --- a/meta-oe/recipes-support/libestr/libestr_0.1.10.bb +++ b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0" SRC_URI = "http://libestr.adiscon.com/files/download/${BP}.tar.gz; -SRC_URI[md5sum] = "f4c9165a23587e77f7efe65d676d5e8e" -SRC_URI[sha256sum] = "bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c" +SRC_URI[md5sum] = "1f25a2332750d4bfacfb314235fedff0" +SRC_URI[sha256sum] = "46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024" UPSTREAM_CHECK_URI = "http://libestr.adiscon.com/download/; -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] tk: export TK_LIBRARY='${libdir}/tk${VER}'
From: Mingli Yu As there is below logic in configure.in [snip] test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' [snip] It can make TK_LIBRARY to be $(prefix)/lib/tk$(VERSION) and then result in some files installed to /usr/lib/tk8.6 even when ${libdir} actually extract as /usr/lib64 and there is also a commit as below adding hack to workaround this. 1ca29d1cd tk: make multilib build compatible and fix library install Export TK_LIBRARY='${libdir}/tk${VER}' to guarantee the files installed to the expected places and also remove the workaround in the previous commit 1ca29d1cd. Signed-off-by: Mingli Yu --- meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb index d0f6fe0..4e38525 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb @@ -45,19 +45,11 @@ EXTRA_OECONF = "\ --with-tcl=${STAGING_BINDIR}/crossscripts \ --libdir=${libdir} \ " - +export TK_LIBRARY='${libdir}/tk${VER}' do_install_append() { ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 oe_libinstall -so libtk${VER} ${D}${libdir} ln -sf wish${VER} ${D}${bindir}/wish - -# Even after passing libdir=${libdir} at config, some incorrect dirs are still generated for the multilib build -if [ "$libdir" != "/usr/lib" ]; then -# Move files to correct library directory -mv ${D}/usr/lib/tk${VER}/* ${D}/${libdir}/tk${VER}/ -# Remove unneeded/incorrect dir ('usr/lib/') -rm -rf ${D}/usr/lib -fi } PACKAGECONFIG ??= "xft" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] tk: update the parameter for --with-tcl
From: Mingli Yu Update the parameter for --with-tcl to fix below do_configure issue: $ bitbake tk-native | checking for Tcl configuration... configure: error: /mybuild/tmp/work/x86_64-linux/tk-native/8.6.8-r0/recipe-sysroot-native/usr/bin directory doesn't contain tclConfig.sh Signed-off-by: Mingli Yu --- meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb index 10281b2..d0f6fe0 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb @@ -42,7 +42,7 @@ REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = "\ --enable-threads \ --with-x \ ---with-tcl=${STAGING_BINDIR_CROSS} \ +--with-tcl=${STAGING_BINDIR}/crossscripts \ --libdir=${libdir} \ " -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] hwloc: Update the SRC_URI
From: Mingli Yu Update the SRC_URI to fix below issue: $ bitbake -cfetch lib32-hwloc ERROR: lib32-hwloc-1.11.10-r0 do_fetch: Fetcher failure for URL: 'https://www.open-mpi.org/software/lib32-hwloc/v1.11/downloads/hwloc-1.11.10.tar.bz2'. Unable to fetch URL from any source. Actually the source located under https://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.10.tar.bz2 Signed-off-by: Mingli Yu --- meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb b/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb index 701af15..5f4155e 100644 --- a/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb +++ b/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb @@ -7,7 +7,7 @@ SECTION = "base" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" -SRC_URI = "https://www.open-mpi.org/software/${PN}/v1.11/downloads/${BP}.tar.bz2; +SRC_URI = "https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2; SRC_URI[md5sum] = "0981a01935982aa7e850a96e0c3057b0" SRC_URI[sha256sum] = "2be808383d8337846fe77ce49c7ad3336fb6857505494d85c0ac03f22c5bd1e7" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] tk: extend to nativesdk
From: Mingli Yu After enable tk via PACKAGECONFIG for python3, there comes below error: Missing or unbuildable dependency chain was: ['buildtools-tarball', 'nativesdk-python3', 'nativesdk-tk'] Extend tk to nativesdk to fix this issue. Signed-off-by: Mingli Yu --- meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb index 13dc4d7..10281b2 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb @@ -73,7 +73,7 @@ FILES_${PN} += "${libdir}/tk*" RDEPENDS_${PN} += "tk-lib" RDEPENDS_${PN}_class-native = "" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" # Fix the path in sstate SSTATE_SCAN_FILES += "*Config.sh" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mariadb: Upgrade to 5.5.62
From: Mingli Yu MariaDB 5.5.62 is a maintenance release. It includes bugfixes and updates, including from MySQL 5.5.62. . XtraDB updated to 5.5.61-38.13 . Fixes for the following security vulnerabilities: CVE-2018-3282 CVE-2018-3174 Signed-off-by: Mingli Yu --- .../{mariadb-native_5.5.61.bb => mariadb-native_5.5.62.bb}| 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 4 ++-- .../mysql/{mariadb_5.5.61.bb => mariadb_5.5.62.bb}| 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_5.5.61.bb => mariadb-native_5.5.62.bb} (100%) rename meta-oe/recipes-dbs/mysql/{mariadb_5.5.61.bb => mariadb_5.5.62.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.61.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_5.5.61.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index b9fa98b5a..8ca5b2ba4 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -18,8 +18,8 @@ SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ file://change-cc-to-cc-version.patch \ file://0001-disable-ucontext-on-musl.patch \ " -SRC_URI[md5sum] = "cb343f855a35ed24ea25984144963f9f" -SRC_URI[sha256sum] = "57afd089e3b458cda26beeda63c0bfe125baa6fead2120478788f1945e551013" +SRC_URI[md5sum] = "6375d577e9539b839f44d857e70f82b9" +SRC_URI[sha256sum] = "56a365af71b8a9ec8bfee0801e2dec95011da8ee7507986ca329be11296411db" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases; diff --git a/meta-oe/recipes-dbs/mysql/mariadb_5.5.61.bb b/meta-oe/recipes-dbs/mysql/mariadb_5.5.62.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_5.5.61.bb rename to meta-oe/recipes-dbs/mysql/mariadb_5.5.62.bb -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] lvm2: update SRC_URI
From: Mingli Yu Update SRC_URI for lvm2 as the previous one is invalid. Signed-off-by: Mingli Yu --- meta-oe/recipes-support/lvm2/lvm2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 75f4d89..5728d83 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ DEPENDS += "util-linux libaio" -SRC_URI = "ftp://sources.redhat.com/pub/lvm2/LVM2.${PV}.tgz \ +SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] apache2: Fix CVE-2018-11763
From: Mingli Yu mod_http2: connection IO event handling reworked. Instead of reacting on incoming bytes, the state machine now acts on incoming frames that are affecting it. This reduces state transitions. Reference: https://people.canonical.com/~ubuntu-security/cve/2018/CVE-2018-11763.html Signed-off-by: Mingli Yu --- .../apache2/apache2-native_2.4.34.bb | 1 + .../apache2/apache2/CVE-2018-11763.patch | 512 ++ .../recipes-httpd/apache2/apache2_2.4.34.bb | 1 + 3 files changed, 514 insertions(+) create mode 100644 meta-webserver/recipes-httpd/apache2/apache2/CVE-2018-11763.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.34.bb b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.34.bb index a3a6804d8..4cc384546 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.34.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.34.bb @@ -10,6 +10,7 @@ inherit autotools pkgconfig native SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ + file://CVE-2018-11763.patch \ " S = "${WORKDIR}/httpd-${PV}" diff --git a/meta-webserver/recipes-httpd/apache2/apache2/CVE-2018-11763.patch b/meta-webserver/recipes-httpd/apache2/apache2/CVE-2018-11763.patch new file mode 100644 index 0..a2c5b2e02 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2/CVE-2018-11763.patch @@ -0,0 +1,512 @@ +From 484aba5048e3457dc1d15189f1910d007b1a4a76 Mon Sep 17 00:00:00 2001 +From: Jim Jagielski +Date: Wed, 12 Sep 2018 20:38:02 + +Subject: [PATCH] Merge r1840010 from trunk: + +On the trunk: + +mod_http2: connection IO event handling reworked. Instead of reacting on + incoming bytes, the state machine now acts on incoming frames that are + affecting it. This reduces state transitions. + + +Submitted by: icing +Reviewed by: icing, ylavic, jim + + +git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1840757 13f79535-47bb-0310-9956-ffa450edef68 +CVE: CVE-2018-11763 +Upstream-Status: Backport [https://github.com/apache/httpd/commit/484aba5048e3457dc1d15189f1910d007b1a4a76] + +Signed-off-by: Mingli Yu +--- + modules/http2/h2_session.c | 238 +++-- + modules/http2/h2_session.h | 7 +- + modules/http2/h2_version.h | 4 +- + 3 files changed, 158 insertions(+), 97 deletions(-) + +diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c +index 805d6774dc..a1b31d2b30 100644 +--- a/modules/http2/h2_session.c b/modules/http2/h2_session.c +@@ -235,6 +235,7 @@ static int on_data_chunk_recv_cb(nghttp2_session *ngh2, uint8_t flags, + stream = h2_session_stream_get(session, stream_id); + if (stream) { + status = h2_stream_recv_DATA(stream, flags, data, len); ++dispatch_event(session, H2_SESSION_EV_STREAM_CHANGE, 0, "stream data rcvd"); + } + else { + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03064) +@@ -317,9 +318,9 @@ static int on_header_cb(nghttp2_session *ngh2, const nghttp2_frame *frame, + } + + /** +- * nghttp2 session has received a complete frame. Most, it uses +- * for processing of internal state. HEADER and DATA frames however +- * we need to handle ourself. ++ * nghttp2 session has received a complete frame. Most are used by nghttp2 ++ * for processing of internal state. Some, like HEADER and DATA frames, ++ * we need to act on. + */ + static int on_frame_recv_cb(nghttp2_session *ng2s, + const nghttp2_frame *frame, +@@ -378,6 +379,9 @@ static int on_frame_recv_cb(nghttp2_session *ng2s, + "h2_stream(%ld-%d): WINDOW_UPDATE incr=%d", + session->id, (int)frame->hd.stream_id, + frame->window_update.window_size_increment); ++if (nghttp2_session_want_write(session->ngh2)) { ++dispatch_event(session, H2_SESSION_EV_FRAME_RCVD, 0, "window update"); ++} + break; + case NGHTTP2_RST_STREAM: + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03067) +@@ -404,6 +408,12 @@ static int on_frame_recv_cb(nghttp2_session *ng2s, +frame->goaway.error_code, NULL); + } + break; ++case NGHTTP2_SETTINGS: ++if (APLOGctrace2(session->c)) { ++ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, session->c, ++ H2_SSSN_MSG(session, "SETTINGS, len=%ld"), (long)frame->hd.length); ++} ++break; + default: + if (APLOGctrace2(session->c)) { + char buffer[256]; +@@ -415,7 +425,40 @@ static int on_frame_recv_cb(nghttp2_session *ng2s, + } + break; + } +-return (APR_SUCCESS == rv)? 0 : NGHTTP2_ERR_PROTO; ++ ++if
[oe] [meta-perl][PATCH 2/2] adduser: Update SRC_URI
From: Mingli Yu Update SRC_URI for adduser as the previous one is invalid. Signed-off-by: Mingli Yu --- meta-perl/recipes-perl/adduser/adduser_3.117.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-perl/recipes-perl/adduser/adduser_3.117.bb b/meta-perl/recipes-perl/adduser/adduser_3.117.bb index e5cefd4..ca96e11 100644 --- a/meta-perl/recipes-perl/adduser/adduser_3.117.bb +++ b/meta-perl/recipes-perl/adduser/adduser_3.117.bb @@ -6,7 +6,7 @@ SECTION = "base/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=caed49ab166f22ef31bf1127f558d0ef" -SRC_URI = "http://ftp.de.debian.org/debian/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \ +SRC_URI = "https://launchpad.net/debian/+archive/primary/+sourcefiles/adduser/${PV}/${BPN}_${PV}.tar.xz \ file://adduser-add-M-option-for-useradd.patch \ " -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/2] snort: Update SRC_URI
From: Mingli Yu Update SRC_URI for snort as the previous one is invalid. Signed-off-by: Mingli Yu --- meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb index 22f52b5..a99138d 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" -SRC_URI = "https://www.snort.org/downloads/snort/${BP}.tar.gz \ +SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ file://snort.init \ file://0001-libpcap-search-sysroot-for-headers.patch \ file://fix-host-contamination-when-enable-static-daq.patch \ -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] udisks2: Upgrade to 2.7.8
From: Mingli Yu This is a bugfix release for UDisks 2.7. Included fixes: - Fix string format vulnerability - Fix CVE-2018-17336 Signed-off-by: Mingli Yu --- .../udisks/{udisks2_2.7.7.bb => udisks2_2.7.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/udisks/{udisks2_2.7.7.bb => udisks2_2.7.8.bb} (89%) diff --git a/meta-oe/recipes-support/udisks/udisks2_2.7.7.bb b/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb similarity index 89% rename from meta-oe/recipes-support/udisks/udisks2_2.7.7.bb rename to meta-oe/recipes-support/udisks/udisks2_2.7.8.bb index ac86a69ee..64b338f11 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.7.7.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb @@ -19,10 +19,10 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" RDEPENDS_${PN} = "acl" SRC_URI = " \ -git://github.com/storaged-project/udisks.git \ +git://github.com/storaged-project/udisks.git;branch=2.7.x-branch \ file://non-gnu-libc.patch \ " -SRCREV = "fcf888ca00980f75ce0c47041629b3d77e9f352e" +SRCREV = "47bc0141cb84624ba1e2242d596a89a30df1f5ea" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] cpupower: Update LIC_FILES_CHKSUM
From: Mingli Yu Update LIC_FILES_CHKSUM for cpupower as the COPYING file which is used for LIC_FILES_CHKSUM has been changed in below commit: commit bf02d491237eea10290bd379bf7fc8c37ac6c3b4 Author: Mauro Carvalho Chehab Date: Fri Mar 23 06:51:06 2018 -0300 COPYING: use the new text with points to the license files Now that we have a new COPYING file with points to the Linux license files, replace it with the old content. This patch does: 1 file changed, 0 insertions(+), 0 deletions(-) rename COPYING.new => COPYING (100%) Reviewed-by: Greg Kroah-Hartman Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet Signed-off-by: Mingli Yu --- meta-oe/recipes-kernel/cpupower/cpupower.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb index 4abd273fa..4544f5b2e 100644 --- a/meta-oe/recipes-kernel/cpupower/cpupower.bb +++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb @@ -2,7 +2,7 @@ SUMMARY = "Shows and sets processor power related values" DESCRIPTION = "cpupower is a collection of tools to examine and tune power \ saving related features of your processor." LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS = "pciutils gettext-native" PROVIDES = "virtual/cpupower" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] rsyslog: avoid recompiling program during running ptest
From: Mingli Yu * Previously there is below logic in rsyslog-8.37.0/tests/Makefile check-TESTS: After below commit in automake, 8555e7b81 check: Make 'check-TESTS' target depend on test dependencies the logic changes to the below: check-TESTS: $(check_PROGRAMS) It will result in compiling program on target when run ptest on target, but actually there is no need to rebuild the program on target, so change it back to "check-TESTS:" to avoid recompiling. * Update the path of abs_top_builddir to guarantee the test env is correct. Signed-off-by: Mingli Yu --- meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb index fb15142..fbdf281 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb @@ -86,10 +86,14 @@ do_install_ptest() { # do NOT need to rebuild Makefile itself sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile +# do NOT need to rebuild $(check_PROGRAMS) +sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile # fix the srcdir, top_srcdir sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile +# fix the abs_top_builddir +sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile # valgrind is not compatible with arm and mips, # so remove related test cases if there is no valgrind. -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] efivar: make CC_FOR_BUILD value complete
From: Mingli Yu Update CC_FOR_BUILD=${BUILD_CC} to CC_FOR_BUILD="${BUILD_CC}" to guarantee the BUILD_CC value passed to CC_FOR_BUILD completely to avoid below build failure when ccache enabled: | NOTE: make -j 48 -C src makeguids CC_FOR_BUILD=ccache gcc | make: Entering directory '/mybuild/tmp-glibc/work/x86_64-linux/efivar-native/0.36-r0/git/src' | ccache -isystem/mybuild/tmp-glibc/work/x86_64-linux/efivar-native/0.36-r0/recipe-sysroot-native/usr/include -O2 -pipe ... -DEFIVAR_BUILD_ENVIRONMENT -o makeguids makeguids.c guid.c -ldl | ccache: invalid option -- 'i' Signed-off-by: Mingli Yu --- meta-oe/recipes-bsp/efivar/efivar_0.36.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-bsp/efivar/efivar_0.36.bb b/meta-oe/recipes-bsp/efivar/efivar_0.36.bb index dfb46c2..20588ee 100644 --- a/meta-oe/recipes-bsp/efivar/efivar_0.36.bb +++ b/meta-oe/recipes-bsp/efivar/efivar_0.36.bb @@ -29,7 +29,7 @@ do_compile_prepend() { } do_compile_class-native() { -oe_runmake -C src makeguids CC_FOR_BUILD=${BUILD_CC} +oe_runmake -C src makeguids CC_FOR_BUILD="${BUILD_CC}" } do_install() { -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] efivar: make CC_FOR_BUILD value complete
From: Mingli Yu Issue: LIN1018-2452 Update CC_FOR_BUILD=${BUILD_CC} to CC_FOR_BUILD="${BUILD_CC}" to guarantee the BUILD_CC value passed to CC_FOR_BUILD completely to avoid below build failure when ccache enabled: | NOTE: make -j 48 -C src makeguids CC_FOR_BUILD=ccache gcc | make: Entering directory '/mybuild/tmp-glibc/work/x86_64-linux/efivar-native/0.36-r0/git/src' | ccache -isystem/mybuild/tmp-glibc/work/x86_64-linux/efivar-native/0.36-r0/recipe-sysroot-native/usr/include -O2 -pipe ... -DEFIVAR_BUILD_ENVIRONMENT -o makeguids makeguids.c guid.c -ldl | ccache: invalid option -- 'i' (LOCAL REV: NOT UPSTREAM) -- Send to oe-devel 20180927 Signed-off-by: Mingli Yu --- meta-oe/recipes-bsp/efivar/efivar_0.36.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-bsp/efivar/efivar_0.36.bb b/meta-oe/recipes-bsp/efivar/efivar_0.36.bb index dfb46c2..20588ee 100644 --- a/meta-oe/recipes-bsp/efivar/efivar_0.36.bb +++ b/meta-oe/recipes-bsp/efivar/efivar_0.36.bb @@ -29,7 +29,7 @@ do_compile_prepend() { } do_compile_class-native() { -oe_runmake -C src makeguids CC_FOR_BUILD=${BUILD_CC} +oe_runmake -C src makeguids CC_FOR_BUILD="${BUILD_CC}" } do_install() { -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] eventlog: remove recipe
From: Mingli Yu eventlog is not external lib anymore and it has been already integrated to syslog-ng as below commit in syslog-ng repo https://github.com/balabit/syslog-ng.git -- Author: kokan Date: Tue Nov 21 22:16:49 2017 +0100 eventlog: now part of the project, not external lib -- Signed-off-by: Mingli Yu --- .../recipes-support/eventlog/eventlog_0.2.13.bb| 23 -- 1 file changed, 23 deletions(-) delete mode 100644 meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb diff --git a/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb b/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb deleted file mode 100644 index 85e29b0ac..0 --- a/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Replacement syslog API" -HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system; -DESCRIPTION = "The EventLog library aims to be a replacement of the \ - simple syslog() API provided on UNIX systems. The \ - major difference between EventLog and syslog is that \ - EventLog tries to add structure to messages. EventLog \ - provides an interface to build, format and output an \ - event record. The exact format and output method can \ - be customized by the administrator via a configuration \ - file. his package is the runtime part of the library. \ -" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=b8ba8e77bcda9a53fac0fe39fe957767" - -PV = "0.2.13+git${SRCPV}" -SRCREV = "a5c19163ba131f79452c6dfe4e31c2b4ce4be741" - -SRC_URI = "git://github.com/balabit/eventlog;protocol=https" - -S = "${WORKDIR}/git" - -inherit autotools -- 2.13.3 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] lksctp-tools: fix ptest Segmentation fault
From: Mingli Yu Initialize the variable event properly to fix the below Segmentation fault: # cd /usr/lib64/lksctp-tools/ptest # ./test_1_to_1_events test_1_to_1_events.c 1 PASS : COMM_UP notification on client socket - SUCCESS test_1_to_1_events.c 2 PASS : COMM_UP notification on server socket - SUCCESS test_1_to_1_events.c 3 BROK : Got a datamsg, expecting notification DUMP_CORE sctputil.c: 187 [ 1468.733938] test_1_to_1_eve[2376]: segfault at 0 ip 561a4a3d5079 sp 7ffd49101580 error 6 in test_1_to_1_events[561a4a3d4000+2000] [ 1468.734479] Code: ff bf 0a 00 00 00 e8 e6 ef ff ff b9 c9 00 00 00 48 8d 15 61 13 00 00 bf 01 00 00 00 31 c0 48 8d 35 c7 0f 00 00 e8 97 f0 Segmentation fault Signed-off-by: Mingli Yu --- ...1_to_1_events.c-initialize-event-properly.patch | 44 ++ .../lksctp-tools/lksctp-tools_1.0.18.bb| 1 + 2 files changed, 45 insertions(+) create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch new file mode 100644 index 000..621e6f4 --- /dev/null +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch @@ -0,0 +1,44 @@ +From e1e670defb84d51efdd124e5f3fa166a1a4b7c1d Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Tue, 25 Sep 2018 11:39:43 +0800 +Subject: [PATCH] test_1_to_1_events.c: initialize event properly + +Initialize event properly to avoid below +Segmentation fault when run below test +related to AUTH_NO_AUTH. + + # ./test_1_to_1_events +test_1_to_1_events.c 1 PASS : COMM_UP notification on client socket - SUCCESS +test_1_to_1_events.c 2 PASS : COMM_UP notification on server socket - SUCCESS +test_1_to_1_events.c 3 BROK : Got a datamsg, expecting notification +DUMP_CORE sctputil.c: 187 +[ 1468.733938] test_1_to_1_eve[2376]: segfault at 0 ip 561a4a3d5079 sp 7ffd49101580 error 6 in test_1_to_1_events[561a4a3d4000+2000] +[ 1468.734479] Code: ff bf 0a 00 00 00 e8 e6 ef ff ff b9 c9 00 00 00 48 8d 15 61 13 00 00 bf 01 00 00 00 31 c0 48 8d 35 c7 0f 00 00 e8 97 f0 +Segmentation fault + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + src/func_tests/test_1_to_1_events.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/func_tests/test_1_to_1_events.c b/src/func_tests/test_1_to_1_events.c +index 46439bf..a086832 100644 +--- a/src/func_tests/test_1_to_1_events.c b/src/func_tests/test_1_to_1_events.c +@@ -92,9 +92,11 @@ main(int argc, char *argv[]) + /* Create the client socket. */ + clt_sk = test_socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); + ++ memset(, 0, sizeof(event)); + event.sctp_data_io_event = 1; + event.sctp_association_event = 1; + event.sctp_shutdown_event = 1; ++ event.sctp_authentication_event = 1; + len = sizeof(struct sctp_event_subscribe); + test_setsockopt(svr_sk, SCTP_EVENTS, , len); + test_setsockopt(clt_sk, SCTP_EVENTS, , len); +-- +2.7.4 + diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb index cc2f835..70cea6c 100644 --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb @@ -21,6 +21,7 @@ SRC_URI = " \ file://0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch \ file://0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch \ file://0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch \ +file://0001-test_1_to_1_events.c-initialize-event-properly.patch \ file://run-ptest \ file://v4test.sh \ file://v6test.sh \ -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2] postfix: fix pkg_postinst_${PN}
From: Mingli Yu "exit 0" will break the postinst logic below the line "exit 0" such as: === update-alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 120 update-alternatives --install /usr/bin/mailq mailq /usr/bin/mailq.postfix 120 update-alternatives --install /usr/bin/newaliases newaliases /usr/bin/newaliases.postfix 120 === It's enough to call "$INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX}" , so remove it to guarantee the postinstall logic is correct Signed-off-by: Mingli Yu --- meta-networking/recipes-daemons/postfix/postfix.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index 49f9f7b1f..882b27b6e 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -246,10 +246,10 @@ pkg_postinst_${PN} () { # This can fail depending on host setup if ! newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases; then $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} -exit 0 +else +touch $D/etc/postfix/virtual_alias +postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias fi -touch $D/etc/postfix/virtual_alias -postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias fi } -- 2.13.3 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] postfix: fix pkg_postinst_${PN}
From: Mingli Yu "exit 0" will break the postinst logic below the line "exit 0" such as: === update-alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 120 update-alternatives --install /usr/bin/mailq mailq /usr/bin/mailq.postfix 120 update-alternatives --install /usr/bin/newaliases newaliases /usr/bin/newaliases.postfix 120 === It's enough to call "$INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX}" , so remove it to guarantee the postinstall logic is correct Signed-off-by: Mingli Yu --- meta-networking/recipes-daemons/postfix/postfix.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index 49f9f7b1f..71d7ef5df 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -246,7 +246,6 @@ pkg_postinst_${PN} () { # This can fail depending on host setup if ! newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases; then $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} -exit 0 fi touch $D/etc/postfix/virtual_alias postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias -- 2.13.3 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gd: Fix CVE-2018-1000222
From: Mingli Yu check return value in gdImageBmpPtr Signed-off-by: Mingli Yu --- .../gd/gd/CVE-2018-1000222.patch | 82 +++ meta-oe/recipes-support/gd/gd_2.2.5.bb| 1 + 2 files changed, 83 insertions(+) create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch diff --git a/meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch b/meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch new file mode 100644 index 0..25924d1aa --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch @@ -0,0 +1,82 @@ +From 4b1e18a00ce7c4b7e6919c3b3109a034393b805a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sat, 14 Jul 2018 13:54:08 -0400 +Subject: [PATCH] bmp: check return value in gdImageBmpPtr + +Closes #447. + +(cherry picked from commit ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5) + +Upstream-Status: Backport [https://github.com/libgd/libgd/commit/4b1e18a00ce7c4b7e6919c3b3109a034393b805a] +CVE: CVE-2018-1000222 +Signed-off-by: Mingli Yu +--- + src/gd_bmp.c | 17 ++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/gd_bmp.c b/src/gd_bmp.c +index ccafdcd..d625da1 100644 +--- a/src/gd_bmp.c b/src/gd_bmp.c +@@ -48,6 +48,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp + static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); + static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); + ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); ++ + #define BMP_DEBUG(s) + + static int gdBMPPutWord(gdIOCtx *out, int w) +@@ -88,8 +90,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageBmpCtx(im, out, compression); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageBmpCtx(im, out, compression)) ++ rv = gdDPExtractData(out, size); ++ else ++ rv = NULL; + out->gd_free(out); + return rv; + } +@@ -142,6 +146,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) + compression - whether to apply RLE or not. + */ + BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) ++{ ++ _gdImageBmpCtx(im, out, compression); ++} ++ ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + { + int bitmap_size = 0, info_size, total_size, padding; + int i, row, xpos, pixel; +@@ -149,6 +158,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; + FILE *tmpfile_for_compression = NULL; + gdIOCtxPtr out_original = NULL; ++ int ret = 1; + + /* No compression if its true colour or we don't support seek */ + if (im->trueColor) { +@@ -326,6 +336,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + out_original = NULL; + } + ++ ret = 0; + cleanup: + if (tmpfile_for_compression) { + #ifdef _WIN32 +@@ -339,7 +350,7 @@ cleanup: + if (out_original) { + out_original->gd_free(out_original); + } +- return; ++ return ret; + } + + static int compress_row(unsigned char *row, int length) +-- +2.17.1 + diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb index 62d0df008..548d2c578 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb +++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb @@ -15,6 +15,7 @@ DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \ + file://CVE-2018-1000222.patch \ " SRCREV = "8255231b68889597d04d451a72438ab92a405aba" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/2] esmtp: add sendmail to ALTERNATIVE_${PN}
From: Mingli Yu There are several packages provide ${sbindir}/sendmail and should add sendmail to ALTERNATIVE_${PN} to make it work well. And the sendmail is removed from ALTERNATIVE_${PN} in below commit: === commit 7b500488115c67d657312135b48027a1c26e0955 Author: Lei Maohui Date: Fri Aug 17 18:19:53 2018 -0700 postfix,esmtp: Fix confilct error in do_rootfs Error: Transaction check error: file /usr/bin/mailq conflicts between attempted installs of esmtp-1.2-r0.x86_64 and postfix-3.2.2-r0.x86_64 file /usr/bin/newaliases conflicts between attempted installs of esmtp-1.2-r0.x86_64 and postfix-3.2.2-r0.x86_64 Signed-off-by: Lei Maohui Signed-off-by: Khem Raj === Add it back to make sendmail works normally Signed-off-by: Mingli Yu --- meta-networking/recipes-support/esmtp/esmtp_1.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb index 9fb817b..663161a 100644 --- a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb +++ b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb @@ -18,9 +18,11 @@ EXTRA_OECONF = "--with-libesmtp=${STAGING_EXECPREFIXDIR}" inherit autotools update-alternatives -ALTERNATIVE_${PN} += "mailq newaliases" +ALTERNATIVE_${PN} += "sendmail mailq newaliases" ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" +ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" +ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp" ALTERNATIVE_PRIORITY = "10" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/2] postfix: add sendmail to ALTERNATIVE_${PN}
From: Mingli Yu There are several packages provide ${sbindir}/sendmail and should add sendmail to ALTERNATIVE_${PN} to make it work well. And the sendmail is removed from ALTERNATIVE_${PN} in below commit: === commit 7b500488115c67d657312135b48027a1c26e0955 Author: Lei Maohui Date: Fri Aug 17 18:19:53 2018 -0700 postfix,esmtp: Fix confilct error in do_rootfs Error: Transaction check error: file /usr/bin/mailq conflicts between attempted installs of esmtp-1.2-r0.x86_64 and postfix-3.2.2-r0.x86_64 file /usr/bin/newaliases conflicts between attempted installs of esmtp-1.2-r0.x86_64 and postfix-3.2.2-r0.x86_64 Signed-off-by: Lei Maohui Signed-off-by: Khem Raj === Add it back to make sendmail works normally before adding it back: # mime-construct --to root --subject mail-20826 --encoding 7bit --string mail_content sendmail: account default not found: no configuration file available Error closing sendmail: non-zero exit (78) at /usr/bin/mime-construct line 572. # echo $? 78 After adding it back: # mime-construct --to root --subject mail-20826 --encoding 7bit --string mail_content # echo $? 0 Signed-off-by: Mingli Yu --- meta-networking/recipes-daemons/postfix/postfix.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index 389136b..49f9f7b 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -214,9 +214,11 @@ do_install_append_class-native() { ln -sf ../sbin/sendmail.postfix ${D}${bindir}/mailq } -ALTERNATIVE_${PN} += "mailq newaliases" +ALTERNATIVE_${PN} += "sendmail mailq newaliases" ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" +ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix" +ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" ALTERNATIVE_PRIORITY = "120" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 1/2] lksctp-tools: Upgrade to 1.0.18
From: Mingli Yu inherit autotools-brokensep to fix the gap between ${S} and ${B} Backport 6 patches from master to fix build issue[https://github.com/sctp/lksctp-tools/compare/lksctp-tools-1.0.18...master] | WARNING: lksctp-tools-1.0.18+gitAUTOINC+1b077af62d-r0 do_package: QA Issue: lksctp-tools: Files/directories were installed but not shipped in: | /usr/lib64/libsctp.so.1.0.17 | /usr/lib64/lksctp-tools/libwithsctp.so.1.0.17 | -- Looking for sctp_connectx - not found[when build freediameter which depends on lksctp-tools] Signed-off-by: Mingli Yu --- ...ld-0b0dce7a36fb-actually-belongs-to-v4.19.patch | 31 ++ ...ld-fix-netinet-sctp.h-not-to-be-installed.patch | 35 +++ ...001-build-fix-probing-for-HAVE_SCTP_SENDV.patch | 35 +++ ...e-v4.12-secondary-defines-in-favor-of-HAV.patch | 52 ...c-add-CURRENT-REVISION-and-AGE-for-libsct.patch | 71 ++ ...ithsctp-use-PACKAGE_VERSION-in-withsctp.h.patch | 43 + ...sctp-tools_1.0.17.bb => lksctp-tools_1.0.18.bb} | 12 +++- 7 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch rename meta-networking/recipes-support/lksctp-tools/{lksctp-tools_1.0.17.bb => lksctp-tools_1.0.18.bb} (72%) diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch new file mode 100644 index 000..7599b1b --- /dev/null +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch @@ -0,0 +1,31 @@ +From e5952a0cdfa8b1b56a5823574835f1f771f14ae0 Mon Sep 17 00:00:00 2001 +From: Marcelo Ricardo Leitner +Date: Fri, 24 Aug 2018 09:53:00 -0300 +Subject: [PATCH] build: 0b0dce7a36fb actually belongs to v4.19 + +Typo or not, this commit actually belongs to v4.19 and made me wonder why +on v4.18 it didn't find this feature. + +Fixes: 817f0bfa248f ("build: add two defines for Peer Address Parameters extensions on sctp_paddrparams") +Signed-off-by: Marcelo Ricardo Leitner +Reviewed-by: Xin Long +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f55775a..5de5c76 100644 +--- a/configure.ac b/configure.ac +@@ -101,7 +101,7 @@ LKSCTP_CHECK_TYPE([struct sctp_prinfo], [HAVE_SCTP_SENDV]) + # added on v4.16, 30f6ebf65bc4 + LKSCTP_CHECK_DECL([SCTP_AUTH_NO_AUTH], [HAVE_SCTP_AUTH_NO_AUTH]) + +-# New members to sctp_paddrparams, added on v4.18, 0b0dce7a36fb ++# New members to sctp_paddrparams, added on v4.19, 0b0dce7a36fb + LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_ipv6_flowlabel], + [HAVE_SCTP_SPP_IPV6_FLOWLABEL]) + LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_dscp], +-- +2.7.4 + diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch new file mode 100644 index 000..03c6c4f --- /dev/null +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch @@ -0,0 +1,35 @@ +From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001 +From: Xin Long +Date: Fri, 24 Aug 2018 01:13:32 +0800 +Subject: [PATCH] build: fix netinet/sctp.h not to be installed + +After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can +no longer be installed into ${includedir}. + +Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already +added into configure.ac, there's no need to generate sctp.h by +automake. + +So we simply set libcnetinet_HEADERS back to sctp.h. + +Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup") +Signed-off-by: Xin Long +Signed-off-by: Marcelo Ricardo Leitner +--- + src/include/netinet/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am +index ca0aac2..965db8c 100644 +---
[oe] [meta-networking][PATCH 2/2] freediameter: update the old sctp api check
From: Mingli Yu The initial sctp api check for freediameter as below: commit d3c5e991cb532ea09684d69fb4d0d58e9bc39a0c Author: Sebastien Decugis Date: Mon Jun 3 12:05:37 2013 +0800 Add some compliancy to RFC6458. Not tested however as Ubuntu does not support this yet diff --git a/libfdcore/sctp.c b/libfdcore/sctp.c index ee5539e..7f93e72 100644 --- a/libfdcore/sctp.c +++ b/libfdcore/sctp.c @@ -44,12 +44,14 @@ [snip] +/* Use old draft-ietf-tsvwg-sctpsocket-17 API ? If not defined, RFC6458 API will be used */ +/* #define OLD_SCTP_SOCKET_API */ + +/* Automatically fallback to old API if some of the new symbols are not defined */ +#if (!defined(SCTP_CONNECTX_4_ARGS) || (!defined(SCTP_RECVRCVINFO)) || (!defined(SCTP_SNDINFO))) +# define OLD_SCTP_SOCKET_API +#endif SCTP_RECVRCVINFO is defined in , but is't included in the source code previouly. So defined(SCTP_RECVRCVINFO) can be 0 and it makes old sctp socket api definition in effect as below: # define OLD_SCTP_SOCKET_API After lksctp-tools upgrade to 1.0.18, there is below commit introduced in lksctp-tools git: commit 3c8bd0d26b64611c690f33f5802c734b0642c1d8 Author: Marcelo Ricardo Leitner Date: Tue Apr 17 20:17:14 2018 -0300 sctp.h: make use kernel UAPI header and with that, remove tons of duplicated declarations. These were lagging behind the kernel header, which is always the most updated one, and as the library is intended to be run only on Linux, there is no reason that we cannot re-use what is in there. That said, this patch drops all duplicated declarations and includes linux/sctp.h to bring them into lksctp-tools. Signed-off-by: Marcelo Ricardo Leitner diff --git a/src/include/netinet/sctp.h b/src/include/netinet/sctp.h [snip] #include #include #include +#include [snip] And above logic make defined(SCTP_RECVRCVINFO) to be 1 and the old sctp socket api macro as below won't be defined. # define OLD_SCTP_SOCKET_API And it encouters below build error: | /build/freediameter/1.2.1-r0/freeDiameter-1.2.1/libfdcore/sctp.c:1262:9: error: 'SCTP_SEND_FAILED_EVENT' undeclared (first use in this function); did you mean 'SCTP_SEND_FAILED'? case SCTP_SEND_FAILED_EVENT: ^~ SCTP_SEND_FAILED | /build/freediameter/1.2.1-r0/freeDiameter-1.2.1/libfdcore/sctp.c:1262:9: note: each undeclared identifier is reported only once for each function it appears in | /build/freediameter/1.2.1-r0/freeDiameter-1.2.1/libfdcore/sctp.c:1274:9: error: 'SCTP_NOTIFICATIONS_STOPPED_EVENT' undeclared (first use in this function); did you mean 'SCTP_AUTHENTICATION_EVENT'? case SCTP_NOTIFICATIONS_STOPPED_EVENT: Update the old sctp socket api check to fix the above build error. Signed-off-by: Mingli Yu --- ...core-sctp.c-update-the-old-sctp-api-check.patch | 99 ++ .../freediameter/freediameter_1.2.1.bb | 1 + 2 files changed, 100 insertions(+) create mode 100644 meta-networking/recipes-protocols/freediameter/files/0001-libfdcore-sctp.c-update-the-old-sctp-api-check.patch diff --git a/meta-networking/recipes-protocols/freediameter/files/0001-libfdcore-sctp.c-update-the-old-sctp-api-check.patch b/meta-networking/recipes-protocols/freediameter/files/0001-libfdcore-sctp.c-update-the-old-sctp-api-check.patch new file mode 100644 index 000..544643c --- /dev/null +++ b/meta-networking/recipes-protocols/freediameter/files/0001-libfdcore-sctp.c-update-the-old-sctp-api-check.patch @@ -0,0 +1,99 @@ +From d527a0b7b63e43263384540b5525714484bb089f Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 3 Sep 2018 14:40:56 +0800 +Subject: [PATCH] libfdcore/sctp.c: update the old sctp api check + +The initial sctp api check for freediameter as below: + commit d3c5e991cb532ea09684d69fb4d0d58e9bc39a0c + Author: Sebastien Decugis + Date: Mon Jun 3 12:05:37 2013 +0800 + +Add some compliancy to RFC6458. Not tested however as Ubuntu does not support this yet + +diff --git a/libfdcore/sctp.c b/libfdcore/sctp.c +index ee5539e..7f93e72 100644 +--- a/libfdcore/sctp.c ++++ b/libfdcore/sctp.c +@@ -44,12 +44,14 @@ +[snip] ++/* Use old draft-ietf-tsvwg-sctpsocket-17 API ? If not defined, RFC6458 API will be used */ ++/* #define OLD_SCTP_SOCKET_API */ ++ ++/* Automatically fallback to old API if some of the new symbols are not defined */ ++#if (!defined(SCTP_CONNECTX_4_ARGS) || (!defined(SCTP_RECVRCVINFO)) || (!defined(SCTP_SNDINFO))) ++# define OLD_SCTP_SOCKET_API ++#endif + +SCTP_RECVRCVINFO is defined in , +but is't included in the source code +previouly. So defined(SCTP_RECVRCVINFO) can be 0 +and it make old sctp socket api definiton in effect +as below: + # define OLD_SCTP_SOCKET_API + +After lksctp-tools upgrade to 1.0.18, there is below +commit introduced: +commit 3c8bd0d26b64611c690f33f5802c734b0642c1d8 +Author: Marcelo Ricardo Leitner +Date: Tue Apr 17
[oe] [meta-networking][PATCH 1/2] lksctp-tools: Upgrade to 1.0.18
From: Mingli Yu inherit autotools-brokensep to fix the gap between ${S} and ${B} Backport 6 patches from master to fix build issue[https://github.com/sctp/lksctp-tools/compare/lksctp-tools-1.0.18...master] | WARNING: lksctp-tools-1.0.18+gitAUTOINC+1b077af62d-r0 do_package: QA Issue: lksctp-tools: Files/directories were installed but not shipped in: | /usr/lib64/libsctp.so.1.0.17 | /usr/lib64/lksctp-tools/libwithsctp.so.1.0.17 | -- Looking for sctp_connectx - not found[when build freediameter which depends on lksctp-tools] Signed-off-by: Mingli Yu --- ...ld-0b0dce7a36fb-actually-belongs-to-v4.19.patch | 31 ++ ...ld-fix-netinet-sctp.h-not-to-be-installed.patch | 35 +++ ...001-build-fix-probing-for-HAVE_SCTP_SENDV.patch | 35 +++ ...e-v4.12-secondary-defines-in-favor-of-HAV.patch | 52 ...c-add-CURRENT-REVISION-and-AGE-for-libsct.patch | 71 ++ ...ithsctp-use-PACKAGE_VERSION-in-withsctp.h.patch | 43 + ...sctp-tools_1.0.17.bb => lksctp-tools_1.0.18.bb} | 12 +++- 7 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch create mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch rename meta-networking/recipes-support/lksctp-tools/{lksctp-tools_1.0.17.bb => lksctp-tools_1.0.18.bb} (72%) diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch new file mode 100644 index 000..7599b1b --- /dev/null +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch @@ -0,0 +1,31 @@ +From e5952a0cdfa8b1b56a5823574835f1f771f14ae0 Mon Sep 17 00:00:00 2001 +From: Marcelo Ricardo Leitner +Date: Fri, 24 Aug 2018 09:53:00 -0300 +Subject: [PATCH] build: 0b0dce7a36fb actually belongs to v4.19 + +Typo or not, this commit actually belongs to v4.19 and made me wonder why +on v4.18 it didn't find this feature. + +Fixes: 817f0bfa248f ("build: add two defines for Peer Address Parameters extensions on sctp_paddrparams") +Signed-off-by: Marcelo Ricardo Leitner +Reviewed-by: Xin Long +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f55775a..5de5c76 100644 +--- a/configure.ac b/configure.ac +@@ -101,7 +101,7 @@ LKSCTP_CHECK_TYPE([struct sctp_prinfo], [HAVE_SCTP_SENDV]) + # added on v4.16, 30f6ebf65bc4 + LKSCTP_CHECK_DECL([SCTP_AUTH_NO_AUTH], [HAVE_SCTP_AUTH_NO_AUTH]) + +-# New members to sctp_paddrparams, added on v4.18, 0b0dce7a36fb ++# New members to sctp_paddrparams, added on v4.19, 0b0dce7a36fb + LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_ipv6_flowlabel], + [HAVE_SCTP_SPP_IPV6_FLOWLABEL]) + LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_dscp], +-- +2.7.4 + diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch new file mode 100644 index 000..03c6c4f --- /dev/null +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch @@ -0,0 +1,35 @@ +From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001 +From: Xin Long +Date: Fri, 24 Aug 2018 01:13:32 +0800 +Subject: [PATCH] build: fix netinet/sctp.h not to be installed + +After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can +no longer be installed into ${includedir}. + +Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already +added into configure.ac, there's no need to generate sctp.h by +automake. + +So we simply set libcnetinet_HEADERS back to sctp.h. + +Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup") +Signed-off-by: Xin Long +Signed-off-by: Marcelo Ricardo Leitner +--- + src/include/netinet/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am +index ca0aac2..965db8c 100644 +---
[oe] [meta-oe][PATCH] cryptsetup: Upgrade to 2.0.4
From: Mingli Yu Signed-off-by: Mingli Yu --- .../cryptsetup/{cryptsetup_2.0.3.bb => cryptsetup_2.0.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.0.3.bb => cryptsetup_2.0.4.bb} (91%) diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb similarity index 91% rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb index df85add6a..cc7bc6e01 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" DEPENDS = "util-linux libdevmapper popt libgcrypt json-c" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz" -SRC_URI[md5sum] = "ea1c722f8d4c4e36427628b679b1f819" -SRC_URI[sha256sum] = "4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4" +SRC_URI[md5sum] = "ed42b31f67d05b05e392d1943d467b8d" +SRC_URI[sha256sum] = "9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734" inherit autotools gettext pkgconfig -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mcelog: Upgrade to 160
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-support/mcelog/{mcelog_159.bb => mcelog_160.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/mcelog/{mcelog_159.bb => mcelog_160.bb} (95%) diff --git a/meta-oe/recipes-support/mcelog/mcelog_159.bb b/meta-oe/recipes-support/mcelog/mcelog_160.bb similarity index 95% rename from meta-oe/recipes-support/mcelog/mcelog_159.bb rename to meta-oe/recipes-support/mcelog/mcelog_160.bb index 236ad7d00..8946134cd 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_159.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_160.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; file://run-ptest \ " -SRCREV = "2ed5cc0489d20cbffdc6d2e08b1fe49973f0ee34" +SRCREV = "10b832edec31d48adf414709dec9327354310f52" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] drbd-utils: fix usrmerge install path
From: Mingli Yu Install the files under folder /usr/lib/drbd to instead of /lib/drbd and also /usr/lib/udev to instead of /lib/udev/ when usrmerge enabled to fix below issue: | WARNING: drbd-utils-9.5.0-r0 do_package: QA Issue: drbd-utils: Files/directories were installed but not shipped in any package: /lib/drbd/drbdsetup-84 /lib/drbd/drbdadm-83 /lib/drbd/drbdsetup-83 /lib/drbd/drbdadm-84 /lib/drbd/drbd | Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_insta. | drbd-utils: 5 installed and not shipped files. [installed-vs-shipped] | ERROR: QA Issue: drbd-utils-dbg package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] Signed-off-by: Mingli Yu --- meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb index 0e3f952..bd1e857 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb @@ -33,9 +33,20 @@ EXTRA_OECONF = " \ --with-distro debian \ --with-initscripttype=both\ --with-systemdunitdir=${systemd_unitdir}/system \ ---without-manual\ +--without-manual \ " +do_configure_prepend() { +# move the the file under folder /lib/drbd/ to /usr/lib/drbd when usrmerge enabled +if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then +for m_file in `find ${S} -name 'Makefile.in'`; do +sed -i -e "s;\$(DESTDIR)\/lib\/drbd;\$(DESTDIR)\${nonarch_libdir}\/drbd;g" $m_file +done +# move the the file under folder /lib/udev/ to /usr/lib/udev when usrmerge enabled +sed -i -e "s;default_udevdir=/lib/udev;default_udevdir=\${prefix}/lib/udev;g" ${S}/configure.ac +fi + +} do_install_append() { # don't install empty /var/lock to avoid conflict with base-files rm -rf ${D}${localstatedir}/lock -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] lmbench: fix usrmerge install path
From: Mingli Yu Rework the patch use-base_libdir-instead-of-hardcoded-lib.patch to 0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch to fix the below do_install error when usrmerge enabled in DISTRO_FEATURES and also fix the lib name from lmbench.a to libmbench.a | if [ ! -d /poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64 ]; then mkdir /poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64; fi | mkdir: cannot create directory /poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64 No such file or directory | Makefile:141: recipe for target 'install-target' failed | make[1]: *** [install-target] Error 1 Signed-off-by: Mingli Yu --- ...efile-use-libdir-instead-of-hardcoded-lib.patch | 34 ++ .../use-base_libdir-instead-of-hardcoded-lib.patch | 30 --- .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb| 3 +- 3 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch delete mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch new file mode 100644 index 000..04cef96 --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch @@ -0,0 +1,34 @@ +From ea683a0dbaa30a0bf101adb09a1a2531c7112c62 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 27 Aug 2018 11:02:45 +0800 +Subject: [PATCH] src/Makefile: use libdir instead of hardcoded /lib + +use libdir instead of hardcoded /lib + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mingli Yu +--- + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 4678d54..b73ddb6 100644 +--- a/src/Makefile b/src/Makefile +@@ -141,10 +141,10 @@ install-target: + if [ ! -d $(BASE) ]; then mkdir $(BASE); fi + if [ ! -d $(BASE)/bin ]; then mkdir $(BASE)/bin; fi + if [ ! -d $(BASE)/include ]; then mkdir $(BASE)/include; fi +- if [ ! -d $(BASE)/lib ]; then mkdir $(BASE)/lib; fi ++ if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir $(DESTDIR)$(libdir); fi + cp $(EXES) $(BASE)/bin + cp $(INCS) $(BASE)/include +- cp $O/lmbench.a $(BASE)/lib/libmbench.a ++ cp $O/lmbench.a $(DESTDIR)$(libdir)/libmbench.a + cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install + + +-- +2.7.4 + diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch deleted file mode 100644 index c6e9465..000 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 73fdc58ca4eb9e2f24d854b3af3a4e5daac5a33e Mon Sep 17 00:00:00 2001 -From: Ting Liu -Date: Fri, 22 Nov 2013 15:20:08 +0800 -Subject: [PATCH] use base_libdir instead of hardcoded /lib - -Upstream Status: Inappropriate [configuration] - -Signed-off-by: Ting Liu - - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index c7a8c79..c7e4e3c 100644 a/src/Makefile -+++ b/src/Makefile -@@ -143,10 +143,10 @@ install-target: - if [ ! -d $(BASE) ]; then mkdir $(BASE); fi - if [ ! -d $(BASE)/bin ]; then mkdir $(BASE)/bin; fi - if [ ! -d $(BASE)/include ]; then mkdir $(BASE)/include; fi -- if [ ! -d $(BASE)/lib ]; then mkdir $(BASE)/lib; fi -+ if [ ! -d $(BASE)$(base_libdir) ]; then mkdir $(BASE)$(base_libdir); fi - cp $(EXES) $(BASE)/bin - cp $(INCS) $(BASE)/include -- cp $O/lmbench.a $(BASE)/lib/libmbench.a -+ cp $O/lmbench.a $(BASE)$(base_libdir) - cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install - - diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 593b62f..8e6e803 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -19,13 +19,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://update-results-script.patch \ file://obey-ranlib.patch \ file://update-config-script.patch \ - file://use-base_libdir-instead-of-hardcoded-lib.patch \ file://lmbench_result_html_report.patch \ file://fix-lmbench-memory-check-failure.patch \
[oe] [meta-oe][PATCH] lmbench: fix usrmerge install path
From: Mingli Yu Update $(base_libdir) to $(baselib) to fix the below do_install error when usrmerge enabled in DISTRO_FEATURES. | if [ ! -d /poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64 ]; then mkdir /poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64; fi | mkdir: cannot create directory /poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64 No such file or directory | Makefile:141: recipe for target 'install-target' failed | make[1]: *** [install-target] Error 1 Signed-off-by: Mingli Yu --- meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 593b62f..c78e7a8 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -51,8 +51,13 @@ do_compile () { install -d ${S}/bin/${TARGET_SYS} oe_runmake -C src } +export baselib do_install () { +# fix the lib path when usrmerge enabled +if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then +sed -i -e "s;\$(BASE)\$(base_libdir);\$(BASE)/\$(baselib);g" ${S}/src/Makefile +fi install -d ${D}${sysconfdir}/default/volatiles \ ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ ${D}${datadir}/lmbench/scripts -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] xerces-c: Update SRC_URI
From: lwang1 The source located under http://archive.apache.org/dist/xerces/c/3/sources/ now, change SRC_URI accordingly Signed-off-by: lwang1 Signed-off-by: Mingli Yu --- meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb index 64ac747..9bc4ea3 100644 --- a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb +++ b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb @@ -9,7 +9,7 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "http://apache.lauf-forum.at/xerces/c/3/sources/${BP}.tar.bz2; +SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2; SRC_URI[md5sum] = "d04ae9d8b2dee2157c6db95fa908abfd" SRC_URI[sha256sum] = "9408f12c1628ecf80730bedbe8b2caad810edd01bb4c66f77b60c873e8cc6891" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] nmap: install ndiff
From: Mingli Yu Currently, the ndiff isn't built and installed as ndiff is python2 compatible script and it checks PYTHON_VERSION to determine whether build and install ndiff in configure phase. Update to inherit pythonnative to let the PYTHON_VERSION to be 2 to let ndiff be built and installed. Apart from ndiff python script, there is another script named ndiff.py used by ndiff, export PYTHON_SITEPACKAGES_DIR to make ndiff.py installed in the correct place. Signed-off-by: Mingli Yu --- meta-oe/recipes-security/nmap/nmap_7.70.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-security/nmap/nmap_7.70.bb b/meta-oe/recipes-security/nmap/nmap_7.70.bb index e47d09f..01be151 100644 --- a/meta-oe/recipes-security/nmap/nmap_7.70.bb +++ b/meta-oe/recipes-security/nmap/nmap_7.70.bb @@ -13,7 +13,7 @@ SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ SRC_URI[md5sum] = "84eb6fbe788e0d4918c2b1e39421bf79" SRC_URI[sha256sum] = "847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18" -inherit autotools-brokensep pkgconfig python3native +inherit autotools-brokensep pkgconfig pythonnative PACKAGECONFIG ?= "ncat nping ndiff pcap" @@ -36,6 +36,8 @@ EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subv # disable for now until py3 is supported EXTRA_OECONF += "--without-zenmap" +export PYTHON_SITEPACKAGES_DIR + do_configure() { autoconf oe_runconf -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 2/2] fio: disable compiler optimizations
From: Mingli Yu Pass parameter "--disable-optimizations" to configure script to disable compiler optimizations to fix below issue: $ gdb /usr/bin/fio (gdb) r -h Starting program: /usr/bin/fio -h [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Program received signal SIGILL, Illegal instruction. 0x00407220 in prio_tree_init () at lib/prio_tree.c:61 61 index_bits_to_maxindex[i] = (1UL << (i + 1)) - 1; (gdb) bt #0 0x00407220 in prio_tree_init () at lib/prio_tree.c:61 #1 0x00482208 in __libc_csu_init (argc=argc@entry=2, argv=argv@entry=0x7fffecc8, envp=0x7fffece0) at /usr/src/debug/glibc/2.26-r0/git/csu/elf-init.c:88 #2 0x0031c742095e in __libc_start_main (main=0x407700 , argc=2, argv=0x7fffecc8, init=0x4821b6 <__libc_csu_init>, fini=, rtld_fini=, stack_end=0x7fffecb8) at /usr/src/debug/glibc/2.26-r0/git/csu/libc-start.c:264 #3 0x004077ea in _start () at ../sysdeps/x86_64/start.S:120 Signed-off-by: Mingli Yu --- meta-oe/recipes-benchmark/fio/fio_3.8.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.8.bb b/meta-oe/recipes-benchmark/fio/fio_3.8.bb index eb517c3..5bc48b0 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.8.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.8.bb @@ -32,6 +32,7 @@ S = "${WORKDIR}/git" DISABLE_STATIC = "" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "--disable-optimizations" do_configure() { ./configure ${EXTRA_OECONF} -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] fio: Upgrade to 3.8
From: Mingli Yu Signed-off-by: Mingli Yu --- meta-oe/recipes-benchmark/fio/{fio_3.7.bb => fio_3.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-benchmark/fio/{fio_3.7.bb => fio_3.8.bb} (95%) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.7.bb b/meta-oe/recipes-benchmark/fio/fio_3.8.bb similarity index 95% rename from meta-oe/recipes-benchmark/fio/fio_3.7.bb rename to meta-oe/recipes-benchmark/fio/fio_3.8.bb index 410e27b..eb517c3 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.7.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.8.bb @@ -20,8 +20,8 @@ PACKAGECONFIG_NUMA_arm = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -# rev for v3.7 -SRCREV = "c397ab3aac3d4ed1660d9cd4d820f31a4375306e" +# rev for v3.8 +SRCREV = "bfd986752ad053175423ffe3bbbeb07803f8ad4a" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ " -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] fio: disable compiler optimizations
From: Mingli Yu Add parameter "--disable-optimizations" to configure script to disable compiler optimizations to fix below issue: $ gdb /usr/bin/fio (gdb) r -h Starting program: /usr/bin/fio -h [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Program received signal SIGILL, Illegal instruction. 0x00407220 in prio_tree_init () at lib/prio_tree.c:61 61 index_bits_to_maxindex[i] = (1UL << (i + 1)) - 1; (gdb) bt #0 0x00407220 in prio_tree_init () at lib/prio_tree.c:61 #1 0x00482208 in __libc_csu_init (argc=argc@entry=2, argv=argv@entry=0x7fffecc8, envp=0x7fffece0) at /usr/src/debug/glibc/2.26-r0/git/csu/elf-init.c:88 #2 0x0031c742095e in __libc_start_main (main=0x407700 , argc=2, argv=0x7fffecc8, init=0x4821b6 <__libc_csu_init>, fini=, rtld_fini=, stack_end=0x7fffecb8) at /usr/src/debug/glibc/2.26-r0/git/csu/libc-start.c:264 #3 0x004077ea in _start () at ../sysdeps/x86_64/start.S:120 Signed-off-by: Mingli Yu --- meta-oe/recipes-benchmark/fio/fio_3.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.7.bb b/meta-oe/recipes-benchmark/fio/fio_3.7.bb index 410e27b..9bec2df 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.7.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.7.bb @@ -32,6 +32,7 @@ S = "${WORKDIR}/git" DISABLE_STATIC = "" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "--disable-optimizations" do_configure() { ./configure ${EXTRA_OECONF} -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] ipvsadm: fix usrmerge install path
From: Mingli Yu Update SBIN to fix below error when usrmerge enabled in DISTRO_FEATURES. ERROR: QA Issue: ipvsadm-dbg package is not obeying usrmerge distro feature. /sbin should be relocated to /usr. [usrmerge] Signed-off-by: Mingli Yu --- meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb index 58407a1..4f3c16d 100644 --- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb @@ -34,6 +34,7 @@ do_compile() { } do_install() { +sed -i -e "s;SBIN\t\t= \$(BUILD_ROOT)/sbin;SBIN\t\t= \$(BUILD_ROOT)/$base_sbindir;" ${S}/Makefile oe_runmake 'BUILD_ROOT=${D}' install } -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] kea: fix do_package warning
From: Mingli Yu Add libdhcp_stat_cmds.a and libdhcp_ha.a to FILES_${PN}-staticdev to fix below warning: WARNING: kea-1.4.0-r0 do_package: QA Issue: kea: Files/directories were installed but not shipped in any package: /usr/lib64/hooks/libdhcp_stat_cmds.a /usr/lib64/hooks/libdhcp_ha.a Signed-off-by: Mingli Yu --- meta-networking/recipes-connectivity/kea/kea_1.4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb b/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb index 40db22b..ba01b8c 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb @@ -45,7 +45,7 @@ PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_TARGET}${prefix},,openssl PACKAGECONFIG[log4cplus] = "--with-log4cplus=${STAGING_DIR_TARGET}${prefix},,log4cplus,log4cplus" PACKAGECONFIG[boost] = "--with-boost-include=${STAGING_INCDIR} --with-boost-lib-dir=${STAGING_LIBDIR} --with-boost-libs=-lboost_system,,boost,boost" -FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a" +FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" FILES_${PN} += "${libdir}/hooks/*.so" BBCLASSEXTEND += "native" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mariadb: Upgrade to 5.5.61
From: Mingli Yu Signed-off-by: Mingli Yu --- .../{mariadb-native_5.5.60.bb => mariadb-native_5.5.61.bb}| 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 4 ++-- .../mysql/{mariadb_5.5.60.bb => mariadb_5.5.61.bb}| 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_5.5.60.bb => mariadb-native_5.5.61.bb} (100%) rename meta-oe/recipes-dbs/mysql/{mariadb_5.5.60.bb => mariadb_5.5.61.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.60.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.61.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_5.5.60.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_5.5.61.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 3afd392af..8ac0dbb51 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -18,8 +18,8 @@ SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ file://change-cc-to-cc-version.patch \ file://0001-disable-ucontext-on-musl.patch \ " -SRC_URI[md5sum] = "afbadcf2980ad5aa205084dd401f1b7f" -SRC_URI[sha256sum] = "4d3d444555416028ce39d3fb4cdc9cf6a658fcd4b0d2d0c45a73f9bf01d07929" +SRC_URI[md5sum] = "cb343f855a35ed24ea25984144963f9f" +SRC_URI[sha256sum] = "57afd089e3b458cda26beeda63c0bfe125baa6fead2120478788f1945e551013" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases; diff --git a/meta-oe/recipes-dbs/mysql/mariadb_5.5.60.bb b/meta-oe/recipes-dbs/mysql/mariadb_5.5.61.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_5.5.60.bb rename to meta-oe/recipes-dbs/mysql/mariadb_5.5.61.bb -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/2] makedumpfile: Upgrade to 1.6.4
From: Mingli Yu Refresh the patches to avoid fuzz warnings Signed-off-by: Mingli Yu --- ...01-makedumpfile-replace-hardcode-CFLAGS.patch | 16 +++- ...upport-only-46-bit-for-MAX_PHYSMEM_BITS.patch | 15 +++ ...kedumpfile_1.6.2.bb => makedumpfile_1.6.4.bb} | 4 ++-- 3 files changed, 16 insertions(+), 19 deletions(-) rename meta-oe/recipes-kernel/makedumpfile/{makedumpfile_1.6.2.bb => makedumpfile_1.6.4.bb} (92%) diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index d599a9193..a47806526 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -1,4 +1,4 @@ -From 3c2f4ff583a156a7ed2fa0cc002a413c391d063d Mon Sep 17 00:00:00 2001 +From 8eeb1b15608ce1a9a1f0d5417938fd6da4504406 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 21 Jul 2016 18:06:21 +0800 Subject: [PATCH] makedumpfile: replace hardcode CFLAGS @@ -13,12 +13,13 @@ Subject: [PATCH] makedumpfile: replace hardcode CFLAGS Upstream-Status: Inappropriate[oe specific] Signed-off-by: Mingli Yu + --- Makefile | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile -index 7dde3e4..c5286ac 100644 +index 612b9d0..f6d6265 100644 --- a/Makefile +++ b/Makefile @@ -8,13 +8,6 @@ ifeq ($(strip $CC),) @@ -80,9 +81,9 @@ index 7dde3e4..c5286ac 100644 + -DRELEASE_DATE='"$(DATE)"' + SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h - SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c + SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) -@@ -54,17 +54,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) +@@ -53,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz ifneq ($(LINKTYPE), dynamic) @@ -103,7 +104,7 @@ index 7dde3e4..c5286ac 100644 endif LIBS := -lpthread $(LIBS) -@@ -72,14 +72,14 @@ LIBS := -lpthread $(LIBS) +@@ -71,14 +71,14 @@ LIBS := -lpthread $(LIBS) all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -120,7 +121,7 @@ index 7dde3e4..c5286ac 100644 echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 mv temp.8 makedumpfile.8 -@@ -90,7 +90,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) +@@ -89,7 +89,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz eppic_makedumpfile.so: extension_eppic.c @@ -129,6 +130,3 @@ index 7dde3e4..c5286ac 100644 clean: rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz --- -2.8.1 - diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch index e0c3d9af6..766f4fc76 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch @@ -1,4 +1,4 @@ -From 653fe8e724081d2f289c2245d1220d5f7170538d Mon Sep 17 00:00:00 2001 +From ba123fa6b2aa0ac62d1b78f327339635ae87201a Mon Sep 17 00:00:00 2001 From: Alexandru Moise Date: Fri, 29 Apr 2016 07:40:46 + Subject: [PATCH] mem_section: Support only 46 bit for MAX_PHYSMEM_BITS on @@ -20,18 +20,20 @@ Upstream-Status: Pending Signed-off-by: Alexandru Moise Signed-off-by: Yi Zhao + --- arch/ppc64.c | 28 ++-- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/arch/ppc64.c b/arch/ppc64.c -index 89a7f05..6c928ab 100644 +index 8b6f7d5..458f06b 100644 --- a/arch/ppc64.c +++ b/arch/ppc64.c -@@ -302,37 +302,13 @@ ppc64_vtop_level4(unsigned long vaddr) +@@ -462,38 +462,14 @@ ppc64_vtop_level4(unsigned long vaddr) + return paddr; } - int +-int -set_ppc64_max_physmem_bits(void) -{ - long array_len = ARRAY_LENGTH(mem_section); @@ -53,7 +55,7 @@ index 89a7f05..6c928ab 100644 - return FALSE; -} - --int + int get_machdep_info_ppc64(void) { unsigned long vmlist, vmap_area_list, vmalloc_start; @@ -68,6 +70,3 @@ index 89a7f05..6c928ab 100644 info->page_offset = __PAGE_OFFSET; if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) { --- -2.5.0 - diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb
[oe] [PATCH 1/2] crash: Upgrade to 7.2.3
From: Mingli Yu Signed-off-by: Mingli Yu --- .../recipes-kernel/crash/{crash_7.2.0.bb => crash_7.2.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-kernel/crash/{crash_7.2.0.bb => crash_7.2.3.bb} (97%) diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.0.bb b/meta-oe/recipes-kernel/crash/crash_7.2.3.bb similarity index 97% rename from meta-oe/recipes-kernel/crash/crash_7.2.0.bb rename to meta-oe/recipes-kernel/crash/crash_7.2.3.bb index 440a69d60..66d740af9 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.2.0.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.2.3.bb @@ -25,8 +25,8 @@ SRC_URI = "https://github.com/crash-utility/${BPN}/archive/${PV}.tar.gz;download file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ " -SRC_URI[md5sum] = "48899de3118e04cfa40a2364f5618193" -SRC_URI[sha256sum] = "5d076e1fefb41aa178ad3e1cef6511670efc47de5cb04d4af9bdd4e8f2f18cbc" +SRC_URI[md5sum] = "4026bc71c8c8c49477f4f551e25ee9fb" +SRC_URI[sha256sum] = "4c861b6fc05ab5048e8d3552445c1a08860d238e83f17ff6b51493cc17bcaa75" SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] iperf3: Upgrade to 3.6
From: Mingli Yu * Licence-Update: - Copyright years are updated to 2018 - Remove the part about src/tcp_window_size.{c,h} as iperf3 uses get/setsockopt() with SO_SNDBUF and SO_RCVBUF directly now * Update the path parameter for --with-openssl as ${RECIPE_SYSROOT}${prefix} to fix the below do_configure error | checking for openssl/ssl.h in /poky-build/tmp/work/i586-poky-linux/iperf3/3.6-r0/recipe-sysroot... no | checking whether compiling and linking against OpenSSL works... no | configure: error: in `/poky-build/tmp/work/i586-poky-linux/iperf3/3.6-r0/build': | configure: error: --with-openssl was given, but test for OpenSSL failed Signed-off-by: Mingli Yu --- .../iperf3/{iperf3_3.2.bb => iperf3_3.6.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-benchmark/iperf3/{iperf3_3.2.bb => iperf3_3.6.bb} (83%) diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb similarity index 83% rename from meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb rename to meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb index 2ed08110f..4e11d8233 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb @@ -9,7 +9,7 @@ SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues; AUTHOR = "ESNET , Lawrence Berkeley National Laboratory " LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d098223e44bdd19585315ee75cd9d2d7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a9a036136b748453e839c0eb8906ef2e" DEPENDS = "openssl" @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/esnet/iperf.git \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ " -SRCREV = "88d907f7fb58bfab5d086c5da60c922e1c582c92" +SRCREV = "88f3ad87f38762081a6d7127890ff5c3a052b06a" S = "${WORKDIR}/git" @@ -28,6 +28,6 @@ PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sc CFLAGS += "-D_GNU_SOURCE" -EXTRA_OECONF = "--with-openssl=${RECIPE_SYSROOT}" +EXTRA_OECONF = "--with-openssl=${RECIPE_SYSROOT}${prefix}" BBCLASSEXTEND = "native" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] librelp: Upgrade to 1.2.16
From: Mingli Yu * Add 0001-src-tcp.c-fix-jump-misses-init-error.patch to fix -Werror=jump-misses-init error * Add 0001-src-tcp.c-increase-the-size-of-szHname.patch to fix -Werror=format-truncation error when security_flags turned on Signed-off-by: Mingli Yu --- ...src-tcp.c-fix-jump-misses-init-error.patch | 71 +++ ...c-tcp.c-increase-the-size-of-szHname.patch | 53 ++ .../{librelp_1.2.14.bb => librelp_1.2.16.bb} | 7 +- 3 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch create mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.14.bb => librelp_1.2.16.bb} (52%) diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch new file mode 100644 index 0..68b686346 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch @@ -0,0 +1,71 @@ +From 3e5a0cb440c788e2383e40ab23ac1cf01d96961b Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Tue, 24 Jul 2018 01:30:25 -0700 +Subject: [PATCH] src/tcp.c: fix jump-misses-init error + +Fix below jump-misses-init error + +| In file included from ../../git/src/tcp.c:51: +| ../../git/src/tcp.c: In function 'relpTcpConnect': +| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init] +|goto finalize_it; \ +|^~~~ +| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE' +|ABORT_FINALIZE(RELP_RET_IO_ERR); +|^~ +| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here +| finalize_it: +| ^~~ +| ../../git/src/tcp.c:1991:6: note: 'r' declared here +| int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, _error, ); +| ^ +| In file included from ../../git/src/tcp.c:51: +| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init] +|goto finalize_it; \ +|^~~~ +| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE' +|ABORT_FINALIZE(RELP_RET_IO_ERR); +|^~ +| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here +| finalize_it: +| ^~~ +| ../../git/src/tcp.c:1989:12: note: 'len' declared here +| socklen_t len = sizeof so_error; +| ^~~ + +Upstream-Status: Submitted[https://github.com/rsyslog/librelp/pull/117] + +Signed-off-by: Mingli Yu +--- + src/tcp.c | 7 --- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/tcp.c b/src/tcp.c +index f35eb84..fb34dc7 100644 +--- a/src/tcp.c b/src/tcp.c +@@ -1936,6 +1936,9 @@ relpTcpConnect(relpTcp_t *const pThis, + struct addrinfo hints; + struct addrinfo *reslocal = NULL; + struct pollfd pfd; ++ int so_error; ++ socklen_t len = sizeof so_error; ++ int r; + + ENTER_RELPFUNC; + RELPOBJ_assert(pThis, Tcp); +@@ -1985,10 +1988,8 @@ relpTcpConnect(relpTcp_t *const pThis, + ABORT_FINALIZE(RELP_RET_TIMED_OUT); + } + +- int so_error; +- socklen_t len = sizeof so_error; + +- int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, _error, ); ++ r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, _error, ); + if (r == -1 || so_error != 0) { + pThis->pEngine->dbgprint("socket has an error %d\n", so_error); + ABORT_FINALIZE(RELP_RET_IO_ERR); +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch new file mode 100644 index 0..5a62e1584 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch @@ -0,0 +1,53 @@ +From d8950ad273d79ec516468289adbd427e681dbc66 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 30 Jul 2018 01:22:56 -0700 +Subject: [PATCH] src/tcp.c: increase the size of szHname + +Increase the size of szHname to fix below +error: +| ../../git/src/tcp.c: In function 'relpTcpSetRemHost': +| ../../git/src/tcp.c:352:57: error: '%s' directive output may be truncated writing up to 1024 bytes into a region of size 1011 [-Werror=format-truncation=] +| snprintf((char*)szHname, NI_MAXHOST, "[MALICIOUS:IP=%s]", szIP); +| ^~ +| In file included from /poky-build/tmp/work/i586-poky-linux/librelp/1.2.16-r0/recipe-sysroot/usr/include/stdio.h:862, +| from ../../git/src/tcp.c:38: +| /poky-build/tmp/work/i586-poky-linux/librelp/1.2.16-r0/recipe-sysroot/usr/include/bits/stdio2.h:64:10: note: '__builtin___snprintf_chk' output between 16