Hi Colin, there's one catch. The Apache 2.4 should have a new API and it should be able to set per request document_root. (It was proposed by me for this module and later SF submitted a tad bit different patch achieving the same functionality.)
And I just didn't have a time to lookup the new API and update the upstream. Anyway feel free to NMU (or remove it from testing) with this patch if it is blocking the Apache 2.4 transition. (And I should also probably stop mangling and breaking the PHP 5, right?) Ondrej On Thu, Jul 11, 2013 at 12:32 AM, Colin Watson <cjwat...@debian.org> wrote: > On Thu, May 30, 2013 at 06:45:12PM +0200, Ondřej Surý wrote: > > Thanks for poke. Uploaded via my iPhone, so let's hope it's not a big > mess ;) > > I don't know if you meant that you sent this mail from your iPhone, or > that you actually tried to upload the package via your iPhone; if the > latter, it apparently never made it: > > http://packages.qa.debian.org/m/mod-vhost-ldap.html > > Could you try again? FWIW the following patch seems to do the trick for > me: > > diff -Nru mod-vhost-ldap-2.0.8/debian/apache2 > mod-vhost-ldap-2.0.8/debian/apache2 > --- mod-vhost-ldap-2.0.8/debian/apache2 1970-01-01 01:00:00.000000000 +0100 > +++ mod-vhost-ldap-2.0.8/debian/apache2 2013-07-10 23:17:48.000000000 +0100 > @@ -0,0 +1,3 @@ > +mod .libs/mod_vhost_ldap.so > +mod debian/vhost_ldap.load > +mod debian/vhost_ldap.conf > diff -Nru mod-vhost-ldap-2.0.8/debian/changelog > mod-vhost-ldap-2.0.8/debian/changelog > --- mod-vhost-ldap-2.0.8/debian/changelog 2011-06-21 > 17:18:19.000000000 +0100 > +++ mod-vhost-ldap-2.0.8/debian/changelog 2013-07-10 > 23:18:58.000000000 +0100 > @@ -1,3 +1,10 @@ > +mod-vhost-ldap (2.0.8-1.1) UNRELEASED; urgency=low > + > + * Non-maintainer upload. > + * Port to Apache 2.4 (closes: #666813). > + > + -- Colin Watson <cjwat...@debian.org> Wed, 10 Jul 2013 23:18:48 +0100 > + > mod-vhost-ldap (2.0.8-1) unstable; urgency=low > > * Upstream release 2.0.8 > diff -Nru mod-vhost-ldap-2.0.8/debian/control > mod-vhost-ldap-2.0.8/debian/control > --- mod-vhost-ldap-2.0.8/debian/control 2011-06-21 17:18:19.000000000 +0100 > +++ mod-vhost-ldap-2.0.8/debian/control 2013-07-10 23:18:40.000000000 +0100 > @@ -3,13 +3,14 @@ > Priority: optional > Maintainer: Ondřej Surý <ond...@debian.org> > Standards-Version: 3.8.4 > -Build-Depends: debhelper (>> 7.0.52~), > +Build-Depends: debhelper (>> 7.2.11~), > quilt (>= 0.46-7~), > - apache2-threaded-dev (>= 2.2.3-3) > + dh-apache2, > + apache2-dev (>= 2.2.3-3) > > Package: libapache2-mod-vhost-ldap > Architecture: any > -Depends: ${shlibs:Depends}, ${misc:Depends}, apache2.2-common > +Depends: ${shlibs:Depends}, ${misc:Depends} > Description: Apache 2 module for Virtual Hosting from LDAP > mod-vhost-ldap is an Apache 2 module for storing and configuring > virtual hosts from LDAP. It supports the DocumentRoot, ScriptAlias, > diff -Nru mod-vhost-ldap-2.0.8/debian/rules > mod-vhost-ldap-2.0.8/debian/rules > --- mod-vhost-ldap-2.0.8/debian/rules 2011-06-21 17:18:19.000000000 +0100 > +++ mod-vhost-ldap-2.0.8/debian/rules 2013-07-10 23:24:42.000000000 +0100 > @@ -19,7 +19,7 @@ > #}}} > > %: > - dh --with quilt $@ > + dh $@ --with quilt,apache2 > > AP2_MAKE_DEFS=top_dir=/usr/share/apache2 \ > APXS=apxs2 APACHECTL=apachectl2 \ > @@ -35,8 +35,4 @@ > $(MAKE) $(AP2_MAKE_DEFS) > > override_dh_auto_install: > - mkdir -p $(DEST)/usr/lib/apache2/modules > - install -m 644 .libs/mod_vhost_ldap.so > $(DEST)/usr/lib/apache2/modules > - mkdir -p $(DEST)/etc/apache2/mods-available > - install -m 644 debian/vhost_ldap.load > $(DEST)/etc/apache2/mods-available > - install -m 644 debian/vhost_ldap.conf > $(DEST)/etc/apache2/mods-available > + # handled by dh_apache2 > > Thanks, > > -- > Colin Watson [cjwat...@debian.org] > -- Ondřej Surý <ond...@sury.org>
