Attachment 655895 Details for Bug 871353 – Git formatted patch to fix apache 2.4 configuration

[patch] Git formatted patch to fix apache 2.4 configuration

0001-Upgrade-apache-config-bz-871353-and-add-missing-BRs.patch (text/plain), 3.24 KB, created by Johan Cwiklinski on 2012-12-02 07:50:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan Cwiklinski

Created: 2012-12-02 07:50:49 UTC

Size: 3.24 KB

patch

obsolete

>From 8df96888591094a7a1ab0514a2b2236159affa79 Mon Sep 17 00:00:00 2001
>From: Johan Cwiklinski <johan@x-tnd.be>
>Date: Sun, 2 Dec 2012 08:48:20 +0100
>Subject: [PATCH] Upgrade apache config (bz #871353) and add missing BRs
>
>---
> BackupPC.htaccess | 43 +++++++++++++++++++++++++++----------------
> BackupPC.spec     | 10 +++++++---
> 2 files changed, 34 insertions(+), 19 deletions(-)
>
>diff --git a/BackupPC.htaccess b/BackupPC.htaccess
>index 1538502..2ec26aa 100644
>--- a/BackupPC.htaccess
>+++ b/BackupPC.htaccess
>@@ -1,24 +1,35 @@
>-<Directory       /usr/share/BackupPC/sbin/>
>-# BackupPC requires valid authentication in order for the web interface to
>-# function properly.  One can view the web interface without authentication
>-# though all functionality is disabled.
>-# 
>-# htpasswd -c /etc/BackupPC/apache.users yourusername
>-# 
>+<Directory /usr/share/BackupPC/>
>+  # BackupPC requires valid authentication in order for the web interface to
>+  # function properly.  One can view the web interface without authentication
>+  # though all functionality is disabled.
>+  # 
>+  # htpasswd -c /etc/BackupPC/apache.users yourusername
>+  # 
> 
>-order deny,allow
>-deny from all
>-allow from 127.0.0.1
>-allow from ::1
>-AuthType Basic
>-AuthUserFile /etc/BackupPC/apache.users
>-AuthName "BackupPC"
>+  AuthType Basic
>+  AuthUserFile /etc/BackupPC/apache.users
>+  AuthName "BackupPC"
> 
>-require valid-user
>+  <IfModule mod_authz_core.c>
>+    # Apache 2.4
>+    <RequireAll>
>+      Require valid-user
>+      <RequireAny>
>+        Require local
>+      </RequireAny>
>+    </RequireAll>
>+  </IfModule>
>+  <IfModule !mod_authz_core.c>
>+    # Apache 2.2
>+    order deny,allow
>+    deny from all
>+    allow from 127.0.0.1
>+    allow from ::1
>+    require valid-user
>+  </IfModule>
> 
> </Directory>
> 
>-
> Alias           /BackupPC/images        /usr/share/BackupPC/html/
> ScriptAlias     /BackupPC               /usr/share/BackupPC/sbin/BackupPC_Admin
> ScriptAlias     /backuppc               /usr/share/BackupPC/sbin/BackupPC_Admin
>diff --git a/BackupPC.spec b/BackupPC.spec
>index 393d571..87c2f19 100644
>--- a/BackupPC.spec
>+++ b/BackupPC.spec
>@@ -16,7 +16,7 @@
> 
> Name:           BackupPC
> Version:        3.2.1
>-Release:        8%{?dist}
>+Release:        9%{?dist}
> Summary:        High-performance backup system
> 
> Group:          Applications/System
>@@ -44,7 +44,7 @@ BuildRequires:  %{_bindir}/rsync
> BuildRequires:  %{_sbindir}/sendmail
> BuildRequires:  %{_bindir}/split
> BuildRequires:  %{_bindir}/ssh
>-BuildRequires:  perl(Compress::Zlib), perl(Digest::MD5)
>+BuildRequires:  perl(Compress::Zlib), perl(Digest::MD5), perl(Data::Dumper)
> %if 0%{?_with_systemd}
> BuildRequires:  systemd-units
> %endif
>@@ -73,7 +73,7 @@ Requires(postun): initscripts
> 
> %if ! 0%{?_without_selinux}
> Requires:       policycoreutils
>-BuildRequires:  selinux-policy-devel, checkpolicy
>+BuildRequires:  selinux-policy-devel, checkpolicy, m4
> %endif
> Provides:       backuppc = %{version}
> 
>@@ -335,6 +335,10 @@ fi
> %endif
> 
> %changelog
>+* Sun Dec 02 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 3.2.1-9
>+- Update apache configuration file for httpd 2.4
>+- Add missing buildrequires
>+
> * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.8.0.1
>

Actions: View | Diff

Attachments on bug 871353: 655895