Changeset 2431 for branches/fc19-dev/server

Timestamp:

Jun 13, 2013, 12:39:44 AM (11 years ago)

Author:

tboning

Message:

Fixed httpd.spec.patch from messing with suexec options.

File:

• branches/fc19-dev/server/fedora/specs/httpd.spec.patch (modified) (2 diffs)

branches/fc19-dev/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2013-06-09 23:29:34.233169507 -0400
-+++ httpd.spec  2013-06-09 23:28:41.956169507 -0400
+--- httpd.spec.orig     2013-06-13 00:09:01.645740322 -0400
++++ httpd.spec  2013-06-13 00:11:16.001740322 -0400
 @@ -14,7 +14,7 @@
  Summary: Apache HTTP Server
@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
+@@ -85,6 +85,12 @@
+ Requires(postun): systemd-units
+ Requires(post): systemd-units
+ 
++Provides: scripts-httpd = %{version}-%{release}
++Patch1001: httpd-suexec-scripts.patch
++Patch1002: httpd-mod_status-security.patch
++Patch1003: httpd-304s.patch
++Patch1004: httpd-fixup-vhost.patch
++
+ %description
+ The Apache HTTP Server is a powerful, efficient, and extensible
+ web server.
+@@ -95,6 +101,7 @@
+ Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
+ Requires: apr-devel, apr-util-devel, pkgconfig
+ Requires: httpd = %{version}-%{release}
++Provides: scripts-httpd-devel = %{version}-%{release}
+ 
+ %description devel
+ The httpd-devel package contains the APXS binary and other files
+@@ -133,6 +140,7 @@
+ Requires(post): openssl, /bin/cat
+ Requires(pre): httpd
+ Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
++Provides: scripts-mod_ssl
+ Obsoletes: stronghold-mod_ssl
+ 
+ %description -n mod_ssl
+@@ -201,6 +209,11 @@
+ # Prevent use of setcap in "install-suexec-caps" target.
+ sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
+ 
++%patch1001 -p1 -b .suexec-scripts
++%patch1002 -p1 -b .mod_status-security
++%patch1003 -p1 -b .scripts-304s
++%patch1004 -p1 -b .fixup-vhost
++
+ # Safety check: prevent build if defined MMN does not equal upstream MMN.
+ vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
+ if test "x${vmmn}" != "x%{mmn}"; then
+@@ -247,11 +260,13 @@
+        --enable-suexec --with-suexec \
+         --enable-suexec-capabilities \
+        --with-suexec-caller=%{suexec_caller} \
+-       --with-suexec-docroot=%{docroot} \
+-       --without-suexec-logfile \
+-        --with-suexec-syslog \
++       --with-suexec-docroot=/ \
++       --with-suexec-userdir=web_scripts \
++       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
++       --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
++        --without-suexec-syslog \
+        --with-suexec-bin=%{_sbindir}/suexec \
+-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
++       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
+         --enable-pie \
+         --with-pcre \
+         --enable-mods-shared=all \