Split out mozconfigs and distribution to ease diffing

Enable -fstack-protector-all
Make -O3 global
Disable gimmicky internal hardening

1 files changed, 17 insertions, 88 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 490142f..a3a484a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -37,6 +37,9 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags)
 source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
         $pkgname.desktop $pkgname-symbolic.svg
+        distribution.ini
+        mozconfig.in
+        mozconfig.common.override
         0001-Use-remoting-name-for-GDK-application-names.patch
         pgo-1.patch
         moz.configure.diff
@@ -45,6 +48,9 @@ sha256sums=('413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5'
             'SKIP'
             '54dcf5e1b91db3f586a7e27814552f96578b9d9495b7b10b268e36f64b49d4d1'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
+            '0ba4d1a619a3a5750a5a48c6bff8c6a69d3aa4be4c303032c5979ab5f68db208'
+            '1cc0730e0f0285f45f30feeeee6d7757931b25263b35b041abd71c2e0486210d'
+            'dcf70d24eedab79d811974a75663f0e84c5efca420da61fc444ebe311d0cada9'
             'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
             'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c'
             'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
@@ -61,82 +67,12 @@ prepare() {
   # Apply pgo patches
   patch -p0 $srcdir/${pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/pgo-1.patch
 
-  cat >$srcdir/${pkgname}-${pkgver}/.mozconfig <<END
-ac_add_options --enable-application=browser
-
-ac_add_options --prefix=/usr
-ac_add_options --enable-release
-ac_add_options --enable-hardening
-ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
-ac_add_options --enable-lto
-ac_add_options --enable-linker=gold
-export MOZ_PGO=1
-export CC=gcc
-export CXX=g++
-export AR=gcc-ar
-export NM=gcc-nm
-export RANLIB=gcc-ranlib
-
-# Branding
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --with-distribution-id=org.artixlinux
-ac_add_options --with-unsigned-addon-scopes=app,system
-
-# System libraries
-ac_add_options --with-system-bz2
-ac_add_options --with-system-ffi
-ac_add_options --with-system-icu
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --enable-system-pixman
-ac_add_options --with-system-png
-ac_add_options --enable-system-sqlite
-ac_add_options --with-system-webp
-ac_add_options --with-system-zlib
-
-
-# Features
-ac_add_options --enable-alsa
-ac_add_options --enable-jack
-ac_add_options --enable-startup-notification
-ac_add_options --disable-cdp
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-eme
-ac_add_options --disable-gconf
-# # marionette required for the xorg tests
-# ac_add_options --disable-marionette
-ac_add_options --disable-necko-wifi
-ac_add_options --disable-parental-controls
-ac_add_options --disable-synth-speechd
-ac_add_options --disable-tests
-ac_add_options --disable-updater
-ac_add_options --disable-webrtc
-# # Disabling webspeech breaks compiling ff67+
-# ac_add_options --disable-webspeech
-
-ac_add_options --enable-strip
-
-mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS"
-export MOZ_APP_REMOTINGNAME=$pkgname
-export MOZ_ADDON_SIGNING=0
-export MOZ_REQUIRE_SIGNING=0
-
-END
-
-# MOZ_TELEMETRY_REPORTING only applied correctly when set in this override file
-  cat >$srcdir/${pkgname}-${pkgver}/build/mozconfig.common.override <<END
-export MOZ_TELEMETRY_REPORTING=0
-export MOZ_DATA_REPORTING=0
-export ACCESSIBILITY=0
-
-END
+  # Add the custom mozconfig
+  cp $srcdir/mozconfig.in $srcdir/${pkgname}-${pkgver}/.mozconfig
+
+  # MOZ_TELEMETRY_REPORTING only applied correctly when set in this override file
+  cp $srcdir/mozconfig.common.override $srcdir/${pkgname}-${pkgver}/build/mozconfig.common.override
+
 
   # Disable various components at the source level
   #sed -i 's|[;]1|;0|' $srcdir/${pkgname}-${pkgver}/toolkit/components/telemetry/TelemetryStartup.manifest
@@ -163,6 +99,9 @@ build() {
 
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
+  export CFLAGS="$CFLAGS -fstack-protector-all -O3"
+  export CXXFLAGS="$CXXFLAGS -fstack-protector-all -O3"
+  export LDFLAGS="$LDFLAGS,-fuse-ld=gold"
   # LTO needs more open files
   ulimit -n 4096
   msg2 "Building optimized browser..."
@@ -177,18 +116,8 @@ package() {
   DESTDIR="$pkgdir" ./mach install
 
 
-  install -Dm644 /dev/stdin \
-    "$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" <<END
-[Global]
-id=artixlinux
-version=1.0
-about=Mozilla Firefox for Artix Linux
-
-[Preferences]
-app.distributor=artixlinux
-app.distributor.channel=$pkgname
-app.partner.artixlinux=artixlinux
-END
+  install -Dm644 $srcdir/distribution.ini \
+  "$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
 
   # don't duplicate the binary, use a symlink instead
   rm "$pkgdir/usr/bin/firefox"