Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Feb 2020 21:46:42 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r527052 - head/net-mgmt/nagios-plugins/files
Message-ID:  <202002242146.01OLkgve022414@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Mon Feb 24 21:46:42 2020
New Revision: 527052
URL: https://svnweb.freebsd.org/changeset/ports/527052

Log:
  Children, don't patch an drive.
  
  Pointy hat:	mat

Modified:
  head/net-mgmt/nagios-plugins/files/patch-plugins-root_Makefile.in   (contents, props changed)

Modified: head/net-mgmt/nagios-plugins/files/patch-plugins-root_Makefile.in
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins-root_Makefile.in	Mon Feb 24 21:37:16 2020	(r527051)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-root_Makefile.in	Mon Feb 24 21:46:42 2020	(r527052)
@@ -11,11 +11,15 @@ Make sure we don't `chown root`, it will fail.
  	echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
  	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
  	done
-@@ -1815,7 +1813,6 @@ install-exec-local: $(noinst_PROGRAMS)
+@@ -1814,10 +1812,7 @@ install-exec-local: $(noinst_PROGRAMS)
+ 	@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
  	rm -f $$TMPFILE; \
  	echo > $$TMPFILE; \
- 	can_create_suid_root_executable=no; \
+-	can_create_suid_root_executable=no; \
 -	chown root $$TMPFILE > /dev/null 2>&1 \
- 	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
- 	  && can_create_suid_root_executable=yes; \
+-	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
+-	  && can_create_suid_root_executable=yes; \
++	can_create_suid_root_executable=yes; \
  	rm -f $$TMPFILE; \
+ 	if test $$can_create_suid_root_executable = yes; then \
+ 	  $(INSTALL_SUID); \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002242146.01OLkgve022414>