From owner-svn-ports-branches@freebsd.org Sun May 13 09:39:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E5C4FD1221; Sun, 13 May 2018 09:39:19 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2D7E76F02; Sun, 13 May 2018 09:39:18 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE70C39ED; Sun, 13 May 2018 09:39:18 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4D9dIS8075702; Sun, 13 May 2018 09:39:18 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4D9dHbq075696; Sun, 13 May 2018 09:39:17 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201805130939.w4D9dHbq075696@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 13 May 2018 09:39:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469785 - in branches/2018Q2/audio/wavpack: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q2/audio/wavpack: . files X-SVN-Commit-Revision: 469785 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 May 2018 09:39:19 -0000 Author: riggs Date: Sun May 13 09:39:17 2018 New Revision: 469785 URL: https://svnweb.freebsd.org/changeset/ports/469785 Log: MFH: r469778 Fix multiple CVEs and memory leaks Details: - Import patches from upstream HEAD to address a bunch of critical CVEs including potential remote code execution and memory leaks PR: 228141 Submitted by: yasu@utahime.org Security: CVE-2018-6767 CVE-2018-7253 CVE-2018-7254 CVE-2018-10536 CVE-2018-10537 CVE-2018-10538 CVE-2018-10539 CVE-2018-10540 Approved by: ports-secteam (riggs) Added: branches/2018Q2/audio/wavpack/files/patch-CVE-2018-10536_10537 - copied unchanged from r469778, head/audio/wavpack/files/patch-CVE-2018-10536_10537 branches/2018Q2/audio/wavpack/files/patch-CVE-2018-10538_10539_10540 - copied unchanged from r469778, head/audio/wavpack/files/patch-CVE-2018-10538_10539_10540 branches/2018Q2/audio/wavpack/files/patch-CVE-2018-6767 - copied unchanged from r469778, head/audio/wavpack/files/patch-CVE-2018-6767 branches/2018Q2/audio/wavpack/files/patch-CVE-2018-7253 - copied unchanged from r469778, head/audio/wavpack/files/patch-CVE-2018-7253 branches/2018Q2/audio/wavpack/files/patch-CVE-2018-7254 - copied unchanged from r469778, head/audio/wavpack/files/patch-CVE-2018-7254 branches/2018Q2/audio/wavpack/files/patch-fix-memory-leaks - copied unchanged from r469778, head/audio/wavpack/files/patch-fix-memory-leaks Modified: branches/2018Q2/audio/wavpack/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/audio/wavpack/Makefile ============================================================================== --- branches/2018Q2/audio/wavpack/Makefile Sun May 13 09:34:04 2018 (r469784) +++ branches/2018Q2/audio/wavpack/Makefile Sun May 13 09:39:17 2018 (r469785) @@ -3,6 +3,7 @@ PORTNAME= wavpack PORTVERSION= 5.1.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.wavpack.com/ Copied: branches/2018Q2/audio/wavpack/files/patch-CVE-2018-10536_10537 (from r469778, head/audio/wavpack/files/patch-CVE-2018-10536_10537) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/wavpack/files/patch-CVE-2018-10536_10537 Sun May 13 09:39:17 2018 (r469785, copy of r469778, head/audio/wavpack/files/patch-CVE-2018-10536_10537) @@ -0,0 +1,63 @@ +From 26cb47f99d481ad9b93eeff80d26e6b63bbd7e15 Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 24 Apr 2018 22:18:07 -0700 +Subject: [PATCH 6/6] issue #30 issue #31 issue #32: no multiple format chunks + in WAV or W64 + +--- + cli/riff.c | 7 ++++++- + cli/wave64.c | 6 ++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git cli/riff.c cli/riff.c +index 7bddf63..5d6452e 100644 +--- cli/riff.c ++++ cli/riff.c +@@ -53,7 +53,7 @@ extern int debug_logging_mode; + + int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) + { +- int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0; ++ int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0, format_chunk = 0; + int64_t total_samples = 0, infilesize; + RiffChunkHeader riff_chunk_header; + ChunkHeader chunk_header; +@@ -140,6 +140,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + else if (!strncmp (chunk_header.ckID, "fmt ", 4)) { // if it's the format chunk, we want to get some info out of there and + int supported = TRUE, format; // make sure it's a .wav file we can handle + ++ if (format_chunk++) { ++ error_line ("%s is not a valid .WAV file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || + !DoReadFile (infile, &WaveHeader, chunk_header.ckSize, &bcount) || + bcount != chunk_header.ckSize) { +diff --git cli/wave64.c cli/wave64.c +index fa928a0..0388dc7 100644 +--- cli/wave64.c ++++ cli/wave64.c +@@ -53,6 +53,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + Wave64ChunkHeader chunk_header; + Wave64FileHeader filehdr; + WaveHeader WaveHeader; ++ int format_chunk = 0; + uint32_t bcount; + + infilesize = DoGetFileSize (infile); +@@ -104,6 +105,11 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + if (!memcmp (chunk_header.ckID, fmt_guid, sizeof (fmt_guid))) { + int supported = TRUE, format; + ++ if (format_chunk++) { ++ error_line ("%s is not a valid .W64 file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L; + + if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || +-- +2.17.0 + Copied: branches/2018Q2/audio/wavpack/files/patch-CVE-2018-10538_10539_10540 (from r469778, head/audio/wavpack/files/patch-CVE-2018-10538_10539_10540) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/wavpack/files/patch-CVE-2018-10538_10539_10540 Sun May 13 09:39:17 2018 (r469785, copy of r469778, head/audio/wavpack/files/patch-CVE-2018-10538_10539_10540) @@ -0,0 +1,75 @@ +From 6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 24 Apr 2018 17:27:01 -0700 +Subject: [PATCH 5/6] issue #33, sanitize size of unknown chunks before + malloc() + +--- + cli/dsdiff.c | 9 ++++++++- + cli/riff.c | 9 ++++++++- + cli/wave64.c | 9 ++++++++- + 3 files changed, 24 insertions(+), 3 deletions(-) + +diff --git cli/dsdiff.c cli/dsdiff.c +index c016df9..fa56bbb 100644 +--- cli/dsdiff.c ++++ cli/dsdiff.c +@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + else { // just copy unknown chunks to output file + + int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1); +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +diff --git cli/riff.c cli/riff.c +index de98c1e..7bddf63 100644 +--- cli/riff.c ++++ cli/riff.c +@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + else { // just copy unknown chunks to output file + + int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L; +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .WAV file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +diff --git cli/wave64.c cli/wave64.c +index 591d640..fa928a0 100644 +--- cli/wave64.c ++++ cli/wave64.c +@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + else { // just copy unknown chunks to output file + int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L; +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .W64 file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +-- +2.17.0 + Copied: branches/2018Q2/audio/wavpack/files/patch-CVE-2018-6767 (from r469778, head/audio/wavpack/files/patch-CVE-2018-6767) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/wavpack/files/patch-CVE-2018-6767 Sun May 13 09:39:17 2018 (r469785, copy of r469778, head/audio/wavpack/files/patch-CVE-2018-6767) @@ -0,0 +1,115 @@ +From d5bf76b5a88d044a1be1d5656698e3ba737167e5 Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Sun, 4 Feb 2018 11:28:15 -0800 +Subject: [PATCH 1/6] issue #27, do not overwrite stack on corrupt RF64 file + +--- + cli/riff.c | 39 ++++++++++++++++++++++++++++++++------- + 1 file changed, 32 insertions(+), 7 deletions(-) + +diff --git cli/riff.c cli/riff.c +index 8b1af45..de98c1e 100644 +--- cli/riff.c ++++ cli/riff.c +@@ -42,6 +42,7 @@ typedef struct { + + #pragma pack(pop) + ++#define CS64ChunkFormat "4D" + #define DS64ChunkFormat "DDDL" + + #define WAVPACK_NO_ERROR 0 +@@ -101,13 +102,13 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + + if (!strncmp (chunk_header.ckID, "ds64", 4)) { + if (chunk_header.ckSize < sizeof (DS64Chunk) || +- !DoReadFile (infile, &ds64_chunk, chunk_header.ckSize, &bcount) || +- bcount != chunk_header.ckSize) { ++ !DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) || ++ bcount != sizeof (DS64Chunk)) { + error_line ("%s is not a valid .WAV file!", infilename); + return WAVPACK_SOFT_ERROR; + } + else if (!(config->qmode & QMODE_NO_STORE_WRAPPER) && +- !WavpackAddWrapper (wpc, &ds64_chunk, chunk_header.ckSize)) { ++ !WavpackAddWrapper (wpc, &ds64_chunk, sizeof (DS64Chunk))) { + error_line ("%s", WavpackGetErrorMessage (wpc)); + return WAVPACK_SOFT_ERROR; + } +@@ -315,10 +316,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + + int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, int qmode) + { +- int do_rf64 = 0, write_junk = 1; ++ int do_rf64 = 0, write_junk = 1, table_length = 0; + ChunkHeader ds64hdr, datahdr, fmthdr; + RiffChunkHeader riffhdr; + DS64Chunk ds64_chunk; ++ CS64Chunk cs64_chunk; + JunkChunk junkchunk; + WaveHeader wavhdr; + uint32_t bcount; +@@ -380,6 +382,7 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + strncpy (riffhdr.formType, "WAVE", sizeof (riffhdr.formType)); + total_riff_bytes = sizeof (riffhdr) + wavhdrsize + sizeof (datahdr) + ((total_data_bytes + 1) & ~(int64_t)1); + if (do_rf64) total_riff_bytes += sizeof (ds64hdr) + sizeof (ds64_chunk); ++ total_riff_bytes += table_length * sizeof (CS64Chunk); + if (write_junk) total_riff_bytes += sizeof (junkchunk); + strncpy (fmthdr.ckID, "fmt ", sizeof (fmthdr.ckID)); + strncpy (datahdr.ckID, "data", sizeof (datahdr.ckID)); +@@ -394,11 +397,12 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + + if (do_rf64) { + strncpy (ds64hdr.ckID, "ds64", sizeof (ds64hdr.ckID)); +- ds64hdr.ckSize = sizeof (ds64_chunk); ++ ds64hdr.ckSize = sizeof (ds64_chunk) + (table_length * sizeof (CS64Chunk)); + CLEAR (ds64_chunk); + ds64_chunk.riffSize64 = total_riff_bytes; + ds64_chunk.dataSize64 = total_data_bytes; + ds64_chunk.sampleCount64 = total_samples; ++ ds64_chunk.tableLength = table_length; + riffhdr.ckSize = (uint32_t) -1; + datahdr.ckSize = (uint32_t) -1; + WavpackNativeToLittleEndian (&ds64hdr, ChunkHeaderFormat); +@@ -409,6 +413,14 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + datahdr.ckSize = (uint32_t) total_data_bytes; + } + ++ // this "table" is just a dummy placeholder for testing (normally not written) ++ ++ if (table_length) { ++ strncpy (cs64_chunk.ckID, "dmmy", sizeof (cs64_chunk.ckID)); ++ cs64_chunk.chunkSize64 = 12345678; ++ WavpackNativeToLittleEndian (&cs64_chunk, CS64ChunkFormat); ++ } ++ + // write the RIFF chunks up to just before the data starts + + WavpackNativeToLittleEndian (&riffhdr, ChunkHeaderFormat); +@@ -418,8 +430,21 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + + if (!DoWriteFile (outfile, &riffhdr, sizeof (riffhdr), &bcount) || bcount != sizeof (riffhdr) || + (do_rf64 && (!DoWriteFile (outfile, &ds64hdr, sizeof (ds64hdr), &bcount) || bcount != sizeof (ds64hdr))) || +- (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk))) || +- (write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || ++ (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk)))) { ++ error_line ("can't write .WAV data, disk probably full!"); ++ return FALSE; ++ } ++ ++ // again, this is normally not written except for testing ++ ++ while (table_length--) ++ if (!DoWriteFile (outfile, &cs64_chunk, sizeof (cs64_chunk), &bcount) || bcount != sizeof (cs64_chunk)) { ++ error_line ("can't write .WAV data, disk probably full!"); ++ return FALSE; ++ } ++ ++ ++ if ((write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || + !DoWriteFile (outfile, &fmthdr, sizeof (fmthdr), &bcount) || bcount != sizeof (fmthdr) || + !DoWriteFile (outfile, &wavhdr, wavhdrsize, &bcount) || bcount != wavhdrsize || + !DoWriteFile (outfile, &datahdr, sizeof (datahdr), &bcount) || bcount != sizeof (datahdr)) { +-- +2.17.0 + Copied: branches/2018Q2/audio/wavpack/files/patch-CVE-2018-7253 (from r469778, head/audio/wavpack/files/patch-CVE-2018-7253) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/wavpack/files/patch-CVE-2018-7253 Sun May 13 09:39:17 2018 (r469785, copy of r469778, head/audio/wavpack/files/patch-CVE-2018-7253) @@ -0,0 +1,35 @@ +From 36a24c7881427d2e1e4dc1cef58f19eee0d13aec Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Sat, 10 Feb 2018 16:01:39 -0800 +Subject: [PATCH 2/6] issue #28, do not overwrite heap on corrupt DSDIFF file + +--- + cli/dsdiff.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git cli/dsdiff.c cli/dsdiff.c +index 410dc1c..c016df9 100644 +--- cli/dsdiff.c ++++ cli/dsdiff.c +@@ -153,7 +153,17 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + error_line ("dsdiff file version = 0x%08x", version); + } + else if (!strncmp (dff_chunk_header.ckID, "PROP", 4)) { +- char *prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); ++ char *prop_chunk; ++ ++ if (dff_chunk_header.ckDataSize < 4 || dff_chunk_header.ckDataSize > 1024) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ if (debug_logging_mode) ++ error_line ("got PROP chunk of %d bytes total", (int) dff_chunk_header.ckDataSize); ++ ++ prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); + + if (!DoReadFile (infile, prop_chunk, (uint32_t) dff_chunk_header.ckDataSize, &bcount) || + bcount != dff_chunk_header.ckDataSize) { +-- +2.17.0 + Copied: branches/2018Q2/audio/wavpack/files/patch-CVE-2018-7254 (from r469778, head/audio/wavpack/files/patch-CVE-2018-7254) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/wavpack/files/patch-CVE-2018-7254 Sun May 13 09:39:17 2018 (r469785, copy of r469778, head/audio/wavpack/files/patch-CVE-2018-7254) @@ -0,0 +1,69 @@ +From 8e3fe45a7bac31d9a3b558ae0079e2d92a04799e Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Sun, 11 Feb 2018 16:37:47 -0800 +Subject: [PATCH 3/6] issue #28, fix buffer overflows and bad allocs on corrupt + CAF files + +--- + cli/caff.c | 30 +++++++++++++++++++++++------- + 1 file changed, 23 insertions(+), 7 deletions(-) + +diff --git cli/caff.c cli/caff.c +index ae57c4b..6248a71 100644 +--- cli/caff.c ++++ cli/caff.c +@@ -89,8 +89,8 @@ typedef struct + + #define CAFChannelDescriptionFormat "LLLLL" + +-static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21 }; +-static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16 }; ++static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21,0 }; ++static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16,0 }; + + static struct { + uint32_t mChannelLayoutTag; // Core Audio layout, 100 - 146 in high word, num channels in low word +@@ -274,10 +274,19 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + } + } + else if (!strncmp (caf_chunk_header.mChunkType, "chan", 4)) { +- CAFChannelLayout *caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); ++ CAFChannelLayout *caf_channel_layout; + +- if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || +- !DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || ++ if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || caf_chunk_header.mChunkSize > 1024) { ++ error_line ("this .CAF file has an invalid 'chan' chunk!"); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ if (debug_logging_mode) ++ error_line ("'chan' chunk is %d bytes", (int) caf_chunk_header.mChunkSize); ++ ++ caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); ++ ++ if (!DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || + bcount != caf_chunk_header.mChunkSize) { + error_line ("%s is not a valid .CAF file!", infilename); + free (caf_channel_layout); +@@ -495,8 +504,15 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + } + else { // just copy unknown chunks to output file + +- int bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; +- char *buff = malloc (bytes_to_copy); ++ uint32_t bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; ++ char *buff; ++ ++ if (caf_chunk_header.mChunkSize < 0 || caf_chunk_header.mChunkSize > 1048576) { ++ error_line ("%s is not a valid .CAF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +-- +2.17.0 + Copied: branches/2018Q2/audio/wavpack/files/patch-fix-memory-leaks (from r469778, head/audio/wavpack/files/patch-fix-memory-leaks) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/wavpack/files/patch-fix-memory-leaks Sun May 13 09:39:17 2018 (r469785, copy of r469778, head/audio/wavpack/files/patch-fix-memory-leaks) @@ -0,0 +1,36 @@ +From 0a72951de8feaaf4c6e1740b5cb5cd0401b00464 Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Sun, 8 Apr 2018 16:27:40 -0700 +Subject: [PATCH 4/6] fix memory leaks + +--- + src/common_utils.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git src/common_utils.c src/common_utils.c +index c53db91..f8ddc63 100644 +--- src/common_utils.c ++++ src/common_utils.c +@@ -384,6 +384,19 @@ WavpackContext *WavpackCloseFile (WavpackContext *wpc) + + WavpackFreeWrapper (wpc); + ++ if (wpc->metadata) { ++ int i; ++ ++ for (i = 0; i < wpc->metacount; ++i) ++ if (wpc->metadata [i].data) ++ free (wpc->metadata [i].data); ++ ++ free (wpc->metadata); ++ } ++ ++ if (wpc->channel_identities) ++ free (wpc->channel_identities); ++ + if (wpc->channel_reordering) + free (wpc->channel_reordering); + +-- +2.17.0 + From owner-svn-ports-branches@freebsd.org Sun May 13 11:08:12 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10561FD527E; Sun, 13 May 2018 11:08:12 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB71D7FED4; Sun, 13 May 2018 11:08:11 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F2C349AC; Sun, 13 May 2018 11:08:11 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4DB8BbC020689; Sun, 13 May 2018 11:08:11 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4DB8Bi9020687; Sun, 13 May 2018 11:08:11 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201805131108.w4DB8Bi9020687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 13 May 2018 11:08:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469786 - branches/2018Q2/devel/jenkins X-SVN-Group: ports-branches X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: branches/2018Q2/devel/jenkins X-SVN-Commit-Revision: 469786 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 May 2018 11:08:12 -0000 Author: lwhsu Date: Sun May 13 11:08:10 2018 New Revision: 469786 URL: https://svnweb.freebsd.org/changeset/ports/469786 Log: MFH: r469608 - Update to 2.121 Security: 06ab7724-0fd7-427e-a5ce-fe436302b10c Approved by: ports-secteam (riggs) Modified: branches/2018Q2/devel/jenkins/Makefile branches/2018Q2/devel/jenkins/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/jenkins/Makefile ============================================================================== --- branches/2018Q2/devel/jenkins/Makefile Sun May 13 09:39:17 2018 (r469785) +++ branches/2018Q2/devel/jenkins/Makefile Sun May 13 11:08:10 2018 (r469786) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 2.113 +PORTVERSION= 2.121 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins Modified: branches/2018Q2/devel/jenkins/distinfo ============================================================================== --- branches/2018Q2/devel/jenkins/distinfo Sun May 13 09:39:17 2018 (r469785) +++ branches/2018Q2/devel/jenkins/distinfo Sun May 13 11:08:10 2018 (r469786) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522421016 -SHA256 (jenkins/2.113/jenkins.war) = 3c443d9aeb178058287d12bb5b81b330e78e83ea949069b82c780257ce301390 -SIZE (jenkins/2.113/jenkins.war) = 74584533 +TIMESTAMP = 1526008976 +SHA256 (jenkins/2.121/jenkins.war) = 3b1b415d98cfa13dac7b68138d56f787f9504213da96c7d43d4e374f01a296dc +SIZE (jenkins/2.121/jenkins.war) = 74737297 From owner-svn-ports-branches@freebsd.org Sun May 13 12:32:38 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88075FDA443; Sun, 13 May 2018 12:32:38 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2FB006C72B; Sun, 13 May 2018 12:32:38 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EBF27582A; Sun, 13 May 2018 12:32:37 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4DCWbRT065925; Sun, 13 May 2018 12:32:37 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4DCWatF065917; Sun, 13 May 2018 12:32:36 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201805131232.w4DCWatF065917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 13 May 2018 12:32:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469792 - in branches/2018Q2/sysutils/e2fsprogs: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2018Q2/sysutils/e2fsprogs: . files X-SVN-Commit-Revision: 469792 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 May 2018 12:32:39 -0000 Author: mandree Date: Sun May 13 12:32:36 2018 New Revision: 469792 URL: https://svnweb.freebsd.org/changeset/ports/469792 Log: MFH: r469630 Cherry-pick upstream bug fixes from Git. This is pending an 1.44.2 release, and contains these fixes from maint: filefrag: avoid temporary buffer overflow libext2fs: add sanity checks for ea_in_inode e2image: fix metadata image handling on big endian systems e2fsck: warn if checkinterval and broken_system_clock both set tests: don't leave temp files behind after running i_bitmaps tests: add new test f_ea_inode_self_ref chattr.1: 'a' and 'i' attribute do not affect existing file Approved by: ports-secteam (riggs@) Added: branches/2018Q2/sysutils/e2fsprogs/files/patch-za - copied unchanged from r469630, head/sysutils/e2fsprogs/files/patch-za branches/2018Q2/sysutils/e2fsprogs/files/patch-zb - copied unchanged from r469630, head/sysutils/e2fsprogs/files/patch-zb branches/2018Q2/sysutils/e2fsprogs/files/patch-zc - copied unchanged from r469630, head/sysutils/e2fsprogs/files/patch-zc branches/2018Q2/sysutils/e2fsprogs/files/patch-zd - copied unchanged from r469630, head/sysutils/e2fsprogs/files/patch-zd branches/2018Q2/sysutils/e2fsprogs/files/patch-ze - copied unchanged from r469630, head/sysutils/e2fsprogs/files/patch-ze branches/2018Q2/sysutils/e2fsprogs/files/patch-zf - copied unchanged from r469630, head/sysutils/e2fsprogs/files/patch-zf branches/2018Q2/sysutils/e2fsprogs/files/patch-zg - copied unchanged from r469630, head/sysutils/e2fsprogs/files/patch-zg Modified: branches/2018Q2/sysutils/e2fsprogs/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/e2fsprogs/Makefile ============================================================================== --- branches/2018Q2/sysutils/e2fsprogs/Makefile Sun May 13 12:25:45 2018 (r469791) +++ branches/2018Q2/sysutils/e2fsprogs/Makefile Sun May 13 12:32:36 2018 (r469792) @@ -3,7 +3,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.44.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} Copied: branches/2018Q2/sysutils/e2fsprogs/files/patch-za (from r469630, head/sysutils/e2fsprogs/files/patch-za) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/e2fsprogs/files/patch-za Sun May 13 12:32:36 2018 (r469792, copy of r469630, head/sysutils/e2fsprogs/files/patch-za) @@ -0,0 +1,34 @@ +From 17a1f2c1929630e3a79e6b98168d56f96acf2e8b Mon Sep 17 00:00:00 2001 +From: Andreas Dilger +Date: Thu, 29 Mar 2018 12:36:54 -0600 +Subject: filefrag: avoid temporary buffer overflow + +If an unknown flag is present in a FIEMAP extent, it is printed as a +hex value into a temporary buffer before adding it to the flags. If +that unknown flag is over 0xfff then it will overflow the temporary +buffer. + +Reported-by: Sarah Liu +Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-10335 +Signed-off-by: Andreas Dilger +Signed-off-by: Theodore Ts'o +--- + misc/filefrag.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/filefrag.c b/misc/filefrag.c +index 9c57ab9..dc00393 100644 +--- ./misc/filefrag.c ++++ b/misc/filefrag.c +@@ -179,7 +179,7 @@ static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex, + print_flag(&fe_flags, FIEMAP_EXTENT_SHARED, flags, "shared,"); + /* print any unknown flags as hex values */ + for (mask = 1; fe_flags != 0 && mask != 0; mask <<= 1) { +- char hex[6]; ++ char hex[sizeof(mask) * 2 + 4]; /* 2 chars/byte + 0x, + NUL */ + + if ((fe_flags & mask) == 0) + continue; +-- +cgit v1.1 + Copied: branches/2018Q2/sysutils/e2fsprogs/files/patch-zb (from r469630, head/sysutils/e2fsprogs/files/patch-zb) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/e2fsprogs/files/patch-zb Sun May 13 12:32:36 2018 (r469792, copy of r469630, head/sysutils/e2fsprogs/files/patch-zb) @@ -0,0 +1,73 @@ +From 9db53e3fec3413572a2240bd374e76353fab9cbe Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Sat, 7 Apr 2018 00:28:49 -0400 +Subject: libext2fs: add sanity checks for ea_in_inode + +An inode containing the value for an extended attribute (aka an +ea_in_inode) must not have the INLINE_DATA flag and must have the +EA_INODE flag set. Enforcing this prevents e2fsck and debugfs crashes +caused by a maliciously crafted file system containing an inode which +has both the EA_INODE and INLINE_DATA flags set, and where that inode +has an extended attribute whose e_value_inum points to itself. + +Reported-by: Wen Xu +Signed-off-by: Theodore Ts'o +--- + e2fsck/pass1.c | 1 + + lib/ext2fs/ext2_err.et.in | 3 +++ + lib/ext2fs/ext_attr.c | 8 +++++++- + 3 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c +index fccd881..69b3f09 100644 +--- ./e2fsck/pass1.c ++++ b/e2fsck/pass1.c +@@ -1542,6 +1542,7 @@ void e2fsck_pass1(e2fsck_t ctx) + case EXT2_ET_NO_INLINE_DATA: + case EXT2_ET_EXT_ATTR_CSUM_INVALID: + case EXT2_ET_EA_BAD_VALUE_OFFSET: ++ case EXT2_ET_EA_INODE_CORRUPTED: + /* broken EA or no system.data EA; truncate */ + if (fix_problem(ctx, PR_1_INLINE_DATA_NO_ATTR, + &pctx)) { +diff --git a/lib/ext2fs/ext2_err.et.in b/lib/ext2fs/ext2_err.et.in +index ac96964..16abd23 100644 +--- ./lib/ext2fs/ext2_err.et.in ++++ b/lib/ext2fs/ext2_err.et.in +@@ -542,4 +542,7 @@ ec EXT2_ET_CORRUPT_JOURNAL_SB, + ec EXT2_ET_INODE_CORRUPTED, + "Inode is corrupted" + ++ec EXT2_ET_EA_INODE_CORRUPTED, ++ "Inode containing extended attribute value is corrupted" ++ + end +diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c +index 89c5f2c..81b067a 100644 +--- ./lib/ext2fs/ext_attr.c ++++ b/lib/ext2fs/ext_attr.c +@@ -903,6 +903,7 @@ static errcode_t read_xattrs_from_buffer(struct ext2_xattr_handle *handle, + memcpy(x->value, value_start + entry->e_value_offs, + entry->e_value_size); + } else { ++ struct ext2_inode *ea_inode; + ext2_file_t ea_file; + + if (entry->e_value_offs != 0) +@@ -920,7 +921,12 @@ static errcode_t read_xattrs_from_buffer(struct ext2_xattr_handle *handle, + if (err) + return err; + +- if (ext2fs_file_get_size(ea_file) != ++ ea_inode = ext2fs_file_get_inode(ea_file); ++ if ((ea_inode->i_flags & EXT4_INLINE_DATA_FL) || ++ !(ea_inode->i_flags & EXT4_EA_INODE_FL) || ++ ea_inode->i_links_count == 0) ++ err = EXT2_ET_EA_INODE_CORRUPTED; ++ else if (ext2fs_file_get_size(ea_file) != + entry->e_value_size) + err = EXT2_ET_EA_BAD_VALUE_SIZE; + else +-- +cgit v1.1 + Copied: branches/2018Q2/sysutils/e2fsprogs/files/patch-zc (from r469630, head/sysutils/e2fsprogs/files/patch-zc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/e2fsprogs/files/patch-zc Sun May 13 12:32:36 2018 (r469792, copy of r469630, head/sysutils/e2fsprogs/files/patch-zc) @@ -0,0 +1,226 @@ +From bfc1856029ff6851845de27114fea899bbdbccbe Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Mon, 9 Apr 2018 11:58:15 -0400 +Subject: e2image: fix metadata image handling on big endian systems + +Currently e2image metadata image handling and creating is completely +broken on big endian systems. It just does not care about endianness at +all. This was uncovered With addition of i_bitmaps test, which is the +first test that actually tests e2image metadata image. + +Fix it by making sure that all on-disk metadata that we write and read +to/from the metadata image is properly converted. + +Signed-off-by: Lukas Czerner +Signed-off-by: Theodore Ts'o +--- + lib/ext2fs/imager.c | 41 +++++++++++++++++++++++++++++++++++++++++ + lib/ext2fs/inode.c | 2 +- + lib/ext2fs/openfs.c | 4 ++-- + lib/ext2fs/rw_bitmaps.c | 4 ++-- + misc/e2image.c | 22 +++++++++++----------- + 5 files changed, 57 insertions(+), 16 deletions(-) + +diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c +index efb85b9..7fd06f7 100644 +--- ./lib/ext2fs/imager.c ++++ b/lib/ext2fs/imager.c +@@ -195,6 +195,11 @@ errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd, + char *buf, *cp; + ssize_t actual; + errcode_t retval; ++#ifdef WORDS_BIGENDIAN ++ unsigned int groups_per_block; ++ struct ext2_group_desc *gdp; ++ int j; ++#endif + + buf = malloc(fs->blocksize); + if (!buf) +@@ -204,7 +209,17 @@ errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd, + * Write out the superblock + */ + memset(buf, 0, fs->blocksize); ++#ifdef WORDS_BIGENDIAN ++ /* ++ * We're writing out superblock so let's convert ++ * it to little endian and then back if needed ++ */ ++ ext2fs_swap_super(fs->super); + memcpy(buf, fs->super, SUPERBLOCK_SIZE); ++ ext2fs_swap_super(fs->super); ++#else ++ memcpy(buf, fs->super, SUPERBLOCK_SIZE); ++#endif + actual = write(fd, buf, fs->blocksize); + if (actual == -1) { + retval = errno; +@@ -218,8 +233,34 @@ errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd, + /* + * Now write out the block group descriptors + */ ++ + cp = (char *) fs->group_desc; ++ ++#ifdef WORDS_BIGENDIAN ++ /* ++ * Convert group descriptors to little endian and back ++ * if needed ++ */ ++ groups_per_block = EXT2_DESC_PER_BLOCK(fs->super); ++ gdp = (struct ext2_group_desc *) cp; ++ for (j=0; j < groups_per_block*fs->desc_blocks; j++) { ++ gdp = ext2fs_group_desc(fs, fs->group_desc, j); ++ ext2fs_swap_group_desc2(fs, gdp); ++ } ++#endif ++ + actual = write(fd, cp, fs->blocksize * fs->desc_blocks); ++ ++ ++#ifdef WORDS_BIGENDIAN ++ groups_per_block = EXT2_DESC_PER_BLOCK(fs->super); ++ gdp = (struct ext2_group_desc *) cp; ++ for (j=0; j < groups_per_block*fs->desc_blocks; j++) { ++ gdp = ext2fs_group_desc(fs, fs->group_desc, j); ++ ext2fs_swap_group_desc2(fs, gdp); ++ } ++#endif ++ + if (actual == -1) { + retval = errno; + goto errout; +diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c +index ad01a9f..015cfe4 100644 +--- ./lib/ext2fs/inode.c ++++ b/lib/ext2fs/inode.c +@@ -770,7 +770,7 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino, + } + if (fs->flags & EXT2_FLAG_IMAGE_FILE) { + inodes_per_block = fs->blocksize / EXT2_INODE_SIZE(fs->super); +- block_nr = fs->image_header->offset_inode / fs->blocksize; ++ block_nr = ext2fs_le32_to_cpu(fs->image_header->offset_inode) / fs->blocksize; + block_nr += (ino - 1) / inodes_per_block; + offset = ((ino - 1) % inodes_per_block) * + EXT2_INODE_SIZE(fs->super); +diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c +index 385d6e8..532e70f 100644 +--- ./lib/ext2fs/openfs.c ++++ b/lib/ext2fs/openfs.c +@@ -185,10 +185,10 @@ errcode_t ext2fs_open2(const char *name, const char *io_options, + fs->image_header); + if (retval) + goto cleanup; +- if (fs->image_header->magic_number != EXT2_ET_MAGIC_E2IMAGE) ++ if (ext2fs_le32_to_cpu(fs->image_header->magic_number) != EXT2_ET_MAGIC_E2IMAGE) + return EXT2_ET_MAGIC_E2IMAGE; + superblock = 1; +- block_size = fs->image_header->fs_blocksize; ++ block_size = ext2fs_le32_to_cpu(fs->image_header->fs_blocksize); + } + + /* +diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c +index 0b532db..e86bacd 100644 +--- ./lib/ext2fs/rw_bitmaps.c ++++ b/lib/ext2fs/rw_bitmaps.c +@@ -253,7 +253,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) + ext2fs_free_mem(&buf); + + if (fs->flags & EXT2_FLAG_IMAGE_FILE) { +- blk = (fs->image_header->offset_inodemap / fs->blocksize); ++ blk = (ext2fs_le32_to_cpu(fs->image_header->offset_inodemap) / fs->blocksize); + ino_cnt = fs->super->s_inodes_count; + while (inode_bitmap && ino_cnt > 0) { + retval = io_channel_read_blk64(fs->image_io, blk++, +@@ -270,7 +270,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) + ino_itr += cnt; + ino_cnt -= cnt; + } +- blk = (fs->image_header->offset_blockmap / ++ blk = (ext2fs_le32_to_cpu(fs->image_header->offset_blockmap) / + fs->blocksize); + blk_cnt = EXT2_GROUPS_TO_CLUSTERS(fs->super, + fs->group_desc_count); +diff --git a/misc/e2image.c b/misc/e2image.c +index 5a18bb4..83ae633 100644 +--- ./misc/e2image.c ++++ b/misc/e2image.c +@@ -240,7 +240,7 @@ static void write_image_file(ext2_filsys fs, int fd) + write_header(fd, NULL, sizeof(struct ext2_image_hdr), fs->blocksize); + memset(&hdr, 0, sizeof(struct ext2_image_hdr)); + +- hdr.offset_super = seek_relative(fd, 0); ++ hdr.offset_super = ext2fs_cpu_to_le32(seek_relative(fd, 0)); + retval = ext2fs_image_super_write(fs, fd, 0); + if (retval) { + com_err(program_name, retval, "%s", +@@ -248,7 +248,7 @@ static void write_image_file(ext2_filsys fs, int fd) + exit(1); + } + +- hdr.offset_inode = seek_relative(fd, 0); ++ hdr.offset_inode = ext2fs_cpu_to_le32(seek_relative(fd, 0)); + retval = ext2fs_image_inode_write(fs, fd, + (fd != 1) ? IMAGER_FLAG_SPARSEWRITE : 0); + if (retval) { +@@ -257,7 +257,7 @@ static void write_image_file(ext2_filsys fs, int fd) + exit(1); + } + +- hdr.offset_blockmap = seek_relative(fd, 0); ++ hdr.offset_blockmap = ext2fs_cpu_to_le32(seek_relative(fd, 0)); + retval = ext2fs_image_bitmap_write(fs, fd, 0); + if (retval) { + com_err(program_name, retval, "%s", +@@ -265,7 +265,7 @@ static void write_image_file(ext2_filsys fs, int fd) + exit(1); + } + +- hdr.offset_inodemap = seek_relative(fd, 0); ++ hdr.offset_inodemap = ext2fs_cpu_to_le32(seek_relative(fd, 0)); + retval = ext2fs_image_bitmap_write(fs, fd, IMAGER_FLAG_INODEMAP); + if (retval) { + com_err(program_name, retval, "%s", +@@ -273,23 +273,23 @@ static void write_image_file(ext2_filsys fs, int fd) + exit(1); + } + +- hdr.magic_number = EXT2_ET_MAGIC_E2IMAGE; ++ hdr.magic_number = ext2fs_cpu_to_le32(EXT2_ET_MAGIC_E2IMAGE); + strcpy(hdr.magic_descriptor, "Ext2 Image 1.0"); + gethostname(hdr.fs_hostname, sizeof(hdr.fs_hostname)); + strncpy(hdr.fs_device_name, device_name, sizeof(hdr.fs_device_name)-1); + hdr.fs_device_name[sizeof(hdr.fs_device_name) - 1] = 0; +- hdr.fs_blocksize = fs->blocksize; ++ hdr.fs_blocksize = ext2fs_cpu_to_le32(fs->blocksize); + + if (stat(device_name, &st) == 0) +- hdr.fs_device = st.st_rdev; ++ hdr.fs_device = ext2fs_cpu_to_le32(st.st_rdev); + + if (fstat(fd, &st) == 0) { +- hdr.image_device = st.st_dev; +- hdr.image_inode = st.st_ino; ++ hdr.image_device = ext2fs_cpu_to_le32(st.st_dev); ++ hdr.image_inode = ext2fs_cpu_to_le32(st.st_ino); + } + memcpy(hdr.fs_uuid, fs->super->s_uuid, sizeof(hdr.fs_uuid)); + +- hdr.image_time = time(0); ++ hdr.image_time = ext2fs_cpu_to_le32(time(0)); + write_header(fd, &hdr, sizeof(struct ext2_image_hdr), fs->blocksize); + } + +@@ -1423,7 +1423,7 @@ static void install_image(char *device, char *image_fn, int type) + + ext2fs_rewrite_to_io(fs, io); + +- seek_set(fd, fs->image_header->offset_inode); ++ seek_set(fd, ext2fs_le32_to_cpu(fs->image_header->offset_inode)); + + retval = ext2fs_image_inode_read(fs, fd, 0); + if (retval) { +-- +cgit v1.1 + Copied: branches/2018Q2/sysutils/e2fsprogs/files/patch-zd (from r469630, head/sysutils/e2fsprogs/files/patch-zd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/e2fsprogs/files/patch-zd Sun May 13 12:32:36 2018 (r469792, copy of r469630, head/sysutils/e2fsprogs/files/patch-zd) @@ -0,0 +1,39 @@ +From 4c41e6801fad37fedbbe8feb849eec190b41a733 Mon Sep 17 00:00:00 2001 +From: Eric Sandeen +Date: Mon, 9 Apr 2018 15:28:12 -0400 +Subject: e2fsck: warn if checkinterval and broken_system_clock both set + +If broken_system_clock is set in e2fsck.conf and this causes +the check interval to be ignored, make that clear to the user: + +e2fsck 1.44.1 (24-Mar-2018) +/dev/sda1: ignoring check interval, broken_system_clock set +/dev/sda1: clean, 11/65536 files, 12955/262144 blocks + +Signed-off-by: Eric Sandeen +Signed-off-by: Theodore Ts'o +Reviewed-by: Lukas Czerner +--- + e2fsck/unix.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/e2fsck/unix.c b/e2fsck/unix.c +index faf5af9..cbe5ec5 100644 +--- ./e2fsck/unix.c ++++ b/e2fsck/unix.c +@@ -396,7 +396,12 @@ static void check_if_skip(e2fsck_t ctx) + if (batt && ((ctx->now - fs->super->s_lastcheck) < + fs->super->s_checkinterval*2)) + reason = 0; ++ } else if (broken_system_clock && fs->super->s_checkinterval) { ++ log_out(ctx, "%s: ", ctx->device_name); ++ log_out(ctx, "%s", ++ _("ignoring check interval, broken_system_clock set\n")); + } ++ + if (reason) { + log_out(ctx, "%s", ctx->device_name); + log_out(ctx, reason, reason_arg); +-- +cgit v1.1 + Copied: branches/2018Q2/sysutils/e2fsprogs/files/patch-ze (from r469630, head/sysutils/e2fsprogs/files/patch-ze) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/e2fsprogs/files/patch-ze Sun May 13 12:32:36 2018 (r469792, copy of r469630, head/sysutils/e2fsprogs/files/patch-ze) @@ -0,0 +1,24 @@ +From 2bb826370c12f599fe6cc401fa83a0e7a592f0df Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Mon, 9 Apr 2018 15:37:00 -0400 +Subject: tests: don't leave temp files behind after running i_bitmaps + +Signed-off-by: Theodore Ts'o +--- + tests/i_bitmaps/script | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/i_bitmaps/script b/tests/i_bitmaps/script +index b8e3bd2..1a16d55 100644 +--- ./tests/i_bitmaps/script ++++ b/tests/i_bitmaps/script +@@ -24,5 +24,5 @@ else + rm -f $test_name.tmp + fi + +-rm -rf $TMPFILE $TMPFILE.bin $TMPFILE.1 ++rm -rf $TMPFILE $TMPFILE.bin $TMPFILE.1 $TMPFILE.2 $TMPFILE.e2i + unset IMAGE FSCK_OPT OUT EXP +-- +cgit v1.1 + Copied: branches/2018Q2/sysutils/e2fsprogs/files/patch-zf (from r469630, head/sysutils/e2fsprogs/files/patch-zf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/e2fsprogs/files/patch-zf Sun May 13 12:32:36 2018 (r469792, copy of r469630, head/sysutils/e2fsprogs/files/patch-zf) @@ -0,0 +1,71 @@ +From b46fbf3d52e722d9810dad97a5fa443b280c8a82 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Sat, 7 Apr 2018 01:12:00 -0400 +Subject: tests: add new test f_ea_inode_self_ref + +Make sure we can handle a maliciously created file system containing +an inode containing an extended attribute whose e_value_inum points +back at itself. + +Signed-off-by: Theodore Ts'o +--- + tests/f_ea_inode_self_ref/expect.1 | 17 +++++++++++++++++ + tests/f_ea_inode_self_ref/expect.2 | 7 +++++++ + tests/f_ea_inode_self_ref/image.gz | Bin 0 -> 661 bytes + tests/f_ea_inode_self_ref/name | 1 + + 4 files changed, 25 insertions(+) + create mode 100644 tests/f_ea_inode_self_ref/expect.1 + create mode 100644 tests/f_ea_inode_self_ref/expect.2 + create mode 100644 tests/f_ea_inode_self_ref/image.gz + create mode 100644 tests/f_ea_inode_self_ref/name + +diff --git a/tests/f_ea_inode_self_ref/expect.1 b/tests/f_ea_inode_self_ref/expect.1 +new file mode 100644 +index 0000000..f94c04d +--- /dev/null ++++ b/tests/f_ea_inode_self_ref/expect.1 +@@ -0,0 +1,17 @@ ++Pass 1: Checking inodes, blocks, and sizes ++Inode 16 has INLINE_DATA_FL flag but extended attribute not found. Truncate? yes ++ ++Extended attribute in inode 16 has a hash (553648128) which is invalid ++Clear? yes ++ ++Pass 2: Checking directory structure ++Pass 3: Checking directory connectivity ++Pass 4: Checking reference counts ++Pass 5: Checking group summary information ++Block bitmap differences: -20 ++Fix? yes ++ ++ ++test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** ++test_filesys: 16/16 files (0.0% non-contiguous), 21/100 blocks ++Exit status is 1 +diff --git a/tests/f_ea_inode_self_ref/expect.2 b/tests/f_ea_inode_self_ref/expect.2 +new file mode 100644 +index 0000000..9398061 +--- /dev/null ++++ b/tests/f_ea_inode_self_ref/expect.2 +@@ -0,0 +1,7 @@ ++Pass 1: Checking inodes, blocks, and sizes ++Pass 2: Checking directory structure ++Pass 3: Checking directory connectivity ++Pass 4: Checking reference counts ++Pass 5: Checking group summary information ++test_filesys: 16/16 files (0.0% non-contiguous), 21/100 blocks ++Exit status is 0 +diff --git a/tests/f_ea_inode_self_ref/image.gz b/tests/f_ea_inode_self_ref/image.gz +new file mode 100644 +index 0000000..3cc733b +Binary files /dev/null and b/tests/f_ea_inode_self_ref/image.gz differ +diff --git a/tests/f_ea_inode_self_ref/name b/tests/f_ea_inode_self_ref/name +new file mode 100644 +index 0000000..4e68da8 +--- /dev/null ++++ b/tests/f_ea_inode_self_ref/name +@@ -0,0 +1 @@ ++corrupted, self-referential ea_in_inode +-- +cgit v1.1 + Copied: branches/2018Q2/sysutils/e2fsprogs/files/patch-zg (from r469630, head/sysutils/e2fsprogs/files/patch-zg) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/e2fsprogs/files/patch-zg Sun May 13 12:32:36 2018 (r469792, copy of r469630, head/sysutils/e2fsprogs/files/patch-zg) @@ -0,0 +1,45 @@ +From d3f01729bff29e75b21994dc305e09fb055baff3 Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Fri, 13 Apr 2018 14:27:49 +0200 +Subject: chattr.1: 'a' and 'i' attribute do not affect existing file + descriptors + +Change chattr man page to make it clear that 'i' and 'a' attributes +does not affect the ability to write to already existing file +descriptors + +Signed-off-by: Lukas Czerner +Signed-off-by: Theodore Ts'o +--- + misc/chattr.1.in | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/misc/chattr.1.in b/misc/chattr.1.in +index fba9cea..028ae9e 100644 +--- ./misc/chattr.1.in ++++ b/misc/chattr.1.in +@@ -121,9 +121,9 @@ although it can be displayed by + .PP + A file with the 'i' attribute cannot be modified: it cannot be deleted or + renamed, no link can be created to this file, most of the file's +-metadata can not be modified, and no data can be written +-to the file. Only the superuser or a process possessing the +-CAP_LINUX_IMMUTABLE capability can set or clear this attribute. ++metadata can not be modified, and the file can not be opened in write mode. ++Only the superuser or a process possessing the CAP_LINUX_IMMUTABLE ++capability can set or clear this attribute. + .PP + The 'I' attribute is used by the htree code to indicate that a directory + is being indexed using hashed trees. It may not be set or reset using +@@ -191,6 +191,8 @@ maintained by Theodore Ts'o . + The 'c', 's', and 'u' attributes are not honored + by the ext2, ext3, and ext4 filesystems as implemented in the current + mainline Linux kernels. ++Setting 'a' and 'i' attributes will not affect the ability to write ++to already existing file descriptors. + .PP + The 'j' option is only useful for ext3 and ext4 file systems. + .PP +-- +cgit v1.1 + From owner-svn-ports-branches@freebsd.org Sun May 13 14:02:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB0F0FDE62F; Sun, 13 May 2018 14:02:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5BCD77905B; Sun, 13 May 2018 14:02:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D76866B9; Sun, 13 May 2018 14:02:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4DE2JL2011386; Sun, 13 May 2018 14:02:19 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4DE2I2b011383; Sun, 13 May 2018 14:02:18 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201805131402.w4DE2I2b011383@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 13 May 2018 14:02:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469795 - in branches/2018Q2/databases: mariadb101-client/files mariadb101-server mariadb101-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q2/databases: mariadb101-client/files mariadb101-server mariadb101-server/files X-SVN-Commit-Revision: 469795 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 May 2018 14:02:19 -0000 Author: brnrd Date: Sun May 13 14:02:18 2018 New Revision: 469795 URL: https://svnweb.freebsd.org/changeset/ports/469795 Log: MFH: r469620 r469631 databases/mariadb101-server: Security update to 10.1.33 - Fix build on aarch64 [1] - Remove ${name}_limits for 11-STABLE [2] PR: 227628 [1], 227434 [2], 228148 [3] Submitted by: Naram Qashat [1] Submitted by: 0mp [2] Reported by: Miroslav Lachman <000 fbsd quip cz> [3] Security: 57aec168-453e-11e8-8777-b499baebfeaf databases/mariadb101-client: Fix patch Reported by: Niels Poppe Approved by: portmgr (riggs) Added: branches/2018Q2/databases/mariadb101-server/files/patch-MDEV-15961 - copied unchanged from r469620, head/databases/mariadb101-server/files/patch-MDEV-15961 Deleted: branches/2018Q2/databases/mariadb101-client/files/patch-sql-common_client.c branches/2018Q2/databases/mariadb101-server/files/patch-sql-common_client.c Modified: branches/2018Q2/databases/mariadb101-server/Makefile branches/2018Q2/databases/mariadb101-server/distinfo branches/2018Q2/databases/mariadb101-server/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/databases/mariadb101-server/Makefile ============================================================================== --- branches/2018Q2/databases/mariadb101-server/Makefile Sun May 13 13:36:03 2018 (r469794) +++ branches/2018Q2/databases/mariadb101-server/Makefile Sun May 13 14:02:18 2018 (r469795) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.31 +PORTVERSION= 10.1.33 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ @@ -22,7 +22,6 @@ LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_aarch64= Fails to link: missing sbrk BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct dh_st' @@ -183,6 +182,14 @@ post-install-MROONGA-on: ${STAGEDIR}${PREFIX}/share/groonga \ ${STAGEDIR}${PREFIX}/share/mysql .endif # defined(CLIENT_ONLY) + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif .include Modified: branches/2018Q2/databases/mariadb101-server/distinfo ============================================================================== --- branches/2018Q2/databases/mariadb101-server/distinfo Sun May 13 13:36:03 2018 (r469794) +++ branches/2018Q2/databases/mariadb101-server/distinfo Sun May 13 14:02:18 2018 (r469795) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518260559 -SHA256 (mariadb-10.1.31.tar.gz) = ab7641c2fe4e5289da6141766a9c3350e013def56fafd6f1377080bc8048b2e6 -SIZE (mariadb-10.1.31.tar.gz) = 67982786 +TIMESTAMP = 1525903240 +SHA256 (mariadb-10.1.33.tar.gz) = 94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d +SIZE (mariadb-10.1.33.tar.gz) = 65292094 Copied: branches/2018Q2/databases/mariadb101-server/files/patch-MDEV-15961 (from r469620, head/databases/mariadb101-server/files/patch-MDEV-15961) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/databases/mariadb101-server/files/patch-MDEV-15961 Sun May 13 14:02:18 2018 (r469795, copy of r469620, head/databases/mariadb101-server/files/patch-MDEV-15961) @@ -0,0 +1,46 @@ +--- mysys/stacktrace.c.orig 2018-03-26 14:18:03 UTC ++++ mysys/stacktrace.c +@@ -34,19 +34,19 @@ + #include + #endif + ++#ifdef __linux__ + #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) +- + static char *heap_start; +- +-#ifdef HAVE_BSS_START + extern char *__bss_start; +-#endif ++#else ++#define PTR_SANE(p) (p) ++#endif /* __linux */ + + void my_init_stacktrace() + { +-#ifdef HAVE_BSS_START ++#ifdef __linux__ + heap_start = (char*) &__bss_start; +-#endif ++#endif /* __linux__ */ + } + + #ifdef __linux__ +@@ -149,15 +149,15 @@ static int safe_print_str(const char *ad + + int my_safe_print_str(const char* val, int max_len) + { ++#ifdef __linux__ + char *heap_end; + +-#ifdef __linux__ + // Try and make use of /proc filesystem to safely print memory contents. + if (!safe_print_str(val, max_len)) + return 0; +-#endif + + heap_end= (char*) sbrk(0); ++#endif + + if (!PTR_SANE(val)) + { Modified: branches/2018Q2/databases/mariadb101-server/pkg-plist ============================================================================== --- branches/2018Q2/databases/mariadb101-server/pkg-plist Sun May 13 13:36:03 2018 (r469794) +++ branches/2018Q2/databases/mariadb101-server/pkg-plist Sun May 13 14:02:18 2018 (r469795) @@ -72,8 +72,8 @@ include/mysql/private/my_md5.h include/mysql/private/my_nosys.h include/mysql/private/my_rdtsc.h include/mysql/private/my_rnd.h +include/mysql/private/my_service_manager.h include/mysql/private/my_stacktrace.h -include/mysql/private/my_systemd.h include/mysql/private/my_time.h include/mysql/private/my_tree.h include/mysql/private/my_uctype.h From owner-svn-ports-branches@freebsd.org Sun May 13 15:10:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35934FE17DC; Sun, 13 May 2018 15:10:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DB3F7826DD; Sun, 13 May 2018 15:10:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBBAE7082; Sun, 13 May 2018 15:10:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4DFA611042390; Sun, 13 May 2018 15:10:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4DFA6qr042389; Sun, 13 May 2018 15:10:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805131510.w4DFA6qr042389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 13 May 2018 15:10:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469802 - branches/2018Q2/graphics/tesseract-data X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/graphics/tesseract-data X-SVN-Commit-Revision: 469802 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 May 2018 15:10:07 -0000 Author: jbeich Date: Sun May 13 15:10:06 2018 New Revision: 469802 URL: https://svnweb.freebsd.org/changeset/ports/469802 Log: MFH: r469800 graphics/tesseract-data: re-try on aarch64 - Builds fine via native-xtools + qemu-user-static Approved by: ports-secteam blanket Modified: branches/2018Q2/graphics/tesseract-data/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/graphics/tesseract-data/Makefile ============================================================================== --- branches/2018Q2/graphics/tesseract-data/Makefile Sun May 13 15:04:50 2018 (r469801) +++ branches/2018Q2/graphics/tesseract-data/Makefile Sun May 13 15:10:06 2018 (r469802) @@ -29,7 +29,6 @@ TESSERACT_LANGS?=afr amh ara asm aze aze_cyrl bel ben PORTDATA= ${TESSERACT_LANGS:O:u:S|$|.traineddata|} -BROKEN_aarch64= Fails to install: runaway process BROKEN_sparc64= Fails to install: runaway process do-install: From owner-svn-ports-branches@freebsd.org Sun May 13 20:00:43 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 709EEFCFBDC; Sun, 13 May 2018 20:00:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1CF7779BED; Sun, 13 May 2018 20:00:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2B4B1202A; Sun, 13 May 2018 20:00:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4DK0gv0089108; Sun, 13 May 2018 20:00:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4DK0f8X089094; Sun, 13 May 2018 20:00:41 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805132000.w4DK0f8X089094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 13 May 2018 20:00:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469814 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 469814 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 May 2018 20:00:43 -0000 Author: jbeich Date: Sun May 13 20:00:40 2018 New Revision: 469814 URL: https://svnweb.freebsd.org/changeset/ports/469814 Log: MFH: r469813 www/waterfox: update to 56.1.0.111172 - Apply some FF61 fixes Changes: https://github.com/MrAlex94/Waterfox/compare/2bb1a86e5dbd6...941b28140102e Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1432323 - copied unchanged from r469813, head/www/waterfox/files/patch-bug1432323 branches/2018Q2/www/waterfox/files/patch-bug1436759 - copied unchanged from r469813, head/www/waterfox/files/patch-bug1436759 branches/2018Q2/www/waterfox/files/patch-bug1436983 - copied unchanged from r469813, head/www/waterfox/files/patch-bug1436983 branches/2018Q2/www/waterfox/files/patch-bug1439444 - copied unchanged from r469813, head/www/waterfox/files/patch-bug1439444 branches/2018Q2/www/waterfox/files/patch-bug1439723 - copied unchanged from r469813, head/www/waterfox/files/patch-bug1439723 branches/2018Q2/www/waterfox/files/patch-bug1443110 - copied unchanged from r469813, head/www/waterfox/files/patch-bug1443110 branches/2018Q2/www/waterfox/files/patch-bug1457912 - copied unchanged from r469813, head/www/waterfox/files/patch-bug1457912 branches/2018Q2/www/waterfox/files/patch-bug1458270 - copied unchanged from r469813, head/www/waterfox/files/patch-bug1458270 Deleted: branches/2018Q2/www/waterfox/files/patch-bug1224396 branches/2018Q2/www/waterfox/files/patch-bug1387079 branches/2018Q2/www/waterfox/files/patch-bug1441941 branches/2018Q2/www/waterfox/files/patch-bug1454692 Modified: branches/2018Q2/www/waterfox/Makefile branches/2018Q2/www/waterfox/distinfo branches/2018Q2/www/waterfox/files/patch-bug847568 Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Sun May 13 19:59:12 2018 (r469813) +++ branches/2018Q2/www/waterfox/Makefile Sun May 13 20:00:40 2018 (r469814) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.1.0-89 -DISTVERSIONSUFFIX= -g2bb1a86e5dbd6 +DISTVERSION= 56.1.0-111172 +DISTVERSIONSUFFIX= -g941b28140102e CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/www/waterfox/distinfo ============================================================================== --- branches/2018Q2/www/waterfox/distinfo Sun May 13 19:59:12 2018 (r469813) +++ branches/2018Q2/www/waterfox/distinfo Sun May 13 20:00:40 2018 (r469814) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526056588 -SHA256 (MrAlex94-Waterfox-56.1.0-89-g2bb1a86e5dbd6_GH0.tar.gz) = ab20b2392440e321ce7a3ecbd8b77eae40110b387094488cec95c57f2a6853bc -SIZE (MrAlex94-Waterfox-56.1.0-89-g2bb1a86e5dbd6_GH0.tar.gz) = 394172045 +TIMESTAMP = 1526148821 +SHA256 (MrAlex94-Waterfox-56.1.0-111172-g941b28140102e_GH0.tar.gz) = a9cedc302e81667f75e46e971ad8e165761f3bed2e1a4a27f6fdb6bc4a812bf1 +SIZE (MrAlex94-Waterfox-56.1.0-111172-g941b28140102e_GH0.tar.gz) = 394958117 Copied: branches/2018Q2/www/waterfox/files/patch-bug1432323 (from r469813, head/www/waterfox/files/patch-bug1432323) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1432323 Sun May 13 20:00:40 2018 (r469814, copy of r469813, head/www/waterfox/files/patch-bug1432323) @@ -0,0 +1,102 @@ +commit 694ff7ca4925 +Author: Eric Rahm +Date: Thu Feb 22 12:38:15 2018 -0800 + + Bug 1432323 - Refactor operator new in nsArrayEnumerator. r=froydnj + + --HG-- + extra : rebase_source : 9df6db9f17e14eff2f79cd29599b03619068cef3 +--- + xpcom/ds/nsArrayEnumerator.cpp | 44 ++++++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 15 deletions(-) + +diff --git xpcom/ds/nsArrayEnumerator.cpp xpcom/ds/nsArrayEnumerator.cpp +index 54951222ae954..2e7d1f9af43a5 100644 +--- xpcom/ds/nsArrayEnumerator.cpp ++++ xpcom/ds/nsArrayEnumerator.cpp +@@ -13,6 +13,7 @@ + + #include "nsCOMArray.h" + #include "nsCOMPtr.h" ++#include "mozilla/OperatorNewExtensions.h" + #include "mozilla/RefPtr.h" + + class nsSimpleArrayEnumerator final : public nsISimpleEnumerator +@@ -112,14 +113,21 @@ public: + // nsISimpleEnumerator interface + NS_DECL_NSISIMPLEENUMERATOR + +- // nsSimpleArrayEnumerator methods +- nsCOMArrayEnumerator() : mIndex(0) {} ++ // Use this instead of `new`. ++ static nsCOMArrayEnumerator* Allocate(const nsCOMArray_base& aArray); + + // specialized operator to make sure we make room for mValues +- void* operator new(size_t aSize, const nsCOMArray_base& aArray) CPP_THROW_NEW; +- void operator delete(void* aPtr) { ::operator delete(aPtr); } ++ void operator delete(void* aPtr) { free(aPtr); } + + private: ++ // nsSimpleArrayEnumerator methods ++ nsCOMArrayEnumerator() ++ : mIndex(0) ++ , mArraySize(0) ++ { ++ mValueArray[0] = nullptr; ++ } ++ + ~nsCOMArrayEnumerator(void); + + protected: +@@ -176,26 +184,32 @@ nsCOMArrayEnumerator::GetNext(nsISupports** aResult) + return NS_OK; + } + +-void* +-nsCOMArrayEnumerator::operator new(size_t aSize, +- const nsCOMArray_base& aArray) CPP_THROW_NEW ++nsCOMArrayEnumerator* ++nsCOMArrayEnumerator::Allocate(const nsCOMArray_base& aArray) + { + // create enough space such that mValueArray points to a large + // enough value. Note that the initial value of aSize gives us + // space for mValueArray[0], so we must subtract +- aSize += (aArray.Count() - 1) * sizeof(aArray[0]); ++ size_t size = sizeof(nsCOMArrayEnumerator); ++ uint32_t count; ++ if (aArray.Count() > 0) { ++ count = static_cast(aArray.Count()); ++ size += (count - 1) * sizeof(aArray[0]); ++ } else { ++ count = 0; ++ } ++ ++ // Allocate a buffer large enough to contain our object and its array. ++ void* mem = moz_xmalloc(size); ++ auto result = new (mozilla::KnownNotNull, mem) nsCOMArrayEnumerator(); + +- // do the actual allocation +- nsCOMArrayEnumerator* result = +- static_cast(::operator new(aSize)); ++ result->mArraySize = count; + + // now need to copy over the values, and addref each one + // now this might seem like a lot of work, but we're actually just + // doing all our AddRef's ahead of time since GetNext() doesn't + // need to AddRef() on the way out +- uint32_t i; +- uint32_t max = result->mArraySize = aArray.Count(); +- for (i = 0; i < max; ++i) { ++ for (uint32_t i = 0; i < count; ++i) { + result->mValueArray[i] = aArray[i]; + NS_IF_ADDREF(result->mValueArray[i]); + } +@@ -207,7 +221,7 @@ nsresult + NS_NewArrayEnumerator(nsISimpleEnumerator** aResult, + const nsCOMArray_base& aArray) + { +- RefPtr enumerator = new (aArray) nsCOMArrayEnumerator(); ++ RefPtr enumerator = nsCOMArrayEnumerator::Allocate(aArray); + enumerator.forget(aResult); + return NS_OK; + } Copied: branches/2018Q2/www/waterfox/files/patch-bug1436759 (from r469813, head/www/waterfox/files/patch-bug1436759) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1436759 Sun May 13 20:00:40 2018 (r469814, copy of r469813, head/www/waterfox/files/patch-bug1436759) @@ -0,0 +1,26 @@ +commit a9c9593126c7 +Author: Michael Froman +Date: Wed Feb 14 14:24:50 2018 -0600 + + Bug 1436759 - Release NrIceMediaStreams on sts thread in transport_unittests.cpp. r=bwc + + MozReview-Commit-ID: BLasqfQJxw + + --HG-- + extra : rebase_source : bca09672917ce5fc4a5450864c9f461952847b3f +--- + media/mtransport/test/transport_unittests.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git media/mtransport/test/transport_unittests.cpp media/mtransport/test/transport_unittests.cpp +index 167a14be1fd52..4bf6195122182 100644 +--- media/mtransport/test/transport_unittests.cpp ++++ media/mtransport/test/transport_unittests.cpp +@@ -481,6 +481,7 @@ class TransportTestPeer : public sigslot::has_slots<> { + flow_ = nullptr; + } + ice_ctx_ = nullptr; ++ streams_.clear(); + } + + void DisconnectDestroyFlow() { Copied: branches/2018Q2/www/waterfox/files/patch-bug1436983 (from r469813, head/www/waterfox/files/patch-bug1436983) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1436983 Sun May 13 20:00:40 2018 (r469814, copy of r469813, head/www/waterfox/files/patch-bug1436983) @@ -0,0 +1,52 @@ +commit 7721a472b21b +Author: Jon Coppeard +Date: Mon Feb 12 10:34:21 2018 +0000 + + Bug 1436983 - Don't GC while linking JIT code r=nbp + + --HG-- + extra : rebase_source : b096346182b263753414e1ef7aa4cb86d57d7386 +--- + js/src/jit-test/tests/ion/getprop-primitive.js | 3 ++- + js/src/jit/CodeGenerator.cpp | 7 ++++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git js/src/jit-test/tests/ion/getprop-primitive.js js/src/jit-test/tests/ion/getprop-primitive.js +index 2cb912d7d4d42..bf59e35b5702b 100644 +--- js/src/jit-test/tests/ion/getprop-primitive.js ++++ js/src/jit-test/tests/ion/getprop-primitive.js +@@ -35,7 +35,8 @@ var template = function (set) { + // If we bailout in the inner loop, then x will have a smaller value + // than the number of iterations. + cont = assertEqIf(lastX > 0, x, set.length); +- lastX = x; ++ if (inIon()) ++ lastX = x; + x = 0; + } + return y; +diff --git js/src/jit/CodeGenerator.cpp js/src/jit/CodeGenerator.cpp +index 1b275a75cfd7e..6677d6cee443c 100644 +--- js/src/jit/CodeGenerator.cpp ++++ js/src/jit/CodeGenerator.cpp +@@ -9838,6 +9838,11 @@ CodeGenerator::linkSharedStubs(JSContext* cx) + bool + CodeGenerator::link(JSContext* cx, CompilerConstraintList* constraints) + { ++ // We cancel off-thread Ion compilations in a few places during GC, but if ++ // this compilation was performed off-thread it will already have been ++ // removed from the relevant lists by this point. Don't allow GC here. ++ JS::AutoAssertNoGC nogc(cx); ++ + RootedScript script(cx, gen->info().script()); + OptimizationLevel optimizationLevel = gen->optimizationInfo().level(); + +@@ -9918,7 +9923,7 @@ CodeGenerator::link(JSContext* cx, CompilerConstraintList* constraints) + // read barriers which were skipped while compiling the script off thread. + Linker linker(masm); + AutoFlushICache afc("IonLink"); +- JitCode* code = linker.newCode(cx, ION_CODE, !patchableBackedges_.empty()); ++ JitCode* code = linker.newCode(cx, ION_CODE, !patchableBackedges_.empty()); + if (!code) + return false; + Copied: branches/2018Q2/www/waterfox/files/patch-bug1439444 (from r469813, head/www/waterfox/files/patch-bug1439444) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1439444 Sun May 13 20:00:40 2018 (r469814, copy of r469813, head/www/waterfox/files/patch-bug1439444) @@ -0,0 +1,53 @@ +commit e8f515046724 +Author: Christoph Kerschbaumer +Date: Thu Mar 1 13:45:04 2018 +0100 + + Bug 1439444: resource and chrome images and styles should not be subject to CSP. r=gijs +--- + dom/security/nsCSPService.cpp | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +diff --git dom/security/nsCSPService.cpp dom/security/nsCSPService.cpp +index 6e6f02c585fb7..f0d733454fc2a 100644 +--- dom/security/nsCSPService.cpp ++++ dom/security/nsCSPService.cpp +@@ -43,13 +43,17 @@ NS_IMPL_ISUPPORTS(CSPService, nsIContentPolicy, nsIChannelEventSink) + // Helper function to identify protocols and content types not subject to CSP. + bool + subjectToCSP(nsIURI* aURI, nsContentPolicyType aContentType) { ++ ++ nsContentPolicyType contentType = ++ nsContentUtils::InternalContentPolicyTypeToExternal(aContentType); ++ + // These content types are not subject to CSP content policy checks: + // TYPE_CSP_REPORT -- csp can't block csp reports + // TYPE_REFRESH -- never passed to ShouldLoad (see nsIContentPolicy.idl) + // TYPE_DOCUMENT -- used for frame-ancestors +- if (aContentType == nsIContentPolicy::TYPE_CSP_REPORT || +- aContentType == nsIContentPolicy::TYPE_REFRESH || +- aContentType == nsIContentPolicy::TYPE_DOCUMENT) { ++ if (contentType == nsIContentPolicy::TYPE_CSP_REPORT || ++ contentType == nsIContentPolicy::TYPE_REFRESH || ++ contentType == nsIContentPolicy::TYPE_DOCUMENT) { + return false; + } + +@@ -90,12 +94,16 @@ subjectToCSP(nsIURI* aURI, nsContentPolicyType aContentType) { + // hence we use protocol flags to accomplish that, but we also + // want resource:, chrome: and moz-icon to be subject to CSP + // (which also use URI_IS_LOCAL_RESOURCE). ++ // Exception to the rule are images and styles using a scheme ++ // of resource: or chrome: ++ bool isImgOrStyle = contentType == nsIContentPolicy::TYPE_IMAGE || ++ contentType == nsIContentPolicy::TYPE_STYLESHEET; + rv = aURI->SchemeIs("resource", &match); +- if (NS_SUCCEEDED(rv) && match) { ++ if (NS_SUCCEEDED(rv) && match && !isImgOrStyle) { + return true; + } + rv = aURI->SchemeIs("chrome", &match); +- if (NS_SUCCEEDED(rv) && match) { ++ if (NS_SUCCEEDED(rv) && match && !isImgOrStyle) { + return true; + } + rv = aURI->SchemeIs("moz-icon", &match); Copied: branches/2018Q2/www/waterfox/files/patch-bug1439723 (from r469813, head/www/waterfox/files/patch-bug1439723) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1439723 Sun May 13 20:00:40 2018 (r469814, copy of r469813, head/www/waterfox/files/patch-bug1439723) @@ -0,0 +1,26 @@ +commit 821df39aefc0 +Author: Nathan Froyd +Date: Mon Feb 26 11:08:55 2018 -0500 + + Bug 1439723 - use a temporary in Animation::Tick(); r=mattwoodrow +--- + dom/animation/Animation.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git dom/animation/Animation.cpp dom/animation/Animation.cpp +index 6c5a55f0baf6e..7b89365f86811 100644 +--- dom/animation/Animation.cpp ++++ dom/animation/Animation.cpp +@@ -693,8 +693,10 @@ Animation::Tick() + // during the *previous* tick of the refresh driver, it can still be + // ahead of the *current* timeline time when we are using the + // vsync timer so we need to clamp it to the timeline time. +- mPendingReadyTime.SetValue(std::min(mTimeline->GetCurrentTime().Value(), +- mPendingReadyTime.Value())); ++ TimeDuration currentTime = mTimeline->GetCurrentTime().Value(); ++ if (currentTime < mPendingReadyTime.Value()) { ++ mPendingReadyTime.SetValue(currentTime); ++ } + FinishPendingAt(mPendingReadyTime.Value()); + mPendingReadyTime.SetNull(); + } Copied: branches/2018Q2/www/waterfox/files/patch-bug1443110 (from r469813, head/www/waterfox/files/patch-bug1443110) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1443110 Sun May 13 20:00:40 2018 (r469814, copy of r469813, head/www/waterfox/files/patch-bug1443110) @@ -0,0 +1,25 @@ +commit 425c5a6ff8fc +Author: Christoph Kerschbaumer +Date: Fri Mar 9 15:54:02 2018 +0100 + + Bug 1443110: Add NullCheck for loadinfo within InitCSP. r=smaug a=jcristau + + --HG-- + extra : source : 25ade148226d93650b653c62e2f4b15cbc51caef +--- + dom/base/nsDocument.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git dom/base/nsDocument.cpp dom/base/nsDocument.cpp +index 88f3aea3b6255..5519dd662df31 100644 +--- dom/base/nsDocument.cpp ++++ dom/base/nsDocument.cpp +@@ -2939,7 +2939,7 @@ nsDocument::InitCSP(nsIChannel* aChannel) + // In case this channel was instrument to discard the CSP, then + // there is nothing for us to do here. + nsCOMPtr loadInfo = aChannel->GetLoadInfo(); +- if (loadInfo->GetAllowDocumentToBeAgnosticToCSP()) { ++ if (loadInfo && loadInfo->GetAllowDocumentToBeAgnosticToCSP()) { + return NS_OK; + } + Copied: branches/2018Q2/www/waterfox/files/patch-bug1457912 (from r469813, head/www/waterfox/files/patch-bug1457912) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1457912 Sun May 13 20:00:40 2018 (r469814, copy of r469813, head/www/waterfox/files/patch-bug1457912) @@ -0,0 +1,169 @@ +commit 695328ac742d +Author: Xidorn Quan +Date: Mon May 7 10:40:34 2018 +1000 + + Bug 1457912 - Don't disable scrollbars when the window feature isn't listed explicitly. r=smaug, a=RyanVM + + MozReview-Commit-ID: CB0PVroA86L + + --HG-- + extra : source : f8876cbee5fa17c374115ed04404a3a3fc61ba40 +--- + .../components/windowwatcher/nsWindowWatcher.cpp | 5 +- + .../test/browser_new_content_window_chromeflags.js | 100 ++++++++++++++------- + 2 files changed, 73 insertions(+), 32 deletions(-) + +diff --git toolkit/components/windowwatcher/nsWindowWatcher.cpp toolkit/components/windowwatcher/nsWindowWatcher.cpp +index 44f06554b26fd..34706cd92b44e 100644 +--- toolkit/components/windowwatcher/nsWindowWatcher.cpp ++++ toolkit/components/windowwatcher/nsWindowWatcher.cpp +@@ -1700,9 +1700,12 @@ nsWindowWatcher::CalculateChromeFlagsHelper(uint32_t aInitialFlags, + nsIWebBrowserChrome::CHROME_WINDOW_MIN); + + // default scrollbar to "on," unless explicitly turned off +- if (WinHasOption(aFeatures, "scrollbars", 1, &presenceFlag) || !presenceFlag) { ++ bool scrollbarsPresent = false; ++ if (WinHasOption(aFeatures, "scrollbars", 1, &scrollbarsPresent) || ++ !scrollbarsPresent) { + chromeFlags |= nsIWebBrowserChrome::CHROME_SCROLLBARS; + } ++ presenceFlag = presenceFlag || scrollbarsPresent; + + return chromeFlags; + } +diff --git toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js +index 871a4376f5671..2ea08da989467 100644 +--- toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js ++++ toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js +@@ -126,18 +126,6 @@ const DISALLOWED = { + }, + }; + +-// Construct a features string that flips all DISALLOWED features +-// to not be their defaults. +-const DISALLOWED_STRING = Object.keys(DISALLOWED).map(feature => { +- let toValue = DISALLOWED[feature].defaults_to ? "no" : "yes"; +- return `${feature}=${toValue}`; +-}).join(","); +- +-const FEATURES = [ALLOWED_STRING, DISALLOWED_STRING].join(","); +- +-const SCRIPT_PAGE = `data:text/html,`; +-const SCRIPT_PAGE_FOR_CHROME_ALL = `data:text/html,`; +- + // This magic value of 2 means that by default, when content tries + // to open a new window, it'll actually open in a new window instead + // of a new tab. +@@ -165,6 +153,35 @@ function getParentChromeFlags(win) { + .chromeFlags; + } + ++/** ++ * Given some nsIDOMWindow for a window running in the parent process, ++ * asynchronously return the nsIWebBrowserChrome chrome flags for the ++ * associated content window. ++ * ++ * @param win (nsIDOMWindow) ++ * @returns int ++ */ ++function getContentChromeFlags(win) { ++ let b = win.gBrowser.selectedBrowser; ++ return ContentTask.spawn(b, null, async function() { ++ // Content scripts provide docShell as a global. ++ /* global docShell */ ++ docShell.QueryInterface(Ci.nsIInterfaceRequestor); ++ try { ++ // This will throw if we're not a remote browser. ++ return docShell.getInterface(Ci.nsITabChild) ++ .QueryInterface(Ci.nsIWebBrowserChrome) ++ .chromeFlags; ++ } catch (e) { ++ // This must be a non-remote browser... ++ return docShell.QueryInterface(Ci.nsIDocShellTreeItem) ++ .treeOwner ++ .QueryInterface(Ci.nsIWebBrowserChrome) ++ .chromeFlags; ++ } ++ }); ++} ++ + /** + * For some chromeFlags, ensures that flags that are in the + * ALLOWED group were modified, and that flags in the DISALLOWED +@@ -214,6 +231,18 @@ function assertContentFlags(chromeFlags) { + * default. + */ + add_task(async function test_new_remote_window_flags() { ++ // Construct a features string that flips all DISALLOWED features ++ // to not be their defaults. ++ const DISALLOWED_STRING = Object.keys(DISALLOWED).map(feature => { ++ let toValue = DISALLOWED[feature].defaults_to ? "no" : "yes"; ++ return `${feature}=${toValue}`; ++ }).join(","); ++ ++ const FEATURES = [ALLOWED_STRING, DISALLOWED_STRING].join(","); ++ ++ const SCRIPT_PAGE = `data:text/html,`; ++ const SCRIPT_PAGE_FOR_CHROME_ALL = `data:text/html,`; ++ + let newWinPromise = BrowserTestUtils.waitForNewWindow(); + + await BrowserTestUtils.withNewTab({ +@@ -236,25 +265,7 @@ add_task(async function test_new_remote_window_flags() { + + // Confusingly, chromeFlags also exist in the content process + // as part of the TabChild, so we have to check those too. +- let b = win.gBrowser.selectedBrowser; +- let contentChromeFlags = await ContentTask.spawn(b, null, async function() { +- // Content scripts provide docShell as a global. +- /* global docShell */ +- docShell.QueryInterface(Ci.nsIInterfaceRequestor); +- try { +- // This will throw if we're not a remote browser. +- return docShell.getInterface(Ci.nsITabChild) +- .QueryInterface(Ci.nsIWebBrowserChrome) +- .chromeFlags; +- } catch (e) { +- // This must be a non-remote browser... +- return docShell.QueryInterface(Ci.nsIDocShellTreeItem) +- .treeOwner +- .QueryInterface(Ci.nsIWebBrowserChrome) +- .chromeFlags; +- } +- }); +- ++ let contentChromeFlags = await getContentChromeFlags(win); + assertContentFlags(contentChromeFlags); + Assert.ok(!(contentChromeFlags & + Ci.nsIWebBrowserChrome.CHROME_REMOTE_WINDOW), +@@ -279,3 +290,30 @@ add_task(async function test_new_remote_window_flags() { + await BrowserTestUtils.closeWindow(win); + }); + }); ++ ++/** ++ * Opens a window with some chrome flags specified, which should not affect ++ * scrollbars flag which defaults to true when not disabled explicitly. ++ */ ++add_task(async function test_scrollbars_flag() { ++ const SCRIPT = 'window.open("about:blank", "_blank", "toolbar=0");'; ++ const SCRIPT_PAGE = `data:text/html,`; ++ ++ let newWinPromise = BrowserTestUtils.waitForNewWindow(); ++ await BrowserTestUtils.withNewTab({ ++ gBrowser, ++ url: SCRIPT_PAGE, ++ }, async function(browser) { ++ let win = await newWinPromise; ++ ++ let parentChromeFlags = getParentChromeFlags(win); ++ Assert.ok(parentChromeFlags & Ci.nsIWebBrowserChrome.CHROME_SCROLLBARS, ++ "Should have scrollbars when not disabled explicitly"); ++ ++ let contentChromeFlags = await getContentChromeFlags(win); ++ Assert.ok(contentChromeFlags & Ci.nsIWebBrowserChrome.CHROME_SCROLLBARS, ++ "Should have scrollbars when not disabled explicitly"); ++ ++ await BrowserTestUtils.closeWindow(win); ++ }); ++}); Copied: branches/2018Q2/www/waterfox/files/patch-bug1458270 (from r469813, head/www/waterfox/files/patch-bug1458270) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1458270 Sun May 13 20:00:40 2018 (r469814, copy of r469813, head/www/waterfox/files/patch-bug1458270) @@ -0,0 +1,125 @@ +commit df3a104363d4 +Author: David Major +Date: Tue May 8 17:37:25 2018 -0400 + + Bug 1458270 - Clean up in the shutdown observer. r=milan, a=RyanVM + + --HG-- + extra : source : 74cb61ae46eec86a761dfd8b245dff06bbf14634 +--- + widget/GfxInfoBase.cpp | 8 ++++++-- + widget/GfxInfoX11.cpp | 8 ++++++-- + widget/android/GfxInfo.cpp | 4 ++++ + widget/cocoa/GfxInfo.mm | 4 ++++ + widget/uikit/GfxInfo.cpp | 4 ++++ + widget/windows/GfxInfo.cpp | 4 ++++ + 6 files changed, 28 insertions(+), 4 deletions(-) + +diff --git widget/GfxInfoBase.cpp widget/GfxInfoBase.cpp +index 560a49e4d237b..d407acb3e611b 100644 +--- widget/GfxInfoBase.cpp ++++ widget/GfxInfoBase.cpp +@@ -65,11 +65,15 @@ public: + delete GfxInfoBase::mFeatureStatus; + GfxInfoBase::mFeatureStatus = nullptr; + +- for (uint32_t i = 0; i < DeviceFamilyMax; i++) ++ for (uint32_t i = 0; i < DeviceFamilyMax; i++) { + delete GfxDriverInfo::mDeviceFamilies[i]; ++ GfxDriverInfo::mDeviceFamilies[i] = nullptr; ++ } + +- for (uint32_t i = 0; i < DeviceVendorMax; i++) ++ for (uint32_t i = 0; i < DeviceVendorMax; i++) { + delete GfxDriverInfo::mDeviceVendors[i]; ++ GfxDriverInfo::mDeviceVendors[i] = nullptr; ++ } + + GfxInfoBase::mShutdownOccurred = true; + +diff --git widget/GfxInfoX11.cpp widget/GfxInfoX11.cpp +index 098f82d2976d2..6d48a88c57c5f 100644 +--- widget/GfxInfoX11.cpp ++++ widget/GfxInfoX11.cpp +@@ -275,8 +275,6 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, + OperatingSystem* aOS /* = nullptr */) + + { +- GetData(); +- + NS_ENSURE_ARG_POINTER(aStatus); + *aStatus = nsIGfxInfo::FEATURE_STATUS_UNKNOWN; + aSuggestedDriverVersion.SetIsVoid(true); +@@ -284,6 +282,12 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, + if (aOS) + *aOS = os; + ++ if (mShutdownOccurred) { ++ return NS_OK; ++ } ++ ++ GetData(); ++ + if (mGLMajorVersion == 1) { + // We're on OpenGL 1. In most cases that indicates really old hardware. + // We better block them, rather than rely on them to fail gracefully, because they don't! +diff --git widget/android/GfxInfo.cpp widget/android/GfxInfo.cpp +index 13d097e380c1a..4fc2c0919447c 100644 +--- widget/android/GfxInfo.cpp ++++ widget/android/GfxInfo.cpp +@@ -392,6 +392,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, + if (aOS) + *aOS = os; + ++ if (mShutdownOccurred) { ++ return NS_OK; ++ } ++ + // OpenGL layers are never blacklisted on Android. + // This early return is so we avoid potentially slow + // GLStrings initialization on startup when we initialize GL layers. +diff --git widget/cocoa/GfxInfo.mm widget/cocoa/GfxInfo.mm +index f0cc36a18847d..bf6092488beab 100644 +--- widget/cocoa/GfxInfo.mm ++++ widget/cocoa/GfxInfo.mm +@@ -338,6 +338,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, + if (aOS) + *aOS = os; + ++ if (mShutdownOccurred) { ++ return NS_OK; ++ } ++ + // Don't evaluate special cases when we're evaluating the downloaded blocklist. + if (!aDriverInfo.Length()) { + if (aFeature == nsIGfxInfo::FEATURE_WEBGL_MSAA) { +diff --git widget/uikit/GfxInfo.cpp widget/uikit/GfxInfo.cpp +index 2aea3b5eaba0d..cabe993dd06f1 100644 +--- widget/uikit/GfxInfo.cpp ++++ widget/uikit/GfxInfo.cpp +@@ -175,6 +175,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, + if (aOS) + *aOS = OperatingSystem::Ios; + ++ if (mShutdownOccurred) { ++ return NS_OK; ++ } ++ + // OpenGL layers are never blacklisted on iOS. + // This early return is so we avoid potentially slow + // GLStrings initialization on startup when we initialize GL layers. +diff --git widget/windows/GfxInfo.cpp widget/windows/GfxInfo.cpp +index dd2798803449f..409c428b493f7 100644 +--- widget/windows/GfxInfo.cpp ++++ widget/windows/GfxInfo.cpp +@@ -1453,6 +1453,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, + if (aOS) + *aOS = os; + ++ if (mShutdownOccurred) { ++ return NS_OK; ++ } ++ + // Don't evaluate special cases if we're checking the downloaded blocklist. + if (!aDriverInfo.Length()) { + nsAutoString adapterVendorID; Modified: branches/2018Q2/www/waterfox/files/patch-bug847568 ============================================================================== --- branches/2018Q2/www/waterfox/files/patch-bug847568 Sun May 13 19:59:12 2018 (r469813) +++ branches/2018Q2/www/waterfox/files/patch-bug847568 Sun May 13 20:00:40 2018 (r469814) @@ -120,28 +120,28 @@ diff --git gfx/skia/generate_mozbuild.py gfx/skia/gene index e06ae3457a47..93faa61594a3 100755 --- gfx/skia/generate_mozbuild.py +++ gfx/skia/generate_mozbuild.py -@@ -143,6 +143,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -148,6 +148,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git gfx/skia/moz.build gfx/skia/moz.build index 2118677ca3a8..e4978b413784 100644 --- gfx/skia/moz.build +++ gfx/skia/moz.build -@@ -753,6 +753,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -822,6 +822,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git gfx/thebes/moz.build gfx/thebes/moz.build From owner-svn-ports-branches@freebsd.org Mon May 14 12:09:26 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11A2CFEAAF1; Mon, 14 May 2018 12:09:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B872C69777; Mon, 14 May 2018 12:09:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 999AC1BE3A; Mon, 14 May 2018 12:09:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EC9Poq083072; Mon, 14 May 2018 12:09:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EC9O59083067; Mon, 14 May 2018 12:09:24 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805141209.w4EC9O59083067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 14 May 2018 12:09:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469880 - in branches/2018Q2/games/openbor: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/games/openbor: . files X-SVN-Commit-Revision: 469880 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 12:09:26 -0000 Author: jbeich Date: Mon May 14 12:09:24 2018 New Revision: 469880 URL: https://svnweb.freebsd.org/changeset/ports/469880 Log: MFH: r469877 games/openbor: update to 6138 Changes: https://github.com/DCurrent/openbor/compare/0b077e46...5673214c Approved by: ports-secteam (feld, implicit for snapshots) Added: branches/2018Q2/games/openbor/files/patch-source_utils.h - copied unchanged from r469877, head/games/openbor/files/patch-source_utils.h Modified: branches/2018Q2/games/openbor/Makefile branches/2018Q2/games/openbor/distinfo branches/2018Q2/games/openbor/files/patch-source_utils.c Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/games/openbor/Makefile ============================================================================== --- branches/2018Q2/games/openbor/Makefile Mon May 14 12:08:36 2018 (r469879) +++ branches/2018Q2/games/openbor/Makefile Mon May 14 12:09:24 2018 (r469880) @@ -2,7 +2,7 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 5137 +PORTVERSION?= 6138 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif @@ -31,7 +31,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= 0b077e46 +GH_TAGNAME?= 5673214c USES+= gmake pkgconfig .if ${PORTVERSION} < 4433 Modified: branches/2018Q2/games/openbor/distinfo ============================================================================== --- branches/2018Q2/games/openbor/distinfo Mon May 14 12:08:36 2018 (r469879) +++ branches/2018Q2/games/openbor/distinfo Mon May 14 12:09:24 2018 (r469880) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525902990 -SHA256 (DCurrent-openbor-5137-0b077e46_GH0.tar.gz) = 549538689d66d641410abb6a25457cadd13c04176f737b9e8b5f5ac52246ec17 -SIZE (DCurrent-openbor-5137-0b077e46_GH0.tar.gz) = 74507480 +TIMESTAMP = 1526285237 +SHA256 (DCurrent-openbor-6138-5673214c_GH0.tar.gz) = e07a3970ae1eb050ade6ea02ae21dd0dbc00c028b504a8fa8f3ee73379ba7fe3 +SIZE (DCurrent-openbor-6138-5673214c_GH0.tar.gz) = 74511657 Modified: branches/2018Q2/games/openbor/files/patch-source_utils.c ============================================================================== --- branches/2018Q2/games/openbor/files/patch-source_utils.c Mon May 14 12:08:36 2018 (r469879) +++ branches/2018Q2/games/openbor/files/patch-source_utils.c Mon May 14 12:09:24 2018 (r469880) @@ -1,6 +1,14 @@ ---- source/utils.c.bak 2017-04-22 14:20:08 UTC +source/utils.c:303:54: error: implicit declaration of function 'mallinfo' is invalid in C99 + [-Werror,-Wimplicit-function-declaration] + writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); + ^ +source/utils.c:303:64: error: member reference base type 'int' is not a structure or union + writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); + ~~~~~~~~~~^~~~~~ + +--- source/utils.c.orig 2017-04-22 14:20:08 UTC +++ source/utils.c -@@ -295,7 +295,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f +@@ -299,7 +299,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f "\n* Shutting Down *\n\n"); writeToLogFile("Out of memory!\n"); writeToLogFile("Allocation of size %i failed in function '%s' at %s:%i.\n", size, func, file, line); Copied: branches/2018Q2/games/openbor/files/patch-source_utils.h (from r469877, head/games/openbor/files/patch-source_utils.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/games/openbor/files/patch-source_utils.h Mon May 14 12:09:24 2018 (r469880, copy of r469877, head/games/openbor/files/patch-source_utils.h) @@ -0,0 +1,19 @@ +In file included from openborscript.c:30: +In file included from source/openborscript/config.h:12: +In file included from source/scriptlib/Interpreter.h:11: +In file included from source/scriptlib/depends.h:13: +In file included from source/globals.h:24: +source/utils.h:65:59: error: unknown type name 'time_t' +void get_time_string(char buffer[], unsigned buffer_size, time_t timestamp, char* pattern); // ex. "%Y-%m-%d %H:%M:%S" + ^ + +--- source/utils.h.orig 2018-05-13 22:01:54 UTC ++++ source/utils.h +@@ -10,6 +10,7 @@ + #define UTILS_H + + // *** INCLUDES *** ++#include + #include "types.h" + #include "stringptr.h" + From owner-svn-ports-branches@freebsd.org Mon May 14 12:10:01 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EC65FEAB4B; Mon, 14 May 2018 12:10:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B433A6985D; Mon, 14 May 2018 12:10:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9514D1BE3E; Mon, 14 May 2018 12:10:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4ECA0Xu083415; Mon, 14 May 2018 12:10:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EC9wat083374; Mon, 14 May 2018 12:09:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805141209.w4EC9wat083374@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 14 May 2018 12:09:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469881 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 469881 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 12:10:01 -0000 Author: jbeich Date: Mon May 14 12:09:58 2018 New Revision: 469881 URL: https://svnweb.freebsd.org/changeset/ports/469881 Log: MFH: r469879 www/waterfox: update to 56.1.0.111178 - Apply some FF61 fixes Changes: https://github.com/MrAlex94/Waterfox/compare/941b28140102e...edfc016bc021c Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1436241 - copied unchanged from r469879, head/www/waterfox/files/patch-bug1436241 branches/2018Q2/www/waterfox/files/patch-bug1451262 - copied unchanged from r469879, head/www/waterfox/files/patch-bug1451262 branches/2018Q2/www/waterfox/files/patch-bug1452576 - copied unchanged from r469879, head/www/waterfox/files/patch-bug1452576 branches/2018Q2/www/waterfox/files/patch-bug1458166 - copied unchanged from r469879, head/www/waterfox/files/patch-bug1458166 branches/2018Q2/www/waterfox/files/patch-bug1458720 - copied unchanged from r469879, head/www/waterfox/files/patch-bug1458720 branches/2018Q2/www/waterfox/files/patch-bug1459206 - copied unchanged from r469879, head/www/waterfox/files/patch-bug1459206 Deleted: branches/2018Q2/www/waterfox/files/patch-bug1381815 branches/2018Q2/www/waterfox/files/patch-bug1436983 branches/2018Q2/www/waterfox/files/patch-bug1444668 branches/2018Q2/www/waterfox/files/patch-bug1445234 branches/2018Q2/www/waterfox/files/patch-bug1449530 Modified: branches/2018Q2/www/waterfox/Makefile branches/2018Q2/www/waterfox/distinfo branches/2018Q2/www/waterfox/files/patch-typos Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Mon May 14 12:09:24 2018 (r469880) +++ branches/2018Q2/www/waterfox/Makefile Mon May 14 12:09:58 2018 (r469881) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.1.0-111172 -DISTVERSIONSUFFIX= -g941b28140102e +DISTVERSION= 56.1.0-111178 +DISTVERSIONSUFFIX= -gedfc016bc021c CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/www/waterfox/distinfo ============================================================================== --- branches/2018Q2/www/waterfox/distinfo Mon May 14 12:09:24 2018 (r469880) +++ branches/2018Q2/www/waterfox/distinfo Mon May 14 12:09:58 2018 (r469881) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526148821 -SHA256 (MrAlex94-Waterfox-56.1.0-111172-g941b28140102e_GH0.tar.gz) = a9cedc302e81667f75e46e971ad8e165761f3bed2e1a4a27f6fdb6bc4a812bf1 -SIZE (MrAlex94-Waterfox-56.1.0-111172-g941b28140102e_GH0.tar.gz) = 394958117 +TIMESTAMP = 1526290324 +SHA256 (MrAlex94-Waterfox-56.1.0-111178-gedfc016bc021c_GH0.tar.gz) = a34715f6954e5b557e976166b69f976f0ae3bc92b168ca26ab6d3ba62bf8e6ec +SIZE (MrAlex94-Waterfox-56.1.0-111178-gedfc016bc021c_GH0.tar.gz) = 394952776 Copied: branches/2018Q2/www/waterfox/files/patch-bug1436241 (from r469879, head/www/waterfox/files/patch-bug1436241) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1436241 Mon May 14 12:09:58 2018 (r469881, copy of r469879, head/www/waterfox/files/patch-bug1436241) @@ -0,0 +1,54 @@ +commit 540471c8085c +Author: Kyle Machulis +Date: Mon Apr 30 12:49:15 2018 -0700 + + Bug 1436241 - Check redirect status code before forwarding to NPAPI. r=jimm, r=pauljt, a=RyanVM + + NPAPI may handle a 307 redirect across different origins, while they + should only happen on same origin requests. Have the browser check + this before forwarding to NPAPI. + + MozReview-Commit-ID: 5vxMooygI4g + + --HG-- + extra : source : 6d595a423fb52766abb5c1d10d4b9d7d6027d68a +--- + dom/plugins/base/nsPluginStreamListenerPeer.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git dom/plugins/base/nsPluginStreamListenerPeer.cpp dom/plugins/base/nsPluginStreamListenerPeer.cpp +index b780688ddd0c7..dd8e84d2df075 100644 +--- dom/plugins/base/nsPluginStreamListenerPeer.cpp ++++ dom/plugins/base/nsPluginStreamListenerPeer.cpp +@@ -668,15 +668,6 @@ nsPluginStreamListenerPeer::AsyncOnChannelRedirect(nsIChannel *oldChannel, nsICh + return NS_ERROR_FAILURE; + } + +- nsCOMPtr proxyCallback = +- new ChannelRedirectProxyCallback(this, callback, oldChannel, newChannel); +- +- // Give NPAPI a chance to control redirects. +- bool notificationHandled = mPStreamListener->HandleRedirectNotification(oldChannel, newChannel, proxyCallback); +- if (notificationHandled) { +- return NS_OK; +- } +- + // Don't allow cross-origin 307 POST redirects. + nsCOMPtr oldHttpChannel(do_QueryInterface(oldChannel)); + if (oldHttpChannel) { +@@ -700,6 +691,15 @@ nsPluginStreamListenerPeer::AsyncOnChannelRedirect(nsIChannel *oldChannel, nsICh + } + } + ++ nsCOMPtr proxyCallback = ++ new ChannelRedirectProxyCallback(this, callback, oldChannel, newChannel); ++ ++ // Give NPAPI a chance to control redirects. ++ bool notificationHandled = mPStreamListener->HandleRedirectNotification(oldChannel, newChannel, proxyCallback); ++ if (notificationHandled) { ++ return NS_OK; ++ } ++ + // Fall back to channel event sink for window. + nsCOMPtr channelEventSink; + nsresult rv = GetInterfaceGlobal(NS_GET_IID(nsIChannelEventSink), getter_AddRefs(channelEventSink)); Copied: branches/2018Q2/www/waterfox/files/patch-bug1451262 (from r469879, head/www/waterfox/files/patch-bug1451262) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1451262 Mon May 14 12:09:58 2018 (r469881, copy of r469879, head/www/waterfox/files/patch-bug1451262) @@ -0,0 +1,62 @@ +commit 659634effe22 +Author: Valentin Gosu +Date: Wed Apr 4 13:47:46 2018 +0300 + + Bug 1451262 - Clear gSocketThread after finishing all operations so we don't trigger thread assertions r=mayhemer + + MozReview-Commit-ID: AHMPd72S2GB + + --HG-- + extra : rebase_source : fe5fb1604e771f223d78f23fcf9d37b1f85763f9 +--- + netwerk/base/nsSocketTransportService2.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git netwerk/base/nsSocketTransportService2.cpp netwerk/base/nsSocketTransportService2.cpp +index abaa8f8fb6da3..a16d888998ae9 100644 +--- netwerk/base/nsSocketTransportService2.cpp ++++ netwerk/base/nsSocketTransportService2.cpp +@@ -1067,9 +1067,8 @@ nsSocketTransportService::Run() + // socket detach handlers get processed. + NS_ProcessPendingEvents(mRawThread); + +- gSocketThread = nullptr; +- + psm::StopSSLServerCertVerificationThreads(); ++ gSocketThread = nullptr; + + SOCKET_LOG(("STS thread exit\n")); + +commit 43e3838b681b +Author: Valentin Gosu +Date: Thu May 10 10:37:24 2018 +0200 + + Bug 1451262 - Call NS_ProcessPendingEvents after StopSSLServerCertVerificationThreads. r=mayhemer, a=RyanVM + + If there are still pending events after we null out gSocketThread, OnSocketThread() will always return false, which can trigger assertions. + + MozReview-Commit-ID: CovFIU3cKL + + --HG-- + extra : source : b859a16d74500eed3b00d7e0bc1eba0d9e0c34a4 +--- + netwerk/base/nsSocketTransportService2.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git netwerk/base/nsSocketTransportService2.cpp netwerk/base/nsSocketTransportService2.cpp +index 637a7d95f748c..06cda53f52056 100644 +--- netwerk/base/nsSocketTransportService2.cpp ++++ netwerk/base/nsSocketTransportService2.cpp +@@ -1067,7 +1067,12 @@ nsSocketTransportService::Run() + // socket detach handlers get processed. + NS_ProcessPendingEvents(mRawThread); + ++ // Stopping the SLL threads can generate new events, so we need to ++ // process them before nulling out gSocketThread, otherwise we can get ++ // !onSocketThread assertions. + psm::StopSSLServerCertVerificationThreads(); ++ NS_ProcessPendingEvents(mRawThread); ++ + gSocketThread = nullptr; + + SOCKET_LOG(("STS thread exit\n")); Copied: branches/2018Q2/www/waterfox/files/patch-bug1452576 (from r469879, head/www/waterfox/files/patch-bug1452576) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1452576 Mon May 14 12:09:58 2018 (r469881, copy of r469879, head/www/waterfox/files/patch-bug1452576) @@ -0,0 +1,92 @@ +commit fac32e857b4b +Author: Andrea Marchesini +Date: Thu May 10 09:02:16 2018 +0200 + + Bug 1452576 - Improve StructuredCloneHolder for fuzzy tests. r=decoder, a=RyanVM + + --HG-- + extra : source : c8d6bf455ae5ac9a31ff9fc5418e87a66f12e89c +--- + dom/base/StructuredCloneHolder.cpp | 34 ++++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +diff --git dom/base/StructuredCloneHolder.cpp dom/base/StructuredCloneHolder.cpp +index 745ef7871b856..9f697fc2878e7 100644 +--- dom/base/StructuredCloneHolder.cpp ++++ dom/base/StructuredCloneHolder.cpp +@@ -1024,9 +1024,9 @@ StructuredCloneHolder::CustomReadHandler(JSContext* aCx, + return ReadFormData(aCx, aReader, aIndex, this); + } + +- if (aTag == SCTAG_DOM_IMAGEBITMAP) { +- MOZ_ASSERT(mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || +- mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread); ++ if (aTag == SCTAG_DOM_IMAGEBITMAP && ++ (mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || ++ mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread)) { + + // Get the current global object. + // This can be null. +@@ -1040,7 +1040,9 @@ StructuredCloneHolder::CustomReadHandler(JSContext* aCx, + return StructuredCloneBlob::ReadStructuredClone(aCx, aReader, this); + } + +- if (aTag == SCTAG_DOM_WASM) { ++ if (aTag == SCTAG_DOM_WASM && ++ (mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || ++ mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread)) { + return ReadWasmModule(aCx, aIndex, this); + } + +@@ -1175,9 +1177,9 @@ StructuredCloneHolder::CustomReadTransferHandler(JSContext* aCx, + return true; + } + +- if (aTag == SCTAG_DOM_CANVAS) { +- MOZ_ASSERT(mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || +- mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread); ++ if (aTag == SCTAG_DOM_CANVAS && ++ (mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || ++ mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread)) { + MOZ_ASSERT(aContent); + OffscreenCanvasCloneData* data = + static_cast(aContent); +@@ -1195,9 +1197,9 @@ StructuredCloneHolder::CustomReadTransferHandler(JSContext* aCx, + return true; + } + +- if (aTag == SCTAG_DOM_IMAGEBITMAP) { +- MOZ_ASSERT(mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || +- mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread); ++ if (aTag == SCTAG_DOM_IMAGEBITMAP && ++ (mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || ++ mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread)) { + MOZ_ASSERT(aContent); + ImageBitmapCloneData* data = + static_cast(aContent); +@@ -1320,9 +1322,9 @@ StructuredCloneHolder::CustomFreeTransferHandler(uint32_t aTag, + return; + } + +- if (aTag == SCTAG_DOM_CANVAS) { +- MOZ_ASSERT(mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || +- mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread); ++ if (aTag == SCTAG_DOM_CANVAS && ++ (mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || ++ mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread)) { + MOZ_ASSERT(aContent); + OffscreenCanvasCloneData* data = + static_cast(aContent); +@@ -1330,9 +1332,9 @@ StructuredCloneHolder::CustomFreeTransferHandler(uint32_t aTag, + return; + } + +- if (aTag == SCTAG_DOM_IMAGEBITMAP) { +- MOZ_ASSERT(mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || +- mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread); ++ if (aTag == SCTAG_DOM_IMAGEBITMAP && ++ (mStructuredCloneScope == StructuredCloneScope::SameProcessSameThread || ++ mStructuredCloneScope == StructuredCloneScope::SameProcessDifferentThread)) { + MOZ_ASSERT(aContent); + ImageBitmapCloneData* data = + static_cast(aContent); Copied: branches/2018Q2/www/waterfox/files/patch-bug1458166 (from r469879, head/www/waterfox/files/patch-bug1458166) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1458166 Mon May 14 12:09:58 2018 (r469881, copy of r469879, head/www/waterfox/files/patch-bug1458166) @@ -0,0 +1,75 @@ +commit 64082ca923f8 +Author: Andreas Pehrson +Date: Mon May 7 11:33:07 2018 +0200 + + Bug 1458166 - Clear out tracks while destroying MediaStream. r=bryce, a=RyanVM + + MediaStream::Destroy() is part of a controlled shutdown sequence. + If there are still tracks with content beyond Destroy() they will + only get caught by the dtor, which may be on CC shutdown and too late. + + MozReview-Commit-ID: GV6XRiTCIRk + + --HG-- + extra : source : da84235630724b32d2e619c4ae6b7ae34a4c5c2d +--- + dom/media/MediaStreamGraph.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git dom/media/MediaStreamGraph.cpp dom/media/MediaStreamGraph.cpp +index 1c6683c966084..9cdb50e8abc98 100644 +--- dom/media/MediaStreamGraph.cpp ++++ dom/media/MediaStreamGraph.cpp +@@ -2054,6 +2054,7 @@ MediaStream::DestroyImpl() + for (int32_t i = mConsumers.Length() - 1; i >= 0; --i) { + mConsumers[i]->Disconnect(); + } ++ mTracks.Clear(); + mGraph = nullptr; + } + +commit d18fab7f3fa9 +Author: Andreas Pehrson +Date: Mon May 7 11:36:35 2018 +0200 + + Bug 1458166 - Remove listeners before destroying MediaStreams. r=bryce, a=RyanVM + + If listeners are still registered to a MediaStream on MediaStream::Destroy + (triggered by MediaStream::UnregisterUser below), they will catch and act + on further events from the MediaStream (such as a track ending). + + This may dispatch runnables that are unnecessary since we know we are + shutting down. + + If we first remove the listeners from the MediaStream we will never see + said events. + + MozReview-Commit-ID: IZ1kENqL2C8 + + --HG-- + extra : source : 8dc7d2696a29c0752066ebe67962b1ad323c4153 +--- + dom/media/DOMMediaStream.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git dom/media/DOMMediaStream.cpp dom/media/DOMMediaStream.cpp +index f69324d416a8f..febb527556701 100644 +--- dom/media/DOMMediaStream.cpp ++++ dom/media/DOMMediaStream.cpp +@@ -455,10 +455,16 @@ DOMMediaStream::Destroy() + { + LOG(LogLevel::Debug, ("DOMMediaStream %p Being destroyed.", this)); + if (mOwnedListener) { ++ if (mOwnedStream) { ++ mOwnedStream->RemoveListener(mOwnedListener); ++ } + mOwnedListener->Forget(); + mOwnedListener = nullptr; + } + if (mPlaybackListener) { ++ if (mPlaybackStream) { ++ mPlaybackStream->RemoveListener(mPlaybackListener); ++ } + mPlaybackListener->Forget(); + mPlaybackListener = nullptr; + } Copied: branches/2018Q2/www/waterfox/files/patch-bug1458720 (from r469879, head/www/waterfox/files/patch-bug1458720) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1458720 Mon May 14 12:09:58 2018 (r469881, copy of r469879, head/www/waterfox/files/patch-bug1458720) @@ -0,0 +1,99 @@ +commit ba437f08694c +Author: David Keeler +Date: Wed May 2 16:42:51 2018 -0700 + + Bug 1458720 - Make RunOnAllContentParents runnable from any thread. r=Ehsan, r=jcj, a=RyanVM + + In bug 1215723 RunOnAllContentParents was added to the DataStorage + implementation so we could make more security state information available in + child processes. It uses IPC APIs, which in general are not thread-safe. We need + to make sure that these APIs are only accessed on the main thread, which means + we have to copy any necessary data, create a runnable, and send it to the main + thread to do the actual work. Note that the IPC APIs are async, so this dispatch + can be async as well. + + MozReview-Commit-ID: HwkgSX1iORU + + --HG-- + extra : source : 38e60f49b316258b72f8453387049c16d2005867 +--- + security/manager/ssl/DataStorage.cpp | 34 +++++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) + +diff --git security/manager/ssl/DataStorage.cpp security/manager/ssl/DataStorage.cpp +index e93f7f50a0b39..00e43f298aae3 100644 +--- security/manager/ssl/DataStorage.cpp ++++ security/manager/ssl/DataStorage.cpp +@@ -707,6 +707,8 @@ DataStorage::MaybeEvictOneEntry(DataStorageType aType, + } + } + ++// NB: Because this may cross a thread boundary, any variables captured by the ++// Functor must be captured by copy and not by reference. + template + static + void +@@ -716,11 +718,16 @@ RunOnAllContentParents(Functor func) + return; + } + using dom::ContentParent; +- nsTArray parents; +- ContentParent::GetAll(parents); +- for (auto& parent: parents) { +- func(parent); +- } ++ ++ nsCOMPtr r = NS_NewRunnableFunction("RunOnAllContentParents", ++ [func] () { ++ nsTArray parents; ++ ContentParent::GetAll(parents); ++ for (auto& parent: parents) { ++ func(parent); ++ } ++ }); ++ MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(r)); + } + + nsresult +@@ -749,12 +756,14 @@ DataStorage::Put(const nsCString& aKey, const nsCString& aValue, + return rv; + } + +- RunOnAllContentParents([&](dom::ContentParent* aParent) { ++ nsString filename(mFilename); ++ RunOnAllContentParents( ++ [aKey, aValue, aType, filename] (dom::ContentParent* aParent) { + DataStorageItem item; + item.key() = aKey; + item.value() = aValue; + item.type() = aType; +- Unused << aParent->SendDataStoragePut(mFilename, item); ++ Unused << aParent->SendDataStoragePut(filename, item); + }); + + return NS_OK; +@@ -788,8 +797,10 @@ DataStorage::Remove(const nsCString& aKey, DataStorageType aType) + Unused << AsyncSetTimer(lock); + } + +- RunOnAllContentParents([&](dom::ContentParent* aParent) { +- Unused << aParent->SendDataStorageRemove(mFilename, aKey, aType); ++ nsString filename(mFilename); ++ RunOnAllContentParents( ++ [filename, aKey, aType] (dom::ContentParent* aParent) { ++ Unused << aParent->SendDataStorageRemove(filename, aKey, aType); + }); + } + +@@ -914,8 +925,9 @@ DataStorage::Clear() + } + } + +- RunOnAllContentParents([&](dom::ContentParent* aParent) { +- Unused << aParent->SendDataStorageClear(mFilename); ++ nsString filename(mFilename); ++ RunOnAllContentParents([filename] (dom::ContentParent* aParent) { ++ Unused << aParent->SendDataStorageClear(filename); + }); + + return NS_OK; Copied: branches/2018Q2/www/waterfox/files/patch-bug1459206 (from r469879, head/www/waterfox/files/patch-bug1459206) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1459206 Mon May 14 12:09:58 2018 (r469881, copy of r469879, head/www/waterfox/files/patch-bug1459206) @@ -0,0 +1,44 @@ +commit 4741651d3ac6 +Author: Andrea Marchesini +Date: Thu May 10 11:24:25 2018 +0200 + + Bug 1459206 - Use FileSystemSecurity in ContentParent::RecvGetFilesRequest. r=ehsan, a=RyanVM + + --HG-- + extra : source : a3ebab26f0d9e962f1f892335838ee1b51335378 +--- + dom/filesystem/tests/test_webkitdirectory.html | 1 + + dom/ipc/ContentParent.cpp | 8 ++++++++ + 2 files changed, 9 insertions(+) + +diff --git dom/filesystem/tests/test_webkitdirectory.html dom/filesystem/tests/test_webkitdirectory.html +index 3611039a5a46a..45957f9bb56d0 100644 +--- dom/filesystem/tests/test_webkitdirectory.html ++++ dom/filesystem/tests/test_webkitdirectory.html +@@ -151,6 +151,7 @@ function test_changeDataWhileWorking() { + + function test_setup() { + SpecialPowers.pushPrefEnv({"set": [["dom.input.dirpicker", true], ++ ["dom.filesystem.pathcheck.disabled", true], + ["dom.webkitBlink.dirPicker.enabled", true]]}, next); + } + +diff --git dom/ipc/ContentParent.cpp dom/ipc/ContentParent.cpp +index 9912238b27744..c55fb106690f0 100644 +--- dom/ipc/ContentParent.cpp ++++ dom/ipc/ContentParent.cpp +@@ -5241,6 +5241,14 @@ ContentParent::RecvGetFilesRequest(const nsID& aUUID, + { + MOZ_ASSERT(!mGetFilesPendingRequests.GetWeak(aUUID)); + ++ if (!mozilla::Preferences::GetBool("dom.filesystem.pathcheck.disabled", false)) { ++ RefPtr fss = FileSystemSecurity::Get(); ++ if (NS_WARN_IF(!fss || ++ !fss->ContentProcessHasAccessTo(ChildID(), aDirectoryPath))) { ++ return IPC_FAIL_NO_REASON(this); ++ } ++ } ++ + ErrorResult rv; + RefPtr helper = + GetFilesHelperParent::Create(aUUID, aDirectoryPath, aRecursiveFlag, this, Modified: branches/2018Q2/www/waterfox/files/patch-typos ============================================================================== --- branches/2018Q2/www/waterfox/files/patch-typos Mon May 14 12:09:24 2018 (r469880) +++ branches/2018Q2/www/waterfox/files/patch-typos Mon May 14 12:09:58 2018 (r469881) @@ -40,3 +40,16 @@ Mismerges found by comparing changes with Firefox 56 +#define SOFTOKEN_BETA PR_FALSE #endif /* _SOFTKVER_H_ */ +--- widget/WidgetMessageUtils.h.orig ++++ widget/WidgetMessageUtils.h +@@ -35,10 +35,6 @@ struct ParamTraits + }; + + template<> +-struct ParamTraits : public ContiguousEnumSerializerInclusive +-{ }; +- +-template<> + struct ParamTraits + : public ContiguousEnumSerializer + { From owner-svn-ports-branches@freebsd.org Mon May 14 16:30:34 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 036A5DF8B25; Mon, 14 May 2018 16:30:34 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A55098648D; Mon, 14 May 2018 16:30:33 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 867351E8DC; Mon, 14 May 2018 16:30:33 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EGUXMh017273; Mon, 14 May 2018 16:30:33 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EGUXJH017272; Mon, 14 May 2018 16:30:33 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201805141630.w4EGUXJH017272@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 14 May 2018 16:30:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469914 - branches/2018Q2/japanese/p5-Text-ChaSen X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2018Q2/japanese/p5-Text-ChaSen X-SVN-Commit-Revision: 469914 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 16:30:34 -0000 Author: sunpoet Date: Mon May 14 16:30:33 2018 New Revision: 469914 URL: https://svnweb.freebsd.org/changeset/ports/469914 Log: MFH: r469913 Update MASTER_SITES and unbreak this port Approved by: ports-secteam (blanket) Modified: branches/2018Q2/japanese/p5-Text-ChaSen/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/japanese/p5-Text-ChaSen/Makefile ============================================================================== --- branches/2018Q2/japanese/p5-Text-ChaSen/Makefile Mon May 14 16:27:20 2018 (r469913) +++ branches/2018Q2/japanese/p5-Text-ChaSen/Makefile Mon May 14 16:30:33 2018 (r469914) @@ -5,7 +5,7 @@ PORTNAME= Text-ChaSen PORTVERSION= 1.03 PORTREVISION= 7 CATEGORIES= japanese textproc perl5 -MASTER_SITES= OSDN/chasen-legacy/32224 +MASTER_SITES= OSDN/chasen-legacy/56305 DISTNAME= chasen-${CHASEN_VERSION} MAINTAINER= perl@FreeBSD.org From owner-svn-ports-branches@freebsd.org Mon May 14 20:28:25 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22C01E75F67; Mon, 14 May 2018 20:28:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C39A2807D6; Mon, 14 May 2018 20:28:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DB3C210B0; Mon, 14 May 2018 20:28:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EKSO4X044359; Mon, 14 May 2018 20:28:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EKSNAX044357; Mon, 14 May 2018 20:28:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805142028.w4EKSNAX044357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 14 May 2018 20:28:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469964 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 469964 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 20:28:25 -0000 Author: jbeich Date: Mon May 14 20:28:23 2018 New Revision: 469964 URL: https://svnweb.freebsd.org/changeset/ports/469964 Log: MFH: r469963 www/waterfox: update to 56.2.0 Changes: https://github.com/MrAlex94/Waterfox/compare/edfc016bc021c...56.2.0 Approved by: ports-secteam blanket Deleted: branches/2018Q2/www/waterfox/files/patch-bug1393367 branches/2018Q2/www/waterfox/files/patch-bug1409440 branches/2018Q2/www/waterfox/files/patch-bug1432323 branches/2018Q2/www/waterfox/files/patch-bug1436759 branches/2018Q2/www/waterfox/files/patch-bug1439723 branches/2018Q2/www/waterfox/files/patch-bug1448705 branches/2018Q2/www/waterfox/files/patch-bug1448771 branches/2018Q2/www/waterfox/files/patch-bug1449358 branches/2018Q2/www/waterfox/files/patch-bug1451376 branches/2018Q2/www/waterfox/files/patch-bug1452202 branches/2018Q2/www/waterfox/files/patch-bug1452417 branches/2018Q2/www/waterfox/files/patch-typos Modified: branches/2018Q2/www/waterfox/Makefile branches/2018Q2/www/waterfox/distinfo branches/2018Q2/www/waterfox/files/patch-bug1426129 Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Mon May 14 20:26:53 2018 (r469963) +++ branches/2018Q2/www/waterfox/Makefile Mon May 14 20:28:23 2018 (r469964) @@ -1,15 +1,14 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.1.0-111178 -DISTVERSIONSUFFIX= -gedfc016bc021c +DISTVERSION= 56.2.0 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment -EXPIRATION_DATE=2018-05-16 +EXPIRATION_DATE=2018-07-03 BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ Modified: branches/2018Q2/www/waterfox/distinfo ============================================================================== --- branches/2018Q2/www/waterfox/distinfo Mon May 14 20:26:53 2018 (r469963) +++ branches/2018Q2/www/waterfox/distinfo Mon May 14 20:28:23 2018 (r469964) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526290324 -SHA256 (MrAlex94-Waterfox-56.1.0-111178-gedfc016bc021c_GH0.tar.gz) = a34715f6954e5b557e976166b69f976f0ae3bc92b168ca26ab6d3ba62bf8e6ec -SIZE (MrAlex94-Waterfox-56.1.0-111178-gedfc016bc021c_GH0.tar.gz) = 394952776 +TIMESTAMP = 1526323182 +SHA256 (MrAlex94-Waterfox-56.2.0_GH0.tar.gz) = b4f8ee4ef6544bacb6b0575e99e05d399cf83f983d3b0193cd9df39bd509f0d2 +SIZE (MrAlex94-Waterfox-56.2.0_GH0.tar.gz) = 395158434 Modified: branches/2018Q2/www/waterfox/files/patch-bug1426129 ============================================================================== --- branches/2018Q2/www/waterfox/files/patch-bug1426129 Mon May 14 20:26:53 2018 (r469963) +++ branches/2018Q2/www/waterfox/files/patch-bug1426129 Mon May 14 20:28:23 2018 (r469964) @@ -26,91 +26,6 @@ index 594b90f808e4..79224b73cefa 100644 LOG(("CamerasSingleton: %p", this)); } -@@ -291,7 +293,7 @@ CamerasChild::NumberOfCapabilities(CaptureEngine aCapEngine, - LOG(("NumberOfCapabilities for %s", deviceUniqueIdUTF8)); - nsCString unique_id(deviceUniqueIdUTF8); - nsCOMPtr runnable = -- mozilla::NewNonOwningRunnableMethod( -+ mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendNumberOfCapabilities", - this, - &CamerasChild::SendNumberOfCapabilities, -@@ -307,7 +309,7 @@ CamerasChild::NumberOfCaptureDevices(CaptureEngine aCapEngine) - { - LOG((__PRETTY_FUNCTION__)); - nsCOMPtr runnable = -- mozilla::NewNonOwningRunnableMethod( -+ mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendNumberOfCaptureDevices", - this, - &CamerasChild::SendNumberOfCaptureDevices, -@@ -334,7 +336,7 @@ CamerasChild::EnsureInitialized(CaptureEngine aCapEngine) - { - LOG((__PRETTY_FUNCTION__)); - nsCOMPtr runnable = -- mozilla::NewNonOwningRunnableMethod( -+ mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendEnsureInitialized", - this, - &CamerasChild::SendEnsureInitialized, -@@ -353,7 +355,7 @@ CamerasChild::GetCaptureCapability(CaptureEngine aCapEngine, - LOG(("GetCaptureCapability: %s %d", unique_idUTF8, capability_number)); - nsCString unique_id(unique_idUTF8); - nsCOMPtr runnable = -- mozilla::NewNonOwningRunnableMethod( -+ mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendGetCaptureCapability", - this, - &CamerasChild::SendGetCaptureCapability, -@@ -395,7 +397,7 @@ CamerasChild::GetCaptureDevice(CaptureEngine aCapEngine, - { - LOG((__PRETTY_FUNCTION__)); - nsCOMPtr runnable = -- mozilla::NewNonOwningRunnableMethod( -+ mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendGetCaptureDevice", - this, - &CamerasChild::SendGetCaptureDevice, -@@ -439,9 +441,9 @@ CamerasChild::AllocateCaptureDevice(CaptureEngine aCapEngine, - LOG((__PRETTY_FUNCTION__)); - nsCString unique_id(unique_idUTF8); - nsCOMPtr runnable = -- mozilla::NewNonOwningRunnableMethod( -+ mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendAllocateCaptureDevice", - this, - &CamerasChild::SendAllocateCaptureDevice, -@@ -475,7 +477,7 @@ CamerasChild::ReleaseCaptureDevice(CaptureEngine aCapEngine, - { - LOG((__PRETTY_FUNCTION__)); - nsCOMPtr runnable = -- mozilla::NewNonOwningRunnableMethod( -+ mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendReleaseCaptureDevice", - this, - &CamerasChild::SendReleaseCaptureDevice, -@@ -526,7 +528,7 @@ CamerasChild::StartCapture(CaptureEngine aCapEngine, - webrtcCaps.codecType, - webrtcCaps.interlaced); - nsCOMPtr runnable = mozilla:: -- NewNonOwningRunnableMethod( -+ NewRunnableMethod( - "camera::PCamerasChild::SendStartCapture", - this, - &CamerasChild::SendStartCapture, -@@ -542,7 +544,7 @@ CamerasChild::StopCapture(CaptureEngine aCapEngine, const int capture_id) - { - LOG((__PRETTY_FUNCTION__)); - nsCOMPtr runnable = -- mozilla::NewNonOwningRunnableMethod( -+ mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendStopCapture", - this, - &CamerasChild::SendStopCapture, @@ -559,6 +561,9 @@ void Shutdown(void) { @@ -121,15 +36,6 @@ index 594b90f808e4..79224b73cefa 100644 CamerasChild* child = CamerasSingleton::Child(); if (!child) { // We don't want to cause everything to get fired up if we're -@@ -610,7 +615,7 @@ CamerasChild::ShutdownParent() - // Delete the parent actor. - // CamerasChild (this) will remain alive and is only deleted by the - // IPC layer when SendAllDone returns. -- nsCOMPtr deleteRunnable = mozilla::NewNonOwningRunnableMethod( -+ nsCOMPtr deleteRunnable = mozilla::NewRunnableMethod( - "camera::PCamerasChild::SendAllDone", this, &CamerasChild::SendAllDone); - CamerasSingleton::Thread()->Dispatch(deleteRunnable, NS_DISPATCH_NORMAL); - } else { @@ -733,7 +738,7 @@ CamerasChild::~CamerasChild() { LOG(("~CamerasChild: %p", this)); @@ -166,3 +72,12 @@ index b2029dbd6b9d..620c409b656f 100644 }; // Get a pointer to a CamerasChild object we can use to do IPC with. +@@ -149,7 +158,7 @@ class CamerasChild final : public PCamerasChild + public: + // We are owned by the PBackground thread only. CamerasSingleton + // takes a non-owning reference. +- NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CamerasChild) ++ NS_INLINE_DECL_REFCOUNTING(CamerasChild) + + // IPC messages recevied, received on the PBackground thread + // these are the actual callbacks with data From owner-svn-ports-branches@freebsd.org Tue May 15 08:41:18 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11DFFEE98DE; Tue, 15 May 2018 08:41:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B88A26B230; Tue, 15 May 2018 08:41:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A71ACAE; Tue, 15 May 2018 08:41:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4F8fHGU015353; Tue, 15 May 2018 08:41:17 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4F8fH2j015351; Tue, 15 May 2018 08:41:17 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805150841.w4F8fH2j015351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 15 May 2018 08:41:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470003 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 470003 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 08:41:18 -0000 Author: jbeich Date: Tue May 15 08:41:16 2018 New Revision: 470003 URL: https://svnweb.freebsd.org/changeset/ports/470003 Log: MFH: r469998 www/waterfox: update to 56.2.0.7 Changes: https://github.com/MrAlex94/Waterfox/compare/56.2.0...436898372f858 Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1381815 - copied unchanged from r469998, head/www/waterfox/files/patch-bug1381815 Deleted: branches/2018Q2/www/waterfox/files/patch-bug1426129 branches/2018Q2/www/waterfox/files/patch-bug1439444 branches/2018Q2/www/waterfox/files/patch-bug1443110 Modified: branches/2018Q2/www/waterfox/Makefile branches/2018Q2/www/waterfox/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Tue May 15 08:40:25 2018 (r470002) +++ branches/2018Q2/www/waterfox/Makefile Tue May 15 08:41:16 2018 (r470003) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.2.0 +DISTVERSION= 56.2.0-7 +DISTVERSIONSUFFIX= -g436898372f858 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/www/waterfox/distinfo ============================================================================== --- branches/2018Q2/www/waterfox/distinfo Tue May 15 08:40:25 2018 (r470002) +++ branches/2018Q2/www/waterfox/distinfo Tue May 15 08:41:16 2018 (r470003) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526323182 -SHA256 (MrAlex94-Waterfox-56.2.0_GH0.tar.gz) = b4f8ee4ef6544bacb6b0575e99e05d399cf83f983d3b0193cd9df39bd509f0d2 -SIZE (MrAlex94-Waterfox-56.2.0_GH0.tar.gz) = 395158434 +TIMESTAMP = 1526343922 +SHA256 (MrAlex94-Waterfox-56.2.0-7-g436898372f858_GH0.tar.gz) = ed9b870b81e3263afaf92efa9830b2a8e84cd71d78e300feaa5de70395974aae +SIZE (MrAlex94-Waterfox-56.2.0-7-g436898372f858_GH0.tar.gz) = 395153667 Copied: branches/2018Q2/www/waterfox/files/patch-bug1381815 (from r469998, head/www/waterfox/files/patch-bug1381815) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1381815 Tue May 15 08:41:16 2018 (r470003, copy of r469998, head/www/waterfox/files/patch-bug1381815) @@ -0,0 +1,278 @@ +commit 165fab2f8596 +Author: Jan Horak +Date: Tue Oct 10 13:35:56 2017 +0200 + + Bug 1381815 - fixing dimensions of radio and checkbox for GTK 3.20+; r=karlt + + In the GTK < 3.20 the size of radio and checkbox toggle is determined by indicator + spacing and indicator size. By GTK 3.20+ it is replaced by standard box model + (padding, margin, border). The patch fixes that while keeping the functionality + for older GTK. The values are also cached by similar way as scrollbar metrics + are cached now. + + The focus is no longer rendered by GTK but by Mozilla code, so the extra + size for toggles has been removed from GetExtraSizeForWidget and toggles + no longer render focus indicator. + + MozReview-Commit-ID: 1Wg5AgHy1Vz + + --HG-- + extra : rebase_source : 81437f45b7d32555942d21fccc9de4a561d85111 +--- + widget/gtk/gtk3drawing.cpp | 121 ++++++++++++++++++++++++++++++---------- + widget/gtk/gtkdrawing.h | 14 +++++ + widget/gtk/nsNativeThemeGTK.cpp | 32 +---------- + 3 files changed, 107 insertions(+), 60 deletions(-) + +diff --git widget/gtk/gtk3drawing.cpp widget/gtk/gtk3drawing.cpp +index 4c562b380095..7968aef920f6 100644 +--- widget/gtk/gtk3drawing.cpp ++++ widget/gtk/gtk3drawing.cpp +@@ -22,6 +22,8 @@ static gboolean checkbox_check_state; + static gboolean notebook_has_tab_gap; + + static ScrollbarGTKMetrics sScrollbarMetrics[2]; ++static ToggleGTKMetrics sCheckboxMetrics; ++static ToggleGTKMetrics sRadioMetrics; + + #define ARROW_UP 0 + #define ARROW_DOWN G_PI +@@ -110,6 +112,8 @@ moz_gtk_refresh() + + sScrollbarMetrics[GTK_ORIENTATION_HORIZONTAL].initialized = false; + sScrollbarMetrics[GTK_ORIENTATION_VERTICAL].initialized = false; ++ sCheckboxMetrics.initialized = false; ++ sRadioMetrics.initialized = false; + } + + gint +@@ -308,33 +312,21 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect, + gboolean isradio, GtkTextDirection direction) + { + GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); +- gint indicator_size, indicator_spacing; + gint x, y, width, height; +- gint focus_x, focus_y, focus_width, focus_height; + GtkStyleContext *style; + +- GtkWidget *widget = GetWidget(isradio ? MOZ_GTK_RADIOBUTTON_CONTAINER : +- MOZ_GTK_CHECKBUTTON_CONTAINER); +- gtk_widget_style_get(widget, +- "indicator_size", &indicator_size, +- "indicator_spacing", &indicator_spacing, +- nullptr); ++ const ToggleGTKMetrics* metrics = GetToggleMetrics(isradio); + + // XXX we should assert rect->height >= indicator_size too + // after bug 369581 is fixed. +- MOZ_ASSERT(rect->width >= indicator_size, ++ MOZ_ASSERT(rect->width >= metrics->minSizeWithBorder.width, + "GetMinimumWidgetSize was ignored"); + + // Paint it center aligned in the rect. +- x = rect->x + (rect->width - indicator_size) / 2; +- y = rect->y + (rect->height - indicator_size) / 2; +- width = indicator_size; +- height = indicator_size; +- +- focus_x = x - indicator_spacing; +- focus_y = y - indicator_spacing; +- focus_width = width + 2 * indicator_spacing; +- focus_height = height + 2 * indicator_spacing; ++ width = metrics->minSizeWithBorder.width; ++ height = metrics->minSizeWithBorder.height; ++ x = rect->x + (rect->width - width) / 2; ++ y = rect->y + (rect->height - height) / 2; + + if (selected) + state_flags = static_cast(state_flags|checkbox_check_state); +@@ -348,20 +340,25 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect, + if (gtk_check_version(3, 20, 0) == nullptr) { + gtk_render_background(style, cr, x, y, width, height); + gtk_render_frame(style, cr, x, y, width, height); +- } +- +- if (isradio) { +- gtk_render_option(style, cr, x, y, width, height); +- if (state->focused) { +- gtk_render_focus(style, cr, focus_x, focus_y, +- focus_width, focus_height); ++ // Indicator is inset by the toggle's padding and border. ++ gint indicator_x = x + metrics->borderAndPadding.left; ++ gint indicator_y = y + metrics->borderAndPadding.top; ++ gint indicator_width = metrics->minSizeWithBorder.width - ++ metrics->borderAndPadding.left - metrics->borderAndPadding.right; ++ gint indicator_height = metrics->minSizeWithBorder.height - ++ metrics->borderAndPadding.top - metrics->borderAndPadding.bottom; ++ if (isradio) { ++ gtk_render_option(style, cr, indicator_x, indicator_y, ++ indicator_width, indicator_height); ++ } else { ++ gtk_render_check(style, cr, indicator_x, indicator_y, ++ indicator_width, indicator_height); + } +- } +- else { +- gtk_render_check(style, cr, x, y, width, height); +- if (state->focused) { +- gtk_render_focus(style, cr, +- focus_x, focus_y, focus_width, focus_height); ++ } else { ++ if (isradio) { ++ gtk_render_option(style, cr, x, y, width, height); ++ } else { ++ gtk_render_check(style, cr, x, y, width, height); + } + } + +@@ -2514,6 +2511,68 @@ SizeFromLengthAndBreadth(GtkOrientation aOrientation, + MozGtkSize({aLength, aBreadth}) : MozGtkSize({aBreadth, aLength}); + } + ++const ToggleGTKMetrics* ++GetToggleMetrics(bool isRadio) ++{ ++ ToggleGTKMetrics* metrics; ++ if (isRadio) { ++ metrics = &sRadioMetrics; ++ } else { ++ metrics = &sCheckboxMetrics; ++ } ++ if (metrics->initialized) ++ return metrics; ++ ++ metrics->initialized = true; ++ if (gtk_check_version(3,20,0) == nullptr) { ++ GtkStyleContext* style; ++ if (isRadio) { ++ style = GetStyleContext(MOZ_GTK_RADIOBUTTON); ++ } else { ++ style = GetStyleContext(MOZ_GTK_CHECKBUTTON); ++ } ++ GtkStateFlags state_flags = gtk_style_context_get_state(style); ++ gtk_style_context_get(style, state_flags, ++ "min-height",&(metrics->minSizeWithBorder.height), ++ "min-width", &(metrics->minSizeWithBorder.width), ++ nullptr); ++ // Fallback to indicator size if min dimensions are zero ++ if (metrics->minSizeWithBorder.height == 0 || ++ metrics->minSizeWithBorder.width == 0) { ++ gint indicator_size; ++ gtk_widget_style_get(GetWidget(MOZ_GTK_CHECKBUTTON_CONTAINER), ++ "indicator_size", &indicator_size, nullptr); ++ if (metrics->minSizeWithBorder.height == 0) { ++ metrics->minSizeWithBorder.height = indicator_size; ++ } ++ if (metrics->minSizeWithBorder.width == 0) { ++ metrics->minSizeWithBorder.width = indicator_size; ++ } ++ } ++ ++ GtkBorder border, padding; ++ gtk_style_context_get_border(style, state_flags, &border); ++ gtk_style_context_get_padding(style, state_flags, &padding); ++ metrics->borderAndPadding.left = border.left + padding.left; ++ metrics->borderAndPadding.right = border.right + padding.right; ++ metrics->borderAndPadding.top = border.top + padding.top; ++ metrics->borderAndPadding.bottom = border.bottom + padding.bottom; ++ metrics->minSizeWithBorder.width += metrics->borderAndPadding.left + ++ metrics->borderAndPadding.right; ++ metrics->minSizeWithBorder.height += metrics->borderAndPadding.top + ++ metrics->borderAndPadding.bottom; ++ } else { ++ gint indicator_size, indicator_spacing; ++ gtk_widget_style_get(GetWidget(MOZ_GTK_CHECKBUTTON_CONTAINER), ++ "indicator_size", &indicator_size, ++ "indicator_spacing", &indicator_spacing, ++ nullptr); ++ metrics->minSizeWithBorder.width = ++ metrics->minSizeWithBorder.height = indicator_size; ++ } ++ return metrics; ++} ++ + const ScrollbarGTKMetrics* + GetScrollbarMetrics(GtkOrientation aOrientation) + { +diff --git widget/gtk/gtkdrawing.h widget/gtk/gtkdrawing.h +index 42dbf8287499..909c18f7f525 100644 +--- widget/gtk/gtkdrawing.h ++++ widget/gtk/gtkdrawing.h +@@ -83,6 +83,12 @@ typedef struct { + } border; + } ScrollbarGTKMetrics; + ++typedef struct { ++ bool initialized; ++ MozGtkSize minSizeWithBorder; ++ GtkBorder borderAndPadding; ++} ToggleGTKMetrics; ++ + typedef enum { + MOZ_GTK_STEPPER_DOWN = 1 << 0, + MOZ_GTK_STEPPER_BOTTOM = 1 << 1, +@@ -391,6 +397,14 @@ moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom, + gint + moz_gtk_checkbox_get_metrics(gint* indicator_size, gint* indicator_spacing); + ++/** ++ * Get metrics of the toggle (radio or checkbox) ++ * isRadio: [IN] true when requesting metrics for the radio button ++ * returns: pointer to ToggleGTKMetrics struct ++ */ ++const ToggleGTKMetrics* ++GetToggleMetrics(bool isRadio); ++ + /** + * Get the desired size of a GtkRadioButton + * indicator_size: [OUT] the indicator size +diff --git widget/gtk/nsNativeThemeGTK.cpp widget/gtk/nsNativeThemeGTK.cpp +index 06e62efbcda8..da3eaa71a6b4 100644 +--- widget/gtk/nsNativeThemeGTK.cpp ++++ widget/gtk/nsNativeThemeGTK.cpp +@@ -1020,24 +1020,6 @@ nsNativeThemeGTK::GetExtraSizeForWidget(nsIFrame* aFrame, uint8_t aWidgetType, + aExtra->left = aExtra->right = 1; + break; + +- // Include the indicator spacing (the padding around the control). +- case NS_THEME_CHECKBOX: +- case NS_THEME_RADIO: +- { +- gint indicator_size, indicator_spacing; +- +- if (aWidgetType == NS_THEME_CHECKBOX) { +- moz_gtk_checkbox_get_metrics(&indicator_size, &indicator_spacing); +- } else { +- moz_gtk_radio_get_metrics(&indicator_size, &indicator_spacing); +- } +- +- aExtra->top = indicator_spacing; +- aExtra->right = indicator_spacing; +- aExtra->bottom = indicator_spacing; +- aExtra->left = indicator_spacing; +- break; +- } + case NS_THEME_BUTTON : + { + if (IsDefaultButton(aFrame)) { +@@ -1595,17 +1577,9 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsPresContext* aPresContext, + case NS_THEME_CHECKBOX: + case NS_THEME_RADIO: + { +- gint indicator_size, indicator_spacing; +- +- if (aWidgetType == NS_THEME_CHECKBOX) { +- moz_gtk_checkbox_get_metrics(&indicator_size, &indicator_spacing); +- } else { +- moz_gtk_radio_get_metrics(&indicator_size, &indicator_spacing); +- } +- +- // Include space for the indicator and the padding around it. +- aResult->width = indicator_size; +- aResult->height = indicator_size; ++ const ToggleGTKMetrics* metrics = GetToggleMetrics(aWidgetType == NS_THEME_RADIO); ++ aResult->width = metrics->minSizeWithBorder.width; ++ aResult->height = metrics->minSizeWithBorder.height; + } + break; + case NS_THEME_TOOLBARBUTTON_DROPDOWN: From owner-svn-ports-branches@freebsd.org Tue May 15 08:42:04 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35F29EE995C; Tue, 15 May 2018 08:42:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DC2B56B4A3; Tue, 15 May 2018 08:42:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE074CE3; Tue, 15 May 2018 08:42:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4F8g3mP017925; Tue, 15 May 2018 08:42:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4F8g3wq017923; Tue, 15 May 2018 08:42:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805150842.w4F8g3wq017923@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 15 May 2018 08:42:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470004 - in branches/2018Q2/emulators/rpcs3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/emulators/rpcs3: . files X-SVN-Commit-Revision: 470004 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 08:42:04 -0000 Author: jbeich Date: Tue May 15 08:42:03 2018 New Revision: 470004 URL: https://svnweb.freebsd.org/changeset/ports/470004 Log: MFH: r469986 emulators/rpcs3: update to 0.0.5.282 Changes: https://github.com/RPCS3/rpcs3/compare/76a1d0d8f...04ad49de4 Changes: https://github.com/RPCS3/llvm/compare/6154c0dcaf1a...17ec6d78a737 Approved by: ports-secteam (junovitch, implicit for snapshots) Deleted: branches/2018Q2/emulators/rpcs3/files/patch-no-asserts Modified: branches/2018Q2/emulators/rpcs3/Makefile branches/2018Q2/emulators/rpcs3/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q2/emulators/rpcs3/Makefile Tue May 15 08:41:16 2018 (r470003) +++ branches/2018Q2/emulators/rpcs3/Makefile Tue May 15 08:42:03 2018 (r470004) @@ -2,9 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-259 -DISTVERSIONSUFFIX= -g76a1d0d8f -PORTREVISION= 1 +DISTVERSION= 0.0.5-282 +DISTVERSIONSUFFIX= -g04ad49de4 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -26,9 +25,10 @@ ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \ - RPCS3:llvm:6154c0dcaf1:llvm/llvm \ + RPCS3:llvm:17ec6d78a73:llvm/llvm \ RPCS3:yaml-cpp:release-0.5.3-62-g017626a:yamlcpp/Utilities/yaml-cpp \ akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \ + Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \ kobalicek:asmjit:673dcef:asmjit/asmjit \ Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \ USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \ Modified: branches/2018Q2/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q2/emulators/rpcs3/distinfo Tue May 15 08:41:16 2018 (r470003) +++ branches/2018Q2/emulators/rpcs3/distinfo Tue May 15 08:42:03 2018 (r470004) @@ -1,14 +1,16 @@ -TIMESTAMP = 1525898306 -SHA256 (RPCS3-rpcs3-v0.0.5-259-g76a1d0d8f_GH0.tar.gz) = 8398bb419320cd433add13f3f1d72842d32e1aac4eca5262c24feb89ded990b5 -SIZE (RPCS3-rpcs3-v0.0.5-259-g76a1d0d8f_GH0.tar.gz) = 4842636 +TIMESTAMP = 1526318079 +SHA256 (RPCS3-rpcs3-v0.0.5-282-g04ad49de4_GH0.tar.gz) = fae9894c962e62dc9eb7c36c23081373355dbed3a30949cdb356bd44f41b2d92 +SIZE (RPCS3-rpcs3-v0.0.5-282-g04ad49de4_GH0.tar.gz) = 4859220 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 -SHA256 (RPCS3-llvm-6154c0dcaf1_GH0.tar.gz) = 7623cfb81e587c7ae8db783676689eee1249d8332b7b9a688cbb76763f172127 -SIZE (RPCS3-llvm-6154c0dcaf1_GH0.tar.gz) = 37831787 +SHA256 (RPCS3-llvm-17ec6d78a73_GH0.tar.gz) = 4567d1d946429ce55d6c0480fad3b82874aad22c2b1928ac4d4ba5ba40338604 +SIZE (RPCS3-llvm-17ec6d78a73_GH0.tar.gz) = 37823077 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 SIZE (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 65888 SHA256 (akrzemi1-Optional-f27e790_GH0.tar.gz) = d9f81fa3699b724812994897180365b7ee2fdef1549239d5086722bd4552baf1 SIZE (akrzemi1-Optional-f27e790_GH0.tar.gz) = 16055 +SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95 +SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521 SHA256 (kobalicek-asmjit-673dcef_GH0.tar.gz) = 228dd2f422740a1c9e713f1c86934e95d75fc1a8731a88ea006a2cebb033ca8c SIZE (kobalicek-asmjit-673dcef_GH0.tar.gz) = 448118 SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff240bf4dd3ef44ba8c832451376fff8e74f7734d32fc8c337557a64d From owner-svn-ports-branches@freebsd.org Tue May 15 21:01:26 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 006FFEAEDF2; Tue, 15 May 2018 21:01:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A2A53807D6; Tue, 15 May 2018 21:01:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83CC610B13; Tue, 15 May 2018 21:01:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4FL1Pl0094064; Tue, 15 May 2018 21:01:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FL1PrL093667; Tue, 15 May 2018 21:01:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805152101.w4FL1PrL093667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 15 May 2018 21:01:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470058 - in branches/2018Q2/math/ceres-solver: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/math/ceres-solver: . files X-SVN-Commit-Revision: 470058 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 21:01:26 -0000 Author: jbeich Date: Tue May 15 21:01:24 2018 New Revision: 470058 URL: https://svnweb.freebsd.org/changeset/ports/470058 Log: MFH: r470051 r470052 r470053 r470054 r470055 r470056 math/ceres-solver: fix LAPACK options after r465552/r465553 - NETLIB used wrong library - OPENBLAS was nop - ATLAS didn't build Approved by: ports-secteam blanket Added: branches/2018Q2/math/ceres-solver/files/ - copied from r470052, head/math/ceres-solver/files/ Modified: branches/2018Q2/math/ceres-solver/Makefile branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/math/ceres-solver/Makefile ============================================================================== --- branches/2018Q2/math/ceres-solver/Makefile Tue May 15 21:00:46 2018 (r470057) +++ branches/2018Q2/math/ceres-solver/Makefile Tue May 15 21:01:24 2018 (r470058) @@ -2,6 +2,7 @@ PORTNAME= ceres-solver DISTVERSION= 1.14.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= jbeich@FreeBSD.org @@ -69,19 +70,24 @@ TEST_IMPLIES= GFLAGS LAPACK_DESC= Linear Algebra PACKage LAPACK_USES= fortran # LDFLAGS LAPACK_CMAKE_BOOL= LAPACK +LAPACK_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW # USES=fortran +# Avoid conflict with Ceres threading by using single-threaded BLAS library. +# BLASLIB from USES=blaslapack cannot be used as it's multi-threaded. +# https://github.com/xianyi/OpenBLAS/wiki/faq#multi-threaded ATLAS_USES= blaslapack:atlas -ATLAS_MAKE_ENV= BLA_VENDOR=ATLAS -ATLAS_CMAKE_ON= -DLAPACK_LIBRARIES:STRING=alapack +ATLAS_CMAKE_ON= -DBLA_VENDOR:STRING="ATLAS" \ + -DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so" \ + -DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libalapack.so" ATLAS_IMPLIES= LAPACK GOTOBLAS_DESC= Goto blas implementation GOTOBLAS_USES= blaslapack:gotoblas -GOTOBLAS_MAKE_ENV= BLA_VENDOR=Goto +GOTOBLAS_CMAKE_ON= -DBLA_VENDOR:STRING="Goto" GOTOBLAS_IMPLIES= LAPACK NETLIB_USES= blaslapack:netlib -NETLIB_MAKE_ENV= BLA_VENDOR=Generic +NETLIB_CMAKE_ON= -DBLA_VENDOR:STRING="Generic" NETLIB_IMPLIES= LAPACK OPENBLAS_USES= blaslapack:openblas -OPENBLAS_MAKE_ENV= BLA_VENDOR=OpenBLAS +OPENBLAS_CMAKE_ON= -DBLA_VENDOR:STRING="OpenBLAS" OPENBLAS_IMPLIES= LAPACK SPARSE_DESC= Sparse linear algebra library Modified: branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt ============================================================================== --- head/math/ceres-solver/files/patch-CMakeLists.txt Tue May 15 20:42:11 2018 (r470052) +++ branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt Tue May 15 21:01:24 2018 (r470058) @@ -7,7 +7,7 @@ https://github.com/ceres-solver/ceres-solver/issues/35 # -std=c++11 s/t we will detect the C++11 versions of unordered_map & # shared_ptr if they exist. - set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11") -+ set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif (CXX11 AND COMPILER_HAS_CXX11_FLAG) # Set the Ceres compile definitions for the unordered_map configuration. From owner-svn-ports-branches@freebsd.org Wed May 16 22:19:48 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83400ED8F5D; Wed, 16 May 2018 22:19:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 34E567F065; Wed, 16 May 2018 22:19:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 079C120265; Wed, 16 May 2018 22:19:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4GMJlJo065811; Wed, 16 May 2018 22:19:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GMJlD9065807; Wed, 16 May 2018 22:19:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805162219.w4GMJlD9065807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 16 May 2018 22:19:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470156 - in branches/2018Q2/www: firefox firefox-i18n X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www: firefox firefox-i18n X-SVN-Commit-Revision: 470156 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2018 22:19:49 -0000 Author: jbeich Date: Wed May 16 22:19:46 2018 New Revision: 470156 URL: https://svnweb.freebsd.org/changeset/ports/470156 Log: MFH: r470155 www/firefox: update to 60.0.1 Changes: https://www.mozilla.org/firefox/60.0.1/releasenotes/ PR: 226476 Approved by: ports-secteam blanket Modified: branches/2018Q2/www/firefox-i18n/Makefile branches/2018Q2/www/firefox-i18n/distinfo branches/2018Q2/www/firefox/Makefile branches/2018Q2/www/firefox/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/firefox-i18n/Makefile ============================================================================== --- branches/2018Q2/www/firefox-i18n/Makefile Wed May 16 22:17:00 2018 (r470155) +++ branches/2018Q2/www/firefox-i18n/Makefile Wed May 16 22:19:46 2018 (r470156) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 60.0 -PORTREVISION= 1 +PORTVERSION= 60.0.1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi Modified: branches/2018Q2/www/firefox-i18n/distinfo ============================================================================== --- branches/2018Q2/www/firefox-i18n/distinfo Wed May 16 22:17:00 2018 (r470155) +++ branches/2018Q2/www/firefox-i18n/distinfo Wed May 16 22:19:46 2018 (r470156) @@ -1,197 +1,197 @@ -TIMESTAMP = 1525366747 -SHA256 (xpi/firefox-i18n-60.0/ach.xpi) = 53d7cc8122d01405ff1e81cd59b99c534416c1a1e1740dd0536bbb608699bd48 -SIZE (xpi/firefox-i18n-60.0/ach.xpi) = 496060 -SHA256 (xpi/firefox-i18n-60.0/af.xpi) = 3c78e0128289c2a3ecefddbbb5488cb6324828606ef46ce083d3f9a39b9ad10e -SIZE (xpi/firefox-i18n-60.0/af.xpi) = 486533 -SHA256 (xpi/firefox-i18n-60.0/an.xpi) = 6ccafad26ff3dcb004eaa409d74b4edfe1a25d9802c7e195990ee23f2af780a4 -SIZE (xpi/firefox-i18n-60.0/an.xpi) = 519732 -SHA256 (xpi/firefox-i18n-60.0/ar.xpi) = 00349c780c191d8155af51dc725ea85a6288bc8a873d1d868e26a59c7491673f -SIZE (xpi/firefox-i18n-60.0/ar.xpi) = 546957 -SHA256 (xpi/firefox-i18n-60.0/as.xpi) = c54a2447f53163d087e7b30f4fd602efcbb77c3ef91a4102539f5df9cae4fcc8 -SIZE (xpi/firefox-i18n-60.0/as.xpi) = 529947 -SHA256 (xpi/firefox-i18n-60.0/ast.xpi) = 88d92a5714da612d52ff0b27165f285ba46ce384ddbdb835c0f6bf3bf939dd96 -SIZE (xpi/firefox-i18n-60.0/ast.xpi) = 507866 -SHA256 (xpi/firefox-i18n-60.0/az.xpi) = 4112937fafee628dc80007aba16b1173bc57d9a01155a5efe1fb0fadc7db79d7 -SIZE (xpi/firefox-i18n-60.0/az.xpi) = 523975 -SHA256 (xpi/firefox-i18n-60.0/be.xpi) = 746627277957930f0a8053c2efc742390fae80d8f087d47b213f188dd2264e09 -SIZE (xpi/firefox-i18n-60.0/be.xpi) = 579944 -SHA256 (xpi/firefox-i18n-60.0/bg.xpi) = b415ea936d517c061d0ebcf42e000ed13943c78ae188c20dc5d65c297670b7cd -SIZE (xpi/firefox-i18n-60.0/bg.xpi) = 573075 -SHA256 (xpi/firefox-i18n-60.0/bn-BD.xpi) = 179a1e8909f34bce3907d11140b467743e2c69a33374a7ef4f9db8dd36979520 -SIZE (xpi/firefox-i18n-60.0/bn-BD.xpi) = 589638 -SHA256 (xpi/firefox-i18n-60.0/bn-IN.xpi) = acea49db1052b5342929bb9f36131315820c1e94f9f9e0a4051644796d215bd9 -SIZE (xpi/firefox-i18n-60.0/bn-IN.xpi) = 570084 -SHA256 (xpi/firefox-i18n-60.0/br.xpi) = c5e18d9645a9f665a736c43ac4faa828728a145f3353b92b23949998d4fc2576 -SIZE (xpi/firefox-i18n-60.0/br.xpi) = 511252 -SHA256 (xpi/firefox-i18n-60.0/bs.xpi) = 67a2a2f68c8e9a6291750e0732c9532c314f8281777432372016b0d0fc3a90bd -SIZE (xpi/firefox-i18n-60.0/bs.xpi) = 513930 -SHA256 (xpi/firefox-i18n-60.0/ca.xpi) = bef4db01eb89d19a9e39a878d63c40346ce1eca72d4b4d47494ded1218842a3b -SIZE (xpi/firefox-i18n-60.0/ca.xpi) = 524485 -SHA256 (xpi/firefox-i18n-60.0/cak.xpi) = 8cd1a8564d4198c5827e04da24cdb684501818e62a610adfcb9001aa345934c6 -SIZE (xpi/firefox-i18n-60.0/cak.xpi) = 535507 -SHA256 (xpi/firefox-i18n-60.0/cs.xpi) = 356b5cf598d3cd435f891d1c734ff69477bb1a1260f6875b7127b55186c4cc0a -SIZE (xpi/firefox-i18n-60.0/cs.xpi) = 531020 -SHA256 (xpi/firefox-i18n-60.0/cy.xpi) = c4c9fc4017deb822cec90d20f214d6266e535e8f2e176dde95adb9e5541e2e50 -SIZE (xpi/firefox-i18n-60.0/cy.xpi) = 515865 -SHA256 (xpi/firefox-i18n-60.0/da.xpi) = be63221fc0247b234b13ae5f6d56ceab4bda666fc51d45ecca7f56a5827387b3 -SIZE (xpi/firefox-i18n-60.0/da.xpi) = 509983 -SHA256 (xpi/firefox-i18n-60.0/de.xpi) = 9ce175158ab0bcf2595d23558806e1ebe2e61d7e5794fa86c2e8e55b6fce0d59 -SIZE (xpi/firefox-i18n-60.0/de.xpi) = 525692 -SHA256 (xpi/firefox-i18n-60.0/dsb.xpi) = b9a8979417bafa03b161840e85b28f320fe2bc05d9a39243c67fcabc9588390e -SIZE (xpi/firefox-i18n-60.0/dsb.xpi) = 538745 -SHA256 (xpi/firefox-i18n-60.0/el.xpi) = b91bf759b261a3ae93f1fa12b46e429297b59e77975b1a0e023336540efbde51 -SIZE (xpi/firefox-i18n-60.0/el.xpi) = 592911 -SHA256 (xpi/firefox-i18n-60.0/en-GB.xpi) = 0e95284c878250498a1655136e39b5080aa0860b2784b2e9062222cda4922607 -SIZE (xpi/firefox-i18n-60.0/en-GB.xpi) = 490907 -SHA256 (xpi/firefox-i18n-60.0/en-US.xpi) = 303cb12f5dd7f14381050082d4408ee8354dd17c85ede7c8ecb9d86302230f8b -SIZE (xpi/firefox-i18n-60.0/en-US.xpi) = 472383 -SHA256 (xpi/firefox-i18n-60.0/en-ZA.xpi) = f04e1036bb18a910fb6eb82235c55919975405982829af81bf55a28b80a3a3d7 -SIZE (xpi/firefox-i18n-60.0/en-ZA.xpi) = 473893 -SHA256 (xpi/firefox-i18n-60.0/eo.xpi) = 2186dc82ada5a005af9f32c3804d27f430120f90c85aa81ab1fff62ef2f5ee19 -SIZE (xpi/firefox-i18n-60.0/eo.xpi) = 510486 -SHA256 (xpi/firefox-i18n-60.0/es-AR.xpi) = f8937590a4970febf434643f88b0c3b8dde9c8b487537e22be36fac85b82bfb9 -SIZE (xpi/firefox-i18n-60.0/es-AR.xpi) = 523825 -SHA256 (xpi/firefox-i18n-60.0/es-CL.xpi) = 72c7ff06f70d9c91e674ff4c5d5d5516d6bf94e6f537251360eae95b6031288d -SIZE (xpi/firefox-i18n-60.0/es-CL.xpi) = 526509 -SHA256 (xpi/firefox-i18n-60.0/es-ES.xpi) = 773edf9dd30c54aa7c635a061aecf4293397ee0bfe4a4ccd5456a7e848e11b2d -SIZE (xpi/firefox-i18n-60.0/es-ES.xpi) = 459145 -SHA256 (xpi/firefox-i18n-60.0/es-MX.xpi) = 15979a5de10cd774f9f0a3f2bd75120fcba0ddcdcee0e6a16827c4951b3de7c9 -SIZE (xpi/firefox-i18n-60.0/es-MX.xpi) = 527837 -SHA256 (xpi/firefox-i18n-60.0/et.xpi) = 486f6e09edf17a28592cca6cc1023ab6df0851a3579ad269158de9ea1736f798 -SIZE (xpi/firefox-i18n-60.0/et.xpi) = 504177 -SHA256 (xpi/firefox-i18n-60.0/eu.xpi) = aaa5de02e9f28d90638cf777986f240252d5573a4823630eb53b7f98e50b1520 -SIZE (xpi/firefox-i18n-60.0/eu.xpi) = 510932 -SHA256 (xpi/firefox-i18n-60.0/fa.xpi) = f1755e375399918d1ae5f96615ec35acf3e724706885f94807d1091072f98d94 -SIZE (xpi/firefox-i18n-60.0/fa.xpi) = 565492 -SHA256 (xpi/firefox-i18n-60.0/ff.xpi) = a948f479a0d09c6b8cd2315f4ce96a8e9039aae5d560eaf6e23a547426796867 -SIZE (xpi/firefox-i18n-60.0/ff.xpi) = 511431 -SHA256 (xpi/firefox-i18n-60.0/fi.xpi) = 341c660264866ee2dfd9f51e702aaf47752345747dd886b827c1fdb4dac88731 -SIZE (xpi/firefox-i18n-60.0/fi.xpi) = 505404 -SHA256 (xpi/firefox-i18n-60.0/fr.xpi) = 6a10513550ca1a215db66180b8de1901d12a9294d123c49ed3dffb671642f8a6 -SIZE (xpi/firefox-i18n-60.0/fr.xpi) = 535240 -SHA256 (xpi/firefox-i18n-60.0/fy-NL.xpi) = f5d1819926c65bef009d9f733bedc59fd611637b57625fb36d5578980d311a07 -SIZE (xpi/firefox-i18n-60.0/fy-NL.xpi) = 523737 -SHA256 (xpi/firefox-i18n-60.0/ga-IE.xpi) = d48d35bae701f7751da67f62c06e66fe7fb88e50f9a53058f1dacdeb93243f41 -SIZE (xpi/firefox-i18n-60.0/ga-IE.xpi) = 526201 -SHA256 (xpi/firefox-i18n-60.0/gd.xpi) = cf0e1ad45addf7385ae8b06588774b97c24f13c19bd6ab8a0ac092ad446eebed -SIZE (xpi/firefox-i18n-60.0/gd.xpi) = 520094 -SHA256 (xpi/firefox-i18n-60.0/gl.xpi) = b3d5f733d8b0054117c6699b869af92364c0635894ccceb1fd10a56bf88dec76 -SIZE (xpi/firefox-i18n-60.0/gl.xpi) = 496596 -SHA256 (xpi/firefox-i18n-60.0/gn.xpi) = 79049bd1ad1352d4821b56a21f8c938dc3f949a247f22ebd0be6238dedac8d16 -SIZE (xpi/firefox-i18n-60.0/gn.xpi) = 532445 -SHA256 (xpi/firefox-i18n-60.0/gu-IN.xpi) = d8867ddf68b99170e91bfc2a5d95822f72dd628227304d197e9c8b5594510c9f -SIZE (xpi/firefox-i18n-60.0/gu-IN.xpi) = 589477 -SHA256 (xpi/firefox-i18n-60.0/he.xpi) = efe697d5cc2489773084126fd9a09a1a326045c4d0bfb6dab879bf3f440bbb03 -SIZE (xpi/firefox-i18n-60.0/he.xpi) = 535208 -SHA256 (xpi/firefox-i18n-60.0/hi-IN.xpi) = cdde1b852744e0584b66aacf193c09b49891093147daa459ded7c586a9ae9216 -SIZE (xpi/firefox-i18n-60.0/hi-IN.xpi) = 590081 -SHA256 (xpi/firefox-i18n-60.0/hr.xpi) = e58a06aef947fef842813be2ad931ef02c57348e7f3fd405d73ebd05ac0ec4c7 -SIZE (xpi/firefox-i18n-60.0/hr.xpi) = 515190 -SHA256 (xpi/firefox-i18n-60.0/hsb.xpi) = 35efa8fe9d6a89a6fcc3178154c7912aa7b2b2be02cd9b926008c04f9e1b40fa -SIZE (xpi/firefox-i18n-60.0/hsb.xpi) = 536278 -SHA256 (xpi/firefox-i18n-60.0/hu.xpi) = 95e0ed5ea210dae542ebfdc9387d9bae4fde53c38f1be1d052e81bcd1afb043b -SIZE (xpi/firefox-i18n-60.0/hu.xpi) = 537586 -SHA256 (xpi/firefox-i18n-60.0/hy-AM.xpi) = 8e7b6ae85cb24a5a116d79b62282affaa9caad20284d2c784b7c0bf9ff54c257 -SIZE (xpi/firefox-i18n-60.0/hy-AM.xpi) = 568631 -SHA256 (xpi/firefox-i18n-60.0/ia.xpi) = 1268720677549267ea5d19b5632de38973922e4c72cf90910dd4234b3a514ffb -SIZE (xpi/firefox-i18n-60.0/ia.xpi) = 509952 -SHA256 (xpi/firefox-i18n-60.0/id.xpi) = 9ca9220d62f26530af4c5bdca44d0a5691130f77a6cefb3f8c5cb8ffce8f07c6 -SIZE (xpi/firefox-i18n-60.0/id.xpi) = 501456 -SHA256 (xpi/firefox-i18n-60.0/is.xpi) = 7ecdab2c648c439e93dacbe5aa37b25a4d42122dd62ff1784323c2a56edce473 -SIZE (xpi/firefox-i18n-60.0/is.xpi) = 512502 -SHA256 (xpi/firefox-i18n-60.0/it.xpi) = 4bdf67ee507fcf3c1e8cd16a22b7cf7c8bd2c7b9ab169b881588ccf7ebcd381b -SIZE (xpi/firefox-i18n-60.0/it.xpi) = 398258 -SHA256 (xpi/firefox-i18n-60.0/ja.xpi) = cea38dd41f439d52aebbb7133c83c655e5a7cda7b9244ca697605f5fb6e75bfd -SIZE (xpi/firefox-i18n-60.0/ja.xpi) = 571236 -SHA256 (xpi/firefox-i18n-60.0/ka.xpi) = d2d92cf67836a2d42cad40e08ec8093882085112f8e8c21f74241448bedf4155 -SIZE (xpi/firefox-i18n-60.0/ka.xpi) = 556067 -SHA256 (xpi/firefox-i18n-60.0/kab.xpi) = bbfb9a2a5b9375df9d82509a5b064c499013d1f02ea464dddb3b553bb776ec5a -SIZE (xpi/firefox-i18n-60.0/kab.xpi) = 519620 -SHA256 (xpi/firefox-i18n-60.0/kk.xpi) = c5c54c15910c2254180d72c10fa8ff1429c43625cbaaca0ab42e266ec850acbe -SIZE (xpi/firefox-i18n-60.0/kk.xpi) = 582208 -SHA256 (xpi/firefox-i18n-60.0/km.xpi) = 3506f2c645ad501fa133df2ca8af5e84458e641860e490ab297f3d3d2335b312 -SIZE (xpi/firefox-i18n-60.0/km.xpi) = 582334 -SHA256 (xpi/firefox-i18n-60.0/kn.xpi) = 0b084c1ad201d15851d8a6acc40b9bac020119175ec1edc390d39a7535abab13 -SIZE (xpi/firefox-i18n-60.0/kn.xpi) = 585100 -SHA256 (xpi/firefox-i18n-60.0/ko.xpi) = d450910b7e256a8599e4432ac49f758d7dd7b7b7ab74a1b0e1cd0c9717d79d1f -SIZE (xpi/firefox-i18n-60.0/ko.xpi) = 547048 -SHA256 (xpi/firefox-i18n-60.0/lij.xpi) = 7d47c90c77289f09f8356b5f42746f75dbd7a52efbacb056f832f980b7331083 -SIZE (xpi/firefox-i18n-60.0/lij.xpi) = 512398 -SHA256 (xpi/firefox-i18n-60.0/lt.xpi) = d614b06a18a7e59683733a21781a851879c31e46b0d345ec6efd49b774210a7d -SIZE (xpi/firefox-i18n-60.0/lt.xpi) = 535634 -SHA256 (xpi/firefox-i18n-60.0/lv.xpi) = 8f68a8ac9d8f7f7d1edcf1d59c8da5254efd1074ddb1e2038424bddb5a413e5d -SIZE (xpi/firefox-i18n-60.0/lv.xpi) = 525636 -SHA256 (xpi/firefox-i18n-60.0/mai.xpi) = 8331bda59001d53abeaf86dfbe649799077963ab4955a66b5caef11fb75894d5 -SIZE (xpi/firefox-i18n-60.0/mai.xpi) = 548470 -SHA256 (xpi/firefox-i18n-60.0/mk.xpi) = 81db9c67e886c57cc2d807bf977686ef4d03cabd4ac8e57eadbe7c68c683434b -SIZE (xpi/firefox-i18n-60.0/mk.xpi) = 513024 -SHA256 (xpi/firefox-i18n-60.0/ml.xpi) = 1a570596e6d9eebfd1b8e03d3d59ef300e977ac204fe707e333b0e389d3ba9cc -SIZE (xpi/firefox-i18n-60.0/ml.xpi) = 598200 -SHA256 (xpi/firefox-i18n-60.0/mr.xpi) = a1d26997a43b90384c97315f86aa8f1ef4af5c126fe6ba02310a21aa399fcfcc -SIZE (xpi/firefox-i18n-60.0/mr.xpi) = 578337 -SHA256 (xpi/firefox-i18n-60.0/ms.xpi) = 522bd4cf7016c2fe181f2a04a5661fd174152973e12a29447bb5d29054a76e16 -SIZE (xpi/firefox-i18n-60.0/ms.xpi) = 508782 -SHA256 (xpi/firefox-i18n-60.0/my.xpi) = 6e61fcd5a98e827db607622d185642ca34e81f84aa83c31508931681899d09a8 -SIZE (xpi/firefox-i18n-60.0/my.xpi) = 569576 -SHA256 (xpi/firefox-i18n-60.0/nb-NO.xpi) = 1f66db8430715fc22690ca5f002f5c60878725dc716131e9ab31bc2e90db0109 -SIZE (xpi/firefox-i18n-60.0/nb-NO.xpi) = 509096 -SHA256 (xpi/firefox-i18n-60.0/ne-NP.xpi) = 9b2827ca22212a947db237c11c94a69b207b4ca3786944f4fdefeaddd1741acb -SIZE (xpi/firefox-i18n-60.0/ne-NP.xpi) = 554576 -SHA256 (xpi/firefox-i18n-60.0/nl.xpi) = 3e7b4623d9390f6bac75368750561adc2599cf19c6a904c764947997bd161f53 -SIZE (xpi/firefox-i18n-60.0/nl.xpi) = 516657 -SHA256 (xpi/firefox-i18n-60.0/nn-NO.xpi) = 06fb56a442e7e1b0907e28617e98401ff88112d6af204a2af779e784ea81f079 -SIZE (xpi/firefox-i18n-60.0/nn-NO.xpi) = 510618 -SHA256 (xpi/firefox-i18n-60.0/oc.xpi) = ad506d782a522c982dfd200057c5adadf9fb28c39c133657713b6e5513454156 -SIZE (xpi/firefox-i18n-60.0/oc.xpi) = 526210 -SHA256 (xpi/firefox-i18n-60.0/or.xpi) = 8537d758630c17f66a3af3d4959e15a864eb34bf9988da6f2f0ffc8526712966 -SIZE (xpi/firefox-i18n-60.0/or.xpi) = 540093 -SHA256 (xpi/firefox-i18n-60.0/pa-IN.xpi) = 246cf5f518f27404e0eb71e4956c098ffd8f5c7cb0797d0be0510a4cda32f69a -SIZE (xpi/firefox-i18n-60.0/pa-IN.xpi) = 557089 -SHA256 (xpi/firefox-i18n-60.0/pl.xpi) = 5b191c59e194d40b2ff9e373fee2031d117c05e5ea95b5f3bb113b7bf971edc1 -SIZE (xpi/firefox-i18n-60.0/pl.xpi) = 418188 -SHA256 (xpi/firefox-i18n-60.0/pt-BR.xpi) = cd8bdb0b980942000164e9a5fc6a8774ce0976621f04e4500522789292b4186c -SIZE (xpi/firefox-i18n-60.0/pt-BR.xpi) = 513937 -SHA256 (xpi/firefox-i18n-60.0/pt-PT.xpi) = 3795f1b2f5507f2509a2039ab826cc0c8e96218be5a31ef4017b11f2a9fbed22 -SIZE (xpi/firefox-i18n-60.0/pt-PT.xpi) = 518541 -SHA256 (xpi/firefox-i18n-60.0/rm.xpi) = 6a2dfac8512656a10ad4cad870a8ec54f6c3edcb5812cb421498ca06155bd8ab -SIZE (xpi/firefox-i18n-60.0/rm.xpi) = 505265 -SHA256 (xpi/firefox-i18n-60.0/ro.xpi) = 30164759886d12cac01539ee433272d217b4e227cab16a3466d6ef47ba6f2418 -SIZE (xpi/firefox-i18n-60.0/ro.xpi) = 513282 -SHA256 (xpi/firefox-i18n-60.0/ru.xpi) = b91ea5ab5bc12b81c366f5b797ce922753d956e75488f8ae071b3a19fa0006fb -SIZE (xpi/firefox-i18n-60.0/ru.xpi) = 590510 -SHA256 (xpi/firefox-i18n-60.0/si.xpi) = 5c3dc73d7f3d10f039208ad3e5e480c28b0d6e168b4467771d06c024310b53c0 -SIZE (xpi/firefox-i18n-60.0/si.xpi) = 544796 -SHA256 (xpi/firefox-i18n-60.0/sk.xpi) = 170e764c2d7842ace3ea10a37a28403ab30092cd010b673053c1366b9d566e2b -SIZE (xpi/firefox-i18n-60.0/sk.xpi) = 540922 -SHA256 (xpi/firefox-i18n-60.0/sl.xpi) = fb819360b31a983242564c49e0398f13f7faecb0f037a8c643e46912b7cfce63 -SIZE (xpi/firefox-i18n-60.0/sl.xpi) = 518574 -SHA256 (xpi/firefox-i18n-60.0/son.xpi) = f7c55f44f07c88e3cde1fed96144185f81554f430632e730d45527ab602c6c51 -SIZE (xpi/firefox-i18n-60.0/son.xpi) = 496914 -SHA256 (xpi/firefox-i18n-60.0/sq.xpi) = 73a47afd344801f2b1af6db49ffe10a99576914416d30e2f69ef4c84345f6224 -SIZE (xpi/firefox-i18n-60.0/sq.xpi) = 520493 -SHA256 (xpi/firefox-i18n-60.0/sr.xpi) = cb3ccfd9a3a8c8256fec8a91dbcca334e2e64b6b36d1c49b3d76ee9133af8bd8 -SIZE (xpi/firefox-i18n-60.0/sr.xpi) = 547995 -SHA256 (xpi/firefox-i18n-60.0/sv-SE.xpi) = 2e5f2209f4263b4defb52edf93c81c45b142dc4f85d4eef5ef7a5df0dfb4a81c -SIZE (xpi/firefox-i18n-60.0/sv-SE.xpi) = 517847 -SHA256 (xpi/firefox-i18n-60.0/ta.xpi) = 6acdcf05d2a55fd7803fb5674b5abada51f89811192d66af1b24bd006d195241 -SIZE (xpi/firefox-i18n-60.0/ta.xpi) = 577139 -SHA256 (xpi/firefox-i18n-60.0/te.xpi) = 8dcc7ed11b9c096904810797153115d507395a8ef01025bc3fb2c53098f02fc4 -SIZE (xpi/firefox-i18n-60.0/te.xpi) = 590183 -SHA256 (xpi/firefox-i18n-60.0/th.xpi) = 3edcbbc2364ecaa1eff5fecee810a201d86bf3dbd81d0916b7b8a94e31aeaa3e -SIZE (xpi/firefox-i18n-60.0/th.xpi) = 562036 -SHA256 (xpi/firefox-i18n-60.0/tr.xpi) = 1cdb5564ec294ffd7d85a8eeb50b749f9d6bce19a585cfb29098cf8e091d5247 -SIZE (xpi/firefox-i18n-60.0/tr.xpi) = 525033 -SHA256 (xpi/firefox-i18n-60.0/uk.xpi) = 2318e5a4bc46540633aa7ea71e3c4da7e0d006fafa8292adaf1ac0baa3927129 -SIZE (xpi/firefox-i18n-60.0/uk.xpi) = 580145 -SHA256 (xpi/firefox-i18n-60.0/ur.xpi) = e0c4f2d2c0a3f478295d0beaaf129e7df286f503601f4530df7ce3194b26763a -SIZE (xpi/firefox-i18n-60.0/ur.xpi) = 562602 -SHA256 (xpi/firefox-i18n-60.0/uz.xpi) = fa358c25b4ee8036d1a10916349b4608d669323d3973fed93e93f2ccc5eae344 -SIZE (xpi/firefox-i18n-60.0/uz.xpi) = 512909 -SHA256 (xpi/firefox-i18n-60.0/vi.xpi) = f34a3c5924999c54e7f79b8237346b6482a745141d9fd2c2d07325c156c8fb34 -SIZE (xpi/firefox-i18n-60.0/vi.xpi) = 527412 -SHA256 (xpi/firefox-i18n-60.0/xh.xpi) = d9cc10826a4bc1e554d81813bdefb7d19ea67d0ba8ce1cccceadae0ea12f4a6c -SIZE (xpi/firefox-i18n-60.0/xh.xpi) = 511081 -SHA256 (xpi/firefox-i18n-60.0/zh-CN.xpi) = c3fff9c7562cd4e76526a2546cbe1ffc75404ff1ab5f8bfb8f871b4bf6118dc2 -SIZE (xpi/firefox-i18n-60.0/zh-CN.xpi) = 542804 -SHA256 (xpi/firefox-i18n-60.0/zh-TW.xpi) = fc807d2d6d2db96229d34f5c0594cd97e948508448ea205f6afc1a1f9b615f23 -SIZE (xpi/firefox-i18n-60.0/zh-TW.xpi) = 541119 +TIMESTAMP = 1526449212 +SHA256 (xpi/firefox-i18n-60.0.1/ach.xpi) = 9f2c6f2d1b27ee90446c5b583ceb95c47ad6be65c17011f90d7187c129cc3ebe +SIZE (xpi/firefox-i18n-60.0.1/ach.xpi) = 496056 +SHA256 (xpi/firefox-i18n-60.0.1/af.xpi) = 2a2f394a16282de72cb80bcdcfddb8b9eb098094bc12093753634e3198015ccc +SIZE (xpi/firefox-i18n-60.0.1/af.xpi) = 486534 +SHA256 (xpi/firefox-i18n-60.0.1/an.xpi) = 482af3329153e5a207191c0f5ddd7fa6dabbb63060bcca7f08a512e411e23627 +SIZE (xpi/firefox-i18n-60.0.1/an.xpi) = 519725 +SHA256 (xpi/firefox-i18n-60.0.1/ar.xpi) = 647e6bf7407f2c34bf1de9709df3ed220abc5ad010e1e3a87a0f77596df35f08 +SIZE (xpi/firefox-i18n-60.0.1/ar.xpi) = 546952 +SHA256 (xpi/firefox-i18n-60.0.1/as.xpi) = c84b760bb9245465c61eb0e90a3fd1c8ac4b6f519599c07b8427af84808ea6e4 +SIZE (xpi/firefox-i18n-60.0.1/as.xpi) = 529948 +SHA256 (xpi/firefox-i18n-60.0.1/ast.xpi) = 58e15d4b11e2cd031a0eff7d55b5ef9b32f2f3d308079b374ebd45a3d2367788 +SIZE (xpi/firefox-i18n-60.0.1/ast.xpi) = 507867 +SHA256 (xpi/firefox-i18n-60.0.1/az.xpi) = bdf804c72b67343a0a55db1c35abb635c59c352ea4283bd69ea961af65666443 +SIZE (xpi/firefox-i18n-60.0.1/az.xpi) = 523976 +SHA256 (xpi/firefox-i18n-60.0.1/be.xpi) = 290f9dd93d9ef59a6429140c544933415558fca996bbafd31d585326781e7c6e +SIZE (xpi/firefox-i18n-60.0.1/be.xpi) = 579946 +SHA256 (xpi/firefox-i18n-60.0.1/bg.xpi) = 2223f37aacdc12eef02122a6dd8c54b99909f95344075d05dfdc28335736da54 +SIZE (xpi/firefox-i18n-60.0.1/bg.xpi) = 573077 +SHA256 (xpi/firefox-i18n-60.0.1/bn-BD.xpi) = 2b4e9781d3bca1c094872d6148c9106d14531fd5446bbd3ba991614ad4ceda19 +SIZE (xpi/firefox-i18n-60.0.1/bn-BD.xpi) = 589632 +SHA256 (xpi/firefox-i18n-60.0.1/bn-IN.xpi) = e941441bbc58d5a6d29a75eadafe99073404c6c12f8de6b26e4ff7b14174a5ae +SIZE (xpi/firefox-i18n-60.0.1/bn-IN.xpi) = 570080 +SHA256 (xpi/firefox-i18n-60.0.1/br.xpi) = f6610922e0f3ac92a5a873e761c347747050a9d8978d200483cd26edbd92085f +SIZE (xpi/firefox-i18n-60.0.1/br.xpi) = 511250 +SHA256 (xpi/firefox-i18n-60.0.1/bs.xpi) = 057da7330714f6e89c12890cad670ef5bc03f20950fda1d5e408a47e78d1a3ff +SIZE (xpi/firefox-i18n-60.0.1/bs.xpi) = 513932 +SHA256 (xpi/firefox-i18n-60.0.1/ca.xpi) = c1fcd9892f63f7a6fa91f049484077196d58cccd4fd4968842f4b476b1e6d8ac +SIZE (xpi/firefox-i18n-60.0.1/ca.xpi) = 524483 +SHA256 (xpi/firefox-i18n-60.0.1/cak.xpi) = e2b41274cdfa4b61df75e4253fd55e8a4e33acd9695e9486ef3977b247209a86 +SIZE (xpi/firefox-i18n-60.0.1/cak.xpi) = 535518 +SHA256 (xpi/firefox-i18n-60.0.1/cs.xpi) = 3659e380259d4945fa64a6ba0a98c5b6d7f46fb28ec2645c106472a7f05a38bd +SIZE (xpi/firefox-i18n-60.0.1/cs.xpi) = 531016 +SHA256 (xpi/firefox-i18n-60.0.1/cy.xpi) = 7e15ac8a2355191b69f6c3053c6552b4dcf96fb24612ee253b9cede182b6fc10 +SIZE (xpi/firefox-i18n-60.0.1/cy.xpi) = 515864 +SHA256 (xpi/firefox-i18n-60.0.1/da.xpi) = d7b511aceebcc368436cdfe77aabccb5fcba182a8d02973cb2729e0a1359e428 +SIZE (xpi/firefox-i18n-60.0.1/da.xpi) = 509975 +SHA256 (xpi/firefox-i18n-60.0.1/de.xpi) = bfe7510cf77085ad28c894241af5bcef535dacf96f6206c866a03f2926cd2e4c +SIZE (xpi/firefox-i18n-60.0.1/de.xpi) = 525690 +SHA256 (xpi/firefox-i18n-60.0.1/dsb.xpi) = 42138b4a07de44cb27b44fd2eeaa61f3eaf4aeeeba86f36a7c4531a3c70eb99b +SIZE (xpi/firefox-i18n-60.0.1/dsb.xpi) = 538748 +SHA256 (xpi/firefox-i18n-60.0.1/el.xpi) = 69527b9f6c52dad90be4c1ea81ad35c14b1c2885871b61b74887021ee3fd8ca3 +SIZE (xpi/firefox-i18n-60.0.1/el.xpi) = 592915 +SHA256 (xpi/firefox-i18n-60.0.1/en-GB.xpi) = a3e3a41fdf1d6ad25db011d58e89aa36b2d0906d4d7b1db26155825508bf9151 +SIZE (xpi/firefox-i18n-60.0.1/en-GB.xpi) = 490905 +SHA256 (xpi/firefox-i18n-60.0.1/en-US.xpi) = 32dfd22ef99404837e6ba0b67ac34d26229f3d2b40844e8499aaeb5801c3ac00 +SIZE (xpi/firefox-i18n-60.0.1/en-US.xpi) = 472381 +SHA256 (xpi/firefox-i18n-60.0.1/en-ZA.xpi) = d81cbe48fa673d8869389ee2f7f0e52fdcc83382f49c03026b46a78ad8ffefe2 +SIZE (xpi/firefox-i18n-60.0.1/en-ZA.xpi) = 473892 +SHA256 (xpi/firefox-i18n-60.0.1/eo.xpi) = fa0afaba0b1f23eeeb1ceb67215d2c246c75c2cf61f7ebc2afefe17d4314421a +SIZE (xpi/firefox-i18n-60.0.1/eo.xpi) = 510496 +SHA256 (xpi/firefox-i18n-60.0.1/es-AR.xpi) = c60c8798199f6908c87955026e29fea2545481ccb80c28a958a93223a99d184d +SIZE (xpi/firefox-i18n-60.0.1/es-AR.xpi) = 523829 +SHA256 (xpi/firefox-i18n-60.0.1/es-CL.xpi) = df52b591b8e528235cb2ca61b075f7c44b1a40f949024328a74a71a56e14a9c8 +SIZE (xpi/firefox-i18n-60.0.1/es-CL.xpi) = 526508 +SHA256 (xpi/firefox-i18n-60.0.1/es-ES.xpi) = e2d8dd7efa699707a5ab4264247a28d722a55bbd2ecc90d3c3a04777ab5f8055 +SIZE (xpi/firefox-i18n-60.0.1/es-ES.xpi) = 459139 +SHA256 (xpi/firefox-i18n-60.0.1/es-MX.xpi) = 096c45ba243f82f0cc91e0fb28e6eef88291795123d906d0b77c4ae455d726e9 +SIZE (xpi/firefox-i18n-60.0.1/es-MX.xpi) = 527843 +SHA256 (xpi/firefox-i18n-60.0.1/et.xpi) = 809f3f363669aad573f019bd8a2bfe3f12b6363de510701c827f3b2bd4e41a18 +SIZE (xpi/firefox-i18n-60.0.1/et.xpi) = 504174 +SHA256 (xpi/firefox-i18n-60.0.1/eu.xpi) = 70cf5cde3cfb2a91ea30dac79f3001bd039aa4e882f9b3f921ce8120429b79dd +SIZE (xpi/firefox-i18n-60.0.1/eu.xpi) = 510936 +SHA256 (xpi/firefox-i18n-60.0.1/fa.xpi) = b48059fe0a235dc0df1f6f7acc1f72bbb691842e742df94b034779e9980c4bb7 +SIZE (xpi/firefox-i18n-60.0.1/fa.xpi) = 565485 +SHA256 (xpi/firefox-i18n-60.0.1/ff.xpi) = fb8b2ebbe19ff794b45ead1fab2b50e77a2d89dc55f6160c7342ff2fa9d1e3a6 +SIZE (xpi/firefox-i18n-60.0.1/ff.xpi) = 511430 +SHA256 (xpi/firefox-i18n-60.0.1/fi.xpi) = d79350afa1badd3c0afae5080c56cb9b197958a1ea1cb22e2d5607f4e3ddd7cf +SIZE (xpi/firefox-i18n-60.0.1/fi.xpi) = 505406 +SHA256 (xpi/firefox-i18n-60.0.1/fr.xpi) = e204eb2d93082be7c4c325f2ebd8f15e6942c245bb692a5a9b48746ae9fe3459 +SIZE (xpi/firefox-i18n-60.0.1/fr.xpi) = 535233 +SHA256 (xpi/firefox-i18n-60.0.1/fy-NL.xpi) = 702915d5a991059d915bd6d51417c8c89de92f44a182ed2a951a6f3f2af3a26e +SIZE (xpi/firefox-i18n-60.0.1/fy-NL.xpi) = 523738 +SHA256 (xpi/firefox-i18n-60.0.1/ga-IE.xpi) = ce654b3dc192b0ee795badf83ee4d3e3fe43e9cdf241e036cd8310bead7feb1a +SIZE (xpi/firefox-i18n-60.0.1/ga-IE.xpi) = 526203 +SHA256 (xpi/firefox-i18n-60.0.1/gd.xpi) = 911f6bd57ac08d651e0d2dbebb8fa5c9dc1920c9399b7cde569c0f8c41060b54 +SIZE (xpi/firefox-i18n-60.0.1/gd.xpi) = 520093 +SHA256 (xpi/firefox-i18n-60.0.1/gl.xpi) = afea12b7291ce528c2e461dd603a8880b3034c155517c55e94d7aa602762fd68 +SIZE (xpi/firefox-i18n-60.0.1/gl.xpi) = 496599 +SHA256 (xpi/firefox-i18n-60.0.1/gn.xpi) = 43210cf6586debf7d0946582ae3c421b04a9acbff1245e04dd2f82ead7c54528 +SIZE (xpi/firefox-i18n-60.0.1/gn.xpi) = 532445 +SHA256 (xpi/firefox-i18n-60.0.1/gu-IN.xpi) = 99633747e77d3ccf2b70fb93f3ea0c0d3fe2f4bb12a96da8b43ffa3cc8dd0ea8 +SIZE (xpi/firefox-i18n-60.0.1/gu-IN.xpi) = 589481 +SHA256 (xpi/firefox-i18n-60.0.1/he.xpi) = bfd8775a3f53a30d3f213deba8b40c31afb90f79cae2072b5abd552a7550b513 +SIZE (xpi/firefox-i18n-60.0.1/he.xpi) = 535206 +SHA256 (xpi/firefox-i18n-60.0.1/hi-IN.xpi) = 05771b81434832f5df8276c1f633c5d9da17beddcedce054a144eb672f58637d +SIZE (xpi/firefox-i18n-60.0.1/hi-IN.xpi) = 590076 +SHA256 (xpi/firefox-i18n-60.0.1/hr.xpi) = 461b7d0947095cddd96fd38755683abd4da3361cde629790ddd1a4c5f50a7905 +SIZE (xpi/firefox-i18n-60.0.1/hr.xpi) = 515187 +SHA256 (xpi/firefox-i18n-60.0.1/hsb.xpi) = a3664259042d39aa8d103c2697bfd8dec36b204d4cfaa39b94ffab0610f80dde +SIZE (xpi/firefox-i18n-60.0.1/hsb.xpi) = 536281 +SHA256 (xpi/firefox-i18n-60.0.1/hu.xpi) = eb08e4e062a15d2570e73753ba64eee950103f81fb7a3c13f8fabdb9db4bb8a8 +SIZE (xpi/firefox-i18n-60.0.1/hu.xpi) = 537581 +SHA256 (xpi/firefox-i18n-60.0.1/hy-AM.xpi) = a9cf353ef6875918aa10ac3db90e71e9cda866be9f2241f0129dd2d8166c60ad +SIZE (xpi/firefox-i18n-60.0.1/hy-AM.xpi) = 568629 +SHA256 (xpi/firefox-i18n-60.0.1/ia.xpi) = 38a01eed0d6e8742947b5c7d49786fee1ced9ee0cd0562286ca9573a5775eba7 +SIZE (xpi/firefox-i18n-60.0.1/ia.xpi) = 509954 +SHA256 (xpi/firefox-i18n-60.0.1/id.xpi) = 6f82420dac7da25658d558d622c145279e7b6c9e024e7c4f6c9248ade53289fd +SIZE (xpi/firefox-i18n-60.0.1/id.xpi) = 501451 +SHA256 (xpi/firefox-i18n-60.0.1/is.xpi) = 0b5107c7bcb0cfc5c7330acc81e29a10cab19d17dc29b35628489d34674965d3 +SIZE (xpi/firefox-i18n-60.0.1/is.xpi) = 512504 +SHA256 (xpi/firefox-i18n-60.0.1/it.xpi) = 143478665cfcec9737a799016e00b65e9ff7fb649d82d5c562fd2bc86bf871e8 +SIZE (xpi/firefox-i18n-60.0.1/it.xpi) = 398259 +SHA256 (xpi/firefox-i18n-60.0.1/ja.xpi) = 3baf02081f34ec5e44a9f52d14117561b39307557eb945cea694d07ce8802bbe +SIZE (xpi/firefox-i18n-60.0.1/ja.xpi) = 571238 +SHA256 (xpi/firefox-i18n-60.0.1/ka.xpi) = 38dab4b4367ef37d07ccde165c7fda9b5578ecfc30c5e1cacb2f559062ac55d2 +SIZE (xpi/firefox-i18n-60.0.1/ka.xpi) = 556068 +SHA256 (xpi/firefox-i18n-60.0.1/kab.xpi) = f28fab89f8a8ce81be3ee517b1ff2b93142d8e157e4e951bd403d6a756347a2f +SIZE (xpi/firefox-i18n-60.0.1/kab.xpi) = 519625 +SHA256 (xpi/firefox-i18n-60.0.1/kk.xpi) = 2162170912aaa6df11d2d73536a58e84f4e2f8a0260c922f710a02b4a2ebfb2c +SIZE (xpi/firefox-i18n-60.0.1/kk.xpi) = 582200 +SHA256 (xpi/firefox-i18n-60.0.1/km.xpi) = b8885aff79fa2c783ac036fc2b64a7aae0c9e14267582e9cbb361b7619cf22ff +SIZE (xpi/firefox-i18n-60.0.1/km.xpi) = 582337 +SHA256 (xpi/firefox-i18n-60.0.1/kn.xpi) = bc50ce2b586a1bf7c194d3d55742c282ce9cab10a210d027e11166ecc5d71782 +SIZE (xpi/firefox-i18n-60.0.1/kn.xpi) = 585098 +SHA256 (xpi/firefox-i18n-60.0.1/ko.xpi) = 7706fb846466b87776a1c96035275dc443678b854ffba6e17c1401ad1c7b0a0a +SIZE (xpi/firefox-i18n-60.0.1/ko.xpi) = 547052 +SHA256 (xpi/firefox-i18n-60.0.1/lij.xpi) = 4bb7fede9dbfc0e632a651d7805aa21bff1cf00e2c7ca2f42fe0941560814b33 +SIZE (xpi/firefox-i18n-60.0.1/lij.xpi) = 512395 +SHA256 (xpi/firefox-i18n-60.0.1/lt.xpi) = 91496fbf1c46acc5cddc993f5fb698d6cb3b18418134119637b03fc698aed3dd +SIZE (xpi/firefox-i18n-60.0.1/lt.xpi) = 535632 +SHA256 (xpi/firefox-i18n-60.0.1/lv.xpi) = 5a81cb391be617b680b17c60f3bf9832c5dba05fe88cac719d1c56fe2b7e563e +SIZE (xpi/firefox-i18n-60.0.1/lv.xpi) = 525646 +SHA256 (xpi/firefox-i18n-60.0.1/mai.xpi) = be1d8eb967400c99e2bd0b89134321582322414df36bf7396258552ec54dc752 +SIZE (xpi/firefox-i18n-60.0.1/mai.xpi) = 548475 +SHA256 (xpi/firefox-i18n-60.0.1/mk.xpi) = dfd03cef0dc9c1ebca8de19ac22219636483c58c47c62369bb454adf6e708884 +SIZE (xpi/firefox-i18n-60.0.1/mk.xpi) = 513028 +SHA256 (xpi/firefox-i18n-60.0.1/ml.xpi) = 23449ff57a2a24a8f7c8e1188c5a0a01c8a8913ccfcb64941775a8a13accd634 +SIZE (xpi/firefox-i18n-60.0.1/ml.xpi) = 598200 +SHA256 (xpi/firefox-i18n-60.0.1/mr.xpi) = 0c5714598f7b6a9a9e373d3bf833f0e01374ba8f94cef78635d0ea313a5db31d +SIZE (xpi/firefox-i18n-60.0.1/mr.xpi) = 578339 +SHA256 (xpi/firefox-i18n-60.0.1/ms.xpi) = 098e2e7b91f65c020e6157a847a56c3124450920a3d58a82dc051530fe259d95 +SIZE (xpi/firefox-i18n-60.0.1/ms.xpi) = 508783 +SHA256 (xpi/firefox-i18n-60.0.1/my.xpi) = fa088a5c16a4b2e3ad9054526d673226f6668c7e21cb15be03d8236daebba7e4 +SIZE (xpi/firefox-i18n-60.0.1/my.xpi) = 569575 +SHA256 (xpi/firefox-i18n-60.0.1/nb-NO.xpi) = 320f6df8fcd78440845f16c28cf476d2c790127502f868faa2909255707439c1 +SIZE (xpi/firefox-i18n-60.0.1/nb-NO.xpi) = 509104 +SHA256 (xpi/firefox-i18n-60.0.1/ne-NP.xpi) = ccd38f4291c0c5cc6d77aada7521a5b6f7c3eab6afe7160ac24d620e2b3e0e9c +SIZE (xpi/firefox-i18n-60.0.1/ne-NP.xpi) = 554579 +SHA256 (xpi/firefox-i18n-60.0.1/nl.xpi) = cfc6abda0af18af86b8183235e88a2acfb00051a1d98f57313ed14a8788b6d71 +SIZE (xpi/firefox-i18n-60.0.1/nl.xpi) = 516663 +SHA256 (xpi/firefox-i18n-60.0.1/nn-NO.xpi) = c43b8b9ee749101b7776a0f2df9235fc579c1287417f307a28a86aa5bdd92b79 +SIZE (xpi/firefox-i18n-60.0.1/nn-NO.xpi) = 510631 +SHA256 (xpi/firefox-i18n-60.0.1/oc.xpi) = 68a494171509df77d94088c10754f4802978a3171f084feff2431aec1d9be8fc +SIZE (xpi/firefox-i18n-60.0.1/oc.xpi) = 526206 +SHA256 (xpi/firefox-i18n-60.0.1/or.xpi) = 964e6d6765a31f54a6c5b7ee2a9ba9407d2836af571dda0fd0b64db05a0f2744 +SIZE (xpi/firefox-i18n-60.0.1/or.xpi) = 540092 +SHA256 (xpi/firefox-i18n-60.0.1/pa-IN.xpi) = 687b2faeb5c7108fc3bb9f6a059b24f695caffd19473b6325ba7555ebe75144d +SIZE (xpi/firefox-i18n-60.0.1/pa-IN.xpi) = 557090 +SHA256 (xpi/firefox-i18n-60.0.1/pl.xpi) = 68b9f1792dca8a18d8d9ac54cbfe9d44cd6e2f69235d944c7cf3223ba73244af +SIZE (xpi/firefox-i18n-60.0.1/pl.xpi) = 418197 +SHA256 (xpi/firefox-i18n-60.0.1/pt-BR.xpi) = 2b76aea47ce17fb9364a2ea3774e03f8d564da49e9a1c48965a262659438d4f7 +SIZE (xpi/firefox-i18n-60.0.1/pt-BR.xpi) = 513941 +SHA256 (xpi/firefox-i18n-60.0.1/pt-PT.xpi) = d3029b50c49afcd0ff0f6e8561bbbee6bd29138febe424953ad33d3d5f0ce5b9 +SIZE (xpi/firefox-i18n-60.0.1/pt-PT.xpi) = 518538 +SHA256 (xpi/firefox-i18n-60.0.1/rm.xpi) = ac557afd2c0ddca6f9f7b2fdb770828b68e4c3897e1130b5921c08d5c1a7388d +SIZE (xpi/firefox-i18n-60.0.1/rm.xpi) = 505268 +SHA256 (xpi/firefox-i18n-60.0.1/ro.xpi) = 8a95aad047ecd3669fb9898eaa08a04dd738b950233556a1e6b3a8f77f7ee849 +SIZE (xpi/firefox-i18n-60.0.1/ro.xpi) = 513283 +SHA256 (xpi/firefox-i18n-60.0.1/ru.xpi) = 37665f3f0da975fadedd3dbff233b9da8f209ed91e17df687d77a2f4d7912368 +SIZE (xpi/firefox-i18n-60.0.1/ru.xpi) = 590512 +SHA256 (xpi/firefox-i18n-60.0.1/si.xpi) = 1ecd05e4af7ae3ec953a5125b18491f13b3fabb426a0bce8e92160797c22921c +SIZE (xpi/firefox-i18n-60.0.1/si.xpi) = 544805 +SHA256 (xpi/firefox-i18n-60.0.1/sk.xpi) = 690b8daef68519a709950d38a6dc6e3e08585bdeb6ca9c4307ba4143abd581ab +SIZE (xpi/firefox-i18n-60.0.1/sk.xpi) = 540930 +SHA256 (xpi/firefox-i18n-60.0.1/sl.xpi) = 129355aff86475d619998539ee4691bd6630800f28acd8b145cf793360375dec +SIZE (xpi/firefox-i18n-60.0.1/sl.xpi) = 518574 +SHA256 (xpi/firefox-i18n-60.0.1/son.xpi) = 19ace977dfc039940c6551d012bda76cf367adc55bee35f20daa1c2a8f6ca49a +SIZE (xpi/firefox-i18n-60.0.1/son.xpi) = 496912 +SHA256 (xpi/firefox-i18n-60.0.1/sq.xpi) = 79f87e86506a5c0b708b3e03afb676ca7ec691524b25ea87b121f3fe1844995b +SIZE (xpi/firefox-i18n-60.0.1/sq.xpi) = 520490 +SHA256 (xpi/firefox-i18n-60.0.1/sr.xpi) = 463b3ce225bb89d1575d80d76bcc38cb1563a14e6fe1205c6e85af01aa82d048 +SIZE (xpi/firefox-i18n-60.0.1/sr.xpi) = 547998 +SHA256 (xpi/firefox-i18n-60.0.1/sv-SE.xpi) = fa57f981946c1fefaf0b60a89916c138248ebe6cff5c1beff0b7563af650f827 +SIZE (xpi/firefox-i18n-60.0.1/sv-SE.xpi) = 517843 +SHA256 (xpi/firefox-i18n-60.0.1/ta.xpi) = a44b9c554a9a28e8deaeaa339072fb59b1b83d5ac21b9217c7a4c45991151a66 +SIZE (xpi/firefox-i18n-60.0.1/ta.xpi) = 577143 +SHA256 (xpi/firefox-i18n-60.0.1/te.xpi) = a4a967985ff28eb2016ca1ffeda616417fa582e9b7d80ee3558ef6d3209234cf +SIZE (xpi/firefox-i18n-60.0.1/te.xpi) = 590180 +SHA256 (xpi/firefox-i18n-60.0.1/th.xpi) = ed6161441a846694e92e2599ed5ed3ee101c5a5614c879e75c84774c67a66e5c +SIZE (xpi/firefox-i18n-60.0.1/th.xpi) = 562032 +SHA256 (xpi/firefox-i18n-60.0.1/tr.xpi) = b00a7592cc031b3fb303a5f0401526d66e17816b9784f9665a985ffadac7e167 +SIZE (xpi/firefox-i18n-60.0.1/tr.xpi) = 525038 +SHA256 (xpi/firefox-i18n-60.0.1/uk.xpi) = 8982bfa40fcf626cf5c8b03c5d56b39481a9de5aa79235cc51a35c93becb8262 +SIZE (xpi/firefox-i18n-60.0.1/uk.xpi) = 580148 +SHA256 (xpi/firefox-i18n-60.0.1/ur.xpi) = 7969dc4e8a3151b7ac107d3fa3a203fee7ae2530b9e9a94777becc4916ba1367 +SIZE (xpi/firefox-i18n-60.0.1/ur.xpi) = 562604 +SHA256 (xpi/firefox-i18n-60.0.1/uz.xpi) = 279fbb7731565381d092cdb64c805b4a913e34fde2f5c1bf3beb5b39008334bf +SIZE (xpi/firefox-i18n-60.0.1/uz.xpi) = 512911 +SHA256 (xpi/firefox-i18n-60.0.1/vi.xpi) = cecaed7dabd4f6c854686c0e6b51a374aca14f6c4d410299c385b4760b89722b +SIZE (xpi/firefox-i18n-60.0.1/vi.xpi) = 527411 +SHA256 (xpi/firefox-i18n-60.0.1/xh.xpi) = 67faed09d6f6fbd8b6992916db46d48ae3f9e72c9d87619dd3babd0b0392b2aa +SIZE (xpi/firefox-i18n-60.0.1/xh.xpi) = 511081 +SHA256 (xpi/firefox-i18n-60.0.1/zh-CN.xpi) = 8f59eec11b816f160b5f767a0d6ed8afe0d61f161c01fbe6d13bd6b94e847de2 +SIZE (xpi/firefox-i18n-60.0.1/zh-CN.xpi) = 542802 +SHA256 (xpi/firefox-i18n-60.0.1/zh-TW.xpi) = 0dddb9ea7edd64784458381c3002a1c62a6c26ad9fefb3a8be0836d2a5a748e4 +SIZE (xpi/firefox-i18n-60.0.1/zh-TW.xpi) = 541124 Modified: branches/2018Q2/www/firefox/Makefile ============================================================================== --- branches/2018Q2/www/firefox/Makefile Wed May 16 22:17:00 2018 (r470155) +++ branches/2018Q2/www/firefox/Makefile Wed May 16 22:19:46 2018 (r470156) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 60.0 -PORTREVISION= 2 +DISTVERSION= 60.0.1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Modified: branches/2018Q2/www/firefox/distinfo ============================================================================== --- branches/2018Q2/www/firefox/distinfo Wed May 16 22:17:00 2018 (r470155) +++ branches/2018Q2/www/firefox/distinfo Wed May 16 22:19:46 2018 (r470156) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525366747 -SHA256 (firefox-60.0.source.tar.xz) = 4bc4fd997e6239f53e16a70b04f197791e5c5d09367e2916bcfe4a427999f842 -SIZE (firefox-60.0.source.tar.xz) = 266717500 +TIMESTAMP = 1526449212 +SHA256 (firefox-60.0.1.source.tar.xz) = c8e621c7dfccbef14cce41a6847b83bee15b5276cd0c35771c3874e464e6a662 +SIZE (firefox-60.0.1.source.tar.xz) = 267804748 From owner-svn-ports-branches@freebsd.org Thu May 17 00:26:52 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25878EE0821; Thu, 17 May 2018 00:26:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CF7E685FA7; Thu, 17 May 2018 00:26:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC93121758; Thu, 17 May 2018 00:26:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4H0Qpgn034768; Thu, 17 May 2018 00:26:51 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4H0QpSU034766; Thu, 17 May 2018 00:26:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805170026.w4H0QpSU034766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 17 May 2018 00:26:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470183 - branches/2018Q2/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/emulators/rpcs3 X-SVN-Commit-Revision: 470183 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 00:26:52 -0000 Author: jbeich Date: Thu May 17 00:26:51 2018 New Revision: 470183 URL: https://svnweb.freebsd.org/changeset/ports/470183 Log: MFH: r470181 emulators/rpcs3: update to 0.0.5.296 Changes: https://github.com/RPCS3/rpcs3/compare/04ad49de4...27dcb7774 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q2/emulators/rpcs3/Makefile branches/2018Q2/emulators/rpcs3/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q2/emulators/rpcs3/Makefile Thu May 17 00:17:12 2018 (r470182) +++ branches/2018Q2/emulators/rpcs3/Makefile Thu May 17 00:26:51 2018 (r470183) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-282 -DISTVERSIONSUFFIX= -g04ad49de4 +DISTVERSION= 0.0.5-296 +DISTVERSIONSUFFIX= -g27dcb7774 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q2/emulators/rpcs3/distinfo Thu May 17 00:17:12 2018 (r470182) +++ branches/2018Q2/emulators/rpcs3/distinfo Thu May 17 00:26:51 2018 (r470183) @@ -1,6 +1,6 @@ -TIMESTAMP = 1526318079 -SHA256 (RPCS3-rpcs3-v0.0.5-282-g04ad49de4_GH0.tar.gz) = fae9894c962e62dc9eb7c36c23081373355dbed3a30949cdb356bd44f41b2d92 -SIZE (RPCS3-rpcs3-v0.0.5-282-g04ad49de4_GH0.tar.gz) = 4859220 +TIMESTAMP = 1526513956 +SHA256 (RPCS3-rpcs3-v0.0.5-296-g27dcb7774_GH0.tar.gz) = 5a0d5934411cacc818487e35f9db931d06e04aa2e595a7a52367e05bf2728d1f +SIZE (RPCS3-rpcs3-v0.0.5-296-g27dcb7774_GH0.tar.gz) = 4848193 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-llvm-17ec6d78a73_GH0.tar.gz) = 4567d1d946429ce55d6c0480fad3b82874aad22c2b1928ac4d4ba5ba40338604 From owner-svn-ports-branches@freebsd.org Thu May 17 00:54:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33F85EE2327; Thu, 17 May 2018 00:54:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DB25A874F6; Thu, 17 May 2018 00:54:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BCD3A21C2D; Thu, 17 May 2018 00:54:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4H0s6iK049877; Thu, 17 May 2018 00:54:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4H0s6x8049875; Thu, 17 May 2018 00:54:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805170054.w4H0s6x8049875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 17 May 2018 00:54:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470186 - branches/2018Q2/games/openbor X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/games/openbor X-SVN-Commit-Revision: 470186 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 00:54:07 -0000 Author: jbeich Date: Thu May 17 00:54:06 2018 New Revision: 470186 URL: https://svnweb.freebsd.org/changeset/ports/470186 Log: MFH: r470185 games/openbor: update to 6172 Changes: https://github.com/DCurrent/openbor/compare/5673214c...7b12a9cc Approved by: ports-secteam (feld, implicit for snapshots) Modified: branches/2018Q2/games/openbor/Makefile branches/2018Q2/games/openbor/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/games/openbor/Makefile ============================================================================== --- branches/2018Q2/games/openbor/Makefile Thu May 17 00:53:10 2018 (r470185) +++ branches/2018Q2/games/openbor/Makefile Thu May 17 00:54:06 2018 (r470186) @@ -2,7 +2,7 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 6138 +PORTVERSION?= 6172 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif @@ -31,7 +31,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= 5673214c +GH_TAGNAME?= 7b12a9cc USES+= gmake pkgconfig .if ${PORTVERSION} < 4433 Modified: branches/2018Q2/games/openbor/distinfo ============================================================================== --- branches/2018Q2/games/openbor/distinfo Thu May 17 00:53:10 2018 (r470185) +++ branches/2018Q2/games/openbor/distinfo Thu May 17 00:54:06 2018 (r470186) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526285237 -SHA256 (DCurrent-openbor-6138-5673214c_GH0.tar.gz) = e07a3970ae1eb050ade6ea02ae21dd0dbc00c028b504a8fa8f3ee73379ba7fe3 -SIZE (DCurrent-openbor-6138-5673214c_GH0.tar.gz) = 74511657 +TIMESTAMP = 1526418962 +SHA256 (DCurrent-openbor-6172-7b12a9cc_GH0.tar.gz) = 84d8e67d37de390433bfce12b71bbb7a8794c21266eee7eaf389218a8a334ede +SIZE (DCurrent-openbor-6172-7b12a9cc_GH0.tar.gz) = 74512025 From owner-svn-ports-branches@freebsd.org Thu May 17 10:15:58 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 284AAEE629D; Thu, 17 May 2018 10:15:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 903DA77F11; Thu, 17 May 2018 10:15:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7291827CDB; Thu, 17 May 2018 10:15:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HAFuQ2037528; Thu, 17 May 2018 10:15:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HAFu5B037527; Thu, 17 May 2018 10:15:56 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805171015.w4HAFu5B037527@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 17 May 2018 10:15:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470215 - branches/2018Q2/graphics/mesa-dri X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/graphics/mesa-dri X-SVN-Commit-Revision: 470215 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 10:15:58 -0000 Author: jbeich Date: Thu May 17 10:15:55 2018 New Revision: 470215 URL: https://svnweb.freebsd.org/changeset/ports/470215 Log: graphics/mesa-{libs,dri}: update to 17.3.9 (direct commit) Changes: https://www.mesa3d.org/relnotes/17.3.9.html PR: 225035 Approved by: ports-secteam (eadler) Modified: branches/2018Q2/graphics/mesa-dri/Makefile.common branches/2018Q2/graphics/mesa-dri/distinfo Modified: branches/2018Q2/graphics/mesa-dri/Makefile.common ============================================================================== --- branches/2018Q2/graphics/mesa-dri/Makefile.common Thu May 17 10:11:20 2018 (r470214) +++ branches/2018Q2/graphics/mesa-dri/Makefile.common Thu May 17 10:15:55 2018 (r470215) @@ -14,7 +14,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 17.3.8 +MESABASEVERSION= 17.3.9 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= Modified: branches/2018Q2/graphics/mesa-dri/distinfo ============================================================================== --- branches/2018Q2/graphics/mesa-dri/distinfo Thu May 17 10:11:20 2018 (r470214) +++ branches/2018Q2/graphics/mesa-dri/distinfo Thu May 17 10:15:55 2018 (r470215) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522776465 -SHA256 (mesa-17.3.8.tar.xz) = 8f9d9bf281c48e4a8f5228816577263b4c655248dc7666e75034ab422951a6b1 -SIZE (mesa-17.3.8.tar.xz) = 10660896 +TIMESTAMP = 1524041040 +SHA256 (mesa-17.3.9.tar.xz) = c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479 +SIZE (mesa-17.3.9.tar.xz) = 10660456 From owner-svn-ports-branches@freebsd.org Thu May 17 14:47:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06574EAA5A9; Thu, 17 May 2018 14:47:07 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A4C4E82E7A; Thu, 17 May 2018 14:47:06 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7BDC72924; Thu, 17 May 2018 14:47:06 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HEl69A073078; Thu, 17 May 2018 14:47:06 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HEl4UC073068; Thu, 17 May 2018 14:47:04 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201805171447.w4HEl4UC073068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 17 May 2018 14:47:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470221 - in branches/2018Q2: sysutils/beats sysutils/logstash6 textproc/elasticsearch6 textproc/kibana6 X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q2: sysutils/beats sysutils/logstash6 textproc/elasticsearch6 textproc/kibana6 X-SVN-Commit-Revision: 470221 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 14:47:07 -0000 Author: feld Date: Thu May 17 14:47:04 2018 New Revision: 470221 URL: https://svnweb.freebsd.org/changeset/ports/470221 Log: MFH: r466867 r469572 Update ElasticSearch 6 ports to 6.2.3 Update ElasticSearch 6 ports to 6.2.4 Modified: branches/2018Q2/sysutils/beats/Makefile branches/2018Q2/sysutils/beats/distinfo branches/2018Q2/sysutils/logstash6/Makefile branches/2018Q2/sysutils/logstash6/distinfo branches/2018Q2/textproc/elasticsearch6/Makefile branches/2018Q2/textproc/elasticsearch6/distinfo branches/2018Q2/textproc/kibana6/Makefile branches/2018Q2/textproc/kibana6/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/beats/Makefile ============================================================================== --- branches/2018Q2/sysutils/beats/Makefile Thu May 17 14:35:53 2018 (r470220) +++ branches/2018Q2/sysutils/beats/Makefile Thu May 17 14:47:04 2018 (r470221) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= beats -PORTVERSION= 6.2.2 +PORTVERSION= 6.2.4 DISTVERSIONPREFIX=v CATEGORIES= sysutils Modified: branches/2018Q2/sysutils/beats/distinfo ============================================================================== --- branches/2018Q2/sysutils/beats/distinfo Thu May 17 14:35:53 2018 (r470220) +++ branches/2018Q2/sysutils/beats/distinfo Thu May 17 14:47:04 2018 (r470221) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519216976 -SHA256 (elastic-beats-v6.2.2_GH0.tar.gz) = 0866c3e26fcbd55f191e746b3bf925b450badd13fb72ea9f712481559932c878 -SIZE (elastic-beats-v6.2.2_GH0.tar.gz) = 19409238 +TIMESTAMP = 1525976251 +SHA256 (elastic-beats-v6.2.4_GH0.tar.gz) = 87d863cf55863329ca80e76c3d813af2960492f4834d4fea919f1d4b49aaf699 +SIZE (elastic-beats-v6.2.4_GH0.tar.gz) = 19466271 Modified: branches/2018Q2/sysutils/logstash6/Makefile ============================================================================== --- branches/2018Q2/sysutils/logstash6/Makefile Thu May 17 14:35:53 2018 (r470220) +++ branches/2018Q2/sysutils/logstash6/Makefile Thu May 17 14:47:04 2018 (r470221) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= logstash -PORTVERSION= 6.2.2 -PORTREVISION= 4 +PORTVERSION= 6.2.4 +PORTREVISION= 0 CATEGORIES= sysutils java MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/ PKGNAMESUFFIX= 6 Modified: branches/2018Q2/sysutils/logstash6/distinfo ============================================================================== --- branches/2018Q2/sysutils/logstash6/distinfo Thu May 17 14:35:53 2018 (r470220) +++ branches/2018Q2/sysutils/logstash6/distinfo Thu May 17 14:47:04 2018 (r470221) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519746290 -SHA256 (logstash-6.2.2.tar.gz) = 40ec30d14e14dde4664a625f410d9d93b1d80abb4235334bf680a35f1f0c4b9d -SIZE (logstash-6.2.2.tar.gz) = 139464029 +TIMESTAMP = 1525976336 +SHA256 (logstash-6.2.4.tar.gz) = 4040c2b6a1e9c6908b12885659021a35dca415c6b884cef6938fcc589e94431e +SIZE (logstash-6.2.4.tar.gz) = 147224408 Modified: branches/2018Q2/textproc/elasticsearch6/Makefile ============================================================================== --- branches/2018Q2/textproc/elasticsearch6/Makefile Thu May 17 14:35:53 2018 (r470220) +++ branches/2018Q2/textproc/elasticsearch6/Makefile Thu May 17 14:47:04 2018 (r470221) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 6.2.2 -PORTREVISION= 7 +PORTVERSION= 6.2.4 +PORTREVISION= 0 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ Modified: branches/2018Q2/textproc/elasticsearch6/distinfo ============================================================================== --- branches/2018Q2/textproc/elasticsearch6/distinfo Thu May 17 14:35:53 2018 (r470220) +++ branches/2018Q2/textproc/elasticsearch6/distinfo Thu May 17 14:47:04 2018 (r470221) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519482605 -SHA256 (elasticsearch-6.2.2.tar.gz) = b26e3546784b39ce3eacc10411e68ada427c5764bcda3064e9bb284eca907983 -SIZE (elasticsearch-6.2.2.tar.gz) = 29049540 +TIMESTAMP = 1525976955 +SHA256 (elasticsearch-6.2.4.tar.gz) = 91e6f1ea1e1dd39011e7a703d2751ca46ee374665b08b0bfe17e0c0c27000e8e +SIZE (elasticsearch-6.2.4.tar.gz) = 29056810 Modified: branches/2018Q2/textproc/kibana6/Makefile ============================================================================== --- branches/2018Q2/textproc/kibana6/Makefile Thu May 17 14:35:53 2018 (r470220) +++ branches/2018Q2/textproc/kibana6/Makefile Thu May 17 14:47:04 2018 (r470221) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= kibana -PORTVERSION= 6.2.2 +PORTVERSION= 6.2.4 DISTVERSIONSUFFIX= -linux-x86_64 -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ http://artifacts.elastic.co/downloads/kibana/ @@ -39,6 +39,7 @@ post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST} + ${ECHO} "@dir ${WWWDIR}/node_modules/@elastic/numeral/src" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/ui/public/factories" >> ${TMPPLIST} Modified: branches/2018Q2/textproc/kibana6/distinfo ============================================================================== --- branches/2018Q2/textproc/kibana6/distinfo Thu May 17 14:35:53 2018 (r470220) +++ branches/2018Q2/textproc/kibana6/distinfo Thu May 17 14:47:04 2018 (r470221) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519487108 -SHA256 (kibana-6.2.2-linux-x86_64.tar.gz) = 225b5c72e333c7e872f3d97f2ab4039e29a7a8bee02f0feb57744dbc59e67abe -SIZE (kibana-6.2.2-linux-x86_64.tar.gz) = 83415765 +TIMESTAMP = 1525977011 +SHA256 (kibana-6.2.4-linux-x86_64.tar.gz) = 53fb5ddcb3055209f8e3dffcad62d24bdbdedbe8e2f66c1773bac4a1f8b629af +SIZE (kibana-6.2.4-linux-x86_64.tar.gz) = 85348919 From owner-svn-ports-branches@freebsd.org Thu May 17 14:50:52 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5403EAA821; Thu, 17 May 2018 14:50:51 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9749A83205; Thu, 17 May 2018 14:50:51 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 783F92949; Thu, 17 May 2018 14:50:51 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HEopuE075684; Thu, 17 May 2018 14:50:51 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HEop3b075683; Thu, 17 May 2018 14:50:51 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201805171450.w4HEop3b075683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 17 May 2018 14:50:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470223 - branches/2018Q2/sysutils/logstash6/files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2018Q2/sysutils/logstash6/files X-SVN-Commit-Revision: 470223 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 14:50:52 -0000 Author: feld Date: Thu May 17 14:50:51 2018 New Revision: 470223 URL: https://svnweb.freebsd.org/changeset/ports/470223 Log: MFH: r467323 sysutils/logstash6: Fix build PR: 227442 Deleted: branches/2018Q2/sysutils/logstash6/files/patch-Gemfile branches/2018Q2/sysutils/logstash6/files/patch-Gemfile.lock Modified: Directory Properties: branches/2018Q2/ (props changed) From owner-svn-ports-branches@freebsd.org Thu May 17 18:31:50 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D0AD3EDC7E0; Thu, 17 May 2018 18:31:50 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E9736FDDB; Thu, 17 May 2018 18:31:50 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5FB5D52ED; Thu, 17 May 2018 18:31:50 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HIVopl088665; Thu, 17 May 2018 18:31:50 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIVoOO088664; Thu, 17 May 2018 18:31:50 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201805171831.w4HIVoOO088664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Thu, 17 May 2018 18:31:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470245 - in branches/2018Q2/databases/mariadb101-server: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q2/databases/mariadb101-server: . files X-SVN-Commit-Revision: 470245 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:31:51 -0000 Author: brnrd Date: Thu May 17 18:31:49 2018 New Revision: 470245 URL: https://svnweb.freebsd.org/changeset/ports/470245 Log: MFH: r466138 www/mariadb101-server: Update to 10.1.33 - Add missing updates from 10.1.32 commit Approved by: ports-secteam (build fix blanket) Deleted: branches/2018Q2/databases/mariadb101-server/files/extra-patch-MDEV-15288 Modified: branches/2018Q2/databases/mariadb101-server/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/databases/mariadb101-server/Makefile ============================================================================== --- branches/2018Q2/databases/mariadb101-server/Makefile Thu May 17 18:31:00 2018 (r470244) +++ branches/2018Q2/databases/mariadb101-server/Makefile Thu May 17 18:31:49 2018 (r470245) @@ -135,7 +135,6 @@ ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -INNOBASE_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-MDEV-15288 LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF LZ4_CMAKE_ON= -DGRN_WITH_LZ4=${LOCALBASE}/lib -DWITH_INNODB_LZ4=${LOCALBASE}/lib LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 From owner-svn-ports-branches@freebsd.org Fri May 18 03:36:36 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4BEBAEE8159; Fri, 18 May 2018 03:36:36 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC4E182EF3; Fri, 18 May 2018 03:36:35 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD34B12B1B; Fri, 18 May 2018 03:36:35 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4I3aZ85065094; Fri, 18 May 2018 03:36:35 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4I3aZLG065092; Fri, 18 May 2018 03:36:35 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201805180336.w4I3aZLG065092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Fri, 18 May 2018 03:36:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470257 - branches/2018Q2/databases/py-pyPgSQL X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: branches/2018Q2/databases/py-pyPgSQL X-SVN-Commit-Revision: 470257 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 03:36:36 -0000 Author: koobs Date: Fri May 18 03:36:35 2018 New Revision: 470257 URL: https://svnweb.freebsd.org/changeset/ports/470257 Log: MFH: r469614 databases/py-pyPgSQL: Unmark BROKEN, Update MAINTAINER This port was marked BROKEN/DEPRECATED due to a corrupt patch file. Update the patch source to fix the issue. Update MAINTAINER at submitters request. While here, level up ports / python port compliance: - Strip shared libraries - Use option helpers - Use python autoplist - Match upstream setup.py metadata (COMMENT) - Use explicit/canonical python package dependencies - Unmute INSTALL_* commands PR: 228119 Submitted by: Chris Hutchinson Approved by: koobs (python, maintainer) Approved by: ports-secteam (riggs) Modified: branches/2018Q2/databases/py-pyPgSQL/Makefile branches/2018Q2/databases/py-pyPgSQL/distinfo branches/2018Q2/databases/py-pyPgSQL/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/databases/py-pyPgSQL/Makefile ============================================================================== --- branches/2018Q2/databases/py-pyPgSQL/Makefile Fri May 18 01:39:41 2018 (r470256) +++ branches/2018Q2/databases/py-pyPgSQL/Makefile Fri May 18 03:36:35 2018 (r470257) @@ -3,48 +3,45 @@ PORTNAME= pyPgSQL PORTVERSION= 2.5.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases python MASTER_SITES= SF PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= python@FreeBSD.org -COMMENT= Python DB-API 2 compliant library for using PostgreSQL databases +MAINTAINER= portmaster@BSDforge.com +COMMENT= Python DB-API 2.0 compliant interface to PostgreSQL -BROKEN= Invalid checksum +LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${DATETIME_DEP}:lang/py-mx-base +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base -USES= pgsql python:2.7 -USE_PYTHON= distutils +USES= pgsql python:2.7 +USE_PYTHON= distutils autoplist DOCS= Announce ChangeLog README README.html EXAMPLES= examples/*.py -DATETIME_DEP= ${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py - -OPTIONS_DEFINE= BYTEA_CONN EXAMPLES DOCS +OPTIONS_DEFINE= BYTEA_CONN EXAMPLES DOCS OPTIONS_DEFAULT= BYTEA_CONN + BYTEA_CONN_DESC= Apply Bytea connection patch +BYTEA_CONN_VARS= PATCH_SITES= https://sourceforge.net/p/pypgsql/patches/_discuss/thread/c9fcb468/43b1/attachment/ \ + PATCHFILES= patch-byteaconn .include -.if ${PORT_OPTIONS:MBYTEA_CONN} -PATCH_SITES= http://sourceforge.net/tracker/download.php?group_id=16528&atid=316528&file_id=273956&aid=1939119/ -PATCHFILES= pyPgSQL-patch_byteaconn -.endif - DOCSDIR= ${PREFIX}/share/doc/py-pyPgSQL EXAMPLESDIR= ${PREFIX}/share/examples/py-pyPgSQL post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyPgSQL/libpq/libpqmodule.so @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${EXAMPLES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor .include Modified: branches/2018Q2/databases/py-pyPgSQL/distinfo ============================================================================== --- branches/2018Q2/databases/py-pyPgSQL/distinfo Fri May 18 01:39:41 2018 (r470256) +++ branches/2018Q2/databases/py-pyPgSQL/distinfo Fri May 18 03:36:35 2018 (r470257) @@ -1,4 +1,3 @@ +TIMESTAMP = 1526023581 SHA256 (pyPgSQL-2.5.1.tar.gz) = 498486f066f11a68f5b02a54ba5a008d01d507038c873bfd901c14d3f5ca18af SIZE (pyPgSQL-2.5.1.tar.gz) = 152840 -SHA256 (pyPgSQL-patch_byteaconn) = 73a324808aef49382e736245023eb8c468e1ca0803052a2a45162465b0ad28d7 -SIZE (pyPgSQL-patch_byteaconn) = 4718 Modified: branches/2018Q2/databases/py-pyPgSQL/pkg-plist ============================================================================== --- branches/2018Q2/databases/py-pyPgSQL/pkg-plist Fri May 18 01:39:41 2018 (r470256) +++ branches/2018Q2/databases/py-pyPgSQL/pkg-plist Fri May 18 03:36:35 2018 (r470257) @@ -1,13 +1,3 @@ -%%PYTHON_SITELIBDIR%%/pyPgSQL/__init__.py -%%PYTHON_SITELIBDIR%%/pyPgSQL/__init__.pyc -%%PYTHON_SITELIBDIR%%/pyPgSQL/__init__.pyo -%%PYTHON_SITELIBDIR%%/pyPgSQL/PgSQL.py -%%PYTHON_SITELIBDIR%%/pyPgSQL/PgSQL.pyc -%%PYTHON_SITELIBDIR%%/pyPgSQL/PgSQL.pyo -%%PYTHON_SITELIBDIR%%/pyPgSQL/libpq/__init__.py -%%PYTHON_SITELIBDIR%%/pyPgSQL/libpq/__init__.pyc -%%PYTHON_SITELIBDIR%%/pyPgSQL/libpq/__init__.pyo -%%PYTHON_SITELIBDIR%%/pyPgSQL/libpq/libpqmodule.so %%PORTDOCS%%%%DOCSDIR%%/Announce %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README From owner-svn-ports-branches@freebsd.org Fri May 18 11:20:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86C69EF1F4A; Fri, 18 May 2018 11:20:07 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3BC467186D; Fri, 18 May 2018 11:20:07 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E40C175CC; Fri, 18 May 2018 11:20:07 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4IBK7UM099367; Fri, 18 May 2018 11:20:07 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4IBK6pO099365; Fri, 18 May 2018 11:20:06 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201805181120.w4IBK6pO099365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 18 May 2018 11:20:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470287 - branches/2018Q2/sysutils/lsof X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: branches/2018Q2/sysutils/lsof X-SVN-Commit-Revision: 470287 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 11:20:07 -0000 Author: swills Date: Fri May 18 11:20:06 2018 New Revision: 470287 URL: https://svnweb.freebsd.org/changeset/ports/470287 Log: MFH: r469248 MFH'ing build fix for -CURRENT sysutils/lsof: upgrade to 4.92A to support recent -CURRENT PR: 227997 Reported by: grahamperrin@gmail.com Approved by: Vic Abell (Author) Approved by: ports-secteam (implicit) Modified: branches/2018Q2/sysutils/lsof/Makefile branches/2018Q2/sysutils/lsof/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/lsof/Makefile ============================================================================== --- branches/2018Q2/sysutils/lsof/Makefile Fri May 18 10:43:32 2018 (r470286) +++ branches/2018Q2/sysutils/lsof/Makefile Fri May 18 11:20:06 2018 (r470287) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lsof -DISTVERSION= 4.91 +DISTVERSION= 4.92A PORTEPOCH= 8 CATEGORIES= sysutils MASTER_SITES= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \ @@ -19,7 +19,7 @@ LICENSE_FILE= ${FILESDIR}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept #Please leave the below line in for the next clean up. -#FIXUP_RELEASE= YES +FIXUP_RELEASE= YES .if defined(FIXUP_RELEASE) DISTNAME_SUFFIX=.freebsd .else Modified: branches/2018Q2/sysutils/lsof/distinfo ============================================================================== --- branches/2018Q2/sysutils/lsof/distinfo Fri May 18 10:43:32 2018 (r470286) +++ branches/2018Q2/sysutils/lsof/distinfo Fri May 18 11:20:06 2018 (r470287) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522102383 -SHA256 (lsof_4.91.tar.bz2) = c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3 -SIZE (lsof_4.91.tar.bz2) = 791734 +TIMESTAMP = 1525635299 +SHA256 (lsof_4.92A.freebsd.tar.bz2) = b15ec931d21a00c01c49e96e4e690db5a4eaae7ca748d33a39af95926ea7da8c +SIZE (lsof_4.92A.freebsd.tar.bz2) = 490820 From owner-svn-ports-branches@freebsd.org Fri May 18 23:54:00 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 966C1EE0D62; Fri, 18 May 2018 23:54:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3D971707A4; Fri, 18 May 2018 23:54:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B3AA1F248; Fri, 18 May 2018 23:54:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4INs0Vn093608; Fri, 18 May 2018 23:54:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4INrxPF093603; Fri, 18 May 2018 23:53:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805182353.w4INrxPF093603@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 18 May 2018 23:53:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470347 - in branches/2018Q2/mail: thunderbird thunderbird-i18n thunderbird/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/mail: thunderbird thunderbird-i18n thunderbird/files X-SVN-Commit-Revision: 470347 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 23:54:00 -0000 Author: jbeich Date: Fri May 18 23:53:59 2018 New Revision: 470347 URL: https://svnweb.freebsd.org/changeset/ports/470347 Log: MFH: r470342 mail/thunderbird: update to 52.8.0 Changes: https://www.mozilla.org/thunderbird/52.8.0/releasenotes/ Security: 5aefc41e-d304-4ec8-8c82-824f84f08244 Approved by: ports-secteam blanket Deleted: branches/2018Q2/mail/thunderbird/files/patch-bug1440717 Modified: branches/2018Q2/mail/thunderbird-i18n/Makefile branches/2018Q2/mail/thunderbird-i18n/distinfo branches/2018Q2/mail/thunderbird/Makefile branches/2018Q2/mail/thunderbird/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/2018Q2/mail/thunderbird-i18n/Makefile Fri May 18 23:53:14 2018 (r470346) +++ branches/2018Q2/mail/thunderbird-i18n/Makefile Fri May 18 23:53:59 2018 (r470347) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 52.7.0 +PORTVERSION= 52.8.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi Modified: branches/2018Q2/mail/thunderbird-i18n/distinfo ============================================================================== --- branches/2018Q2/mail/thunderbird-i18n/distinfo Fri May 18 23:53:14 2018 (r470346) +++ branches/2018Q2/mail/thunderbird-i18n/distinfo Fri May 18 23:53:59 2018 (r470347) @@ -1,119 +1,119 @@ -TIMESTAMP = 1521836784 -SHA256 (xpi/thunderbird-i18n-52.7.0/ar.xpi) = 8212abdbe942452369dc290b00a98954d7a713c99b60d439b3b513216760fbcb -SIZE (xpi/thunderbird-i18n-52.7.0/ar.xpi) = 604236 -SHA256 (xpi/thunderbird-i18n-52.7.0/ast.xpi) = 3d49ddaf86b0a0d2909c4fa2fdb1c1a1a150a09e70600dad2b070b6f8a737f42 -SIZE (xpi/thunderbird-i18n-52.7.0/ast.xpi) = 541174 -SHA256 (xpi/thunderbird-i18n-52.7.0/be.xpi) = 52814d6cdd5cebcd44b9df8225d9f185882e56983896f127427b66cfc0116a0a -SIZE (xpi/thunderbird-i18n-52.7.0/be.xpi) = 570932 -SHA256 (xpi/thunderbird-i18n-52.7.0/bg.xpi) = 39b84ae64b41ae34135e166f32e11ccbc6e1c2fefb3bbde642735c16ce8f9daf -SIZE (xpi/thunderbird-i18n-52.7.0/bg.xpi) = 634897 -SHA256 (xpi/thunderbird-i18n-52.7.0/bn-BD.xpi) = cf2d10315603e84614052e68044e417513573c6002a2a2c3c37f651fdb52a035 -SIZE (xpi/thunderbird-i18n-52.7.0/bn-BD.xpi) = 676901 -SHA256 (xpi/thunderbird-i18n-52.7.0/br.xpi) = 5416998b38b8b3b18b62048929de711ca2999f8e8a45ea242c69c2e68bb9cfbd -SIZE (xpi/thunderbird-i18n-52.7.0/br.xpi) = 559381 -SHA256 (xpi/thunderbird-i18n-52.7.0/ca.xpi) = 87bb623143d2b1f4a2fafb5c7054ffbef7c85fa24f78c415a86f97b28b39e9f0 -SIZE (xpi/thunderbird-i18n-52.7.0/ca.xpi) = 569910 -SHA256 (xpi/thunderbird-i18n-52.7.0/cs.xpi) = a2fef472427924f08a759d96bf3bb8986956ed395ee92f0a2f9ed7dee34bb6dd -SIZE (xpi/thunderbird-i18n-52.7.0/cs.xpi) = 579150 -SHA256 (xpi/thunderbird-i18n-52.7.0/cy.xpi) = f34586b7f06c42712158c4766ef3484a6985b9024d51cd546b5b19f241b6ed6f -SIZE (xpi/thunderbird-i18n-52.7.0/cy.xpi) = 554858 -SHA256 (xpi/thunderbird-i18n-52.7.0/da.xpi) = b2c6cb1b6668e6aabd2838b4e1db74618db70b8f682de9dfc1a803ffc3b71c5c -SIZE (xpi/thunderbird-i18n-52.7.0/da.xpi) = 543336 -SHA256 (xpi/thunderbird-i18n-52.7.0/de.xpi) = 06b1ec1c4ace0211a51e60bcad7322299bec420d14516186dcfd9ece11548543 -SIZE (xpi/thunderbird-i18n-52.7.0/de.xpi) = 555744 -SHA256 (xpi/thunderbird-i18n-52.7.0/dsb.xpi) = 9827822895c0f228f9f253ea9434779dbc330d894c653d2821596ccf9bfa88a2 -SIZE (xpi/thunderbird-i18n-52.7.0/dsb.xpi) = 584579 -SHA256 (xpi/thunderbird-i18n-52.7.0/el.xpi) = 6a02b6c79f8be2ad43a01bdfcd8430451ed3d5ad4e9c9f5012caa98800daf36f -SIZE (xpi/thunderbird-i18n-52.7.0/el.xpi) = 662965 -SHA256 (xpi/thunderbird-i18n-52.7.0/en-GB.xpi) = 595a5ef2e64984ece043d0d0d374e3d81a4f7201b632758687b9f03e1e23057c -SIZE (xpi/thunderbird-i18n-52.7.0/en-GB.xpi) = 531234 -SHA256 (xpi/thunderbird-i18n-52.7.0/en-US.xpi) = 3b55d2377d7790675e3b68eeb4d1338a1913ff22d375183806c2bfa054dfa540 -SIZE (xpi/thunderbird-i18n-52.7.0/en-US.xpi) = 529123 -SHA256 (xpi/thunderbird-i18n-52.7.0/es-AR.xpi) = 819be79a7473a0f3afd4825b26e3f5ba1dd6b745e7d4fb2fa6ec8bd10236e9aa -SIZE (xpi/thunderbird-i18n-52.7.0/es-AR.xpi) = 565995 -SHA256 (xpi/thunderbird-i18n-52.7.0/es-ES.xpi) = 47d591d366a50ae9f69221be2b1882546b9beaadf3962240b65e6910a9023dd8 -SIZE (xpi/thunderbird-i18n-52.7.0/es-ES.xpi) = 445464 -SHA256 (xpi/thunderbird-i18n-52.7.0/et.xpi) = 1afff1eed8ebee534f87f21d675e1d3d76875f1a2bd1c1d8504c2e43e14b1dab -SIZE (xpi/thunderbird-i18n-52.7.0/et.xpi) = 551661 -SHA256 (xpi/thunderbird-i18n-52.7.0/eu.xpi) = 0891d434e1ba57a71d0dbfd5a0f54c7bbbf0bbc5b5725671e3243aa9d836fd2c -SIZE (xpi/thunderbird-i18n-52.7.0/eu.xpi) = 555536 -SHA256 (xpi/thunderbird-i18n-52.7.0/fi.xpi) = 8f63092de10863ee4bf4c66f88e33842c987ad244d73bb2377e386730652f08d -SIZE (xpi/thunderbird-i18n-52.7.0/fi.xpi) = 550669 -SHA256 (xpi/thunderbird-i18n-52.7.0/fr.xpi) = 0d71ac2f70c3f4d117e8ed41f5c4a82e333bdfa58783e829dae179a901a24093 -SIZE (xpi/thunderbird-i18n-52.7.0/fr.xpi) = 577561 -SHA256 (xpi/thunderbird-i18n-52.7.0/fy-NL.xpi) = 3a7de09335a80a7a846b413479b3ee069a1d74ade1c054e71fa4f4e8261e88d9 -SIZE (xpi/thunderbird-i18n-52.7.0/fy-NL.xpi) = 563633 -SHA256 (xpi/thunderbird-i18n-52.7.0/ga-IE.xpi) = 017e9ee7d930637f7f72633b4eeeb8cde9f44fd47cbf4564704ef8d4e6b96616 -SIZE (xpi/thunderbird-i18n-52.7.0/ga-IE.xpi) = 583557 -SHA256 (xpi/thunderbird-i18n-52.7.0/gd.xpi) = 314d22069e8f7e5d9dc18a35e8cd8baf4bd80280f4e22e5bb7b4c5c96e482860 -SIZE (xpi/thunderbird-i18n-52.7.0/gd.xpi) = 574065 -SHA256 (xpi/thunderbird-i18n-52.7.0/gl.xpi) = 16af3293f6b01a80e31525d33c65113b445f53ae0ccd318597cc1ce686bf0cc9 -SIZE (xpi/thunderbird-i18n-52.7.0/gl.xpi) = 575150 -SHA256 (xpi/thunderbird-i18n-52.7.0/he.xpi) = 143ddad4eaa4eab357eae17b31c86ab0fb33f5f5e112b90e144bd66249f09ec3 -SIZE (xpi/thunderbird-i18n-52.7.0/he.xpi) = 592566 -SHA256 (xpi/thunderbird-i18n-52.7.0/hr.xpi) = 8c85aaf66eaaf806229b090665e2d3389dae2f44b96e128605bcec269460ff73 -SIZE (xpi/thunderbird-i18n-52.7.0/hr.xpi) = 564780 -SHA256 (xpi/thunderbird-i18n-52.7.0/hsb.xpi) = c14a32839dba703bddaeca917a1b9abaaa254ef1a254aee75fca08bb08de7c76 -SIZE (xpi/thunderbird-i18n-52.7.0/hsb.xpi) = 582242 -SHA256 (xpi/thunderbird-i18n-52.7.0/hu.xpi) = 2bdbcb919a81a905a5d29022eceb8f8b4091e1f938a666d5ea757023a27e9b68 -SIZE (xpi/thunderbird-i18n-52.7.0/hu.xpi) = 586446 -SHA256 (xpi/thunderbird-i18n-52.7.0/hy-AM.xpi) = 01942aacb942e1fe95c119aa6904ec67ea7c2b5e7c3bb41e5678dc558bf8e4c7 -SIZE (xpi/thunderbird-i18n-52.7.0/hy-AM.xpi) = 629880 -SHA256 (xpi/thunderbird-i18n-52.7.0/id.xpi) = 94bd63d09400796e7001fc9a2e7930a29d0f8e338dc3a79a23368b3daa5827fb -SIZE (xpi/thunderbird-i18n-52.7.0/id.xpi) = 546527 -SHA256 (xpi/thunderbird-i18n-52.7.0/is.xpi) = 8ea8d3f3d7e4dac11688a2215bb512fa0e0adecdea31c391235a36d16ed2b204 -SIZE (xpi/thunderbird-i18n-52.7.0/is.xpi) = 555713 -SHA256 (xpi/thunderbird-i18n-52.7.0/it.xpi) = 6458c381a598cc97513c1b7b83ea2d7092b4b7b729d939d6ba1c51b91a4e1c8b -SIZE (xpi/thunderbird-i18n-52.7.0/it.xpi) = 455408 -SHA256 (xpi/thunderbird-i18n-52.7.0/ja.xpi) = 96feb42e3ae1646d64ad74b2de7952e73a05a4302b7dde5841a32c43be859255 -SIZE (xpi/thunderbird-i18n-52.7.0/ja.xpi) = 630053 -SHA256 (xpi/thunderbird-i18n-52.7.0/kab.xpi) = dea8e31429a2eddb7c40ff1eb6252034285af11dc2bd3f0c9637a494ffd2be36 -SIZE (xpi/thunderbird-i18n-52.7.0/kab.xpi) = 568689 -SHA256 (xpi/thunderbird-i18n-52.7.0/ko.xpi) = 341e891e3aa85199a4da33a716d0d70fde05fba87c7ca165722f7b95f7172a67 -SIZE (xpi/thunderbird-i18n-52.7.0/ko.xpi) = 595517 -SHA256 (xpi/thunderbird-i18n-52.7.0/lt.xpi) = 7d2fe137ef7b18056a399a6768f93b9e35d543da8c1b07151d4b34f08bb287af -SIZE (xpi/thunderbird-i18n-52.7.0/lt.xpi) = 580598 -SHA256 (xpi/thunderbird-i18n-52.7.0/nb-NO.xpi) = bd7df863f1695ac09ababad15f681ecd099d6bf7e33115adfea1be41b53e7f7c -SIZE (xpi/thunderbird-i18n-52.7.0/nb-NO.xpi) = 551104 -SHA256 (xpi/thunderbird-i18n-52.7.0/nl.xpi) = 15c4a0bbf3fa30fa970a3870bd1e580b39bcdf217d74723ee4252b57a94be78b -SIZE (xpi/thunderbird-i18n-52.7.0/nl.xpi) = 557957 -SHA256 (xpi/thunderbird-i18n-52.7.0/nn-NO.xpi) = 1d70ee7b991f5ab73e5aa627d8f19f93e8771a85da27abda1dc40c98a513a5da -SIZE (xpi/thunderbird-i18n-52.7.0/nn-NO.xpi) = 551892 -SHA256 (xpi/thunderbird-i18n-52.7.0/pa-IN.xpi) = 0becb534e4577903b84aa2fe2ce5d59ae0fc2e7daa9bcbcddf697211b5dae43e -SIZE (xpi/thunderbird-i18n-52.7.0/pa-IN.xpi) = 646569 -SHA256 (xpi/thunderbird-i18n-52.7.0/pl.xpi) = c59eb5cae2f997a886ae0c78ade2178f92d49dfde5ec00949e409fe7eaa04025 -SIZE (xpi/thunderbird-i18n-52.7.0/pl.xpi) = 469902 -SHA256 (xpi/thunderbird-i18n-52.7.0/pt-BR.xpi) = c8948e2776e85e9e3b56e9cf05f5cc7c5f75d325950939f5f542a3d7d4a4a638 -SIZE (xpi/thunderbird-i18n-52.7.0/pt-BR.xpi) = 558224 -SHA256 (xpi/thunderbird-i18n-52.7.0/pt-PT.xpi) = 1111fef71a87b7a1921201046cf186909b2fbf7f52f55f6837a2dac510a9b9e8 -SIZE (xpi/thunderbird-i18n-52.7.0/pt-PT.xpi) = 565624 -SHA256 (xpi/thunderbird-i18n-52.7.0/rm.xpi) = fd0367417943f820620980c832a9b94613020ba9382f1f1b7137daf9e003463b -SIZE (xpi/thunderbird-i18n-52.7.0/rm.xpi) = 557605 -SHA256 (xpi/thunderbird-i18n-52.7.0/ro.xpi) = 5528eb38e8da8f83264b4387a9b5c9a7444ebb5bda9db7911c4ceeb5febcdba2 -SIZE (xpi/thunderbird-i18n-52.7.0/ro.xpi) = 570530 -SHA256 (xpi/thunderbird-i18n-52.7.0/ru.xpi) = 3a6a8680abfa01f696c4dcb25fd88a14b889c6b03866d185909b72d462b901d7 -SIZE (xpi/thunderbird-i18n-52.7.0/ru.xpi) = 530670 -SHA256 (xpi/thunderbird-i18n-52.7.0/si.xpi) = 815c60141b335c1ecc497668343aa4fb77d378eac475bebddaef4ba4cbf552bb -SIZE (xpi/thunderbird-i18n-52.7.0/si.xpi) = 649010 -SHA256 (xpi/thunderbird-i18n-52.7.0/sk.xpi) = c75343dcc57b2eb13c7affed446d2b59d31ed8f677995479fa37af13615f40f4 -SIZE (xpi/thunderbird-i18n-52.7.0/sk.xpi) = 583882 -SHA256 (xpi/thunderbird-i18n-52.7.0/sl.xpi) = 591aafe3714e5a0253b9210a054452b0a92a4202029d4016e0e593a54212e3aa -SIZE (xpi/thunderbird-i18n-52.7.0/sl.xpi) = 562835 -SHA256 (xpi/thunderbird-i18n-52.7.0/sq.xpi) = 7c1f9e88265233d1f39eb2ed79695c3bbeb1b1a7acab02634c0f9eab5e1280a2 -SIZE (xpi/thunderbird-i18n-52.7.0/sq.xpi) = 570616 -SHA256 (xpi/thunderbird-i18n-52.7.0/sr.xpi) = f0fa84335f0d15c972aff835a0a887e0a6816eeb14f0a096ccc987d1baf43bbc -SIZE (xpi/thunderbird-i18n-52.7.0/sr.xpi) = 609020 -SHA256 (xpi/thunderbird-i18n-52.7.0/sv-SE.xpi) = d41d6e198cc298ed35ee76d98f305b60614069ba8774096f83fefe38cab8ae3b -SIZE (xpi/thunderbird-i18n-52.7.0/sv-SE.xpi) = 565777 -SHA256 (xpi/thunderbird-i18n-52.7.0/ta-LK.xpi) = 4fde53c46c3108ecdc077d4908e4c67ee1d2074e1dc793897925f4a218027069 -SIZE (xpi/thunderbird-i18n-52.7.0/ta-LK.xpi) = 675039 -SHA256 (xpi/thunderbird-i18n-52.7.0/tr.xpi) = ca485aff2aafd544d819ab494119286a70954fead827d86d4158cfd4b493022e -SIZE (xpi/thunderbird-i18n-52.7.0/tr.xpi) = 569926 -SHA256 (xpi/thunderbird-i18n-52.7.0/uk.xpi) = c6d1de503332abe0129b1bee3fe129f20ffc6f3870058d54d2627fdf420332ad -SIZE (xpi/thunderbird-i18n-52.7.0/uk.xpi) = 652855 -SHA256 (xpi/thunderbird-i18n-52.7.0/vi.xpi) = b97c479f0e52e8429ad0f3c9195ca3005e01a9a32b1ef6c4fae6efa4e81710eb -SIZE (xpi/thunderbird-i18n-52.7.0/vi.xpi) = 637164 -SHA256 (xpi/thunderbird-i18n-52.7.0/zh-CN.xpi) = c551cc18219c4cf979be3e32adb3dc34b3cfebd036fdde7a1148041d47418533 -SIZE (xpi/thunderbird-i18n-52.7.0/zh-CN.xpi) = 593612 -SHA256 (xpi/thunderbird-i18n-52.7.0/zh-TW.xpi) = 3eda9dd7b4814d142b2a1f74e0c3f9b90321fd8f6b620df83c25c780ae17e780 -SIZE (xpi/thunderbird-i18n-52.7.0/zh-TW.xpi) = 595729 +TIMESTAMP = 1526507977 +SHA256 (xpi/thunderbird-i18n-52.8.0/ar.xpi) = babc8c7230081ec21bd44190beb667611b566ea03f6f471e2170c9f76f78c8ea +SIZE (xpi/thunderbird-i18n-52.8.0/ar.xpi) = 604235 +SHA256 (xpi/thunderbird-i18n-52.8.0/ast.xpi) = aeae96cf4baf67e1a193b4bb34b18e874f8e35025c64e51810b87b3c414b1490 +SIZE (xpi/thunderbird-i18n-52.8.0/ast.xpi) = 541174 +SHA256 (xpi/thunderbird-i18n-52.8.0/be.xpi) = 16057e993a0f45387ab931d952af8ce1d9d22a60f211d836bad7f1d662855bbe +SIZE (xpi/thunderbird-i18n-52.8.0/be.xpi) = 570932 +SHA256 (xpi/thunderbird-i18n-52.8.0/bg.xpi) = 834245301cc7b83eb765c2c0f819cd6a7f76b92e39c6834c009020398c0b265e +SIZE (xpi/thunderbird-i18n-52.8.0/bg.xpi) = 634897 +SHA256 (xpi/thunderbird-i18n-52.8.0/bn-BD.xpi) = 4fdfede1ce6ca6e44f1956f2ef49e934c601ac3b12c80a6ae5a5c6c47790c131 +SIZE (xpi/thunderbird-i18n-52.8.0/bn-BD.xpi) = 676901 +SHA256 (xpi/thunderbird-i18n-52.8.0/br.xpi) = 93d28398d54d4e86780d479e5f239fdc516f0d5b51919777a61dface094a9512 +SIZE (xpi/thunderbird-i18n-52.8.0/br.xpi) = 559380 +SHA256 (xpi/thunderbird-i18n-52.8.0/ca.xpi) = 945f31b9409f6231cd3512bded82522e9ffec283387cbe51dcc83cda388d51b4 +SIZE (xpi/thunderbird-i18n-52.8.0/ca.xpi) = 569910 +SHA256 (xpi/thunderbird-i18n-52.8.0/cs.xpi) = 343b7da87749497ae9a19d3fada86b5138637680807f777628b54779f0cc1f4e +SIZE (xpi/thunderbird-i18n-52.8.0/cs.xpi) = 579150 +SHA256 (xpi/thunderbird-i18n-52.8.0/cy.xpi) = bf0043033fb140bedc7f0eecc557693c165c8e1ebb939018d0b2b1f7db7a1cad +SIZE (xpi/thunderbird-i18n-52.8.0/cy.xpi) = 554858 +SHA256 (xpi/thunderbird-i18n-52.8.0/da.xpi) = b7ae6e521b213f239d08f2e5a080e7a36d488b3454013487527e933fa21be9ad +SIZE (xpi/thunderbird-i18n-52.8.0/da.xpi) = 543335 +SHA256 (xpi/thunderbird-i18n-52.8.0/de.xpi) = 962b47c41d92e2855dc3bf8bae82af2b604cfbbfdae53a7d8f7a2c0766d17195 +SIZE (xpi/thunderbird-i18n-52.8.0/de.xpi) = 555744 +SHA256 (xpi/thunderbird-i18n-52.8.0/dsb.xpi) = 9825238e7cb785bac9cb94c32ab261dd0f7635df16ee96ce3cf092aab116e676 +SIZE (xpi/thunderbird-i18n-52.8.0/dsb.xpi) = 584578 +SHA256 (xpi/thunderbird-i18n-52.8.0/el.xpi) = 3954794a7df584d4a4e5561e32da2734561d7e7573a02d6d72a63b5afbe23fd4 +SIZE (xpi/thunderbird-i18n-52.8.0/el.xpi) = 662965 +SHA256 (xpi/thunderbird-i18n-52.8.0/en-GB.xpi) = 78d9423758e8ae538affc4a8bed05ce0b6b27427a5333901d2387ddccdf5a30f +SIZE (xpi/thunderbird-i18n-52.8.0/en-GB.xpi) = 531234 +SHA256 (xpi/thunderbird-i18n-52.8.0/en-US.xpi) = 5af2a9b42d1b53917f62ded2eb219ffa0347d5aabf45926a3a04b00747a1f94e +SIZE (xpi/thunderbird-i18n-52.8.0/en-US.xpi) = 529123 +SHA256 (xpi/thunderbird-i18n-52.8.0/es-AR.xpi) = 2ddff5be5bcc95eb64044b932f6a02aadefc5000c650ca0f49088035a8ae7dad +SIZE (xpi/thunderbird-i18n-52.8.0/es-AR.xpi) = 565995 +SHA256 (xpi/thunderbird-i18n-52.8.0/es-ES.xpi) = fe57740f88c0d11e06a6e9e76f2a8e44e8a3cafd5f2eebdc4d3d81ea506e224b +SIZE (xpi/thunderbird-i18n-52.8.0/es-ES.xpi) = 445464 +SHA256 (xpi/thunderbird-i18n-52.8.0/et.xpi) = 1fe4460f0e4e7f2cada39298542eb4404553656a42743df8cb1d689676f125e5 +SIZE (xpi/thunderbird-i18n-52.8.0/et.xpi) = 551661 +SHA256 (xpi/thunderbird-i18n-52.8.0/eu.xpi) = 2a28960004cfa003f82f8a79488957f8059f3362d58226e4c246d0d9eb4786a0 +SIZE (xpi/thunderbird-i18n-52.8.0/eu.xpi) = 555536 +SHA256 (xpi/thunderbird-i18n-52.8.0/fi.xpi) = 44f394c5c84f1b5dcf7ce08b13a227170196a6b284b3249548830336be535a4e +SIZE (xpi/thunderbird-i18n-52.8.0/fi.xpi) = 550669 +SHA256 (xpi/thunderbird-i18n-52.8.0/fr.xpi) = 8187c48a4c00635faa8d2cb93cbf9f23919039c662a6c5b9be0dbbf28c2fbb7f +SIZE (xpi/thunderbird-i18n-52.8.0/fr.xpi) = 577561 +SHA256 (xpi/thunderbird-i18n-52.8.0/fy-NL.xpi) = f64c745089a68b47664569fe6eb0ea8198dfcf28009723b97e8b242fb27287f7 +SIZE (xpi/thunderbird-i18n-52.8.0/fy-NL.xpi) = 563632 +SHA256 (xpi/thunderbird-i18n-52.8.0/ga-IE.xpi) = e5d64beeba305fc84e6b2eb3b2a76e91f82d40b61f0d392e4a5e3f40f94e98af +SIZE (xpi/thunderbird-i18n-52.8.0/ga-IE.xpi) = 583556 +SHA256 (xpi/thunderbird-i18n-52.8.0/gd.xpi) = daf9941666c11babff96c8b90145366d5b8ae4291688dc86ef423b7803fa4c05 +SIZE (xpi/thunderbird-i18n-52.8.0/gd.xpi) = 574065 +SHA256 (xpi/thunderbird-i18n-52.8.0/gl.xpi) = 1e5a512e7d1cf914a3d0fc105269be70ea2ed230a9fc7688c5d13ddeb366c9d5 +SIZE (xpi/thunderbird-i18n-52.8.0/gl.xpi) = 575150 +SHA256 (xpi/thunderbird-i18n-52.8.0/he.xpi) = 0ba6bc817dcada05ba84834693f8dc2a34a6b11325312d1cf5fb406469a9a26a +SIZE (xpi/thunderbird-i18n-52.8.0/he.xpi) = 592566 +SHA256 (xpi/thunderbird-i18n-52.8.0/hr.xpi) = 60ada7f1d81536ff207436e5d97742b74a314b6687deda0f102d7a4afbf8e220 +SIZE (xpi/thunderbird-i18n-52.8.0/hr.xpi) = 564780 +SHA256 (xpi/thunderbird-i18n-52.8.0/hsb.xpi) = a6831c6fd8667d45b82301bdbbe0acbb2b814f7785eae61c3df03b5e9f4ff44a +SIZE (xpi/thunderbird-i18n-52.8.0/hsb.xpi) = 582242 +SHA256 (xpi/thunderbird-i18n-52.8.0/hu.xpi) = 2aa78f474f69a8bc2d0d8893ff18a57b2126c8888706d21c20625207bf83f0cc +SIZE (xpi/thunderbird-i18n-52.8.0/hu.xpi) = 586446 +SHA256 (xpi/thunderbird-i18n-52.8.0/hy-AM.xpi) = 557558deeb63012f91959e975832458c753c9469a205827962f68c5f42bbfb3b +SIZE (xpi/thunderbird-i18n-52.8.0/hy-AM.xpi) = 629879 +SHA256 (xpi/thunderbird-i18n-52.8.0/id.xpi) = adabb413805c050e2d809116b0a7aa929dcb9ff5a8cda78e7acf6ac120953468 +SIZE (xpi/thunderbird-i18n-52.8.0/id.xpi) = 546527 +SHA256 (xpi/thunderbird-i18n-52.8.0/is.xpi) = bc8675a3667aabc3c438ca19c8ef5560e867579347a1bb64e3231f9a4c064c38 +SIZE (xpi/thunderbird-i18n-52.8.0/is.xpi) = 555712 +SHA256 (xpi/thunderbird-i18n-52.8.0/it.xpi) = 88840b998eb7320df68d23a7ad3d0451b806986cd8324cdaa2332ec186613128 +SIZE (xpi/thunderbird-i18n-52.8.0/it.xpi) = 455408 +SHA256 (xpi/thunderbird-i18n-52.8.0/ja.xpi) = fed11dfbf56caa82c8d3b9de5a1d77a3b25ad9f3c98640735921cf3386c510f3 +SIZE (xpi/thunderbird-i18n-52.8.0/ja.xpi) = 630053 +SHA256 (xpi/thunderbird-i18n-52.8.0/kab.xpi) = b4fbbbca63d71293e5d272de1cb63f49b2bb6e0fdc1169eb2b6c43acb4fe81d7 +SIZE (xpi/thunderbird-i18n-52.8.0/kab.xpi) = 568689 +SHA256 (xpi/thunderbird-i18n-52.8.0/ko.xpi) = 879f073ada33126d5deeaf07492835c4246480631cf7ab658f9b1ab952dbd63f +SIZE (xpi/thunderbird-i18n-52.8.0/ko.xpi) = 595517 +SHA256 (xpi/thunderbird-i18n-52.8.0/lt.xpi) = 8e6b88d22fdf2c1d724d35c452338b21c81e65fc207accb93644dc83daa5107a +SIZE (xpi/thunderbird-i18n-52.8.0/lt.xpi) = 580598 +SHA256 (xpi/thunderbird-i18n-52.8.0/nb-NO.xpi) = dec871d230e2afd1977b8c67c8aa65ae4ea017a634c6fe891ce7f0561621cc65 +SIZE (xpi/thunderbird-i18n-52.8.0/nb-NO.xpi) = 551104 +SHA256 (xpi/thunderbird-i18n-52.8.0/nl.xpi) = 20d6a0c950c9f225366e0a24d364ed5e8beaa6936a341c0324788cbf10142d2a +SIZE (xpi/thunderbird-i18n-52.8.0/nl.xpi) = 557957 +SHA256 (xpi/thunderbird-i18n-52.8.0/nn-NO.xpi) = d4e02f9fc22dc237ed0b3623a9e298f177434afb0967b32721acccc3201618a5 +SIZE (xpi/thunderbird-i18n-52.8.0/nn-NO.xpi) = 551891 +SHA256 (xpi/thunderbird-i18n-52.8.0/pa-IN.xpi) = 661b78d3a15559e359cb948a9f5df55cc5cd9958b794f877d2836106f686f487 +SIZE (xpi/thunderbird-i18n-52.8.0/pa-IN.xpi) = 646569 +SHA256 (xpi/thunderbird-i18n-52.8.0/pl.xpi) = 606606ea12c72fbf3bf00369d69a182ec2db369eadd245d5fc1f9365a2b18b6d +SIZE (xpi/thunderbird-i18n-52.8.0/pl.xpi) = 469901 +SHA256 (xpi/thunderbird-i18n-52.8.0/pt-BR.xpi) = aa4a97312893ca1a3952af89711b7793e841f9e91f44f9f53612a164593dd110 +SIZE (xpi/thunderbird-i18n-52.8.0/pt-BR.xpi) = 558224 +SHA256 (xpi/thunderbird-i18n-52.8.0/pt-PT.xpi) = 4838816aa27dc5799e4dbfd8c491b83889c68fdbd8f1ff3220522da014e539e4 +SIZE (xpi/thunderbird-i18n-52.8.0/pt-PT.xpi) = 565624 +SHA256 (xpi/thunderbird-i18n-52.8.0/rm.xpi) = a102c56a122fd22a1ea0a69a75ff8709d55a383595cc90b066d144d993e990f8 +SIZE (xpi/thunderbird-i18n-52.8.0/rm.xpi) = 557605 +SHA256 (xpi/thunderbird-i18n-52.8.0/ro.xpi) = 99b2f4b52c4f1dea880bfd826a119fa604885a9195039376ba092a830ef929c4 +SIZE (xpi/thunderbird-i18n-52.8.0/ro.xpi) = 570529 +SHA256 (xpi/thunderbird-i18n-52.8.0/ru.xpi) = 40119528c2301ecf0e778590026aed070e1e36929a245b8c02a69c1222d6103e +SIZE (xpi/thunderbird-i18n-52.8.0/ru.xpi) = 530670 +SHA256 (xpi/thunderbird-i18n-52.8.0/si.xpi) = a3b8bff61f1bfda9ca7a9cbc3a04563b33c693f4853e4fe15cff2d098314e578 +SIZE (xpi/thunderbird-i18n-52.8.0/si.xpi) = 649010 +SHA256 (xpi/thunderbird-i18n-52.8.0/sk.xpi) = 35cff3578b05c5448307ae69f1e2784598d1696ccba3ec9abccdb19c0f05f1a1 +SIZE (xpi/thunderbird-i18n-52.8.0/sk.xpi) = 583882 +SHA256 (xpi/thunderbird-i18n-52.8.0/sl.xpi) = 601baa286166d9ddebd6e0d0ed609403faa2474253b74aad0add0a9413c71c89 +SIZE (xpi/thunderbird-i18n-52.8.0/sl.xpi) = 562834 +SHA256 (xpi/thunderbird-i18n-52.8.0/sq.xpi) = a78686c96f8f04ce1bae89c60585aefbb89db6dd89ffb58d03e02de4bd8ad90b +SIZE (xpi/thunderbird-i18n-52.8.0/sq.xpi) = 570616 +SHA256 (xpi/thunderbird-i18n-52.8.0/sr.xpi) = 01c6f243d9654f3f94964121ce0472fbe81a6d3e668c88df412bad5af89c8ade +SIZE (xpi/thunderbird-i18n-52.8.0/sr.xpi) = 609020 +SHA256 (xpi/thunderbird-i18n-52.8.0/sv-SE.xpi) = 4004249e78db033b808ab0c8153e00cef03261ebb73a95e8551bb1c6b3959e48 +SIZE (xpi/thunderbird-i18n-52.8.0/sv-SE.xpi) = 565777 +SHA256 (xpi/thunderbird-i18n-52.8.0/ta-LK.xpi) = e0dd273b8e68b89588dd3272f7075af7ff1d18c6426af898f516eb2e02b04887 +SIZE (xpi/thunderbird-i18n-52.8.0/ta-LK.xpi) = 675039 +SHA256 (xpi/thunderbird-i18n-52.8.0/tr.xpi) = 6d59ed19e25dc1eb4b2dcbbad7e7adb00cf54266a77fcf237e98ec0ff78e415a +SIZE (xpi/thunderbird-i18n-52.8.0/tr.xpi) = 569926 +SHA256 (xpi/thunderbird-i18n-52.8.0/uk.xpi) = 1529750bb6eed89bea777120d049f8fe598ecad3450fac1910504479eec9cd89 +SIZE (xpi/thunderbird-i18n-52.8.0/uk.xpi) = 652855 +SHA256 (xpi/thunderbird-i18n-52.8.0/vi.xpi) = 020917361ec5336af4d52f8e4096dc8fde910aa6a7a6c7bdc8d1c575f5631a54 +SIZE (xpi/thunderbird-i18n-52.8.0/vi.xpi) = 637164 +SHA256 (xpi/thunderbird-i18n-52.8.0/zh-CN.xpi) = 57a37a05cffc455d59a62bfcd7e3f8dda8a5373ed213c3313b564a65e0a17475 +SIZE (xpi/thunderbird-i18n-52.8.0/zh-CN.xpi) = 593612 +SHA256 (xpi/thunderbird-i18n-52.8.0/zh-TW.xpi) = 72f8710cfc670aa6b7983a02e6d17cf36a813a5f7d0cbfee039fc6892708f1b0 +SIZE (xpi/thunderbird-i18n-52.8.0/zh-TW.xpi) = 595729 Modified: branches/2018Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2018Q2/mail/thunderbird/Makefile Fri May 18 23:53:14 2018 (r470346) +++ branches/2018Q2/mail/thunderbird/Makefile Fri May 18 23:53:59 2018 (r470347) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 52.7.0 -PORTREVISION= 2 +DISTVERSION= 52.8.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Modified: branches/2018Q2/mail/thunderbird/distinfo ============================================================================== --- branches/2018Q2/mail/thunderbird/distinfo Fri May 18 23:53:14 2018 (r470346) +++ branches/2018Q2/mail/thunderbird/distinfo Fri May 18 23:53:59 2018 (r470347) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521833256 -SHA256 (thunderbird-52.7.0.source.tar.xz) = 82462890d393ed78c03226924a6166596b7b6d1562b5071e713a7558cd292ea3 -SIZE (thunderbird-52.7.0.source.tar.xz) = 230410444 +TIMESTAMP = 1526507977 +SHA256 (thunderbird-52.8.0.source.tar.xz) = 35b9a687997d92f36107090c1217941e5d637760b0efa7d13819cde36894eb59 +SIZE (thunderbird-52.8.0.source.tar.xz) = 230380780 From owner-svn-ports-branches@freebsd.org Fri May 18 23:55:06 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2872EE0DEE; Fri, 18 May 2018 23:55:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 54BDA708B4; Fri, 18 May 2018 23:55:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 362621F24A; Fri, 18 May 2018 23:55:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4INt6Zt093837; Fri, 18 May 2018 23:55:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4INt5eN093833; Fri, 18 May 2018 23:55:05 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805182355.w4INt5eN093833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 18 May 2018 23:55:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470348 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 470348 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 23:55:06 -0000 Author: jbeich Date: Fri May 18 23:55:05 2018 New Revision: 470348 URL: https://svnweb.freebsd.org/changeset/ports/470348 Log: MFH: r470343 www/waterfox: apply some FF61 fixes Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1450448 - copied unchanged from r470343, head/www/waterfox/files/patch-bug1450448 branches/2018Q2/www/waterfox/files/patch-bug1456524 - copied unchanged from r470343, head/www/waterfox/files/patch-bug1456524 branches/2018Q2/www/waterfox/files/patch-bug1459162 - copied unchanged from r470343, head/www/waterfox/files/patch-bug1459162 Modified: branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Fri May 18 23:53:59 2018 (r470347) +++ branches/2018Q2/www/waterfox/Makefile Fri May 18 23:55:05 2018 (r470348) @@ -3,6 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.2.0-7 DISTVERSIONSUFFIX= -g436898372f858 +PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-bug1450448 (from r470343, head/www/waterfox/files/patch-bug1450448) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1450448 Fri May 18 23:55:05 2018 (r470348, copy of r470343, head/www/waterfox/files/patch-bug1450448) @@ -0,0 +1,40 @@ +commit fbba8d988c94 +Author: Johann Hofmann +Date: Tue May 15 22:02:33 2018 +0200 + + Bug 1450448 - Correctly handle non-initialized appCache in site data preferences. r=Gijs, a=RyanVM + + MozReview-Commit-ID: IhQGAWNQtR0 + + --HG-- + extra : rebase_source : c1e902883a977c54ccafd4a1c3042d0a17660996 + extra : source : 9f41afd3012718d839033663196a746a47065007 +--- + browser/modules/SiteDataManager.jsm | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git browser/components/preferences/SiteDataManager.jsm browser/components/preferences/SiteDataManager.jsm +index 118a40ce38fc8..9e08e00c38c5b 100644 +--- browser/components/preferences/SiteDataManager.jsm ++++ browser/components/preferences/SiteDataManager.jsm +@@ -192,7 +192,19 @@ var SiteDataManager = { + }, + + _updateAppCache() { +- let groups = this._appCache.getGroups(); ++ let groups; ++ try { ++ groups = this._appCache.getGroups(); ++ } catch (e) { ++ // NS_ERROR_NOT_AVAILABLE means that appCache is not initialized, ++ // which probably means the user has disabled it. Otherwise, log an ++ // error. Either way, there's nothing we can do here. ++ if (e.result != Cr.NS_ERROR_NOT_AVAILABLE) { ++ Cu.reportError(e); ++ } ++ return; ++ } ++ + for (let group of groups) { + let cache = this._appCache.getActiveCache(group); + if (cache.usage <= 0) { Copied: branches/2018Q2/www/waterfox/files/patch-bug1456524 (from r470343, head/www/waterfox/files/patch-bug1456524) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1456524 Fri May 18 23:55:05 2018 (r470348, copy of r470343, head/www/waterfox/files/patch-bug1456524) @@ -0,0 +1,122 @@ +commit 7813b28f0e98 +Author: Sean Stangl +Date: Thu May 17 14:06:00 2018 -0400 + + Bug 1456524 - Maintain MoveResolver invariants. r=jandem, a=RyanVM + + The MoveResolver is a persistent data structure that requires + state to not leak between borrowers. An early-exit optimization + in the case of OOM allows for state to leak, leading to impossible + move list inputs, tripping assertions. + + --HG-- + extra : rebase_source : 38c5d7afaa4b6394ced3266b90032b8e3bdba351 +--- + js/src/jit/MacroAssembler.h | 5 +++++ + js/src/jit/MoveResolver.cpp | 7 +++++++ + js/src/jit/MoveResolver.h | 3 +++ + js/src/jit/arm/MacroAssembler-arm.cpp | 2 +- + js/src/jit/mips32/MacroAssembler-mips32.cpp | 2 +- + js/src/jit/mips64/MacroAssembler-mips64.cpp | 2 +- + 6 files changed, 18 insertions(+), 3 deletions(-) + +diff --git js/src/jit/MacroAssembler.h js/src/jit/MacroAssembler.h +index b2cc464aafcc4..cef8c094b70c5 100644 +--- js/src/jit/MacroAssembler.h ++++ js/src/jit/MacroAssembler.h +@@ -334,6 +334,11 @@ class MacroAssembler : public MacroAssemblerSpecific + + public: + MoveResolver& moveResolver() { ++ // As an optimization, the MoveResolver is a persistent data structure ++ // shared between visitors in the CodeGenerator. This assertion ++ // checks that state is not leaking from visitor to visitor ++ // via an unresolved addMove(). ++ MOZ_ASSERT(moveResolver_.hasNoPendingMoves()); + return moveResolver_; + } + +diff --git js/src/jit/MoveResolver.cpp js/src/jit/MoveResolver.cpp +index bd71d0acea44d..d79af5053b79c 100644 +--- js/src/jit/MoveResolver.cpp ++++ js/src/jit/MoveResolver.cpp +@@ -7,6 +7,7 @@ + #include "jit/MoveResolver.h" + + #include "mozilla/Attributes.h" ++#include "mozilla/ScopeExit.h" + + #include "jit/MacroAssembler.h" + #include "jit/RegisterSets.h" +@@ -178,12 +179,18 @@ SplitIntoUpperHalf(const MoveOperand& move) + } + #endif + ++// Resolves the pending_ list to a list in orderedMoves_. + bool + MoveResolver::resolve() + { + resetState(); + orderedMoves_.clear(); + ++ // Upon return from this function, the pending_ list must be cleared. ++ auto clearPending = mozilla::MakeScopeExit([this]() { ++ pending_.clear(); ++ }); ++ + #ifdef JS_CODEGEN_ARM + // Some of ARM's double registers alias two of its single registers, + // but the algorithm below assumes that every register can participate +diff --git js/src/jit/MoveResolver.h js/src/jit/MoveResolver.h +index d9a9415488704..d094ee1307563 100644 +--- js/src/jit/MoveResolver.h ++++ js/src/jit/MoveResolver.h +@@ -333,6 +333,9 @@ class MoveResolver + uint32_t numCycles() const { + return numCycles_; + } ++ bool hasNoPendingMoves() const { ++ return pending_.empty(); ++ } + void setAllocator(TempAllocator& alloc) { + movePool_.setAllocator(alloc); + } +diff --git js/src/jit/arm/MacroAssembler-arm.cpp js/src/jit/arm/MacroAssembler-arm.cpp +index a3985f2c24d1f..86e86310cc129 100644 +--- js/src/jit/arm/MacroAssembler-arm.cpp ++++ js/src/jit/arm/MacroAssembler-arm.cpp +@@ -4593,7 +4593,7 @@ MacroAssembler::callWithABIPre(uint32_t* stackAdjust, bool callFromWasm) + + // Position all arguments. + { +- enoughMemory_ = enoughMemory_ && moveResolver_.resolve(); ++ enoughMemory_ &= moveResolver_.resolve(); + if (!enoughMemory_) + return; + +diff --git js/src/jit/mips32/MacroAssembler-mips32.cpp js/src/jit/mips32/MacroAssembler-mips32.cpp +index 8f2fec7948b75..ef0a9136f4e39 100644 +--- js/src/jit/mips32/MacroAssembler-mips32.cpp ++++ js/src/jit/mips32/MacroAssembler-mips32.cpp +@@ -2191,7 +2191,7 @@ MacroAssembler::callWithABIPre(uint32_t* stackAdjust, bool callFromWasm) + + // Position all arguments. + { +- enoughMemory_ = enoughMemory_ && moveResolver_.resolve(); ++ enoughMemory_ &= moveResolver_.resolve(); + if (!enoughMemory_) + return; + +diff --git js/src/jit/mips64/MacroAssembler-mips64.cpp js/src/jit/mips64/MacroAssembler-mips64.cpp +index c944b0427aaee..8eec6bac047e4 100644 +--- js/src/jit/mips64/MacroAssembler-mips64.cpp ++++ js/src/jit/mips64/MacroAssembler-mips64.cpp +@@ -2040,7 +2040,7 @@ MacroAssembler::callWithABIPre(uint32_t* stackAdjust, bool callFromWasm) + + // Position all arguments. + { +- enoughMemory_ = enoughMemory_ && moveResolver_.resolve(); ++ enoughMemory_ &= moveResolver_.resolve(); + if (!enoughMemory_) + return; + Copied: branches/2018Q2/www/waterfox/files/patch-bug1459162 (from r470343, head/www/waterfox/files/patch-bug1459162) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1459162 Fri May 18 23:55:05 2018 (r470348, copy of r470343, head/www/waterfox/files/patch-bug1459162) @@ -0,0 +1,71 @@ +commit 7588031f0792 +Author: Jonathan Kew +Date: Thu May 17 09:49:58 2018 +0100 + + Bug 1459162 - Update dimensions early in ClearTarget. r=lsalzman a=abillings +--- + dom/canvas/CanvasRenderingContext2D.cpp | 14 +++++++++----- + dom/canvas/CanvasRenderingContext2D.h | 5 ++++- + 2 files changed, 13 insertions(+), 6 deletions(-) + +diff --git dom/canvas/CanvasRenderingContext2D.cpp dom/canvas/CanvasRenderingContext2D.cpp +index 1e057824a4675..4501ffaff2d97 100644 +--- dom/canvas/CanvasRenderingContext2D.cpp ++++ dom/canvas/CanvasRenderingContext2D.cpp +@@ -1928,8 +1928,6 @@ CanvasRenderingContext2D::GetHeight() const + NS_IMETHODIMP + CanvasRenderingContext2D::SetDimensions(int32_t aWidth, int32_t aHeight) + { +- ClearTarget(); +- + // Zero sized surfaces can cause problems. + mZero = false; + if (aHeight == 0) { +@@ -1940,14 +1938,14 @@ CanvasRenderingContext2D::SetDimensions(int32_t aWidth, int32_t aHeight) + aWidth = 1; + mZero = true; + } +- mWidth = aWidth; +- mHeight = aHeight; ++ ++ ClearTarget(aWidth, aHeight); + + return NS_OK; + } + + void +-CanvasRenderingContext2D::ClearTarget() ++CanvasRenderingContext2D::ClearTarget(int32_t aWidth, int32_t aHeight) + { + Reset(); + +@@ -1955,6 +1953,12 @@ CanvasRenderingContext2D::ClearTarget() + + SetInitialState(); + ++ // Update dimensions only if new (strictly positive) values were passed. ++ if (aWidth > 0 && aHeight > 0) { ++ mWidth = aWidth; ++ mHeight = aHeight; ++ } ++ + // For vertical writing-mode, unless text-orientation is sideways, + // we'll modify the initial value of textBaseline to 'middle'. + RefPtr canvasStyle; +diff --git dom/canvas/CanvasRenderingContext2D.h dom/canvas/CanvasRenderingContext2D.h +index 6f0f6279e0cf5..c2ed098b053d0 100644 +--- dom/canvas/CanvasRenderingContext2D.h ++++ dom/canvas/CanvasRenderingContext2D.h +@@ -683,8 +683,11 @@ protected: + + /** + * Disposes an old target and prepares to lazily create a new target. ++ * ++ * Parameters are the new dimensions to be used, or if either is negative, ++ * existing dimensions will be left unchanged. + */ +- void ClearTarget(); ++ void ClearTarget(int32_t aWidth = -1, int32_t aHeight = -1); + + /* + * Returns the target to the buffer provider. i.e. this will queue a frame for From owner-svn-ports-branches@freebsd.org Fri May 18 23:56:04 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D743FEE0E91; Fri, 18 May 2018 23:56:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A9D8709D7; Fri, 18 May 2018 23:56:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D65E1F24B; Fri, 18 May 2018 23:56:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4INu4Ys094001; Fri, 18 May 2018 23:56:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4INu4sJ093999; Fri, 18 May 2018 23:56:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805182356.w4INu4sJ093999@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 18 May 2018 23:56:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470349 - branches/2018Q2/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/emulators/rpcs3 X-SVN-Commit-Revision: 470349 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 23:56:05 -0000 Author: jbeich Date: Fri May 18 23:56:03 2018 New Revision: 470349 URL: https://svnweb.freebsd.org/changeset/ports/470349 Log: MFH: r470345 emulators/rpcs3: update to 0.0.5.336 Changes: https://github.com/RPCS3/rpcs3/compare/67391322f...4e8ce7fac Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q2/emulators/rpcs3/Makefile branches/2018Q2/emulators/rpcs3/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q2/emulators/rpcs3/Makefile Fri May 18 23:55:05 2018 (r470348) +++ branches/2018Q2/emulators/rpcs3/Makefile Fri May 18 23:56:03 2018 (r470349) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-296 -DISTVERSIONSUFFIX= -g27dcb7774 +DISTVERSION= 0.0.5-336 +DISTVERSIONSUFFIX= -g4e8ce7fac CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q2/emulators/rpcs3/distinfo Fri May 18 23:55:05 2018 (r470348) +++ branches/2018Q2/emulators/rpcs3/distinfo Fri May 18 23:56:03 2018 (r470349) @@ -1,6 +1,6 @@ -TIMESTAMP = 1526513956 -SHA256 (RPCS3-rpcs3-v0.0.5-296-g27dcb7774_GH0.tar.gz) = 5a0d5934411cacc818487e35f9db931d06e04aa2e595a7a52367e05bf2728d1f -SIZE (RPCS3-rpcs3-v0.0.5-296-g27dcb7774_GH0.tar.gz) = 4848193 +TIMESTAMP = 1526671030 +SHA256 (RPCS3-rpcs3-v0.0.5-336-g4e8ce7fac_GH0.tar.gz) = 3f8d9e08c518410c9dabd169f4ff7188aad870a03e0c1d6b23127e40aea09348 +SIZE (RPCS3-rpcs3-v0.0.5-336-g4e8ce7fac_GH0.tar.gz) = 4851521 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-llvm-17ec6d78a73_GH0.tar.gz) = 4567d1d946429ce55d6c0480fad3b82874aad22c2b1928ac4d4ba5ba40338604