From bdab3ae0fc52c68aefaeb1c7395c52ddaf055d9b78719f4dec727484b2759853 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 1 Apr 2010 11:52:09 +0000 Subject: [PATCH] Accepting request 36544 from mozilla Copy from mozilla/MozillaThunderbird via accept of submit request 36544 revision 235. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/36544 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=75 --- MozillaThunderbird.changes | 28 ++++++ MozillaThunderbird.spec | 24 +++-- comm-system-ldap.patch | 148 +++++++++++++++++++++++++++++++ create-tar.sh | 4 +- enigmail-1.0.0.tar.bz2 | 3 - enigmail-1.0.1.tar.bz2 | 3 + l10n-3.0.1.tar.bz2 | 3 - l10n-3.0.4.tar.bz2 | 3 + mozilla-clipboard.patch | 110 ----------------------- ready | 0 thunderbird-3.0.1-source.tar.bz2 | 3 - thunderbird-3.0.4-source.tar.bz2 | 3 + 12 files changed, 198 insertions(+), 134 deletions(-) create mode 100644 comm-system-ldap.patch delete mode 100644 enigmail-1.0.0.tar.bz2 create mode 100644 enigmail-1.0.1.tar.bz2 delete mode 100644 l10n-3.0.1.tar.bz2 create mode 100644 l10n-3.0.4.tar.bz2 delete mode 100644 mozilla-clipboard.patch delete mode 100644 ready delete mode 100644 thunderbird-3.0.1-source.tar.bz2 create mode 100644 thunderbird-3.0.4-source.tar.bz2 diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 3c49b55..6ba39d4 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Wed Mar 17 20:07:51 CET 2010 - wr@rosenauer.org + +- security update to 3.0.4 (bnc#586567) + * requires NSS 3.12.6 + +------------------------------------------------------------------- +Sun Feb 28 19:56:44 CET 2010 - wr@rosenauer.org + +- update to 3.0.3 + * Fix for missing folders or empty folder pane after updating + to Thunderbird 3.0.2 + +------------------------------------------------------------------- +Fri Feb 26 17:04:00 CET 2010 - wr@rosenauer.org + +- security update to 3.0.2 (bnc#576969) + * MFSA 2010-01/CVE-2010-0159 + Crashes with evidence of memory corruption + * MFSA 2010-03/CVE-2009-1571 + Use-after-free crash in HTML parser + * various stability improvements +- update enigmail to 1.0.1 + * Czech, Dutch, Polish and Portuguese (Brazilian) languages + were added to the release. + * there are several fixes related using OpenPGP Smartcards +- use system hunspell again (bnc#582276) + ------------------------------------------------------------------- Tue Jan 12 00:23:23 CET 2010 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 43dd564..eee0a90 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 3.0.1) +# spec file for package MozillaThunderbird (Version 3.0.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer @@ -20,7 +20,8 @@ Name: MozillaThunderbird -BuildRequires: autoconf213 fdupes gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel python startup-notification-devel unzip update-desktop-files zip +BuildRequires: autoconf213 fdupes gcc-c++ libgnomeui-devel libidl-devel python startup-notification-devel unzip update-desktop-files zip +BuildRequires: mozilla-nss-devel >= 3.12.6 %if %suse_version > 1030 BuildRequires: hunspell-devel %endif @@ -28,10 +29,10 @@ BuildRequires: hunspell-devel BuildRequires: nss-shared-helper-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -%define mainversion 3.0.1 +%define mainversion 3.0.4 Version: %{mainversion} Release: 1 -%define releasedate 2010011100 +%define releasedate 2010031700 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -44,9 +45,8 @@ Source4: l10n-%{version}.tar.bz2 Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: MozillaThunderbird-rpmlintrc -Source9: enigmail-1.0.0.tar.bz2 +Source9: enigmail-1.0.1.tar.bz2 Source10: create-tar.sh -Patch1: mozilla-clipboard.patch Patch2: thunderbird-appname.patch Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch @@ -87,7 +87,7 @@ Mozilla application suite. %package translations-common License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Common translations for MozillaThunderbird -Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) +Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) Group: System/Localization PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} @@ -123,10 +123,9 @@ Software Development Kit to build plugins/extensions against Thunderbird. %if %build_enigmail - %package -n enigmail -Version: 1.0.0 -Release: 2 +Version: 1.0.1 +Release: 1 License: GPLv2+ ; MPLv1.1+ Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients @@ -152,7 +151,6 @@ popd %endif # xulrunner patches pushd mozilla -%patch1 -p1 %patch3 -p1 %patch4 -p1 %patch8 -p1 @@ -206,7 +204,7 @@ ac_add_options --with-l10n-base=../l10n ac_add_options --disable-updater #ac_add_options --with-system-png # no apng support %if %suse_version > 1030 -ac_add_options --enable-system-myspell +ac_add_options --enable-system-hunspell %endif ac_add_options --enable-ldap-experimental ac_add_options --disable-installer @@ -449,8 +447,8 @@ exit 0 %{_libdir}/%{progname}/xpt_link #%{_libdir}/pkgconfig/*.pc %{_includedir}/%{progname}/ -%if %build_enigmail +%if %build_enigmail %files -n enigmail %defattr(-,root,root) %dir %{_libdir}/mozilla diff --git a/comm-system-ldap.patch b/comm-system-ldap.patch new file mode 100644 index 0000000..1852e89 --- /dev/null +++ b/comm-system-ldap.patch @@ -0,0 +1,148 @@ +diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in +--- a/config/autoconf.mk.in ++++ b/config/autoconf.mk.in +@@ -421,16 +421,17 @@ NSPR_CONFIG = @NSPR_CONFIG@ + NSPR_CFLAGS = @NSPR_CFLAGS@ + NSPR_LIBS = @NSPR_LIBS@ + + NSS_CONFIG = @NSS_CONFIG@ + NSS_CFLAGS = @NSS_CFLAGS@ + NSS_LIBS = @NSS_LIBS@ + NSS_DEP_LIBS = @NSS_DEP_LIBS@ + ++MOZ_NATIVE_MOZLDAP = @SYSTEM_MOZLDAP@ + LDAP_CFLAGS = @LDAP_CFLAGS@ + LDAP_LIBS = @LDAP_LIBS@ + XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@ + XPCOM_STANDALONE_GLUE_LDOPTS = @XPCOM_STANDALONE_GLUE_LDOPTS@ + MOZ_XPCOM_OBSOLETE_LIBS = @MOZ_XPCOM_OBSOLETE_LIBS@ + + USE_DEPENDENT_LIBS = @USE_DEPENDENT_LIBS@ + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -4936,16 +4936,34 @@ dnl ==================================== + dnl = LDAP + dnl ========================================================= + MOZ_ARG_DISABLE_BOOL(ldap, + [ --disable-ldap Disable LDAP support], + MOZ_LDAP_XPCOM=, + MOZ_LDAP_XPCOM=1) + + dnl ======================================================== ++dnl = If mozldap was not detected in the system, ++dnl = use the one in the source tree (mozilla/directory/c-sdk) ++dnl ======================================================== ++ ++if test -n "$MOZ_LDAP_XPCOM"; then ++ MOZ_ARG_ENABLE_BOOL(system-mozldap, ++ [ --enable-system-mozldap ++ Use system installed mozldap (located with pkgconfig)], ++ SYSTEM_MOZLDAP=1 ) ++ ++ if test -n "$SYSTEM_MOZLDAP"; then ++ PKG_CHECK_MODULES(MOZLDAP, mozldap >= 6.0.6, ++ SYSTEM_MOZLDAP=1, SYSTEM_MOZLDAP=) ++ fi ++fi ++AC_SUBST(SYSTEM_MOZLDAP) ++ ++dnl ======================================================== + dnl = Trademarked Branding + dnl ======================================================== + MOZ_ARG_ENABLE_BOOL(official-branding, + [ --enable-official-branding Enable Official mozilla.org Branding + Do not distribute builds with + --enable-official-branding unless you have + permission to use trademarks per + http://www.mozilla.org/foundation/trademarks/ .], +@@ -7043,17 +7061,22 @@ if test "$MOZ_LDAP_XPCOM"; then + if test -n "$GNU_CC"; then + LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60' + else + LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}' + fi + elif test "$OS_ARCH" = "OS2"; then + LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}' + else +- LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60' ++ if test "$SYSTEM_MOZLDAP"; then ++ LDAP_LIBS="$MOZLDAP_LIBS" ++ LDAP_CFLAGS="$MOZLDAP_CFLAGS" ++ else ++ LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60' ++ fi + fi + fi + + dnl ======================================================== + dnl = + dnl = Maintainer debug option (no --enable equivalent) + dnl = + dnl ======================================================== +@@ -7603,17 +7626,17 @@ fi + AC_OUTPUT_SUBDIRS(mozilla) + ac_configure_args="$_SUBDIR_CONFIG_ARGS" + MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED" + + if test "$COMPILE_ENVIRONMENT"; then + # if we're building the LDAP XPCOM component, we need to build + # the c-sdk first. + # +-if test "$MOZ_LDAP_XPCOM"; then ++if test "$MOZ_LDAP_XPCOM" -a -z "$SYSTEM_MOZLDAP" ; then + + # these subdirs may not yet have been created in the build tree. + # don't use the "-p" switch to mkdir, since not all platforms have it + # + if test ! -d "directory"; then + mkdir "directory" + fi + if test ! -d "directory/c-sdk"; then +diff --git a/mail/build.mk b/mail/build.mk +--- a/mail/build.mk ++++ b/mail/build.mk +@@ -47,17 +47,19 @@ ifdef MOZ_EXTENSIONS + tier_app_dirs += extensions + endif + + else # toplevel Makefile + + TIERS += app + + ifdef MOZ_LDAP_XPCOM ++ifndef MOZ_NATIVE_MOZLDAP + tier_app_staticdirs += directory/c-sdk ++endif + tier_app_dirs += directory/xpcom + endif + + ifdef MOZ_COMPOSER + tier_app_dirs += editor/ui + endif + + ifdef MOZ_BRANDING_DIRECTORY +diff --git a/suite/build.mk b/suite/build.mk +--- a/suite/build.mk ++++ b/suite/build.mk +@@ -47,17 +47,19 @@ ifdef MOZ_EXTENSIONS + tier_app_dirs += extensions + endif + + else # toplevel Makefile + + TIERS += app + + ifdef MOZ_LDAP_XPCOM ++ifndef MOZ_NATIVE_MOZLDAP + tier_app_staticdirs += directory/c-sdk ++endif + tier_app_dirs += directory/xpcom + endif + + ifdef MOZ_COMPOSER + tier_app_dirs += editor/ui + endif + + ifdef MOZ_BRANDING_DIRECTORY diff --git a/create-tar.sh b/create-tar.sh index 3aa3c0f..b28b6f9 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ BRANCH="releases/comm-1.9.1" # comm-central -RELEASE_TAG="THUNDERBIRD_3_0_1_RELEASE" -VERSION="3.0.1" +RELEASE_TAG="THUNDERBIRD_3_0_4_RELEASE" +VERSION="3.0.4" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird diff --git a/enigmail-1.0.0.tar.bz2 b/enigmail-1.0.0.tar.bz2 deleted file mode 100644 index b22296c..0000000 --- a/enigmail-1.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c55b6f008f0a24d5e783d845f6d3534e1279757afcc41ca5c26a9802576ec100 -size 838623 diff --git a/enigmail-1.0.1.tar.bz2 b/enigmail-1.0.1.tar.bz2 new file mode 100644 index 0000000..28139dd --- /dev/null +++ b/enigmail-1.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea9e271bdf52dcd6c538975dc9ba056644d736cf52fd411af0c97a32ae9552dd +size 858106 diff --git a/l10n-3.0.1.tar.bz2 b/l10n-3.0.1.tar.bz2 deleted file mode 100644 index eeed942..0000000 --- a/l10n-3.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71e62aef60197f212593644e8e32a6a17868e1c2312153d3c641a811bcc34f8a -size 19931410 diff --git a/l10n-3.0.4.tar.bz2 b/l10n-3.0.4.tar.bz2 new file mode 100644 index 0000000..eca641d --- /dev/null +++ b/l10n-3.0.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd0f8808186324aa9edb59d47946acc1f70b763db48a5a3e0e3875607e1db279 +size 20083958 diff --git a/mozilla-clipboard.patch b/mozilla-clipboard.patch deleted file mode 100644 index c0d662d..0000000 --- a/mozilla-clipboard.patch +++ /dev/null @@ -1,110 +0,0 @@ -From: Martin Stránský -Subject: Fix crash in clipboard handling -References: -https://bugzilla.mozilla.org/show_bug.cgi?id=495392 - - -diff --git a/widget/src/gtk2/nsClipboard.cpp b/widget/src/gtk2/nsClipboard.cpp ---- a/widget/src/gtk2/nsClipboard.cpp -+++ b/widget/src/gtk2/nsClipboard.cpp -@@ -440,21 +440,21 @@ nsClipboard::HasDataMatchingFlavors(cons - if (!strcmp(aFlavorList[i], kUnicodeMime) && - gtk_selection_data_targets_include_text(selection_data)) { - *_retval = PR_TRUE; - break; - } - - for (PRInt32 j = 0; j < n_targets; j++) { - gchar *atom_name = gdk_atom_name(targets[j]); -- if (!strcmp(atom_name, aFlavorList[i])) -+ if (!g_strcmp0(atom_name, aFlavorList[i])) - *_retval = PR_TRUE; - - // X clipboard wants image/jpeg, not image/jpg -- if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg")) -+ if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg")) - *_retval = PR_TRUE; - - g_free(atom_name); - - if (*_retval) - break; - } - } -diff --git a/widget/src/gtk2/nsDragService.cpp b/widget/src/gtk2/nsDragService.cpp ---- a/widget/src/gtk2/nsDragService.cpp -+++ b/widget/src/gtk2/nsDragService.cpp -@@ -796,46 +796,43 @@ nsDragService::IsDataFlavorSupported(con - GList *tmp; - for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { - /* Bug 331198 */ - GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); - gchar *name = NULL; - name = gdk_atom_name(atom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("checking %s against %s\n", name, aDataFlavor)); -- if (name && (strcmp(name, aDataFlavor) == 0)) { -+ if (g_strcmp0(name, aDataFlavor) == 0) { - PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n")); - *_retval = PR_TRUE; - } - // check for automatic text/uri-list -> text/x-moz-url mapping - if (*_retval == PR_FALSE && -- name && -- (strcmp(name, gTextUriListType) == 0) && -- (strcmp(aDataFlavor, kURLMime) == 0)) { -+ (g_strcmp0(name, gTextUriListType) == 0) && -+ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("good! ( it's text/uri-list and \ - we're checking against text/x-moz-url )\n")); - *_retval = PR_TRUE; - } - // check for automatic _NETSCAPE_URL -> text/x-moz-url mapping - if (*_retval == PR_FALSE && -- name && -- (strcmp(name, gMozUrlType) == 0) && -- (strcmp(aDataFlavor, kURLMime) == 0)) { -+ (g_strcmp0(name, gMozUrlType) == 0) && -+ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("good! ( it's _NETSCAPE_URL and \ - we're checking against text/x-moz-url )\n")); - *_retval = PR_TRUE; - } - // check for auto text/plain -> text/unicode mapping - if (*_retval == PR_FALSE && -- name && -- (strcmp(name, kTextMime) == 0) && -- ((strcmp(aDataFlavor, kUnicodeMime) == 0) || -- (strcmp(aDataFlavor, kFileMime) == 0))) { -+ (g_strcmp0(name, kTextMime) == 0) && -+ ((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) || -+ (g_strcmp0(aDataFlavor, kFileMime) == 0))) { - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("good! ( it's text plain and we're checking \ - against text/unicode or application/x-moz-file)\n")); - *_retval = PR_TRUE; - } - g_free(name); - } - return NS_OK; -@@ -946,17 +943,17 @@ nsDragService::IsTargetContextList(void) - - // walk the list of context targets and see if one of them is a list - // of items. - for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { - /* Bug 331198 */ - GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); - gchar *name = NULL; - name = gdk_atom_name(atom); -- if (strcmp(name, gMimeListType) == 0) -+ if (g_strcmp0(name, gMimeListType) == 0) - retval = PR_TRUE; - g_free(name); - if (retval) - break; - } - return retval; - } - diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/thunderbird-3.0.1-source.tar.bz2 b/thunderbird-3.0.1-source.tar.bz2 deleted file mode 100644 index 31c64f4..0000000 --- a/thunderbird-3.0.1-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e40d6bfff23015f757fd88e5224c785f9699626bbdae6a5e567acd31c78a0b5e -size 60243348 diff --git a/thunderbird-3.0.4-source.tar.bz2 b/thunderbird-3.0.4-source.tar.bz2 new file mode 100644 index 0000000..5bab324 --- /dev/null +++ b/thunderbird-3.0.4-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab9871fbc13cc28fdbb6f66b4fe8d7917ac915e4ac45e929352cc710410e62f2 +size 60553648