Request 2828 (superseded)

This request is superseded by request 2834 (Show diff)

Overview

Request 2828 (superseded)

Removed old references to kolabicalendar.so

Created by mollekopf over 3 years ago
In state superseded
Superseded by 2834
Open review for Admin
Open review for vanmeeuwen

Submit libkolab

Submit package Kolab:Winterfell / libkolab to package Kolab:16 / libkolab

libkolab.spec Changed

@@ -4,9 +4,6 @@
 #!BuildIgnore:  httpd
 %endif
 
-# The cmake macro changed to build out of source by default, which breaks our own out of source build, so disable that.
-%define __cmake_in_source_build 1
-
 %{expand: %(if  `php-config --vernum` -gt 70000 ; then echo %%global with_php7 1; else echo %%global with_php7 0; fi)}
 
 %if 0%{?suse_version}
@@ -20,17 +17,10 @@
 %endif
 %{!?php_apiver: %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}
 
-
-%if 0%{?rhel} > 8
-%global with_python 0
-%else
-%global with_python 1
-%endif
-%global with_python3 1
-
+# Filter out private python and php libs. Does not work on EPEL5,
+# therefor we use it conditionally
 %{?filter_setup:
-%filter_provides_in %{python2_sitearch}/.*\.so$
-%filter_provides_in %{python3_sitearch}/.*\.so$
+%filter_provides_in %{python_sitearch}/.*\.so$
 %filter_provides_in %{php_extdir}/.*\.so$
 %filter_setup
 }
@@ -41,43 +31,50 @@
 Name:           libkolab
 %endif
 
-Version:        3.2.0
-Release:        1%{?dist}
+Version:        3.0.0
+Release:        0.1.dev20150112.gitf0f953aa%{?dist}
 Summary:        Kolab Object Handling Library
 
 License:        LGPLv3+
 URL:            http://git.kolab.org/libkolab
 
 # From 2881447555eb7965f557158c88ae2aa18e936971
-Source0:        libkolab-%{version}.tar.gz
+Source0:        http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz
+
+#Patch1:         0001-Fix-dangling-pointers.patch
+#Patch2:         0002-Fixed-memory-leaks-in-tests.patch
 
 BuildRequires:  cmake
+%if 0%{?rhel} > 7 || 0%{?fedora}
+BuildRequires:  kf5-kcoreaddons-devel
 BuildRequires:  kf5-kcalendarcore-devel
 BuildRequires:  kf5-kmime-devel
-%if 0%{?suse_version}
-BuildRequires:  qt-devel
 %else
-BuildRequires:  qt5-qtbase-devel
+# Note: available within kolabsys.com infrastructure only, as being (essentially) a
+# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
+BuildRequires:  libcalendaring-devel >= 4.9.1
 %endif
 BuildRequires:  libcurl-devel
-BuildRequires:  libkolabxml-devel >= 1.2
+BuildRequires:  libkolabxml-devel >= 1.0
 BuildRequires:  make
 BuildRequires:  php >= 5.3
 BuildRequires:  php-devel >= 5.3
-BuildRequires:  swig >= 4.1
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
+BuildRequires:  plesk-php56-devel
+BuildRequires:  plesk-php70-devel
+BuildRequires:  plesk-php71-devel
 BuildRequires:  plesk-php72-devel
 BuildRequires:  plesk-php73-devel
-%endif
 BuildRequires:  plesk-php74-devel
-BuildRequires:  plesk-php80-devel
-BuildRequires:  plesk-php81-devel
-BuildRequires:  plesk-php82-devel
 %endif
 
 BuildRequires:  python3-devel
+%if 0%{?suse_version}
+BuildRequires:  qt-devel
+%else
+BuildRequires:  qt5-qtbase-devel
+%endif
 Provides:       libkolab%{?_isa} = %{version}
 
 %description
@@ -90,16 +87,23 @@
 %endif
 Summary:        Kolab library development headers
 Requires:       libkolab%{?_isa} = %{version}
+%if 0%{?rhel} > 7 || 0%{?fedora}
+BuildRequires:  kf5-kcoreaddons-devel
 BuildRequires:  kf5-kcalendarcore-devel
 BuildRequires:  kf5-kmime-devel
 %if 0%{?fedora} >= 21
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca
 BuildRequires: qca
 %endif
+%else
+# Note: available within kolabsys.com infrastructure only, as being (essentially) a
+# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
+BuildRequires:  libcalendaring-devel >= 4.9.1
+%endif
 Requires:       libkolabxml-devel >= 1.0
 Requires:       php-devel
 Requires:       pkgconfig
-Requires:       python3-devel
+Requires:       python36-devel
 
 %if 0%{?suse_version}
 %description -n libkolab-devel
@@ -128,68 +132,65 @@
 PHP Bindings for libkolab
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-%package -n plesk-php72-kolab
-Summary:        libkolab bindings for Plesk's PHP 7.2
+%package -n plesk-php56-kolab
+Summary:        libkolab bindings for Plesk's PHP 5.6
 Group:          System Environment/Libraries
 Provides:       php-bindings(libkolab) = %{version}-%{release}
 Requires:       libkolab%{?_isa} = %{version}
-Requires:       plesk-php72
+Requires:       plesk-php56
 
-%description -n plesk-php72-kolab
-libkolab bindings for Plesk's PHP 7.2
+%description -n plesk-php56-kolab
+libkolab bindings for Plesk's PHP 5.6
 
-%package -n plesk-php73-kolab
-Summary:        libkolab bindings for Plesk's PHP 7.3
+%package -n plesk-php70-kolab
+Summary:        libkolab bindings for Plesk's PHP 7.0
 Group:          System Environment/Libraries
 Provides:       php-bindings(libkolab) = %{version}-%{release}
 Requires:       libkolab%{?_isa} = %{version}
-Requires:       plesk-php73
+Requires:       plesk-php70
 
-%description -n plesk-php73-kolab
-libkolab bindings for Plesk's PHP 7.3
+%description -n plesk-php70-kolab
+libkolab bindings for Plesk's PHP 7.0
 
-%endif
-%package -n plesk-php74-kolab
-Summary:        libkolab bindings for Plesk's PHP 7.4
+%package -n plesk-php71-kolab
+Summary:        libkolab bindings for Plesk's PHP 7.1
 Group:          System Environment/Libraries
 Provides:       php-bindings(libkolab) = %{version}-%{release}
 Requires:       libkolab%{?_isa} = %{version}
-Requires:       plesk-php74
+Requires:       plesk-php71
 
-%description -n plesk-php74-kolab
-libkolab bindings for Plesk's PHP 7.4
+%description -n plesk-php71-kolab
+libkolab bindings for Plesk's PHP 7.1
 
-%package -n plesk-php80-kolab
-Summary:        libkolab bindings for Plesk's PHP 8.0
+%package -n plesk-php72-kolab
+Summary:        libkolab bindings for Plesk's PHP 7.2
 Group:          System Environment/Libraries
 Provides:       php-bindings(libkolab) = %{version}-%{release}
 Requires:       libkolab%{?_isa} = %{version}
-Requires:       plesk-php80
+Requires:       plesk-php72
 
-%description -n plesk-php80-kolab
-libkolab bindings for Plesk's PHP 8.0
+%description -n plesk-php72-kolab
+libkolab bindings for Plesk's PHP 7.2
 
-%package -n plesk-php81-kolab
-Summary:        libkolab bindings for Plesk's PHP 8.1
+%package -n plesk-php73-kolab
+Summary:        libkolab bindings for Plesk's PHP 7.3
 Group:          System Environment/Libraries
 Provides:       php-bindings(libkolab) = %{version}-%{release}
 Requires:       libkolab%{?_isa} = %{version}
-Requires:       plesk-php81
+Requires:       plesk-php73
 
-%description -n plesk-php81-kolab
-libkolab bindings for Plesk's PHP 8.1
+%description -n plesk-php73-kolab
+libkolab bindings for Plesk's PHP 7.3
 
-%package -n plesk-php82-kolab
-Summary:        libkolab bindings for Plesk's PHP 8.2
+%package -n plesk-php74-kolab
+Summary:        libkolab bindings for Plesk's PHP 7.4
 Group:          System Environment/Libraries
 Provides:       php-bindings(libkolab) = %{version}-%{release}
 Requires:       libkolab%{?_isa} = %{version}
-Requires:       plesk-php82
-
-%description -n plesk-php82-kolab
-libkolab bindings for Plesk's PHP 8.2
+Requires:       plesk-php74
 
+%description -n plesk-php74-kolab
+libkolab bindings for Plesk's PHP 7.4
 %endif
 
 %package -n python-kolab
@@ -205,46 +206,31 @@
 %description -n python-kolab
 Python bindings for libkolab
 
-%package -n python3-kolab
-Summary:        Python bindings for libkolab
-Group:          System Environment/Libraries
-Requires:       libkolab%{?_isa} = %{version}
-Requires:       python3-kolabformat >= 1.0.0
-%if 0%{?suse_version}
-Obsoletes:      python3-%{name} < %{version}
-Provides:       python3-%{name} = %{version}
-%endif
-
-%description -n python3-kolab
-Python bindings for libkolab
-
 %prep
 %setup -q -c -n libkolab-%{version}
 
 pushd %{name}-%{version}
-#%patch1 -p1
+%patch1 -p1
+%patch2 -p1
 popd
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
+cp -a libkolab-%{version} libkolab-%{version}-5.6
+
+cp -a libkolab-%{version} libkolab-%{version}-7.0
+sed -i "s/-php/-php7/g" libkolab-%{version}-7.0/cmake/modules/SWIGUtils.cmake
+
+cp -a libkolab-%{version} libkolab-%{version}-7.1
+sed -i "s/-php/-php7/g" libkolab-%{version}-7.1/cmake/modules/SWIGUtils.cmake
+
 cp -a libkolab-%{version} libkolab-%{version}-7.2
 sed -i "s/-php/-php7/g" libkolab-%{version}-7.2/cmake/modules/SWIGUtils.cmake
 
 cp -a libkolab-%{version} libkolab-%{version}-7.3
 sed -i "s/-php/-php7/g" libkolab-%{version}-7.3/cmake/modules/SWIGUtils.cmake
 
-%endif
 cp -a libkolab-%{version} libkolab-%{version}-7.4
 sed -i "s/-php/-php7/g" libkolab-%{version}-7.4/cmake/modules/SWIGUtils.cmake
