- up to 2.4.59

[packages/apache.git] / apache-suexec.patch

diff --git a/apache-suexec.patch b/apache-suexec.patch
index ec7daca4385cacb0664726cbb3a707a080447b27..cb15598c9b0bf84363101c640608e2f113d2b537 100644 (file)
--- a/apache-suexec.patch
+++ b/apache-suexec.patch
@@ -1,20 +1,12 @@
---- httpd-2.0.40/support/Makefile.in.wiget     Mon Aug 12 20:09:35 2002
-+++ httpd-2.0.40/support/Makefile.in   Mon Aug 12 20:09:43 2002
-@@ -59,5 +59,5 @@
- # since LD_* environment variables are ignored in setuid programs.
- suexec_OBJECTS = suexec.lo
- suexec: $(suexec_OBJECTS)
--      $(LINK) -static $(suexec_OBJECTS) $(PROGRAM_LDADD)
-+      $(LINK) -static $(suexec_OBJECTS) 
+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:
  
---- 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
-@@ -195,7 +195,7 @@
+ install-suexec-setuid: install-suexec-binary
        @if test -f $(builddir)/support/suexec; then \
-             test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
-             $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \
--            chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
-+            chmod 0755 $(DESTDIR)$(sbindir)/suexec; \
+-          chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
++          chmod 0755 $(DESTDIR)$(sbindir)/suexec; \
        fi
  
- suexec:
+ install-suexec-caps: install-suexec-binary