[arch-commits] Commit in seamonkey/repos (28 files)
Kyle Keen
kkeen at archlinux.org
Sun Oct 29 02:39:33 UTC 2017
Date: Sunday, October 29, 2017 @ 02:39:32
Author: kkeen
Revision: 264653
archrelease: copy trunk to community-i686, community-x86_64
Added:
seamonkey/repos/community-i686/PKGBUILD
(from rev 264652, seamonkey/trunk/PKGBUILD)
seamonkey/repos/community-i686/mozbug1323209.patch
(from rev 264652, seamonkey/trunk/mozbug1323209.patch)
seamonkey/repos/community-i686/mozbug1329272.patch
(from rev 264652, seamonkey/trunk/mozbug1329272.patch)
seamonkey/repos/community-i686/mozconfig
(from rev 264652, seamonkey/trunk/mozconfig)
seamonkey/repos/community-i686/no-crmf.diff
(from rev 264652, seamonkey/trunk/no-crmf.diff)
seamonkey/repos/community-i686/rhbz-966424.patch
(from rev 264652, seamonkey/trunk/rhbz-966424.patch)
seamonkey/repos/community-i686/seamonkey-2.0-lang.patch
(from rev 264652, seamonkey/trunk/seamonkey-2.0-lang.patch)
seamonkey/repos/community-x86_64/PKGBUILD
(from rev 264652, seamonkey/trunk/PKGBUILD)
seamonkey/repos/community-x86_64/mozbug1323209.patch
(from rev 264652, seamonkey/trunk/mozbug1323209.patch)
seamonkey/repos/community-x86_64/mozbug1329272.patch
(from rev 264652, seamonkey/trunk/mozbug1329272.patch)
seamonkey/repos/community-x86_64/mozconfig
(from rev 264652, seamonkey/trunk/mozconfig)
seamonkey/repos/community-x86_64/no-crmf.diff
(from rev 264652, seamonkey/trunk/no-crmf.diff)
seamonkey/repos/community-x86_64/rhbz-966424.patch
(from rev 264652, seamonkey/trunk/rhbz-966424.patch)
seamonkey/repos/community-x86_64/seamonkey-2.0-lang.patch
(from rev 264652, seamonkey/trunk/seamonkey-2.0-lang.patch)
Deleted:
seamonkey/repos/community-i686/PKGBUILD
seamonkey/repos/community-i686/mozbug1323209.patch
seamonkey/repos/community-i686/mozbug1329272.patch
seamonkey/repos/community-i686/mozconfig
seamonkey/repos/community-i686/no-crmf.diff
seamonkey/repos/community-i686/rhbz-966424.patch
seamonkey/repos/community-i686/seamonkey-2.0-lang.patch
seamonkey/repos/community-x86_64/PKGBUILD
seamonkey/repos/community-x86_64/mozbug1323209.patch
seamonkey/repos/community-x86_64/mozbug1329272.patch
seamonkey/repos/community-x86_64/mozconfig
seamonkey/repos/community-x86_64/no-crmf.diff
seamonkey/repos/community-x86_64/rhbz-966424.patch
seamonkey/repos/community-x86_64/seamonkey-2.0-lang.patch
-------------------------------------------+
/PKGBUILD | 200 ++++++++++++++++++++++++++++
/mozbug1323209.patch | 70 +++++++++
/mozbug1329272.patch | 62 ++++++++
/mozconfig | 78 ++++++++++
/no-crmf.diff | 30 ++++
/rhbz-966424.patch | 46 ++++++
/seamonkey-2.0-lang.patch | 22 +++
community-i686/PKGBUILD | 100 --------------
community-i686/mozbug1323209.patch | 35 ----
community-i686/mozbug1329272.patch | 31 ----
community-i686/mozconfig | 36 -----
community-i686/no-crmf.diff | 15 --
community-i686/rhbz-966424.patch | 23 ---
community-i686/seamonkey-2.0-lang.patch | 11 -
community-x86_64/PKGBUILD | 100 --------------
community-x86_64/mozbug1323209.patch | 35 ----
community-x86_64/mozbug1329272.patch | 31 ----
community-x86_64/mozconfig | 36 -----
community-x86_64/no-crmf.diff | 15 --
community-x86_64/rhbz-966424.patch | 23 ---
community-x86_64/seamonkey-2.0-lang.patch | 11 -
21 files changed, 508 insertions(+), 502 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-i686/PKGBUILD 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,100 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-
-pkgname=seamonkey
-pkgver=2.46
-pkgrel=4
-pkgdesc="SeaMonkey internet suite"
-arch=('i686' 'x86_64')
-license=('MPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification' 'libpulse' 'icu' 'gconf')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake' 'python3' 'gst-plugins-base')
-optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing'
- 'gst-plugins-bad: aac, vp8 and opus decoding'
- 'gst-plugins-good: webm and mp4 demuxing'
- 'gst-plugins-ugly: h.264 decoding')
-url="http://www.seamonkey-project.org/"
-source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz
- mozconfig
- seamonkey-2.0-lang.patch
- rhbz-966424.patch
- mozbug1323209.patch
- mozbug1329272.patch
- no-crmf.diff)
-sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
- '8d3bd1c0f1101a382cf7861aff4a94bad9834ecfc0b240e43aca49d219a80d13'
- 'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
- '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
- '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
- '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b'
- 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb')
-
-prepare() {
- cd "$pkgname-$pkgver"
- cp ../mozconfig .mozconfig
- #patch -Np1 -i ../seamonkey-2.0-lang.patch
-
- # FS#48404
- #echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig
-
- # https://bugs.archlinux.org/task/41689
- patch -Np1 -d mozilla -i ../../rhbz-966424.patch
-
- # Support NSS 3.28
- patch -Np1 -d mozilla -i ../../mozbug1323209.patch
-
- # Bugfix for icu detection
- patch -Np1 -d mozilla -i ../../mozbug1329272.patch
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed -i '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' suite/installer/Makefile.in
-
- # configure script misdetects the preprocessor without an optimization level
- sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
- # 2.26 build fix from wgnie (blfs ch 37)
- sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
-
- # work around from FS#54395
- patch -Np1 -d mozilla -i ../../no-crmf.diff
- sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
- export MOZ_MAKE_FLAGS="$MAKEFLAGS"
- unset MAKEFLAGS
- unset CPPFLAGS
-
- # GCC 6
- CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
- CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-
- make -j1 -f client.mk build
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make -j1 -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
-
- rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation}
- ln -s /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries"
- ln -s /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation"
-
- install -Dm644 suite/branding/nightly/icons/gtk/seamonkey.png \
- "$pkgdir/usr/share/pixmaps/seamonkey.png"
-
- install -Dm644 mozilla/toolkit/mozapps/installer/linux/rpm/mozilla.desktop \
- "$pkgdir/usr/share/applications/seamonkey.desktop"
- sed -i 's/@MOZ_APP_DISPLAYNAME@/SeaMonkey internet suite/' \
- "$pkgdir/usr/share/applications/seamonkey.desktop"
- sed -i 's/@MOZ_APP_NAME@/seamonkey/' "$pkgdir/usr/share/applications/seamonkey.desktop"
-
- rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
- #rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl}
-}
-
Copied: seamonkey/repos/community-i686/PKGBUILD (from rev 264652, seamonkey/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+
+pkgname=seamonkey
+pkgver=2.48
+pkgrel=1
+pkgdesc="SeaMonkey internet suite"
+arch=('i686' 'x86_64')
+license=('MPL')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification' 'libpulse' 'icu' 'gconf')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake' 'python3' 'gst-plugins-base')
+optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing'
+ 'gst-plugins-bad: aac, vp8 and opus decoding'
+ 'gst-plugins-good: webm and mp4 demuxing'
+ 'gst-plugins-ugly: h.264 decoding')
+url="http://www.seamonkey-project.org/"
+source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz
+ mozconfig
+ seamonkey-2.0-lang.patch
+ rhbz-966424.patch
+ mozbug1323209.patch
+ mozbug1329272.patch
+ no-crmf.diff)
+sha256sums=('6f9a07c86ba6474b44e5083f9d1315d01778c097937f7da4c5701debffab2631'
+ 'da8cc2001ae77f2b357d267f9f8d3d7e48c7d37b99ff3fb73fbbfc0b9329744a'
+ 'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
+ '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
+ '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
+ '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b'
+ 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ cp ../mozconfig .mozconfig
+ #patch -Np1 -i ../seamonkey-2.0-lang.patch
+
+ # FS#48404
+ #echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig
+
+ # https://bugs.archlinux.org/task/41689
+ #patch -Np1 -d mozilla -i ../../rhbz-966424.patch
+
+ # Support NSS 3.28
+ #patch -Np1 -d mozilla -i ../../mozbug1323209.patch
+
+ # Bugfix for icu detection
+ #patch -Np1 -d mozilla -i ../../mozbug1329272.patch
+
+ # Don't exit with error when some libs are missing which we have in
+ # system.
+ sed -i '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' suite/installer/Makefile.in
+
+ # configure script misdetects the preprocessor without an optimization level
+ sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+
+ # 2.26 build fix from wgnie (blfs ch 37)
+ sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
+
+ # work around from FS#54395
+ patch -Np1 -d mozilla -i ../../no-crmf.diff
+ sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
+ export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ unset MAKEFLAGS
+ unset CPPFLAGS
+
+ # GCC 6
+ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+ CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+
+ make -j1 -f client.mk build
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make -j1 -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
+
+ rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation}
+ ln -s /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries"
+ ln -s /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation"
+
+ install -Dm644 suite/branding/nightly/icons/gtk/seamonkey.png \
+ "$pkgdir/usr/share/pixmaps/seamonkey.png"
+
+ install -Dm644 mozilla/toolkit/mozapps/installer/linux/rpm/mozilla.desktop \
+ "$pkgdir/usr/share/applications/seamonkey.desktop"
+ sed -i 's/@MOZ_APP_DISPLAYNAME@/SeaMonkey internet suite/' \
+ "$pkgdir/usr/share/applications/seamonkey.desktop"
+ sed -i 's/@MOZ_APP_NAME@/seamonkey/' "$pkgdir/usr/share/applications/seamonkey.desktop"
+
+ rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
+ #rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl}
+}
+
Deleted: community-i686/mozbug1323209.patch
===================================================================
--- community-i686/mozbug1323209.patch 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-i686/mozbug1323209.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Franziskus Kiefer <franziskuskiefer at gmail.com>
-# Date 1469717280 -7200
-# Node ID 361ac226da2a83516db8d4e4c5b41a69b3ba754f
-# Parent 5d5d3ef04f3f77bb95616f56c129256a89f57831
-Bug 1290037 - Update keybits in H2, r=mt
-
-MozReview-Commit-ID: 35oWoDMqe1Y
-
-diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
---- a/netwerk/protocol/http/Http2Session.cpp
-+++ b/netwerk/protocol/http/Http2Session.cpp
-@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile()
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
- }
-
- uint32_t keybits = ssl->GetKEAKeyBits();
- if (kea == ssl_kea_dh && keybits < 2048) {
- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
- this, keybits));
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
-- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
-- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
-+ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
-+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
- this, keybits));
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
- }
-
- int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
- LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
- this, macAlgorithm));
- if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {
-
Copied: seamonkey/repos/community-i686/mozbug1323209.patch (from rev 264652, seamonkey/trunk/mozbug1323209.patch)
===================================================================
--- community-i686/mozbug1323209.patch (rev 0)
+++ community-i686/mozbug1323209.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Franziskus Kiefer <franziskuskiefer at gmail.com>
+# Date 1469717280 -7200
+# Node ID 361ac226da2a83516db8d4e4c5b41a69b3ba754f
+# Parent 5d5d3ef04f3f77bb95616f56c129256a89f57831
+Bug 1290037 - Update keybits in H2, r=mt
+
+MozReview-Commit-ID: 35oWoDMqe1Y
+
+diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
+--- a/netwerk/protocol/http/Http2Session.cpp
++++ b/netwerk/protocol/http/Http2Session.cpp
+@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile()
+ RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+ }
+
+ uint32_t keybits = ssl->GetKEAKeyBits();
+ if (kea == ssl_kea_dh && keybits < 2048) {
+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
+ this, keybits));
+ RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
+- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
+ this, keybits));
+ RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+ }
+
+ int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
+ LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
+ this, macAlgorithm));
+ if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {
+
Deleted: community-i686/mozbug1329272.patch
===================================================================
--- community-i686/mozbug1329272.patch 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-i686/mozbug1329272.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,31 +0,0 @@
-
-# HG changeset patch
-# User Daniel Stenberg <daniel at haxx.se>
-# Date 1484000700 -3600
-# Node ID ebcbf47a83e7d3b89460cf1c991b6be5a79a967b
-# Parent 0759511f24e1b8d42acf5e9612f3ab91715842c2
-Bug 1329272 - add bracket for sed 4.3 compliance, r=glandium
-
-diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
---- a/build/autoconf/icu.m4
-+++ b/build/autoconf/icu.m4
-@@ -64,17 +64,17 @@ if test -n "$USE_ICU"; then
- icudir="$_topsrcdir/intl/icu/source"
- if test ! -d "$icudir"; then
- icudir="$_topsrcdir/../../intl/icu/source"
- if test ! -d "$icudir"; then
- AC_MSG_ERROR([Cannot find the ICU directory])
- fi
- fi
-
-- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-+ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
- if test x"$version" = x; then
- AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
- fi
- MOZ_ICU_VERSION="$version"
-
- # TODO: the l is actually endian-dependent
- # We could make this set as 'l' or 'b' for little or big, respectively,
- # but we'd need to check in a big-endian version of the file.
-
Copied: seamonkey/repos/community-i686/mozbug1329272.patch (from rev 264652, seamonkey/trunk/mozbug1329272.patch)
===================================================================
--- community-i686/mozbug1329272.patch (rev 0)
+++ community-i686/mozbug1329272.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User Daniel Stenberg <daniel at haxx.se>
+# Date 1484000700 -3600
+# Node ID ebcbf47a83e7d3b89460cf1c991b6be5a79a967b
+# Parent 0759511f24e1b8d42acf5e9612f3ab91715842c2
+Bug 1329272 - add bracket for sed 4.3 compliance, r=glandium
+
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
+--- a/build/autoconf/icu.m4
++++ b/build/autoconf/icu.m4
+@@ -64,17 +64,17 @@ if test -n "$USE_ICU"; then
+ icudir="$_topsrcdir/intl/icu/source"
+ if test ! -d "$icudir"; then
+ icudir="$_topsrcdir/../../intl/icu/source"
+ if test ! -d "$icudir"; then
+ AC_MSG_ERROR([Cannot find the ICU directory])
+ fi
+ fi
+
+- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+ if test x"$version" = x; then
+ AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+ fi
+ MOZ_ICU_VERSION="$version"
+
+ # TODO: the l is actually endian-dependent
+ # We could make this set as 'l' or 'b' for little or big, respectively,
+ # but we'd need to check in a big-endian version of the file.
+
Deleted: community-i686/mozconfig
===================================================================
--- community-i686/mozconfig 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-i686/mozconfig 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-#ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-ac_add_options --enable-system-pixman
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-gio
-#ac_add_options --disable-gstreamer
-ac_add_options --enable-pulseaudio
-
-
-#ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-#ac_add_options --disable-installer
-
-export MOZILLA_OFFICIAL=1
Copied: seamonkey/repos/community-i686/mozconfig (from rev 264652, seamonkey/trunk/mozconfig)
===================================================================
--- community-i686/mozconfig (rev 0)
+++ community-i686/mozconfig 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,39 @@
+ac_add_options --enable-application=suite
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+#ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --with-pthreads
+ac_add_options --enable-system-pixman
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-gio
+#ac_add_options --disable-gstreamer
+ac_add_options --enable-pulseaudio
+
+ac_add_options --enable-optimize="-O2"
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+
+#ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+#ac_add_options --disable-installer
+
+export MOZILLA_OFFICIAL=1
Deleted: community-i686/no-crmf.diff
===================================================================
--- community-i686/no-crmf.diff 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-i686/no-crmf.diff 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,15 +0,0 @@
-diff --git i/old-configure.in w/old-configure.in
-index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
---- i/old-configure.in
-+++ w/old-configure.in
-@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
- AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
- fi
-
--if test -n "$MOZ_SYSTEM_NSS"; then
-- NSS_LIBS="$NSS_LIBS -lcrmf"
--else
-+if test -z "$MOZ_SYSTEM_NSS"; then
- NSS_CFLAGS="-I${DIST}/include/nss"
- case "${OS_ARCH}" in
- # Only few platforms have been tested with GYP
Copied: seamonkey/repos/community-i686/no-crmf.diff (from rev 264652, seamonkey/trunk/no-crmf.diff)
===================================================================
--- community-i686/no-crmf.diff (rev 0)
+++ community-i686/no-crmf.diff 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,15 @@
+diff --git i/old-configure.in w/old-configure.in
+index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
+--- i/old-configure.in
++++ w/old-configure.in
+@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
+ AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+
+-if test -n "$MOZ_SYSTEM_NSS"; then
+- NSS_LIBS="$NSS_LIBS -lcrmf"
+-else
++if test -z "$MOZ_SYSTEM_NSS"; then
+ NSS_CFLAGS="-I${DIST}/include/nss"
+ case "${OS_ARCH}" in
+ # Only few platforms have been tested with GYP
Deleted: community-i686/rhbz-966424.patch
===================================================================
--- community-i686/rhbz-966424.patch 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-i686/rhbz-966424.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,23 +0,0 @@
---- a/toolkit/modules/CertUtils.jsm
-+++ b/toolkit/modules/CertUtils.jsm
-@@ -170,17 +170,19 @@ this.checkCert =
- issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
- var tokenNames = issuerCert.getAllTokenNames({});
-
- if (!tokenNames || !tokenNames.some(isBuiltinToken))
- throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
- }
-
- function isBuiltinToken(tokenName) {
-- return tokenName == "Builtin Object Token";
-+ return tokenName == "Builtin Object Token" ||
-+ tokenName == "Default Trust" ||
-+ tokenName == "System Trust";
- }
-
- /**
- * This class implements nsIBadCertListener. Its job is to prevent "bad cert"
- * security dialogs from being shown to the user. It is better to simply fail
- * if the certificate is bad. See bug 304286.
- *
- * @param aAllowNonBuiltInCerts (optional)
Copied: seamonkey/repos/community-i686/rhbz-966424.patch (from rev 264652, seamonkey/trunk/rhbz-966424.patch)
===================================================================
--- community-i686/rhbz-966424.patch (rev 0)
+++ community-i686/rhbz-966424.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,23 @@
+--- a/toolkit/modules/CertUtils.jsm
++++ b/toolkit/modules/CertUtils.jsm
+@@ -170,17 +170,19 @@ this.checkCert =
+ issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
+ var tokenNames = issuerCert.getAllTokenNames({});
+
+ if (!tokenNames || !tokenNames.some(isBuiltinToken))
+ throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
+ }
+
+ function isBuiltinToken(tokenName) {
+- return tokenName == "Builtin Object Token";
++ return tokenName == "Builtin Object Token" ||
++ tokenName == "Default Trust" ||
++ tokenName == "System Trust";
+ }
+
+ /**
+ * This class implements nsIBadCertListener. Its job is to prevent "bad cert"
+ * security dialogs from being shown to the user. It is better to simply fail
+ * if the certificate is bad. See bug 304286.
+ *
+ * @param aAllowNonBuiltInCerts (optional)
Deleted: community-i686/seamonkey-2.0-lang.patch
===================================================================
--- community-i686/seamonkey-2.0-lang.patch 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-i686/seamonkey-2.0-lang.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector", "chrome://global/locale/intl.properties");
- pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS", false);
-+pref("intl.locale.matchOS", true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
Copied: seamonkey/repos/community-i686/seamonkey-2.0-lang.patch (from rev 264652, seamonkey/trunk/seamonkey-2.0-lang.patch)
===================================================================
--- community-i686/seamonkey-2.0-lang.patch (rev 0)
+++ community-i686/seamonkey-2.0-lang.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,11 @@
+--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200
++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200
+@@ -890,7 +890,7 @@
+ pref("intl.charset.detector", "chrome://global/locale/intl.properties");
+ pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
+ pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties");
+-pref("intl.locale.matchOS", false);
++pref("intl.locale.matchOS", true);
+ // fallback charset list for Unicode conversion (converting from Unicode)
+ // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
+ // for ISO-8859-1
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-x86_64/PKGBUILD 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,100 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-
-pkgname=seamonkey
-pkgver=2.46
-pkgrel=4
-pkgdesc="SeaMonkey internet suite"
-arch=('i686' 'x86_64')
-license=('MPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification' 'libpulse' 'icu' 'gconf')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake' 'python3' 'gst-plugins-base')
-optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing'
- 'gst-plugins-bad: aac, vp8 and opus decoding'
- 'gst-plugins-good: webm and mp4 demuxing'
- 'gst-plugins-ugly: h.264 decoding')
-url="http://www.seamonkey-project.org/"
-source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz
- mozconfig
- seamonkey-2.0-lang.patch
- rhbz-966424.patch
- mozbug1323209.patch
- mozbug1329272.patch
- no-crmf.diff)
-sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
- '8d3bd1c0f1101a382cf7861aff4a94bad9834ecfc0b240e43aca49d219a80d13'
- 'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
- '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
- '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
- '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b'
- 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb')
-
-prepare() {
- cd "$pkgname-$pkgver"
- cp ../mozconfig .mozconfig
- #patch -Np1 -i ../seamonkey-2.0-lang.patch
-
- # FS#48404
- #echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig
-
- # https://bugs.archlinux.org/task/41689
- patch -Np1 -d mozilla -i ../../rhbz-966424.patch
-
- # Support NSS 3.28
- patch -Np1 -d mozilla -i ../../mozbug1323209.patch
-
- # Bugfix for icu detection
- patch -Np1 -d mozilla -i ../../mozbug1329272.patch
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed -i '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' suite/installer/Makefile.in
-
- # configure script misdetects the preprocessor without an optimization level
- sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
- # 2.26 build fix from wgnie (blfs ch 37)
- sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
-
- # work around from FS#54395
- patch -Np1 -d mozilla -i ../../no-crmf.diff
- sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
- export MOZ_MAKE_FLAGS="$MAKEFLAGS"
- unset MAKEFLAGS
- unset CPPFLAGS
-
- # GCC 6
- CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
- CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-
- make -j1 -f client.mk build
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make -j1 -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
-
- rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation}
- ln -s /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries"
- ln -s /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation"
-
- install -Dm644 suite/branding/nightly/icons/gtk/seamonkey.png \
- "$pkgdir/usr/share/pixmaps/seamonkey.png"
-
- install -Dm644 mozilla/toolkit/mozapps/installer/linux/rpm/mozilla.desktop \
- "$pkgdir/usr/share/applications/seamonkey.desktop"
- sed -i 's/@MOZ_APP_DISPLAYNAME@/SeaMonkey internet suite/' \
- "$pkgdir/usr/share/applications/seamonkey.desktop"
- sed -i 's/@MOZ_APP_NAME@/seamonkey/' "$pkgdir/usr/share/applications/seamonkey.desktop"
-
- rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
- #rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl}
-}
-
Copied: seamonkey/repos/community-x86_64/PKGBUILD (from rev 264652, seamonkey/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+
+pkgname=seamonkey
+pkgver=2.48
+pkgrel=1
+pkgdesc="SeaMonkey internet suite"
+arch=('i686' 'x86_64')
+license=('MPL')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification' 'libpulse' 'icu' 'gconf')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake' 'python3' 'gst-plugins-base')
+optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing'
+ 'gst-plugins-bad: aac, vp8 and opus decoding'
+ 'gst-plugins-good: webm and mp4 demuxing'
+ 'gst-plugins-ugly: h.264 decoding')
+url="http://www.seamonkey-project.org/"
+source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz
+ mozconfig
+ seamonkey-2.0-lang.patch
+ rhbz-966424.patch
+ mozbug1323209.patch
+ mozbug1329272.patch
+ no-crmf.diff)
+sha256sums=('6f9a07c86ba6474b44e5083f9d1315d01778c097937f7da4c5701debffab2631'
+ 'da8cc2001ae77f2b357d267f9f8d3d7e48c7d37b99ff3fb73fbbfc0b9329744a'
+ 'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
+ '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
+ '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
+ '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b'
+ 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ cp ../mozconfig .mozconfig
+ #patch -Np1 -i ../seamonkey-2.0-lang.patch
+
+ # FS#48404
+ #echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig
+
+ # https://bugs.archlinux.org/task/41689
+ #patch -Np1 -d mozilla -i ../../rhbz-966424.patch
+
+ # Support NSS 3.28
+ #patch -Np1 -d mozilla -i ../../mozbug1323209.patch
+
+ # Bugfix for icu detection
+ #patch -Np1 -d mozilla -i ../../mozbug1329272.patch
+
+ # Don't exit with error when some libs are missing which we have in
+ # system.
+ sed -i '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' suite/installer/Makefile.in
+
+ # configure script misdetects the preprocessor without an optimization level
+ sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+
+ # 2.26 build fix from wgnie (blfs ch 37)
+ sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
+
+ # work around from FS#54395
+ patch -Np1 -d mozilla -i ../../no-crmf.diff
+ sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
+ export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ unset MAKEFLAGS
+ unset CPPFLAGS
+
+ # GCC 6
+ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+ CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+
+ make -j1 -f client.mk build
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make -j1 -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
+
+ rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation}
+ ln -s /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries"
+ ln -s /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation"
+
+ install -Dm644 suite/branding/nightly/icons/gtk/seamonkey.png \
+ "$pkgdir/usr/share/pixmaps/seamonkey.png"
+
+ install -Dm644 mozilla/toolkit/mozapps/installer/linux/rpm/mozilla.desktop \
+ "$pkgdir/usr/share/applications/seamonkey.desktop"
+ sed -i 's/@MOZ_APP_DISPLAYNAME@/SeaMonkey internet suite/' \
+ "$pkgdir/usr/share/applications/seamonkey.desktop"
+ sed -i 's/@MOZ_APP_NAME@/seamonkey/' "$pkgdir/usr/share/applications/seamonkey.desktop"
+
+ rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
+ #rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl}
+}
+
Deleted: community-x86_64/mozbug1323209.patch
===================================================================
--- community-x86_64/mozbug1323209.patch 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-x86_64/mozbug1323209.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Franziskus Kiefer <franziskuskiefer at gmail.com>
-# Date 1469717280 -7200
-# Node ID 361ac226da2a83516db8d4e4c5b41a69b3ba754f
-# Parent 5d5d3ef04f3f77bb95616f56c129256a89f57831
-Bug 1290037 - Update keybits in H2, r=mt
-
-MozReview-Commit-ID: 35oWoDMqe1Y
-
-diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
---- a/netwerk/protocol/http/Http2Session.cpp
-+++ b/netwerk/protocol/http/Http2Session.cpp
-@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile()
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
- }
-
- uint32_t keybits = ssl->GetKEAKeyBits();
- if (kea == ssl_kea_dh && keybits < 2048) {
- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
- this, keybits));
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
-- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
-- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
-+ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
-+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
- this, keybits));
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
- }
-
- int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
- LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
- this, macAlgorithm));
- if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {
-
Copied: seamonkey/repos/community-x86_64/mozbug1323209.patch (from rev 264652, seamonkey/trunk/mozbug1323209.patch)
===================================================================
--- community-x86_64/mozbug1323209.patch (rev 0)
+++ community-x86_64/mozbug1323209.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Franziskus Kiefer <franziskuskiefer at gmail.com>
+# Date 1469717280 -7200
+# Node ID 361ac226da2a83516db8d4e4c5b41a69b3ba754f
+# Parent 5d5d3ef04f3f77bb95616f56c129256a89f57831
+Bug 1290037 - Update keybits in H2, r=mt
+
+MozReview-Commit-ID: 35oWoDMqe1Y
+
+diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
+--- a/netwerk/protocol/http/Http2Session.cpp
++++ b/netwerk/protocol/http/Http2Session.cpp
+@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile()
+ RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+ }
+
+ uint32_t keybits = ssl->GetKEAKeyBits();
+ if (kea == ssl_kea_dh && keybits < 2048) {
+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
+ this, keybits));
+ RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
+- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
+ this, keybits));
+ RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+ }
+
+ int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
+ LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
+ this, macAlgorithm));
+ if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {
+
Deleted: community-x86_64/mozbug1329272.patch
===================================================================
--- community-x86_64/mozbug1329272.patch 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-x86_64/mozbug1329272.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,31 +0,0 @@
-
-# HG changeset patch
-# User Daniel Stenberg <daniel at haxx.se>
-# Date 1484000700 -3600
-# Node ID ebcbf47a83e7d3b89460cf1c991b6be5a79a967b
-# Parent 0759511f24e1b8d42acf5e9612f3ab91715842c2
-Bug 1329272 - add bracket for sed 4.3 compliance, r=glandium
-
-diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
---- a/build/autoconf/icu.m4
-+++ b/build/autoconf/icu.m4
-@@ -64,17 +64,17 @@ if test -n "$USE_ICU"; then
- icudir="$_topsrcdir/intl/icu/source"
- if test ! -d "$icudir"; then
- icudir="$_topsrcdir/../../intl/icu/source"
- if test ! -d "$icudir"; then
- AC_MSG_ERROR([Cannot find the ICU directory])
- fi
- fi
-
-- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-+ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
- if test x"$version" = x; then
- AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
- fi
- MOZ_ICU_VERSION="$version"
-
- # TODO: the l is actually endian-dependent
- # We could make this set as 'l' or 'b' for little or big, respectively,
- # but we'd need to check in a big-endian version of the file.
-
Copied: seamonkey/repos/community-x86_64/mozbug1329272.patch (from rev 264652, seamonkey/trunk/mozbug1329272.patch)
===================================================================
--- community-x86_64/mozbug1329272.patch (rev 0)
+++ community-x86_64/mozbug1329272.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User Daniel Stenberg <daniel at haxx.se>
+# Date 1484000700 -3600
+# Node ID ebcbf47a83e7d3b89460cf1c991b6be5a79a967b
+# Parent 0759511f24e1b8d42acf5e9612f3ab91715842c2
+Bug 1329272 - add bracket for sed 4.3 compliance, r=glandium
+
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
+--- a/build/autoconf/icu.m4
++++ b/build/autoconf/icu.m4
+@@ -64,17 +64,17 @@ if test -n "$USE_ICU"; then
+ icudir="$_topsrcdir/intl/icu/source"
+ if test ! -d "$icudir"; then
+ icudir="$_topsrcdir/../../intl/icu/source"
+ if test ! -d "$icudir"; then
+ AC_MSG_ERROR([Cannot find the ICU directory])
+ fi
+ fi
+
+- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+ if test x"$version" = x; then
+ AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+ fi
+ MOZ_ICU_VERSION="$version"
+
+ # TODO: the l is actually endian-dependent
+ # We could make this set as 'l' or 'b' for little or big, respectively,
+ # but we'd need to check in a big-endian version of the file.
+
Deleted: community-x86_64/mozconfig
===================================================================
--- community-x86_64/mozconfig 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-x86_64/mozconfig 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-#ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-ac_add_options --enable-system-pixman
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-gio
-#ac_add_options --disable-gstreamer
-ac_add_options --enable-pulseaudio
-
-
-#ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-#ac_add_options --disable-installer
-
-export MOZILLA_OFFICIAL=1
Copied: seamonkey/repos/community-x86_64/mozconfig (from rev 264652, seamonkey/trunk/mozconfig)
===================================================================
--- community-x86_64/mozconfig (rev 0)
+++ community-x86_64/mozconfig 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,39 @@
+ac_add_options --enable-application=suite
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+#ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --with-pthreads
+ac_add_options --enable-system-pixman
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-gio
+#ac_add_options --disable-gstreamer
+ac_add_options --enable-pulseaudio
+
+ac_add_options --enable-optimize="-O2"
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+
+#ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+#ac_add_options --disable-installer
+
+export MOZILLA_OFFICIAL=1
Deleted: community-x86_64/no-crmf.diff
===================================================================
--- community-x86_64/no-crmf.diff 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-x86_64/no-crmf.diff 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,15 +0,0 @@
-diff --git i/old-configure.in w/old-configure.in
-index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
---- i/old-configure.in
-+++ w/old-configure.in
-@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
- AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
- fi
-
--if test -n "$MOZ_SYSTEM_NSS"; then
-- NSS_LIBS="$NSS_LIBS -lcrmf"
--else
-+if test -z "$MOZ_SYSTEM_NSS"; then
- NSS_CFLAGS="-I${DIST}/include/nss"
- case "${OS_ARCH}" in
- # Only few platforms have been tested with GYP
Copied: seamonkey/repos/community-x86_64/no-crmf.diff (from rev 264652, seamonkey/trunk/no-crmf.diff)
===================================================================
--- community-x86_64/no-crmf.diff (rev 0)
+++ community-x86_64/no-crmf.diff 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,15 @@
+diff --git i/old-configure.in w/old-configure.in
+index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
+--- i/old-configure.in
++++ w/old-configure.in
+@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
+ AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+
+-if test -n "$MOZ_SYSTEM_NSS"; then
+- NSS_LIBS="$NSS_LIBS -lcrmf"
+-else
++if test -z "$MOZ_SYSTEM_NSS"; then
+ NSS_CFLAGS="-I${DIST}/include/nss"
+ case "${OS_ARCH}" in
+ # Only few platforms have been tested with GYP
Deleted: community-x86_64/rhbz-966424.patch
===================================================================
--- community-x86_64/rhbz-966424.patch 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-x86_64/rhbz-966424.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,23 +0,0 @@
---- a/toolkit/modules/CertUtils.jsm
-+++ b/toolkit/modules/CertUtils.jsm
-@@ -170,17 +170,19 @@ this.checkCert =
- issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
- var tokenNames = issuerCert.getAllTokenNames({});
-
- if (!tokenNames || !tokenNames.some(isBuiltinToken))
- throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
- }
-
- function isBuiltinToken(tokenName) {
-- return tokenName == "Builtin Object Token";
-+ return tokenName == "Builtin Object Token" ||
-+ tokenName == "Default Trust" ||
-+ tokenName == "System Trust";
- }
-
- /**
- * This class implements nsIBadCertListener. Its job is to prevent "bad cert"
- * security dialogs from being shown to the user. It is better to simply fail
- * if the certificate is bad. See bug 304286.
- *
- * @param aAllowNonBuiltInCerts (optional)
Copied: seamonkey/repos/community-x86_64/rhbz-966424.patch (from rev 264652, seamonkey/trunk/rhbz-966424.patch)
===================================================================
--- community-x86_64/rhbz-966424.patch (rev 0)
+++ community-x86_64/rhbz-966424.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,23 @@
+--- a/toolkit/modules/CertUtils.jsm
++++ b/toolkit/modules/CertUtils.jsm
+@@ -170,17 +170,19 @@ this.checkCert =
+ issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
+ var tokenNames = issuerCert.getAllTokenNames({});
+
+ if (!tokenNames || !tokenNames.some(isBuiltinToken))
+ throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
+ }
+
+ function isBuiltinToken(tokenName) {
+- return tokenName == "Builtin Object Token";
++ return tokenName == "Builtin Object Token" ||
++ tokenName == "Default Trust" ||
++ tokenName == "System Trust";
+ }
+
+ /**
+ * This class implements nsIBadCertListener. Its job is to prevent "bad cert"
+ * security dialogs from being shown to the user. It is better to simply fail
+ * if the certificate is bad. See bug 304286.
+ *
+ * @param aAllowNonBuiltInCerts (optional)
Deleted: community-x86_64/seamonkey-2.0-lang.patch
===================================================================
--- community-x86_64/seamonkey-2.0-lang.patch 2017-10-29 02:38:50 UTC (rev 264652)
+++ community-x86_64/seamonkey-2.0-lang.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector", "chrome://global/locale/intl.properties");
- pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS", false);
-+pref("intl.locale.matchOS", true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
Copied: seamonkey/repos/community-x86_64/seamonkey-2.0-lang.patch (from rev 264652, seamonkey/trunk/seamonkey-2.0-lang.patch)
===================================================================
--- community-x86_64/seamonkey-2.0-lang.patch (rev 0)
+++ community-x86_64/seamonkey-2.0-lang.patch 2017-10-29 02:39:32 UTC (rev 264653)
@@ -0,0 +1,11 @@
+--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200
++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200
+@@ -890,7 +890,7 @@
+ pref("intl.charset.detector", "chrome://global/locale/intl.properties");
+ pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
+ pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties");
+-pref("intl.locale.matchOS", false);
++pref("intl.locale.matchOS", true);
+ // fallback charset list for Unicode conversion (converting from Unicode)
+ // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
+ // for ISO-8859-1
More information about the arch-commits
mailing list