-
-cp -a libkolab-%{version} libkolab-%{version}-8.0
-sed -i "s/-php/-php7/g" libkolab-%{version}-8.0/cmake/modules/SWIGUtils.cmake
-
-cp -a libkolab-%{version} libkolab-%{version}-8.1
-sed -i "s/-php/-php7/g" libkolab-%{version}-8.1/cmake/modules/SWIGUtils.cmake
-
-cp -a libkolab-%{version} libkolab-%{version}-8.2
-sed -i "s/-php/-php7/g" libkolab-%{version}-8.2/cmake/modules/SWIGUtils.cmake
 %endif
 
 %if 0%{?with_php7}
@@ -253,14 +239,6 @@
 popd
 %endif
 
-%if 0%{?with_python}
-cp -a libkolab-%{version} libkolab-%{version}-python2
-%endif
-
-%if 0%{?with_python3}
-cp -a libkolab-%{version} libkolab-%{version}-python3
-%endif
-
 %build
 pushd %{name}-%{version}
 rm -rf build
@@ -289,73 +267,35 @@
 %else
 %cmake \
 %endif
+%if 0%{?with_at}
+    -DBUILD_TOOLS:BOOL=OFF \
+%endif
     -DCMAKE_C_FLAGS:STRING="-DNDEBUG -DQT_NO_DEBUG" \
     -DBoost_NO_BOOST_CMAKE=TRUE \
     -Wno-fatal-errors -Wno-errors \
     -DINCLUDE_INSTALL_DIR=%{_includedir} \
+%if 0%{?rhel} < 8 && 0%{?fedora} < 20
+    -DUSE_LIBCALENDARING=ON \
+%endif
     -DPHP_BINDINGS=ON \
     -DPHP_INSTALL_DIR=%{php_extdir} \
+    -DPYTHON_BINDINGS=ON \
+    -DPYTHON_INSTALL_DIR=%{python_sitearch} \
     ..
 make
 popd
 popd
 
-%if 0%{with_python}
-    pushd %{name}-%{version}-python2
-    rm -rf build
-    mkdir -p build
-    pushd build
-    %cmake \
-        -DCMAKE_C_FLAGS:STRING="-DNDEBUG -DQT_NO_DEBUG" \
-        -DBoost_NO_BOOST_CMAKE=TRUE \
-        -Wno-fatal-errors -Wno-errors \
-        -DINCLUDE_INSTALL_DIR=%{_includedir} \
-%if 0%{?rhel} >= 8 || 0%{?fedora}
-        -DQT5_BUILD=ON \
-%endif
-        -DINCLUDE_INSTALL_DIR=%{_includedir} \
-        -DPYTHON_BINDINGS=ON \
-        -DPYTHON_INSTALL_DIR=%{python2_sitearch} \
-        ..
-    make
-    popd
-    popd
-%endif
-
-%if 0%{with_python3}
-    pushd %{name}-%{version}-python3
-    rm -rf build
-    mkdir -p build
-    pushd build
-    %cmake \
-        -DCMAKE_C_FLAGS:STRING="-DNDEBUG -DQT_NO_DEBUG" \
-        -DBoost_NO_BOOST_CMAKE=TRUE \
-        -Wno-fatal-errors -Wno-errors \
-        -DINCLUDE_INSTALL_DIR=%{_includedir} \
-%if 0%{?rhel} >= 8 || 0%{?fedora}
-        -DQT5_BUILD=ON \
-%endif
-        -DINCLUDE_INSTALL_DIR=%{_includedir} \
-        -DPYTHON_BINDINGS=ON \
-        -DPYTHON_INSTALL_DIR=%{python3_sitearch} \
-        ..
-    make
-    popd
-    popd
-%endif
-
-
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
-%else
-for version in 7.4 8.0 8.1 8.2; do
-%endif
+for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
     pushd %{name}-%{version}-${version}
     rm -rf build
     mkdir -p build
     pushd build
     %cmake \
+%if 0%{?with_at}
+        -DBUILD_TOOLS:BOOL=OFF \
+%endif
         -DCMAKE_C_FLAGS:STRING="-DNDEBUG -DQT_NO_DEBUG" \
         -DBoost_NO_BOOST_CMAKE=TRUE \
         -Wno-fatal-errors -Wno-errors \
@@ -364,6 +304,9 @@
         -DQT5_BUILD=ON \
 %endif
         -DINCLUDE_INSTALL_DIR=%{_includedir} \
+%if 0%{?rhel} < 8 && 0%{?fedora} < 20
+        -DUSE_LIBCALENDARING=ON \
+%endif
         -DPHP_BINDINGS=ON \
         -DPHP_INCLUDE_DIR=/opt/plesk/php/${version}/include/php/ \
         -DPHP_EXECUTABLE=/opt/plesk/php/${version}/bin/php \
@@ -382,12 +325,16 @@
 make install DESTDIR=%{buildroot}
 popd
 
+mkdir -p %{buildroot}/%{_datadir}/%{php}
+mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/%{php}/.
+
 mkdir -p %{buildroot}/%{php_inidir}
 cat >%{buildroot}/%{php_inidir}/kolab.ini <<EOF
 ; Kolab libraries
 extension=kolabobject.so
 extension=kolabshared.so
 extension=kolabcalendaring.so
+extension=kolabicalendar.so
 EOF
 
 # Workaround for #2050
@@ -397,23 +344,25 @@
 EOF
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
-%else
-for version in 7.4 8.0 8.1 8.2; do
-%endif
+for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
     pushd %{name}-%{version}-${version}
     pushd build
     make install DESTDIR=%{buildroot} INSTALL='install -p'
     popd
 
     mkdir -p \
+        %{buildroot}/opt/plesk/php/${version}/share/php/ \
         %{buildroot}/opt/plesk/php/${version}/etc/php.d/ \
         %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
 
