From 76758313926f5a578c01bf1419897914807e3385 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Jun 29 2014 14:10:40 +0000 Subject: Upgrade to 7.1.10 --- diff --git a/sources b/sources index 5f6d3d3..b03ae3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d74bcca184e4c245fb06ef7db4ec0d8 zcp-7.1.9.tar.gz +244bf320f811fd375cfb8cb82bd324eb zcp-7.1.10.tar.gz diff --git a/zarafa-7.1.8-man-pages.patch b/zarafa-7.1.8-man-pages.patch deleted file mode 100644 index df4fb75..0000000 --- a/zarafa-7.1.8-man-pages.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch by Robert Scheck for Zarafa <= 7.1.8 which ensures that -the removed man pages for proprietary Zarafa Web Services are not tried to be installed. - ---- zarafa-7.1.8/doc/Makefile.am 2014-02-20 12:02:44.000000000 +0100 -+++ zarafa-7.1.8/doc/Makefile.am.man-pages 2014-02-21 08:55:04.000000000 +0100 -@@ -8,7 +8,11 @@ - zarafa-ical.cfg.5 zarafa-server.cfg.5 zarafa-ldap.cfg.5 zarafa-ldapms.cfg.5 zarafa-unix.cfg.5 zarafa-spooler.cfg.5 zarafa-gateway.cfg.5 \ - zarafa-monitor.cfg.5 zarafa-licensed.cfg.5 zarafa-dagent.cfg.5 zarafa-search.cfg.5 zarafa-archiver.1 zarafa-archiver.cfg.5 \ - zarafa-msr.1 zarafa-msr.cfg.5 zarafa-msr-verify.1 za-aclsync.1 za-aclset.1 zarafa-backup.cfg.5 za-restore.1 \ -- zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1 zarafa-ws.1 zarafa-ws.cfg.5 -+ zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1 -+ -+if ! OSS_ONLY -+allpages += zarafa-ws.1 zarafa-ws.cfg.5 -+endif - - CLEANFILES = zarafa-cfgchecker.1 - ---- zarafa-7.1.8/doc/Makefile.in 2014-02-20 12:08:17.000000000 +0100 -+++ zarafa-7.1.8/doc/Makefile.in.man-pages 2014-02-21 08:57:00.000000000 +0100 -@@ -294,7 +294,8 @@ - zarafa-ical.cfg.5 zarafa-server.cfg.5 zarafa-ldap.cfg.5 zarafa-ldapms.cfg.5 zarafa-unix.cfg.5 zarafa-spooler.cfg.5 zarafa-gateway.cfg.5 \ - zarafa-monitor.cfg.5 zarafa-licensed.cfg.5 zarafa-dagent.cfg.5 zarafa-search.cfg.5 zarafa-archiver.1 zarafa-archiver.cfg.5 \ - zarafa-msr.1 zarafa-msr.cfg.5 zarafa-msr-verify.1 za-aclsync.1 za-aclset.1 zarafa-backup.cfg.5 za-restore.1 \ -- zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1 zarafa-ws.1 zarafa-ws.cfg.5 -+ zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1 -+@OSS_ONLY_FALSE@allpages += zarafa-ws.1 zarafa-ws.cfg.5 - - CLEANFILES = zarafa-cfgchecker.1 - man_MANS = $(BUILT_SOURCES) $(allpages) diff --git a/zarafa-7.1.8-nullptr.patch b/zarafa-7.1.8-nullptr.patch deleted file mode 100644 index ffb2cb6..0000000 --- a/zarafa-7.1.8-nullptr.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch by Robert Scheck for Zarafa <= 7.1.8 which adds a check -to avoid a NULL pointer segfault. At least a Fedora build with this patch can no longer be -crashed. See https://bugzilla.redhat.com/show_bug.cgi?id=1059903 for further information. -Please do not confuse https://bugzilla.redhat.com/show_bug.cgi?id=1056767 with this patch. - ---- zarafa-7.1.8/provider/libserver/ECSession.cpp 2014-01-21 15:38:53.000000000 +0100 -+++ zarafa-7.1.8/provider/libserver/ECSession.cpp.rsc 2014-01-29 01:26:49.000000000 +0100 -@@ -865,10 +865,10 @@ - { - ECRESULT er = erSuccess; - -- if (!lpszName) -+ if (!lpszName || !lpszPassword) - { - // Commandment 2: Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end. -- m_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_FATAL, "Invalid argument lpszName in call to ECAuthSession::ValidateUserLogon()"); -+ m_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_FATAL, "Invalid argument %s in call to ECAuthSession::ValidateUserLogon()", (!lpszName) ? "lpszName" : "lpszPassword"); - er = ZARAFA_E_INVALID_PARAMETER; - goto exit; - } diff --git a/zarafa.spec b/zarafa.spec index 97dc8af..b08c3e0 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -1,9 +1,14 @@ %global beta_or_rc 0 -%global actual_release 2 -%global svnrevision 44333 +%global actual_release 1 +%global svnrevision 44973 %global with_search 1 %global with_ldap 1 %global with_xmlto 1 +%if 0%{?fedora} > 15 || 0%{?rhel} > 6 +%global with_gsoap 1 +%else +%global with_gsoap 0 +%endif %global no_multiupload 1 %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") @@ -16,19 +21,20 @@ # RPM 4.9 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/%{name}/.*\\.so$ %global __provides_exclude_from %{__provides_exclude_from}|%{_libdir}/php/modules/.*\\.so$ + %if "%{php_version}" < "5.6" -%global ini_name %{name}.ini +%global ini_name %{name}.ini %else -%global ini_name 40-%{name}.ini +%global ini_name 40-%{name}.ini %endif Summary: Open Source Edition of the Zarafa Collaboration Platform Name: zarafa -Version: 7.1.9 +Version: 7.1.10 %if %{beta_or_rc} -Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}.1 +Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else -Release: %{actual_release}%{?dist}.2 +Release: %{actual_release}%{?dist} %endif # Red Hat Legal has been advised by email from Zarafa that no license is # required in order to use the letter string "zarafa" (combined with other @@ -48,8 +54,6 @@ Source2: %{name}.logrotate Source3: %{name}-webaccess.conf Patch0: zarafa-7.0.9-rpath.patch -Patch1: zarafa-7.1.8-nullptr.patch -Patch2: zarafa-7.1.8-man-pages.patch BuildRequires: bison BuildRequires: gcc-c++ @@ -74,6 +78,10 @@ BuildRequires: boost141-devel BuildRequires: swig BuildRequires: python-devel >= 2.4 +%if %{with_gsoap} +BuildRequires: gsoap-devel +%endif + %if %{with_search} BuildRequires: kyotocabinet-devel %if 0%{?fedora} > 15 || 0%{?rhel} > 6 @@ -367,8 +375,6 @@ to interact with Zarafa. %setup -q %patch0 -p1 -b .rpath touch -c -r aclocal.m4.rpath aclocal.m4 -%patch1 -p1 -b .nullptr -%patch2 -p1 -b .man-pages %build %if 0%{?rhel}%{?fedora} < 6 @@ -384,6 +390,9 @@ export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}/clucene09" --with-userscript-prefix=%{_sysconfdir}/%{name}/userscripts \ --with-quotatemplate-prefix=%{_sysconfdir}/%{name}/quotamail \ --with-searchscripts-prefix=%{_datadir}/%{name}/searchscripts \ +%if %{with_gsoap} + --with-system-gsoap \ +%endif %if %{with_search} %if 0%{?rhel}%{?fedora} > 6 --with-clucene-lib-prefix=%{_libdir}/clucene09 \ @@ -523,15 +532,13 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/client/widgets/swfupload/ # Remove files only required by proprietary web services rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/ws.cfg,%{_datadir}/zarafa/timezones} -# rename the PHP config file when needed (PHP 5.6+) +# Rename the PHP config file when needed (PHP 5.6+) if [ "%{name}.ini" != "%{ini_name}" ]; then - mv %{buildroot}%{_sysconfdir}/php.d/%{name}.ini \ - %{buildroot}%{_sysconfdir}/php.d/%{ini_name} + mv -f $RPM_BUILD_ROOT%{_sysconfdir}/php.d/{%{name}.ini,%{ini_name}} fi %find_lang %{name} - %clean rm -rf $RPM_BUILD_ROOT @@ -898,6 +905,9 @@ fi %{python_sitearch}/* %changelog +* Sun Jun 29 2014 Robert Scheck 7.1.10-1 +- Upgrade to 7.1.10 + * Fri Jun 20 2014 Remi Collet - 7.1.9-2.1 - rebuild for https://fedoraproject.org/wiki/Changes/Php56 - add numerical prefix to extension configuration file