[SCM] Debian branch, master, updated. debian/1.2.4-1-5-g3edf881

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 3edf881e61de9d26ac0e9146db527ef0b0895e73
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Jun 2 17:08:55 2013 +0200

    Replace default Apache-2.2 conf by Apache-2.4 one in patch

diff --git a/debian/changelog b/debian/changelog
index 4eb33ed..226c165 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,9 @@
-lemonldap-ng (1.2.4-2) UNRELEASED; urgency=low
-
-  QUESTIONS:
-  - comment-Apache2.4-configuration.patch:
-    shouldn't this be the other way round, i.e. Apache 2.2 commented out and
-    Apache 2.4 uncommented?
-  - (aesthetic) any reason why d/liblemonldap-ng-conf-perl.postinst is
-    execuatbale and the other maintainer scripts are not?
+lemonldap-ng (1.2.4-2) unstable; urgency=low
 
   * Fix "transition towards Apache 2.4" by adding a patch to comment
     Apache-2.4 example configuration files (Closes: #669808, #669809, #669822)
 
- -- Xavier Guimard <x.guimard at free.fr>  Fri, 31 May 2013 22:38:54 +0200
+ -- Xavier Guimard <x.guimard at free.fr>  Sun, 02 Jun 2013 17:08:26 +0200
 
 lemonldap-ng (1.2.4-1) unstable; urgency=low
 
diff --git a/debian/patches/comment-Apache2.4-configuration.patch b/debian/patches/comment-Apache2.4-configuration.patch
index df346bf..22359fd 100644
--- a/debian/patches/comment-Apache2.4-configuration.patch
+++ b/debian/patches/comment-Apache2.4-configuration.patch
@@ -13,11 +13,13 @@ Last-Update: 2013-05-31
      # DocumentRoot
      DocumentRoot __TESTDIR__
      <Directory __TESTDIR__>
+-        Order deny,allow
+-        Allow from all
 +	# For Apache 2.2 use:
-         Order deny,allow
-         Allow from all
++        #Order deny,allow
++        #Allow from all
 +	# For Apache 2.4 use:
-+	#Require all granted
++	Require all granted
 +
          Options +ExecCGI
      </Directory>
@@ -28,24 +30,30 @@ Last-Update: 2013-05-31
      # needed): choose your URL to avoid restarting Apache when
      # configuration change
      <Location /reload>
+-        Order deny,allow
+-        Deny from all
+-        Allow from 127.0.0.0/8
 +	# For Apache 2.2 use:
-         Order deny,allow
-         Deny from all
-         Allow from 127.0.0.0/8
++        #Order deny,allow
++        #Deny from all
++        #Allow from 127.0.0.0/8
 +	# For Apache 2.4 use:
-+	#Require all denied
++	Require ip 127
 +
          PerlHeaderParserHandler My::Package->refresh
      </Location>
  
      # Uncomment this to activate status module
      #<Location /status>
+-    #    Order deny,allow
+-    #    Deny from all
+-    #    Allow from 127.0.0.0/8
 +    #    # For Apache 2.2 use:
-     #    Order deny,allow
-     #    Deny from all
-     #    Allow from 127.0.0.0/8
++    #    #Order deny,allow
++    #    #Deny from all
++    #    #Allow from 127.0.0.0/8
 +    #    # For Apache 2.4 use:
-+    #    #Require ip 127
++    #    Require ip 127
 +    #
      #    PerlHeaderParserHandler My::Package->status
      #</Location>
@@ -56,11 +64,13 @@ Last-Update: 2013-05-31
      # DocumentRoot
      DocumentRoot __MANAGERDIR__
      <Directory __MANAGERDIR__>
+-	Order deny,allow
+-	Allow from all
 +	# For Apache 2.2 use:
- 	Order deny,allow
- 	Allow from all
++	#Order deny,allow
++	#Allow from all
 +	# For Apache 2.4 use:
-+	#Require all granted
++	Require all granted
 +
  	Options +ExecCGI +FollowSymLinks
      </Directory>
@@ -69,11 +79,13 @@ Last-Update: 2013-05-31
      Alias /doc/ __DOCDIR__
      Alias /lib/ __DOCDIR__lib/
      <Directory __DOCDIR__>
+-	Order deny,allow
+-	Allow from all
 +	# For Apache 2.2 use:
- 	Order deny,allow
- 	Allow from all
++	#Order deny,allow
++	#Allow from all
 +	# For Apache 2.4 use:
-+	#Require all granted
++	Require all granted
 +
  	ErrorDocument 404 /notfound.html
  	Options +FollowSymLinks
@@ -84,55 +96,61 @@ Last-Update: 2013-05-31
      # DocumentRoot
      DocumentRoot __PORTALDIR__
      <Directory __PORTALDIR__>
+-	Order allow,deny
+-	Allow from all
 +	# For Apache 2.2 use:
- 	Order allow,deny
- 	Allow from all
++	#Order deny,allow
++	#Allow from all
 +	# For Apache 2.4 use:
-+	#Require all granted
++	Require all granted
 +
  	Options +ExecCGI +FollowSymLinks
      </Directory>
  
-@@ -29,26 +33,42 @@
+@@ -29,26 +33,38 @@
  
      # SOAP functions for sessions management (disabled by default)
      <Location /index.pl/adminSessions>
+-	Order deny,allow
+-	Deny from all
 +	# For Apache 2.2 use:
- 	Order deny,allow
- 	Deny from all
++	#Order deny,allow
++	#Deny from all
 +	# For Apache 2.4 use:
-+	#Require all denied
-+
++	Require all denied
      </Location>
  
      # SOAP functions for sessions access (disabled by default)
      <Location /index.pl/sessions>
+-	Order deny,allow
+-	Deny from all
 +	# For Apache 2.2 use:
- 	Order deny,allow
- 	Deny from all
++	#Order deny,allow
++	#Deny from all
 +	# For Apache 2.4 use:
-+	#Require all denied
-+
++	Require all denied
      </Location>
  
      # SOAP functions for configuration access (disabled by default)
      <Location /index.pl/config>
+-	Order deny,allow
+-	Deny from all
 +	# For Apache 2.2 use:
- 	Order deny,allow
- 	Deny from all
++	#Order deny,allow
++	#Deny from all
 +	# For Apache 2.4 use:
-+	#Require all denied
-+
++	Require all denied
      </Location>
  
      # SOAP functions for notification insertion (disabled by default)
      <Location /index.pl/notification>
+-	Order deny,allow
+-	Deny from all
 +	# For Apache 2.2 use:
- 	Order deny,allow
- 	Deny from all
++	#Order deny,allow
++	#Deny from all
 +	# For Apache 2.4 use:
-+	#Require all denied
-+
++	Require all denied
      </Location>
  
      # SAML2 Issuer

-- 
Debian