diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-14 19:20:46 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-14 19:20:46 -0400 |
commit | f7fd1d99d87f11c41cf09f881b1aeb950a3c8e13 (patch) | |
tree | 95910fb3078e1136e35aaa6d9f0f251cdb4ca1a8 /libre | |
parent | 09c1bb45d89c78a9fd80c7a500cb29a0908dc668 (diff) | |
parent | cd640e7ca0a8968edf887d03db8224334f663e84 (diff) | |
download | abslibre-f7fd1d99d87f11c41cf09f881b1aeb950a3c8e13.tar.gz abslibre-f7fd1d99d87f11c41cf09f881b1aeb950a3c8e13.tar.bz2 abslibre-f7fd1d99d87f11c41cf09f881b1aeb950a3c8e13.zip |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre')
54 files changed, 319 insertions, 1192 deletions
diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD index 84eabd29c..9652da0db 100644 --- a/libre/acpi_call-libre/PKGBUILD +++ b/libre/acpi_call-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112482 2014-06-02 19:16:06Z foutrelis $ +# $Id: PKGBUILD 112886 2014-06-09 12:13:38Z foutrelis $ # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com> # Contributor (Arch): mortzu <me@mortzu.de> # Contributor (Arch): fnord0 <fnord0@riseup.net> @@ -7,7 +7,7 @@ _pkgname=acpi_call pkgname=acpi_call-libre pkgver=1.1.0 -pkgrel=4 +pkgrel=5 _extramodules=extramodules-3.14-LIBRE pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre kernel package)' arch=('i686' 'x86_64') diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 9964d4e98..e68b417c6 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112484 2014-06-02 19:16:18Z foutrelis $ +# $Id: PKGBUILD 112888 2014-06-09 12:13:51Z foutrelis $ # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor (Arch): M0Rf30 # Contributor (Arch): Samsagax <samsagax@gmail.com> @@ -8,7 +8,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.8 _extramodules=extramodules-3.14-LIBRE # Don't forget to update bbswitch.install -pkgrel=8 +pkgrel=9 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index e29ba491e..73c635297 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 106211 2014-02-25 15:02:06Z bpiotrowski $ +# $Id: PKGBUILD 113111 2014-06-13 18:57:57Z eric $ # Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com> _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.10.0 +pkgver=4.0.0 pkgrel=1 -pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." +pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors') makedepends=('uthash' 'yasm') replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) -url='https://bitcointalk.org/index.php?topic=168174.0' +url='http://bfgminer.org/' license=('GPL3') -source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 +source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz remove-dangerous-rpath.patch) -sha256sums=('12458aed84abc4a953532fe0645772492701e5d627f56f62d382aa0f458a10d5' +sha256sums=('feec7d4ada6ceae456656b68188df05d095bbd7fc9839368f65dcd52b04f7539' 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 770e5a224..aee169fd9 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112255 2014-05-30 17:49:50Z jelle $ +# $Id: PKGBUILD 113113 2014-06-13 19:40:31Z jelle $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.39.0 +pkgver=1.40.0 pkgrel=1 pkgdesc="Ebook management application, without nonfree libunrar support" arch=('i686' 'x86_64' 'mips64el') @@ -32,8 +32,8 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver} 'desktop_integration.patch' 'calibre-mount-helper' 'libre.patch') -mkmd5sums=('38aa711c11586eb365bc5ff522cf9b58') -md5sums=('fad9ab43170f284dcb159413093de2e4' +mkmd5sums=('4fb8c0273e9bf14698fe99a89c9e2a65') +md5sums=('d4c862b8b1590b116275393512909284' 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7' '073a36adbb3628d21c2dff8b41e84abe') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 9c8ae1354..4bc76b463 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 211789 2014-04-26 10:47:56Z andyrtr $ +# $Id: PKGBUILD 214332 2014-06-06 21:41:24Z andyrtr $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.53 -pkgrel=2 +pkgver=1.0.54 +pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" @@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar. provides=("${_pkgname}=${pkgver}" 'foomatic-filters') replaces=("${_pkgname}" 'foomatic-filters') conflicts=("${_pkgname}" 'foomatic-filters') -md5sums=('f9df275dd161eb0364f40c6f00d755a4') +md5sums=('a2785a3dbe5d4977189363828b93d2cf') build() { cd $_pkgname-$pkgver diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 9590f1a83..16d3b8944 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -4,8 +4,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=filesystem -pkgver=2014.05 -pkgrel=2 +pkgver=2014.06 +pkgrel=1 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,13 +21,13 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' 'locale.sh') -md5sums=('e26a6b21c1e154e87a5c45e8b8c366fd' +md5sums=('764dca1d786d43fbee33364ccbebfcd3' '6be47d893fd49b2e4a8c0e811b350861' '9e4533df61f0c82d6b2e2371f7376282' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' - '932af5f313265a774ec5995d9e720025' + '18a8a3564f40a28d8f9f6060001c6f9e' '2ef2429c2c98d0883906aa6f5363be80' '693c97f2c9a519bb97a17008e92c2b74' '1745349eb24ed21b4cfaa6f423bddb76' diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 62e553ce4..7a43b24df 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -38,6 +38,8 @@ post_upgrade() { _adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin _addgroup systemd-timesync -g 192 _adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin + _addgroup systemd-network -g 193 + _adduser systemd-network -u 193 -g 193 -d / -s /usr/bin/nologin # sync gshadow to group (fixes FS#19869) if ! grep -q '^lock:' etc/gshadow; then diff --git a/libre/filesystem/group b/libre/filesystem/group index 0d0918cbb..3a481a2c0 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -35,3 +35,4 @@ users:x:100: systemd-journal:x:190: systemd-journal-gateway:x:191: systemd-timesync:x:192: +systemd-network:x:193: diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index b65b7cc8a..2f404bb41 100644 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd @@ -1,11 +1,12 @@ root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/bin/false -daemon:x:2:2:daemon:/sbin:/bin/false -mail:x:8:12:mail:/var/spool/mail:/bin/false -ftp:x:14:11:ftp:/srv/ftp:/bin/false -http:x:33:33:http:/srv/http:/bin/false +bin:x:1:1:bin:/bin:/usr/bin/nologin +daemon:x:2:2:daemon:/sbin:/usr/bin/nologin +mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin +ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin +http:x:33:33:http:/srv/http:/usr/bin/nologin uuidd:x:68:68:uuidd:/:/sbin/nologin dbus:x:81:81:dbus:/:/sbin/nologin -nobody:x:99:99:nobody:/:/bin/false -systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/bin/false -systemd-timesync:x:192:192:systemd-timesync:/:/bin/false +nobody:x:99:99:nobody:/:/usr/bin/nologin +systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/usr/bin/nologin +systemd-timesync:x:192:192:systemd-timesync:/:/usr/bin/nologin +systemd-network:x:193:193:systemd-network:/:/usr/bin/nologin diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 89fb50fd2..aa97da2e4 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 210088 2014-04-09 19:22:29Z andyrtr $ +# $Id: PKGBUILD 214338 2014-06-06 21:56:37Z andyrtr $ +# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer (Arch): Tom Gundersen <teg@jklm.no> # Contributor (Arch): Rémy Oudompheng <remy@archlinux.org> # Contributor (Arch): Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.14.4 +pkgver=3.14.6 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64') @@ -22,7 +23,7 @@ optdepends=('cups: for printing support' 'python2-notify: for Desktop notification support' 'python2-reportlab: for pdf output in hp-scan' 'rpcbind: for network support' - 'python2-pyqt4: for running hp-toolbox' + 'python2-pyqt4: for running GUI and hp-toolbox' 'python2-gobject2: for running hp-toolbox' 'libusb: for advanced usb support') replaces=($_pkgname) @@ -31,7 +32,7 @@ provides=($_pkgname=$pkgver) install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} disable_upgrade.patch) -md5sums=('6e8d53fb2284271505d2e1706c01f6c5' +md5sums=('ec14b3bf3ac17a7c00b96e51d4c38114' 'SKIP' 'a853ba0eb0883f4bcee00b4277128b29') diff --git a/libre/icecat-firebug/PKGBUILD b/libre/icecat-firebug/PKGBUILD index ebe8a4fc9..2a3de297f 100644 --- a/libre/icecat-firebug/PKGBUILD +++ b/libre/icecat-firebug/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $ +# $Id: PKGBUILD 113091 2014-06-13 13:27:58Z speps $ # Maintainer (Arch): speps <speps at aur dot archlinux dot org> pkgname=icecat-firebug -pkgver=1.12.8 +pkgver=2.0 pkgrel=1 pkgdesc="IceCat plugin with tools for web development." arch=(any) @@ -11,8 +11,8 @@ license=('custom:BSD') groups=('icecat-addons') depends=('icecat') provides=('firebug' firefox-firebug=$pkgver) -source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi") -md5sums=('b93528ff22c76f6c3f63f81fe5e49496') +source=("${url}releases/firebug/$pkgver/firebug-$pkgver.xpi") +md5sums=('d628079b2bd28970be02be48608753b3') package() { # extension diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD index 2c897ae21..dad19082f 100644 --- a/libre/iceweasel-firebug/PKGBUILD +++ b/libre/iceweasel-firebug/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $ +# $Id: PKGBUILD 113091 2014-06-13 13:27:58Z speps $ # Maintainer (Arch): speps <speps at aur dot archlinux dot org> pkgname=iceweasel-firebug -pkgver=1.12.8 +pkgver=2.0 pkgrel=1 pkgdesc="Iceweasel plugin with tools for web development." arch=(any) @@ -11,8 +11,8 @@ license=('custom:BSD') groups=('iceweasel-addons') depends=('iceweasel-libre') provides=('firebug' firefox-firebug=$pkgver) -source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi") -md5sums=('b93528ff22c76f6c3f63f81fe5e49496') +source=("${url}releases/firebug/$pkgver/firebug-$pkgver.xpi") +md5sums=('d628079b2bd28970be02be48608753b3') package() { # extension diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 52b25edc3..4c43612d0 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=29.0.1 -_debrel=deb2 +_debver=30.0 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -71,85 +71,85 @@ for lang in ${_langpacks[@]}; do done md5sums=('a4593936bf1c7a9ec9368ff249f9cc56' - '5212e031eae6de237047493dd3b17839' - '5256c33646c811243d971c2948d4540f' - '1b4ebf2a5bb60a39a692e6e2bf921bc1' - 'eff8df5362b969fad2d5035f0e293c3b' - '53764ab1290f283f5cb19fa7c7851b5b' - '286a30364cbe548b8ea7869a9ed0e714' - '268d68d7f7ac0c370a55fd7f3f4c494c' - 'f06df37df6355d61b572b6088e6827e8' - '2c87dbb5025d05f95f001ab992ec9da5' - 'a1b079b85c5756b1583a13cd24863e9d' - 'b002a0c681dbac4069943b5db61c95e5' - '310af575e5c39d7962cdb56169262185' - '1f773521b7b6675582439e64d9e3d758' - '02879f164cb7cd9a13af3e1b46fea80d' - '6ea7166c043a7d4c05c210d5261c414c' - 'f65c77f6f15c04275a008d6e58bd541c' - 'c7aa15567191e72dd757691abb1a5ae7' - '46a8e0708537ea2631fe8790a383d5a7' - 'cc693b069aa1d9b4788c02e10ab788d3' - '49b31e547a79005e3e2cc0506389cfff' - 'f4f7b1752d03cb075a17fd03d2ff62de' - 'c2339402fa423f24941cc31d8317c07d' - 'eb95e0d926d08ad7d4d2c07dbaf95f1f' - '7f65d10b78824b6d68823670a2465e3e' - '29e6930e9614730c5a7c7af9918a6bf6' - '707399d8624c1d11e23449ec98ff295a' - '9f38ec248ce6d0effcbb8dc0a57d0451' - 'a142fd17b8a6210b4175787e706a1dd0' - 'f2859ececb5f37952e1251e2a4c12eb2' - '683cc117552326b7956735ce92a615c6' - 'f5fb8323242af74905a252b2aedfb8ac' - 'dd4bb43eb2667ddbce04df69d476b6eb' - '47bae6defee487720cf4af99d4800661' - '0b3140ec20919558f9ec98091701106c' - '82a89d3d33abee4c7a8e6c2fa85e975a' - 'd9ca9caf4db47f7196fc6214e0a88adf' - '0383cd4f92605bf1f9b5ee0f65aed28c' - '1b223a3e494e52c035dc60c573df1e77' - '0ad8bf4d1654e0526046e0c029e13cf5' - '8429ca65a11669c1d42c6f250b650372' - '2cbac1603a4e4363ff7322f8a09b6a86' - '3825833afcd237ef7f647bdbb9b1b385' - '009c5f3e9e3763b7f1aacfab67b351a1' - 'e617f501efd7546e2926dc314b6f4bb0' - '327748b28598bae3c3425c3392a89ee1' - 'c3c38d1e1bff579c05fb470a44d35ea6' - '5d3f5c3cd1ae88ad0fb3b93da2c55089' - '1f8df74964bf45063dfa5d313596cbe0' - '35e562ca13f45c02042619bce9e92e0c' - '57f901a464f6d474267f03980342e4b2' - 'f7fb39449967ad0da8aa567ba2e4cb96' - 'bfb7ac8d35e0418ac351e2f9494eb3eb' - '00543f199dc9043601add130bd35cf7c' - '6bfe70687da3906ff8c60084e7cd11f0' - 'b363419979847f37b61efd36d82b1b22' - '41cf324447d9e4d4d31dc570e013668e' - '3167c6aa26338edbc2fea9286b74ac92' - 'a6d70c9fa7a4eb5c18361f206b0c2853' - 'c22b649ed95516ab2f209d5f457fc7ec' - '05125f937750c8a32b21025dd795ad34' - '0566b26dd4ab9e407566a260b6fa437a' - 'df14368e5407b32f35afec5983d23065' - '26f7f8630d2af347d30158493e72dbc6' - 'e95a43f0267dc0208628a613ab36462d' - 'aa4a9f335e4b16b940e95737176138fa' - '493018de7779e66e2bd405f9a48f583d' - 'a7c85664f9d8d5de735ecb8c83888e34' - '2226e585636f8128bb2cd2bb99119798' - 'f56cc0a56c3549f6209b8075f2c96612' - 'b66c06b84b384ee2dff7ebfe99cfd5bd' - '1a7bee60f76a49385bdae30f2cba57cf' - 'e38da54ece4d168306c36f164fda7cd6' - 'd4d1ac230fdce90aab2a788f07b76c29' - 'ed2daf324d05e140da7c9c3f0530a13f' - 'ba18543af3aca23aa987c4bb1b2d721d' - '01782138beaa302f3937a8654d445349' - '39025e66895473df2a0aedb967c994ad' - 'a6023974d5bb2536afb533f55e146f30' - '6b443a261b5c71861dc162e63e276411' - '3e0d27a1975e62b3289afce485cc6a10' - '4505e984500672d97b9873cdc8f9813f' - '261941346e68fd1d3aae024734e0f9cd') + 'a4ebadbcd3792d8df1d9d781ed71de01' + 'd808ad3e592e61d0b9bc221600f083ee' + '5d337f816a8b0a66764226b490b5e2c8' + '09d45c5b359b83065276ed38e70b96fb' + '2fbbe3cf20242b703d4435204d558bdf' + '41dd62eda1522717e640db9300fa8219' + '7a5c03ecaae02beb41400d7903af771e' + '24cf8ff52b7f7568735910f2272809d4' + '5a0e6ca6b4c3eebf2c13b0897c535168' + '0c997d23e45f3aa8d906c7fefd149950' + 'f3b756e5afdf6bc5ce22e229ef9d810f' + '57a1e272e720b93988a6159c6865d61f' + 'bf16f137b99e9ef816c78e5e4eded227' + 'c503e483e5ab38e7d5fd0b4972fcbc33' + '765e13734512f2e0eb21305dfc8d4159' + '11450005daf415910863362606244dc9' + '2fddb79e2d9ed989313a3ef26600fdac' + 'c89513012b9ebcd635d1d3d0af21c894' + '7100396629a2051ef04112c785a2659c' + 'd239601f870a8d2d21b12fe7b498d0e5' + 'dd0f09e577c528e259ef1cf5d5891f1c' + 'f571a129430b6b86143ac672733e98ba' + '7048e50f5dfd348337c46aae445bdd38' + '1dccd98c3a34cd95c0a11ee49bd68f31' + '086c5270c7cead2207922da4d15295ab' + '5ddb9ac3ae4202aa619cf6c459735d3f' + '60cfabd429c222056a837bd7e0fed2ba' + 'f276e31c1c9381c99c2b193c2fdeb07b' + '97fa118868effc7aef1099404c44d1c7' + '60acbd8824d0e880108c91e9c1ac1fd2' + '74bab6b82f4cfc053b3c3bcc6bd9ad32' + '577cf1c5abc7eafcd089484efba3ca73' + 'e3c478dbc1be5dad585270de58aaa8cd' + '9448c177eeb1a601e540e3eb34061c8d' + '54238a4ddd14929278365282562b8f17' + '9748cdc9ac6d2f24040c7cd671952110' + '38154e8181ceea36939e1b2d1e9332f8' + '85a1bf8e27d54efccb2db596c860db38' + 'a16e4e09c9cec0e4222aff9631605a6f' + 'd7c50c99ccc20cf2e804d68043cbc82b' + '0d696d728e376fc49f04c871dab48b94' + '16fc03a3e98ea4a075394af4ff9380b3' + '895c82fed083616ac88f1f9b49469d7f' + '1619509e3c27400f0350b264c0002f1e' + 'ba65d345b0ac2fbf057eccf27e8f37a0' + '0e3d9acc4be099621a63d48e29516e1b' + 'c12ecc9ae543b59a8ca84f4a39ebc650' + 'e5ab76e0f6d7a26755aff3a4719e6d23' + 'b2e0be67e9e1d6b4791fde0fb0fb9214' + '1a8a299cf4b325f92d6724e8db440ce5' + '42674ca5e2dba846c4f9aafe17f746ef' + '52b261a801eac3690444282c0ce775ce' + '814508f80b8ee14c75f246d12f949c9f' + '287ac8a6e330e74e9da9da0afdb8d143' + 'afaf98af1617be4063ac02522c4781ac' + '1b54b35778cd45c35e970a68dccd8b49' + '26ba16c8126f033e87e066a617a94aec' + '1c7b8f635357d12f79309957f521f6f1' + '5675466e6e11505e7fbddf1b3a7aabd2' + '53c439be649253fb58ae5cd0458d2c4d' + '622509371083bf62233d3489d0709360' + '2e2dbfd3573a8ccf3614bf9ac0619edc' + 'be1f3d3d4aac76fe19be373dd1046859' + 'd01fee3c62ca34fc5c06295a0401eb58' + 'ddf3acdaecfbbe8f8828d66b1f055c51' + '6f21301b43463b19a4f7e73c2d0fd05b' + '8825499cf0120b8cf9a58693644e7b54' + 'd07f0ca31a841317b36c6aa00c7d51b6' + '41435530531cea6b067c69041007ba51' + '3f091773b50248ec33c12e177c4073ef' + 'd5c52bd0cb774ec9afe267d3c38aa994' + 'c5514c3eee68b19969676b73c7c3ea42' + '44a311210e2e3f4b51d134498da0d0bf' + 'e92bb2a8677c7ec8a50fa7ba35d4805f' + '1205b6b370499e2e0c7ef428bc4d2a3f' + '50297f4fda05fb09516345788938f6dc' + '20fe5a27307f924d5c8b4130fa34e18e' + '4629cdcfedd802f7d5d2b7cd0929db8a' + 'ce4a5c30aea9212cd71af9e990e95638' + 'd4b642858a1d8297d33223141a95199e' + '149b2070f4fc5116093221957bba3dfb' + '27b23f1040f2bfface3a13e1152a3d1a') diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch deleted file mode 100644 index 56de11354..000000000 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ /dev/null @@ -1,287 +0,0 @@ -From: Mike Hommey <mh@glandium.org>
-Date: Tue, 5 Jun 2012 08:57:06 +0200
-Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
-
-diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index 91c5c1c..2f8bd1a 100644
---- a/browser/components/migration/content/migration.js
-+++ b/browser/components/migration/content/migration.js
-@@ -249,7 +249,7 @@ var MigrationWizard = {
- }
-
- var brandBundle = document.getElementById("brandBundle");
-- // These strings don't exist when not using official branding. If that's
-+ // These strings may not exist when not using official branding. If that's
- // the case, just skip this page.
- try {
- var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
-@@ -281,8 +281,8 @@ var MigrationWizard = {
- case "chrome":
- source = "sourceNameChrome";
- break;
-- case "firefox":
-- source = "sourceNameFirefox";
-+ case "self":
-+ source = "brand";
- break;
- }
-
-@@ -292,7 +292,12 @@ var MigrationWizard = {
- var oldHomePageURL = this._migrator.sourceHomePageURL;
-
- if (oldHomePageURL && source) {
-- var appName = MigrationUtils.getLocalizedString(source);
-+ var appName;
-+ if (source == "brand") {
-+ appName = brandBundle.GetStringFromName("brandFullName");
-+ } else {
-+ appName = MigrationUtils.getLocalizedString(source);
-+ }
- var oldHomePageLabel =
- brandBundle.getFormattedString("homePageImport", [appName]);
- var oldHomePage = document.getElementById("oldHomePage");
-diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
-index f030756..23e37ff 100644
---- a/browser/components/migration/content/migration.xul
-+++ b/browser/components/migration/content/migration.xul
-@@ -42,7 +42,7 @@
- #elifdef XP_UNIX
- <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
- #endif
-- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
-+ <radio id="self" hidden="true"/>
- <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
- </radiogroup>
- <label id="noSources" hidden="true">&noMigrationSources.label;</label>
-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index d7fec75..d531b83 100644
---- a/browser/components/migration/src/BrowserProfileMigrators.manifest
-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
- #ifdef HAS_IE_MIGRATOR
- component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
-diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 3db6720..a3b3dda 100644
---- a/browser/components/migration/src/FirefoxProfileMigrator.js
-+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -128,7 +128,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
-
-
- FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
-
- this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
-diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 2c91e9a..08962c4 100644
---- a/browser/components/migration/src/MigrationUtils.jsm
-+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -405,12 +405,6 @@ this.MigrationUtils = Object.freeze({
- * @see nsIStringBundle
- */
- getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
-- const OVERRIDES = {
-- "4_firefox": "4_firefox_history_and_bookmarks",
-- "64_firefox": "64_firefox_other"
-- };
-- aKey = OVERRIDES[aKey] || aKey;
--
- if (aReplacements === undefined)
- return getMigrationBundle().GetStringFromName(aKey);
- return getMigrationBundle().formatStringFromName(
-@@ -625,6 +619,17 @@ this.MigrationUtils = Object.freeze({
- },
-
- /**
-+ * Returns whether a given migration type is supported.
-+ *
-+ * @param aKey Migrator key
-+ * @returns whether the migrator key is supported.
-+ */
-+ canMigrate:
-+ function MU_canMigrate(aMigratorKey) {
-+ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
-+ },
-+
-+ /**
- * Cleans up references to migrators and nsIProfileInstance instances.
- */
- finishMigration: function MU_finishMigration() {
-diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index f67823b..36016b8 100644
---- a/browser/components/migration/src/ProfileMigrator.js
-+++ b/browser/components/migration/src/ProfileMigrator.js
-@@ -12,6 +12,7 @@ function ProfileMigrator() {
-
- ProfileMigrator.prototype = {
- migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
-+ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
- QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
- classDescription: "Profile Migrator",
- contractID: "@mozilla.org/toolkit/profile-migrator;1",
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 21cf405..f3c1a6b 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-@@ -17,8 +17,6 @@
- <!ENTITY importFromSafari.accesskey "S">
- <!ENTITY importFromChrome.label "Chrome">
- <!ENTITY importFromChrome.accesskey "C">
--<!ENTITY importFromFirefox.label "Firefox">
--<!ENTITY importFromFirefox.accesskey "X">
-
- <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
-
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 094a9dc..a620905 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.properties
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
-@@ -24,30 +24,30 @@ importedSafariReadingList=Reading List (From Safari)
- 2_ie=Cookies
- 2_safari=Cookies
- 2_chrome=Cookies
--2_firefox=Cookies
-+2_self=Cookies
-
- 4_ie=Browsing History
- 4_safari=Browsing History
- 4_chrome=Browsing History
--4_firefox_history_and_bookmarks=Browsing History and Bookmarks
-+4_self=Browsing History and Bookmarks
-
- 8_ie=Saved Form History
- 8_safari=Saved Form History
- 8_chrome=Saved Form History
--8_firefox=Saved Form History
-+8_self=Saved Form History
-
- 16_ie=Saved Passwords
- 16_safari=Saved Passwords
- 16_chrome=Saved Passwords
--16_firefox=Saved Passwords
-+16_self=Saved Passwords
-
--32_ie=Favorites
-+32_ie=Favourites
- 32_safari=Bookmarks
- 32_chrome=Bookmarks
-
- 64_ie=Other Data
- 64_safari=Other Data
- 64_chrome=Other Data
--64_firefox_other=Other Data
-+64_self=Other Data
-
--128_firefox=Windows and Tabs
-+128_self=Windows and Tabs
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index d46b43b..2253994 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -28,6 +28,58 @@ function onResetProfileLoad() {
- populateResetPane("migratedItems");
- }
-
-+<<<<<<< HEAD
-+=======
-+/**
-+ * Check if reset is supported for the currently running profile.
-+ *
-+ * @return boolean whether reset is supported.
-+ */
-+function resetSupported() {
-+ let profileService = Cc["@mozilla.org/toolkit/profile-service;1"].
-+ getService(Ci.nsIToolkitProfileService);
-+ let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
-+
-+ // Reset is only supported for the default profile if the self-migrator used for reset exists.
-+ try {
-+ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-+ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
-+ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
-+ return ("canMigrate" in pm) && pm.canMigrate("self");
-+ }
-+ } catch (e) {
-+ // Catch exception when there is no selected profile.
-+ Cu.reportError(e);
-+ }
-+ return false;
-+}
-+
-+function getMigratedData() {
-+ Components.utils.import("resource:///modules/MigrationUtils.jsm");
-+
-+ // From migration.properties
-+ const MIGRATED_TYPES = [
-+ 4, // History and Bookmarks
-+ 16, // Passwords
-+ 8, // Form History
-+ 2, // Cookies
-+ ];
-+
-+ // Loop over possible data to migrate to give the user a list of what will be preserved.
-+ let dataTypes = [];
-+ for (let itemID of MIGRATED_TYPES) {
-+ try {
-+ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
-+ dataTypes.push(typeName);
-+ } catch (x) {
-+ // Catch exceptions when the string for a data type doesn't exist.
-+ Components.utils.reportError(x);
-+ }
-+ }
-+ return dataTypes;
-+}
-+
-+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
- function onResetProfileAccepted() {
- let retVals = window.arguments[0];
- retVals.reset = true;
-diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
-index f35c227..7062886 100644
---- a/toolkit/profile/nsIProfileMigrator.idl
-+++ b/toolkit/profile/nsIProfileMigrator.idl
-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
- * @client Toolkit (Startup code)
- * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
- */
--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
- interface nsIProfileMigrator : nsISupports
- {
- /**
-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
- * @note The startup code ignores COM exceptions thrown from this method.
- */
- void migrate(in nsIProfileStartup aStartup, in ACString aKey);
-+
-+ /**
-+ * Returns whether a given migration type is supported.
-+ *
-+ * @param aKey Migrator key
-+ * @returns whether the migrator key is supported.
-+ */
-+ bool canMigrate(in ACString aKey);
- };
-
- %{C++
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index fe66f3b..2ddcd3b 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3952,7 +3952,7 @@ XREMain::XRE_mainRun()
- if (gDoProfileReset) {
- // Automatically migrate from the current application if we just
- // reset the profile.
-- aKey = MOZ_APP_NAME;
-+ aKey = "self";
- }
- pm->Migrate(&mDirProvider, aKey);
- }
diff --git a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch b/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch deleted file mode 100644 index c7c4c355b..000000000 --- a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch +++ /dev/null @@ -1,108 +0,0 @@ -From: Mike Hommey <mh@glandium.org> -Date: Sat, 16 Nov 2013 13:01:17 +0900 -Subject: Fixup "Reset Firefox" after bad merge - ---- - toolkit/content/resetProfile.js | 52 ---------------------------------------- - toolkit/modules/ResetProfile.jsm | 11 +++++---- - 2 files changed, 6 insertions(+), 57 deletions(-) - -diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js -index 2253994..d46b43b 100644 ---- a/toolkit/content/resetProfile.js -+++ b/toolkit/content/resetProfile.js -@@ -28,58 +28,6 @@ function onResetProfileLoad() { - populateResetPane("migratedItems"); - } - --<<<<<<< HEAD --======= --/** -- * Check if reset is supported for the currently running profile. -- * -- * @return boolean whether reset is supported. -- */ --function resetSupported() { -- let profileService = Cc["@mozilla.org/toolkit/profile-service;1"]. -- getService(Ci.nsIToolkitProfileService); -- let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile); -- -- // Reset is only supported for the default profile if the self-migrator used for reset exists. -- try { -- if (currentProfileDir.equals(profileService.selectedProfile.rootDir) && -- "@mozilla.org/toolkit/profile-migrator;1" in Cc) { -- let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator); -- return ("canMigrate" in pm) && pm.canMigrate("self"); -- } -- } catch (e) { -- // Catch exception when there is no selected profile. -- Cu.reportError(e); -- } -- return false; --} -- --function getMigratedData() { -- Components.utils.import("resource:///modules/MigrationUtils.jsm"); -- -- // From migration.properties -- const MIGRATED_TYPES = [ -- 4, // History and Bookmarks -- 16, // Passwords -- 8, // Form History -- 2, // Cookies -- ]; -- -- // Loop over possible data to migrate to give the user a list of what will be preserved. -- let dataTypes = []; -- for (let itemID of MIGRATED_TYPES) { -- try { -- let typeName = MigrationUtils.getLocalizedString(itemID + "_self"); -- dataTypes.push(typeName); -- } catch (x) { -- // Catch exceptions when the string for a data type doesn't exist. -- Components.utils.reportError(x); -- } -- } -- return dataTypes; --} -- -->>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic - function onResetProfileAccepted() { - let retVals = window.arguments[0]; - retVals.reset = true; -diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm -index db57f2a..d618d08 100644 ---- a/toolkit/modules/ResetProfile.jsm -+++ b/toolkit/modules/ResetProfile.jsm -@@ -7,8 +7,6 @@ - this.EXPORTED_SYMBOLS = ["ResetProfile"]; - - const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; --#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; --#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; - - Cu.import("resource://gre/modules/Services.jsm"); - -@@ -25,8 +23,11 @@ this.ResetProfile = { - - // Reset is only supported for the default profile if the self-migrator used for reset exists. - try { -- return currentProfileDir.equals(profileService.selectedProfile.rootDir) && -- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc); -+ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) && -+ "@mozilla.org/toolkit/profile-migrator;1" in Cc) { -+ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator); -+ return ("canMigrate" in pm) && pm.canMigrate("self"); -+ } - } catch (e) { - // Catch exception when there is no selected profile. - Cu.reportError(e); -@@ -50,7 +51,7 @@ this.ResetProfile = { - let dataTypes = []; - for (let itemID of MIGRATED_TYPES) { - try { -- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME); -+ let typeName = MigrationUtils.getLocalizedString(itemID + "_self"); - dataTypes.push(typeName); - } catch (x) { - // Catch exceptions when the string for a data type doesn't exist. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 083262b48..0a4127d60 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,8 +14,8 @@ _pgo=true # We're getting this from Debian Sid _debname=iceweasel -_debver=29.0.1 -_debrel=deb2 +_debver=30.0 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -29,19 +29,16 @@ pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based o arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 clang diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) +makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') -options=(!emptydirs !makeflags) +options=(!emptydirs !makeflags debug) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) fi optdepends=('networkmanager: Location detection via available WiFi networks' - 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' - 'gstreamer0.10-good-plugins: webm and mp4 demuxing' - 'gstreamer0.10-bad-plugins: aac, vp8 and opus decoding' - 'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding' - 'gstreamer0.10-ffmpeg: more decoders' + 'gst-plugins-good: h.264 video' + 'gst-libav: h.264 video' 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/sid/${_pkgname}" install=iceweasel.install @@ -57,21 +54,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel.desktop iceweasel-install-dir.patch vendor.js - iceweasel-20.0.1-fixed-loading-icon.png - Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - Fixup-Reset-Firefox-after-bad-merge.patch) -md5sums=('4db358c753cb15a526dfe79c6602c886' - '4d786ae63da53ba6da8105fbb50cbad9' - '92a08a18995b915d6a6d0dab93ec6c1d' + iceweasel-20.0.1-fixed-loading-icon.png) +md5sums=('3a603dbbfc9c7e56a8e58cede90a9b0b' + '89e7b2ed2e84fdefcc1eca7d076b72c2' + '2f5cb3df42b09fbfeaee5e72e5433ab9' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '5d22063ebea2472dd0b1163b32b2050b' + '21d3ffb77ea84ce897016bc713b52ef4' 'b03a979a78484503ba8dddad4f2c96d1' '7b9e5996dd9fe0b186a43a297db1c6b5' '1c42509891cf6843660a5f3c69896e80' '783a5927246f014855b96a3abb92566b' - '6e335a517c68488941340ee1c23f97b0' - '9d1cc7b80085a4438305e9e37d42745b' - '8e165ef85ddd72491f0b48f8954afca6') + '6e335a517c68488941340ee1c23f97b0') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -86,18 +79,10 @@ prepare() { # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - # Doesn't works in some parts due it has patches for others locales languages, source code hasn't it - rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true - - # It needs to be patched after Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - rm -v debian/patches/debian-hacks/Fixup-Reset-Firefox-after-bad-merge.patch || true - quilt push -av install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code - patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - patch -Np1 -i "$srcdir/Fixup-Reset-Firefox-after-bad-merge.patch" patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname # Patch and remove anything that's left @@ -186,8 +171,6 @@ build() { export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - export CC=clang - export CXX=clang++ if [[ $CARCH == i686 ]]; then # Work around memory address space exhaustion during linking on i686 diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 29b8e9457..71f401e05 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,8 +1,7 @@ -diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 171c78a..a02efa8 100644 ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -273,11 +273,6 @@ pref("browser.slowStartup.notificationDisabled", false); +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-06-11 23:44:43.729632510 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2014-06-11 23:54:32.231213278 -0300 +@@ -281,11 +281,6 @@ pref("browser.slowStartup.timeThreshold", 60000); pref("browser.slowStartup.maxSamples", 5); @@ -14,24 +13,24 @@ index 171c78a..a02efa8 100644 pref("browser.enable_automatic_image_resizing", true); pref("browser.chrome.site_icons", true); pref("browser.chrome.favicons", true); -@@ -1298,11 +1293,7 @@ pref("shumway.disabled", true); +@@ -1486,12 +1481,7 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -// Default social providers -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Share\",\"shareURL\":\"https://www.facebook.com/sharer/sharer.php?u=%{url}\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAACNNJREFUeNrtm3tw1NUVxz/399hHHkgCaCBGEFEEREVFYFQcSoOKdkZay4z+4dDpYIsjHWx1WoTMhFi1gzBSpVgVGbU4U1sHfPESKODwEEnRYDFAICEIeZIQshs2u/v73ds/drMsyW7YLEkl2Z6Z32yy+9v7u+fc7znne8+5KzgvAjDunzlv0M13PjDZ6c4cARj0WhEoaZ1tOn3yq9XLf/tNU0O1D5Ad7wq/OpxpaXOL1j5uZAwuaGlVgwNBhULRm0XXBG6HZrlNa9uRrzfM+3DlgjIgGMsA7rl/XDdHOnNf9vosTfVuvTsaQhdkZ4iykh2rHtqydvkxwI58BhjTfv7MmP55E9/1nLNdfU15ACkVvoAaMCRvRPa+re9+DgTaPjMAx+DrJv3M67Mz+6LybWLb4NfTHhxzx31DDhZvOtqGAgNwWbjGICV9XQJB0e/KobcOP1i8qTzaAEYgaDtNU/V5A9hSaUFLuQEt2gVQSgml+j4CUAIppYgK/m0GkCjZ9xGAUNAu0LUhgJRAAAIVzwBSqVRQH4hlAClRKZAFhOgEASoFECBR8QwgUyQGdJT/B8HzCEiBNKhUJzEgBYIgQsTJAkohe9oFZHgHKvQoHtZ9K3tewfiixXABLdoFeuSSEmkF+PH4QTz7+M3o+ENptzvGtS36uSwmjMpAYF10XCllHCYoe84FlLS555Zs5jx6J6ahY+iCl98pJiDNS1hwSZop+cm91zJmxEBefGsPlu1AxKC67V3gf5oGlZSMuz6Dp2fdhWnoAEwaN5T5hsYLb+4hKB1dcgelFDpB8ifk8thDt3DO5+fZxRvxBV0IjQR0EB3KfD1GhJS0GZnnYuGcKTgdF9ZWx4/No/BJjUUrdtJqm4iL+K5SCmSAiWMHMevhcQzNzaa6ron5SzfQ7HeiaSKx+au4m6HupcJKSYZdZVI4dypuV2yo3zoql0VP3cOiFV/Q4jdiGkGhQFqMGpbJL346kbE3DEYIQWNTC39Ysp4Gr4HQtZDyiRhA0NlmSHZbRM7pr1H0m6lckeHqdGXG3jCYoqfupeC17bT49fNRXIFSNrkDTGbNGM9dtw1D10M1DI/Xx3NLP6OqETRdDy1eglPT4rqA7K56gCIrXfHCvHwGZqUnBMtR113FS/N+xHPLtuJpDa1mVobg0emjmX7vqEjsUErhaw1Q8Mo6yk4F0A1HeOW7kIlFx/u7jworRabLpmhuPjmD+iG7YNDrrhnIS09P5cW/buOeO67lkftvJt3tDE06PE7Qsnh++QYOHPOim86wcVUS0+whJug0ghTMmcK1V2eH8m2UHP++nrwhAyIwjiXDcrN5vXAGhqGhFBeMYUvJ0re2sPfgGTTDGUZrEogVopMgmGQWUCgMEWTBE5MZPSLngnGqas/w9j92s31fJfmThvPM7HyMMKRj+qgmOiBHSsnr73/B5r1V6A53KD4k3bFS8dNgckFQoWPxu1kTGDc6N7JqzR4ff/+smE+2H8FSLkx3FluLawhaG3n2iXwcppGoV/Hemt18tK0c3UwLIfUS2nVafBeQJNUXkAF+/dht3H37cKSUBC2bTTv+w98++YazPg1dT0NoIUhruoMd+2sJrtjI7381rQM3iCVrN33N++tL0c30xFNdp0GQeFRYQhcRIO0gv5xxE/fdfSO2bfNVSTmrPtxLZW0A3XSh6VporaLG1XQHu0pOU/TaOhY8+QAuZ3w6vHnnQd74536EkZ50wOsSE0zcugolbWZOG8GM/LGUVdSw6sM97D/UgGa60QxXzMJDZAq6yb7SJgr//CkLn5pOmsvR4Z5dxUdZ9t6XoKfFjNyXkqZjuoBUCpGgCyhp8eDdQ5k++UaWrdrMlr2VSFxoZlpE8YtNWGgGXx9ppnDZpxTMfTCS8gAOlJ5g8ds7kCItTIi6j6FqMVxAC2sV2RB1ekmLCTcNpH+myeyFH7BxT1Voopoe4RKJXQqhmxw45mXh0o/xeH0opThcXs2iv2wmoFyhAnbC4yX+3PgISMDShrA5XHGa3d9UITRniIeTfHASmsGhEz7mL/mI2TPv4sU3t+KzHAnu7JKpCosOkcSIICAB5hZE0OiRCM0Iwb0b6LPQdI5W+Zn/yucoYYayRk+16eK1xqRMDAHtA0r3lep0lNAjO8kfpCpMqpTF4xZEUqA7rIlOCiKpgADVWXc4FQwgEfHPB5AiByTixIDUCYJx+wJoqdIcJV5VOAWygEZcF7BToT2upFDKtuz2BrAtf8v3mju972cBJX2exso6ok6N64BhOtM11xXXPBz6v6340PcuO+DZfaJkzWqgqY3L64Bqaaz0ZV45Mkc308dG2kd97FLSaq4v317gazr5HeCLRoACFTxbfeBw+oDhWYYj4/rw+30H+rb/VMPxXQsbKnbuABqJOi4vogyRiRB5/XNvvz3zytFTDEf61eF9b0dCKTS36c4afymTsgLeQ9Ly13X/aYnzE1Uy6PV7679trNy1xe+tKwPqAH/0Vla0qw65gH7AFeG/Y3Uy9P45o0bm3PTIaplM6lTK9jWf/OBUyQcrpdXaTIyfsXQb9QcLaAn7vJd2vxY5XxBpo8pwDmgFGsLKx1oeh8OVmUUSLXUlrWZPzbdLag9v+BjUqfDzepKAyDDcZbznGHG+1NmqSKHpVlfbadJqLW+o2LHobNX+PUB1WPkfnHwYyTmX6lI7Lehr3F576NM/+T3V3wH17f2w1xkg2ggXuSvga6p8p+bgmpVKWpXAmVh+2AsNEKogdYYAJa0GT03J4obyf60HTgKe6PTTqw0QOpcQ3wXs4LlDZyq2FXrrS4uBmjDxuCw3G5eIgA46yeC5ho11pWsWW35PWTibBC4Xf+9eBLRPg0q2+s5UvHG6bMNqJYPHw7nXutxZYvIIiMoCSgbrPVX/fv7syS+3AKfC5MOmF4iRpP6RjrId8O5vrNhS1NpUWQLUholUr6muXEoatP3emrWNR9e/avk9R8P+HuxNypPkrk93pGdnK0VtXemaN6UdOHo55vdE5b/0NKx+K4AxtAAAAABJRU5ErkJggg==\", \"description\":\"Easily share the web to your Facebook friends.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com\",\"builtin\":\"true\",\"version\":1}"); - --pref("social.sidebar.open", true); -pref("social.sidebar.unload_timeout_ms", 10000); +- +-pref("dom.identity.enabled", false); +// Removed Facebook sidebar with Iceweasel. - pref("social.allowMultipleWorkers", true); - -diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css -index c270318..049fe6e 100644 ---- a/browser/base/content/abouthome/aboutHome.css -+++ b/browser/base/content/abouthome/aboutHome.css -@@ -49,11 +49,6 @@ a { + // Turn on the CSP 1.0 parser for Content Security Policy headers + pref("security.csp.speccompliant", true); +diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2014-06-05 22:15:17.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2014-06-11 23:51:17.732797819 -0300 +@@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -43,7 +42,7 @@ index c270318..049fe6e 100644 #searchForm { display: -moz-box; } -@@ -72,8 +67,7 @@ a { +@@ -72,8 +67,7 @@ #searchEngineLogo { display: inline-block; height: 28px; @@ -53,7 +52,7 @@ index c270318..049fe6e 100644 } #searchText { -@@ -145,48 +139,6 @@ a { +@@ -145,48 +139,6 @@ transition-duration: 0ms; } @@ -102,7 +101,7 @@ index c270318..049fe6e 100644 #launcher { display: -moz-box; -moz-box-align: center; -@@ -335,26 +287,25 @@ body[narrow] #restorePreviousSession::before { +@@ -335,26 +287,25 @@ width: 32px; } @@ -135,7 +134,7 @@ index c270318..049fe6e 100644 } /* [HiDPI] -@@ -366,26 +317,6 @@ body[narrow] #restorePreviousSession::before { +@@ -366,26 +317,6 @@ background-image: url("chrome://branding/content/about-logo@2x.png"); } @@ -162,7 +161,7 @@ index c270318..049fe6e 100644 #downloads::before { content: url("chrome://browser/content/abouthome/downloads@2x.png"); } -@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before { +@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before { content: url("chrome://browser/content/abouthome/restore@2x.png"); } @@ -172,10 +171,9 @@ index c270318..049fe6e 100644 - } } -diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js -index 432fcdc..bd1692a 100644 ---- a/browser/base/content/abouthome/aboutHome.js -+++ b/browser/base/content/abouthome/aboutHome.js +diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2014-06-05 22:15:17.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2014-06-11 23:51:17.769464803 -0300 @@ -3,152 +3,44 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -363,7 +361,7 @@ index 432fcdc..bd1692a 100644 // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -156,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) { +@@ -156,7 +48,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -371,7 +369,7 @@ index 432fcdc..bd1692a 100644 gInitialized = true; } return; -@@ -181,117 +72,6 @@ window.addEventListener("pagehide", function() { +@@ -181,117 +72,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -489,7 +487,7 @@ index 432fcdc..bd1692a 100644 function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -350,147 +130,6 @@ function loadSucceeded() +@@ -350,147 +130,6 @@ document.dispatchEvent(event); } @@ -637,10 +635,9 @@ index 432fcdc..bd1692a 100644 function fitToWidth() { if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); -diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml -index 1d03d38..5d808db 100644 ---- a/browser/base/content/abouthome/aboutHome.xhtml -+++ b/browser/base/content/abouthome/aboutHome.xhtml +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 @@ -43,15 +43,6 @@ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/> </form> @@ -665,11 +662,10 @@ index 1d03d38..5d808db 100644 + <a id="aboutGNU" href="http://gnu.org"></a> </body> </html> -diff --git a/browser/base/jar.mn b/browser/base/jar.mn -index 0870527..301c8cb 100644 ---- a/browser/base/jar.mn -+++ b/browser/base/jar.mn -@@ -33,7 +33,7 @@ browser.jar: +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 +@@ -32,7 +32,7 @@ content/browser/abouthome/settings.png (content/abouthome/settings.png) content/browser/abouthome/restore.png (content/abouthome/restore.png) content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) @@ -678,7 +674,7 @@ index 0870527..301c8cb 100644 content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) -@@ -45,7 +45,6 @@ browser.jar: +@@ -44,7 +44,6 @@ content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) @@ -686,10 +682,9 @@ index 0870527..301c8cb 100644 #ifdef MOZ_SERVICES_HEALTHREPORT content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml) content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js) -diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd -index e84341f..5476d32 100644 ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd +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 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -708,10 +703,9 @@ index e84341f..5476d32 100644 <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> <!ENTITY abouthome.settingsButton.label "Settings"> -diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties -index 087cc50..5654eb9 100644 ---- a/browser/locales/en-US/chrome/browser-region/region.properties -+++ b/browser/locales/en-US/chrome/browser-region/region.properties +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-06-05 22:15:18.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2014-06-11 23:51:17.842798771 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -734,7 +728,7 @@ index 087cc50..5654eb9 100644 # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s +@@ -22,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=4 @@ -759,10 +753,9 @@ index 087cc50..5654eb9 100644 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in -index e925c1e..8c121fc 100644 ---- a/browser/locales/generic/profile/bookmarks.html.in -+++ b/browser/locales/generic/profile/bookmarks.html.in +diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2014-06-05 22:15:18.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2014-06-11 23:51:17.869465669 -0300 @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -790,11 +783,10 @@ index e925c1e..8c121fc 100644 + <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> -diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -index c3dc6b2..df312e3 100644 ---- a/browser/modules/AboutHome.jsm -+++ b/browser/modules/AboutHome.jsm -@@ -8,7 +8,7 @@ let Cc = Components.classes; +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 +@@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -803,9 +795,9 @@ index c3dc6b2..df312e3 100644 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", - "resource://gre/modules/PrivateBrowsingUtils.jsm"); +@@ -18,66 +18,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", + "resource://gre/modules/FxAccounts.jsm"); -// Url to fetch snippets, in the urlFormatter service format. -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; @@ -870,7 +862,7 @@ index c3dc6b2..df312e3 100644 /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -186,18 +126,9 @@ let AboutHome = { +@@ -202,18 +142,9 @@ ss.promiseInitialized.then(function() { let data = { showRestoreLastSession: ss.canRestoreLastSession, diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 8b2b2a5e3..37ad56fda 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -26,6 +26,7 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification ac_add_options --enable-pulseaudio +ac_add_options --enable-gstreamer=1.0 ac_add_options --disable-crashreporter ac_add_options --disable-updater diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 8cf04237f..6f2ce3b32 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212468 2014-05-14 19:53:18Z svenstaro $ +# $Id: PKGBUILD 214443 2014-06-09 03:04:24Z svenstaro $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -18,7 +18,7 @@ provides=("kdebase-konqueror=$pkgver") makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'konq-about-fsdg.diff') -sha1sums=('9b19ce18bd7e2beb9d43d33fc9a6c98b6452fc50' +sha1sums=('90b4fefcd307df8da6f6eab4da97d9e7be9f2f78' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 65f819c52..468f35da4 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 213013 2014-05-17 10:14:55Z andrea $ +# $Id: PKGBUILD 214415 2014-06-09 03:02:38Z svenstaro $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('57b0cd485ec9f7d70b535c136516dd0d3c345311' +sha1sums=('3ee6b1d263b7c87a63951a0ebc4d77a93c92214a' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 696ab790d..60f17de47 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 213594 2014-05-26 08:53:32Z andrea $ +# $Id: PKGBUILD 214788 2014-06-10 17:50:05Z andyrtr $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -21,12 +21,10 @@ depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt' makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'qt4.patch' - 'fix-cifs-mount.patch' 'khtml-fsdg.diff') -sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec' + 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') +sha1sums=('c540edeb7da23f5a8feacb4d775bce43f2060a96' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - '26bbebeaf3f882d84030fd9b39b7b4c9debbbeec' 'a1502a964081ad583a00cf90c56e74bf60121830') prepare() { @@ -35,9 +33,7 @@ prepare() { patch -p1 -i "${srcdir}"/kde-applications-menu.patch # qmake refers to Qt5 patch -p1 -i "${srcdir}"/qt4.patch - - patch -p1 -i "${srcdir}"/fix-cifs-mount.patch - # Don't ask the user to download a plugin, it's probably nonfree. + # don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff } diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch deleted file mode 100644 index 5f5354633..000000000 --- a/libre/kdelibs-libre/fix-xfreepixmap-call.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 9323adac35d40da69e3cb18504340e984c4afd05 -Author: Anne-Marie Mahfouf <annma@kde.org> -Date: Fri May 10 17:12:33 2013 +0200 - - Fix crash when quitting apps - - Backport to 4.10 branch - - CCBUG: 319137 - -diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp -index b54fb1a..1925670 100644 ---- a/plasma/private/dialogshadows.cpp -+++ b/plasma/private/dialogshadows.cpp -@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps() - { - #ifdef Q_WS_X11 - foreach (const QPixmap &pixmap, m_shadowPixmaps) { -+ if (!QX11Info::display()) { -+ return; -+ } - if (!pixmap.isNull()) { - XFreePixmap(QX11Info::display(), pixmap.handle()); - } diff --git a/libre/kdelibs-libre/security-fix.patch b/libre/kdelibs-libre/security-fix.patch deleted file mode 100644 index 3d98a47ae..000000000 --- a/libre/kdelibs-libre/security-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 65d736dab592bced4410ccfa4699de89f78c96ca -Author: Grégory Oestreicher <greg@kamago.net> -Date: Wed May 8 23:16:00 2013 +0200 - - Don't show passwords contained in HTTP URLs in error messages - BUG: 319428 - -diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp -index 2d139a9..129fc7b 100644 ---- a/kioslave/http/http.cpp -+++ b/kioslave/http/http.cpp -@@ -3056,7 +3056,7 @@ try_again: - ; // Ignore error - } else { - if (!sendErrorPageNotification()) { -- error(ERR_INTERNAL_SERVER, m_request.url.url()); -+ error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl()); - return false; - } - } -@@ -3072,9 +3072,9 @@ try_again: - // Tell that we will only get an error page here. - if (!sendErrorPageNotification()) { - if (m_request.responseCode == 403) -- error(ERR_ACCESS_DENIED, m_request.url.url()); -+ error(ERR_ACCESS_DENIED, m_request.url.prettyUrl()); - else -- error(ERR_DOES_NOT_EXIST, m_request.url.url()); -+ error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl()); - return false; - } - } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) { diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 74e2d75fb..1a468243e 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214073 2014-06-03 09:46:26Z andrea $ +# $Id: PKGBUILD 214656 2014-06-09 03:17:39Z svenstaro $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn' makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('99e47bba25606fdccbe1ac04346e9c3acad254d1') +sha1sums=('bf520ce1fd08eb0464753675405b0f362fef2606') prepare() { cd kopete-${pkgver} diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 57d2f0cc9..d97c67589 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 212732 2014-05-14 20:10:50Z svenstaro $ +# $Id: PKGBUILD 214706 2014-06-09 03:21:25Z svenstaro $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ optdepends=('p7zip' 'zip' 'unzip' 'unar') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('e3c5dbe62caeb23a6a19e2313192f2d4e75f32e9' +sha1sums=('450aead29450fa1d17016e4bf8b8e5fdca30de05' 'a0a836950f185d9b2245204579f969203036fdec') prepare() { diff --git a/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch b/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch deleted file mode 100644 index 74283b57c..000000000 --- a/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 71d4f3022d1f625d94187f7cda682d2233a692d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> -Date: Thu, 3 Apr 2014 23:59:49 +0200 -Subject: [PATCH 05/10] Revert "Bluetooth: Enable autosuspend for Intel - Bluetooth device" - -This reverts commit d2bee8fb6e18f6116aada39851918473761f7ab1. - -USB autosuspend still breaks on some xhci controllers, so disable -it by default as long as no solution is found. ---- - drivers/bluetooth/btusb.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index baeaaed..6d6e09e 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1478,10 +1478,8 @@ static int btusb_probe(struct usb_interface *intf, - if (id->driver_info & BTUSB_BCM92035) - hdev->setup = btusb_setup_bcm92035; - -- if (id->driver_info & BTUSB_INTEL) { -- usb_enable_autosuspend(data->udev); -+ if (id->driver_info & BTUSB_INTEL) - hdev->setup = btusb_setup_intel; -- } - - /* Interface numbers are hardcoded in the specification */ - data->isoc = usb_ifnum_to_if(data->udev, 1); --- -1.9.2 - diff --git a/libre/linux-libre-grsec/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch b/libre/linux-libre-grsec/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch deleted file mode 100644 index 7f18091a4..000000000 --- a/libre/linux-libre-grsec/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 784c4f0b18f89922ddc0fe21e5ec64cc370bb3f2 Mon Sep 17 00:00:00 2001 -From: Johannes Berg <johannes.berg@intel.com> -Date: Wed, 19 Mar 2014 18:36:39 +0100 -Subject: [PATCH 10/10] iwlwifi: mvm: delay enabling smart FIFO until after - beacon RX - -If we have no beacon data before association, delay smart FIFO -enablement until after we have this data. - -Not doing so can cause association failures in extremely silent -environments (usually only a shielded box/room) as beacon RX is -not sent to the host immediately, and then the association time -event ends without the host receiving any beacon even though it -was on the air - it's just stuck on the FIFO. - -Cc: <stable@vger.kernel.org> [3.14] -Signed-off-by: Johannes Berg <johannes.berg@intel.com> -Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> ---- - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 + - drivers/net/wireless/iwlwifi/mvm/sf.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -index c35b866..45e861e 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c -+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -@@ -971,6 +971,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, - */ - iwl_mvm_remove_time_event(mvm, mvmvif, - &mvmvif->time_event_data); -+ iwl_mvm_sf_update(mvm, vif, false); - } else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS | - BSS_CHANGED_QOS)) { - ret = iwl_mvm_power_update_mode(mvm, vif); -diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c -index 8401627..88809b2 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/sf.c -+++ b/drivers/net/wireless/iwlwifi/mvm/sf.c -@@ -274,7 +274,8 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif, - return -EINVAL; - if (changed_vif->type != NL80211_IFTYPE_STATION) { - new_state = SF_UNINIT; -- } else if (changed_vif->bss_conf.assoc) { -+ } else if (changed_vif->bss_conf.assoc && -+ changed_vif->bss_conf.dtim_period) { - mvmvif = iwl_mvm_vif_from_mac80211(changed_vif); - sta_id = mvmvif->ap_sta_id; - new_state = SF_FULL_ON; --- -1.9.2 - diff --git a/libre/linux-libre-grsec/0011-kernfs-fix-removed-error-check.patch b/libre/linux-libre-grsec/0011-kernfs-fix-removed-error-check.patch deleted file mode 100644 index b597595c6..000000000 --- a/libre/linux-libre-grsec/0011-kernfs-fix-removed-error-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c -index 8034706..e01ea4a 100644 ---- a/fs/kernfs/file.c -+++ b/fs/kernfs/file.c -@@ -484,6 +484,8 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma) - - ops = kernfs_ops(of->kn); - rc = ops->mmap(of, vma); -+ if (rc) -+ goto out_put; - - /* - * PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup() diff --git a/libre/linux-libre-grsec/0015-fix-xsdt-validation.patch b/libre/linux-libre-grsec/0015-fix-xsdt-validation.patch deleted file mode 100644 index 82dd2be25..000000000 --- a/libre/linux-libre-grsec/0015-fix-xsdt-validation.patch +++ /dev/null @@ -1,42 +0,0 @@ -@@ -, +, @@ - acpi_tb_parse_root_table(). - Commit: 671cc68dc61f029d44b43a681356078e02d8dab8 - Subject: ACPICA: Back port and refine validation of the XSDT root table. ---- - drivers/acpi/acpica/tbutils.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) ---- a/drivers/acpi/acpica/tbutils.c -+++ a/drivers/acpi/acpica/tbutils.c -@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - u32 table_count; - struct acpi_table_header *table; - acpi_physical_address address; -+ acpi_physical_address rsdt_address; - u32 length; - u8 *table_entry; - acpi_status status; -@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - * as per the ACPI specification. - */ - address = (acpi_physical_address) rsdp->xsdt_physical_address; -+ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address; - table_entry_size = ACPI_XSDT_ENTRY_SIZE; - } else { - /* Root table is an RSDT (32-bit physical addresses) */ - - address = (acpi_physical_address) rsdp->rsdt_physical_address; -+ rsdt_address = address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - -@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - - /* Fall back to the RSDT */ - -- address = -- (acpi_physical_address) rsdp->rsdt_physical_address; -+ address = rsdt_address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - } - diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index b3c73dcef..9fac0ece5 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -12,13 +12,13 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.14 -_sublevel=5 +_sublevel=6 _grsecver=3.0 -_timestamp=201406051310 +_timestamp=201406101411 _pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel}.${_sublevel}.${_timestamp} pkgrel=1 -_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="https://grsecurity.net/" license=('GPL2') @@ -39,20 +39,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' - '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch' '0006-genksyms-fix-typeof-handling.patch' - '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch' - '0011-kernfs-fix-removed-error-check.patch' '0012-fix-saa7134.patch' - '0015-fix-xsdt-validation.patch' 'sysctl.conf' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8' - '4011302ac77541893ff1350f02255b45aa6b3ee5c4cb38581d063152dabb5e5a' + 'ae83fbc10c77ed665f029502c90a458a711f9188216e34a1354073dba31a1b26' + 'abefdcbacb2c78c0de1168915dc26d16e35ec0e6158e0bbbc84fad819b234404' 'SKIP' - 'a82a5b673dae3f1aa8124e91c485cb8648623d560b7543da63fffab2606443d6' - '51e86aeeb4fadbb2ead2b4af115f0bfd04afb83c9959856e3495d704cec55db6' + '670869cdfc522e452332ec953fe860cf1a2974edfe8d0c851fbdba70b6167921' + '64a457c3d7cc4ef530359f2f5132697ab3bf9ea3cb64d13d9dbf68ed66325606' '9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486' 'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b' '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9' @@ -61,14 +57,10 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85' - '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4' - 'e734ac2a6e865b70dbe1e55ce55a5bd1b1e0cedea903c6341b9cfbabe420c763' - '4f1db7c68dbff6d80258de4074af46b989cedcda175776b567cd4658b33c9f99') + '763f9323cdefc9ddf74ffeffd856f9eaec4d8d4ef702c88ee1aab429c2d0b389' + 'ce3b8b43ff2650eab53cb790c403392358dad7461c512d4f9c43c523e42f6643') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -107,33 +99,15 @@ prepare() { patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch" patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch" - # Disable usb autosuspend for intel btusb - # See http://www.spinics.net/lists/kernel/msg1716461.html - # Until a solution is found, make sure the driver leaves autosuspend alone - patch -p1 -i "${srcdir}/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch" - # Fix generation of symbol CRCs # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" - # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d - # FS#39815 - patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch" - - # fix Xorg crash with i810 chipset due to wrong removed error check - # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com - patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch" - # fix saa7134 video # https://bugs.archlinux.org/task/39904 # https://bugzilla.kernel.org/show_bug.cgi?id=73361 patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - # fix xsdt validation bug - # https://bugs.archlinux.org/task/39811 - # https://bugzilla.kernel.org/show_bug.cgi?id=73911 - patch -Np1 -i "${srcdir}/0015-fix-xsdt-validation.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index 99ccdb5bf..288f1caca 100644 --- a/libre/linux-libre-grsec/config.i686 +++ b/libre/linux-libre-grsec/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.4.201405281922-1 Kernel Configuration +# Linux/x86 3.14.6.201406101411-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -207,6 +207,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -265,7 +266,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -523,6 +523,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index 2e13102ee..fc26220ea 100644 --- a/libre/linux-libre-grsec/config.x86_64 +++ b/libre/linux-libre-grsec/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.4.201405281922-1 Kernel Configuration +# Linux/x86 3.14.6.201406101411-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -216,6 +216,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -280,7 +281,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -534,6 +534,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/libre/linux-libre-grsec/sysctl.conf b/libre/linux-libre-grsec/sysctl.conf index bef8e350d..ebd4dd574 100644 --- a/libre/linux-libre-grsec/sysctl.conf +++ b/libre/linux-libre-grsec/sysctl.conf @@ -44,7 +44,7 @@ kernel.grsecurity.fifo_restrictions = 1 #kernel.grsecurity.romount_protect = 1 # -# chroot restrictions (these will break containers) +# chroot restrictions (many of these will break containers) # #kernel.grsecurity.chroot_caps = 1 @@ -57,7 +57,7 @@ kernel.grsecurity.fifo_restrictions = 1 #kernel.grsecurity.chroot_deny_shmat = 1 #kernel.grsecurity.chroot_deny_sysctl = 1 #kernel.grsecurity.chroot_deny_unix = 1 -#kernel.grsecurity.chroot_enforce_chdir = 1 +kernel.grsecurity.chroot_enforce_chdir = 1 #kernel.grsecurity.chroot_findtask = 1 #kernel.grsecurity.chroot_restrict_nice = 1 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 25ee8bd5d..a5e256aa6 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213944 2014-06-01 09:21:26Z bpiotrowski $ +# $Id: PKGBUILD 215080 2014-06-13 10:32:35Z bpiotrowski $ # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -10,10 +10,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=41 +_sublevel=43 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.40 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.42 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,8 +32,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '870f01e2439758cab57520fc5490c446' - '85ce008eaacbb2fc54b81116d35cf946' + '608bae7e9718c3b178c8a6b5594660e3' + 'c4c1ffeb312c2a70685fd960cc328e01' '16867e648e4b9f89bec949cb643888c2' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' @@ -41,7 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '4515aaccb905a164f5e44213d264b5ed') + 'fc169cfc460e78637a667465e26493e0') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -118,7 +118,7 @@ build() { #make menuconfig # CLI menu for configuration #make nconfig # new CLI menu for configuration #make xconfig # X-based configuration - #make oldconfig # using old config from previous kernel version + make oldconfig # using old config from previous kernel version # ... or manually edit .config # rewrite configuration diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 942c1a052..11293a2bd 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.15-1 Kernel Configuration +# Linux/x86 3.10.43 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1718,7 +1718,7 @@ CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_SCAN_ASYNC=y # # SCSI Transports @@ -1981,6 +1981,7 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_EDEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -3399,6 +3400,7 @@ CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NCT6775=m +# CONFIG_SENSORS_NTC_THERMISTOR is not set CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -4816,18 +4818,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5187,7 +5177,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/libre/linux-libre/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch b/libre/linux-libre/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch deleted file mode 100644 index 74283b57c..000000000 --- a/libre/linux-libre/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 71d4f3022d1f625d94187f7cda682d2233a692d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> -Date: Thu, 3 Apr 2014 23:59:49 +0200 -Subject: [PATCH 05/10] Revert "Bluetooth: Enable autosuspend for Intel - Bluetooth device" - -This reverts commit d2bee8fb6e18f6116aada39851918473761f7ab1. - -USB autosuspend still breaks on some xhci controllers, so disable -it by default as long as no solution is found. ---- - drivers/bluetooth/btusb.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index baeaaed..6d6e09e 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1478,10 +1478,8 @@ static int btusb_probe(struct usb_interface *intf, - if (id->driver_info & BTUSB_BCM92035) - hdev->setup = btusb_setup_bcm92035; - -- if (id->driver_info & BTUSB_INTEL) { -- usb_enable_autosuspend(data->udev); -+ if (id->driver_info & BTUSB_INTEL) - hdev->setup = btusb_setup_intel; -- } - - /* Interface numbers are hardcoded in the specification */ - data->isoc = usb_ifnum_to_if(data->udev, 1); --- -1.9.2 - diff --git a/libre/linux-libre/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch b/libre/linux-libre/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch deleted file mode 100644 index 7f18091a4..000000000 --- a/libre/linux-libre/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 784c4f0b18f89922ddc0fe21e5ec64cc370bb3f2 Mon Sep 17 00:00:00 2001 -From: Johannes Berg <johannes.berg@intel.com> -Date: Wed, 19 Mar 2014 18:36:39 +0100 -Subject: [PATCH 10/10] iwlwifi: mvm: delay enabling smart FIFO until after - beacon RX - -If we have no beacon data before association, delay smart FIFO -enablement until after we have this data. - -Not doing so can cause association failures in extremely silent -environments (usually only a shielded box/room) as beacon RX is -not sent to the host immediately, and then the association time -event ends without the host receiving any beacon even though it -was on the air - it's just stuck on the FIFO. - -Cc: <stable@vger.kernel.org> [3.14] -Signed-off-by: Johannes Berg <johannes.berg@intel.com> -Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> ---- - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 + - drivers/net/wireless/iwlwifi/mvm/sf.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -index c35b866..45e861e 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c -+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -@@ -971,6 +971,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, - */ - iwl_mvm_remove_time_event(mvm, mvmvif, - &mvmvif->time_event_data); -+ iwl_mvm_sf_update(mvm, vif, false); - } else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS | - BSS_CHANGED_QOS)) { - ret = iwl_mvm_power_update_mode(mvm, vif); -diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c -index 8401627..88809b2 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/sf.c -+++ b/drivers/net/wireless/iwlwifi/mvm/sf.c -@@ -274,7 +274,8 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif, - return -EINVAL; - if (changed_vif->type != NL80211_IFTYPE_STATION) { - new_state = SF_UNINIT; -- } else if (changed_vif->bss_conf.assoc) { -+ } else if (changed_vif->bss_conf.assoc && -+ changed_vif->bss_conf.dtim_period) { - mvmvif = iwl_mvm_vif_from_mac80211(changed_vif); - sta_id = mvmvif->ap_sta_id; - new_state = SF_FULL_ON; --- -1.9.2 - diff --git a/libre/linux-libre/0015-fix-xsdt-validation.patch b/libre/linux-libre/0015-fix-xsdt-validation.patch deleted file mode 100644 index 82dd2be25..000000000 --- a/libre/linux-libre/0015-fix-xsdt-validation.patch +++ /dev/null @@ -1,42 +0,0 @@ -@@ -, +, @@ - acpi_tb_parse_root_table(). - Commit: 671cc68dc61f029d44b43a681356078e02d8dab8 - Subject: ACPICA: Back port and refine validation of the XSDT root table. ---- - drivers/acpi/acpica/tbutils.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) ---- a/drivers/acpi/acpica/tbutils.c -+++ a/drivers/acpi/acpica/tbutils.c -@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - u32 table_count; - struct acpi_table_header *table; - acpi_physical_address address; -+ acpi_physical_address rsdt_address; - u32 length; - u8 *table_entry; - acpi_status status; -@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - * as per the ACPI specification. - */ - address = (acpi_physical_address) rsdp->xsdt_physical_address; -+ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address; - table_entry_size = ACPI_XSDT_ENTRY_SIZE; - } else { - /* Root table is an RSDT (32-bit physical addresses) */ - - address = (acpi_physical_address) rsdp->rsdt_physical_address; -+ rsdt_address = address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - -@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - - /* Fall back to the RSDT */ - -- address = -- (acpi_physical_address) rsdp->rsdt_physical_address; -+ address = rsdt_address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - } - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 9f0dda4ef..56c5ef0ae 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $ +# $Id: PKGBUILD 214389 2014-06-08 19:44:39Z tpowa $ # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.14 -_sublevel=5 +_sublevel=6 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.5 # nearly always the same as pkgver @@ -32,17 +32,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' - '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch' '0006-genksyms-fix-typeof-handling.patch' - '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch' - '0011-kernfs-fix-removed-error-check.patch' '0012-fix-saa7134.patch' - '0015-fix-xsdt-validation.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8' - '71891ae6903598f4686e86fdb0d371ff9e179e8dac1d2cf60ca16c5190916745' - 'fca0060bde385e2c292489087af0aa5f48da594221a6d162fc6f8ba2159571e8' + 'ae83fbc10c77ed665f029502c90a458a711f9188216e34a1354073dba31a1b26' + '32aa542d854f9c87ded3c6acc51537b25e37dd8921af79f71a4f035ed965ede0' + '3f2420725cfe1cd271e8ea6084ad141f54d117965b46adffae92a49e9b8ce0f7' 'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176' 'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b' '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9' @@ -51,12 +47,8 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85' - '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4' '4f1db7c68dbff6d80258de4074af46b989cedcda175776b567cd4658b33c9f99') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. @@ -92,33 +84,15 @@ prepare() { patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch" patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch" - # Disable usb autosuspend for intel btusb - # See http://www.spinics.net/lists/kernel/msg1716461.html - # Until a solution is found, make sure the driver leaves autosuspend alone - patch -p1 -i "${srcdir}/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch" - # Fix generation of symbol CRCs # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" - # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d - # FS#39815 - patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch" - - # fix Xorg crash with i810 chipset due to wrong removed error check - # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com - patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch" - # fix saa7134 video # https://bugs.archlinux.org/task/39904 # https://bugzilla.kernel.org/show_bug.cgi?id=73361 patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - # fix xsdt validation bug - # https://bugs.archlinux.org/task/39811 - # https://bugzilla.kernel.org/show_bug.cgi?id=73911 - patch -Np1 -i "${srcdir}/0015-fix-xsdt-validation.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 184db97b8..8f5a286f3 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-4 Kernel Configuration +# Linux/x86 3.14.6-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -208,6 +208,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -270,7 +271,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -533,6 +533,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 1a32c7bf7..d8408c906 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-4 Kernel Configuration +# Linux/x86 3.14.6-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -217,6 +217,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -281,7 +282,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -541,6 +541,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 8ac6c73da..7415ce3b3 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname _pkgflag=libre -pkgver=10.1.4 -pkgrel=2 +pkgver=10.2.1 +pkgrel=1 pkgdesc='Mesa 3-D OpenCL library' url=http://${pkgbase}3d.sourceforge.net license=( @@ -59,7 +59,7 @@ source=( ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 ) sha512sums=( - 3260c535d4ad2123fba29090b6d2d48b508086916b55bfad304936a48b0f79dd176be50a080add59755e9b2cc65c797dcb6a3aad34a1f7a6c30b97ef9428d02d + 71221293cccb24f7b3312bdea5afac7e46e37bd40a17da3c2313198018f144a12f96da5dbeb62784a365c2c9baf294e8ebb50998a6f3763b7659c1154ddb5d6e ) build() { @@ -71,7 +71,7 @@ build() { --enable-r600-llvm-compiler\ --enable-dri3\ --with-clang-libdir=/usr/lib\ - --with-llvm-shared-libs\ + --enable-llvm-shared-libs\ --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast make } diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index e5db4a11d..4684f48e8 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112490 2014-06-02 19:17:04Z foutrelis $ +# $Id: PKGBUILD 112894 2014-06-09 12:14:37Z foutrelis $ # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor (Arch): xduugu # Contributor (Arch): nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=46 +pkgrel=47 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index aa7417af2..952935c35 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112492 2014-06-02 19:17:18Z foutrelis $ +# $Id: PKGBUILD 112896 2014-06-09 12:14:50Z foutrelis $ # Maintainer (Arch): Ray Rashif <schiv@archlinux.org> # Contributor (Arch): Mateusz Herych <heniekk@gmail.com> # Contributor (Arch): Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.14-LIBRE -pkgrel=26 +pkgrel=27 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD index 5970c5bcb..1a0380bd7 100644 --- a/libre/wings3d-libre/PKGBUILD +++ b/libre/wings3d-libre/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 95697 2013-08-15 18:20:27Z arodseth $ +# $Id: PKGBUILD 113127 2014-06-13 22:30:55Z arodseth $ # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com> # Contributor (Arch): kappa <kappacurve@gmail.com> # Maintainer: Márcio Silva <coadde@parabola.nu> +_pkgname=wings3d _name=wings -_pkgname=${_name}3d -pkgname=$_pkgname-libre -pkgver=1.5.2 -pkgrel=1.1 +pkgname=wings3d-libre +pkgver=1.5.3 +pkgrel=1 pkgdesc='3D modeling program, without nonfree kerkythea render support' arch=('x86_64' 'i686' 'mips64el') url='http://www.wings3d.com/' @@ -19,47 +19,38 @@ provides=("$_pkgname") conflicts=("$_pkgname") replaces=("$_pkgname") install=$_pkgname.install -source=("$_pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/v$pkgver.tar.gz" +source=("http://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2" "$_pkgname.sh" "$_pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('d86980e4fa91a04ca96b989b0dcba53a37c8cfda4e6d98accb8e7bd9a289094b' +sha256sums=('c08060016f83679ce08947942d31af0e3b5d105525d0df5e993ec6f1a81fdd8e' '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') prepare() { - gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" \ + gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \ --genericname '3D Modeler' --categories 'Graphics;3DGraphics' - - cd "$_name-$pkgver" - sed -i "s|v1[.]2[.]x[.]y[.]WINGS|v$pkgver.$pkgrel.PARABOLA|" WINGS-VERSION-GEN } build() { - cd "$_name-$pkgver" - export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) - make - make lang + make -C "$_name-$pkgver" all lang } package() { + install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" + install -Dm644 "$_pkgname.desktop" \ + "$pkgdir/usr/share/applications/$_pkgname.desktop" + install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" cd "$_name-$pkgver" - - mkdir -p "$pkgdir/usr/lib/$_pkgname" + install -d "$pkgdir/usr/lib/$_pkgname" for subdir in ebin fonts patches plugins shaders textures; do cp -r "$srcdir/$_name-$pkgver/$subdir/" "$pkgdir/usr/lib/$_pkgname" done - cd "$srcdir" - install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" - install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" - install -Dm644 "$_pkgname.desktop" \ - "$pkgdir/usr/share/applications/$_pkgname.desktop" - msg 'remove nonfree kerkythea render support plugin' - rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_kerky.beam + rm -v $pkgdir/usr/lib/$_pkgname/plugins/import_export/wpc_kerky.beam - msg 'remove obsolete yafray render support plugin' - rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang} + msg 'remove deprecated yafray render support plugin' + rm -v $pkgdir/usr/lib/$_pkgname/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang} } # vim:set ts=2 sw=2 et: diff --git a/libre/wings3d-libre/wings3d.install b/libre/wings3d-libre/wings3d.install index 98f3ea190..ad97d7bab 100644 --- a/libre/wings3d-libre/wings3d.install +++ b/libre/wings3d-libre/wings3d.install @@ -1,5 +1,4 @@ post_upgrade() { - #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor update-desktop-database -q } diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD index 8a146c2dc..5596513a9 100644 --- a/libre/xbmc-libre-lts/PKGBUILD +++ b/libre/xbmc-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=xbmc pkgname=xbmc-libre-lts pkgver=12.3 _codename=Frodo -pkgrel=3 +pkgrel=4 pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -43,7 +43,7 @@ mksource=( "http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" ) source=( - "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" + "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz" 'xbmc.service' "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285" '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' @@ -52,8 +52,8 @@ mkmd5sums=( '7ae385ebf8e5cfcb917393235e6efbdb' ) md5sums=( - '7c71af50af55b097e4365a58b70754e8' - 'de331663cc8adc94f2fe44a262cfff58' + '10ed8b9cb84b2825d746c26bd5236899' + '12c9b4dfb8dd0d5b20cc230c28388160' '7fd6399d2ffbdf06b724f0cc2efa0784' '8998bc505ae4c66604c90b1c005be8c2' ) @@ -119,6 +119,7 @@ build() { --enable-libusb \ --enable-libcec \ --enable-external-libraries \ + --with-lirc-device=/run/lirc/lircd \ --enable-external-ffmpeg \ --disable-non-free diff --git a/libre/xbmc-libre-lts/xbmc.install b/libre/xbmc-libre-lts/xbmc.install index 406476198..48f337c55 100644 --- a/libre/xbmc-libre-lts/xbmc.install +++ b/libre/xbmc-libre-lts/xbmc.install @@ -10,10 +10,16 @@ post_install() { post_upgrade() { post_install $1 if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then - groupmod -g 420 xbmc + groupmod -g 420 xbmc > /dev/null 2>&1 fi if ! id -u xbmc | grep 420 > /dev/null 2>&1; then - usermod -u 420 xbmc + usermod -u 420 xbmc > /dev/null 2>&1 + if [[ $? -ne 0 ]]; then + echo "Changing uid of user xbmc failed" + echo "It is recommended that the uid is changed." + echo "Stop all processes running under the xbmc user and reinstall xbmc" + echo "or change the uid manually. (usermod -u 420 xbmc)" + fi chown -R xbmc:xbmc /var/lib/xbmc fi } diff --git a/libre/xbmc-libre-lts/xbmc.service b/libre/xbmc-libre-lts/xbmc.service index d36ddb05a..81a37ac7e 100644 --- a/libre/xbmc-libre-lts/xbmc.service +++ b/libre/xbmc-libre-lts/xbmc.service @@ -9,7 +9,7 @@ Group = xbmc PAMName=login Type = simple TTYPath=/dev/tty7 -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -- :0 -nolisten tcp vt7 Restart = on-abort [Install] diff --git a/libre/xbmc-libre/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch b/libre/xbmc-libre/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch deleted file mode 100644 index 20d8e0250..000000000 --- a/libre/xbmc-libre/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch +++ /dev/null @@ -1,75 +0,0 @@ -From a58bcbb0a35ac8e26a880be477705d833330ecc5 Mon Sep 17 00:00:00 2001 -From: Jonathan Marshall <jmarshall@xbmc.org> -Date: Tue, 6 May 2014 19:40:17 +1200 -Subject: [PATCH 1/7] [rtmp] check m_rtmp for non-NULL - fixes crashes with - missing librtmp - ---- - .../dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp -index b02792a..93fc6f0 100644 ---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp -+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp -@@ -104,7 +104,8 @@ CDVDInputStreamRTMP::~CDVDInputStreamRTMP() - m_sStreamPlaying = NULL; - - Close(); -- m_libRTMP.Free(m_rtmp); -+ if (m_rtmp) -+ m_libRTMP.Free(m_rtmp); - m_rtmp = NULL; - m_bPaused = false; - } -@@ -139,7 +140,7 @@ bool CDVDInputStreamRTMP::Open(const char* strFile, const std::string& content) - m_sStreamPlaying = NULL; - } - -- if (!CDVDInputStream::Open(strFile, "video/x-flv")) -+ if (!m_rtmp || !CDVDInputStream::Open(strFile, "video/x-flv")) - return false; - - CSingleLock lock(m_RTMPSection); -@@ -181,7 +182,8 @@ void CDVDInputStreamRTMP::Close() - CSingleLock lock(m_RTMPSection); - CDVDInputStream::Close(); - -- m_libRTMP.Close(m_rtmp); -+ if (m_rtmp) -+ m_libRTMP.Close(m_rtmp); - - m_optionvalues.clear(); - m_eof = true; -@@ -190,6 +192,9 @@ void CDVDInputStreamRTMP::Close() - - int CDVDInputStreamRTMP::Read(uint8_t* buf, int buf_size) - { -+ if (!m_rtmp) -+ return -1; -+ - int i = m_libRTMP.Read(m_rtmp, (char *)buf, buf_size); - if (i < 0) - m_eof = true; -@@ -210,7 +215,7 @@ bool CDVDInputStreamRTMP::SeekTime(int iTimeInMsec) - CLog::Log(LOGNOTICE, "RTMP Seek to %i requested", iTimeInMsec); - CSingleLock lock(m_RTMPSection); - -- if (m_libRTMP.SendSeek(m_rtmp, iTimeInMsec)) -+ if (m_rtmp && m_libRTMP.SendSeek(m_rtmp, iTimeInMsec)) - return true; - - return false; -@@ -229,7 +234,8 @@ bool CDVDInputStreamRTMP::Pause(double dTime) - - CLog::Log(LOGNOTICE, "RTMP Pause %s requested", m_bPaused ? "TRUE" : "FALSE"); - -- m_libRTMP.Pause(m_rtmp, m_bPaused); -+ if (m_rtmp) -+ m_libRTMP.Pause(m_rtmp, m_bPaused); - - return true; - } --- -1.9.1 - diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index df4d37f38..bd8e32c35 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 112480 2014-06-02 19:00:07Z idevolder $ +# $Id: PKGBUILD 112817 2014-06-08 08:35:29Z idevolder $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> # Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> # Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com> # Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor (Arch): Maxime Gauduin <alucryd@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> _prefix=/usr _pkgname=xbmc pkgname=xbmc-libre -pkgver=13.0 -_codename=Gotham_r2 -pkgrel=6 +pkgver=13.1 +_codename=Gotham +pkgrel=2 pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -46,23 +47,21 @@ optdepends=( ) install="${_pkgname}.install" mksource=( - "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" + "xbmc-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" ) source=( - "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" - "xbmc.service" - "enable-external-ffmpeg.patch" - '0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch' + "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz" + 'xbmc.service' + 'enable-external-ffmpeg.patch' '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' ) mksha256sums=( - '663b99f3e196ead51d90f06ccfa864b4e5ade385dfc5972acb0f854d525f2903' + '344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678' ) sha256sums=( - 'a23b416f7cdc5f2b3d5544fc9a2ac22c4cdddd117ba82fe8aab25805552ff974' - 'f83097388e6c9b301cac78de95cf1797d4aaa11e4021734c28d643320e76d919' + '0e06a586e2b3041fd812b9d440ffe224f78779ac4cf6a21421a47c74a0f65d1f' + '17ea860b675568f516df0289e5663029a2ce1829b0dfa3c71636ef1ae7cd2207' '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355' - '4d643f1bc5a0f9a6bba36c8c2c2d220351acb58172c57d86417b67c02d39fa2b' '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' ) @@ -76,7 +75,6 @@ mksource() { prepare() { cd "$srcdir/xbmc-$pkgver-$_codename" patch -p1 -i "$srcdir/enable-external-ffmpeg.patch" - patch -p1 -i "$srcdir/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch" patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch" find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + @@ -126,6 +124,7 @@ build() { --enable-libusb \ --enable-libcec \ --enable-external-libraries \ + --with-lirc-device=/run/lirc/lircd \ --disable-non-free # Now (finally) build diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 406476198..48f337c55 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -10,10 +10,16 @@ post_install() { post_upgrade() { post_install $1 if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then - groupmod -g 420 xbmc + groupmod -g 420 xbmc > /dev/null 2>&1 fi if ! id -u xbmc | grep 420 > /dev/null 2>&1; then - usermod -u 420 xbmc + usermod -u 420 xbmc > /dev/null 2>&1 + if [[ $? -ne 0 ]]; then + echo "Changing uid of user xbmc failed" + echo "It is recommended that the uid is changed." + echo "Stop all processes running under the xbmc user and reinstall xbmc" + echo "or change the uid manually. (usermod -u 420 xbmc)" + fi chown -R xbmc:xbmc /var/lib/xbmc fi } diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service index d36ddb05a..81a37ac7e 100644 --- a/libre/xbmc-libre/xbmc.service +++ b/libre/xbmc-libre/xbmc.service @@ -9,7 +9,7 @@ Group = xbmc PAMName=login Type = simple TTYPath=/dev/tty7 -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -- :0 -nolisten tcp vt7 Restart = on-abort [Install] diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 7fb26c711..5a22d37c9 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 201451 2013-12-12 05:18:26Z eric $ +# $Id: PKGBUILD 214395 2014-06-09 00:20:39Z eric $ # Maintainer (Arch): Eric Bélanger <eric@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=xscreensaver pkgname=xscreensaver-libre -pkgver=5.26 +pkgver=5.29 pkgrel=1 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww') -makedepends=('bc' 'libxpm' 'gdm') +makedepends=('bc' 'intltool' 'libxpm' 'gdm') optdepends=('gdm: for login manager support') replaces=("${_pkgname}") conflicts=("${_pkgname}") @@ -20,8 +20,8 @@ backup=('etc/pam.d/xscreensaver') mksource=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz) source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz \ xscreensaver-add-electricsheep.diff LICENSE) -mksha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc') -sha1sums=('f041ac860f52fab79c438012ebf58a021ef9bfea' +mksha1sums=('a27a10c6eed024c458e927ee0dc1e6cb306d3335') +sha1sums=('0b0d8d57cac76460cb3a77aa5cd80adcfa856572' 'e8dc57b6471fb3867ee099304ac6bf628351cb98' '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2') |