Accepting request 892050 from Base:System

OBS-URL: https://build.opensuse.org/request/show/892050
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2021-05-12 17:31:42 +00:00 committed by Git OBS Bridge
commit 67dea2a96c
7 changed files with 44 additions and 48 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd
size 2448841

3
busybox-1.33.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28
size 2453694

BIN
busybox-1.33.1.tar.bz2.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri May 7 19:04:53 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- update to 1.33.1:
* httpd: fix sendfile
* ash: fix HISTFILE corruptio
* ash: fix unset variable pattern expansion
* traceroute: fix option parsing
* gunzip: fix for archive corruption
- drop update_passwd_selinux_fix.patch, included upstream
- add upstream signing key and verify source signature
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 28 15:22:02 UTC 2021 - Thorsten Kukuk <kukuk@suse.com> Thu Jan 28 15:22:02 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>

24
busybox.keyring Normal file
View File

@ -0,0 +1,24 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.6 (GNU/Linux)
mQGiBEV/D2cRBACIILILVH2Hw7pTT/wGSx8sV4AiRGqgLrkSYej1o2aV73KYr803
ciaE6cvCv2pA7VVDGNjjA0Qm6z9NLiwOyL6Lxt0X7pv5LPHiGuusuJbo1IlT7Alf
vJS47XNZUKOK+DwTbrnKawEGKJLdANJ3x4aqu1tZI0tle2u42Ek1zgBiiwCg5WIB
LbZbsN9vuvhDXkU5rjA+rtsD/jeV7l4q+F31xboCE6Kixzv1Q+UNeiP+lcncqzOW
CIzh6prPooRqdXokb13OYwfAv1d84Ww2AA93grCAnNHUBomz4iVzpnMsRRxpwMoy
EnVFbutX8Zl1S631IqSKmM237X4cTItUDHABQIqUY4k7xW44UMBb62jYxyekNW6v
yVo5A/4yM8ri1E7AIUAOjoEMuWkBSYxdcq7h1jxh1Rm5QqRejiS7TNejF5EOUSlo
oPx5ijS56JHAvPJZFWu5CU0VUveTcFrv0IhqDuoYNM4uUIh/QIjo06CxBEjgviNs
kYZBwHBIBMGOIj/Vo+xzGQLySDuVxzMpDrUm9gXb49e/5skxSrQpRGVuaXMgVmxh
c2Vua28gPHZkYS5saW51eEBnb29nbGVtYWlsLmNvbT6IYAQTEQIAIAUCRX8PZwIb
AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEEe3DFWsyZZbExwAoOTGwQOj75Hj
pDbOw99+vhlx8/uUAKCwAaxacnpRFUkhVRBsCYWIC5obf7kBDQRFfw9oEAQAjQyS
MWag/Dxc6G9Em9/2jVG9FQAi+NOPx2EigOUC8wEeErEjwQRN/9xIU8CCncttYfBe
U00b198fSL9axKZIptn0hLAMOruFODBVjVDiOY09M67DfQ47zzTRE9HWst47TgVN
LWdfNljB+wqgvEor4S6WtZpyAcq8f1kOMrX115sAAwUD/2eow67bKR7yGhHw8Me2
HWqUmd8B0+CM5QpfYGOND5p7oKnMLXDu+Q0bma6wbTasQX+urA1UxdXo0EAWrQXr
ttQTF92G6G0Gi5JcMWu2QkgTWiZMr90sY+PMAi3nGnqiJLwHVnlxhKnTSE5JdpcX
cQLJQDYDoJtBBccBUtF0o1z+iEkEGBECAAkFAkV/D2gCGwwACgkQR7cMVazJllvV
igCfbxD3ZRcgCpaZo6gZyXf89oyKCjAAnAiK5h7KxXPrwviUL4K/GlWGGFOA
=2JoA
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -17,21 +17,21 @@
Name: busybox Name: busybox
Version: 1.33.0 Version: 1.33.1
Release: 0 Release: 0
Summary: Minimalist variant of UNIX utilities linked in a single executable Summary: Minimalist variant of UNIX utilities linked in a single executable
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Base Group: System/Base
URL: http://www.busybox.net/ URL: https://www.busybox.net/
Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2 Source: https://busybox.net/downloads/%{name}-%{version}.tar.bz2
Source1: BusyBox.1 Source1: BusyBox.1
Source2: busybox.config Source2: busybox.config
Source3: busybox-static.config Source3: busybox-static.config
Source4: man.conf Source4: man.conf
Source5: https://busybox.net/downloads/%{name}-%{version}.tar.bz2.sig
Source6: https://busybox.net/~vda/vda_pubkey.gpg#/%{name}.keyring
Patch0: cpio-long-opt.patch Patch0: cpio-long-opt.patch
Patch1: sendmail-ignore-F-option.patch Patch1: sendmail-ignore-F-option.patch
# Compile fix from upstream
Patch10: update_passwd_selinux_fix.patch
# other patches # other patches
Patch100: busybox.install.patch Patch100: busybox.install.patch
Provides: useradd_or_adduser_dep Provides: useradd_or_adduser_dep
@ -76,7 +76,6 @@ PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch10 -p1
%patch100 -p0 %patch100 -p0
cp -a %{SOURCE1} docs/ cp -a %{SOURCE1} docs/
find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \ find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \

View File

@ -1,39 +0,0 @@
From 808d93c0eca49e0b22056e23d965f0d967433fbb Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sun, 10 Jan 2021 13:20:44 +0100
Subject: update_passwd: fix context variable
Commit
https://git.busybox.net/busybox/commit/libbb/update_passwd.c?id=2496616b0a8d1c80cd1416b73a4847b59b9f969a
changed the variable used from context to seuser but forgot this
change resulting in build errors detected by buildroot autobuilders:
http://autobuild.buildroot.net/results/b89/b89b7d0f0601bb706e76cea31cf4e43326e5540c//build-end.log
libbb/update_passwd.c:51:11: error: 'context' undeclared (first use in
this function); did you mean 'ucontext'?
freecon(context);
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
libbb/update_passwd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index 7b67f30cd..a228075cc 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -48,7 +48,7 @@ static void check_selinux_update_passwd(const char *username)
bb_simple_error_msg_and_die("SELinux: access denied");
}
if (ENABLE_FEATURE_CLEAN_UP)
- freecon(context);
+ freecon(seuser);
}
#else
# define check_selinux_update_passwd(username) ((void)0)
--
cgit v1.2.1