+    mv \
+        %{buildroot}/opt/plesk/php/${version}/lib64/php/modules/*.php \
+        %{buildroot}/opt/plesk/php/${version}/share/php/.
+
     echo "extension=kolabobject.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=kolabshared.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=kolabcalendaring.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
+    echo "extension=kolabicalendar.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=dummy.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabdummy.ini
 
     cp %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini \
@@ -426,24 +375,7 @@
 done
 %endif
 
-%if 0%{?with_python}
-pushd %{name}-%{version}-python2
-pushd build
-make install DESTDIR=%{buildroot} INSTALL='install -p'
-popd
-touch %{buildroot}/%{python2_sitearch}/kolab/__init__.py
-popd
-%endif
-
-
-%if 0%{?with_python3}
-pushd %{name}-%{version}-python3
-pushd build
-make install DESTDIR=%{buildroot} INSTALL='install -p'
-popd
-touch %{buildroot}/%{python3_sitearch}/kolab/__init__.py
-popd
-%endif
+touch %{buildroot}/%{python_sitearch}/kolab/__init__.py
 
 %check
 pushd %{name}-%{version}/build/tests
@@ -479,84 +411,74 @@
 %files -n php-kolab
 %config(noreplace) %{php_inidir}/kolab.ini
 %config(noreplace) %{php_inidir}/kolabdummy.ini
+%{_datadir}/%{php}/kolabcalendaring.php
 %{php_extdir}/kolabcalendaring.so
+%{_datadir}/%{php}/kolabicalendar.php
+%{php_extdir}/kolabicalendar.so
+%{_datadir}/%{php}/kolabobject.php
 %{php_extdir}/kolabobject.so
+%{_datadir}/%{php}/kolabshared.php
 %{php_extdir}/kolabshared.so
+%{_datadir}/%{php}/dummy.php
 %{php_extdir}/dummy.so
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
+%files -n plesk-php56-kolab
+%defattr(-,root,root,-)
+/opt/plesk/php/5.6/lib64/php/modules/*.so
+/opt/plesk/php/5.6/share/php/*.php
+/opt/plesk/php/5.6/etc/php.d/*.ini
+/opt/plesk/php/5.6/etc/php-fpm.d/*.ini
+
+%files -n plesk-php70-kolab
+%defattr(-,root,root,-)
+/opt/plesk/php/7.0/lib64/php/modules/*.so
+/opt/plesk/php/7.0/share/php/*.php
+/opt/plesk/php/7.0/etc/php.d/*.ini
+/opt/plesk/php/7.0/etc/php-fpm.d/*.ini
+
+%files -n plesk-php71-kolab
+%defattr(-,root,root,-)
+/opt/plesk/php/7.1/lib64/php/modules/*.so
+/opt/plesk/php/7.1/share/php/*.php
+/opt/plesk/php/7.1/etc/php.d/*.ini
+/opt/plesk/php/7.1/etc/php-fpm.d/*.ini
+
 %files -n plesk-php72-kolab
 %defattr(-,root,root,-)
 /opt/plesk/php/7.2/lib64/php/modules/*.so
+/opt/plesk/php/7.2/share/php/*.php
 /opt/plesk/php/7.2/etc/php.d/*.ini
 /opt/plesk/php/7.2/etc/php-fpm.d/*.ini
 
 %files -n plesk-php73-kolab
 %defattr(-,root,root,-)
 /opt/plesk/php/7.3/lib64/php/modules/*.so
+/opt/plesk/php/7.3/share/php/*.php
 /opt/plesk/php/7.3/etc/php.d/*.ini
 /opt/plesk/php/7.3/etc/php-fpm.d/*.ini
 
-%endif
 %files -n plesk-php74-kolab
 %defattr(-,root,root,-)
 /opt/plesk/php/7.4/lib64/php/modules/*.so
+/opt/plesk/php/7.4/share/php/*.php
 /opt/plesk/php/7.4/etc/php.d/*.ini
 /opt/plesk/php/7.4/etc/php-fpm.d/*.ini
-
-%files -n plesk-php80-kolab
-%defattr(-,root,root,-)
-/opt/plesk/php/8.0/lib64/php/modules/*.so
-/opt/plesk/php/8.0/etc/php.d/*.ini
-/opt/plesk/php/8.0/etc/php-fpm.d/*.ini
-
-%files -n plesk-php81-kolab
-%defattr(-,root,root,-)
-/opt/plesk/php/8.1/lib64/php/modules/*.so
-/opt/plesk/php/8.1/etc/php.d/*.ini
-/opt/plesk/php/8.1/etc/php-fpm.d/*.ini
-
-%files -n plesk-php82-kolab
-%defattr(-,root,root,-)
-/opt/plesk/php/8.2/lib64/php/modules/*.so
-/opt/plesk/php/8.2/etc/php.d/*.ini
-/opt/plesk/php/8.2/etc/php-fpm.d/*.ini
-
 %endif
 
-%if 0%{?with_python} > 0
 %files -n python-kolab
-%dir %{python2_sitearch}/kolab/
-%{python2_sitearch}/kolab/__init__.py*
-%{python2_sitearch}/kolab/_calendaring.so
-%{python2_sitearch}/kolab/calendaring.py*
-%{python2_sitearch}/kolab/_kolabobject.so*
-%{python2_sitearch}/kolab/kolabobject.py*
-%{python2_sitearch}/kolab/_shared.so*
-%{python2_sitearch}/kolab/shared.py*
-%endif
-
-%if 0%{?with_python3}
-%files -n python3-kolab
-%dir %{python3_sitearch}/kolab/
-%{python3_sitearch}/kolab/__init__.py*
-%{python3_sitearch}/kolab/_calendaring.so
-%{python3_sitearch}/kolab/calendaring.py*
-%{python3_sitearch}/kolab/_kolabobject.so*
-%{python3_sitearch}/kolab/kolabobject.py*
-%{python3_sitearch}/kolab/_shared.so*
-%{python3_sitearch}/kolab/shared.py*
-%{python3_sitearch}/kolab/__pycache__/
-%endif
+%dir %{python_sitearch}/kolab/
+%{python_sitearch}/kolab/__init__.py*
+%{python_sitearch}/kolab/_calendaring.so
+%{python_sitearch}/kolab/calendaring.py*
+%{python_sitearch}/kolab/_icalendar.so
+%{python_sitearch}/kolab/icalendar.py*
+%{python_sitearch}/kolab/_kolabobject.so*
+%{python_sitearch}/kolab/kolabobject.py*
+%{python_sitearch}/kolab/_shared.so*
+%{python_sitearch}/kolab/shared.py*
 
 %changelog
-* Fri Aug 12 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 3.0.2-1
-- New upstream release
-
-* Tue Jan 04 2022 Christian Mollekopf <mollekopf@kolabsys.com> - 3.0.1-1
-- New upstream release
-
 * Mon Feb 09 2015 Timotheus Pokorra <tp@tbits.net>
 - master is going towards 0.7

0001-Fix-dangling-pointers.patch Added

@@ -0,0 +1,64 @@
+From 4bda8a1cb3befa5dc4b03c6590640053afb74ef5 Mon Sep 17 00:00:00 2001
+From: Christoph Erhardt <kolab@sicherha.de>
+Date: Tue, 25 May 2021 08:57:22 +0200
+Subject: PATCH 1/2 Fix dangling pointers
+
+std::vector gives zero guarantees that pointers to its elements remain
+valid when the vector's size changes. In particular, pushing new
+elements into the vector may trigger reallocation of the underlying heap
+area.
+
+Consequently, Event::delegate() needs to ensure that any modifications
+to the d->attendees vector are performed before pointers to its elements
+are taken and collected.
+
+Found with Valgrind.
+
+
+Reviewers: mollekopf
+
+Reviewed By: mollekopf
+
+Subscribers: mollekopf
+
+Differential Revision: https://git.kolab.org/D2548
+---
+ calendaring/event.cpp | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/calendaring/event.cpp b/calendaring/event.cpp
+index bcdf833..ea9ead1 100644
+--- a/calendaring/event.cpp
++++ b/calendaring/event.cpp
+@@ -76,17 +76,22 @@ bool contains(const Kolab::ContactReference &delegatorRef, const std::vector <Ko
+ void Event::delegate(const std::vector< Attendee >& delegators, const std::vector< Attendee >& delegatees)
+ {
+ 
+-    //First build a list of attendee references, and insert any missing attendees
+-    std::vector<Kolab::Attendee*> delegateesRef;
++    //First insert any missing attendees
+     foreach(const Attendee &a, delegatees) {
+-        if (Attendee *attendee = getAttendee(a.contact())) {
+-            delegateesRef.push_back(attendee);
+-        } else {
++        if (!getAttendee(a.contact())) {
+             d->attendees.push_back(a);
+-            delegateesRef.push_back(&d->attendees.back());
+         }
+     }
+ 
++    //Build a list of attendee references
++    //These are pointers into d->attendees, so we MUST NOT modify that vector after this point!
++    std::vector<Kolab::Attendee*> delegateesRef;
++    foreach(const Attendee &a, delegatees) {
++        Attendee *attendee = getAttendee(a.contact());
++        Q_ASSERT(attendee);
++        delegateesRef.push_back(attendee);
++    }
++
+     std::vector<Kolab::Attendee*> delegatorsRef;
+     foreach(const Attendee& a, delegators) {
+         if (Attendee *attendee = getAttendee(a.contact())) {
+-- 
+2.31.1
+

0002-Fixed-memory-leaks-in-tests.patch Added

@@ -0,0 +1,196 @@
+From 483b1019396296dfffa634abc80ddd19b61b9aa9 Mon Sep 17 00:00:00 2001
+From: Christoph Erhardt <kolab@sicherha.de>
+Date: Tue, 25 May 2021 09:01:44 +0200
+Subject: PATCH 2/2 Fixed memory leaks in tests
+
+toString requires the returned memory to be freed.
+
+Reviewers: mollekopf
+
+Reviewed By: mollekopf
+
+Subscribers: mollekopf
+
+Differential Revision: https://git.kolab.org/D2548
+---
+ tests/calendaringtest.cpp |  4 +-
+ tests/testhelpers.h       | 77 +++++++++++++++++++++++----------------
+ 2 files changed, 48 insertions(+), 33 deletions(-)
+
+diff --git a/tests/calendaringtest.cpp b/tests/calendaringtest.cpp
+index 44440dc..cc65605 100644
+--- a/tests/calendaringtest.cpp
++++ b/tests/calendaringtest.cpp
+@@ -110,7 +110,9 @@ void CalendaringTest::testRecurrence()
+     Kolab::cDateTime previousDate = event.start();
+     for (int i = 0; i < 9; i++) {
+         const Kolab::cDateTime nextDate = event.getNextOccurence(previousDate);
+-        qDebug() << QTest::toString(nextDate);
++        const char *nextDateString = QTest::toString(nextDate);
++        qDebug() << nextDateString;
++        delete nextDateString;
+         QCOMPARE(nextDate, Kolab::cDateTime("Europe/Zurich", previousDate.year(), previousDate.month(), previousDate.day()+1, previousDate.hour(), previousDate.minute(), previousDate.second()));
+         const Kolab::cDateTime endDate = event.getOccurenceEndDate(nextDate);
+ //         qDebug() << QTest::toString(endDate);
+diff --git a/tests/testhelpers.h b/tests/testhelpers.h
+index e09dd3a..8a443de 100644
+--- a/tests/testhelpers.h
++++ b/tests/testhelpers.h
+@@ -44,6 +44,19 @@ Q_DECLARE_METATYPE(KCalCore::Event);
+ Q_DECLARE_METATYPE(KCalCore::Todo);
+ Q_DECLARE_METATYPE(KCalCore::Journal);
+ 
++namespace {
++
++    // Appends a C string to a QByteArray and deletes the string argument.
++    // Returns a reference to the QByteArray.
++    QByteArray &append(QByteArray &ba, const char *string)
++    {
++        ba += QByteArray(string);
++        delete string;
++        return ba;
++    }
++
++}
++
+ namespace QTest {
+     
+     template<>
+@@ -123,7 +136,7 @@ namespace QTest {
+     {
+         QByteArray ba = "KCalCore::DateTimeList(";
+         foreach(const QDateTime &i, l) {
+-            ba += toString(i);
++            append(ba, toString(i));
+         }
+         ba += ")";
+         return qstrdup(ba.data());
+@@ -145,20 +158,20 @@ namespace QTest {
+             ba += QByteArray::number(r->recurrenceType()) + "\n";
+             ba += QByteArray::number(r->frequency()) + "\n";
+             ba += QByteArray::number(r->duration()) + "\n";
+-            ba += QByteArray(toString(r->startDt())) + "\n";
+-            ba += QByteArray(toString(r->endDt())) + "\n";
+-            ba += QByteArray(toString(r->bySeconds())) + "\n";
+-            ba += QByteArray(toString(r->byMinutes())) + "\n";
+-            ba += QByteArray(toString(r->byHours())) + "\n";
+-            ba += QByteArray(toString(r->byDays())) + "\n";
+-            ba += QByteArray(toString(r->byMonthDays())) + "\n";
+-            ba += QByteArray(toString(r->byYearDays())) + "\n";
+-            ba += QByteArray(toString(r->byMonths())) + "\n";
++            append(ba, toString(r->startDt())) += "\n";
++            append(ba, toString(r->endDt())) += "\n";
++            append(ba, toString(r->bySeconds())) += "\n";
++            append(ba, toString(r->byMinutes())) += "\n";
++            append(ba, toString(r->byHours())) += "\n";
++            append(ba, toString(r->byDays())) += "\n";
++            append(ba, toString(r->byMonthDays())) += "\n";
++            append(ba, toString(r->byYearDays())) += "\n";
++            append(ba, toString(r->byMonths())) += "\n";
+             ba += ")\n";
+-            ba += QByteArray(toString(at.exDates())) + "\n";
+-            ba += QByteArray(toString(at.exDateTimes())) + "\n";
+-            ba += QByteArray(toString(at.rDates())) + "\n";
+-            ba += QByteArray(toString(at.rDateTimes())) + "\n";
++            append(ba, toString(at.exDates())) += "\n";
++            append(ba, toString(at.exDateTimes())) += "\n";
++            append(ba, toString(at.rDates())) += "\n";
++            append(ba, toString(at.rDateTimes())) += "\n";
+ 
+         }
+         return qstrdup(ba.data());
+@@ -173,15 +186,15 @@ namespace QTest {
+         ba += QByteArray::number(at.frequency()) + "\n";
+         ba += QByteArray::number(at.interval()) + "\n";
+         ba += QByteArray::number(at.count()) + "\n";
+-        ba += QByteArray(toString(at.end())) + "\n";
+-        ba += QByteArray(toString(at.bysecond())) + "\n";
+-        ba += QByteArray(toString(at.byminute())) + "\n";
+-        ba += QByteArray(toString(at.byhour())) + "\n";
+-        ba += QByteArray(toString(at.byday())) + "\n";
+-        ba += QByteArray(toString(at.bymonthday())) + "\n";
+-        ba += QByteArray(toString(at.byyearday())) + "\n";
+-        ba += QByteArray(toString(at.byweekno())) + "\n";
+-        ba += QByteArray(toString(at.bymonth())) + "\n";
++        append(ba, toString(at.end())) += "\n";
++        append(ba, toString(at.bysecond())) += "\n";
++        append(ba, toString(at.byminute())) += "\n";
++        append(ba, toString(at.byhour())) += "\n";
++        append(ba, toString(at.byday())) += "\n";
++        append(ba, toString(at.bymonthday())) += "\n";
++        append(ba, toString(at.byyearday())) += "\n";
++        append(ba, toString(at.byweekno())) += "\n";
++        append(ba, toString(at.bymonth())) += "\n";
+         ba += ")";
+         return qstrdup(ba.data());
+     }
+@@ -213,7 +226,7 @@ namespace QTest {
+     {
+         QByteArray ba = "vector<Kolab::ContactReference>(";
+         for (std::size_t i = 0; i < v.size(); i++) {
+-                ba += QByteArray(toString(v.at(i)))+ "\n";
++                append(ba, toString(v.at(i))) += "\n";
+             }
+             ba += ")";
+             return qstrdup(ba.data());
+@@ -229,8 +242,8 @@ namespace QTest {
+         ba += QByteArray::number(a.role())  + "\n";
+         ba += QByteArray::number(a.rsvp())  + "\n";
+         ba += QByteArray::fromStdString(a.contact().uid())+"\n";
+-        ba += QByteArray(toString(a.delegatedTo()))+"\n";
+-        ba += QByteArray(toString(a.delegatedFrom()))+ "\n";
++        append(ba, toString(a.delegatedTo())) += "\n";
++        append(ba, toString(a.delegatedFrom())) += "\n";
+         ba += QByteArray::number(a.cutype())+ "\n";
+         ba += ")";
+         return qstrdup(ba.data());
+@@ -241,7 +254,7 @@ namespace QTest {
+     {
+         QByteArray ba = "vector<Kolab::Attendee>(";
+         for (std::size_t i = 0; i < v.size(); i++) {
+-            ba += QByteArray(toString(v.at(i)))+ "\n";
++            append(ba, toString(v.at(i))) += "\n";
+             ba += QByteArray("#######################")+ "\n";
+         }
+         ba += ")";
+@@ -263,7 +276,7 @@ namespace QTest {
+     {
+         QByteArray ba = "vector<Kolab::CustomProperty>(";
+         for (std::size_t i = 0; i < v.size(); i++) {
+-            ba += QByteArray(toString(v.at(i)))+ "\n";
++            append(ba, toString(v.at(i))) += "\n";
+         }
+         ba += ")";
+         return qstrdup(ba.data());
+@@ -273,8 +286,8 @@ namespace QTest {
+     char *toString(const Kolab::Period &p)
+     {
+         QByteArray ba = "Kolab::Period(";
+-        ba += QByteArray(toString(p.start))+ "\n";
+-        ba += QByteArray(toString(p.end))+ "\n";
++        append(ba, toString(p.start)) += "\n";
++        append(ba, toString(p.end)) += "\n";
+         ba += ")";
+         return qstrdup(ba.data());
+     }
+@@ -284,7 +297,7 @@ namespace QTest {
+     {
+         QByteArray ba = "vector<Kolab::Period>(";
+         for (std::size_t i = 0; i < v.size(); i++) {
+-            ba += QByteArray(toString(v.at(i)))+ "\n";
++            append(ba, toString(v.at(i))) += "\n";
+         }
+         ba += ")";
+         return qstrdup(ba.data());
+@@ -298,7 +311,7 @@ namespace QTest {
+         ba += QByteArray::fromStdString(p.eventUid())+ "\n";
+         ba += QByteArray::fromStdString(p.eventLocation())+ "\n";
+         ba += QByteArray::fromStdString(p.eventSummary())+ "\n";
+-        ba += QByteArray(toString(p.periods()))+ "\n";
++        append(ba, toString(p.periods())) += "\n";
+         ba += ")";
+         return qstrdup(ba.data());
+     }
+-- 
+2.31.1
+

libkolab-0.4.2-cmake-2.8.11.patch Added

debian.changelog Changed

debian.control Changed

@@ -6,30 +6,27 @@
 Build-Depends:
 	cmake,
 	debhelper,
-    dh-python,
 	libcurl4-gnutls-dev,
-	libkolabxml-dev (>= 1.3),
+	libboost-dev,
+	libboost-thread-dev,
+	libboost-system-dev,
+	libkolabxml-dev (>= 1.0),
 	libossp-uuid-dev,
-    libboost-dev,
-    libboost-system-dev,
-    libboost-thread-dev,
     qtbase5-dev,
     libkf5coreaddons-dev,
     libkf5calendarcore-dev,
     libkf5mime-dev,
 	libxerces-c-dev,
-	php-cgi,
-	php-dev,
+	php-cgi | php5-cli,
+	php-dev | php5-dev,
+	plesk-php70-dev | bash,
+	plesk-php71-dev | bash,
+	plesk-php72-dev | bash,
 	plesk-php73-dev | bash,
 	plesk-php74-dev | bash,
-	plesk-php80-dev | bash,
-	plesk-php81-dev | bash,
-	plesk-php82-dev | bash,
 	psa | bash,
-    python2-dev | python-dev | python3-dev,
-    python-minimal | python2-minimal | python3-minimal,
-    python3-all-dev,
-	swig4.0 (>= 4.1)
+	python-dev,
+	swig (>= 2.0)
 X-Python-Version: >= 2.7
 Standards-Version: 3.9.3
 Homepage: http://git.kolab.org/libkolab
@@ -49,6 +46,8 @@
                    Handles v2/v3 transparently.
   - conversion:    Conversions from KDE to Kolab containers and vice verca.
   - mime:          Mime message handling used by kolabformat
+  - icalendar:     Exposes iCalendar functionality:
+                   iCal reading/writing, iTip, iMip
   - calendaring:   Some general calendaring functions
  .
  The libkolab library belongs to the Kolab 3 server components.
@@ -64,22 +63,26 @@
 Provides: php-bindings-libkolab
 Conflicts: php-kolab-kde
 Description: PHP bindings for Kolab Library
- This package provides the Kolab PHP module calendaring.
+ This package provides the Kolab PHP modules icalendar and calendaring.
  .
   - The calendaring module provides some general calendaring functions
+  - The icalendar module exposes iCalendar functionality:
+    iCal reading/writing, iTip, iMip
 
-Package: python3-kolab
+Package: python-kolab
 Architecture: any
 Section: python
 Depends: libkolab3 (= ${binary:Version}),
-	${python3:Depends},
+	python,
 	${misc:Depends},
 	${shlibs:Depends}
 Conflicts: python-kolab-kde
 Description: Python bindings for Kolab Library
- This package provides the Kolab Python module calendaring.
+ This package provides the Kolab Python modules icalendar and calendaring.
  .
   - The calendaring module provides some general calendaring functions
+  - The icalendar module exposes iCalendar functionality:
+    iCal reading/writing, iTip, iMip
 
 Package: libkolab-dev
 Section: libdevel

debian.rules Changed

@@ -4,8 +4,9 @@
 PHPBIN := $(shell php-config --php-binary)
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
+PYTHON_SITEARCH := $(shell python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')
 
-PHP_VERSIONS=8.2 8.1 8.0 7.4 7.3
+PHP_VERSIONS=7.4 7.3 7.2 7.1 7.0 5.6
 
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
@@ -13,11 +14,7 @@
 export DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed"
 
 %:
-	if  -f /usr/bin/python  ; then \
-        dh $@ --parallel --with python2,python3 --buildsystem=pybuild ; \
-    else \
-        dh $@ --parallel --with python3 --buildsystem=pybuild ; \
-    fi
+	dh $@ --parallel --with python2
 
 override_dh_gencontrol:
 	echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolab.substvars
@@ -38,25 +35,14 @@
 			sed -i -e "/Files:/ i\
  plesk-php$${shver}-kolab deb web extra" debian/control ; \
 			echo "opt/plesk/php/$${version}/lib/php/modules/*.so" >> debian/plesk-php$${shver}-kolab.install ; \
+			echo "opt/plesk/php/$${version}/share/php/kolab.php" >> debian/plesk-php$${shver}-kolab.install ; \
 			echo "debian/kolab.ini opt/plesk/php/$${version}/etc/php.d" > debian/plesk-php$${shver}-kolab.install ; \
 		done ; \
 	fi
 
-	if  -f /usr/bin/python  ; then \
-        echo "" >> debian/control ; \
-        echo "Package: python-kolab" >> debian/control ; \
-        echo "Architecture: any" >> debian/control ; \
-        echo "Section: python" >> debian/control ; \
-        echo "Depends: libkolab3 (= ${binary:Version}), {python:Depends}, ${misc:Depends}, ${shlibs:Depends}" >> debian/control ; \
-        echo "Conflicts: python-kolab-kde" >> debian/control ; \
-        echo "Description: Python bindings for Kolab library." >> debian/control ; \
-        echo "" >> debian/control ; \
-    fi
-
 	dh_gencontrol
 
 override_dh_auto_build:
-	# Build plesk php versions
 	if  -f /etc/plesk-release  ; then \
 		for version in $(PHP_VERSIONS) ; do \
 			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
@@ -67,26 +53,32 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
 			fi ; \
-			dh_auto_build --buildsystem cmake --builddirectory php-$${version} ; \
+			dh_auto_build --builddirectory php-$${version} ; \
 		done ; \
 	fi
 
-	dh_auto_build --buildsystem cmake --builddirectory php-vanilla
+	if  $$(php-config --vernum) -gt 70000 ; then \
+		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
+	else \
+		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
+	fi
 
-	# Build python versions via pybuild
 	dh_auto_build
 
 override_dh_auto_configure:
-	echo 9 > debian/compat
-	# Configure plesk php version
 	if  -f /etc/plesk-release  ; then \
 		for version in $(PHP_VERSIONS) ; do \
 			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
 				continue ; \
 			fi ; \
-			dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- \
+			if  $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \
+				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
+			else \
+				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
+			fi ; \
+			dh_auto_configure --builddirectory php-$${version} -- \
 				-DLIB_INSTALL_DIR=/usr/lib \
-                -DBoost_NO_BOOST_CMAKE=ON \
+                -DBoost_NO_BOOST_CMAKE=TRUE \
 				-DSWIG=/usr/bin/swig \
 				-DPHP_BINDINGS=ON \
 				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
@@ -97,58 +89,65 @@
 		done ; \
 	fi
 
-	dh_auto_configure --buildsystem cmake --builddirectory php-vanilla -- \
+	if  $$(php-config --vernum) -gt 70000 ; then \
+		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
+	else \
+		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
+	fi
+
+	dh_auto_configure -- \
 		-DLIB_INSTALL_DIR=/usr/lib \
-		-DBoost_NO_BOOST_CMAKE=ON \
-	    -DSWIG=/usr/bin/swig \
-	    -DPHP_BINDINGS=ON \
+        -DBoost_NO_BOOST_CMAKE=TRUE \
+		-DPHP_BINDINGS=ON \
 		-DPHP_INSTALL_DIR=$(PHPEXT) \
 		-DPHP_EXECUTABLE=$(PHPBIN) \
-		-DPHP_INCLUDE_DIR=$(PHPINC)
-
-	# Configure python builds via pybuild
-	dh_auto_configure -- --configure-args \
-		"-DLIB_INSTALL_DIR=/usr/lib \
-        -DBoost_NO_BOOST_CMAKE=ON \
+		-DPHP_INCLUDE_DIR=$(PHPINC) \
 		-DPYTHON_BINDINGS=ON \
-		-DPYTHON_INSTALL_DIR={install_dir}"
+		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH)
 
 override_dh_install:
 	# 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
-	make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/
+	mv debian/tmp/$(PHPEXT)/*.php debian/tmp/usr/share/php/.
 	echo "$(PHPEXT)" >> debian/php-kolab.install
 
 	# Put kolab.ini into place
-	if  -d "/etc/php/8.2/mods-available" ; then \
-		echo "debian/kolab.ini etc/php/8.2/mods-available" >> debian/php-kolab.install ; \
-	elif  -d "/etc/php/8.1/mods-available" ; then \
-		echo "debian/kolab.ini etc/php/8.1/mods-available" >> debian/php-kolab.install ; \
-	elif  -d "/etc/php/8.0/mods-available" ; then \
-		echo "debian/kolab.ini etc/php/8.0/mods-available" >> debian/php-kolab.install ; \
-	elif  -d "/etc/php/7.4/mods-available" ; then \
+	if  -d "/etc/php/7.4/mods-available" ; then \
 		echo "debian/kolab.ini etc/php/7.4/mods-available" >> debian/php-kolab.install ; \
 	elif  -d "/etc/php/7.3/mods-available" ; then \
 		echo "debian/kolab.ini etc/php/7.3/mods-available" >> debian/php-kolab.install ; \
-	else \
+	elif  -d "/etc/php/7.2/mods-available" ; then \
+		echo "debian/kolab.ini etc/php/7.2/mods-available" >> debian/php-kolab.install ; \
+	elif  -d "/etc/php/7.1/mods-available" ; then \
+		echo "debian/kolab.ini etc/php/7.1/mods-available" >> debian/php-kolab.install ; \
+	elif  -d "/etc/php/7.0/mods-available" ; then \
+		echo "debian/kolab.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 ; \
+	else \
+		echo "debian/kolab.ini etc/php5/mods-available" >> debian/php-kolab.install ; \
 	fi
 
-	for i in debian/tmp/usr/lib/python*/dist-packages/kolab ; do \
-		touch $${i}/__init__.py; \
-	done
+	touch debian/tmp/$(PYTHON_SITEARCH)/kolab/__init__.py
 
 	if  -f /etc/plesk-release ; then \
 		for version in $(PHP_VERSIONS) ; do \
 			if  ! -f "/opt/plesk/php/$${version}/bin/php-config" ; then \
 				continue ; \
 			fi ; \
