From 921cfa01ffc104c57f2825d0bca648233ddff191 Mon Sep 17 00:00:00 2001 From: aristocratos Date: Wed, 13 Oct 2021 23:20:15 +0200 Subject: Re-enable setuid and set default SU_GROUP to wheel for OSX --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5dc459b..db4bbfe 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,6 @@ override CXXFLAGS += $(REQFLAGS) $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS) override LDFLAGS += $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS) INC := -I$(INCDIR) -I$(SRCDIR) SU_USER := root -SU_GROUP := root ifdef DEBUG override OPTFLAGS := -O0 -g @@ -106,7 +105,9 @@ endif ifeq ($(PLATFORM), OSX) override LDCXXFLAGS += -framework IOKit -framework CoreFoundation + SU_GROUP := wheel else + SU_GROUP := root ifneq ($(ARCH),arm64) override LDCXXFLAGS += -fstack-protector -fstack-clash-protection endif @@ -179,7 +180,7 @@ install: @printf "\033[1;92mInstalling themes to: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop/themes\033[0m\n" @cp -pr themes $(DESTDIR)$(PREFIX)/share/btop -ifneq ($(PLATFORM),OSX) + #? Set SUID bit for btop as $SU_USER in $SU_GROUP setuid: @printf "\033[1;97mFile: $(DESTDIR)$(PREFIX)/bin/btop\n" @@ -187,7 +188,6 @@ setuid: @chown $(SU_USER):$(SU_GROUP) $(DESTDIR)$(PREFIX)/bin/btop @printf "\033[1;92mSetting SUID bit\033[0m\n" @chmod u+s $(DESTDIR)$(PREFIX)/bin/btop -endif uninstall: @printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/bin/btop\033[0m\n" -- cgit v1.2.3