[SCM] Debian branch, master, updated. debian/1.2.4-1-2-gcb67b7e

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 16566df6ca8d91aa3bb817f9df9ee894012ec699
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Fri May 31 22:33:49 2013 +0200

    Add patch to explain how to configure it to use with Apache-2.4

diff --git a/debian/patches/comment-Apache2.4-configuration.patch b/debian/patches/comment-Apache2.4-configuration.patch
new file mode 100644
index 0000000..df346bf
--- /dev/null
+++ b/debian/patches/comment-Apache2.4-configuration.patch
@@ -0,0 +1,138 @@
+Description: add comments to use with Apache 2.4
+Author: Xavier Guimard <x.guimard at free.fr>
+Bug: http://jira.ow2.org/browse/LEMONLDAP-571
+Bug-Debian: http://bugs.debian.org/669808
+Bug-Debian: http://bugs.debian.org/669809
+Bug-Debian: http://bugs.debian.org/669822
+Forwarded: http://jira.ow2.org/browse/LEMONLDAP-571
+Last-Update: 2013-05-31
+
+--- a/_example/etc/test-apache2.conf
++++ b/_example/etc/test-apache2.conf
+@@ -16,8 +16,12 @@
+     # DocumentRoot
+     DocumentRoot __TESTDIR__
+     <Directory __TESTDIR__>
++	# For Apache 2.2 use:
+         Order deny,allow
+         Allow from all
++	# For Apache 2.4 use:
++	#Require all granted
++
+         Options +ExecCGI
+     </Directory>
+ 
+--- a/_example/etc/handler-apache2.conf
++++ b/_example/etc/handler-apache2.conf
+@@ -21,17 +21,25 @@
+     # needed): choose your URL to avoid restarting Apache when
+     # configuration change
+     <Location /reload>
++	# For Apache 2.2 use:
+         Order deny,allow
+         Deny from all
+         Allow from 127.0.0.0/8
++	# For Apache 2.4 use:
++	#Require all denied
++
+         PerlHeaderParserHandler My::Package->refresh
+     </Location>
+ 
+     # Uncomment this to activate status module
+     #<Location /status>
++    #    # For Apache 2.2 use:
+     #    Order deny,allow
+     #    Deny from all
+     #    Allow from 127.0.0.0/8
++    #    # For Apache 2.4 use:
++    #    #Require ip 127
++    #
+     #    PerlHeaderParserHandler My::Package->status
+     #</Location>
+ 
+--- a/_example/etc/manager-apache2.conf
++++ b/_example/etc/manager-apache2.conf
+@@ -12,8 +12,12 @@
+     # DocumentRoot
+     DocumentRoot __MANAGERDIR__
+     <Directory __MANAGERDIR__>
++	# For Apache 2.2 use:
+ 	Order deny,allow
+ 	Allow from all
++	# For Apache 2.4 use:
++	#Require all granted
++
+ 	Options +ExecCGI +FollowSymLinks
+     </Directory>
+ 
+@@ -21,8 +25,12 @@
+     Alias /doc/ __DOCDIR__
+     Alias /lib/ __DOCDIR__lib/
+     <Directory __DOCDIR__>
++	# For Apache 2.2 use:
+ 	Order deny,allow
+ 	Allow from all
++	# For Apache 2.4 use:
++	#Require all granted
++
+ 	ErrorDocument 404 /notfound.html
+ 	Options +FollowSymLinks
+     </Directory>
+--- a/_example/etc/portal-apache2.conf
++++ b/_example/etc/portal-apache2.conf
+@@ -12,8 +12,12 @@
+     # DocumentRoot
+     DocumentRoot __PORTALDIR__
+     <Directory __PORTALDIR__>
++	# For Apache 2.2 use:
+ 	Order allow,deny
+ 	Allow from all
++	# For Apache 2.4 use:
++	#Require all granted
++
+ 	Options +ExecCGI +FollowSymLinks
+     </Directory>
+ 
+@@ -29,26 +33,42 @@
+ 
+     # SOAP functions for sessions management (disabled by default)
+     <Location /index.pl/adminSessions>
++	# For Apache 2.2 use:
+ 	Order deny,allow
+ 	Deny from all
++	# For Apache 2.4 use:
++	#Require all denied
++
+     </Location>
+ 
+     # SOAP functions for sessions access (disabled by default)
+     <Location /index.pl/sessions>
++	# For Apache 2.2 use:
+ 	Order deny,allow
+ 	Deny from all
++	# For Apache 2.4 use:
++	#Require all denied
++
+     </Location>
+ 
+     # SOAP functions for configuration access (disabled by default)
+     <Location /index.pl/config>
++	# For Apache 2.2 use:
+ 	Order deny,allow
+ 	Deny from all
++	# For Apache 2.4 use:
++	#Require all denied
++
+     </Location>
+ 
+     # SOAP functions for notification insertion (disabled by default)
+     <Location /index.pl/notification>
++	# For Apache 2.2 use:
+ 	Order deny,allow
+ 	Deny from all
++	# For Apache 2.4 use:
++	#Require all denied
++
+     </Location>
+ 
+     # SAML2 Issuer
diff --git a/debian/patches/series b/debian/patches/series
index 7689bc9..cb087ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 change-js-libs-by-shared-packages.patch
 hide-perl-warning.patch
 remove-dev-hook.patch
+comment-Apache2.4-configuration.patch

-- 
Debian