On 08/30/2018 04:25 AM, Andrej Valek wrote:
- refresh busybox-udhcpc-no_deconfig.patch
- remove obsolete patches which are included in this update
- update defconfig
It seems that you just adapted to upstream changes so just say so
in the long log.
I looked at the defconfig changes and I have some minor comments
on that below. I think we should merge the defconfig as is with
a long log comment.
It might be nice to add the setfattr applet but that can be done
later or even in the next release if someone comes up with a real
need rather than thinking that it's "nice to have".
Also, your patch email was in the wrong format and
even if I work around that, it didn't apply to master.
You email encoding is:
Openpgp: preference=signencrypt
Autocrypt: addr=andrej.va...@siemens.com; prefer-encrypt=mutual; keydata=
xsBNBFkSzTcBCADSJTRk7Y...bIFUmc7ck3KeuUGKy
ifrpWD6/7YPXbixv4sAlFl...zmMdr0BPLMsL96nBO
...
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
so while I can read it in an email client such as Thunderbird,
if I save it and try to git am it, that doesn't work since
it's encoded.
Can you resend using:
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
or maybe someone will explain how to deal with this encoding.
Even saving the text doesn't result in a good patch
due to line wrapping (which I tried to fix manually)
and then another error:
$ git am /tmp/bb-txt/busybox-update-fix.txt
Applying: busybox: update to 1.29.2
error: patch failed: \
meta/recipes-core/busybox/busybox/CVE-2011-5325.patch:1
error: meta/recipes-core/busybox/busybox/CVE-2011-5325.patch: \
patch does not apply
error: patch failed: \
meta/recipes-core/busybox/busybox/CVE-2017-15873.patch:1
error: meta/recipes-core/busybox/busybox/CVE-2017-15873.patch: \
patch does not apply
...
I use 'git send-email' and usually remember to us:
--smtp-server=smtp.example.com
to avoid Outlook being a problem. I expect that some of
your co-workers have dealt with the problem already.
Or maybe just send punch cards! ;-)
Thanks Andrej!
../Randy
Signed-off-by: Andrej Valek <andrej.va...@siemens.com>
---
...inittab_1.27.2.bb => busybox-inittab_1.29.2.bb} | 0
.../busybox/busybox/CVE-2011-5325.patch | 481
---------------------
.../busybox/busybox/CVE-2017-15873.patch | 95 ----
.../busybox/busybox/busybox-CVE-2017-16544.patch | 43 --
.../busybox/busybox-fix-lzma-segfaults.patch | 106 -----
.../busybox/busybox-udhcpc-no_deconfig.patch | 48 +-
meta/recipes-core/busybox/busybox/defconfig | 46 +-
.../busybox/busybox/umount-ignore-c.patch | 40 --
.../{busybox_1.27.2.bb => busybox_1.29.2.bb} | 9 +-
9 files changed, 66 insertions(+), 802 deletions(-)
rename meta/recipes-core/busybox/{busybox-inittab_1.27.2.bb =>
busybox-inittab_1.29.2.bb} (100%)
delete mode 100755 meta/recipes-core/busybox/busybox/CVE-2011-5325.patch
delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2017-15873.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-CVE-2017-16544.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-fix-lzma-segfaults.patch
delete mode 100644 meta/recipes-core/busybox/busybox/umount-ignore-c.patch
rename meta/recipes-core/busybox/{busybox_1.27.2.bb =>
busybox_1.29.2.bb} (82%)
...
diff --git a/meta/recipes-core/busybox/busybox/defconfig
b/meta/recipes-core/busybox/busybox/defconfig
index 59d93c7079..f081f281cc 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1,12 +1,12 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.27.2
-# Wed Sep 27 08:56:13 2017
+# Busybox version: 1.29.1
s/1.29.1/1.29.2/
+# Thu Jul 19 11:09:46 2018
#
CONFIG_HAVE_DOT_CONFIG=y
#
-# Busybox Settings
+# Settings
#
# CONFIG_DESKTOP is not set
# CONFIG_EXTRA_COMPAT is not set
@@ -78,7 +78,7 @@ CONFIG_NO_DEBUG_LIB=y
# CONFIG_EFENCE is not set
#
-# Busybox Library Tuning
+# Library Tuning
#
# CONFIG_FEATURE_USE_BSS_TAIL is not set
CONFIG_FEATURE_RTMINMAX=y
@@ -90,6 +90,7 @@ CONFIG_MD5_SMALL=1
CONFIG_SHA3_SMALL=1
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
CONFIG_FEATURE_EDITING=y
CONFIG_FEATURE_EDITING_MAX_LEN=1024
# CONFIG_FEATURE_EDITING_VI is not set
@@ -321,6 +322,7 @@ CONFIG_TRUE=y
CONFIG_TTY=y
CONFIG_UNAME=y
CONFIG_UNAME_OSNAME="GNU/Linux"
+# CONFIG_BB_ARCH is not set
CONFIG_UNIQ=y
CONFIG_UNLINK=y
CONFIG_USLEEP=y
@@ -393,6 +395,14 @@ CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
CONFIG_WHICH=y
#
+# klibc-utils
+#
+# CONFIG_MINIPS is not set
+# CONFIG_NUKE is not set
+# CONFIG_RESUME is not set
+# CONFIG_RUN_INIT is not set
+
+#
# Editors
#
CONFIG_AWK=y
@@ -678,6 +688,10 @@ CONFIG_FEATURE_MOUNT_LOOP=y
CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
# CONFIG_FEATURE_MTAB_SUPPORT is not set
# CONFIG_VOLUMEID is not set
+
+#
+# Filesystem/Volume identification
+#
# CONFIG_FEATURE_VOLUMEID_BCACHE is not set
# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
@@ -725,6 +739,7 @@ CONFIG_FEATURE_CROND_DIR=""
# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_HEXEDIT is not set
# CONFIG_I2CGET is not set
# CONFIG_I2CSET is not set
# CONFIG_I2CDUMP is not set
@@ -807,6 +822,7 @@ CONFIG_MICROCOM=y
# CONFIG_RUNLEVEL is not set
# CONFIG_RX is not set
# CONFIG_SETSID is not set
+# CONFIG_SETFATTR is not set
Seems like that might be useful and should be enabled by default
but I don't need it for 2.6
It's not a huge delta:
b278ac0e6 setfattr: new applet
...
(add/remove: 7/0 grow/shrink: 4/0 up/down: 458/0)
Total: 458 bytes
CONFIG_STRINGS=y
CONFIG_TIME=y
# CONFIG_TIMEOUT is not set
@@ -912,6 +928,8 @@ CONFIG_FEATURE_FANCY_PING=y
CONFIG_ROUTE=y
# CONFIG_SLATTACH is not set
# CONFIG_SSL_CLIENT is not set
+# CONFIG_TC is not set
+# CONFIG_FEATURE_TC_INGRESS is not set
# CONFIG_TCPSVD is not set
# CONFIG_UDPSVD is not set
CONFIG_TELNET=y
@@ -949,13 +967,9 @@ CONFIG_FEATURE_WGET_HTTPS=y
# CONFIG_FEATURE_WGET_OPENSSL is not set
# CONFIG_WHOIS is not set
# CONFIG_ZCIP is not set
-# CONFIG_UDHCPC6 is not set
-# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
-# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
-# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
Ah, these are just moved down a few lines.
CONFIG_UDHCPD=y
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
CONFIG_DUMPLEASES=y
# CONFIG_DHCPRELAY is not set
@@ -963,6 +977,15 @@ CONFIG_UDHCPC=y
CONFIG_FEATURE_UDHCPC_ARPING=y
CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+# CONFIG_UDHCPC6 is not set
+# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
+# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
+# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
+# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
+
+#
+# Common options for DHCP applets
+#
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
@@ -1045,6 +1068,7 @@ CONFIG_WATCH=y
# CONFIG_SV is not set
CONFIG_SV_DEFAULT_SERVICE_DIR=""
# CONFIG_SVC is not set
+# CONFIG_SVOK is not set
# CONFIG_SVLOGD is not set
# CONFIG_CHCON is not set
# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
@@ -1134,6 +1158,10 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
# System Logging Utilities
#
CONFIG_KLOGD=y
+
+#
+# klogd should not be used together with syslog to kernel printk buffer
+#
CONFIG_FEATURE_KLOGD_KLOGCTL=y
CONFIG_LOGGER=y
# CONFIG_LOGREAD is not set
diff --git a/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
b/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
deleted file mode 100644
index 9fe7998df3..0000000000
--- a/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
+++ /dev/null
...
diff --git a/meta/recipes-core/busybox/busybox_1.27.2.bb
b/meta/recipes-core/busybox/busybox_1.29.2.bb
similarity index 82%
rename from meta/recipes-core/busybox/busybox_1.27.2.bb
rename to meta/recipes-core/busybox/busybox_1.29.2.bb
index 1ce4823d47..c86b4f57b3 100644
--- a/meta/recipes-core/busybox/busybox_1.27.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.29.2.bb
@@ -42,13 +42,8 @@ SRC_URI =
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://rcK \
file://runlevel \
file://makefile-libbb-race.patch \
- file://CVE-2011-5325.patch \
- file://CVE-2017-15873.patch \
- file://busybox-CVE-2017-16544.patch \
- file://busybox-fix-lzma-segfaults.patch \
- file://umount-ignore-c.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "
-SRC_URI[tarball.md5sum] = "476186f4bab81781dab2369bfd42734e"
-SRC_URI[tarball.sha256sum] =
"9d4be516b61e6480f156b11eb42577a13529f75d3383850bb75c50c285de63df"
+SRC_URI[tarball.md5sum] = "9cffb6c0e4df06914205f38ac8b40d80"
+SRC_URI[tarball.sha256sum] =
"fc250730ea16d28839bfecda3c431683fa6bd4273ffca6b632cbeb3556c914c3"
--
# Randy MacLeod
# Wind River Linux
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
