From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Mon, 16 Jul 2018 17:37:01 +0000 (+0200)
Subject: - up to 2.4.34
X-Git-Tag: auto/th/apache-2.4.34-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache.git;a=commitdiff_plain;h=c069c9d517920d9e18bf12416de91a6ceb6e0541

- up to 2.4.34
---

diff --git a/apache-suexec.patch b/apache-suexec.patch
index 5edaf4e..7fe4adb 100644
--- a/apache-suexec.patch
+++ b/apache-suexec.patch
@@ -1,11 +1,29 @@
 --- 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 @@
+@@ -279,7 +279,7 @@ install-suexec-binary:
+ 
+ install-suexec-setuid:
  	@if test -f $(builddir)/support/suexec; then \
-             test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
+-	    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); \
--            chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
-+            chmod 0755 $(DESTDIR)$(sbindir)/suexec; \
  	fi
  
- suexec:
+-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
diff --git a/apache.spec b/apache.spec
index 3cd8d3c..6e5e9d2 100644
--- a/apache.spec
+++ b/apache.spec
@@ -35,12 +35,12 @@ Summary(pt_BR.UTF-8):	Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.4.33
-Release:	2
+Version:	2.4.34
+Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5:	6ef469d3f16fffeb688bc6e0346823e5
+# Source0-md5:	818adca52f3be187fe45d6822755be95
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig