diff options
Diffstat (limited to 'nonprism')
| -rw-r--r-- | nonprism/icedove-hardened/PKGBUILD | 34 | ||||
| -rw-r--r-- | nonprism/icedove-hardened/icedove.install | 14 | ||||
| -rw-r--r-- | nonprism/icedove-hardened/vendor.js | 4 |
3 files changed, 24 insertions, 28 deletions
diff --git a/nonprism/icedove-hardened/PKGBUILD b/nonprism/icedove-hardened/PKGBUILD index 666312043..88b0c504c 100644 --- a/nonprism/icedove-hardened/PKGBUILD +++ b/nonprism/icedove-hardened/PKGBUILD @@ -5,7 +5,7 @@ # We're getting this from Debian Sid _debname=icedove -_debver=45.4.0 +_debver=45.5.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -25,8 +25,8 @@ options=(!emptydirs !makeflags) optdepends=('libcanberra: for sound support') url="https://wiki.parabola.nu/${pkgname%-*}" replaces=("${pkgname%-*}-libre" "${_pkgname}-hardening" "$_pkgname") -conflicts=("${pkgname%-*}-libre" "$_pkgname" "${pkgname%-*}") -provides=("$_pkgname" "${pkgname%-*}") +conflicts=("${pkgname%-*}-libre" "$_pkgname") +provides=("$_pkgname" "${pkgname%-*}=$epoch.$pkgver") install=${pkgname%-*}.install source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz" "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz" @@ -38,15 +38,15 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz" fix-missing-files.patch no-neon.patch mozilla-1253216.patch) -sha256sums=('00ff0dcd4bddd053b5285c78cd687876cfab9455c2eb1e670746eb4bedaac38f' - 'b4d1b193aee7481249ef5e638bf583b69c1785dd530a9ecd098a84f42dfdf09d' +sha256sums=('953db5edf31101f6cfc546bc2d9c9857134b5a7cfabf2251294a444364b45fa8' + '33cc4f2355a7f30f1679dc7ff6c6be9c57c9399f9c5163d719fe1c2a6bb95fc2' 'aaca37bcca176d1b8ebe7c18d3fb0c61e3d21769fbf8e994a189eb3263257d3d' '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' 'e1f72c44e31f191271207fc874dcfbf3d504b6b42dc1bb063ba8c7c9ee032130' '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf' '3a3e84c702ee31450a3e84698441aceb11cf44e64c9fedcaddb8cb50db759417' 'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19' - '173c929176262c0ad27984d68d61918d51d27bbc538ccbe9e6d19727d1f9de4d' + '9a7d1a31274bd2e0b530fbabb2e382a8ce6eba3f06ccada1fecf67654b72d1ed' '294a2cc7b0477ad285af10ac2a04b767cabec07f03b23da23014bda71caea510' '59f40d8b2480aa67bf76f4f119826b6828a6a59cc040caf1ab5a6e19eef44c6e' '1e7ef08acd46aeacc8cd8b2c89012983fb2c8c18648e0f3e9371b0c76caedbde') @@ -84,6 +84,10 @@ prepare() { # Fix missing files patch -Np1 -i "$srcdir/fix-missing-files.patch" + # Modify MOZ_APP_NAME for icedove-hardened be installed side by side with icedove + sed -i '\|MOZ_APP_NAME| s|icedove|icedove-hardened| + ' mail/confvars.sh + # Remove url-classifier from package-manifest.in to build and disable Phishing Protection sed -i '\|Phishing Protection|d \|UrlClassifier|d @@ -175,32 +179,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" + "$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" \ - "$pkgdir/usr/share/applications" + "$pkgdir/usr/share/applications/$pkgname.desktop" # 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/icedove-hardened/icedove.install b/nonprism/icedove-hardened/icedove.install index af5f896b5..35a707927 100644 --- a/nonprism/icedove-hardened/icedove.install +++ b/nonprism/icedove-hardened/icedove.install @@ -5,17 +5,9 @@ notice() { 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 security, you may override options in - about:config using a user.js file in your ~/.icedove's profile folder. - - Some user.js examples: - user_pref("mailnews.display.prefer_plaintext", false); # Enables possible HTML leaks - user_pref("purple.logging.log_chats", true); # Enables chat logging - - Further reading: - * https://lists.parabola.nu/pipermail/dev/2016-October/004522.html - * http://kb.mozillazine.org/About:config - * http://kb.mozillazine.org/User.js_file + In addition, it was adapted to be installed side by side with + icedove. This way you could running 'icedove-hardened' and + use just 'icedove' where needed. EOM } diff --git a/nonprism/icedove-hardened/vendor.js b/nonprism/icedove-hardened/vendor.js index e65c501d7..3d652a4e1 100644 --- a/nonprism/icedove-hardened/vendor.js +++ b/nonprism/icedove-hardened/vendor.js @@ -103,9 +103,9 @@ pref("mailnews.send_plaintext_flowed", false); pref("mailnews.display.prefer_plaintext", true); pref("mailnews.display.disallow_mime_handlers", 3); // http://www.bucksch.org/1/projects/mozilla/108153/ pref("mailnews.display.html_as", 1); // Convert HTML to text and then back again. -pref("mailnews.reply_header_type", 1); +//pref("mailnews.reply_header_type", 1); pref("mailnews.reply_header_authorwrote", "%s"); // https://lists.torproject.org/pipermail/tor-talk/2012-May/024395.html -pref("mailnews.reply_header_authorwrotesingle", "#1"); +//pref("mailnews.reply_header_authorwrotesingle", "#1"); pref("mailnews.headers.showSender", true); pref("mailnews.message_display.allow_plugins", false); // Disable plugin support. pref("mailnews.migration.header_addons_url", ""); |