Projects
Kolab:16:Enterprise
libkolab
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 4
View file
0001-Dummy-plugin-to-to-workaround-the-httpd-reload-issue.patch
Deleted
@@ -1,33 +0,0 @@ -From b7d0c724af32d3d70cfd48694d3cf113b703c89e Mon Sep 17 00:00:00 2001 -From: Christian Mollekopf <mollekopf@kolabsys.com> -Date: Fri, 28 Nov 2014 16:21:35 +0100 -Subject: PATCH Dummy plugin to to workaround the httpd reload issue. - -See https://issues.kolab.org/show_bug.cgi?id=2050 ---- - CMakeLists.txt | 1 + - dummy.i | 1 + - 2 files changed, 2 insertions(+) - create mode 100644 dummy.i - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 99eef60..d7f724e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -209,5 +209,6 @@ endif(PYTHON_BINDINGS) - - if(PHP_BINDINGS) - generatePHPBindings(kolabshared shared.i) -+ generatePHPBindings(dummy dummy.i) - add_subdirectory(kolabformat/php) - endif(PHP_BINDINGS) -diff --git a/dummy.i b/dummy.i -new file mode 100644 -index 0000000..24c258f ---- /dev/null -+++ b/dummy.i -@@ -0,0 +1 @@ -+/* This is a dummy plugin that does nothing. See https://issues.kolab.org/show_bug.cgi?id=2050 */ --- -1.9.3 -
View file
debian.changelog
Changed
@@ -1,3 +1,11 @@ +libkolab (2.0~dev20151230-0~kolab5) unstable; urgency=low + + * Provide proper upgrade path + * Nuke the dummy plugin - it causes an infinite loop on apache reload, which + is even worse than the segfault it's supposed to work around + + -- Christoph Erhardt <kolab@sicherha.de> Sun, 14 May 2017 13:10:54 +0200 + libkolab (2.0~dev20151230-0~kolab4) unstable; urgency=low * Liberate the build requirements for Debian/Ubuntu
View file
debian.control
Changed
@@ -27,6 +27,8 @@ Package: libkolab2 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libkolabxml1v5 (>= 1.0) +Conflicts: libkolab0 +Replaces: libkolab0 Description: Maps KDE containers to Kolab formats libkolab provides conversions from/to KDE containers, mime message handling and facilities to read and write kolabv2 and kolabv3.
View file
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
View file
debian.tar.gz/kolab.ini
Changed
@@ -1,5 +1,4 @@ ; Kolab libraries -extension=dummy.so extension=kolabobject.so extension=kolabshared.so extension=kolabcalendaring.so
View file
debian.tar.gz/kolabdummy.ini
Deleted
@@ -1,2 +0,0 @@ -; Kolab libraries -;extension=dummy.so
View file
debian.tar.gz/php-kolab-kde.install
Changed
@@ -1,4 +1,3 @@ /usr/share/php5/kolab/kolab.ini usr/share/php5/kolab/ -/usr/share/php5/kolabdummy/kolabdummy.ini usr/share/php5/kolabdummy/ usr/lib/php5/*/*.so usr/share/php/kolab*.php
View file
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
View file
debian.tar.gz/php-kolab.postrm
Changed
@@ -47,38 +47,4 @@ fi fi -# Dummy plugin (workaround for #2050) -module=kolabdummy -package=php-kolab -inifile=${module}.ini - -if -f "/etc/php5/conf.d/${inifile}" ; then - dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.3.0~ -- "$@"; -fi - -# Query which package has this conffile registered -if which ucfq >/dev/null; then - ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:) -fi - -# Only work with the config file if it still belongs to us -if test "$ucfp" = ${package}; then - if "$1" = "purge" ; then - for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do - rm -f ${inidir}/${inifile}${ext} - done - - rm -f ${inidir}/${inifile} - - if which ucf >/dev/null; then - ucf --purge ${inidir}/${inifile} - fi - - if which ucfr >/dev/null; then - ucfr --purge ${package} ${inidir}/${inifile} - fi - fi -fi -# End dummy plugin - exit 0
View file
debian.tar.gz/php-kolab.preinst
Changed
@@ -5,13 +5,6 @@ #EXTRA# #DEBHELPER# -# Dummy plugin (workaround for #2050) -inifile=kolabdummy.ini -if -f "/etc/php5/conf.d/${inifile}" ; then - dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} /etc/php5/mods-available/${inifile} 0.3.0~ -- "$@"; -fi -# End dummy plugin - inifile=kolab.ini if -f "/etc/php5/conf.d/${inifile}" ; then dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} /etc/php5/mods-available/${inifile} 0.3.0~ -- "$@";
View file
debian.tar.gz/php-kolab.prerm
Changed
@@ -29,20 +29,4 @@ fi fi -# Dummy plugin (workaround for #2050) -module=kolabdummy -package=php-kolab -inifile=${module}.ini - -if "$1" = "remove" ; then - if -x "$(which phpdismod 2>/dev/null)" ; then - phpdismod ${module} - elif -x "$(which php5dismod 2>/dev/null)" ; then - php5dismod ${module} - elif -f "${inidir}/${inifile}" ; then - rm -f "${inidir}/${inifile}" - fi -fi -# End dummy plugin - exit 0
View file
libkolab.dsc
Changed
@@ -2,7 +2,7 @@ Source: libkolab Binary: libkolab2, php-kolab, python-kolab, libkolab-dev Architecture: any -Version: 2.0~dev20151230-0~kolab4 +Version: 2.0~dev20151230-0~kolab5 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org> Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Christoph Wickert <wickert@kolabsys.com>, Paul Klos <kolab@klos2day.nl> Homepage: http://git.kolab.org/libkolab
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.