+			if  $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \
+				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
+			else \
+				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
+			fi ; \
 			shver=$$(echo $${version} | sed -e 's/\.//g') ; \
 			make -C php-$${version} install DESTDIR=$(PWD)/debian/plesk-php$${shver}-kolab/ ; \
 			mkdir -p debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/etc/php.d/ ; \
 			mkdir -p debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/ ; \
 			cp -a debian/kolab.ini debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/etc/php.d/ ; \
+			mv debian/plesk-php$${shver}-kolab$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolab*.php \
+				debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/. ; \
 			rm -rf debian/plesk-php$${shver}-kolab/usr/ ; \
 		done ; \
 	fi

debian.series Changed

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

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

debian.tar.gz/python-kolab.install Changed

debian.tar.gz/python3-kolab.install Deleted

libkolab-3.2.0.tar.gz/CMakeLists.txt -> libkolab-3.0.0.tar.gz/CMakeLists.txt Changed

@@ -30,7 +30,7 @@
 # 0.1.1 (patch release for 0.1.0)
 # 0.2 (0.2 development version towards 0.2.0)
 set(Libkolab_VERSION_MAJOR 3)
-set(Libkolab_VERSION_MINOR 2)
+set(Libkolab_VERSION_MINOR 0)
 # Enable the full x.y.z version only for release versions
 set(Libkolab_VERSION_PATCH 0)
 #set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH})
