upkg, added cargo as makedepend

3 files changed, 34 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c634546b839c..efe8c7b6531d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Dec 30 14:05:44 UTC 2016
+# Sun Jan 29 01:01:15 UTC 2017
 pkgbase = firefox-kde-opensuse
 	pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
-	pkgver = 50.1.0
-	pkgrel = 2
+	pkgver = 51.0.1
+	pkgrel = 1
 	url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
 	arch = i686
 	arch = x86_64
@@ -22,6 +22,7 @@ pkgbase = firefox-kde-opensuse
 	makedepends = inetutils
 	makedepends = autoconf2.13
 	makedepends = rust
+	makedepends = cargo
 	depends = gtk2
 	depends = mozilla-common
 	depends = libxt
@@ -43,24 +44,23 @@ pkgbase = firefox-kde-opensuse
 	depends = gtk3
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = upower: Battery API
-	provides = firefox=50.1.0
+	provides = firefox=51.0.1
 	conflicts = firefox
 	options = !emptydirs
 	options = strip
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/50.1.0/source/firefox-50.1.0.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/51.0.1/source/firefox-51.0.1.source.tar.xz
 	source = mozconfig
 	source = firefox.desktop
 	source = firefox-install-dir.patch
 	source = vendor.js
 	source = kde.js
 	source = firefox-fixed-loading-icon.png
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/a58cc7936ce7/firefox-branded-icons.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/a58cc7936ce7/firefox-kde.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/a58cc7936ce7/firefox-no-default-ualocale.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/a58cc7936ce7/mozilla-kde.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/a58cc7936ce7/mozilla-language.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/a58cc7936ce7/mozilla-nongnome-proxies.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/a58cc7936ce7/mozilla-flex_buffer_overrun.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/3604ed712e16/firefox-branded-icons.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/3604ed712e16/firefox-kde.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/3604ed712e16/firefox-no-default-ualocale.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/3604ed712e16/mozilla-kde.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/3604ed712e16/mozilla-language.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/3604ed712e16/mozilla-nongnome-proxies.patch
 	source = unity-menubar.patch
 	source = add_missing_pgo_rule.patch
 	source = pgo_fix_missing_kdejs.patch
@@ -68,20 +68,19 @@ pkgbase = firefox-kde-opensuse
 	source = fix_mozalloc.patch
 	source = fix-wifi-scanner.diff
 	source = rust-i686.patch
-	md5sums = 0f6a56cd8da8fa9deedfd61bcb43a65d
-	md5sums = 169f583544e9efaf1f80f8548b57a8cc
+	md5sums = 05d8d655983d21d5059d5c886b2e6a9c
+	md5sums = b3b04357505b8f00864ceeb1cc40a66f
 	md5sums = 14e0f6237a79b85e60256f4808163160
 	md5sums = dbf14588e85812ee769bd735823a0146
 	md5sums = aa9f776d2187cba09de65cbb02b39ca0
 	md5sums = 05bb69d25fb3572c618e3adf1ee7b670
 	md5sums = 6e335a517c68488941340ee1c23f97b0
 	md5sums = 3b3eb8c2747429887e4a03537932eac5
-	md5sums = 4597391f698d5f3a7138e5a2757ac094
+	md5sums = a8bff00299be95e2d5635c8660858237
 	md5sums = 1fad9a988826d69fe712ea973e43f6da
-	md5sums = 1a8a9fbe8ac6a37f2af5032e81e63fff
-	md5sums = ce59663430373d7facd5915056745897
+	md5sums = f41f9222bc2108516719178e77528e9d
+	md5sums = fa6ac817f576b486419b5f308116a7cd
 	md5sums = 0c684360f1df4536512d51873c1d243d
-	md5sums = 01af53dc830d00fe522c545bcc0ec4b9
 	md5sums = eb6771472c8c5f67331256c7f5a692da
 	md5sums = fe24f5ea463013bb7f1c12d12dce41b2
 	md5sums = 3fa8bd22d97248de529780f5797178af
diff --git a/PKGBUILD b/PKGBUILD
index ef74060d4893..5f8bc69ca8af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ _gtk3=true
 
 _pkgname=firefox
 pkgname=$_pkgname-kde-opensuse
