Attachment 655911 Details for Bug 871388 – Git formatted patch to fix apache 2.4 configuration

[patch] Git formatted patch to fix apache 2.4 configuration

0001-Fix-apache-config-for-httpd-2.4-bz-871388.patch (text/plain), 1.41 KB, created by Johan Cwiklinski on 2012-12-02 09:23:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan Cwiklinski

Created: 2012-12-02 09:23:19 UTC

Size: 1.41 KB

patch

obsolete

>From 6bebb36eead209571a4fefbec05ffc5d3d2d39ac Mon Sep 17 00:00:00 2001
>From: Johan Cwiklinski <johan@x-tnd.be>
>Date: Sun, 2 Dec 2012 10:22:58 +0100
>Subject: [PATCH] Fix apache config for httpd 2.4 (bz #871388)
>
>---
> dokuwiki.spec | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
>diff --git a/dokuwiki.spec b/dokuwiki.spec
>index 9ba91ee..d34b10d 100644
>--- a/dokuwiki.spec
>+++ b/dokuwiki.spec
>@@ -1,6 +1,6 @@
> Name:		dokuwiki
> Version:	0
>-Release:	0.14.20121013%{?dist}
>+Release:	0.15.20121013%{?dist}
> Summary:	Standards compliant simple to use wiki
> Group:		Applications/Internet
> License:	GPLv2
>@@ -53,9 +53,16 @@ cat <<EOF >%{name}.httpd
> Alias /%{name} %{_datadir}/%{name}
> 
> <Directory %{_datadir}/%{name}>
>-	Options +FollowSymLinks
>-	Order Allow,Deny
>-	Allow from 127.0.0.1 ::1
>+	<IfModule mod_authz_core.c>
>+		# Apache 2.4
>+		Require local
>+	</IfModule>
>+	<IfModule !mod_authz_core.c>
>+		# Apache 2.2
>+		Options +FollowSymLinks
>+		Order Allow,Deny
>+		Allow from 127.0.0.1 ::1
>+	</IfModule>
> </Directory>
> 
> <Directory %{_datadir}/%{name}/inc>
>@@ -190,6 +197,9 @@ fi
> %doc DOKUWIKI-SELINUX.README
> 
> %changelog
>+- Sun Dec 02 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 0-0.15.20121013
>+- Fix apache config file for httpd 2.4
>+
> * Sat Oct 20 2012 Andrew Colin Kissa <andrew@topdog.za.net> - 0-0.14.20121013
> - Latest upstream
> - Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145
>-- 
>1.8.0.1
>

Actions: View | Diff

Attachments on bug 871388: 655911