Make this use ${CHOWN}, ${CHMOD}, ${XARGS} and ${FIND}, rather than the

hard-coded commands, which may not be in the PATH depending on the operating
system.  This partly addresses PR pkg/19804.

1 files changed, 55 insertions, 17 deletions

diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index ea099ea49b5..fdf8316b02f 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
+$NetBSD: patch-aa,v 1.21 2003/01/20 22:58:26 jschauma Exp $
 
---- Makefile.tmpl.orig	Fri Jun 21 02:02:43 2002
-+++ Makefile.tmpl
+--- Makefile.tmpl.orig	Mon Jan 20 17:12:39 2003
++++ Makefile.tmpl	Mon Jan 20 17:15:27 2003
 @@ -100,6 +100,8 @@
  PERL            = @PERL@
  TAR		= @TAR@
@@ -23,6 +23,15 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
  	$(MKDIR) $(root)$(htdocsdir)
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
+@@ -340,7 +337,7 @@
+ 	$(MKDIR) $(root)$(proxycachedir)
+ 	-@if [ "x`$(AUX)/getuid.sh`" = "x0" ]; then \
+ 		echo "chown $(conf_user) $(root)$(proxycachedir)"; \
+-		chown $(conf_user) $(root)$(proxycachedir); \
++		${CHOWN} $(conf_user) $(root)$(proxycachedir); \
+ 		echo "chgrp $(conf_group) $(root)$(proxycachedir)"; \
+ 		chgrp "$(conf_group)" $(root)$(proxycachedir); \
+ 	fi
 @@ -387,34 +384,6 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
@@ -58,7 +67,31 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -533,7 +502,7 @@
+@@ -464,9 +433,9 @@
+ 	    echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
+ 	    $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
+ 	    echo "chown root $(root)$(sbindir)/suexec"; \
+-	    chown root $(root)$(sbindir)/suexec; \
++	    ${CHOWN} root $(root)$(sbindir)/suexec; \
+ 	    echo "chmod 4711 $(root)$(sbindir)/suexec"; \
+-	    chmod 4711 $(root)$(sbindir)/suexec; \
++	    ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
+ 	    echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
+ 	    $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
+ 	fi
+@@ -508,9 +477,9 @@
+ 	    echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
+ 	    $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
+ 	    echo "chown root $(root)$(sbindir)/suexec"; \
+-	    chown root $(root)$(sbindir)/suexec; \
++	    ${CHOWN} root $(root)$(sbindir)/suexec; \
+ 	    echo "chmod 4711 $(root)$(sbindir)/suexec"; \
+-	    chmod 4711 $(root)$(sbindir)/suexec; \
++	    ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
+ 	    echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
+ 	    $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
+ 	fi
+@@ -533,21 +502,25 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -67,21 +100,25 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
  		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
  	else \
  		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-@@ -541,6 +510,8 @@
+ 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
  		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
- 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
-+		find $(root)$(htdocsdir)/ -print | \
-+			xargs chown ${BINOWN}:${BINGRP} ; \
+-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
++		${FIND} $(root)$(htdocsdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
++		${FIND} $(root)$(htdocsdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
++		${FIND} $(root)$(htdocsdir)/ -print | \
++			${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
  	fi
  	-@if [ -d $(TOP)/htdocs/manual ]; then \
  		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
-@@ -548,6 +519,8 @@
+ 		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
  		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
- 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
-+		find $(root)$(manualdir)/ -print | \
-+			xargs chown ${BINOWN}:${BINGRP} ; \
+-		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
++		${FIND} $(root)$(manualdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
++		${FIND} $(root)$(manualdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
++		${FIND} $(root)$(manualdir)/ -print | \
++			${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
  	fi
  	-@if [ -f $(root)$(cgidir)/printenv ]; then \
  		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
@@ -100,10 +137,11 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
  	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
- 	find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
+-	find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
 -	find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
-+	find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \; ;\
-+	chown -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
++	${FIND} $(root)$(iconsdir)/ -type d -exec ${CHMOD} a+rx {} \; ;\
++	${FIND} $(root)$(iconsdir)/ -type f -exec ${CHMOD} a+r {} \; ;\
++	${CHOWN} -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
  	@echo "<=== [data]"
  
  #   create the initial configuration by providing default files