summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-09-05 17:47:01 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-09-05 17:47:01 -0300
commit3db6c1b9f7644bdaa1cc2ba9e9f523ef07028b73 (patch)
treeddbc59ae1b32da731401eadf67d66680c61df614
parent24e60f2102bfe288f740e0845951f76fdb013991 (diff)
parentdb5a47408bc6cf52599c5853c6dd9da89f3512bc (diff)
downloadabslibre-3db6c1b9f7644bdaa1cc2ba9e9f523ef07028b73.tar.gz
abslibre-3db6c1b9f7644bdaa1cc2ba9e9f523ef07028b73.tar.bz2
abslibre-3db6c1b9f7644bdaa1cc2ba9e9f523ef07028b73.zip
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
-rw-r--r--libre/ca-certificates-cacert/PKGBUILD22
-rw-r--r--libre/ca-certificates-cacert/ca-certificates-cacert.install23
-rw-r--r--libre/epiphany/PKGBUILD (renamed from libre/epiphany-libre/PKGBUILD)20
-rw-r--r--libre/epiphany/epiphany.install (renamed from libre/epiphany-libre/epiphany.install)0
-rw-r--r--libre/epiphany/git-fixes.patch (renamed from libre/epiphany-libre/git-fixes.patch)0
-rw-r--r--libre/evince/PKGBUILD (renamed from libre/evince-libre/PKGBUILD)18
-rw-r--r--libre/evince/evince.install (renamed from libre/evince-libre/evince.install)0
-rw-r--r--libre/evince/libarchive.patch (renamed from libre/evince-libre/libarchive.patch)0
-rw-r--r--libre/icecat-noscript/PKGBUILD6
-rw-r--r--libre/iceweasel-l10n/PKGBUILD172
-rw-r--r--libre/iceweasel-noscript/PKGBUILD8
-rw-r--r--libre/iceweasel/PKGBUILD25
-rw-r--r--libre/iceweasel/iceweasel-fixed-loading-icon.png (renamed from libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png)bin12184 -> 12184 bytes
-rw-r--r--libre/iceweasel/libre.patch54
-rw-r--r--libre/iceweasel/rhbz-966424.patch23
15 files changed, 202 insertions, 169 deletions
diff --git a/libre/ca-certificates-cacert/PKGBUILD b/libre/ca-certificates-cacert/PKGBUILD
index 444cded6f..57c8c3ae6 100644
--- a/libre/ca-certificates-cacert/PKGBUILD
+++ b/libre/ca-certificates-cacert/PKGBUILD
@@ -1,32 +1,26 @@
# $Id: PKGBUILD 220625 2014-08-24 14:47:59Z heftig $
# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=ca-certificates-cacert
pkgver=20140824
-pkgrel=0.1.parabola1 # build with 0.x only and keep this package on [libre] temporally until which Arch official package be moved from [testing] to some stable repo
+pkgrel=0.1.parabola3 # build with 0.x only and keep this package on [libre] temporally until which Arch official package be moved from [testing] to some stable repo
pkgdesc="CAcert.org root certificates"
arch=(any)
url="https://www.cacert.org/index.php?id=3"
license=('custom:RDL')
-depends=(ca-certificates)
+depends=(ca-certificates=20140325-1)
install=ca-certificates-cacert.install
-source=(CAcert.org_root.crt::http://www.cacert.org/certs/root.crt
- CAcert.org_class3.crt::http://www.cacert.org/certs/class3.crt
+source=(http://www.cacert.org/certs/root.crt
+ http://www.cacert.org/certs/class3.crt
LICENSE)
sha256sums=('c0e0773a79dceb622ef6410577c19c1e177fb2eb9c623a49340de3c9f1de2560'
'f5badaa5da1cc05b110a9492455a2c2790d00c7175dcf3a7bcb5441af71bf84f'
'2d9007a467e72d437ecfa13cc605c371e98a469f1aac4c890be74f953559833c')
-build() {
- printf "cacert/%s\n" *.crt > cacert.conf
-}
-
package() {
- local _certdir="$pkgdir/usr/share/ca-certificates/cacert"
- install -d "$_certdir"
- install -t "$_certdir" -m644 *.crt
-
- install -Dm644 cacert.conf "$pkgdir/etc/ca-certificates/conf.d/cacert.conf"
+ [[ "$(openssl x509 -noout -fingerprint -in root.crt)" == "SHA1 Fingerprint=13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33" ]] && install -Dm644 root.crt "${pkgdir}/usr/share/ca-certificates/cacert.org/cacert.org_root.crt"
+ [[ "$(openssl verify -CAfile root.crt -verbose class3.crt)" == "class3.crt: OK" ]] && install -Dm644 class3.crt "${pkgdir}/usr/share/ca-certificates/cacert.org/cacert.org_class3.crt"
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/libre/ca-certificates-cacert/ca-certificates-cacert.install b/libre/ca-certificates-cacert/ca-certificates-cacert.install
index 0edbb0d72..eb11f6607 100644
--- a/libre/ca-certificates-cacert/ca-certificates-cacert.install
+++ b/libre/ca-certificates-cacert/ca-certificates-cacert.install
@@ -1,11 +1,26 @@
post_install() {
- usr/bin/update-ca-certificates --fresh &>/dev/null
+ #UPDATE FILE NAMES IN ca-certificates.conf IF THEY'RE OUT OF DATE
+ [[ `grep -c "mozilla/cacert.org" /etc/ca-certificates.conf` -gt 0 ]] && sed -i 's/mozilla\/cacert\.org/cacert\.org\/cacert\.org/g' /etc/ca-certificates.conf
+ [[ `grep -c "cacert.org/cacert.org-" /etc/ca-certificates.conf` -gt 0 ]] && sed -i 's/cacert\.org\/cacert\.org-/cacert\.org\/cacert\.org_/g' /etc/ca-certificates.conf
+
+ #ADD THE CERTIFICATES TO ca-certificates.conf IF THEY'RE MISSING
+ [[ `grep -c "cacert.org/cacert.org_root.crt" /etc/ca-certificates.conf` -eq 0 ]] && echo "cacert.org/cacert.org_root.crt" >> /etc/ca-certificates.conf
+ [[ `grep -c "cacert.org/cacert.org_class3.crt" /etc/ca-certificates.conf` -eq 0 ]] && echo "cacert.org/cacert.org_class3.crt" >> /etc/ca-certificates.conf
+
+ #UPDATE THE CERTIFICATES BASED ON ca-certificates.conf
+ update-ca-certificates --fresh
}
post_upgrade() {
- post_install
+ post_install
}
-pre_remove() {
- post_install
+post_remove() {
+ grep -v "cacert.org" /etc/ca-certificates.conf > /dev/shm/ca-certificates.conf.tmp
+ if [[ -s /dev/shm/ca-certificates.conf.tmp ]]; then
+ mv /dev/shm/ca-certificates.conf.tmp /etc/ca-certificates.conf
+ update-ca-certificates --fresh
+ else
+ echo "An error occurred that prevented the cacert.org certificates from being removed from /etc/ca-certificates.conf, please remove them manually, then run update-ca-certificates --fresh"
+ fi
}
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany/PKGBUILD
index 114d396a1..f21e94e0a 100644
--- a/libre/epiphany-libre/PKGBUILD
+++ b/libre/epiphany/PKGBUILD
@@ -3,29 +3,27 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: Márcio Silva <coadde@parabola.nu>
-_pkgname=epiphany
-pkgname=epiphany-libre
+pkgname=epiphany
pkgver=3.12.1
-pkgrel=2
+pkgrel=2.parabola1
install=epiphany.install
pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils' 'gnome-icon-theme-symbolic' 'gcr' 'gnome-desktop' 'libwnck3' 'gnome-themes-standard')
makedepends=('intltool' 'itstool' 'docbook-xml' 'startup-notification' 'gobject-introspection')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
options=('!emptydirs')
groups=('gnome')
url="https://wiki.gnome.org/Apps/Web"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
git-fixes.patch)
sha256sums=('16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93'
'22b026b30e4792b3244f3fecf12bd48f928efc34097bf501d87611f77c0750bf')
prepare() {
- cd $_pkgname-$pkgver
+ cd $pkgname-$pkgver
# Patch up to f43f9af7b195de53011b2e22c91041674dc00e2e
patch -Np1 -i ../git-fixes.patch
@@ -44,9 +42,9 @@ prepare() {
}
build() {
- cd $_pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/$_pkgname
+ --localstatedir=/var --libexecdir=/usr/lib/$pkgname
# https://bugzilla.gnome.org/show_bug.cgi?id=655517
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -55,6 +53,6 @@ build() {
}
package() {
- cd $_pkgname-$pkgver
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/libre/epiphany-libre/epiphany.install b/libre/epiphany/epiphany.install
index 8b17fa3d4..8b17fa3d4 100644
--- a/libre/epiphany-libre/epiphany.install
+++ b/libre/epiphany/epiphany.install
diff --git a/libre/epiphany-libre/git-fixes.patch b/libre/epiphany/git-fixes.patch
index 47215e3a0..47215e3a0 100644
--- a/libre/epiphany-libre/git-fixes.patch
+++ b/libre/epiphany/git-fixes.patch
diff --git a/libre/evince-libre/PKGBUILD b/libre/evince/PKGBUILD
index e31379442..9e2513935 100644
--- a/libre/evince-libre/PKGBUILD
+++ b/libre/evince/PKGBUILD
@@ -2,17 +2,15 @@
# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgname=evince
-pkgname=evince-libre
+pkgname=evince
pkgver=3.12.2
-pkgrel=1
+pkgrel=1.parabola1
pkgdesc="Document viewer (PDF, Postscript, djvu, tiff, dvi, XPS, SyncTex support with gedit, comics books (cbr,cbz,cb7 and cbt)), with libarchive support"
url="https://wiki.gnome.org/Apps/Evince"
arch=(i686 x86_64 mips64el)
license=(GPL)
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas)
makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python)
optdepends=('texlive-bin: DVI support'
@@ -23,17 +21,17 @@ optdepends=('texlive-bin: DVI support'
groups=(gnome)
install=evince.install
options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
libarchive.patch)
sha256sums=('30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d'
'023f01f40c5efb8bf245d97067b3ef1da74f96a0bc53e53eb3d990d6c29b9e5e')
prepare() {
- cd $_pkgname-$pkgver
+ cd $pkgname-$pkgver
patch -Np1 -i ../libarchive.patch
}
build() {
- cd $_pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --libexecdir=/usr/lib/evince \
--disable-static --enable-nautilus \
@@ -46,6 +44,6 @@ build() {
}
package() {
- cd $_pkgname-$pkgver
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/libre/evince-libre/evince.install b/libre/evince/evince.install
index 1571179ca..1571179ca 100644
--- a/libre/evince-libre/evince.install
+++ b/libre/evince/evince.install
diff --git a/libre/evince-libre/libarchive.patch b/libre/evince/libarchive.patch
index f86908267..f86908267 100644
--- a/libre/evince-libre/libarchive.patch
+++ b/libre/evince/libarchive.patch
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index d0cee155c..f93f4afbf 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 116600 2014-07-30 17:58:37Z spupykin $
+# $Id: PKGBUILD 118113 2014-09-01 09:22:05Z spupykin $
# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=icecat-noscript
-pkgver=2.6.8.36
+pkgver=2.6.8.39
pkgrel=1
pkgdesc="Extension for icecat which disables script"
arch=('any')
@@ -14,7 +14,7 @@ depends=()
provides=($_pkgname=$pkgver)
makedepends=('unzip')
source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a296c3d54f805ffa8602056ac0976183')
+md5sums=('b25e91b44d2fa79cf45e0d7158764853')
package() {
depends=("icecat")
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index acf61fc3a..16378ec17 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -6,8 +6,8 @@
# Based on icecat-l10n package, which is in turn based on firefox-i18n
_debname=iceweasel
-_debver=31.0
-_debrel=deb3
+_debver=32.0
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -21,11 +21,11 @@ pkgname=(
)
epoch=1
pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
-url="http://packages.debian.org/sid/iceweasel"
+url="http://packages.debian.org/experimental/iceweasel"
license=('MPL' 'GPL')
depends=("iceweasel>=$epoch:$pkgver")
makedepends=('unzip' 'zip')
@@ -71,85 +71,85 @@ for lang in ${_langpacks[@]}; do
done
md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
- '979ec90c56bfc695a484ebc4479be3ce'
- '662a26993001d48de45365e7c808091e'
- '8d562e0f467b1316c7811b5cfeb855da'
- 'a20c8ee5637816e67d1900309211252c'
- 'e1409ca1ff01b10bd8f07e10e31875a0'
- '5eb46901a50b2cef0bd977cf418567b7'
- '36b3ba57e51781df14b9bb2199e502af'
- '096ff9ca1d6904261e163743282b75dc'
- 'd64dae5555f0beb4da9123e5a64203db'
- 'ef776031aa632b441fffa9ac7b8c072e'
- '4ac278707bfe62bb59f0601dfa3eed75'
- '427cc1af4a53579fe4e7ec21242a1655'
- 'cca7a103d85f37905398e309e95bb977'
- '39ee08a93a6d655e2eb0e460f148cffe'
- '83c952187cd743e505eed9823835d31a'
- '804d8c1801c232a5084d307aa700da85'
- '645af177570b685906ba5815526826d4'
- 'aafe3dfdb59b28484c55b81f38794553'
- '292099a2fe1614d02596f8bb6cd98918'
- '8bb47d2ecf286100b61cf9a61d64f1de'
- 'dac09081bd85c2f0fae1f7d38380761f'
- '1c9ffc02ca1cf802b663268e6b077225'
- '288a9c5b629fdae2a5f1553b654fd878'
- '18dc916ae974a705992ec861d7aa8316'
- 'e14749922e341e97d03d1c83e62c63db'
- '251e052f280f1a4e4cc4f23d52d0f30d'
- '8419f10cd10eeb0fb22ce6240f0598b5'
- 'cfdd7e3492c1208bf78f22aad52fb107'
- '067bab944ef8399249e43e18e898193a'
- 'd10b7551bfc33120da853023a6484bc0'
- '4f1603913b44ed167cade9f6c62c574e'
- '3495cbc3a15aaeae161989f96b3d24c7'
- '87056c69475ea27262c50b321a963fe3'
- 'a044d04b035558551115fc2ad002e9c1'
- 'c1c45e7b76e43c09cdcc3097e7f6ade3'
- 'a02519f058d73dee907d599bdb233406'
- '32613aba1de7282c8ac5a509c5dd3e94'
- '56c07bb7c2c7ee51c4998e81ad289a7b'
- '6c84990bcbc5c91f5c3483f296579df5'
- 'ae14d3dd2ff9d64c2ca028e201ac613b'
- '18cb3976689b013e6d775d99e2125b2b'
- '79e2fb29720f8492dea92470ed7a4e03'
- 'c50ad985dd4642f8c5bab98085fa2ff2'
- '0842667ba5d995163d10a774640a60f8'
- 'fce10ed28f34ad871c921d2ccfea2147'
- '9d54f086ba8af6136f5984c7408d3b90'
- '06045af8b26935f63254496018a5adef'
- '04e2d0f5b44f042b5fbd5bdddebd424d'
- '06d42fb7f1cdb619c94af022aa7ac447'
- 'dd0ddb81303e942d18576f9eaebbd79e'
- '475f3af7145ed17299fa9b8eed470089'
- '42cc9832ba4f2c4a03abbd8513ec4f7e'
- '884d28f9177da50c9b76edd68df0e77f'
- '06a4491cb14f093d396ff0164334dc17'
- '9d696d3887847f77ac6ab412123cab98'
- 'ed8edf5905f8cd27ac4c20b735f0c53b'
- 'd425800c2c8fdeb876ad5bef1666f83e'
- 'f75a4b6849be93d5dc23496b8f440341'
- '5cd7bc02af507fd379e32da3654e73ec'
- 'c2568fdc3534751b8f6fe8cf70f0aa11'
- 'c23385cc4fabcfbf8465cd6253cbacb7'
- '3ef0590cb8ea2087fbe990bc6e56a2af'
- '5272d687712b19c496d14a9066553ee6'
- '5ffa4cfdd724aa6ad109c0bf606afb49'
- '6720efd0ae70606db437cfa70a2d7eec'
- 'b71a931434a57f7d9c411753afaa0674'
- 'c06732385841d960b7fef22d165ddb1d'
- '7be4f43aa57a590fda8b6e5b87df85bb'
- 'da92fc0800199db392a175a719906d56'
- '113fb7306a9965c72291bbdfc74e5320'
- '1b352f6bfbcd2b27613afcc55d5b446f'
- '9e8d722c89779bfa30c83b511025230a'
- '331e9a31e58f498fa3d4a5f51dfef592'
- 'e770a61776efe20f2c0b888437ce6ed5'
- '017418f19a2843a59045f19c1a1aa31b'
- 'df8e5b2da59586adbe6c234695a27e93'
- 'd6d9e8c5c479b5987fc7ca3040783bdd'
- '2bd5b500633faee4ddb6d0d2967cb3d3'
- '3fefc5619b1d62eaf1875f609cfb8056'
- '28bde01725d455837e2ced5915d3886d'
- '8b1edd424031edd3dd70c94892eedb8f'
- 'dd5f8c7b67b6edf0ed83602636f8ce32')
+ '02a7ae67d8c788aad11b263c4e1e64e4'
+ '6fd383a5eeaa242066902f04b40f9743'
+ '6e0f68a2f69057d2c33b588fb72474d3'
+ 'ea9f74d969f0388d2d856839cd875385'
+ 'cb6284946220eee8668fdff7e53bf110'
+ 'af07b493c06bf6e9167dd238df8893ca'
+ '80754795f819d6053263427429850bcf'
+ 'd430ed275f210842b82eca83c45dade3'
+ '63707911152fc15947979b48d66d3704'
+ '01af1fa3037b98bc95eb25ee796ca6d4'
+ '31e1622fe413dbbb91490849aa098b90'
+ '1b6c4962984baeb43f2071e315425eb2'
+ '5b7f24c45e19f3d6707ebd94b962a210'
+ '9bf5772c4b2f8af7c9f93972a18bbc83'
+ '6db33d279065faef1bc7a82613742476'
+ '3d85d4d9d54bd261d5125fa654bf8d24'
+ '07a23e7a50616127752780216c33e114'
+ 'a2887f9364103b5a368011ab0c6951b8'
+ '82e22846b21630a4f67619a6425bcf2c'
+ '59778e643d8d646bbee4e71e4adeeec6'
+ 'a354bf2c1079bc689df659fc64e910d6'
+ 'f6b1fad70e9661df7b76457890443117'
+ 'e3a06e21db8db03c73e6ee6642b0d7e5'
+ 'acd5a979b178603ef73dcb031f47adfc'
+ '1273247f3fc15558d82c4871c8f1036f'
+ '320e32261625662d2d4818db1e43483e'
+ 'ed2ac4ab3a5a81e95dfee66456a805f8'
+ 'c54214c020a7bf4f78b9cdb8d5512d28'
+ '1aa4178852b51161fe0dddef8caee7f0'
+ 'a60f12629fd6d75ca35f3182beaf8f2e'
+ '70ea1fa4afd93e6a7111e9c669d97299'
+ 'b8f0a5ee5828dacf7470335e99b29808'
+ 'a84292e56589ea81a70e94411ab75861'
+ 'fd172ff44577e75f820e31578449fb86'
+ '6585ba2d49255ebb751f1607cfaddf16'
+ '29758df7d0975b656666df1731ad63ed'
+ 'db728d21825f696e1cd6ca18079266e1'
+ 'bc52b428d070683f925d4ff98857881e'
+ 'b7816d5ad59e367dd660118536b19a9e'
+ 'e0e1b8267149bf69b5133a9a410e582b'
+ '52ed39d43e81d8c19732e81a4853a01d'
+ 'c0aee8cc8e552b3d1700f15d301f3738'
+ '6af9db33c0ce736b93a38c93616a830d'
+ '019bd9e4f29074641630bb05ae8c6fb8'
+ 'f35fa4270d54b6bfd29e8dbd9f6d17f0'
+ '75ce00592ad53319c3e7842a592c8983'
+ '7471ab024343cf4f5552b8cd44e7aa95'
+ '43515f38a8d479348c8a614d742fa2e1'
+ 'a0725499b6244b9f37b92ec078e77f8c'
+ 'af074a842abdd73a4592d67a0819ad73'
+ '39609d71b67aa01d9a3b7db20e56c3a4'
+ 'ae69255817b08cb42417fddf69a320c8'
+ '43bcb244d531487cf8f1bb5960ad7453'
+ '296f91c03696702c88e1c2923774b784'
+ '95b55b6ff35c4075e0f06cf78334e18f'
+ 'ba76bdd9cae9fd2748db796e7769fe9f'
+ '4f9c8814ba532790fbc0b209777b1e72'
+ '91cbfbfd18ba52ece433b544c7a8aef6'
+ '755ec20ab6fec6ca471f6c86f8d60886'
+ '15eaa73c5e6d601ec53d0526f95e77d6'
+ '10861b5a187ef1a969299122050ef41b'
+ '199106f9094425fc874ee24254060e45'
+ '61e35e58878f4c5dafc458dba057b4d8'
+ 'fdc87b45b44f5d5b8a85a44c3e2028fd'
+ 'c9720da542948d5a1a69041191a6d302'
+ 'f49dd949d9779a6f4a30391657f361ab'
+ 'a1aa60b6e22709699bf17850aa7a01d1'
+ 'a926c4d2835e9dcc0bab18b5eb87601e'
+ '0e84e628bbcdd55362ccb4f00ea56336'
+ 'af4fb574e3f47f1807fcbd3b2c76e986'
+ 'b6ec92475fc12d697c8e424fe3a3b4b6'
+ '835841730a30ee0407f01b220e249c82'
+ '06874bb9946f9f086b41f9f158fd453a'
+ '6cdf573eb1a62753e28ae1f987a16847'
+ 'e50589bcc053adc4f92bae61477eccf3'
+ '0feb316ea87be3529b7b408348950666'
+ 'f5ed012117d28856316845be0c7f6939'
+ '3be3c35dc8671e4ccef82d14cf42393f'
+ '6c87ce1ad4098fd1005578c870e023d1'
+ '4eb0bcec7a2ba155423144eb089330f2'
+ 'd0eb522610f6f92b539ce29c673564b0'
+ 'f638ef46aeb5ac56ce815230afadac90')
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 2dda0ddcc..6e253464a 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 116600 2014-07-30 17:58:37Z spupykin $
+# $Id: PKGBUILD 118113 2014-09-01 09:22:05Z spupykin $
# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=iceweasel-noscript
-pkgver=2.6.8.36
-pkgrel=1.1
+pkgver=2.6.8.39
+pkgrel=1
pkgdesc="Extension for iceweasel which disables script"
arch=('any')
url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
provides=($_pkgname=$pkgver)
makedepends=('unzip')
source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a296c3d54f805ffa8602056ac0976183')
+md5sums=('b25e91b44d2fa79cf45e0d7158764853')
package() {
depends=("iceweasel")
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 122e6138e..b450b632f 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -12,10 +12,10 @@
_pgo=true
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=31.0
-_debrel=deb3
+_debver=32.0
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -38,7 +38,7 @@ fi
optdepends=('networkmanager: Location detection via available WiFi networks'
'gst-plugins-good: h.264 video'
'gst-libav: h.264 video')
-url="http://packages.debian.org/sid/${pkgname}"
+url="http://packages.debian.org/experimental/${pkgname}"
install=iceweasel.install
replaces=('firefox' "${pkgname}-libre")
conflicts=('firefox' "${pkgname}-libre")
@@ -52,16 +52,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
iceweasel.desktop
iceweasel-install-dir.patch
vendor.js
- iceweasel-20.0.1-fixed-loading-icon.png)
-md5sums=('52fc839ddc92223023d98c600075cd9e'
- '11f646159f802ac0bdb4900d9953e9f6'
+ rhbz-966424.patch
+ iceweasel-fixed-loading-icon.png)
+md5sums=('cfc55fb35f740f90736381c6060534de'
+ 'bf737a17c17b2ac01742b84921bbc5d0'
'2f5cb3df42b09fbfeaee5e72e5433ab9'
'df08eaa1ac3bc6c2356be4fbf8ec8932'
- '038ce8cedafb790041fb9842ad0f21f4'
+ '27f6c4f656600d559629013427f7fa7d'
'b03a979a78484503ba8dddad4f2c96d1'
'7b9e5996dd9fe0b186a43a297db1c6b5'
'1c42509891cf6843660a5f3c69896e80'
'd6d1d8fa09082766ba8df2ca4b898cba'
+ '8c1578232b7a60fa1caa9a0b322d1e2b'
'6e335a517c68488941340ee1c23f97b0')
prepare() {
@@ -86,6 +88,9 @@ prepare() {
# Install to /usr/lib/iceweasel
patch -Np1 -i "$srcdir/iceweasel-install-dir.patch"
+ # https://bugs.archlinux.org/task/41689
+ patch -Np1 -i "$srcdir/rhbz-966424.patch"
+
# Patch and remove anything that's left
patch -Np1 -i "$srcdir/libre.patch"
sed -i 's|Adobe Flash|SWF Player|g;
@@ -159,9 +164,9 @@ prepare() {
# Fix tab loading icon (flickers with libpng 1.6)
# https://bugzilla.mozilla.org/show_bug.cgi?id=841734
- # TODO: Remove this; Iceweasel 32 will use CSS animations for the loading icon
+ # TODO: Remove this; Iceweasel 34 might use CSS animations for the loading icon
# https://bugzilla.mozilla.org/show_bug.cgi?id=759252
- cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
+ cp "$srcdir/iceweasel-fixed-loading-icon.png" \
browser/themes/linux/tabbrowser/loading.png
# Remove non-existent file on Makefile.in
diff --git a/libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel/iceweasel-fixed-loading-icon.png
index 55f25e591..55f25e591 100644
--- a/libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png
+++ b/libre/iceweasel/iceweasel-fixed-loading-icon.png
Binary files differ
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 08704affd..7884ec5ba 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,8 +1,8 @@
diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js 2014-07-23 13:16:30.287622288 -0300
-+++ mozilla-release/browser/app/profile/firefox.js 2014-07-23 13:19:13.362141893 -0300
-@@ -281,11 +281,6 @@
- pref("browser.slowStartup.timeThreshold", 50000);
+--- mozilla-release.orig/browser/app/profile/firefox.js 2014-09-05 17:00:02.762187158 -0300
++++ mozilla-release/browser/app/profile/firefox.js 2014-09-05 17:02:57.786772902 -0300
+@@ -282,11 +282,6 @@
+ pref("browser.slowStartup.timeThreshold", 45000);
pref("browser.slowStartup.maxSamples", 5);
-// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
@@ -13,7 +13,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
pref("browser.enable_automatic_image_resizing", true);
pref("browser.chrome.site_icons", true);
pref("browser.chrome.favicons", true);
-@@ -1489,12 +1484,7 @@
+@@ -1540,12 +1535,7 @@
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
@@ -639,8 +639,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
if (window.scrollMaxX) {
document.body.setAttribute("narrow", "true");
diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-06-05 22:15:17.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-06-11 23:51:17.789464976 -0300
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-08-26 00:37:44.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-09-05 17:02:57.806773064 -0300
@@ -43,15 +43,6 @@
<input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
</form>
@@ -657,7 +657,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
</div>
<div class="spacer"/>
-@@ -67,6 +58,6 @@
+@@ -71,6 +62,6 @@
<button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
</div>
@@ -666,8 +666,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
</body>
</html>
diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/jar.mn
---- mozilla-release.orig/browser/base/jar.mn 2014-06-05 22:15:17.000000000 -0300
-+++ mozilla-release/browser/base/jar.mn 2014-06-11 23:51:17.812798511 -0300
+--- mozilla-release.orig/browser/base/jar.mn 2014-08-26 00:37:44.000000000 -0300
++++ mozilla-release/browser/base/jar.mn 2014-09-05 17:05:26.448079382 -0300
@@ -32,7 +32,7 @@
content/browser/abouthome/settings.png (content/abouthome/settings.png)
content/browser/abouthome/restore.png (content/abouthome/restore.png)
@@ -682,12 +682,12 @@ diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/
content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png)
content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
- content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png)
- #ifdef MOZ_SERVICES_HEALTHREPORT
- content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml)
- content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js)
+
+ content/browser/aboutneterror/netError.xhtml (content/aboutneterror/netError.xhtml)
+ content/browser/aboutneterror/netError.css (content/aboutneterror/netError.css)
diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd
---- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-06-05 22:15:18.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-06-11 23:51:17.836132046 -0300
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-08-26 00:37:46.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-09-05 17:02:57.820106506 -0300
@@ -13,17 +13,6 @@
<!ENTITY abouthome.searchEngineButton.label "Search">
@@ -705,7 +705,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dt
-
<!ENTITY abouthome.bookmarksButton.label "Bookmarks">
<!ENTITY abouthome.historyButton.label "History">
- <!ENTITY abouthome.settingsButton.label "Settings">
+ <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2014-07-16 22:45:07.000000000 -0300
+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2014-07-23 13:32:03.204266405 -0300
@@ -787,8 +787,8 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
</DL><p>
</DL><p>
diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm
---- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-06-05 22:15:18.000000000 -0300
-+++ mozilla-release/browser/modules/AboutHome.jsm 2014-06-11 23:51:17.926132826 -0300
+--- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-08-26 00:37:46.000000000 -0300
++++ mozilla-release/browser/modules/AboutHome.jsm 2014-09-05 17:07:48.222390205 -0300
@@ -8,7 +8,7 @@
let Ci = Components.interfaces;
let Cu = Components.utils;
@@ -798,9 +798,9 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -18,66 +18,6 @@
- XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
- "resource://gre/modules/FxAccounts.jsm");
+@@ -20,66 +20,6 @@
+ XPCOMUtils.defineLazyModuleGetter(this, "Promise",
+ "resource://gre/modules/Promise.jsm");
-// Url to fetch snippets, in the urlFormatter service format.
-const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl";
@@ -865,14 +865,14 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
/**
* This code provides services to the about:home page. Whenever
* about:home needs to do something chrome-privileged, it sends a
-@@ -202,18 +142,9 @@
- ss.promiseInitialized.then(function() {
+@@ -229,18 +169,9 @@
+ }).then(function(engineName) {
let data = {
showRestoreLastSession: ss.canRestoreLastSession,
- snippetsURL: AboutHomeUtils.snippetsURL,
- showKnowYourRights: AboutHomeUtils.showKnowYourRights,
- snippetsVersion: AboutHomeUtils.snippetsVersion,
- defaultEngineName: Services.search.defaultEngine.name
+ defaultEngineName: engineName
};
- if (AboutHomeUtils.showKnowYourRights) {
@@ -885,9 +885,9 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
target.messageManager.sendAsyncMessage("AboutHome:Update", data);
} else {
diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
---- mozilla-release.orig/modules/libpref/src/init/all.js 2014-09-03 04:25:46.017695291 -0300
-+++ mozilla-release/modules/libpref/src/init/all.js 2014-09-03 04:44:10.801521540 -0300
-@@ -4268,19 +4268,6 @@
+--- mozilla-release.orig/modules/libpref/src/init/all.js 2014-09-05 17:00:02.748853744 -0300
++++ mozilla-release/modules/libpref/src/init/all.js 2014-09-05 17:02:57.840106668 -0300
+@@ -4024,19 +4024,6 @@
// Number of stack frames to capture in createObjectURL for about:memory.
pref("memory.blob_report.stack_frames", 0);
diff --git a/libre/iceweasel/rhbz-966424.patch b/libre/iceweasel/rhbz-966424.patch
new file mode 100644
index 000000000..c4c332e9e
--- /dev/null
+++ b/libre/iceweasel/rhbz-966424.patch
@@ -0,0 +1,23 @@
+--- a/toolkit/modules/CertUtils.jsm
++++ b/toolkit/modules/CertUtils.jsm
+@@ -170,17 +170,19 @@ this.checkCert =
+ issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
+ var tokenNames = issuerCert.getAllTokenNames({});
+
+ if (!tokenNames || !tokenNames.some(isBuiltinToken))
+ throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
+ }
+
+ function isBuiltinToken(tokenName) {
+- return tokenName == "Builtin Object Token";
++ return tokenName == "Builtin Object Token" ||
++ tokenName == "Default Trust" ||
++ tokenName == "System Trust";
+ }
+
+ /**
+ * This class implements nsIBadCertListener. Its job is to prevent "bad cert"
+ * security dialogs from being shown to the user. It is better to simply fail
+ * if the certificate is bad. See bug 304286.
+ *
+ * @param aAllowNonBuiltInCerts (optional)