summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-09-16 23:08:21 +0000
committerB Stack <bgstack15@gmail.com>2020-09-16 23:08:21 +0000
commit36ef6fd4f38428329d0adbba325e403efc1552c5 (patch)
tree2e95be9c1a86bc2ba47491a50045bfdf3bbca290
parentMerge branch 'freefilesync-bump' into 'master' (diff)
parentsystem_sqlite=0 for el8 (diff)
downloadstackrpms-36ef6fd4f38428329d0adbba325e403efc1552c5.tar.gz
stackrpms-36ef6fd4f38428329d0adbba325e403efc1552c5.tar.bz2
stackrpms-36ef6fd4f38428329d0adbba325e403efc1552c5.zip
Merge branch 'waterfox-bump' into 'master'
Waterfox 2020.08 See merge request bgstack15/stackrpms!186
-rw-r--r--waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch38
-rw-r--r--waterfox/debian/changelog11
-rw-r--r--waterfox/debian/waterfox_devuan.dsc2
-rw-r--r--waterfox/waterfox.spec18
4 files changed, 64 insertions, 5 deletions
diff --git a/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch b/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch
new file mode 100644
index 0000000..f600f17
--- /dev/null
+++ b/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch
@@ -0,0 +1,38 @@
+From 26459c47f867dc1882fa7b87e32a9e8fc5e125e5 Mon Sep 17 00:00:00 2001
+From: Andrea Marchesini <amarchesini@mozilla.com>
+Date: Mon, 13 Jul 2020 08:34:07 +0000
+Subject: [PATCH] Bug 1650811 - Make Base64 compatible with ReadSegments() with
+ small buffers. r=asuth, a=RyanVM
+
+Differential Revision: https://phabricator.services.mozilla.com/D82522
+---
+ netwerk/test/gtest/moz.build | 1 +
+ xpcom/io/Base64.cpp | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/netwerk/test/gtest/moz.build b/netwerk/test/gtest/moz.build
+index 34a06c9943ac..fa7c90ff3bdd 100644
+--- a/netwerk/test/gtest/moz.build
++++ b/netwerk/test/gtest/moz.build
+@@ -6,6 +6,7 @@
+
+ UNIFIED_SOURCES += [
+ 'TestBase64Stream.cpp',
++ 'TestBufferedInputStream.cpp',
+ 'TestHeaders.cpp',
+ 'TestHttpAuthUtils.cpp',
+ 'TestProtocolProxyService.cpp',
+diff --git a/xpcom/io/Base64.cpp b/xpcom/io/Base64.cpp
+index 2f9f50b6528b..72ad070c4bf5 100644
+--- a/xpcom/io/Base64.cpp
++++ b/xpcom/io/Base64.cpp
+@@ -107,6 +107,9 @@ nsresult EncodeInputStream_Encoder(nsIInputStream* aStream, void* aClosure,
+ // We consume the whole data always.
+ *aWriteCount = aCount;
+
++ // We consume the whole data always.
++ *aWriteCount = aCount;
++
+ // If we have any data left from last time, encode it now.
+ uint32_t countRemaining = aCount;
+ const unsigned char* src = (const unsigned char*)aFromSegment;
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index cf17a67..8fe42fc 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,14 @@
+waterfox (2020.08-1+devuan) obs; urgency=medium
+
+ - Latest version
+ * Updated Network Security Services
+ * Set maximum supported TLS version to 1.3 and minimum to 1.2
+ * Updated SQLite library
+ * Improved <table> support
+ * Latest security advisories patched (best effort)
+
+ -- Ben Stack <bgstack15@gmail.com> Tue, 25 Aug 2020 14:26:28 -0400
+
waterfox (2020.07-1+devuan) obs; urgency=medium
- Latest version. No release notes yet on waterfox.net
diff --git a/waterfox/debian/waterfox_devuan.dsc b/waterfox/debian/waterfox_devuan.dsc
index 84f1627..9d4a57a 100644
--- a/waterfox/debian/waterfox_devuan.dsc
+++ b/waterfox/debian/waterfox_devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: waterfox
Binary: waterfox
Architecture: any
-Version: 2020.07.2-1+devuan
+Version: 2020.08-1+devuan
Maintainer: B Stack <bgstack15@gmail.com>
Homepage: https://www.waterfox.net/
Standards-Version: 4.1.4
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index e3444f4..3b3e5af 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -153,10 +153,14 @@ BuildRequires: %{scl_buildreq}
%if 0%{?rhel} >= 7
%global system_webp 0
%endif
+# added for 2020.08 because right now el8 does not have sqlite >= 3.30.1
+%if 0%{?rhel} == 8
+%global system_sqlite 0
+%endif
Summary: Waterfox Web browser
Name: waterfox
-Version: 2020.07.2
+Version: 2020.08
Release: 11%{?branch:.%{branch}}%{?gver}%{?dist}
URL: https://www.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -221,6 +225,7 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo
# Upstream updates/PRs/Reverts
#Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch
+Patch450: %{vc_url}/commit/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch#/%{name}-gh-26459c4.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -425,6 +430,8 @@ This package contains results of tests executed during build.
%patch419 -p1 -b .mozilla-1320560
%patch420 -p1 -b .mozilla-1389436
+%patch450 -p1 -b .gh26459c4 -R
+
# Debian extension patch
%patch500 -p1 -b .440908
@@ -457,9 +464,9 @@ done
# 3: no apply
# 4: uncertain
for i in \
- 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \
+ 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \
1401909 1419762 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \
- 1384121 1384701 1388744 1401063 1413143 1415883 1402442 1437450 \
+ 1384121 1384701 1388744 1401063 1406396 1413143 1415883 1402442 1437450 \
1447519
do
rm -f _patches/patch-bug${i}
@@ -1082,11 +1089,14 @@ fi
#---------------------------------------------------------------------
%changelog
-* Tue Aug 11 2020 B Stack <bgstack15@gmail.com> - 2020.07.2-11.classic
+* Wed Aug 26 2020 B Stack <bgstack15@gmail.com> - 2020.08-11.classic
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Tue Aug 25 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.08-1.classic
+- 2020.08
+
* Wed Aug 05 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.07.2-1.classic
- 2020.07.2
bgstack15