diff --git a/evolution-data-server-shared-nss-db.patch b/evolution-data-server-shared-nss-db.patch new file mode 100644 index 0000000..a8e51e6 --- /dev/null +++ b/evolution-data-server-shared-nss-db.patch @@ -0,0 +1,48 @@ +diff -upr evolution-data-server-2.24.1-old/camel/camel.c evolution-data-server-2.24.1-new/camel/camel.c +--- evolution-data-server-2.24.1-old/camel/camel.c 2008-10-13 03:07:53.000000000 -0500 ++++ evolution-data-server-2.24.1-new/camel/camel.c 2008-10-26 19:14:49.000000000 -0600 +@@ -38,6 +38,8 @@ + #include + #include + ++#include ++ + #include "camel.h" + #include "camel-certdb.h" + #include "camel-debug.h" +@@ -78,12 +80,16 @@ camel_init (const char *configdir, gbool + nss_configdir = g_win32_locale_filename_from_utf8 (configdir); + #endif + +- if (NSS_InitReadWrite (nss_configdir) == SECFailure) { +- /* fall back on using volatile dbs? */ +- if (NSS_NoDB_Init (nss_configdir) == SECFailure) { +- g_free (nss_configdir); +- g_warning ("Failed to initialize NSS"); +- return -1; ++ if (nsshelp_open_db ("evolution", nss_configdir, 0) != SECSuccess) { ++ g_warning ("Opening non-shared cert database"); ++ ++ if (NSS_InitReadWrite (nss_configdir) == SECFailure) { ++ /* fall back on using volatile dbs? */ ++ if (NSS_NoDB_Init (nss_configdir) == SECFailure) { ++ g_free (nss_configdir); ++ g_warning ("Failed to initialize NSS"); ++ return -1; ++ } + } + } + +diff -upr evolution-data-server-2.24.1-old/configure.in evolution-data-server-2.24.1-new/configure.in +--- evolution-data-server-2.24.1-old/configure.in 2008-10-19 22:26:33.000000000 -0500 ++++ evolution-data-server-2.24.1-new/configure.in 2008-10-26 19:17:20.000000000 -0600 +@@ -535,6 +535,9 @@ if test "x${enable_nss}" = "xyes" || tes + AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) + msg_smime="yes (Mozilla NSS)" + fi ++ ++ mozilla_nss="$mozilla_nss nss-shared-helper" ++ + AC_DEFINE(HAVE_NSS,1,[Define if you have NSS]) + AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library]) + MANUAL_NSPR_CFLAGS="" diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 050420b..4c0f293 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Oct 31 19:48:06 IST 2008 - msuman@suse.de + +- Invoke the binaries from a script which sets the library path + for picking the LDAP libraries. + +------------------------------------------------------------------- +Wed Oct 29 08:28:41 CST 2008 - maw@suse.de + +- Make the -devel subpackage require nss-shared-helper-devel. + +------------------------------------------------------------------- +Tue Oct 28 17:44:26 CST 2008 - maw@suse.de + +- Reorder the list of build requirements +- Tag eds-core-mapi-changes.diff +- Run autotools before running configure. + ------------------------------------------------------------------- Mon Oct 27 19:05:54 CET 2008 - aj@suse.de @@ -9,6 +27,12 @@ Mon Oct 27 12:14:48 CET 2008 - kukuk@suse.de - Requires to evoldap2-devel should be libevoldap2 for main package [bnc#439152]. +------------------------------------------------------------------- +Sun Oct 26 23:53:18 CST 2008 - hpj@novell.com + +- Add evolution-data-server-shared-nss-db.patch, which lets us + migrate to new, shared NSS database and location. + ------------------------------------------------------------------- Sat Oct 25 22:07:50 IST 2008 - msuman@suse.de diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 8248bbb..34395cb 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -19,8 +19,14 @@ Name: evolution-data-server +%define _evo_version 2.24 BuildRequires: bison BuildRequires: db-devel +%if %suse_version > 1100 +BuildRequires: evoldap2-devel +%else +BuildRequires: openldap2-devel +%endif BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-certauth-devel @@ -34,21 +40,17 @@ BuildRequires: libgnome-devel BuildRequires: libidl-devel BuildRequires: libsoup-devel BuildRequires: mozilla-nss-devel +BuildRequires: nss-shared-helper-devel BuildRequires: perl-XML-Parser BuildRequires: python-devel BuildRequires: sgml-skel BuildRequires: sqlite3-devel -%if %suse_version > 1100 -BuildRequires: evoldap2-devel -%else -BuildRequires: openldap2-devel -%endif License: GPL v2 or later Group: Development/Libraries/GNOME AutoReqProv: on Summary: Evolution Data Server Version: 2.24.1 -Release: 4 +Release: 5 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.24/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch @@ -56,7 +58,9 @@ Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch Patch4: bnc-304835-ex-crash-after-restart.patch # PATCH-FIX-UPSTREAM bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo. Patch5: bnc-307861-calendar-auth.diff -# This patch contains changes in the core code base for the MAPI provider. +# PATCH-FEATURE-OPENSUSE evolution-data-server-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database. +Patch10: evolution-data-server-shared-nss-db.patch +# PATCH-FIX-OPENSUSE eds-core-mapi-changes.diff msuman@suse.de -- This patch contains changes in the core code base for the MAPI provider. Patch100: eds-core-mapi-changes.diff Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,6 +96,7 @@ Requires: libgnome-devel Requires: libgpg-error-devel Requires: libsoup-devel Requires: libxml2-devel +Requires: nss-shared-helper-devel Requires: orbit2-devel Requires: sqlite3-devel %if %suse_version > 1100 @@ -127,9 +132,18 @@ documentation. ###%patch3 ###%patch4 ###%patch5 +%patch10 -p1 %patch100 -p1 %build +intltoolize --force --copy +# should use autoreconf, but libdb is broken +libtoolize --force --copy +aclocal +autoconf +automake -a +autoheader +(pushd calendar/libical; autoreconf -fi; popd) export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -150,10 +164,15 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install %{__make} DESTDIR=$RPM_BUILD_ROOT install -%find_lang evolution-data-server-2.24 +%find_lang evolution-data-server-%{_evo_version} %{__rm} $RPM_BUILD_ROOT/%{_libdir}/*.*a %{__rm} $RPM_BUILD_ROOT/%{_libdir}/*/*/*.*a %fdupes $RPM_BUILD_ROOT +%if %suse_version > 1100 +%{__mv} $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version} $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}.bin +echo -e "#!/bin/sh\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}\" %{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}.bin \$@\n\nexit \$?" > $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version} +%{__chmod} +x $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version} +%endif %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -165,7 +184,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %files %defattr(-,root,root) %doc README COPYING ChangeLog NEWS TODO AUTHORS -%{_datadir}/evolution-data-server-2.24 +%{_datadir}/evolution-data-server-%{_evo_version} %{_datadir}/idl/evolution-data-server-1.2 %{_datadir}/pixmaps/evolution-data-server %{_libdir}/*.so.* @@ -173,11 +192,11 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_libdir}/evolution-data-server %{_libdir}/evolution-data-server-1.2 -%files lang -f evolution-data-server-2.24.lang +%files lang -f evolution-data-server-%{_evo_version}.lang %files devel %defattr(-, root, root) -%{_includedir}/evolution-data-server-2.24 +%{_includedir}/evolution-data-server-%{_evo_version} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -186,12 +205,24 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_datadir}/gtk-doc/html/* %changelog +* Fri Oct 31 2008 msuman@suse.de +- Invoke the binaries from a script which sets the library path + for picking the LDAP libraries. +* Wed Oct 29 2008 maw@suse.de +- Make the -devel subpackage require nss-shared-helper-devel. +* Tue Oct 28 2008 maw@suse.de +- Reorder the list of build requirements +- Tag eds-core-mapi-changes.diff +- Run autotools before running configure. * Mon Oct 27 2008 aj@suse.de - The package is called libevoldap-2_4-2. * Mon Oct 27 2008 kukuk@suse.de - Requires to evoldap2-devel should be libevoldap2 for main package [bnc#439152]. -* Sat Oct 25 2008 msuman@suse.de +* Mon Oct 27 2008 hpj@novell.com +- Add evolution-data-server-shared-nss-db.patch, which lets us + migrate to new, shared NSS database and location. +* Fri Oct 24 2008 msuman@suse.de - Use evoldap2-client only for SUSE versions above 11.0, fallback to openldap2-client for the older versions. - Use proper RPM macros in the spec file, clean up spec file to reduce the @@ -202,7 +233,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + bgo-530514-check-to-handle-specific-server-response.diff. Fixed upstream. + libgnomeui-dep.patch - not required anymore, SUSE has moved away from /opt/gnome -* Fri Oct 24 2008 msuman@suse.de +* Thu Oct 23 2008 msuman@suse.de - Update to version 2.24.1 + Bugs fixed: bgo#337479, bgo#364542, bgo#497928, bgo#511947, bgo#514670, bgo#537718, bgo#544141, bgo#546406, bgo#546637, @@ -258,7 +289,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" * Wed Sep 03 2008 maw@suse.de - Add evolution-data-server-sexp-to-sql-fixes.patch (more work on bnc#418080). -* Wed Sep 03 2008 maw@suse.de +* Tue Sep 02 2008 maw@suse.de - Update to version 2.23.91: + Bugs fixed: bgo#213072, bnc#391936, bnc#418080 (more work), bgo#466754, bgo#518728, bgo#546926, bgo#548331, bgo#548565, @@ -332,12 +363,12 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" * Mon Jun 02 2008 abharath@suse.de - Added + bnc#394654 - bnc-394654-eds-crasher.patch: EDS crasher (Chenthill) -* Wed May 21 2008 msuman@suse.de +* Tue May 20 2008 msuman@suse.de - Added + bgo-530514-check-to-handle-specific-server-response.diff (Sankar P) + bgo-530543-leak-while-syncing-mails-for-offline.diff (Sankar P) + bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff (Sankar P) -* Wed May 14 2008 psankar@suse.de +* Tue May 13 2008 psankar@suse.de - Removed: bnc-152070-eds-crash.patch - Removed: eds-compiler-warning.patch - Removed: evolution-data-server-abuild.patch @@ -392,7 +423,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" added patch includes those changes as well. * Wed Mar 26 2008 sbrabec@suse.cz - Fixed GroupWise attachment crash on x86_64 (bgo#522389). -* Fri Mar 14 2008 maw@suse.de +* Thu Mar 13 2008 maw@suse.de - Update to versoin 2.22.0: + Bugs fixed: bgo#327851, bgo#518728, and bgo#520362 + Minor API doc updates @@ -458,7 +489,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + Updated translations + Protect against a NULL subject string - Remove old patches, and refresh and renumber the remaining ones. -* Wed Dec 05 2007 maw@suse.de +* Tue Dec 04 2007 maw@suse.de - Don't require openldap2 to build. * Thu Oct 11 2007 sbrabec@suse.cz - Removed bogus dependency on mDNSResponder. @@ -469,7 +500,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + Bug (bugzilla.novell.com) fixed: #275990 + Updated timezone info + Updated translations. -* Sat Sep 15 2007 maw@suse.de +* Fri Sep 14 2007 maw@suse.de - Fix bnc-307861-calendar-auth.diff. * Fri Sep 14 2007 pchenthill@novell.com - evolution-data-server-1.11.5-cert-auth-complete.patch: Updated the @@ -530,7 +561,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" * Fri Jun 22 2007 sbrabec@suse.cz - Fixed IMAP UID format string vulnerability (#284828, GNOME#447414, CVE-2007-3257). -* Thu May 24 2007 ro@suse.de +* Wed May 23 2007 ro@suse.de - added ldconfig to post scripts * Wed Apr 11 2007 maw@suse.de - Update to version 1.10.1 @@ -558,7 +589,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" evolution-data-server-devel. * Fri Dec 29 2006 james@usr-local-bin.org - Re-enable custom configure options. -* Thu Dec 14 2006 maw@suse.de +* Wed Dec 13 2006 maw@suse.de - Move to /usr - Do some specfile cleanup. * Tue Nov 21 2006 sbrabec@suse.cz @@ -582,7 +613,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" as it is a "to-be" reverted patch. * Wed Oct 18 2006 schwab@suse.de - Fix missing declaration. -* Tue Oct 03 2006 jhargadon@suse.de +* Mon Oct 02 2006 jhargadon@suse.de - update to version 1.8.1 - translation updates - Bug fixes: @@ -595,7 +626,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - update to 1.8.0: * updated translation * bugfixes -* Sat Aug 19 2006 jhargadon@suse.de +* Fri Aug 18 2006 jhargadon@suse.de - update to version 1.7.91 - Add filters to Groupwise SOAP calls so that each component fetches items of its own type and none other @@ -608,10 +639,10 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - Support for Gadu Gadu IM in Contact Entries - Memory reduction and Performance improvements in Contacts - Removed patches that were incorporated upstream. -* Thu Jul 20 2006 kharish@novell.com +* Wed Jul 19 2006 kharish@novell.com - Patch to add alarms to GW meetings by default based on customer preference. Fixes bnc 167330. -* Wed Jul 19 2006 kharish@novell.com +* Tue Jul 18 2006 kharish@novell.com - Patch to correctly handle calendar attachment filenames that do not require special characters handling. They were being parsed incorrectly and ignored by clients. @@ -645,7 +676,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - Committed patch for bug 181906, which solves a exchange crash. * Fri Jun 02 2006 sragavan@novell.com - Updated German Translations. -* Thu Jun 01 2006 fejj@suse.de +* Wed May 31 2006 fejj@suse.de - Added bnc-176277-2.patch which fixes a deadlock condition * Mon May 29 2006 vvaradhan@novell.com - Fixes (bnc) @@ -655,7 +686,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" * Thu May 25 2006 sragavan@novell.com - Fixes (bnc) 176615 - Added a new camel stream vfs for saving to remote shares. -* Tue May 23 2006 sragavan@novell.com +* Mon May 22 2006 sragavan@novell.com - Updated translations (Srini) * Mon May 22 2006 fejj@suse.de - Added bnc-177394.patch to fix a crasher when an IMAP server replies @@ -678,7 +709,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - Removed gw-force-use-imap.patch as it was decided to default to soap. * Tue May 02 2006 fejj@suse.de - Added bnc-167638.patch: Fixes long shutdown times due to the imap/gw providers trying to sync data at exit time. -* Tue May 02 2006 fejj@suse.de +* Mon May 01 2006 fejj@suse.de - Added bgo-315976-INBOX-not-shown-when-override-namespace.patch * Tue Apr 25 2006 sragavan@novell.com - Fixes (bnc) @@ -841,7 +872,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" * Thu Oct 13 2005 gekker@suse.de - Update to version 1.4.1 - Fix more warnings -* Mon Sep 26 2005 ro@suse.de +* Sun Sep 25 2005 ro@suse.de - added LDAP_DEPRECATED to CFLAGS * Fri Sep 09 2005 aj@suse.de - Change last patch. @@ -855,15 +886,15 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - Fix brokeness inlibical * Sat Aug 13 2005 aj@suse.de - Add lzo and lzo-devel to nfb. -* Fri Aug 12 2005 gekker@suse.de +* Thu Aug 11 2005 gekker@suse.de - Update to version 1.3.7 * Mon Aug 01 2005 gekker@suse.de - Update to version 1.3.6.1 * Fri Jul 29 2005 sbrabec@suse.cz - Require mozilla-nss (#98002). -* Wed Jul 27 2005 ro@suse.de +* Tue Jul 26 2005 ro@suse.de - fix typo in specfile -* Tue Jul 26 2005 gekker@suse.de +* Mon Jul 25 2005 gekker@suse.de - Update to version 1.3.5 * Thu Jul 14 2005 schwab@suse.de - Fix missing declarations again. @@ -881,7 +912,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - Build with mozilla-nss. * Wed Jun 01 2005 sbrabec@suse.cz - Fixed devel requirements. -* Thu May 19 2005 ro@suse.de +* Wed May 18 2005 ro@suse.de - fix build with current pkgconfig * Fri Apr 29 2005 sbrabec@suse.cz - Yet another mail crasher fix (#66996). @@ -895,14 +926,14 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" * Wed Mar 16 2005 gekker@suse.de - Update to version 1.2.1 - Add 64bit-warn.patch -* Wed Mar 09 2005 gekker@suse.de +* Tue Mar 08 2005 gekker@suse.de - Update to version 1.2.0 (GNOME 2.10) - remove upstreamed dest.patch * Wed Mar 02 2005 gekker@suse.de - add dest.patch * Wed Mar 02 2005 gekker@suse.de - update to version 1.1.6 -* Mon Feb 28 2005 ro@suse.de +* Sun Feb 27 2005 ro@suse.de - fix build on lib64 * Fri Feb 25 2005 gekker@suse.de - fix libexecdir, so that e-d-s will actually get launched @@ -936,12 +967,12 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - locale rename: no -> nb * Thu Sep 30 2004 dobey@suse.de - Add patch to fix bug 66368 in bugzilla.ximian.com -* Thu Sep 30 2004 dobey@suse.de +* Wed Sep 29 2004 dobey@suse.de - Add patch to fix bug 66230 in bugzilla.ximian.com * Fri Sep 24 2004 dobey@suse.de - Updated to version 1.0.1 - Removed evolution-data-server-0.0.99.dif which is in upstream source -* Fri Sep 17 2004 ro@suse.de +* Thu Sep 16 2004 ro@suse.de - readd evolution-data-server-0.0.99.dif to fix parallel build * Mon Sep 13 2004 dobey@suse.de - Updated to version 1.0.0 @@ -971,13 +1002,13 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - Updated to version 0.0.95. * Mon Jun 21 2004 clahey@suse.de - Updated to version 0.0.94.1. -* Fri Jun 04 2004 mibarra@suse.de +* Thu Jun 03 2004 mibarra@suse.de - Updated to version 0.0.94. * Mon May 24 2004 ro@suse.de - fix lib64 issue -* Sat May 22 2004 mibarra@suse.de +* Fri May 21 2004 mibarra@suse.de - Updated to 0.0.93. * Tue May 18 2004 clahey@suse.de - Don't install to /opt/gnome/libexec -* Tue May 18 2004 clahey@suse.de +* Mon May 17 2004 clahey@suse.de - Initial import of evolution-data-server.