Re: [OE-core] [PATCH v2] busybox: update to 1.29.2
Hi Randy,
I had some network problems. I was trying to send patches likes general
email instead of from git. But it was not so successful.
This is the right one
http://lists.openembedded.org/pipermail/openembedded-core/2018-August/155059.html
.
Regards,
Andrej
On 08/30/18 20:27, Randy MacLeod wrote:
> 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
>> ---
>> ...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
Re: [OE-core] [PATCH v2] busybox: update to 1.29.2
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
---
...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
#
