From 67d783471a73d4a6088529458747943638a70c5b12ee129402874f19c41adb13 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 5 Jan 2021 09:00:02 +0000 Subject: [PATCH] Accepting request 860408 from home:kukuk:container - Update to version 1.32.1 - fixes a case where in ash, "wait" never finishes. - sendmail-ignore-F-option.patch: ignore -F option as used by cron (workaround for [bbn#13426]) OBS-URL: https://build.opensuse.org/request/show/860408 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=84 --- busybox-1.32.0.tar.bz2 | 3 --- busybox-1.32.1.tar.bz2 | 3 +++ busybox.changes | 12 ++++++++++++ busybox.spec | 6 ++++-- sendmail-ignore-F-option.patch | 12 ++++++++++++ 5 files changed, 31 insertions(+), 5 deletions(-) delete mode 100644 busybox-1.32.0.tar.bz2 create mode 100644 busybox-1.32.1.tar.bz2 create mode 100644 sendmail-ignore-F-option.patch diff --git a/busybox-1.32.0.tar.bz2 b/busybox-1.32.0.tar.bz2 deleted file mode 100644 index cfc6c5e..0000000 --- a/busybox-1.32.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 -size 2439463 diff --git a/busybox-1.32.1.tar.bz2 b/busybox-1.32.1.tar.bz2 new file mode 100644 index 0000000..f83fb78 --- /dev/null +++ b/busybox-1.32.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee +size 2444679 diff --git a/busybox.changes b/busybox.changes index ddf932d..8caba1c 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jan 5 08:17:09 UTC 2021 - Thorsten Kukuk + +- Update to version 1.32.1 + - fixes a case where in ash, "wait" never finishes. + +------------------------------------------------------------------- +Tue Jan 5 07:26:20 UTC 2021 - Thorsten Kukuk + +- sendmail-ignore-F-option.patch: ignore -F option as used by + cron (workaround for [bbn#13426]) + ------------------------------------------------------------------- Wed Dec 9 14:40:27 UTC 2020 - Thorsten Kukuk diff --git a/busybox.spec b/busybox.spec index 810975f..7461fce 100644 --- a/busybox.spec +++ b/busybox.spec @@ -1,7 +1,7 @@ # # spec file for package busybox # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: busybox -Version: 1.32.0 +Version: 1.32.1 Release: 0 Summary: Minimalist variant of UNIX utilities linked in a single executable License: GPL-2.0-or-later @@ -29,6 +29,7 @@ Source2: busybox.config Source3: busybox-static.config Source4: man.conf Patch0: cpio-long-opt.patch +Patch1: sendmail-ignore-F-option.patch # other patches Patch100: busybox.install.patch Provides: useradd_or_adduser_dep @@ -72,6 +73,7 @@ PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch100 -p0 cp -a %{SOURCE1} docs/ find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \ diff --git a/sendmail-ignore-F-option.patch b/sendmail-ignore-F-option.patch new file mode 100644 index 0000000..2e7a6eb --- /dev/null +++ b/sendmail-ignore-F-option.patch @@ -0,0 +1,12 @@ +diff -urN busybox-1.32.0.orig/mailutils/sendmail.c busybox-1.32.0/mailutils/sendmail.c +--- busybox-1.32.0.orig/mailutils/sendmail.c 2020-06-26 20:47:44.000000000 +0200 ++++ busybox-1.32.0/mailutils/sendmail.c 2021-01-05 09:04:05.973347132 +0100 +@@ -271,7 +271,7 @@ + // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility, + // it is still under development. + opts = getopt32(argv, "^" +- "tf:o:iw:+H:S:a:*:v" ++ "tf:o:iw:+H:S:a:*:vF:" + "\0" + // -v is a counter, -H and -S are mutually exclusive, -a is a list + "vv:H--S:S--H",