25 files changed, 56 insertions, 55 deletions
diff --git a/nonprism-testing/icedove/PKGBUILD b/pcr/icedove-hardening/PKGBUILD
index 6de81d68b..6ce8d46eb 100644
--- a/nonprism-testing/icedove/PKGBUILD
+++ b/pcr/icedove-hardening/PKGBUILD
@@ -11,27 +11,27 @@ _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=thunderbird
-pkgname=icedove
+pkgname=icedove-hardening
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=1.nonprism1
+pkgrel=1
 
-pkgdesc="A libre version of Debian Icedove, the standalone mail and news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
+pkgdesc="A libre version of Debian Icedove, the standalone mail and news reader based on Mozilla Thunderbird, with several patches that were introduced to strengthen and protect the end user from security threats and without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64 armv7h)
 license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib gtk2 hunspell icu=57.1 libevent libvpx=1.6.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
 makedepends=(autoconf2.13 diffutils gconf imake inetutils libpulse mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
 options=(!emptydirs !makeflags)
 optdepends=('libcanberra: for sound support')
-url="https://wiki.parabola.nu/$pkgname"
-replaces=("$pkgname-libre" "$_pkgname")
-conflicts=("$pkgname-libre" "$_pkgname")
-provides=("$_pkgname")
-install=$pkgname.install
+url="https://wiki.parabola.nu/${pkgname%-*}"
+replaces=("${pkgname%-*}-libre" "$_pkgname")
+conflicts=("${pkgname%-*}-libre" "$_pkgname" "${pkgname%-*}")
+provides=("$_pkgname" "${pkgname%-*}")
+install=${pkgname%-*}.install
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
         mozconfig
-        $pkgname.desktop
+        ${pkgname%-*}.desktop
         changing-the-default-search-engine.patch
         firefox-gcc-6.0.patch mozilla-1228540.patch mozilla-1228540-1.patch
         vendor.js
@@ -60,17 +60,17 @@ prepare() {
   export QUILT_DIFF_ARGS='--no-timestamps'
 
   # Prepare branding for the Icedove packages
-  mkdir -v mail/branding/$pkgname
+  mkdir -v mail/branding/${pkgname%-*}
 
   # Copy needed icons
-  cp -va debian/$pkgname-branding/* mail/branding/$pkgname
+  cp -va debian/${pkgname%-*}-branding/* mail/branding/${pkgname%-*}
   for i in 16 22 24 32 48 256; do
-    install -Dm644 debian/app-icons/$pkgname$i.png \
-      mail/branding/$pkgname/mailicon$i.png
+    install -Dm644 debian/app-icons/${pkgname%-*}$i.png \
+      mail/branding/${pkgname%-*}/mailicon$i.png
   done
   for i in 48 64; do
-    install -Dm644 debian/app-icons/$pkgname$i.png \
-      mail/branding/$pkgname/content/icon$i.png
+    install -Dm644 debian/app-icons/${pkgname%-*}$i.png \
+      mail/branding/${pkgname%-*}/content/icon$i.png
   done
   cp -av debian/preview.png mail/themes/linux/mail/preview.png
 
@@ -175,32 +175,32 @@ package() {
   cd "$srcdir/$_pkgname-$_debver"
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
 
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/${pkgname%-*}/defaults/preferences/vendor.js"
 
   # Install Icedove menu icon
-  install -Dm644 debian/$pkgname.xpm "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
+  install -Dm644 debian/${pkgname%-*}.xpm "$pkgdir/usr/share/pixmaps/${pkgname%-*}.xpm"
 
   # Install Icedove icons
   brandingdir=debian/app-icons
   icondir="$pkgdir/usr/share/icons/hicolor"
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 "$brandingdir/$pkgname$i.png" \
-      "$icondir/${i}x${i}/apps/$pkgname.png"
+    install -Dm644 "$brandingdir/${pkgname%-*}$i.png" \
+      "$icondir/${i}x${i}/apps/${pkgname%-*}.png"
   done
   install -Dm644 "$brandingdir/${pkgname}big.svg" \
-    "$icondir/scalable/apps/$pkgname.svg"
+    "$icondir/scalable/apps/${pkgname%-*}.svg"
 
   # Install Icedove desktop
   install -d "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/$pkgname.desktop" \
+  install -m644 "$srcdir/${pkgname%-*}.desktop" \
     "$pkgdir/usr/share/applications"
 
   # Use system-provided dictionaries
-  rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
-  ln -s /usr/share/hyphen   "$pkgdir/usr/lib/$pkgname/hyphenation"
+  rm -rf "$pkgdir/usr/lib/${pkgname%-*}/"{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/${pkgname%-*}/dictionaries"
+  ln -s /usr/share/hyphen   "$pkgdir/usr/lib/${pkgname%-*}/hyphenation"
 
   # Replace duplicate binary with symlink
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
+  ln -sf ${pkgname%-*} "$pkgdir/usr/lib/${pkgname%-*}/${pkgname%-*}-bin"
 }
diff --git a/nonprism-testing/icedove/changing-the-default-search-engine.patch b/pcr/icedove-hardening/changing-the-default-search-engine.patch
index 37df3e851..37df3e851 100644
--- a/nonprism-testing/icedove/changing-the-default-search-engine.patch
+++ b/pcr/icedove-hardening/changing-the-default-search-engine.patch
diff --git a/nonprism-testing/icedove/firefox-gcc-6.0.patch b/pcr/icedove-hardening/firefox-gcc-6.0.patch
index 0a74d3616..0a74d3616 100644
--- a/nonprism-testing/icedove/firefox-gcc-6.0.patch
+++ b/pcr/icedove-hardening/firefox-gcc-6.0.patch
diff --git a/nonprism-testing/icedove/fix-missing-files.patch b/pcr/icedove-hardening/fix-missing-files.patch
index 04cf3d35e..04cf3d35e 100644
--- a/nonprism-testing/icedove/fix-missing-files.patch
+++ b/pcr/icedove-hardening/fix-missing-files.patch
diff --git a/nonprism-testing/icedove/icedove.desktop b/pcr/icedove-hardening/icedove.desktop
index 1ba43e0b3..1ba43e0b3 100644
--- a/nonprism-testing/icedove/icedove.desktop
+++ b/pcr/icedove-hardening/icedove.desktop
diff --git a/nonprism-testing/icedove/icedove.install b/pcr/icedove-hardening/icedove.install
index dc20b4f9b..af5f896b5 100644
--- a/nonprism-testing/icedove/icedove.install
+++ b/pcr/icedove-hardening/icedove.install
@@ -2,10 +2,10 @@ notice() {
   cat <<EOM
   == IMPORTANT NOTICE ==
 
-  This package contains several new patches that were introduced
-  to strengthen and protect the end user from security and privacy threats.
+  This package contains several patches that were introduced
+  to strengthen and protect the end user from security threats.
 
-  For users who wish to opt-out of privacy, you may override options in
+  For users who wish to opt-out of security, you may override options in
   about:config using a user.js file in your ~/.icedove's profile folder.
 
   Some user.js examples:
diff --git a/nonprism-testing/icedove/mozconfig b/pcr/icedove-hardening/mozconfig
index 972b9ac0d..972b9ac0d 100644
--- a/nonprism-testing/icedove/mozconfig
+++ b/pcr/icedove-hardening/mozconfig
diff --git a/nonprism-testing/icedove/mozilla-1228540-1.patch b/pcr/icedove-hardening/mozilla-1228540-1.patch
index be6ffc316..be6ffc316 100644
--- a/nonprism-testing/icedove/mozilla-1228540-1.patch
+++ b/pcr/icedove-hardening/mozilla-1228540-1.patch
diff --git a/nonprism-testing/icedove/mozilla-1228540.patch b/pcr/icedove-hardening/mozilla-1228540.patch
index 9f6c46077..9f6c46077 100644
--- a/nonprism-testing/icedove/mozilla-1228540.patch
+++ b/pcr/icedove-hardening/mozilla-1228540.patch
diff --git a/nonprism-testing/icedove/mozilla-1253216.patch b/pcr/icedove-hardening/mozilla-1253216.patch
index 6de072054..6de072054 100644
--- a/nonprism-testing/icedove/mozilla-1253216.patch
+++ b/pcr/icedove-hardening/mozilla-1253216.patch
diff --git a/nonprism-testing/icedove/no-neon.patch b/pcr/icedove-hardening/no-neon.patch
index af8bf198d..af8bf198d 100644
--- a/nonprism-testing/icedove/no-neon.patch
+++ b/pcr/icedove-hardening/no-neon.patch
diff --git a/nonprism-testing/icedove/vendor.js b/pcr/icedove-hardening/vendor.js
index e65c501d7..e65c501d7 100644
--- a/nonprism-testing/icedove/vendor.js
+++ b/pcr/icedove-hardening/vendor.js
diff --git a/nonprism-testing/iceweasel/PKGBUILD b/pcr/iceweasel-hardening/PKGBUILD
index 0aed9e254..790b18177 100644
--- a/nonprism-testing/iceweasel/PKGBUILD
+++ b/pcr/iceweasel-hardening/PKGBUILD
@@ -27,11 +27,11 @@ _parabolarepo=https://repo.parabola.nu/other/iceweasel
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=firefox
-pkgname=iceweasel
+pkgname=iceweasel-hardening
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=2.nonprism1
-pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox, without support for unsafe and dangerous for privacy protocols"
+pkgrel=1
+pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox, with several patches that were introduced to strengthen and protect the end user from security threats"
 arch=(i686 x86_64 armv7h)
 license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell icu=57.1 libevent libvpx=1.6.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
@@ -46,10 +46,11 @@ fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'upower: Battery API')
-url="https://wiki.parabola.nu/$pkgname"
-replaces=("$pkgname-libre" "$_pkgname")
-conflicts=("$pkgname-libre")
-install=$pkgname.install
+url="https://wiki.parabola.nu/${pkgname%-*}"
+replaces=("${pkgname%-*}-libre" "$_pkgname")
+conflicts=("${pkgname%-*}-libre" "${pkgname%-*}")
+provides=("${pkgname%-*}")
+install=${pkgname%-*}.install
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
         "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz"
@@ -59,8 +60,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         remove-default-and-shell-icons-in-packaging-manifest.patch
         gnu_headshadow.png
         drm-free.png
-        $pkgname.desktop
-        $pkgname-install-dir.patch
+        ${pkgname%-*}.desktop
+        ${pkgname%-*}-install-dir.patch
         vendor.js
         enable-object-directory-paths.patch
         mozilla-1253216.patch
@@ -88,9 +89,9 @@ validpgpkeys=(
 prepare() {
   cd "$srcdir/$_pkgname-$_debver"
   mv "$srcdir/debian" .
-  mv "$srcdir/$pkgname-$_brandingver/branding" debian
-  mv "$srcdir/$pkgname-$_brandingver/patches/iceweasel-branding" debian/patches
-  cat "$srcdir/$pkgname-$_brandingver/patches/series" >> debian/patches/series
+  mv "$srcdir/${pkgname%-*}-$_brandingver/branding" debian
+  mv "$srcdir/${pkgname%-*}-$_brandingver/patches/iceweasel-branding" debian/patches
+  cat "$srcdir/${pkgname%-*}-$_brandingver/patches/series" >> debian/patches/series
 
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -108,8 +109,8 @@ prepare() {
   # Enable object directory paths for Iceweasel rebranding
   patch -Np1 -i "$srcdir/enable-object-directory-paths.patch"
 
-  # Install to /usr/lib/$pkgname
-  patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
+  # Install to /usr/lib/${pkgname%-*}
+  patch -Np1 -i "$srcdir/${pkgname%-*}-install-dir.patch"
 
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
@@ -133,8 +134,8 @@ prepare() {
   cp -av /usr/lib/mozilla/searchplugins browser/locales/en-US
 
   # Disable various components at the source level
-  sed -i 's|1|0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup"
-  sed -i 's|1|0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
+  sed -i 's|[;]1|;0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup"
+  sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
   sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket"
 
   # ARM-specific changes:
@@ -182,7 +183,7 @@ package() {
   cd "$srcdir/$_pkgname-$_debver"
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
 
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/${pkgname%-*}/browser/defaults/preferences/vendor.js"
 
   _brandingdir=debian/branding
   brandingdir=moz-objdir/$_brandingdir
@@ -191,22 +192,22 @@ package() {
     rsvg-convert -w $i -h $i "$_brandingdir/${pkgname}_icon.svg" \
       -o "$brandingdir/default$i.png"
     install -Dm644 "$brandingdir/default$i.png" \
-      "$icondir/${i}x${i}/apps/$pkgname.png"
+      "$icondir/${i}x${i}/apps/${pkgname%-*}.png"
   done
 
   install -Dm644 "$_brandingdir/${pkgname}_icon.svg" \
-    "$icondir/scalable/apps/$pkgname.svg"
+    "$icondir/scalable/apps/${pkgname%-*}.svg"
 
   install -d "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/$pkgname.desktop" \
+  install -m644 "$srcdir/${pkgname%-*}.desktop" \
     "$pkgdir/usr/share/applications"
 
   # Use system-provided dictionaries
-  rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
-  ln -s /usr/share/hyphen   "$pkgdir/usr/lib/$pkgname/hyphenation"
+  rm -rf "$pkgdir/usr/lib/${pkgname%-*}/"{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/${pkgname%-*}/dictionaries"
+  ln -s /usr/share/hyphen   "$pkgdir/usr/lib/${pkgname%-*}/hyphenation"
 
   # Replace duplicate binary with symlink
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
+  ln -sf ${pkgname%-*} "$pkgdir/usr/lib/${pkgname%-*}/${pkgname%-*}-bin"
 }
diff --git a/nonprism-testing/iceweasel/drm-free.png b/pcr/iceweasel-hardening/drm-free.png
index e30994e67..e30994e67 100644
--- a/nonprism-testing/iceweasel/drm-free.png
+++ b/pcr/iceweasel-hardening/drm-free.png
diff --git a/nonprism-testing/iceweasel/enable-object-directory-paths.patch b/pcr/iceweasel-hardening/enable-object-directory-paths.patch
index bc938c66e..bc938c66e 100644
--- a/nonprism-testing/iceweasel/enable-object-directory-paths.patch
+++ b/pcr/iceweasel-hardening/enable-object-directory-paths.patch
diff --git a/nonprism-testing/iceweasel/gnu_headshadow.png b/pcr/iceweasel-hardening/gnu_headshadow.png
index e0f73a3bf..e0f73a3bf 100644
--- a/nonprism-testing/iceweasel/gnu_headshadow.png
+++ b/pcr/iceweasel-hardening/gnu_headshadow.png
diff --git a/nonprism-testing/iceweasel/iceweasel-install-dir.patch b/pcr/iceweasel-hardening/iceweasel-install-dir.patch
index af113fa85..af113fa85 100644
--- a/nonprism-testing/iceweasel/iceweasel-install-dir.patch
+++ b/pcr/iceweasel-hardening/iceweasel-install-dir.patch
diff --git a/nonprism-testing/iceweasel/iceweasel.desktop b/pcr/iceweasel-hardening/iceweasel.desktop
index 028aeffde..028aeffde 100644
--- a/nonprism-testing/iceweasel/iceweasel.desktop
+++ b/pcr/iceweasel-hardening/iceweasel.desktop
diff --git a/nonprism-testing/iceweasel/iceweasel.install b/pcr/iceweasel-hardening/iceweasel.install
index e6187db6d..574e0d3db 100644
--- a/nonprism-testing/iceweasel/iceweasel.install
+++ b/pcr/iceweasel-hardening/iceweasel.install
@@ -2,10 +2,10 @@ notice() {
   cat <<EOM
   == IMPORTANT NOTICE ==
 
-  This package contains several new patches that were introduced
-  to strengthen and protect the end user from security and privacy threats.
+  This package contains several patches that were introduced
+  to strengthen and protect the end user from security threats.
 
-  For users who wish to opt-out of privacy, you may override options in
+  For users who wish to opt-out of security, you may override options in
   about:config using a user.js file in your ~/.mozilla's profile folder.
 
   Some user.js examples:
diff --git a/nonprism-testing/iceweasel/libre.patch b/pcr/iceweasel-hardening/libre.patch
index a434fef2f..a434fef2f 100644
--- a/nonprism-testing/iceweasel/libre.patch
+++ b/pcr/iceweasel-hardening/libre.patch
diff --git a/nonprism-testing/iceweasel/mozconfig b/pcr/iceweasel-hardening/mozconfig
index 7349e3ccd..7349e3ccd 100644
--- a/nonprism-testing/iceweasel/mozconfig
+++ b/pcr/iceweasel-hardening/mozconfig
diff --git a/nonprism-testing/iceweasel/mozilla-1253216.patch b/pcr/iceweasel-hardening/mozilla-1253216.patch
index c9252da5f..c9252da5f 100644
--- a/nonprism-testing/iceweasel/mozilla-1253216.patch
+++ b/pcr/iceweasel-hardening/mozilla-1253216.patch
diff --git a/nonprism-testing/iceweasel/mozilla-build-arm.patch b/pcr/iceweasel-hardening/mozilla-build-arm.patch
index 774147bbb..774147bbb 100644
--- a/nonprism-testing/iceweasel/mozilla-build-arm.patch
+++ b/pcr/iceweasel-hardening/mozilla-build-arm.patch
diff --git a/nonprism-testing/iceweasel/remove-default-and-shell-icons-in-packaging-manifest.patch b/pcr/iceweasel-hardening/remove-default-and-shell-icons-in-packaging-manifest.patch
index 6bc67b30a..6bc67b30a 100644
--- a/nonprism-testing/iceweasel/remove-default-and-shell-icons-in-packaging-manifest.patch
+++ b/pcr/iceweasel-hardening/remove-default-and-shell-icons-in-packaging-manifest.patch
diff --git a/nonprism-testing/iceweasel/vendor.js b/pcr/iceweasel-hardening/vendor.js
index 84489482b..84489482b 100644
--- a/nonprism-testing/iceweasel/vendor.js
+++ b/pcr/iceweasel-hardening/vendor.js