X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache-suexec.patch;h=5edaf4e4682280fa4f4b66416c45c8bd48a29a60;hp=7fe4adbc2d1d07c13b2477760160a303cf07cead;hb=HEAD;hpb=c069c9d517920d9e18bf12416de91a6ceb6e0541

diff --git a/apache-suexec.patch b/apache-suexec.patch
index 7fe4adb..cb15598 100644
--- a/apache-suexec.patch
+++ b/apache-suexec.patch
@@ -1,29 +1,12 @@
---- httpd-2.0.43/Makefile.in.wiget	Fri Oct  4 15:20:09 2002
-+++ httpd-2.0.43/Makefile.in	Fri Oct  4 15:20:32 2002
+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-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:
-
---- httpd-2.4.34/Makefile.in~	2018-07-16 18:45:42.000000000 +0200
-+++ httpd-2.4.34/Makefile.in	2018-07-16 19:33:00.579273405 +0200
-@@ -277,12 +277,12 @@ install-suexec-binary:
-             $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \
- 	fi
- 
--install-suexec-setuid:
-+install-suexec-setuid: install-suexec-binary
- 	@if test -f $(builddir)/support/suexec; then \
- 	    chmod 0755 $(DESTDIR)$(sbindir)/suexec; \
- 	fi
- 
--install-suexec-caps:
-+install-suexec-caps: install-suexec-binary
- 	@if test -f $(builddir)/support/suexec; then \
-             setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \
- 	fi
+ install-suexec-caps: install-suexec-binary