Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 28 lines 738 B view raw
1diff --git a/src/Makefile.am b/src/Makefile.am 2index a1a2e4e..fa17f9d 100644 3--- a/src/Makefile.am 4+++ b/src/Makefile.am 5@@ -74,10 +74,6 @@ suidubins += newgidmap newuidmap 6 endif 7 endif 8 9-if WITH_TCB 10-shadowsgidubins = passwd 11-endif 12- 13 LDADD = $(INTLLIBS) \ 14 $(top_builddir)/libmisc/libmisc.la \ 15 $(top_builddir)/lib/libshadow.la \ 16@@ -146,12 +142,6 @@ install-am: all-am 17 set -e; for i in $(suidusbins); do \ 18 chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \ 19 done 20-if WITH_TCB 21- set -e; for i in $(shadowsgidubins); do \ 22- chown root:shadow $(DESTDIR)$(ubindir)/$$i; \ 23- chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \ 24- done 25-endif 26 if ENABLE_SUBIDS 27 if FCAPS 28 setcap cap_setuid+ep $(DESTDIR)$(ubindir)/newuidmap