@@ -54,9 +54,7 @@
 include(MacroLogFeature)
 
 find_package(Qt5 REQUIRED Core Xml)
-# FIXME: Seems to be required for libkolabxml, but should be fixed in libkolabxml
-set(Boost_USE_MULTITHREADED ON)
-find_package(Boost REQUIRED COMPONENTS thread system)
+
 
 # Do the building
 find_package(Libkolabxml 1.1.1 REQUIRED)
@@ -71,11 +69,8 @@
 
 include(FindPackageHandleStandardArgs)
 
-find_package(KF5CalendarCore "5.9.3" CONFIG REQUIRED)
-if (KF5CalendarCore_VERSION VERSION_LESS "5.12.1")
-    message("Building with legacy kcalcore")
-    add_definitions(-DLEGACY_KCALCORE=1)
-endif()
+find_package(KF5CoreAddons CONFIG REQUIRED)
+find_package(KF5CalendarCore "5.12.1" CONFIG REQUIRED)
 find_package(KF5Mime "4.84.0" CONFIG REQUIRED)
 
 find_package(SWIG)

libkolab-3.2.0.tar.gz/calendaring/calendaring.cpp -> libkolab-3.0.0.tar.gz/calendaring/calendaring.cpp Changed

libkolab-3.2.0.tar.gz/calendaring/calendaring.h -> libkolab-3.0.0.tar.gz/calendaring/calendaring.h Changed

libkolab-3.2.0.tar.gz/calendaring/calendaring.i -> libkolab-3.0.0.tar.gz/calendaring/calendaring.i Changed

libkolab-3.2.0.tar.gz/calendaring/event.cpp -> libkolab-3.0.0.tar.gz/calendaring/event.cpp Changed

@@ -19,19 +19,14 @@
 #include "event.h"
 
 #include <QDebug>
-#include <QTimeZone>
 
 #include <conversion/kcalconversion.h>
 #include <conversion/commonconversion.h>
-#include <kcalcore/memorycalendar.h>
-#include <kcalcore/icalformat.h>
 
 #include <iostream>
 #include <kolabformat.h>
 #include <kolabevent_p.h>
 