-pkgver=50.1.0
-pkgrel=2
+pkgver=51.0.1
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -29,12 +29,13 @@ if [ $_gtk3 ] ; then
 fi
 
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake'
-             'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'rust')
+             'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'rust'
+            'cargo')
 optdepends=('networkmanager: Location detection via available WiFi networks'
 	    'upower: Battery API' )
 provides=("firefox=${pkgver}")
 conflicts=('firefox')
-_patchrev=a58cc7936ce7
+_patchrev=3604ed712e16
 options=('!emptydirs'  'strip' )
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
@@ -47,7 +48,6 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
 	$_patchurl/mozilla-kde.patch
 	$_patchurl/mozilla-language.patch
 	$_patchurl/mozilla-nongnome-proxies.patch
-        $_patchurl/mozilla-flex_buffer_overrun.patch
 	unity-menubar.patch
 	add_missing_pgo_rule.patch
         pgo_fix_missing_kdejs.patch
@@ -87,7 +87,7 @@ prepare() {
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 
   echo -n "$_google_default_client_id $_google_default_client_secret" >google-oauth-api-key
-  echo "ac_add_options --with-google-oauth-api-keyfile=\"$PWD/google-oauth-api-key\"" >>.mozconfig
+  echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-oauth-api-key\"" >>.mozconfig
 
   echo -n "$_mozilla_api_key" >mozilla-api-key
   echo "ac_add_options --with-mozilla-api-keyfile=\"$PWD/mozilla-api-key\"" >>.mozconfig
@@ -113,8 +113,6 @@ prepare() {
   # https://bugs.archlinux.org/task/34644
   # sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 
-  # CVE-2016-6354 (bmo#1292534)
-  patch -Np1 -i "$srcdir"/mozilla-flex_buffer_overrun.patch
 
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
@@ -122,6 +120,8 @@ prepare() {
   
   # Build with the rust targets we actually ship
   patch -Np1 -i "$srcdir"/rust-i686.patch
+
+
   
   # WebRTC build tries to execute "python" and expects Python 2
   mkdir -p "$srcdir/path"
@@ -147,7 +147,6 @@ build() {
   CPPFLAGS+=" -O2"
 
   # GCC 6
-  CFLAGS+=" -fPIC -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
   CXXFLAGS+=" -fPIC -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
 
   # Hardening
@@ -202,20 +201,19 @@ package() {
   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
 }
-md5sums=('0f6a56cd8da8fa9deedfd61bcb43a65d'
-         '169f583544e9efaf1f80f8548b57a8cc'
+md5sums=('05d8d655983d21d5059d5c886b2e6a9c'
+         'b3b04357505b8f00864ceeb1cc40a66f'
          '14e0f6237a79b85e60256f4808163160'
          'dbf14588e85812ee769bd735823a0146'
          'aa9f776d2187cba09de65cbb02b39ca0'
          '05bb69d25fb3572c618e3adf1ee7b670'
          '6e335a517c68488941340ee1c23f97b0'
          '3b3eb8c2747429887e4a03537932eac5'
-         '4597391f698d5f3a7138e5a2757ac094'
+         'a8bff00299be95e2d5635c8660858237'
          '1fad9a988826d69fe712ea973e43f6da'
-         '1a8a9fbe8ac6a37f2af5032e81e63fff'
-         'ce59663430373d7facd5915056745897'
+         'f41f9222bc2108516719178e77528e9d'
+         'fa6ac817f576b486419b5f308116a7cd'
          '0c684360f1df4536512d51873c1d243d'
-         '01af53dc830d00fe522c545bcc0ec4b9'
          'eb6771472c8c5f67331256c7f5a692da'
          'fe24f5ea463013bb7f1c12d12dce41b2'
          '3fa8bd22d97248de529780f5797178af'
diff --git a/mozconfig b/mozconfig
index aa4ad613ad21..a084539cb579 100644
--- a/mozconfig
+++ b/mozconfig
@@ -38,6 +38,10 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-debug-symbols
+ac_add_options --disable-crashreporter
+
+STRIP_FLAGS="--strip-debug"
+ 
 
 # Optimization
 ac_add_options --enable-optimize