| Message ID | 20210110122310.313941-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/busybox: fix selinux-related build error | expand |
Bernd, All, On 2021-01-10 13:23 +0100, Bernd Kuhls spake thusly: > Fixes: > http://autobuild.buildroot.net/results/b89/b89b7d0f0601bb706e76cea31cf4e43326e5540c/ > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...3-update_passwd-fix-context-variable.patch | 41 +++++++++++++++++++ > 1 file changed, 41 insertions(+) > create mode 100644 package/busybox/0003-update_passwd-fix-context-variable.patch > > diff --git a/package/busybox/0003-update_passwd-fix-context-variable.patch b/package/busybox/0003-update_passwd-fix-context-variable.patch > new file mode 100644 > index 0000000000..25c07d7054 > --- /dev/null > +++ b/package/busybox/0003-update_passwd-fix-context-variable.patch > @@ -0,0 +1,41 @@ > +From b4828612abe378491693c9036db19e4f64768307 Mon Sep 17 00:00:00 2001 > +From: Bernd Kuhls <bernd.kuhls@t-online.de> > +Date: Sun, 10 Jan 2021 13:15:04 +0100 > +Subject: [PATCH] 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); > + > +Patch sent upstream: > +http://lists.busybox.net/pipermail/busybox/2021-January/088467.html > + > +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > +--- > + 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) > +-- > +2.29.2 > + > -- > 2.29.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/busybox/0003-update_passwd-fix-context-variable.patch b/package/busybox/0003-update_passwd-fix-context-variable.patch new file mode 100644 index 0000000000..25c07d7054 --- /dev/null +++ b/package/busybox/0003-update_passwd-fix-context-variable.patch @@ -0,0 +1,41 @@ +From b4828612abe378491693c9036db19e4f64768307 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <bernd.kuhls@t-online.de> +Date: Sun, 10 Jan 2021 13:15:04 +0100 +Subject: [PATCH] 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); + +Patch sent upstream: +http://lists.busybox.net/pipermail/busybox/2021-January/088467.html + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + 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) +-- +2.29.2 +
Fixes: http://autobuild.buildroot.net/results/b89/b89b7d0f0601bb706e76cea31cf4e43326e5540c/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- ...3-update_passwd-fix-context-variable.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/busybox/0003-update_passwd-fix-context-variable.patch