-#include "libkolab-version.h"
-
 
 namespace Kolab {
     namespace Calendaring {
@@ -81,22 +76,17 @@
 void Event::delegate(const std::vector< Attendee >& delegators, const std::vector< Attendee >& delegatees)
 {
 
-    //First insert any missing attendees
+    //First build a list of attendee references, and insert any missing attendees
+    std::vector<Kolab::Attendee*> delegateesRef;
     foreach(const Attendee &a, delegatees) {
-        if (!getAttendee(a.contact())) {
+        if (Attendee *attendee = getAttendee(a.contact())) {
+            delegateesRef.push_back(attendee);
+        } else {
             d->attendees.push_back(a);
+            delegateesRef.push_back(&d->attendees.back());
         }
     }
 
-    //Build a list of attendee references
-    //These are pointers into d->attendees, so we MUST NOT modify that vector after this point!
-    std::vector<Kolab::Attendee*> delegateesRef;
-    foreach(const Attendee &a, delegatees) {
-        Attendee *attendee = getAttendee(a.contact());
-        Q_ASSERT(attendee);
-        delegateesRef.push_back(attendee);
-    }
-
     std::vector<Kolab::Attendee*> delegatorsRef;
     foreach(const Attendee& a, delegators) {
         if (Attendee *attendee = getAttendee(a.contact())) {
@@ -154,10 +144,12 @@
 cDateTime Calendaring::Event::getNextOccurence(const cDateTime &date)
 {
     KCalCore::Event::Ptr event = Kolab::Conversion::toKCalCore(*this);
+    qWarning() << "Converted start " << event->dtStart() << Kolab::Conversion::toDate(date);
     if (!event->recurs()) {
         return cDateTime();
     }
     const QDateTime nextDate = event->recurrence()->getNextDateTime(Kolab::Conversion::toDate(date));
+    qWarning() << "Next date " << nextDate;
     return Kolab::Conversion::fromDate(nextDate);
 }
 
@@ -179,80 +171,6 @@
     return Kolab::Conversion::fromDate(endDate);
 }
 
-static std::vector< Kolab::Event > fromICalEvents(const std::string &input)
-{
-    KCalCore::Calendar::Ptr calendar(new KCalCore::MemoryCalendar(QTimeZone::utc()));
-    KCalCore::ICalFormat format;
-    format.setApplication("libkolab", LIBKOLAB_LIB_VERSION_STRING);
-    format.fromString(calendar, Conversion::fromStdString(input));
-    std::vector<Kolab::Event> events;
-    QMap< QString, int > uidMap;
-    foreach (const KCalCore::Event::Ptr &event, calendar->events()) {
-        Kolab::Event e = Conversion::fromKCalCore(*event);
-        if (!e.recurrenceID().isValid()) {
-            if (uidMap.contains(event->uid())) {
-                e.setExceptions(events.at(uidMapevent->uid()).exceptions());
-                eventsuidMapevent->uid() = e;
-            } else {
-                events.push_back(e);
-                uidMap.insert(event->uid(), events.size()-1);
-            }
-        } else {
-            if (!uidMap.contains(event->uid())) {
-                Kolab::Event e;
-                e.setUid("");
-                events.push_back(e);
-                uidMap.insert(event->uid(), events.size()-1);
-            }
-            std::vector<Kolab::Event> exceptions = events.at( uidMapevent->uid()).exceptions();
-            exceptions.push_back(e);
-            events.at(uidMapevent->uid()).setExceptions(exceptions);
-        }
-    }
-    return events;
-}
-
-static std::string eventsToICal(const std::vector<Kolab::Event> &events)
-{
-    KCalCore::Calendar::Ptr calendar(new KCalCore::MemoryCalendar(QTimeZone::utc()));
-    foreach (const Kolab::Event &event, events) {
-        KCalCore::Event::Ptr kcalEvent = Conversion::toKCalCore(event);
-        if (!kcalEvent->created().isValid()) {
-            kcalEvent->setCreated(QDateTime::currentDateTime()); //sets dtstamp
-        }
-        calendar->addEvent(kcalEvent);
-        foreach(const Kolab::Event &exception, event.exceptions()) {
-            KCalCore::Event::Ptr kcalException = Conversion::toKCalCore(exception);
-            if (!kcalException->created().isValid()) {
-                kcalException->setCreated(QDateTime::currentDateTime()); //sets dtstamp
-            }
-            calendar->addEvent(kcalException);
-        }
-    }
-    KCalCore::ICalFormat format;
-    format.setApplication("libkolab", LIBKOLAB_LIB_VERSION_STRING);
-//     qDebug() << format.createScheduleMessage(calendar->events().first(), KCalCore::iTIPRequest);
-    return Conversion::toStdString(format.toString(calendar));
-
-}
-
-std::string Event::toICal() const
-{
-    std::vector<Kolab::Event> list;
-    list.push_back(*this);
-    return eventsToICal(list);
-}
-
-bool Event::fromICal(const std::string &input)
-{
-    std::vector<Kolab::Event> list = fromICalEvents(input);
-    if (list.size() != 1) {
-        std::cout << "invalid number of events: " << list.size();
-        return false;
-    }
-    Kolab::Event::operator=(list.at(0));
-    return true;
-}
 
     };
 };

libkolab-3.2.0.tar.gz/calendaring/event.h -> libkolab-3.0.0.tar.gz/calendaring/event.h Changed

libkolab-3.2.0.tar.gz/cmake/modules/SWIGUtils.cmake -> libkolab-3.0.0.tar.gz/cmake/modules/SWIGUtils.cmake Changed

@@ -3,10 +3,8 @@
 macro (generatePHPBindings MODULE_NAME INTERFACE_FILE)
 
     set(KOLAB_SWIG_PHP_SOURCE_FILE php_${MODULE_NAME}_wrapper.cpp)
-    #Set to php7 or php5 to force use of the non-default php version
-    set(SWIG_PHP_VERSION php)
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE}
-        COMMAND ${SWIG} -v -c++ -${SWIG_PHP_VERSION} -I${Libkolabxml_INCLUDES} -module ${MODULE_NAME} -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${INTERFACE_FILE}
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.php
+        COMMAND ${SWIG} -v -c++ -php -I${Libkolabxml_INCLUDES} -module ${MODULE_NAME} -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${INTERFACE_FILE}
         COMMENT "Generating php bindings"
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         DEPENDS ${INTERFACE_FILE} kolab
@@ -69,6 +67,11 @@
         #     configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
 
         install(TARGETS ${MODULE_NAME}_phpbindings LIBRARY DESTINATION ${PHP_INSTALL_DIR})
+        install(FILES
+            ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.php
+            DESTINATION ${PHP_INSTALL_DIR}
+            )
+
     else()
         message(WARNING "not building php bindings because php was not found")
     endif()

libkolab-3.2.0.tar.gz/conversion/commonconversion.cpp -> libkolab-3.0.0.tar.gz/conversion/commonconversion.cpp Changed

@@ -64,14 +64,18 @@
     date.setDate(QDate(dt.year(), dt.month(), dt.day()));
     date.setTime(QTime(dt.hour(), dt.minute(), dt.second()));
     if (dt.isUTC()) {
+        qWarning() << "Converting utc";
         date.setTimeSpec(Qt::UTC);
         // date.setTimeZone(QTimeZone::utc());
     } else if (!dt.timezone().empty()) {
+        qWarning() << "Converting timezone";
         date.setTimeZone(getTimeSpec(dt.timezone()));
     } else {
+        qWarning() << "Converting localtime";
         date.setTimeSpec(Qt::LocalTime);
         //We apparently can't have what used to be called floating time, so set the timezone to utc.
         // date.setTimeZone(QTimeZone::utc());
+        qWarning() << "Converting localtime" << date.timeZone();
     }
     // Q_ASSERT(date.timeSpec().isValid());
     Q_ASSERT(date.isValid());
@@ -80,12 +84,15 @@
 
 cDateTime fromDate(const QDateTime &dt)
 {
+    qWarning() << dt;
     if (!dt.isValid()) {
         //         qDebug() << "invalid datetime converted";
         return cDateTime();
     }
+    qWarning() << "From " << dt;
     cDateTime date;
     if (!dt.time().isValid()) { //Date only
+        qWarning() << "invalid datetime";
         const QDate &d = dt.date();
         date.setDate(d.year(), d.month(), d.day());
     } else {
@@ -95,6 +102,7 @@
         date.setTime(t.hour(), t.minute(), t.second());
         if (dt.timeSpec() == Qt::UTC) { //UTC
             date.setUTC(true);
+            qWarning() << "From utc";
         } else if (dt.timeSpec() == Qt::OffsetFromUTC) {
             const QDateTime utcDate = dt.toUTC();
             const QDate &d = utcDate.date();
@@ -103,6 +111,7 @@
             date.setTime(t.hour(), t.minute(), t.second());
             date.setUTC(true);
         } else if (dt.timeSpec() == Qt::TimeZone) { //Timezone
+            qWarning() << "From timezone";
             //Not actually a timezone
             // if (dt.timeZone().id().toLower() == "utc") {
             //     date.setUTC(true);
@@ -117,6 +126,7 @@
                 }
             // }
         } else if (dt.timeSpec() != Qt::LocalTime) {
+            qWarning() << "From localtime";
             Error() << "invalid timespec, assuming floating time. Type: " << dt.timeSpec() << "dt: " << dt.toString();
             return date;
         }
@@ -164,8 +174,10 @@
 
 QPair<std::string, std::string> fromMailto(const std::string &mailto)
 {
+    qWarning() << "fromMailto" << mailto;
     const std::string &decoded = toStdString(QUrl::fromPercentEncoding(QByteArray(mailto.c_str())));
 
+    qWarning() << "fromMailto decoded" << decoded;
     if (decoded.substr(0, 7).compare("mailto:")) {
         // WARNING("no mailto address");
         // std::cout << decoded << std::endl;

libkolab-3.2.0.tar.gz/conversion/kcalconversion.cpp -> libkolab-3.0.0.tar.gz/conversion/kcalconversion.cpp Changed

@@ -277,6 +277,7 @@
 
     if (e.start().isValid()) {
 
+        qWarning() << "Setting start" << toDate(e.start());
         i.setDtStart(toDate(e.start()));
         if (e.start().isDateOnly()) {
             i.setAllDay(true);
@@ -293,33 +294,7 @@
          * Since that means the semantics of the two are different, we have to store the kolab uid as a custom property.
          */
         // QUrl::fromPercentEncoding(
-#ifdef LEGACY_KCALCORE
-        KCalCore::Attendee::Ptr attendee = KCalCore::Attendee::Ptr(new KCalCore::Attendee(fromStdString(a.contact().name()),
-                                                                                          fromStdString(a.contact().email()),
-                                                                                          a.rsvp(),
-                                                                                          toPartStat(a.partStat()),
-                                                                                          toRole(a.role()) ));
-        if (!a.contact().uid().empty()) { //TODO Identify contact from addressbook based on uid
-            attendee->customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID, fromStdString(a.contact().uid()));
-        }
-        if (!a.delegatedTo().empty()) {
-            if (a.delegatedTo().size() > 1) {
-                WARNING("multiple delegatees are not supported");
-            }
-
-            attendee->setDelegate(toMailto(a.delegatedTo().front().email(), a.delegatedTo().front().name()).toString());
-        }
-        if (!a.delegatedFrom().empty()) {
-            if (a.delegatedFrom().size() > 1) {
-                WARNING("multiple delegators are not supported");
-            }
-            attendee->setDelegator(toMailto(a.delegatedFrom().front().email(), a.delegatedFrom().front().name()).toString());
-        }
-        if (a.cutype() != CutypeIndividual) {
-            attendee->customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE, QString::number(a.cutype()));
-        }
-        i.addAttendee(attendee);
-#else
+        qWarning() << "Name " << fromStdString(a.contact().name()) << " EMail " << fromStdString(a.contact().email());
         KCalCore::Attendee attendee(fromStdString(a.contact().name()),
                                     fromStdString(a.contact().email()),
                                     a.rsvp(),
@@ -333,33 +308,23 @@
                 WARNING("multiple delegatees are not supported");
             }
 
+            qWarning() << "delegated from " << toMailto(a.delegatedTo().front().email(), a.delegatedTo().front().name()).toString();
             attendee.setDelegate(toMailto(a.delegatedTo().front().email(), a.delegatedTo().front().name()).toString());
         }
         if (!a.delegatedFrom().empty()) {
             if (a.delegatedFrom().size() > 1) {
                 WARNING("multiple delegators are not supported");
             }
+            qWarning() << "delegator from " << toMailto(a.delegatedFrom().front().email(), a.delegatedFrom().front().name()).toString();
             attendee.setDelegator(toMailto(a.delegatedFrom().front().email(), a.delegatedFrom().front().name()).toString());
         }
         if (a.cutype() != CutypeIndividual) {
             attendee.customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE, QString::number(a.cutype()));
         }
+        // qWarning() << attendee;
         i.addAttendee(attendee);
-#endif
     }
     foreach (const Kolab::Attachment a, e.attachments()) {
-#ifdef LEGACY_KCALCORE
-        KCalCore::Attachment::Ptr ptr;
-        if (!a.uri().empty()) {
-            ptr = KCalCore::Attachment::Ptr(new KCalCore::Attachment(fromStdString(a.uri()), fromStdString(a.mimetype())));
-        } else {
-            ptr = KCalCore::Attachment::Ptr(new KCalCore::Attachment(QByteArray::fromRawData(a.data().c_str(), a.data().size()).toBase64(), fromStdString(a.mimetype())));
-        }
-        if (!a.label().empty()) {
-            ptr->setLabel(fromStdString(a.label()));
-        }
-        i.addAttachment(ptr);
-#else
         KCalCore::Attachment ptr;
         if (!a.uri().empty()) {
             ptr = KCalCore::Attachment(fromStdString(a.uri()), fromStdString(a.mimetype()));
@@ -370,7 +335,6 @@
             ptr.setLabel(fromStdString(a.label()));
         }
         i.addAttachment(ptr);
-#endif
     }
 
     QMap<QByteArray, QString> props;
@@ -401,31 +365,6 @@
     i.setDescription(toStdString(e.description()));
     i.setStatus(fromStatus(e.status()));
     std::vector<Kolab::Attendee> attendees;
-#ifdef LEGACY_KCALCORE
-    foreach (const KCalCore::Attendee::Ptr attendee, e.attendees()) {
-        const QString &uid = attendee->customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID);
-        Kolab::Attendee a(Kolab::ContactReference(toStdString(attendee->email()), toStdString(attendee->name()), toStdString(uid)));
-        a.setRSVP(attendee->RSVP());
-        a.setPartStat(fromPartStat(attendee->status()));
-        a.setRole(fromRole(attendee->role()));
-        if (!attendee->delegate().isEmpty()) {
-            std::string name;
-            const std::string &email = fromMailto(QUrl(attendee->delegate()), name);
-            a.setDelegatedTo(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name));
-        }
-        if (!attendee->delegator().isEmpty()) {
-            std::string name;
-            const std::string &email = fromMailto(QUrl(attendee->delegator()), name);
-            a.setDelegatedFrom(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name));
-        }
-        const QString &cutype = attendee->customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE);
-        if (!cutype.isEmpty()) {
-            a.setCutype(static_cast<Kolab::Cutype>(cutype.toInt()));
-        }
-        
-        attendees.push_back(a);
-    }
-#else
     foreach (const KCalCore::Attendee attendee, e.attendees()) {
         const QString &uid = attendee.customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID);
         Kolab::Attendee a(Kolab::ContactReference(toStdString(attendee.email()), toStdString(attendee.name()), toStdString(uid)));
