[lemonldap-ng] 03/12: Use upstream apache2.X files and removing Apache-2.4 patch
Xavier Guimard
xguimard-guest at moszumanska.debian.org
Mon Dec 29 18:31:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
xguimard-guest pushed a commit to branch master
in repository lemonldap-ng.
commit b7c9b4e3496825bd6e91b7dac8ad174ab201f6af
Author: xavier <xavier at stc093srsas380.lemonldap-ng.org>
Date: Mon Dec 29 15:45:39 2014 +0100
Use upstream apache2.X files and removing Apache-2.4 patch
---
debian/liblemonldap-ng-handler-perl.examples | 2 +-
debian/liblemonldap-ng-handler-perl.install | 2 +-
debian/liblemonldap-ng-handler-perl.links | 2 +-
debian/liblemonldap-ng-manager-perl.install | 2 +-
debian/liblemonldap-ng-manager-perl.links | 2 +-
debian/liblemonldap-ng-portal-perl.install | 2 +-
debian/liblemonldap-ng-portal-perl.links | 2 +-
.../patches/comment-Apache2.4-configuration.patch | 154 ---------------------
debian/patches/series | 1 -
9 files changed, 7 insertions(+), 162 deletions(-)
diff --git a/debian/liblemonldap-ng-handler-perl.examples b/debian/liblemonldap-ng-handler-perl.examples
index f9ab48f..c00476e 100644
--- a/debian/liblemonldap-ng-handler-perl.examples
+++ b/debian/liblemonldap-ng-handler-perl.examples
@@ -1,3 +1,3 @@
debian/tmp/examples/handler/*
-debian/tmp/etc/lemonldap-ng/handler-apache2.conf
+debian/tmp/etc/lemonldap-ng/handler-apache2.X.conf
debian/tmp/var/lib/lemonldap-ng/test
diff --git a/debian/liblemonldap-ng-handler-perl.install b/debian/liblemonldap-ng-handler-perl.install
index a054f4e..d3cab09 100644
--- a/debian/liblemonldap-ng-handler-perl.install
+++ b/debian/liblemonldap-ng-handler-perl.install
@@ -1,4 +1,4 @@
-/etc/lemonldap-ng/handler-apache2.conf
+/etc/lemonldap-ng/handler-apache2.X.conf
/usr/share/perl5/auto/Lemonldap/NG/Handler*
/usr/share/perl5/Lemonldap/NG/Handler*
/usr/share/man/man3/Lemonldap::NG::Handler*
diff --git a/debian/liblemonldap-ng-handler-perl.links b/debian/liblemonldap-ng-handler-perl.links
index 5ff3ddd..d367f7f 100644
--- a/debian/liblemonldap-ng-handler-perl.links
+++ b/debian/liblemonldap-ng-handler-perl.links
@@ -1 +1 @@
-/etc/lemonldap-ng/handler-apache2.conf /etc/apache2/sites-available/handler-apache2.conf
+/etc/lemonldap-ng/handler-apache2.X.conf /etc/apache2/sites-available/handler-apache2.conf
diff --git a/debian/liblemonldap-ng-manager-perl.install b/debian/liblemonldap-ng-manager-perl.install
index 05639c1..7f58d4b 100644
--- a/debian/liblemonldap-ng-manager-perl.install
+++ b/debian/liblemonldap-ng-manager-perl.install
@@ -1,6 +1,6 @@
/usr/share/perl5/Lemonldap/NG/Manager*
/usr/share/perl5/auto/Lemonldap/NG/Manager
-/etc/lemonldap-ng/manager-apache2.conf
+/etc/lemonldap-ng/manager-apache2.X.conf
/usr/share/lemonldap-ng/manager-skins
/usr/share/lemonldap-ng/manager
/var/lib/lemonldap-ng/manager
diff --git a/debian/liblemonldap-ng-manager-perl.links b/debian/liblemonldap-ng-manager-perl.links
index c657b97..2ed60e8 100644
--- a/debian/liblemonldap-ng-manager-perl.links
+++ b/debian/liblemonldap-ng-manager-perl.links
@@ -1,4 +1,4 @@
-/etc/lemonldap-ng/manager-apache2.conf /etc/apache2/sites-available/manager-apache2.conf
+/etc/lemonldap-ng/manager-apache2.X.conf /etc/apache2/sites-available/manager-apache2.conf
/usr/share/lemonldap-ng/manager/index.pl /var/lib/lemonldap-ng/manager/index.pl
/usr/share/lemonldap-ng/manager/notifications.pl /var/lib/lemonldap-ng/manager/notifications.pl
/usr/share/lemonldap-ng/manager/sessions.pl /var/lib/lemonldap-ng/manager/sessions.pl
diff --git a/debian/liblemonldap-ng-portal-perl.install b/debian/liblemonldap-ng-portal-perl.install
index d884b77..bb0a86e 100644
--- a/debian/liblemonldap-ng-portal-perl.install
+++ b/debian/liblemonldap-ng-portal-perl.install
@@ -6,4 +6,4 @@
/usr/share/lemonldap-ng/bin/buildPortalWSDL
/usr/share/lemonldap-ng/portal
/var/lib/lemonldap-ng/portal
-/etc/lemonldap-ng/portal-apache2.conf
+/etc/lemonldap-ng/portal-apache2.X.conf
diff --git a/debian/liblemonldap-ng-portal-perl.links b/debian/liblemonldap-ng-portal-perl.links
index 44dbfb5..dc6f669 100644
--- a/debian/liblemonldap-ng-portal-perl.links
+++ b/debian/liblemonldap-ng-portal-perl.links
@@ -1,4 +1,4 @@
-/etc/lemonldap-ng/portal-apache2.conf /etc/apache2/sites-available/portal-apache2.conf
+/etc/lemonldap-ng/portal-apache2.X.conf /etc/apache2/sites-available/portal-apache2.conf
/usr/share/lemonldap-ng/portal/cdc.pl /var/lib/lemonldap-ng/portal/cdc.pl
/usr/share/lemonldap-ng/portal/index.pl /var/lib/lemonldap-ng/portal/index.pl
/usr/share/lemonldap-ng/portal/mail.pl /var/lib/lemonldap-ng/portal/mail.pl
diff --git a/debian/patches/comment-Apache2.4-configuration.patch b/debian/patches/comment-Apache2.4-configuration.patch
deleted file mode 100644
index 388bc24..0000000
--- a/debian/patches/comment-Apache2.4-configuration.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Description: compliance with both Apache 2.4 and 2.2
- To be compliant with both Apache 2.2 (Ubuntu) and 2.4 (Sid), version is now
- tested
-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/handler-apache2.conf
-+++ b/_example/etc/handler-apache2.conf
-@@ -21,17 +21,27 @@
- # 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
-+ <IfVersion < 2.4>
-+ Order deny,allow
-+ Deny from all
-+ Allow from 127.0.0.0/8
-+ </IfVersion>
-+ <IfVersion >= 2.4>
-+ Require ip 127
-+ </IfVersion>
- 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
-+ # <IfVersion < 2.4>
-+ # Order deny,allow
-+ # Deny from all
-+ # Allow from 127.0.0.0/8
-+ # </IfVersion>
-+ # <IfVersion >= 2.4>
-+ # Require ip 127
-+ # </IfVersion>
- # PerlHeaderParserHandler My::Package->status
- #</Location>
-
---- a/_example/etc/manager-apache2.conf
-+++ b/_example/etc/manager-apache2.conf
-@@ -12,8 +12,13 @@
- # DocumentRoot
- DocumentRoot __MANAGERDIR__
- <Directory __MANAGERDIR__>
-- Order deny,allow
-- Allow from all
-+ <IfVersion < 2.4>
-+ Order allow,deny
-+ Allow from all
-+ </IfVersion>
-+ <IfVersion >= 2.4>
-+ Require all granted
-+ </IfVersion>
- Options +ExecCGI +FollowSymLinks
- </Directory>
-
-@@ -21,8 +26,13 @@
- Alias /doc/ __DOCDIR__
- Alias /lib/ __DOCDIR__lib/
- <Directory __DOCDIR__>
-- Order allow,deny
-- Allow from all
-+ <IfVersion < 2.4>
-+ Order deny,allow
-+ Allow from all
-+ </IfVersion>
-+ <IfVersion >= 2.4>
-+ Require all granted
-+ </IfVersion>
- ErrorDocument 404 /notfound.html
- Options +FollowSymLinks
- </Directory>
---- a/_example/etc/portal-apache2.conf
-+++ b/_example/etc/portal-apache2.conf
-@@ -12,8 +12,13 @@
- # DocumentRoot
- DocumentRoot __PORTALDIR__
- <Directory __PORTALDIR__>
-- Order allow,deny
-- Allow from all
-+ <IfVersion < 2.4>
-+ Order allow,deny
-+ Allow from all
-+ </IfVersion>
-+ <IfVersion >= 2.4>
-+ Require all granted
-+ </IfVersion>
- Options +ExecCGI +FollowSymLinks
- </Directory>
-
-@@ -29,26 +34,46 @@
-
- # SOAP functions for sessions management (disabled by default)
- <Location /index.pl/adminSessions>
-- Order deny,allow
-- Deny from all
-+ <IfVersion < 2.4>
-+ Order deny,allow
-+ Deny from all
-+ </IfVersion>
-+ <IfVersion >= 2.4>
-+ Require all denied
-+ </IfVersion>
- </Location>
-
- # SOAP functions for sessions access (disabled by default)
- <Location /index.pl/sessions>
-- Order deny,allow
-- Deny from all
-+ <IfVersion < 2.4>
-+ Order deny,allow
-+ Deny from all
-+ </IfVersion>
-+ <IfVersion >= 2.4>
-+ Require all denied
-+ </IfVersion>
- </Location>
-
- # SOAP functions for configuration access (disabled by default)
- <Location /index.pl/config>
-- Order deny,allow
-- Deny from all
-+ <IfVersion < 2.4>
-+ Order deny,allow
-+ Deny from all
-+ </IfVersion>
-+ <IfVersion >= 2.4>
-+ Require all denied
-+ </IfVersion>
- </Location>
-
- # SOAP functions for notification insertion (disabled by default)
- <Location /index.pl/notification>
-- Order deny,allow
-- Deny from all
-+ <IfVersion < 2.4>
-+ Order deny,allow
-+ Deny from all
-+ </IfVersion>
-+ <IfVersion >= 2.4>
-+ Require all denied
-+ </IfVersion>
- </Location>
-
- # SAML2 Issuer
diff --git a/debian/patches/series b/debian/patches/series
index fffcddb..10aced8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-comment-Apache2.4-configuration.patch
change-js-libs-by-shared-packages.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git
More information about the Pkg-perl-cvs-commits
mailing list