version 2.46-4

4 files changed, 32 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99a4fe507191..b852677ec482 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = seamonkey-gtk2
 	pkgdesc = SeaMonkey internet suite (GTK2 version)
 	pkgver = 2.46
-	pkgrel = 2
+	pkgrel = 4
 	url = http://www.seamonkey-project.org/
 	arch = i686
 	arch = x86_64
@@ -38,7 +38,7 @@ pkgbase = seamonkey-gtk2
 	optdepends = gst-plugins-bad: aac, vp8 and opus decoding
 	optdepends = gst-plugins-good: webm and mp4 demuxing
 	optdepends = gst-plugins-ugly: h.264 decoding
-	provides = seamonkey=2.46.2
+	provides = seamonkey=2.46.4
 	conflicts = seamonkey
 	source = https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.46/source/seamonkey-2.46.source.tar.xz
 	source = mozconfig
@@ -46,12 +46,14 @@ pkgbase = seamonkey-gtk2
 	source = rhbz-966424.patch
 	source = mozbug1323209.patch
 	source = mozbug1329272.patch
+	source = no-crmf.diff
 	sha256sums = 39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912
-	sha256sums = 9a730ec71744e9e674a7922cd573fe2428f39ee53b0c3c8912053a910975f1d8
+	sha256sums = 8d3bd1c0f1101a382cf7861aff4a94bad9834ecfc0b240e43aca49d219a80d13
 	sha256sums = ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e
 	sha256sums = 746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a
 	sha256sums = 87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4
 	sha256sums = 33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b
+	sha256sums = fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb
 
 pkgname = seamonkey-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index f05d867f494b..1195507ba713 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 209304 2017-01-28 17:00:56Z heftig $
+# $Id$
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Kyle Keen <keenerd@gmail.com>
 
 pkgname=seamonkey-gtk2
 _pkgname=seamonkey
 pkgver=2.46
-pkgrel=2
+pkgrel=4
 pkgdesc="SeaMonkey internet suite (GTK2 version)"
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -23,13 +23,15 @@ source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/s
         seamonkey-2.0-lang.patch
         rhbz-966424.patch
         mozbug1323209.patch
-        mozbug1329272.patch)
+        mozbug1329272.patch
+	no-crmf.diff)
 sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
-            '9a730ec71744e9e674a7922cd573fe2428f39ee53b0c3c8912053a910975f1d8'
+            '8d3bd1c0f1101a382cf7861aff4a94bad9834ecfc0b240e43aca49d219a80d13'
             'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
             '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
             '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
-            '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b')
+            '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b'
+            'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb')
 
 prepare() {
   cd "$_pkgname-$pkgver"
@@ -58,6 +60,10 @@ prepare() {
 
   # 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() {
diff --git a/mozconfig b/mozconfig
index 9b25381b5b80..4d51550fb91f 100644
--- a/mozconfig
+++ b/mozconfig
@@ -10,7 +10,7 @@ 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-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
diff --git a/no-crmf.diff b/no-crmf.diff
new file mode 100644
index 000000000000..242304eb4182
--- /dev/null
+++ b/no-crmf.diff
@@ -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