@@ -435,11 +374,13 @@
         if (!attendee.delegate().isEmpty()) {
             std::string name;
             const std::string &email = fromMailto(QUrl(attendee.delegate()), name);
+            qWarning() << "delegate Email " << email << " EMail " << name << attendee.delegate();
             a.setDelegatedTo(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name));
         }
         if (!attendee.delegator().isEmpty()) {
             std::string name;
             const std::string &email = fromMailto(QUrl(attendee.delegator()), name);
+            qWarning() << "delegated from " << email << " EMail " << name << attendee.delegator();
             a.setDelegatedFrom(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name));
         }
         const QString &cutype = attendee.customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE);
@@ -449,21 +390,8 @@
         
         attendees.push_back(a);
     }
-#endif
     i.setAttendees(attendees);
     std::vector<Kolab::Attachment> attachments;
-#ifdef LEGACY_KCALCORE
-    foreach (const KCalCore::Attachment::Ptr &ptr, e.attachments()) {
-        Kolab::Attachment a;
-        if (ptr->isUri()) {
-            a.setUri(toStdString(ptr->uri()), toStdString(ptr->mimeType()));
-        } else {
-            a.setData(std::string(ptr->decodedData().data(), ptr->decodedData().size()), toStdString(ptr->mimeType()));
-        }
-        a.setLabel(toStdString(ptr->label()));
-        attachments.push_back(a);
-    }
-#else
     foreach (const KCalCore::Attachment &ptr, e.attachments()) {
         Kolab::Attachment a;
         if (ptr.isUri()) {
@@ -474,7 +402,6 @@
         a.setLabel(toStdString(ptr.label()));
         attachments.push_back(a);
     }
-#endif
     i.setAttachments(attachments);
 
     std::vector<Kolab::CustomProperty> customProperties;
@@ -617,6 +544,7 @@
         
         if (rrule.end().isValid()) {
             rec->setEndDateTime(toDate(rrule.end())); //TODO date/datetime setEndDate(). With date-only the start date has to be taken into account.
+            qWarning() << "Set end date time" << toDate(rrule.end());
         } else {
             rec->setDuration(rrule.count());
         }
@@ -741,11 +669,7 @@
         i.setLocation(fromStdString(e.location())); //TODO detect richtext
     }
     if (e.organizer().isValid()) {
-#ifdef LEGACY_KCALCORE
-        i.setOrganizer(KCalCore::Person::Ptr(new KCalCore::Person(fromStdString(e.organizer().name()), fromStdString(e.organizer().email())))); //TODO handle uid too
-#else
         i.setOrganizer(KCalCore::Person(fromStdString(e.organizer().name()), fromStdString(e.organizer().email()))); //TODO handle uid too
-#endif
     }
     if (!e.url().empty()) {
         i.setNonKDECustomProperty(CUSTOM_KOLAB_URL, fromStdString(e.url()));
@@ -761,11 +685,7 @@
             case Kolab::Alarm::EMailAlarm: {
                 KCalCore::Person::List receipents;
                 foreach (Kolab::ContactReference c ,a.attendees()) {
-#ifdef LEGACY_KCALCORE
-                    KCalCore::Person::Ptr person = KCalCore::Person::Ptr(new KCalCore::Person(fromStdString(c.name()), fromStdString(c.email())));
-#else
                     KCalCore::Person person(fromStdString(c.name()), fromStdString(c.email()));
-#endif
                     receipents.append(person);
                 }
                 alarm->setEmailAlarm(fromStdString(a.summary()), fromStdString(a.description()), receipents);
@@ -803,15 +723,9 @@
 {
     i.setPriority(fromPriority(e.priority()));
     i.setLocation(toStdString(e.location()));
-#ifdef LEGACY_KCALCORE
-    if (!e.organizer()->email().isEmpty()) {
-        i.setOrganizer(Kolab::ContactReference(Kolab::ContactReference::EmailReference, toStdString(e.organizer()->email()), toStdString(e.organizer()->name()))); //TODO handle uid too
-    }
-#else
     if (!e.organizer().email().isEmpty()) {
         i.setOrganizer(Kolab::ContactReference(Kolab::ContactReference::EmailReference, toStdString(e.organizer().email()), toStdString(e.organizer().name()))); //TODO handle uid too
     }
-#endif
     i.setUrl(toStdString(e.nonKDECustomProperty(CUSTOM_KOLAB_URL)));
     i.setRecurrenceID(fromDate(e.recurrenceId()), e.thisAndFuture());
     getRecurrence(i, e);
@@ -830,15 +744,9 @@
                 break;
             case KCalCore::Alarm::Email: {
                 std::vector<Kolab::ContactReference> receipents;
-#ifdef LEGACY_KCALCORE
-                foreach(const KCalCore::Person::Ptr &p, a->mailAddresses()) {
-                    receipents.push_back(Kolab::ContactReference(toStdString(p->email()), toStdString(p->name())));
-                }
-#else
                 foreach(const KCalCore::Person &p, a->mailAddresses()) {
                     receipents.push_back(Kolab::ContactReference(toStdString(p.email()), toStdString(p.name())));
                 }
-#endif
                 alarm = Kolab::Alarm(toStdString(a->mailSubject()), toStdString(a->mailText()), receipents);
             }
                 break;

libkolab-3.2.0.tar.gz/tests/calendaringtest.cpp -> libkolab-3.0.0.tar.gz/tests/calendaringtest.cpp Changed

@@ -110,9 +110,7 @@
     Kolab::cDateTime previousDate = event.start();
     for (int i = 0; i < 9; i++) {
         const Kolab::cDateTime nextDate = event.getNextOccurence(previousDate);
-        const char *nextDateString = QTest::toString(nextDate);
-        qDebug() << nextDateString;
-        delete nextDateString;
+        qDebug() << QTest::toString(nextDate);
         QCOMPARE(nextDate, Kolab::cDateTime("Europe/Zurich", previousDate.year(), previousDate.month(), previousDate.day()+1, previousDate.hour(), previousDate.minute(), previousDate.second()));
         const Kolab::cDateTime endDate = event.getOccurenceEndDate(nextDate);
 //         qDebug() << QTest::toString(endDate);
@@ -130,28 +128,6 @@
     std::cout << Kolab::DateTimeUtils::getLocalTimezone() << std::endl;
 }
 
-void CalendaringTest::testICal()
-{
-    Kolab::Calendaring::Event event;
-    event.setStart(Kolab::cDateTime("Europe/Zurich",2012,5,5,3,4,4));
-    const std::string &result = event.toICal();
-    //TODO write an actual test
-    event.setStart(Kolab::cDateTime(1,1,1));
-    event.fromICal(result);
-    QCOMPARE(event.start(), Kolab::cDateTime("Europe/Zurich",2012,5,5,3,4,4));
-}
-
-
-void CalendaringTest::testParseICal()
-{
-    QFile icalFile( getPath("v3/event/simple.ics") );
-    QVERIFY( icalFile.open( QFile::ReadOnly ) );
-    Kolab::Calendaring::Event event;
-    event.fromICal(icalFile.readAll().constData());
-    QCOMPARE(event.start(), Kolab::cDateTime("Europe/Berlin", 2009, 9, 2, 8, 0, 0));
-}
-
-
 QTEST_MAIN( CalendaringTest )
 
 #include "calendaringtest.moc"

libkolab-3.2.0.tar.gz/tests/calendaringtest.h -> libkolab-3.0.0.tar.gz/tests/calendaringtest.h Changed

libkolab-3.2.0.tar.gz/tests/kcalconversiontest.cpp -> libkolab-3.0.0.tar.gz/tests/kcalconversiontest.cpp Changed

@@ -50,7 +50,6 @@
 void compareAttendeesVectors(const KCalCore::Attendee::List &list, const KCalCore::Attendee::List &other)
 {
     QCOMPARE(list.size(), other.size());
-#ifndef LEGACY_KCALCORE
     for (int i = 0 ; i < list.size(); i++) {
         KCalCore::Attendee at1 = list.at(i);
         at1.setUid(QString());
@@ -58,7 +57,6 @@
         at2.setUid(QString());
         QCOMPARE(at1, at2);
     }
-#endif
 }
 
 void KCalConversionTest::initTestCase()
@@ -194,25 +192,19 @@
         kcal.setPriority(3);
         kcal.setStatus(KCalCore::Incidence::StatusConfirmed);
         kcal.setLocation("location");
-#ifndef LEGACY_KCALCORE
         kcal.setOrganizer(KCalCore::Person("organizer", "organizer@email"));
-#endif
         //Url
         kcal.setNonKDECustomProperty("X-KOLAB-URL", "http://test.org");
-#ifndef LEGACY_KCALCORE
         KCalCore::Attendee att("attendee", "attendee@email", false, KCalCore::Attendee::NeedsAction, KCalCore::Attendee::ReqParticipant);
         att.setDelegate("mailto:delegatee<delegatee@email>");
         att.setDelegator("mailto:delegator<delegator@email>");
         kcal.addAttendee(att);
         kcal.addAttachment(KCalCore::Attachment(QString("uri"), "mimetype/mime"));
-#endif
-#ifndef LEGACY_KCALCORE
         KCalCore::Alarm::Ptr alarm = KCalCore::Alarm::Ptr(new KCalCore::Alarm(&kcal));    
         KCalCore::Person::List addressees;
         addressees.append(KCalCore::Person("name", "email@email"));
         alarm->setEmailAlarm("subject", "text", addressees, QStringList()); //No support for attachments
         kcal.addAlarm(alarm);
-#endif
         //TODO alarms
 
         kcal.setNonKDECustomProperty("X-KOLAB-key1", "value1");
@@ -396,10 +388,8 @@
     QCOMPARE(e->priority(), kcal.priority());
     QCOMPARE(e->status(), kcal.status());
     QCOMPARE(e->location(), kcal.location());
-#ifndef LEGACY_KCALCORE
     QCOMPARE(e->organizer().name(), kcal.organizer().name());
     QCOMPARE(e->organizer().email(), kcal.organizer().email());
-#endif
     QCOMPARE(e->nonKDECustomProperty("X-KOLAB-URL"), kcal.nonKDECustomProperty("X-KOLAB-URL"));
     //otherwise we'd break the customProperties comparison
     e->removeNonKDECustomProperty("X-KOLAB-URL");

libkolab-3.2.0.tar.gz/tests/testhelpers.h -> libkolab-3.0.0.tar.gz/tests/testhelpers.h Changed

@@ -44,19 +44,6 @@
 Q_DECLARE_METATYPE(KCalCore::Todo);
 Q_DECLARE_METATYPE(KCalCore::Journal);
 
-namespace {
-
-    // Appends a C string to a QByteArray and deletes the string argument.
-    // Returns a reference to the QByteArray.
-    QByteArray &append(QByteArray &ba, const char *string)
-    {
-        ba += QByteArray(string);
-        delete string;
-        return ba;
-    }
-
-}
-
 namespace QTest {
     
     template<>
@@ -136,7 +123,7 @@
     {
         QByteArray ba = "KCalCore::DateTimeList(";
         foreach(const QDateTime &i, l) {
-            append(ba, toString(i));
+            ba += toString(i);
         }
         ba += ")";
         return qstrdup(ba.data());
@@ -158,20 +145,20 @@
             ba += QByteArray::number(r->recurrenceType()) + "\n";
             ba += QByteArray::number(r->frequency()) + "\n";
             ba += QByteArray::number(r->duration()) + "\n";
-            append(ba, toString(r->startDt())) += "\n";
-            append(ba, toString(r->endDt())) += "\n";
-            append(ba, toString(r->bySeconds())) += "\n";
-            append(ba, toString(r->byMinutes())) += "\n";
-            append(ba, toString(r->byHours())) += "\n";
-            append(ba, toString(r->byDays())) += "\n";
-            append(ba, toString(r->byMonthDays())) += "\n";
-            append(ba, toString(r->byYearDays())) += "\n";
-            append(ba, toString(r->byMonths())) += "\n";
+            ba += QByteArray(toString(r->startDt())) + "\n";
+            ba += QByteArray(toString(r->endDt())) + "\n";
+            ba += QByteArray(toString(r->bySeconds())) + "\n";
+            ba += QByteArray(toString(r->byMinutes())) + "\n";
+            ba += QByteArray(toString(r->byHours())) + "\n";
+            ba += QByteArray(toString(r->byDays())) + "\n";
+            ba += QByteArray(toString(r->byMonthDays())) + "\n";
+            ba += QByteArray(toString(r->byYearDays())) + "\n";
+            ba += QByteArray(toString(r->byMonths())) + "\n";
             ba += ")\n";
-            append(ba, toString(at.exDates())) += "\n";
-            append(ba, toString(at.exDateTimes())) += "\n";
-            append(ba, toString(at.rDates())) += "\n";
-            append(ba, toString(at.rDateTimes())) += "\n";
+            ba += QByteArray(toString(at.exDates())) + "\n";
+            ba += QByteArray(toString(at.exDateTimes())) + "\n";
+            ba += QByteArray(toString(at.rDates())) + "\n";
+            ba += QByteArray(toString(at.rDateTimes())) + "\n";
 
         }
         return qstrdup(ba.data());
@@ -186,15 +173,15 @@
         ba += QByteArray::number(at.frequency()) + "\n";
         ba += QByteArray::number(at.interval()) + "\n";
         ba += QByteArray::number(at.count()) + "\n";
-        append(ba, toString(at.end())) += "\n";
-        append(ba, toString(at.bysecond())) += "\n";
-        append(ba, toString(at.byminute())) += "\n";
-        append(ba, toString(at.byhour())) += "\n";
-        append(ba, toString(at.byday())) += "\n";
-        append(ba, toString(at.bymonthday())) += "\n";
-        append(ba, toString(at.byyearday())) += "\n";
-        append(ba, toString(at.byweekno())) += "\n";
-        append(ba, toString(at.bymonth())) += "\n";
+        ba += QByteArray(toString(at.end())) + "\n";
+        ba += QByteArray(toString(at.bysecond())) + "\n";
+        ba += QByteArray(toString(at.byminute())) + "\n";
+        ba += QByteArray(toString(at.byhour())) + "\n";
+        ba += QByteArray(toString(at.byday())) + "\n";
+        ba += QByteArray(toString(at.bymonthday())) + "\n";
+        ba += QByteArray(toString(at.byyearday())) + "\n";
+        ba += QByteArray(toString(at.byweekno())) + "\n";
+        ba += QByteArray(toString(at.bymonth())) + "\n";
         ba += ")";
         return qstrdup(ba.data());
     }
@@ -226,7 +213,7 @@
     {
         QByteArray ba = "vector<Kolab::ContactReference>(";
         for (std::size_t i = 0; i < v.size(); i++) {
-                append(ba, toString(v.at(i))) += "\n";
+                ba += QByteArray(toString(v.at(i)))+ "\n";
             }
             ba += ")";
             return qstrdup(ba.data());
@@ -242,8 +229,8 @@
         ba += QByteArray::number(a.role())  + "\n";
         ba += QByteArray::number(a.rsvp())  + "\n";
         ba += QByteArray::fromStdString(a.contact().uid())+"\n";
-        append(ba, toString(a.delegatedTo())) += "\n";
-        append(ba, toString(a.delegatedFrom())) += "\n";
+        ba += QByteArray(toString(a.delegatedTo()))+"\n";
+        ba += QByteArray(toString(a.delegatedFrom()))+ "\n";
         ba += QByteArray::number(a.cutype())+ "\n";
         ba += ")";
         return qstrdup(ba.data());
@@ -254,7 +241,7 @@
     {
         QByteArray ba = "vector<Kolab::Attendee>(";
         for (std::size_t i = 0; i < v.size(); i++) {
-            append(ba, toString(v.at(i))) += "\n";
+            ba += QByteArray(toString(v.at(i)))+ "\n";
             ba += QByteArray("#######################")+ "\n";
         }
         ba += ")";
@@ -276,7 +263,7 @@
     {
         QByteArray ba = "vector<Kolab::CustomProperty>(";
         for (std::size_t i = 0; i < v.size(); i++) {
-            append(ba, toString(v.at(i))) += "\n";
+            ba += QByteArray(toString(v.at(i)))+ "\n";
         }
         ba += ")";
         return qstrdup(ba.data());
@@ -286,8 +273,8 @@
     char *toString(const Kolab::Period &p)
     {
         QByteArray ba = "Kolab::Period(";
-        append(ba, toString(p.start)) += "\n";
-        append(ba, toString(p.end)) += "\n";
+        ba += QByteArray(toString(p.start))+ "\n";
+        ba += QByteArray(toString(p.end))+ "\n";
         ba += ")";
         return qstrdup(ba.data());
     }
@@ -297,7 +284,7 @@
     {
         QByteArray ba = "vector<Kolab::Period>(";
         for (std::size_t i = 0; i < v.size(); i++) {
-            append(ba, toString(v.at(i))) += "\n";
+            ba += QByteArray(toString(v.at(i)))+ "\n";
         }
         ba += ")";
         return qstrdup(ba.data());
@@ -311,7 +298,7 @@
         ba += QByteArray::fromStdString(p.eventUid())+ "\n";
         ba += QByteArray::fromStdString(p.eventLocation())+ "\n";
         ba += QByteArray::fromStdString(p.eventSummary())+ "\n";
-        append(ba, toString(p.periods())) += "\n";
+        ba += QByteArray(toString(p.periods()))+ "\n";
         ba += ")";
         return qstrdup(ba.data());
     }

libkolab.dsc Changed

@@ -2,45 +2,40 @@
 Source: libkolab
 Binary: libkolab3, php-kolab, python-kolab, libkolab-dev
 Architecture: any
-Version: 3.2.0-0~kolab2
+Version: 3.0~dev20151230-0~kolab20
 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Homepage: http://git.kolab.org/libkolab
 Standards-Version: 3.9.3
 Build-Depends:
-    cmake,
-    debhelper,
-    dh-python,
-    libcurl4-gnutls-dev,
-    libboost-dev,
-    libboost-thread-dev,
-    libboost-system-dev,
-    libkolabxml-dev (>= 1.0),
-    libossp-uuid-dev,
+	cmake,
+	debhelper,
+	libcurl4-gnutls-dev,
+	libboost-dev,
+	libboost-thread-dev,
+	libboost-system-dev,
+	libkolabxml-dev (>= 1.0),
+	libossp-uuid-dev,
     qtbase5-dev,
     libkf5coreaddons-dev,
     libkf5calendarcore-dev,
     libkf5mime-dev,
-    libkf5codecs-dev,
-    libxerces-c-dev,
-    php-cgi,
-    php-dev,
+	libxerces-c-dev,
+    php-cgi | php5-cli,
+	php-dev | php5-dev,
+    plesk-php70-dev | plesk-php71-dev | bash,
+    plesk-php71-dev | bash,
+    plesk-php72-dev | bash,
+    plesk-php73-dev | bash,
+    plesk-php74-dev | bash,
     psa | bash,
-    plesk-php72-dev | plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
-    plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
-    plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev| bash,
-    plesk-php80-dev | plesk-php81-dev | plesk-php82-dev| bash,
-    plesk-php81-dev | plesk-php82-dev| bash,
-    plesk-php82-dev | bash,
-    python2-dev | python-dev | python3-dev,
-    python-minimal | python2-minimal | python3-minimal,
-    python3-all-dev,
-    swig4.0 (>= 4.1)
+	python-dev,
+	swig (>= 2.0)
 Package-List:
  libkolab-dev deb libdevel optional
  libkolab2 deb libs optional
  php-kolab deb libs optional
  python-kolab deb python optional
 Files:
- 00000000000000000000000000000000 0 libkolab-3.2.0.tar.gz
+ 00000000000000000000000000000000 0 libkolab-3.0.0.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 2828 0

Request History

mollekopf created request over 3 years ago

Removed old references to kolabicalendar.so

mollekopf superseded request over 3 years ago