Update to 31.8.0-gnu2. Applied patch for CVE-2015-4473 CVE-2015-4482 CVE-2015-4488 CVE-2015-4489 CVE-2015-4491 CVE-2015-4492 CVE-2015-4495 from Guix

1 files changed, 26 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d88267a33037..917599c943d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=icecat
 pkgver=31.8.0
 _pkgver=31.8.0-gnu1
 _pkgverbase=${pkgver%%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU version of the Firefox browser."
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnuzilla/"
@@ -26,9 +26,16 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'upower: Battery API')
 
 install=icecat.install
-#source=(http://jenkins.trisquel.info/icecat/binaries/${pkgname}-${_pkgver}.tar.bz2{,.sig}
+#source=(http://jenkins.trisquel.info/icecat/binaries/${pkgname}-${pkgver}.tar.bz2{,.sig}
 source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
-#source=(http://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz      ## Good mirror
+#source=(http://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.xz      ## Good mirror
+        icecat-CVE-2015-4473-partial.patch
+        icecat-CVE-2015-4482.patch
+        icecat-CVE-2015-4488.patch
+        icecat-CVE-2015-4489.patch
+        icecat-CVE-2015-4491.patch
+        icecat-CVE-2015-4492.patch
+        icecat-CVE-2015-4495.patch
         mozconfig
         icecat.desktop
         icecat-safe.desktop
@@ -38,6 +45,13 @@ source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2
 
 sha256sums=('370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87'
             'SKIP'
+            '2c569b073f03450fec0d2c9ea0a735ffb91df5bf7fa0595a3ea55e41935bae5a'
+            'd05621004ec24f72cb14696977e0f75e091bb44203139f089643e055401fa9b4'
+            'f963b4dd4582e0a79aed41cf7c148ccc2dbf65e6e518ba6736e12ba746ff62c5'
+            'eedb11bacc946d0e449883de269b8c19e7fc754037e18ddc72f7c65219f88482'
+            '05be2eb909ea21df6d4be2aec1ac910604953522c00447a78e056f46300c57c6'
+            'c83d604ddedf6ba5da41bd4a2581413df0c5a4ef285b5dbef37a2a1d17e7356b'
+            '28ad5a04c6e0f12ef7b43e6e12c7a1f82f2583282c62128d135b24305626f387'
             '91a675ffde751aac15c83401dc8842a055df0fe3949b6a0b304882608e6a4de2'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
             '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
@@ -51,6 +65,15 @@ prepare() {
 
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Patches for version 31.8.0-gnu2
+  patch -Np1 -i ${srcdir}/icecat-CVE-2015-4473-partial.patch
+  patch -Np1 -i ${srcdir}/icecat-CVE-2015-4482.patch
+  patch -Np1 -i ${srcdir}/icecat-CVE-2015-4488.patch
+  patch -Np1 -i ${srcdir}/icecat-CVE-2015-4489.patch
+  patch -Np1 -i ${srcdir}/icecat-CVE-2015-4491.patch
+  patch -Np1 -i ${srcdir}/icecat-CVE-2015-4492.patch
+  patch -Np1 -i ${srcdir}/icecat-CVE-2015-4495.patch
+
   # Patch to move files directly to /usr/lib/icecat. No more symlinks.
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk