From 1d866a70e4a3cf186c67edcb2455b86a9e944be7 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 14 Mar 2017 01:24:14 +0100 Subject: [PATCH] shadow: upstream patch to fix suid bit for subuid tools Fixes #5979. --- .../patches/fix-suidubins-assignments.patch | 31 +++++++++++++++++++ srcpkgs/shadow/template | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/shadow/patches/fix-suidubins-assignments.patch diff --git a/srcpkgs/shadow/patches/fix-suidubins-assignments.patch b/srcpkgs/shadow/patches/fix-suidubins-assignments.patch new file mode 100644 index 00000000000..0425dc563ed --- /dev/null +++ b/srcpkgs/shadow/patches/fix-suidubins-assignments.patch @@ -0,0 +1,31 @@ +From 61abb4645cb0c4911eea0a7ce63a9c7d37cabe8f Mon Sep 17 00:00:00 2001 +From: Wolfgang Bumiller +Date: Sat, 5 Nov 2016 15:51:13 +0100 +Subject: [PATCH] buildsys: fix suidubins assignments + +These assignments were pasted as is into the Makefile and +ended up as part of a rule. (Usually the .PRECIOUS rule +which is why the build system never attempted to execute it +as commands, hiding the problem.) + +Signed-off-by: Wolfgang Bumiller +Reported-by: Rahel A +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -54,10 +54,10 @@ noinst_PROGRAMS = id sulogin + suidbins = su + suidubins = chage chfn chsh expiry gpasswd newgrp passwd + if ACCT_TOOLS_SETUID +- suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod ++suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod + endif + if ENABLE_SUBIDS +- suidubins += newgidmap newuidmap ++suidubins += newgidmap newuidmap + endif + + if WITH_TCB diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index 3b55cb9bfea..18d20187308 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -1,7 +1,7 @@ # Template file for 'shadow' pkgname=shadow version=4.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--bindir=/usr/bin --sbindir=/usr/bin --libdir=/usr/lib --enable-shared --disable-static