Control: tag -1 patch pending

Hi Gerald,

Gerald Turner <gtur...@unzane.com> (2017-06-15):
> In preparation for upgrading several hosts from jessie to stretch, my
> colleague and I discovered that phpldapadmin was removed from stretch
> due to this bug.
> 
> Attached is a trivial one-line patch that solves the piuparts postisnt
> failure by ensuring path /etc/apache2/mods-available is installed by the
> package.  I verified that this is what other 'a2enconf' style packages
> are doing.  I've also verified that piuparts is successful (but there's
> a caveat¹).

It's conf-available rather than mods-available but OK. :)

I think I'll go in a slightly different direction, since apache2 is only
one of the many options: using mkdir -p to ensure the target directory
exists before putting a symlink there, which causes
/etc/apache2/conf-available to only exist if apache2 is indeed selected.
By symmetry, I'm attempting rmdir (with || true) on this directory in the
postrm script.

This seems to lead to suitable results, even if I'm also getting php
issues with piuparts:

> ¹ Caveat: piuparts now fails for another reason, but I believe it's a
> problem with php7.0.  I ran piuparts on phpmyadmin and had the same
> results.
> 
> Output:
> 
> 0m55.8s ERROR: FAIL: Package purging left files on system:
>   /var/lib/php/       owned by: php-common
>   /var/lib/php/modules/    owned by: php-common
>   /var/lib/php/modules/7.0/     not owned
>   /var/lib/php/modules/7.0/apache2/        not owned
>   /var/lib/php/modules/7.0/apache2/enabled_by_maint/     not owned
>   /var/lib/php/modules/7.0/apache2/enabled_by_maint/calendar not owned
>   ...


The source debdiff for my upcoming Non-Maintainer Upload is attached,
feel free to double check and report back. I'm uploading it to unstable
in a few moments, given this bug has been around for some time already…

Thanks for your efforts & patch though!


Cheers,
-- 
Cyril Brulebois -- Debian Consultant @ DEBAMAX -- https://debamax.com/
diff -Nru phpldapadmin-1.2.2/debian/changelog phpldapadmin-1.2.2/debian/changelog
--- phpldapadmin-1.2.2/debian/changelog	2016-08-06 09:21:21.000000000 +0200
+++ phpldapadmin-1.2.2/debian/changelog	2017-10-13 00:52:28.000000000 +0200
@@ -1,3 +1,14 @@
+phpldapadmin (1.2.2-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Create /etc/apache2/conf-available on the fly before trying to put a
+    symlink there, fixing installation failure spotted through piuparts
+    (Closes: #834015).
+  * By symmetry, try to remove it (rmdir || true) in postrm, to avoid
+    leaving an empty directory behind.
+
+ -- Cyril Brulebois <cy...@debamax.com>  Fri, 13 Oct 2017 00:52:28 +0200
+
 phpldapadmin (1.2.2-6) unstable; urgency=medium
 
   * PHP 7.0 transition (Closes: #821585)
diff -Nru phpldapadmin-1.2.2/debian/postinst phpldapadmin-1.2.2/debian/postinst
--- phpldapadmin-1.2.2/debian/postinst	2014-05-02 04:28:13.000000000 +0200
+++ phpldapadmin-1.2.2/debian/postinst	2017-10-13 00:48:47.000000000 +0200
@@ -128,6 +128,7 @@
                     fi
                 fi
                 if [ ! -f /etc/$webserver/conf-available/phpldapadmin.conf ] && [ ! -h /etc/$webserver/conf-available/phpldapadmin.conf ]; then
+                    mkdir -p /etc/$webserver/conf-available
                     ln -s /etc/phpldapadmin/apache.conf /etc/$webserver/conf-available/phpldapadmin.conf
                     if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
                         . /usr/share/apache2/apache2-maintscript-helper
diff -Nru phpldapadmin-1.2.2/debian/postrm phpldapadmin-1.2.2/debian/postrm
--- phpldapadmin-1.2.2/debian/postrm	2014-05-02 04:28:13.000000000 +0200
+++ phpldapadmin-1.2.2/debian/postrm	2017-10-13 00:51:41.000000000 +0200
@@ -29,6 +29,7 @@
                      apache2_invoke disconf phpldapadmin.conf || exit $?
                  fi
                  rm -f /etc/$webserver/conf-available/phpldapadmin.conf
+                 rmdir /etc/$webserver/conf-available || true
                  ;;
              *)
                  ;;

Attachment: signature.asc
Description: PGP signature

Reply via email to