Request 2048 (accepted)

Overview

Request 2048 (accepted)

Debian fixes:
* Fix upgrade path
* Nuke dummy plugin - it forces apache2 into an infinite loop at reload, which is even worse than the segfault it is supposed to work around

Created by sicherha over 7 years ago
In state accepted
Open review for Admin
Open review for vanmeeuwen

Submit libkolab

Submit package home:sicherha:branches:Kolab:16 / libkolab to package Kolab:16 / libkolab

0001-Dummy-plugin-to-to-workaround-the-httpd-reload-issue.patch Deleted

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -39,7 +39,6 @@
 	# Install the PHP modules manually, because they depend on PHP the API version,
 	# which has to be determined dynamically, so we can't put it into an .install file.
 	mkdir -p debian/tmp/usr/share/php
-	mv debian/tmp/$(PHPEXT)/dummy.php debian/tmp/usr/share/php/dummy.php
 	mv debian/tmp/$(PHPEXT)/kolabcalendaring.php debian/tmp/usr/share/php/kolabcalendaring.php
 	mv debian/tmp/$(PHPEXT)/kolabicalendar.php debian/tmp/usr/share/php/kolabicalendar.php
 	mv debian/tmp/$(PHPEXT)/kolabobject.php debian/tmp/usr/share/php/kolabobject.php
@@ -48,13 +47,10 @@
 	# Put kolab.ini into place
 	if [ -d "/etc/php/7.0/mods-available" ]; then \
 		echo "debian/kolab.ini etc/php/7.0/mods-available" >> debian/php-kolab.install ; \
-		echo "debian/kolabdummy.ini etc/php/7.0/mods-available" >> debian/php-kolab.install ; \
 	elif [ -d "/etc/php/mods-available" ]; then \
 		echo "debian/kolab.ini etc/php/mods-available" >> debian/php-kolab.install ; \
-		echo "debian/kolabdummy.ini etc/php/mods-available" >> debian/php-kolab.install ; \
 	else \
 		echo "debian/kolab.ini etc/php5/mods-available" >> debian/php-kolab.install ; \
-		echo "debian/kolabdummy.ini etc/php5/mods-available" >> debian/php-kolab.install ; \
 	fi
 
 	touch debian/tmp/$(PYTHON_SITEARCH)/kolab/__init__.py

debian.tar.gz/kolab.ini Changed

debian.tar.gz/kolabdummy.ini Deleted

debian.tar.gz/php-kolab-kde.install Changed

debian.tar.gz/php-kolab.postinst Changed

@@ -15,46 +15,6 @@
     inidir=/etc/php5/conf.d
 fi
 
-# Dummy plugin (workaround for #2050)
-module=kolabdummy
-package=php-kolab
-inifile=${module}.ini
-priority=29
-
-if [ "$1" = "configure" ]; then
-
-	# Register new conffile with UCF
-	if [ -f "/usr/share/php5/${module}/${inifile}" ]; then
-		ucf /usr/share/php5/${module}/${inifile} ${inidir}/${inifile}
-	fi
-
-	ucfr --force ${package} ${inidir}/${inifile}
-
-	# Move pre-extension manager conffile
-	if [ -f "/etc/php5/conf.d/${inifile}" ]; then
-		dpkg-maintscript-helper mv_conffile \
-			/etc/php5/conf.d/${inifile} \
-			${inidir}/${inifile} \
-			0.4.0~ -- "$@";
-	fi
-
-	if [ -f "${inidir}/${inifile}.dpkg-new" ]; then
-	    md5sum="$(md5sum ${inidir}/${inifile}.dpkg-new | sed -e 's/ .*//')"
-	    old_md5sum="$(md5sum ${inidir}/${inifile} | sed -e 's/ .*//')"
-	    if [ "$md5sum" = "$old_md5sum" ]; then
-		mv "${inidir}/${inifile}.dpkg-new" "${inidir}/${inifile}"
-	    fi
-	fi
-
-	# Enable the module
-	if [ -x "$(which phpenmod 2>/dev/null)" ]; then
-		phpenmod ${module}/${priority:-19}
-	elif [ -x "$(which php5enmod 2>/dev/null)" ]; then
-		php5enmod ${module}/${priority:-19}
-	fi
-fi
-# End dummy plugin
-
 module=kolab
 package=php-${module}
 inifile=${module}.ini
@@ -93,12 +53,4 @@
 	fi
 fi
 
-if [ "$1" = "configure" ]; then
-
-	# make sure that kolabformat.so is loaded after dummy.so, see #2050
-	sed -i "s/extension=dummy.so/extension=dummy.so\nextension=kolabformat.so/" ${inidir}/kolab.ini
-	sed -i "s/extension=kolabformat.so/;extension=kolabformat.so/" ${inidir}/kolabformat.ini
-
-fi
-
 exit 0

debian.tar.gz/php-kolab.postrm Changed

debian.tar.gz/php-kolab.preinst Changed

debian.tar.gz/php-kolab.prerm Changed

libkolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2048 0

Request History

sicherha created request over 7 years ago

Debian fixes:
* Fix upgrade path
* Nuke dummy plugin - it forces apache2 into an infinite loop at reload, which is even worse than the segfault it is supposed to work around

sicherha accepted request over 7 years ago

Does what it's supposed to do; thanks to Catwiesel for additional testing