X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=apache-suexec.patch;h=cb15598c9b0bf84363101c640608e2f113d2b537;hb=HEAD;hp=c8fd68ac1da2bfbe0437a7a5af954276cae43732;hpb=58f9559ba0a1637067e8bc49bb2ff928429d16a7;p=packages%2Fapache.git

diff --git a/apache-suexec.patch b/apache-suexec.patch
index c8fd68a..cb15598 100644
--- a/apache-suexec.patch
+++ b/apache-suexec.patch
@@ -1,13 +1,12 @@
---- apache_1.3.2/Makefile.tmpl.orig	Fri Sep 25 23:56:02 1998
-+++ apache_1.3.2/Makefile.tmpl	Fri Sep 25 23:57:37 1998
-@@ -317,10 +317,6 @@
- 	-@if [ ".$(suexec)" = .1 ]; then \
- 	    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; \
--	    echo "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; \
+diff -urNp -x '*.orig' httpd-2.4.46.org/Makefile.in httpd-2.4.46/Makefile.in
+--- httpd-2.4.46.org/Makefile.in	2018-08-08 13:48:15.000000000 +0200
++++ httpd-2.4.46/Makefile.in	2021-06-16 09:18:53.088643073 +0200
+@@ -279,7 +279,7 @@ install-suexec-binary:
+ 
+ install-suexec-setuid: install-suexec-binary
+ 	@if test -f $(builddir)/support/suexec; then \
+-	    chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
++	    chmod 0755 $(DESTDIR)$(sbindir)/suexec; \
  	fi
+ 
+ install-suexec-caps: install-suexec-binary