diff options
Diffstat (limited to 'poky/meta/recipes-extended')
43 files changed, 610 insertions, 522 deletions
diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index 36feaddcf8..fa32c38549 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -15,6 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/cups-${PV}-source.tar.gz \ file://0004-cups-fix-multilib-install-file-conflicts.patch \ file://volatiles.99_cups \ file://cups-volatiles.conf \ + file://CVE-2023-4504.patch \ " GITHUB_BASE_URI = "https://github.com/OpenPrinting/cups/releases" diff --git a/poky/meta/recipes-extended/cups/cups/CVE-2023-4504.patch b/poky/meta/recipes-extended/cups/cups/CVE-2023-4504.patch new file mode 100644 index 0000000000..e52e43a209 --- /dev/null +++ b/poky/meta/recipes-extended/cups/cups/CVE-2023-4504.patch @@ -0,0 +1,42 @@ +CVE: CVE-2023-4504 +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/2431caddb7e6a87f04ac90b5c6366ad268b6ff31 ] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> + +From 2431caddb7e6a87f04ac90b5c6366ad268b6ff31 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal <zdohnal@redhat.com> +Date: Wed, 20 Sep 2023 14:45:17 +0200 +Subject: [PATCH] raster-interpret.c: Fix CVE-2023-4504 + +We didn't check for end of buffer if it looks there is an escaped +character - check for NULL terminator there and if found, return NULL +as return value and in `ptr`, because a lone backslash is not +a valid PostScript character. +--- + cups/raster-interpret.c | 14 +++++++++++++- + 1 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/cups/raster-interpret.c b/cups/raster-interpret.c +index 6fcf731b5..b8655c8c6 100644 +--- a/cups/raster-interpret.c ++++ b/cups/raster-interpret.c +@@ -1116,7 +1116,19 @@ scan_ps(_cups_ps_stack_t *st, /* I - Stack */ + + cur ++; + +- if (*cur == 'b') ++ /* ++ * Return NULL if we reached NULL terminator, a lone backslash ++ * is not a valid character in PostScript. ++ */ ++ ++ if (!*cur) ++ { ++ *ptr = NULL; ++ ++ return (NULL); ++ } ++ ++ if (*cur == 'b') + *valptr++ = '\b'; + else if (*cur == 'f') + *valptr++ = '\f'; diff --git a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 5e9024834c..409c8de685 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 08f887f4bc65684397bf8ec30cc61d91d894deac Mon Sep 17 00:00:00 2001 +From 0c77437267601d40d7ce9efd87eb4b82a5675d2f Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,12 +15,12 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index c1e0012..c460398 100644 +index 11efb99..b5ce018 100644 --- a/configure.ac +++ b/configure.ac -@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 6.3, netdev@vger.kernel.org) +@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.5, netdev@vger.kernel.org) AC_PREREQ(2.52) + AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) +AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests]) diff --git a/poky/meta/recipes-extended/ethtool/ethtool_6.3.bb b/poky/meta/recipes-extended/ethtool/ethtool_6.5.bb index 504e645966..ef925e16b9 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool_6.3.bb +++ b/poky/meta/recipes-extended/ethtool/ethtool_6.5.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "342d37d3fe19da79d0276c4c69c34c61f1ad8f87b06514d664bf1eeb29bfd525" +SRC_URI[sha256sum] = "aed41ca58b3129126f18429172064d214191d7e7ef52c6e3f6b2ff7503706c03" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/0001-Bug-706897-Copy-pcx-buffer-overrun-fix-from-devices-.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/0001-Bug-706897-Copy-pcx-buffer-overrun-fix-from-devices-.patch deleted file mode 100644 index b29212fbc6..0000000000 --- a/poky/meta/recipes-extended/ghostscript/ghostscript/0001-Bug-706897-Copy-pcx-buffer-overrun-fix-from-devices-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d81b82c70bc1fb9991bb95f1201abb5dea55f57f Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Mon, 17 Jul 2023 14:06:37 +0100 -Subject: [PATCH] Bug 706897: Copy pcx buffer overrun fix from - devices/gdevpcx.c - -Bounds check the buffer, before dereferencing the pointer. - -CVE: CVE-2023-38559 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - base/gdevdevn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/base/gdevdevn.c b/base/gdevdevn.c -index 7b14d9c71..6351fb77a 100644 ---- a/base/gdevdevn.c -+++ b/base/gdevdevn.c -@@ -1983,7 +1983,7 @@ devn_pcx_write_rle(const byte * from, const byte * end, int step, gp_file * file - byte data = *from; - - from += step; -- if (data != *from || from == end) { -+ if (from >= end || data != *from) { - if (data >= 0xc0) - gp_fputc(0xc1, file); - } else { --- -2.34.1 - diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript_10.01.2.bb b/poky/meta/recipes-extended/ghostscript/ghostscript_10.02.0.bb index 434170e34d..4bad0f86e1 100644 --- a/poky/meta/recipes-extended/ghostscript/ghostscript_10.01.2.bb +++ b/poky/meta/recipes-extended/ghostscript/ghostscript_10.02.0.bb @@ -25,11 +25,10 @@ def gs_verdir(v): SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ file://ghostscript-9.16-Werror-return-type.patch \ file://avoid-host-contamination.patch \ - file://0001-Bug-706897-Copy-pcx-buffer-overrun-fix-from-devices-.patch \ file://configure.ac-add-option-to-explicitly-disable-neon.patch \ -" + " -SRC_URI[sha256sum] = "a4cd61a07fec161bee35da0211a5e5cde8ff8a0aaf942fc0176715e499d21661" +SRC_URI[sha256sum] = "e54062f166708d84ca82de9f8304a04344466080f936118b88082bd55ed6dc97" PACKAGECONFIG ??= "" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" diff --git a/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index ce6ec08c59..98cd4d8103 100644 --- a/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" -SRCREV = "5bec756976671f30903223ec46ff8a70dced4954" +SRCREV = "d9923f6970e9ba7e0d23aa9448ead71ea57235ae" UPSTREAM_CHECK_COMMITS = "1" GO_IMPORT = "golang.org/x/example" diff --git a/poky/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch b/poky/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch new file mode 100644 index 0000000000..eae5dc9998 --- /dev/null +++ b/poky/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch @@ -0,0 +1,51 @@ +From c75965053124149381ada3c394da74be078076cf Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" <g.branden.robinson@gmail.com> +Date: Sat, 16 Sep 2023 16:28:00 -0500 +Subject: [PATCH] [build]: Fix Savannah #64681 (webpage.ps deps). + +* doc/doc.am (doc/webpage.ps, doc/webpage.html): Update and parallelize + target dependencies. Resolve race by requiring "grn" and "soelim" to + be built first. Also add dependency on `$(TMAC_PACKAGE_MS)`. + +Fixes <https://savannah.gnu.org/bugs/?64681>. Thanks to Alexander +Kanavin for the report. + +ANNOUNCE: Acknowledge Alexander. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + doc/doc.am | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/doc/doc.am b/doc/doc.am +index cddc51907..d3c9ab6b7 100644 +--- a/doc/doc.am ++++ b/doc/doc.am +@@ -346,6 +346,9 @@ doc/pic.ps: $(doc_srcdir)/pic.ms eqn pic tbl + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@ + ++# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and ++# soelim even though the document doesn't require them. ++doc/webpage.ps: grn soelim + doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl + doc/webpage.ps: $(doc_srcdir)/webpage.ms + $(GROFF_V)$(MKDIR_P) `dirname $@` \ +@@ -365,11 +368,12 @@ doc/pic.html: $(doc_srcdir)/pic.ms + && $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \ + $(doc_srcdir)/pic.ms > pic.html + +-doc/webpage.html: tbl +-doc/webpage.html: tmac/www.tmac +-doc/webpage.html: $(DOC_GNU_EPS) ++# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and ++# soelim even though the document doesn't require them. ++doc/webpage.html: grn soelim ++doc/webpage.html: $(DOC_GNU_EPS) tmac/www.tmac tbl + doc/webpage.html: $(doc_srcdir)/groff.css +-doc/webpage.html: $(doc_srcdir)/webpage.ms ++doc/webpage.html: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS) + $(GROFF_V)$(MKDIR_P) $(doc_builddir) \ + && cd $(doc_builddir) \ + && $(DOC_GROFF) -t -I $(doc_srcdir) -P-jwebpage -P-nrb \ diff --git a/poky/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch b/poky/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch new file mode 100644 index 0000000000..3e81b86ac8 --- /dev/null +++ b/poky/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch @@ -0,0 +1,31 @@ +From f21e9f13beb57a1e0666edf9693d7c83f2189897 Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" <g.branden.robinson@gmail.com> +Date: Fri, 22 Sep 2023 01:27:57 -0500 +Subject: [PATCH] [build]: meintro_fr.ps depends on tbl. + +* doc/doc.am (doc/meintro_fr.ps): Depend on tbl, resolving race in + sufficiently parallelized builds. Overlooked in commit 92349ae223, + 2022-05-30. + +Fixes <https://savannah.gnu.org/bugs/?64695>. Thanks to Alexander +Kanavin for the report. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + doc/doc.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/doc.am b/doc/doc.am +index d3c9ab6b7..0f95c7774 100644 +--- a/doc/doc.am ++++ b/doc/doc.am +@@ -334,7 +334,7 @@ SUFFIXES += .me.in .me + + # Use '-K utf8', not '-k', in case 'configure' didn't find uchardet. + # The French translation uses tbl; its English counterpart does not. +-doc/meintro_fr.ps: doc/meintro_fr.me preconv ++doc/meintro_fr.ps: doc/meintro_fr.me preconv tbl + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -K utf8 -t -Tps -me -mfr $< >$@ + diff --git a/poky/meta/recipes-extended/groff/groff_1.23.0.bb b/poky/meta/recipes-extended/groff/groff_1.23.0.bb index 1dcd0bb605..0fc4f831d8 100644 --- a/poky/meta/recipes-extended/groff/groff_1.23.0.bb +++ b/poky/meta/recipes-extended/groff/groff_1.23.0.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-not-search-fonts-on-build-host.patch \ file://0001-Make-manpages-mulitlib-identical.patch \ + file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \ + file://0001-build-meintro_fr.ps-depends-on-tbl.patch \ " SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13" diff --git a/poky/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch b/poky/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch deleted file mode 100644 index 18f992beb8..0000000000 --- a/poky/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch +++ /dev/null @@ -1,24 +0,0 @@ -The gnulib largefile macro needs updating to work with autoconf 2.73. Rather -than the full code: - -https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb - -Just tweak the exiting code to work with 2.73. The next gzip upgrade should -update to new gnulib - -Upstream-Status: Inappropriate -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: findutils-4.9.0/gl/m4/largefile.m4 -=================================================================== ---- findutils-4.9.0.orig/m4/largefile.m4 -+++ findutils-4.9.0/m4/largefile.m4 -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. --m4_version_prereq([2.70], [], [ -+m4_version_prereq([2.73], [], [ - - # _AC_SYS_LARGEFILE_TEST_INCLUDES - # ------------------------------- diff --git a/poky/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch b/poky/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch index 7f9e249de8..7f9e249de8 100644 --- a/poky/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch +++ b/poky/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch diff --git a/poky/meta/recipes-extended/gzip/gzip_1.12.bb b/poky/meta/recipes-extended/gzip/gzip_1.13.bb index 35eb7c4da2..fd846b30a5 100644 --- a/poky/meta/recipes-extended/gzip/gzip_1.12.bb +++ b/poky/meta/recipes-extended/gzip/gzip_1.13.bb @@ -5,12 +5,11 @@ require gzip.inc LICENSE = "GPL-3.0-or-later" SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ - file://autoconf-2.73.patch \ file://run-ptest \ - " + " SRC_URI:append:class-target = " file://wrong-path-fix.patch" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" PROVIDES:append:class-native = " gzip-replacement-native" @@ -39,4 +38,4 @@ do_install_ptest() { ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile } -SRC_URI[sha256sum] = "5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085" +SRC_URI[sha256sum] = "20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a" diff --git a/poky/meta/recipes-extended/libarchive/libarchive_3.7.1.bb b/poky/meta/recipes-extended/libarchive/libarchive_3.7.2.bb index e40c3e7ed0..a09f607fcf 100644 --- a/poky/meta/recipes-extended/libarchive/libarchive_3.7.1.bb +++ b/poky/meta/recipes-extended/libarchive/libarchive_3.7.2.bb @@ -32,7 +32,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" SRC_URI += "file://configurehack.patch" UPSTREAM_CHECK_URI = "http://libarchive.org/" -SRC_URI[sha256sum] = "5d24e40819768f74daf846b99837fc53a3a9dcdf3ce1c2003fe0596db850f0f0" +SRC_URI[sha256sum] = "df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104" CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" diff --git a/poky/meta/recipes-extended/libsolv/libsolv_0.7.24.bb b/poky/meta/recipes-extended/libsolv/libsolv_0.7.25.bb index 7c8f1fd372..69cb3f7996 100644 --- a/poky/meta/recipes-extended/libsolv/libsolv_0.7.24.bb +++ b/poky/meta/recipes-extended/libsolv/libsolv_0.7.25.bb @@ -6,13 +6,13 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" -DEPENDS = "expat zlib" +DEPENDS = "expat zlib zstd" SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \ file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ " -SRCREV = "4d05dca3974156faf2f025ca4a82b68904848307" +SRCREV = "f1be8bf3dcc7dc14d331adbc97f337fa08e641c9" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" @@ -23,7 +23,7 @@ inherit cmake PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" -EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" +EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON -DENABLE_ZSTD_COMPRESSION=ON" PACKAGES =+ "${PN}-tools ${PN}ext" diff --git a/poky/meta/recipes-extended/man-pages/man-pages_6.04.bb b/poky/meta/recipes-extended/man-pages/man-pages_6.05.01.bb index fee57e3fbd..2726eded8b 100644 --- a/poky/meta/recipes-extended/man-pages/man-pages_6.04.bb +++ b/poky/meta/recipes-extended/man-pages/man-pages_6.05.01.bb @@ -4,7 +4,7 @@ SECTION = "console/utils" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" -LIC_FILES_CHKSUM = "file://README;md5=5b7d7488344f5af8841dc13aaec49cdf \ +LIC_FILES_CHKSUM = "file://README;md5=cbd51cd3dd298230df8ddd4637e65c37 \ file://LICENSES/BSD-2-Clause.txt;md5=d0f280d1058e77e66264a9b9e10e6c89 \ file://LICENSES/BSD-3-Clause.txt;md5=71f739ef75581cae312e8c711bcdab16 \ file://LICENSES/BSD-4-Clause-UC.txt;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \ @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://README;md5=5b7d7488344f5af8841dc13aaec49cdf \ " SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "590623b99bf1f8ee958483c35cc0aaef2363e42998c4d927d1f705890d15d51e" +SRC_URI[sha256sum] = "b2dd44ca0342b50923291f06bdba38c42438e10c04843ce1f731cf3f50631e0a" inherit manpages diff --git a/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb b/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb index 7a16c65299..aa5a989df2 100644 --- a/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb +++ b/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb @@ -3,7 +3,6 @@ SECTION = "console/utils" HOMEPAGE = "http://sourceforge.net/projects/mingetty/" DESCRIPTION = "This is a small Linux console getty that is started on the Linux text console, asks for a login name and then tranfers over to login directory. Is extended to allow automatic login and starting any app." LICENSE = "GPL-2.0-only" -PR = "r3" LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" diff --git a/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index b66617fbf6..e9531fa838 100644 --- a/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb @@ -4,7 +4,6 @@ SUMMARY = "Standard full-featured Linux system" DESCRIPTION = "Package group bringing in packages needed for a more traditional full-featured Linux system" -PR = "r6" inherit packagegroup diff --git a/poky/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch b/poky/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch deleted file mode 100644 index 805517900d..0000000000 --- a/poky/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1d685477c254e5b10a81e32c87786e0f001b70f1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Mon, 24 Jul 2023 18:06:51 +0200 -Subject: [PATCH] po/fr.po: address failures with gettext 0.22 - -Specifically: -| fr.1po:3027: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 4, the argument size specifier is invalid. -| fr.1po:3820: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid. - -Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/199] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - po/fr.po | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/po/fr.po b/po/fr.po -index 715c2b69..700834e1 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -3800,7 +3800,7 @@ msgid "" - "Type 'q' or <Esc> to continue " - msgstr "" - "Aide pour les commandes interactives~2 - %s\n" --"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1lf " -+"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1f " - "secs~2; ~1Mode sûr ~3%s~2.\n" - "\n" - " Z~5,~1B~5,E,e Global: «~1Z~2» couleurs; «~1B~2» gras; «~1E~2»/«~1e~2» " -@@ -4723,7 +4723,7 @@ msgstr " -v, --version affiche les informations de version et sort\n" - #: src/watch.c:486 - #, c-format - msgid "Every %.1fs: " --msgstr "Toutes les %.1lfs: " -+msgstr "Toutes les %.1fs: " - - #: src/watch.c:487 - #, c-format diff --git a/poky/meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch b/poky/meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch deleted file mode 100644 index 23c91ec775..0000000000 --- a/poky/meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch +++ /dev/null @@ -1,65 +0,0 @@ -From c41b3be62fbb78e0939fddaebad519360cbd8702 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Mon, 6 Mar 2023 09:27:57 +0100 -Subject: [PATCH] src/w.c: use only utmpx - -Nowadays this works both on musl and glibc systems, however on musl -utmp.h is also needed to avoid the following failure: - -| ../git/src/w.c: In function 'print_from': -| ../git/src/w.c:73:28: error: '__UT_HOSTSIZE' undeclared (first use in this function); did you mean 'UT_HOSTSIZE'? -| 73 | # define UT_HOSTSIZE __UT_HOSTSIZE -| | ^~~~~~~~~~~~~ -| ../git/src/w.c:233:64: note: in expansion of macro 'UT_HOSTSIZE' -| 233 | print_display_or_interface(u->ut_host, UT_HOSTSIZE, fromlen - len); -| | ^~~~~~~~~~~ -| - -It is caused by including utmpx.h, but not utmp.h, which (on musl) -lacks the needed definitions. - -I have verified that both musl and glibc based builds continue to work. - -Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/171] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> - ---- - src/w.c | 17 ++--------------- - 1 file changed, 2 insertions(+), 15 deletions(-) - -diff --git a/src/w.c b/src/w.c -index 5e878f04..912c5df3 100644 ---- a/src/w.c -+++ b/src/w.c -@@ -46,11 +46,8 @@ - #include <termios.h> - #include <time.h> - #include <unistd.h> --#ifdef HAVE_UTMPX_H --# include <utmpx.h> --#else --# include <utmp.h> --#endif -+#include <utmp.h> -+#include <utmpx.h> - #include <arpa/inet.h> - - #include "c.h" -@@ -63,17 +60,7 @@ - static int ignoreuser = 0; /* for '-u' */ - static int oldstyle = 0; /* for '-o' */ - --#ifdef HAVE_UTMPX_H - typedef struct utmpx utmp_t; --#else --typedef struct utmp utmp_t; --#endif -- --#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE) --# define UT_HOSTSIZE __UT_HOSTSIZE --# define UT_LINESIZE __UT_LINESIZE --# define UT_NAMESIZE __UT_NAMESIZE --#endif - - #ifdef W_SHOWFROM - # define FROM_STRING "on" diff --git a/poky/meta/recipes-extended/procps/procps/CVE-2023-4016.patch b/poky/meta/recipes-extended/procps/procps/CVE-2023-4016.patch deleted file mode 100644 index 202fea91f1..0000000000 --- a/poky/meta/recipes-extended/procps/procps/CVE-2023-4016.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 2c933ecba3bb1d3041a5a7a53a7b4078a6003413 Mon Sep 17 00:00:00 2001 -From: Craig Small <csmall@dropbear.xyz> -Date: Thu, 10 Aug 2023 21:18:38 +1000 -Subject: [PATCH] ps: Fix possible buffer overflow in -C option - -ps allocates memory using malloc(length of arg * len of struct). -In certain strange circumstances, the arg length could be very large -and the multiplecation will overflow, allocating a small amount of -memory. - -Subsequent strncpy() will then write into unallocated memory. -The fix is to use calloc. It's slower but this is a one-time -allocation. Other malloc(x * y) calls have also been replaced -by calloc(x, y) - -References: - https://www.freelists.org/post/procps/ps-buffer-overflow-CVE-20234016 - https://nvd.nist.gov/vuln/detail/CVE-2023-4016 - https://gitlab.com/procps-ng/procps/-/issues/297 - https://bugs.debian.org/1042887 - -Signed-off-by: Craig Small <csmall@dropbear.xyz> - -CVE: CVE-2023-4016 -Upstream-Status: Backport [https://gitlab.com/procps-ng/procps/-/commit/2c933ecba3bb1d3041a5a7a53a7b4078a6003413] -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - NEWS | 1 + - src/ps/parser.c | 8 ++++---- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/ps/parser.c b/src/ps/parser.c -index 248aa741..15873dfa 100644 ---- a/src/ps/parser.c -+++ b/src/ps/parser.c -@@ -189,7 +189,6 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s - const char *err; /* error code that could or did happen */ - /*** prepare to operate ***/ - node = xmalloc(sizeof(selection_node)); -- node->u = xmalloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */ - node->n = 0; - buf = strdup(arg); - /*** sanity check and count items ***/ -@@ -210,6 +209,7 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s - } while (*++walk); - if(need_item) goto parse_error; - node->n = items; -+ node->u = xcalloc(items, sizeof(sel_union)); - /*** actually parse the list ***/ - walk = buf; - while(items--){ -@@ -1050,15 +1050,15 @@ static const char *parse_trailing_pids(void){ - thisarg = ps_argc - 1; /* we must be at the end now */ - - pidnode = xmalloc(sizeof(selection_node)); -- pidnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */ -+ pidnode->u = xcalloc(i, sizeof(sel_union)); /* waste is insignificant */ - pidnode->n = 0; - - grpnode = xmalloc(sizeof(selection_node)); -- grpnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */ -+ grpnode->u = xcalloc(i,sizeof(sel_union)); /* waste is insignificant */ - grpnode->n = 0; - - sidnode = xmalloc(sizeof(selection_node)); -- sidnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */ -+ sidnode->u = xcalloc(i, sizeof(sel_union)); /* waste is insignificant */ - sidnode->n = 0; - - while(i--){ --- -GitLab - diff --git a/poky/meta/recipes-extended/procps/procps_4.0.3.bb b/poky/meta/recipes-extended/procps/procps_4.0.4.bb index 9ef679c6bd..800384f22f 100644 --- a/poky/meta/recipes-extended/procps/procps_4.0.3.bb +++ b/poky/meta/recipes-extended/procps/procps_4.0.4.bb @@ -14,11 +14,8 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ file://sysctl.conf \ - file://0001-src-w.c-use-utmp.h-only.patch \ - file://0001-po-fr.po-address-failures-with-gettext-0.22.patch \ - file://CVE-2023-4016.patch \ " -SRCREV = "806eb270f217ff7e1e745c7bda2b002b5be74be4" +SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch b/poky/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch deleted file mode 100644 index 80659942c7..0000000000 --- a/poky/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 4e102de2e6204c1d8e8be00bb5ffd4587e70350c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 15 Aug 2022 10:35:53 -0700 -Subject: [PATCH] configure: Add needed system headers in checks - -Newer compilers throw warnings when a funciton is used with implicit -declaration and enabling -Werror can silently fail these tests and -result in wrong configure results. Therefore add the needed headers in -the AC_TRY_LINK macros - - * configure.ac: Add missing system headers in AC_TRY_LINK. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/screen-devel/2022-08/msg00000.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 57 +++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 43 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c0f02df..d308079 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -233,6 +233,7 @@ AC_CHECKING(BSD job jontrol) - AC_TRY_LINK( - [#include <sys/types.h> - #include <sys/ioctl.h> -+#include <unistd.h> - ], [ - #ifdef POSIX - tcsetpgrp(0, 0); -@@ -250,12 +251,16 @@ dnl - dnl **** setresuid(), setreuid(), seteuid() **** - dnl - AC_CHECKING(setresuid) --AC_TRY_LINK(,[ --setresuid(0, 0, 0); -+AC_TRY_LINK([ -+#include <unistd.h> -+],[ -+return setresuid(0, 0, 0); - ], AC_DEFINE(HAVE_SETRESUID)) - AC_CHECKING(setreuid) --AC_TRY_LINK(,[ --setreuid(0, 0); -+AC_TRY_LINK([ -+#include <unistd.h> -+],[ -+return setreuid(0, 0); - ], AC_DEFINE(HAVE_SETREUID)) - dnl - dnl seteuid() check: -@@ -274,7 +279,9 @@ seteuid(0); - - dnl execvpe - AC_CHECKING(execvpe) --AC_TRY_LINK(,[ -+AC_TRY_LINK([ -+ #include <unistd.h> -+],[ - execvpe(0, 0, 0); - ], AC_DEFINE(HAVE_EXECVPE) - CFLAGS="$CFLAGS -D_GNU_SOURCE") -@@ -284,10 +291,18 @@ dnl **** select() **** - dnl - - AC_CHECKING(select) --AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, -+AC_TRY_LINK([ -+ #include <sys/select.h> -+],[ -+ select(0, 0, 0, 0, 0); -+],, - LIBS="$LIBS -lnet -lnsl" - AC_CHECKING(select with $LIBS) --AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, -+AC_TRY_LINK([ -+ #include <sys/select.h> -+],[ -+ select(0, 0, 0, 0, 0); -+],, - AC_MSG_ERROR(!!! no select - no screen)) - ) - dnl -@@ -624,11 +639,19 @@ dnl - dnl **** termcap or terminfo **** - dnl - AC_CHECKING(for tgetent) --AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, -+AC_TRY_LINK([ -+ #include <curses.h> -+ #include <term.h> -+],[ -+ tgetent((char *)0, (char *)0); -+],, - olibs="$LIBS" - LIBS="-lcurses $olibs" - AC_CHECKING(libcurses) --AC_TRY_LINK(,[ -+AC_TRY_LINK([ -+ #include <curses.h> -+ #include <term.h> -+],[ - #ifdef __hpux - __sorry_hpux_libcurses_is_totally_broken_in_10_10(); - #else -@@ -871,7 +894,7 @@ test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil" - fi - - AC_CHECKING(getloadavg) --AC_TRY_LINK(,[getloadavg((double *)0, 0);], -+AC_TRY_LINK([#include <stdlib.h>],[getloadavg((double *)0, 0);], - AC_DEFINE(LOADAV_GETLOADAVG) load=1, - if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then - olibs="$LIBS" -@@ -1109,10 +1132,10 @@ AC_CHECKING(IRIX sun library) - AC_TRY_LINK(,,,LIBS="$oldlibs") - - AC_CHECKING(syslog) --AC_TRY_LINK(,[closelog();], , [oldlibs="$LIBS" -+AC_TRY_LINK([#include <syslog.h>],[closelog();], , [oldlibs="$LIBS" - LIBS="$LIBS -lbsd" - AC_CHECKING(syslog in libbsd.a) --AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" -+AC_TRY_LINK([#include <syslog.h>], [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" - AC_NOTE(- bad news: syslog missing.) AC_DEFINE(NOSYSLOG)])]) - - AC_EGREP_CPP(YES_IS_DEFINED, -@@ -1149,7 +1172,7 @@ AC_CHECKING(getspnam) - AC_TRY_LINK([#include <shadow.h>], [getspnam("x");],AC_DEFINE(SHADOWPW)) - - AC_CHECKING(getttyent) --AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) -+AC_TRY_LINK([#include <ttyent.h>],[getttyent();], AC_DEFINE(GETTTYENT)) - - AC_CHECKING(fdwalk) - AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) -@@ -1204,7 +1227,13 @@ main() { - AC_SYS_LONG_FILE_NAMES - - AC_MSG_CHECKING(for vsprintf) --AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) -+AC_TRY_LINK([ -+ #include <stdarg.h> -+ #include <stdio.h> -+],[ -+ va_list valist; -+ vsprintf(0,0,valist); -+], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) - - AC_HEADER_DIRENT - diff --git a/poky/meta/recipes-extended/screen/screen/signal-permission.patch b/poky/meta/recipes-extended/screen/screen/signal-permission.patch deleted file mode 100644 index 77dc649090..0000000000 --- a/poky/meta/recipes-extended/screen/screen/signal-permission.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e9ad41bfedb4537a6f0de20f00b27c7739f168f7 Mon Sep 17 00:00:00 2001 -From: Alexander Naumov <alexander_naumov@opensuse.org> -Date: Mon, 30 Jan 2023 17:22:25 +0200 -Subject: fix: missing signal sending permission check on failed query messages - -Signed-off-by: Alexander Naumov <alexander_naumov@opensuse.org> - -CVE: CVE-2023-24626 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - src/socket.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/socket.c b/src/socket.c -index 147dc54..54d8cb8 100644 ---- a/socket.c -+++ b/socket.c -@@ -1285,11 +1285,16 @@ ReceiveMsg() - else - queryflag = -1; - -- Kill(m.m.command.apid, -+ if (CheckPid(m.m.command.apid)) { -+ Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid); -+ } -+ else { -+ Kill(m.m.command.apid, - (queryflag >= 0) - ? SIGCONT - : SIG_BYE); /* Send SIG_BYE if an error happened */ -- queryflag = -1; -+ queryflag = -1; -+ } - } - break; - case MSG_COMMAND: --- -cgit v1.1 - diff --git a/poky/meta/recipes-extended/screen/screen_4.9.0.bb b/poky/meta/recipes-extended/screen/screen_4.9.1.bb index 235cd8c6cf..7b040e6b57 100644 --- a/poky/meta/recipes-extended/screen/screen_4.9.0.bb +++ b/poky/meta/recipes-extended/screen/screen_4.9.1.bb @@ -21,11 +21,9 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0002-comm.h-now-depends-on-term.h.patch \ file://0001-fix-for-multijob-build.patch \ file://0001-Remove-more-compatibility-stuff.patch \ - file://0001-configure-Add-needed-system-headers-in-checks.patch \ - file://signal-permission.patch \ " -SRC_URI[sha256sum] = "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4" +SRC_URI[sha256sum] = "26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69" inherit autotools texinfo diff --git a/poky/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch b/poky/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch index 37ba5f3dc2..89f9c05c8d 100644 --- a/poky/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch +++ b/poky/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch @@ -7,7 +7,7 @@ Date: Tue Dec 27 17:40:17 2022 +0530 Login timed out message prints only first few bytes when write is immediately followed by exit. Calling exit from new handler provides enough time to display full message. -Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] +Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] diff --git a/src/login.c b/src/login.c index 116e2cb3..c55f4de0 100644 diff --git a/poky/meta/recipes-extended/shadow/shadow-securetty_4.6.bb b/poky/meta/recipes-extended/shadow/shadow-securetty_4.6.bb index c78f888cf4..fe51ea1874 100644 --- a/poky/meta/recipes-extended/shadow/shadow-securetty_4.6.bb +++ b/poky/meta/recipes-extended/shadow/shadow-securetty_4.6.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 INHIBIT_DEFAULT_DEPS = "1" -PR = "r3" SRC_URI = "file://securetty" diff --git a/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb index 6580bd9166..00ab58b38c 100644 --- a/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb +++ b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://login.defs_shadow-sysroot;endline=1;md5=ceddfb61608e4 DEPENDS = "base-passwd" -PR = "r3" # The sole purpose of this recipe is to provide the /etc/login.defs # file for the target sysroot - needed so the shadow-native utilities diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.16.04.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.16.05.bb index af8433975b..1a1e9e4057 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.16.04.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.16.05.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ " -SRCREV = "95777d7cf32de9fc88c452a968ae2ae23ed269c2" +SRCREV = "aea6f3306f4676a7f7e8d8c507f811ef3d0244c5" S = "${WORKDIR}/git" DEPENDS = "coreutils-native libbsd" diff --git a/poky/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch b/poky/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch index 4067bb983b..84383f955f 100644 --- a/poky/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch +++ b/poky/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch @@ -1,7 +1,7 @@ From 1590cc614aaf0fb81cd804414d6c9d5a9227352c Mon Sep 17 00:00:00 2001 From: Wenlin Kang <wenlin.kang@windriver.com> Date: Tue, 5 Nov 2019 16:16:44 +0800 -Subject: [PATCH] configure.in: remove check for chkconfig +Subject: [PATCH] configure.ac: remove check for chkconfig chkconfig can't work on cross-platform, so should remove check for it. @@ -9,13 +9,13 @@ Upstream-Status: Inappropriate [ embedded specific ] Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> --- - configure.in | 3 ++- + configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/configure.in b/configure.in +diff --git a/configure.ac b/configure.ac index 48b9a31..cedeb43 100644 ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -42,7 +42,8 @@ AC_SUBST(VER_JSON) AC_SUBST(VER_XML) diff --git a/poky/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch b/poky/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch deleted file mode 100644 index a7b51f3217..0000000000 --- a/poky/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0764cb56df4a5afdf04980c9eb6735f789f5aa42 Mon Sep 17 00:00:00 2001 -From: Pavel Kopylov <pkopylov@cloudlinux.com> -Date: Wed, 17 May 2023 11:33:45 +0200 -Subject: [PATCH] Fix an overflow which is still possible for some values. - -CVE: CVE-2023-33204 -Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/954ff2e2673c] - -Backport Changes: -Adopt additional changes as per following merge commit of pull request: -https://github.com/sysstat/sysstat/commit/6f8dc568e6ab - -Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> -Signed-off-by: Sanjay Chitroda <schitrod@cisco.com> ---- - common.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/common.c b/common.c -index a3d31a5..138920c 100644 ---- a/common.c -+++ b/common.c -@@ -447,15 +447,17 @@ int check_dir(char *dirname) - void check_overflow(unsigned int val1, unsigned int val2, - unsigned int val3) - { -- if ((unsigned long long) val1 * (unsigned long long) val2 * -- (unsigned long long) val3 > UINT_MAX) { -+ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && -+ (((unsigned long long)UINT_MAX / (unsigned long long)val1 < -+ (unsigned long long)val2) || -+ ((unsigned long long)UINT_MAX / ((unsigned long long)val1 * -+ (unsigned long long)val2) < (unsigned long long)val3))) { - #ifdef DEBUG -- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", -- __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * -- (unsigned long long) val3); -+ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n", -+ __FUNCTION__, val1, val2, val3); - #endif - exit(4); -- } -+ } - } - - #ifndef SOURCE_SADC diff --git a/poky/meta/recipes-extended/sysstat/sysstat_12.6.2.bb b/poky/meta/recipes-extended/sysstat/sysstat_12.6.2.bb deleted file mode 100644 index b5014eaefb..0000000000 --- a/poky/meta/recipes-extended/sysstat/sysstat_12.6.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require sysstat.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" - -SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch \ - file://CVE-2023-33204.patch \ - " - -SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48" diff --git a/poky/meta/recipes-extended/sysstat/sysstat.inc b/poky/meta/recipes-extended/sysstat/sysstat_12.7.4.bb index 77337722ea..134fd5cf96 100644 --- a/poky/meta/recipes-extended/sysstat/sysstat.inc +++ b/poky/meta/recipes-extended/sysstat/sysstat_12.7.4.bb @@ -1,20 +1,24 @@ SUMMARY = "System performance tools" DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." -HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" +HOMEPAGE = "https://sysstat.github.io/" LICENSE = "GPL-2.0-or-later" SECTION = "console/utils" -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \ +SRC_URI = "git://github.com/sysstat/sysstat.git;protocol=https;branch=master \ file://99_sysstat \ file://sysstat.service \ + file://0001-configure.in-remove-check-for-chkconfig.patch \ " -UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html" +LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" + +SRCREV = "1df0d61306ae826c896a5cf6f665d58c671c0498" +S = "${WORKDIR}/git" DEPENDS += "base-passwd" # autotools-brokensep as this package doesn't use automake -inherit autotools-brokensep gettext systemd upstream-version-is-even +inherit autotools-brokensep gettext systemd PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" @@ -69,3 +73,4 @@ pkg_postinst:${PN} () { FILES:${PN} += "${systemd_system_unitdir} ${nonarch_base_libdir}/systemd" TARGET_CC_ARCH += "${LDFLAGS}" + diff --git a/poky/meta/recipes-extended/tar/tar/0001-tests-fix-TESTSUITE_AT.patch b/poky/meta/recipes-extended/tar/tar/0001-tests-fix-TESTSUITE_AT.patch new file mode 100644 index 0000000000..27d4d9aebf --- /dev/null +++ b/poky/meta/recipes-extended/tar/tar/0001-tests-fix-TESTSUITE_AT.patch @@ -0,0 +1,228 @@ +From 39849e9d91f477d3fb839f93cd0815d0cb3273e9 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 18 Jul 2023 09:15:03 -0700 +Subject: tests: fix TESTSUITE_AT + +Problem reported by Lukas Javorsky <ljavorsk@redhat.com> in: +https://lists.gnu.org/r/bug-tar/2023-07/msg00002.html +* tests/Makefile.am (TESTSUITE_AT): Add exclude17.at, exclude18.at. +Remove compress.m4; all uses changed. Add a comment saying how +to rederive this. Sort. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/tar.git/commit/?id=39849e9d91f477d3fb839f93cd0815d0cb3273e9] +--- + tests/Makefile.am | 93 ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 48 insertions(+), 45 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 4a8f501..1884b72 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -45,21 +45,24 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac + ## Test suite. ## + ## ------------ ## + ++# You can generate the body of this macro with the following shell command: ++# LC_ALL=C ls *.at */*.at | sed -e 's/^/ /' -e '$!s/$/\\/' + TESTSUITE_AT = \ +- testsuite.at\ +- compress.m4\ + T-cd.at\ + T-dir00.at\ + T-dir01.at\ + T-empty.at\ ++ T-mult.at\ ++ T-nest.at\ ++ T-nonl.at\ + T-null.at\ + T-null2.at\ + T-rec.at\ + T-recurse.at\ + T-zfile.at\ +- T-nonl.at\ +- T-mult.at\ +- T-nest.at\ ++ acls01.at\ ++ acls02.at\ ++ acls03.at\ + add-file.at\ + append.at\ + append01.at\ +@@ -68,14 +71,15 @@ TESTSUITE_AT = \ + append04.at\ + append05.at\ + backup01.at\ +- chtype.at\ +- comprec.at\ +- comperr.at\ ++ capabs_raw01.at\ + checkpoint/defaults.at\ +- checkpoint/interval.at\ +- checkpoint/dot.at\ + checkpoint/dot-compat.at\ + checkpoint/dot-int.at\ ++ checkpoint/dot.at\ ++ checkpoint/interval.at\ ++ chtype.at\ ++ comperr.at\ ++ comprec.at\ + delete01.at\ + delete02.at\ + delete03.at\ +@@ -83,6 +87,8 @@ TESTSUITE_AT = \ + delete05.at\ + delete06.at\ + difflink.at\ ++ dirrem01.at\ ++ dirrem02.at\ + exclude.at\ + exclude01.at\ + exclude02.at\ +@@ -100,6 +106,8 @@ TESTSUITE_AT = \ + exclude14.at\ + exclude15.at\ + exclude16.at\ ++ exclude17.at\ ++ exclude18.at\ + extrac01.at\ + extrac02.at\ + extrac03.at\ +@@ -127,11 +135,9 @@ TESTSUITE_AT = \ + extrac25.at\ + filerem01.at\ + filerem02.at\ +- dirrem01.at\ +- dirrem02.at\ +- gzip.at\ + grow.at\ +- incremental.at\ ++ gzip.at\ ++ ignfail.at\ + incr01.at\ + incr02.at\ + incr03.at\ +@@ -143,8 +149,8 @@ TESTSUITE_AT = \ + incr09.at\ + incr10.at\ + incr11.at\ ++ incremental.at\ + indexfile.at\ +- ignfail.at\ + label01.at\ + label02.at\ + label03.at\ +@@ -188,22 +194,16 @@ TESTSUITE_AT = \ + opcomp04.at\ + opcomp05.at\ + opcomp06.at\ +- positional01.at\ +- positional02.at\ +- positional03.at\ + options.at\ + options02.at\ + options03.at\ + owner.at\ + pipe.at\ +- recurse.at\ ++ positional01.at\ ++ positional02.at\ ++ positional03.at\ + recurs02.at\ +- rename01.at\ +- rename02.at\ +- rename03.at\ +- rename04.at\ +- rename05.at\ +- rename06.at\ ++ recurse.at\ + remfiles01.at\ + remfiles02.at\ + remfiles03.at\ +@@ -226,11 +226,19 @@ TESTSUITE_AT = \ + remfiles09b.at\ + remfiles09c.at\ + remfiles10.at\ ++ rename01.at\ ++ rename02.at\ ++ rename03.at\ ++ rename04.at\ ++ rename05.at\ ++ rename06.at\ + same-order01.at\ + same-order02.at\ ++ selacl01.at\ ++ selnx01.at\ + shortfile.at\ +- shortupd.at\ + shortrec.at\ ++ shortupd.at\ + sigpipe.at\ + sparse01.at\ + sparse02.at\ +@@ -247,6 +255,13 @@ TESTSUITE_AT = \ + sptrcreat.at\ + sptrdiff00.at\ + sptrdiff01.at\ ++ star/gtarfail.at\ ++ star/gtarfail2.at\ ++ star/multi-fail.at\ ++ star/pax-big-10g.at\ ++ star/ustar-big-2g.at\ ++ star/ustar-big-8g.at\ ++ testsuite.at\ + time01.at\ + time02.at\ + truncate.at\ +@@ -255,21 +270,11 @@ TESTSUITE_AT = \ + update02.at\ + update03.at\ + update04.at\ +- volsize.at\ +- volume.at\ + verbose.at\ + verify.at\ + version.at\ +- xform-h.at\ +- xform01.at\ +- xform02.at\ +- xform03.at\ +- star/gtarfail.at\ +- star/gtarfail2.at\ +- star/multi-fail.at\ +- star/ustar-big-2g.at\ +- star/ustar-big-8g.at\ +- star/pax-big-10g.at\ ++ volsize.at\ ++ volume.at\ + xattr01.at\ + xattr02.at\ + xattr03.at\ +@@ -278,12 +283,10 @@ TESTSUITE_AT = \ + xattr06.at\ + xattr07.at\ + xattr08.at\ +- acls01.at\ +- acls02.at\ +- acls03.at\ +- selnx01.at\ +- selacl01.at\ +- capabs_raw01.at ++ xform-h.at\ ++ xform01.at\ ++ xform02.at\ ++ xform03.at + + distclean-local: + -rm -rf download +@@ -291,7 +294,7 @@ distclean-local: + TESTSUITE = $(srcdir)/testsuite + + AUTOTEST = $(AUTOM4TE) --language=autotest +-$(TESTSUITE): package.m4 $(TESTSUITE_AT) ++$(TESTSUITE): compress.m4 package.m4 $(TESTSUITE_AT) + $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp + mv $@.tmp $@ + +-- +cgit v1.1 + diff --git a/poky/meta/recipes-extended/tar/tar/0002-tests-check-for-recently-fixed-bug.patch b/poky/meta/recipes-extended/tar/tar/0002-tests-check-for-recently-fixed-bug.patch new file mode 100644 index 0000000000..6cd8c5510f --- /dev/null +++ b/poky/meta/recipes-extended/tar/tar/0002-tests-check-for-recently-fixed-bug.patch @@ -0,0 +1,60 @@ +From 0f0722df45ec520d0dac7c9ad7e69165e9140931 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Fri, 7 Oct 2022 15:22:07 -0700 +Subject: tests: check for recently-fixed bug + +* tests/exclude17.at: New file. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/tar.git/commit/?id=0f0722df45ec520d0dac7c9ad7e69165e9140931] + +Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> + +--- + tests/exclude17.at | 35 +++++++++++++++++++++++++++++++++++ + 1 files changed, 35 insertions(+) + create mode 100644 tests/exclude17.at + +diff --git a/tests/exclude17.at b/tests/exclude17.at +new file mode 100644 +index 0000000..4162b2b +--- /dev/null ++++ b/tests/exclude17.at +@@ -0,0 +1,35 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# ++# Test suite for GNU tar. ++# Copyright 2013-2022 Free Software Foundation, Inc. ++ ++# This file is part of GNU tar. ++ ++# GNU tar is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++ ++# GNU tar is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++AT_SETUP([--exclude-vcs-ignores memory allocation]) ++AT_KEYWORDS([exclude exclude17]) ++ ++AT_TAR_CHECK([ ++mkdir dir ++cd dir ++echo '*.o' >.cvsignore ++tar -cf - --exclude-vcs-ignores . | tar -tf - ++], ++[0], ++[./ ++./.cvsignore ++]) ++ ++AT_CLEANUP +-- +cgit v1.1 + diff --git a/poky/meta/recipes-extended/tar/tar/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch b/poky/meta/recipes-extended/tar/tar/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch new file mode 100644 index 0000000000..577a9ba997 --- /dev/null +++ b/poky/meta/recipes-extended/tar/tar/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch @@ -0,0 +1,112 @@ +From 4f814e0e4c673f86dc65a557f7e55f6b5efd1529 Mon Sep 17 00:00:00 2001 +From: Anton Makrushin <makrusan@gmail.com> +Date: Mon, 20 Mar 2023 20:05:42 +0530 +Subject: Exclude VCS directory with writing from an archive + +See https://savannah.gnu.org/bugs/?62859 + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/tar.git/commit/?id=4f814e0e4c673f86dc65a557f7e55f6b5efd1529] + +Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> + +--- + tests/exclude18.at | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 87 insertions(+) + create mode 100644 tests/exclude18.at + +diff --git a/tests/exclude18.at b/tests/exclude18.at +new file mode 100644 +index 0000000..64aaa52 +--- /dev/null ++++ b/tests/exclude18.at +@@ -0,0 +1,87 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++ ++# Test suite for GNU tar. ++# Copyright 2004-2023 Free Software Foundation, Inc. ++ ++# This file is part of GNU tar. ++ ++# GNU tar is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++ ++# GNU tar is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++# Test --exclude-vcs option with subcommands: EXTRACT, LIST, DIFF. ++# Check VCS directory with files, and empty. ++# ++# Ref: https://savannah.gnu.org/bugs/?62859 ++# Wed 03 Aug 2022 04:06:28 PM UTC, original submission: Quote ++# Mohamed Akram <mohdakram> ++# > The --exclude-vcs flag seems to exclude .gitignore but not .git when ++# extracting. ++ ++AT_SETUP([--exclude-vcs extract list compare]) ++AT_KEYWORDS([exclude-vcs extract list compare exclude18]) ++ ++AT_TAR_CHECK([ ++AT_SORT_PREREQ ++mkdir gitrepo ++cd gitrepo ++ ++# Make an empty VCS directory: ++mkdir .svn ++ ++# Make a VCS directory with a file: ++mkdir .git ++touch .git/_A ++ ++# Make a VCS file: ++touch .gitignore ++ ++# Make non-VCS files: ++touch .git_B ++touch _C ++ ++# Create an archive, include VCS: ++cd .. ++tar -cf gitrepo.tar gitrepo ++rm -r gitrepo ++ ++echo Extract: ++tar -xvf gitrepo.tar --exclude-vcs | sort ++ ++echo ++echo List: ++tar -tf gitrepo.tar --exclude-vcs | sort ++ ++echo ++echo Diff: ++tar -dvf gitrepo.tar --exclude-vcs gitrepo | sort ++ ++], ++[0], ++[Extract: ++gitrepo/ ++gitrepo/.git_B ++gitrepo/_C ++ ++List: ++gitrepo/ ++gitrepo/.git_B ++gitrepo/_C ++ ++Diff: ++gitrepo/ ++gitrepo/.git_B ++gitrepo/_C ++], ++[]) ++ ++AT_CLEANUP +-- +cgit v1.1 + diff --git a/poky/meta/recipes-extended/tar/tar/run-ptest b/poky/meta/recipes-extended/tar/tar/run-ptest new file mode 100644 index 0000000000..185b33d61a --- /dev/null +++ b/poky/meta/recipes-extended/tar/tar/run-ptest @@ -0,0 +1,14 @@ +#!/bin/sh + +# Define tar test work dir +WORKDIR=@PTEST_PATH@/tests/ + +# Run test +cd ${WORKDIR} +./atconfig ./atlocal ./testsuite + +# clear log +rm -rf testsuite.dir +rm -rf testsuite.log + +./testsuite --am-fmt diff --git a/poky/meta/recipes-extended/tar/tar_1.35.bb b/poky/meta/recipes-extended/tar/tar_1.35.bb index 4dbd418b60..c7bd1d195e 100644 --- a/poky/meta/recipes-extended/tar/tar_1.35.bb +++ b/poky/meta/recipes-extended/tar/tar_1.35.bb @@ -42,6 +42,40 @@ do_install:append:class-target() { fi } +# add for ptest support +SRC_URI += " \ + file://run-ptest \ + file://0001-tests-fix-TESTSUITE_AT.patch \ + file://0002-tests-check-for-recently-fixed-bug.patch \ + file://0003-Exclude-VCS-directory-with-writing-from-an-archive.patch \ +" + +inherit ptest + +do_compile_ptest() { + oe_runmake -C ${B}/gnu/ check + oe_runmake -C ${B}/lib/ check + oe_runmake -C ${B}/rmt/ check + oe_runmake -C ${B}/src/ check + rm -rf ${S}/tests/testsuite + oe_runmake -C ${B}/tests/ testsuite + oe_runmake -C ${B}/tests/ genfile checkseekhole ckmtime +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/ + install --mode=755 ${B}/tests/atconfig ${D}${PTEST_PATH}/tests/ + sed -i "/abs_/d" ${D}${PTEST_PATH}/tests/atconfig + echo "abs_builddir=${PTEST_PATH}/tests/" >> ${D}${PTEST_PATH}/tests/atconfig + install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ + sed -i "/PATH=/d" ${D}${PTEST_PATH}/tests/atlocal + install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ + install --mode=755 ${B}/tests/checkseekhole ${D}${PTEST_PATH}/tests/ + install --mode=755 ${B}/tests/ckmtime ${D}${PTEST_PATH}/tests/ + install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ + sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest +} + PACKAGES =+ "${PN}-rmt" FILES:${PN}-rmt = "${sbindir}/rmt*" diff --git a/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index 8137d257c8..c655da1199 100644 --- a/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -6,7 +6,6 @@ SECTION = "console/network" LICENSE = "BSD-1-Clause" LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa" -PR ="r10" DEPENDS += "libnsl2" diff --git a/poky/meta/recipes-extended/unzip/unzip_6.0.bb b/poky/meta/recipes-extended/unzip/unzip_6.0.bb index a53663d086..27076d5d9b 100644 --- a/poky/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/poky/meta/recipes-extended/unzip/unzip_6.0.bb @@ -5,7 +5,6 @@ SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" PE = "1" -PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz \ file://avoid-strip.patch \ diff --git a/poky/meta/recipes-extended/watchdog/watchdog_5.16.bb b/poky/meta/recipes-extended/watchdog/watchdog_5.16.bb index 6031dcaa16..5325ccafda 100644 --- a/poky/meta/recipes-extended/watchdog/watchdog_5.16.bb +++ b/poky/meta/recipes-extended/watchdog/watchdog_5.16.bb @@ -21,7 +21,6 @@ SRC_URI[sha256sum] = "b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a # Can be dropped when the output next changes, avoids failures after # reproducibility issues -PR = "r1" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/" UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/" diff --git a/poky/meta/recipes-extended/which/which_2.21.bb b/poky/meta/recipes-extended/which/which_2.21.bb index c8a50735b1..77861370e5 100644 --- a/poky/meta/recipes-extended/which/which_2.21.bb +++ b/poky/meta/recipes-extended/which/which_2.21.bb @@ -13,7 +13,6 @@ DEPENDS = "cwautomacros-native" inherit autotools texinfo update-alternatives -PR = "r3" EXTRA_OECONF = "--disable-iberty" diff --git a/poky/meta/recipes-extended/zip/zip_3.0.bb b/poky/meta/recipes-extended/zip/zip_3.0.bb index 3425e8eb7b..70df5ab872 100644 --- a/poky/meta/recipes-extended/zip/zip_3.0.bb +++ b/poky/meta/recipes-extended/zip/zip_3.0.bb @@ -6,7 +6,6 @@ SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d" -PR = "r2" S = "${WORKDIR}/zip30" |