diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-core/coreutils | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/coreutils')
-rw-r--r-- | poky/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch | 33 | ||||
-rw-r--r-- | poky/meta/recipes-core/coreutils/coreutils/CVE-2017-18018-1.patch | 40 | ||||
-rw-r--r-- | poky/meta/recipes-core/coreutils/coreutils/CVE-2017-18018-2.patch | 83 | ||||
-rw-r--r-- | poky/meta/recipes-core/coreutils/coreutils_8.30.bb (renamed from poky/meta/recipes-core/coreutils/coreutils_8.29.bb) | 30 |
4 files changed, 17 insertions, 169 deletions
diff --git a/poky/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index ba1a4bab4..000000000 --- a/poky/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 13 Apr 2015 17:02:13 -0700 -Subject: [PATCH] Unset need_charset_alias when building for musl - -localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 -which actually shoudl be fixed in gnulib and then all downstream -projects will get it eventually. For now we apply the fix to -coreutils - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/gnulib.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/gnulib.mk b/lib/gnulib.mk -index e1d74db..c0e92dd 100644 ---- a/lib/gnulib.mk -+++ b/lib/gnulib.mk -@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ --- -2.1.4 - diff --git a/poky/meta/recipes-core/coreutils/coreutils/CVE-2017-18018-1.patch b/poky/meta/recipes-core/coreutils/coreutils/CVE-2017-18018-1.patch deleted file mode 100644 index 6f31eba26..000000000 --- a/poky/meta/recipes-core/coreutils/coreutils/CVE-2017-18018-1.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7597cfa482e42a00a69fb9577ee523762980a9a2 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 28 Dec 2017 15:52:42 -0500 -Subject: doc: clarify chown/chgrp --dereference defaults - -* doc/coreutils.texi: the documentation for the --dereference - flag of chown/chgrp states that it is the default mode of - operation. Document that this is only the case when operating - non-recursively. - -CVE: CVE-2017-18018 -Upstream-Status: Backport from v8.30 - -Signed-off-by: Michael Orlitzky <michael@orlitzky.com> -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> ---- - doc/coreutils.texi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff -Naurp coreutils-8.27_org/doc/coreutils.texi coreutils-8.27/doc/coreutils.texi ---- coreutils-8.27_org/doc/coreutils.texi 2018-07-22 21:09:50.128736692 -0700 -+++ coreutils-8.27/doc/coreutils.texi 2018-07-22 21:12:59.972219770 -0700 -@@ -10952,7 +10952,7 @@ chown -h -R --from=OLDUSER NEWUSER / - @cindex symbolic links, changing owner - @findex lchown - Do not act on symbolic links themselves but rather on what they point to. --This is the default. -+This is the default when not operating recursively. - - @item -h - @itemx --no-dereference -@@ -11082,7 +11082,7 @@ changed. - @cindex symbolic links, changing owner - @findex lchown - Do not act on symbolic links themselves but rather on what they point to. --This is the default. -+This is the default when not operating recursively. - - @item -h - @itemx --no-dereference diff --git a/poky/meta/recipes-core/coreutils/coreutils/CVE-2017-18018-2.patch b/poky/meta/recipes-core/coreutils/coreutils/CVE-2017-18018-2.patch deleted file mode 100644 index c8f5f54ac..000000000 --- a/poky/meta/recipes-core/coreutils/coreutils/CVE-2017-18018-2.patch +++ /dev/null @@ -1,83 +0,0 @@ -From bc2fd9796403e03bb757b064d44c22fab92e6842 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 4 Jan 2018 11:38:21 -0500 -Subject: doc: warn about following symlinks recursively in chown/chgrp - -In both chown and chgrp (which shares its code with chown), operating -on symlinks recursively has a window of vulnerability where the -destination user or group can change the target of the operation. -Warn about combining the --dereference, --recursive, and -L flags. - -* doc/coreutils.texi (warnOptDerefWithRec): Add macro. -(node chown invocation): Add it to --dereference and -L. -(node chgrp invocation): Likewise. - -See also: CVE-2017-18018 -CVE: CVE-2017-18018 -Upstream-Status: Backport from v8.30 - -Signed-off-by: Michael Orlitzky <michael@orlitzky.com> -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> ---- - doc/coreutils.texi | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/doc/coreutils.texi b/doc/coreutils.texi -index 6bb9f09..9f5f95b 100644 ---- a/doc/coreutils.texi -+++ b/doc/coreutils.texi -@@ -1428,6 +1428,19 @@ a command line argument is a symbolic link to a directory, traverse it. - In a recursive traversal, traverse every symbolic link to a directory - that is encountered. - @end macro -+ -+@c Append the following warning to -L where appropriate (e.g. chown). -+@macro warnOptDerefWithRec -+ -+Combining this dereferencing option with the @option{--recursive} option -+may create a security risk: -+During the traversal of the directory tree, an attacker may be able to -+introduce a symlink to an arbitrary target; when the tool reaches that, -+the operation will be performed on the target of that symlink, -+possibly allowing the attacker to escalate privileges. -+ -+@end macro -+ - @choptL - - @macro choptP -@@ -10995,6 +11008,7 @@ chown -h -R --from=OLDUSER NEWUSER / - @findex lchown - Do not act on symbolic links themselves but rather on what they point to. - This is the default when not operating recursively. -+@warnOptDerefWithRec - - @item -h - @itemx --no-dereference -@@ -11051,6 +11065,7 @@ Recursively change ownership of directories and their contents. - @xref{Traversing symlinks}. - - @choptL -+@warnOptDerefWithRec - @xref{Traversing symlinks}. - - @choptP -@@ -11125,6 +11140,7 @@ changed. - @findex lchown - Do not act on symbolic links themselves but rather on what they point to. - This is the default when not operating recursively. -+@warnOptDerefWithRec - - @item -h - @itemx --no-dereference -@@ -11180,6 +11196,7 @@ Recursively change the group ownership of directories and their contents. - @xref{Traversing symlinks}. - - @choptL -+@warnOptDerefWithRec - @xref{Traversing symlinks}. - - @choptP --- -cgit v1.0-41-gc330 - diff --git a/poky/meta/recipes-core/coreutils/coreutils_8.29.bb b/poky/meta/recipes-core/coreutils/coreutils_8.30.bb index b0572afdc..205ba4a0a 100644 --- a/poky/meta/recipes-core/coreutils/coreutils_8.29.bb +++ b/poky/meta/recipes-core/coreutils/coreutils_8.30.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/" BUGTRACKER = "http://debbugs.gnu.org/coreutils" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://src/ls.c;beginline=1;endline=15;md5=1c3f9411e1842a062ce5ce9210beee0e" + file://src/ls.c;beginline=1;endline=15;md5=dbe356a88b09c29232b083d1ff8ac82a" DEPENDS = "gmp libcap" DEPENDS_class-native = "" @@ -15,16 +15,13 @@ inherit autotools gettext texinfo SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ file://fix-selinux-flask.patch \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-uname-report-processor-and-hardware-correctly.patch \ file://disable-ls-output-quoting.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ - file://CVE-2017-18018-1.patch \ - file://CVE-2017-18018-2.patch \ " -SRC_URI[md5sum] = "960cfe75a42c9907c71439f8eb436303" -SRC_URI[sha256sum] = "92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e" +SRC_URI[md5sum] = "ab06d68949758971fe744db66b572816" +SRC_URI[sha256sum] = "e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057" EXTRA_OECONF_class-native = "--without-gmp" EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" @@ -45,12 +42,12 @@ PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," PACKAGECONFIG[single-binary] = "--enable-single-binary,--disable-single-binary,," -# [ df mktemp base64 gets a special treatment and is not included in this +# [ df mktemp nice printenv base64 gets a special treatment and is not included in this bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname du \ env expand expr factor fmt fold groups head hostid id install \ - join link logname md5sum mkfifo nice nl nohup nproc od paste pathchk \ - pinky pr printenv printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \ - sha384sum sha512sum shred shuf sort split stdbuf sum tac tail tee test timeout\ + join link logname md5sum mkfifo nl nohup nproc od paste pathchk \ + pinky pr printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \ + sha384sum sha512sum shred shuf sort split stdbuf sum tac tail tee test timeout \ tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes" # hostname gets a special treatment and is not included in this @@ -80,7 +77,7 @@ do_install_class-native() { } do_install_append() { - for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done + for i in df mktemp nice printenv base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done install -d ${D}${base_bindir} [ "${base_bindir}" != "${bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${BPN}; done @@ -99,8 +96,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" # Make hostname's priority higher than busybox but lower than net-tools ALTERNATIVE_PRIORITY[hostname] = "90" -ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" -ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" +ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 nice printenv mktemp df" +ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" @@ -116,6 +113,13 @@ ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df" ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}" ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1" +ALTERNATIVE_LINK_NAME[nice] = "${base_bindir}/nice" +ALTERNATIVE_TARGET[nice] = "${bindir}/nice.${BPN}" +ALTERNATIVE_LINK_NAME[nice.1] = "${mandir}/man1/nice.1" + +ALTERNATIVE_LINK_NAME[printenv] = "${base_bindir}/printenv" +ALTERNATIVE_TARGET[printenv] = "${bindir}/printenv.${BPN}" + ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" |