From e09f106df1bc2da6318f310762e9d596bd9a6880 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 11 Aug 2018 05:01:49 +0000 Subject: Sat Aug 11 05:01:49 UTC 2018 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xap/mozilla-thunderbird-60.0-x86_64-2.txz: Rebuilt. Applied upstream patch to fix crash with folder name with special characters. Thanks to Karl Magnus Kolstø for the bug report and link to the patch. --- ChangeLog.rss | 17 +++++++- ChangeLog.txt | 5 +++ FILELIST.TXT | 51 +++++++++++----------- recompress.sh | 1 + source/xap/mozilla-thunderbird/80754eac3809 | 32 ++++++++++++++ .../mozilla-thunderbird.SlackBuild | 7 ++- 6 files changed, 85 insertions(+), 28 deletions(-) create mode 100644 source/xap/mozilla-thunderbird/80754eac3809 diff --git a/ChangeLog.rss b/ChangeLog.rss index eac35a43..3729646c 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,22 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Fri, 10 Aug 2018 22:42:55 GMT - Sat, 11 Aug 2018 07:00:28 GMT + Sat, 11 Aug 2018 05:01:49 GMT + Sat, 11 Aug 2018 13:00:26 GMT maintain_current_git.sh v 1.10 + + Sat, 11 Aug 2018 05:01:49 GMT + Sat, 11 Aug 2018 05:01:49 GMT + https://git.slackware.nl/current/tag/?h=20180811050149 + 20180811050149 + + +xap/mozilla-thunderbird-60.0-x86_64-2.txz: Rebuilt. + Applied upstream patch to fix crash with folder name with special characters. + Thanks to Karl Magnus Kolstø for the bug report and link to the patch. + ]]> + + Fri, 10 Aug 2018 22:42:55 GMT Fri, 10 Aug 2018 22:42:55 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index b09337e4..fff3744c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Sat Aug 11 05:01:49 UTC 2018 +xap/mozilla-thunderbird-60.0-x86_64-2.txz: Rebuilt. + Applied upstream patch to fix crash with folder name with special characters. + Thanks to Karl Magnus Kolstø for the bug report and link to the patch. ++--------------------------+ Fri Aug 10 22:42:55 UTC 2018 a/kernel-generic-4.14.62-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.62-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index e83eb38d..3d65beb2 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Fri Aug 10 23:07:08 UTC 2018 +Sat Aug 11 05:23:18 UTC 2018 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2018-08-10 22:42 . +drwxr-xr-x 12 root root 4096 2018-08-11 05:13 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 13424 2018-06-13 05:25 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 899707 2018-08-07 23:35 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-08-07 23:35 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 899828 2018-08-11 05:13 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-08-11 05:13 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 454837 2018-08-10 22:42 ./ChangeLog.txt +-rw-r--r-- 1 root root 455102 2018-08-11 05:21 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2018-08-09 23:06 ./EFI/BOOT -rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2018-08-09 23:06 ./EFI/BOOT -rwxr-xr-x 1 root root 2494 2018-02-24 20:49 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1184211 2018-08-07 23:34 ./FILELIST.TXT +-rw-r--r-- 1 root root 1184340 2018-08-11 05:13 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 725339 2018-08-10 23:05 ./PACKAGES.TXT +-rw-r--r-- 1 root root 725339 2018-08-11 05:10 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3634 2018-08-09 21:52 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -748,11 +748,11 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 18 root root 4096 2018-08-10 23:05 ./slackware64 --rw-r--r-- 1 root root 288296 2018-08-10 23:05 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-08-10 23:05 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 359164 2018-08-10 23:02 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3603778 2018-08-10 23:03 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2018-08-11 05:11 ./slackware64 +-rw-r--r-- 1 root root 288296 2018-08-11 05:11 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-08-11 05:11 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 359164 2018-08-11 05:08 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3591121 2018-08-11 05:09 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 28672 2018-08-10 23:02 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt @@ -4690,7 +4690,7 @@ drwxr-xr-x 2 root root 65536 2018-08-07 23:30 ./slackware64/x -rw-r--r-- 1 root root 213 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txt -rw-r--r-- 1 root root 25288 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz.asc -drwxr-xr-x 2 root root 12288 2018-08-10 23:02 ./slackware64/xap +drwxr-xr-x 2 root root 12288 2018-08-11 05:08 ./slackware64/xap -rw-r--r-- 1 root root 625 2018-07-20 18:36 ./slackware64/xap/MPlayer-20180720-x86_64-1.txt -rw-r--r-- 1 root root 2733036 2018-07-20 18:36 ./slackware64/xap/MPlayer-20180720-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-07-20 18:36 ./slackware64/xap/MPlayer-20180720-x86_64-1.txz.asc @@ -4758,9 +4758,9 @@ drwxr-xr-x 2 root root 12288 2018-08-10 23:02 ./slackware64/xap -rw-r--r-- 1 root root 492 2018-06-25 17:49 ./slackware64/xap/mozilla-firefox-60.1.0esr-x86_64-1.txt -rw-r--r-- 1 root root 39725500 2018-06-25 17:49 ./slackware64/xap/mozilla-firefox-60.1.0esr-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-06-25 17:49 ./slackware64/xap/mozilla-firefox-60.1.0esr-x86_64-1.txz.asc --rw-r--r-- 1 root root 663 2018-08-06 19:41 ./slackware64/xap/mozilla-thunderbird-60.0-x86_64-1.txt --rw-r--r-- 1 root root 36578868 2018-08-06 19:41 ./slackware64/xap/mozilla-thunderbird-60.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-08-06 19:41 ./slackware64/xap/mozilla-thunderbird-60.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 663 2018-08-11 03:01 ./slackware64/xap/mozilla-thunderbird-60.0-x86_64-2.txt +-rw-r--r-- 1 root root 36576332 2018-08-11 03:01 ./slackware64/xap/mozilla-thunderbird-60.0-x86_64-2.txz +-rw-r--r-- 1 root root 163 2018-08-11 03:01 ./slackware64/xap/mozilla-thunderbird-60.0-x86_64-2.txz.asc -rw-r--r-- 1 root root 359 2018-08-07 23:02 ./slackware64/xap/network-manager-applet-1.8.16-x86_64-1.txt -rw-r--r-- 1 root root 1101700 2018-08-07 23:02 ./slackware64/xap/network-manager-applet-1.8.16-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-08-07 23:02 ./slackware64/xap/network-manager-applet-1.8.16-x86_64-1.txz.asc @@ -4930,11 +4930,11 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:35 ./slackware64/y -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez -rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile -drwxr-xr-x 19 root root 4096 2018-08-10 23:07 ./source --rw-r--r-- 1 root root 454171 2018-08-10 23:07 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-08-10 23:07 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 642678 2018-08-10 23:06 ./source/FILE_LIST --rw-r--r-- 1 root root 15162946 2018-08-10 23:06 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2018-08-11 05:13 ./source +-rw-r--r-- 1 root root 454247 2018-08-11 05:13 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-08-11 05:13 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 642772 2018-08-11 05:12 ./source/FILE_LIST +-rw-r--r-- 1 root root 15173474 2018-08-11 05:12 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 110 root root 4096 2018-07-09 19:21 ./source/a -rw-r--r-- 1 root root 769 2018-06-26 09:45 ./source/a/FTBFSlog @@ -12198,7 +12198,8 @@ lrwxrwxrwx 1 root root 4 2013-11-14 21:24 ./source/xap/mozilla-firefox -rwxr-xr-x 1 root root 14347 2018-08-07 21:12 ./source/xap/mozilla-firefox/mozilla-firefox.SlackBuild -rw-r--r-- 1 root root 2748 2017-12-04 21:30 ./source/xap/mozilla-firefox/mozilla-firefox.desktop -rw-r--r-- 1 root root 955 2018-02-27 06:46 ./source/xap/mozilla-firefox/slack-desc -drwxr-xr-x 4 root root 4096 2018-08-06 18:31 ./source/xap/mozilla-thunderbird +drwxr-xr-x 4 root root 4096 2018-08-11 00:25 ./source/xap/mozilla-thunderbird +-rw-r--r-- 1 root root 582 2018-08-11 00:24 ./source/xap/mozilla-thunderbird/80754eac3809.gz drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./source/xap/mozilla-thunderbird/autoconf -rw-r--r-- 1 root root 5869 2016-07-03 18:04 ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz -rw-r--r-- 1 root root 300116 1999-01-15 21:03 ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13.tar.xz @@ -12207,7 +12208,7 @@ drwxr-xr-x 2 root root 4096 2013-11-14 21:24 ./source/xap/mozilla-thunder -rwxr-xr-x 1 root root 34 2013-11-14 21:15 ./source/xap/mozilla-thunderbird/gold/gold lrwxrwxrwx 1 root root 4 2013-11-14 21:24 ./source/xap/mozilla-thunderbird/gold/ld -> gold -rw-r--r-- 1 root root 312 2012-03-28 18:01 ./source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch.gz --rwxr-xr-x 1 root root 11654 2018-08-06 23:11 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +-rwxr-xr-x 1 root root 11750 2018-08-11 00:31 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild -rw-r--r-- 1 root root 3378 2005-03-08 05:13 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.desktop -rw-r--r-- 1 root root 1130 2018-02-27 06:47 ./source/xap/mozilla-thunderbird/slack-desc -rw-r--r-- 1 root root 343 2017-06-14 23:43 ./source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff.gz @@ -12450,8 +12451,8 @@ drwxr-xr-x 2 root root 4096 2018-06-21 03:12 ./source/xfce/Thunar -rwxr-xr-x 1 root root 4674 2018-06-21 03:13 ./source/xfce/Thunar/Thunar.SlackBuild -rw-r--r-- 1 root root 66 2018-04-06 20:05 ./source/xfce/Thunar/Thunar.url -rw-r--r-- 1 root root 914 2018-02-27 06:13 ./source/xfce/Thunar/slack-desc -drwxr-xr-x 2 root root 4096 2018-06-21 20:21 ./source/xfce/exo --rw-r--r-- 1 root root 983586 2018-06-20 22:07 ./source/xfce/exo/exo-0.12.2.tar.lz +drwxr-xr-x 2 root root 4096 2018-06-21 20:21 ./source/xfce/exo +-rw-r--r-- 1 root root 983586 2018-06-20 22:07 ./source/xfce/exo/exo-0.12.2.tar.lz -rwxr-xr-x 1 root root 4674 2018-06-21 20:21 ./source/xfce/exo/exo.SlackBuild -rw-r--r-- 1 root root 62 2018-06-21 20:21 ./source/xfce/exo/exo.url -rw-r--r-- 1 root root 826 2018-02-27 06:13 ./source/xfce/exo/slack-desc diff --git a/recompress.sh b/recompress.sh index d4dd3150..854eeb4b 100755 --- a/recompress.sh +++ b/recompress.sh @@ -613,6 +613,7 @@ gzip ./source/xap/xpdf/lang/xpdf-greek.diff gzip ./source/xap/xpdf/lang/xpdf-arabic.diff gzip ./source/xap/xpdf/lang/xpdf-japanese.diff gzip ./source/xap/MPlayer/include-samba-4.0.patch +gzip ./source/xap/mozilla-thunderbird/80754eac3809 gzip ./source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch gzip ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch gzip ./source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff diff --git a/source/xap/mozilla-thunderbird/80754eac3809 b/source/xap/mozilla-thunderbird/80754eac3809 new file mode 100644 index 00000000..c38efb65 --- /dev/null +++ b/source/xap/mozilla-thunderbird/80754eac3809 @@ -0,0 +1,32 @@ + +# HG changeset patch +# User Magnus Melin +# Date 1533928828 -10800 +# Node ID 80754eac3809bff2f8fe4ea05bd16dbaf3dfe1a7 +# Parent 020481090e4e241e345f92410688c9f81e543911 +Bug 1482248 - don't crash on empty file name in nsMsgLocalStoreUtils::nsShouldIgnoreFile. r=jorgk + +diff --git a/mailnews/local/src/nsMsgLocalStoreUtils.cpp b/mailnews/local/src/nsMsgLocalStoreUtils.cpp +--- a/mailnews/local/src/nsMsgLocalStoreUtils.cpp ++++ b/mailnews/local/src/nsMsgLocalStoreUtils.cpp +@@ -23,16 +23,19 @@ nsMsgLocalStoreUtils::AddDirectorySepara + path->GetLeafName(leafName); + leafName.AppendLiteral(FOLDER_SUFFIX); + return path->SetLeafName(leafName); + } + + bool + nsMsgLocalStoreUtils::nsShouldIgnoreFile(nsAString& name) + { ++ if (name.IsEmpty()) ++ return true; ++ + char16_t firstChar = name.First(); + if (firstChar == '.' || firstChar == '#' || + name.CharAt(name.Length() - 1) == '~') + return true; + + if (name.LowerCaseEqualsLiteral("msgfilterrules.dat") || + name.LowerCaseEqualsLiteral("rules.dat") || + name.LowerCaseEqualsLiteral("filterlog.html") || + diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index fa0d4c02..3f7b3999 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-thunderbird VERSION=$(basename $(ls thunderbird-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Specify this variable for a localized build. # For example, to build a version of Thunderbird with Italian support, run @@ -161,6 +161,11 @@ cd thunderbird-$RELEASEVER || exit 1 # Retain GTK+ v2 scrolling behavior: zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p2 --verbose || exit 1 +# Fix crash with 60.0: +( cd comm + zcat $CWD/80754eac3809.gz | patch -p1 --verbose || exit 1 +) + # Fetch localization, if requested: if [ ! -z $MOZLOCALIZE ]; then LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE" -- cgit v1.2.3