diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-01-30 14:49:06 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-01-30 14:49:06 -0300 |
| commit | 1416490658fb1d376129a926572f34b6be8c3283 (patch) | |
| tree | e2336ed8d163eb63049f1a53fd91c68f62e768b6 | |
| parent | 27aa494d6370c4193a98b2df3502d07ba655be68 (diff) | |
| parent | 518a74be94932936436dd22d85a0584c904d229e (diff) | |
| download | abslibre-1416490658fb1d376129a926572f34b6be8c3283.tar.gz abslibre-1416490658fb1d376129a926572f34b6be8c3283.tar.bz2 abslibre-1416490658fb1d376129a926572f34b6be8c3283.zip | |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
41 files changed, 312 insertions, 707 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-grsec-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-grsec-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index a17715738..277700e78 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec-knock # Build kernel with -grsec-knock localname _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.4-gnu _grsecver=3.0 -_timestamp=201501182219 +_timestamp=201501272307 _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -44,27 +44,25 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' 'SKIP' - 'ba8d2a97211522e8fb1797e06f77e5a83c0f331d763e4bb5ce2931ddf714461b' + '655d998d6436c84e630696a94f9f53d0036fed82d5ff02119db2ab9e37db835f' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' - '98c976f19423a9aa917f8401e87478ed851535af990b7be1cc1ded938e21fd44' - '929c59c941c30d96b750d08ffc2a82fba8ba6bc04cbd03bb8e46ea8ccd2e70dd' + 'd081c0ec2514ee3dec06d2fe10980e2958746f9e78d0a5cda54c8df8cf4c4a0a' + 'fce9e649924e852519437f98dfaf6c59c54f7ece71210d4405420d673ff877df' '8b79e94a734b994aa788edfea58ab540de3f1db80adab88f73c6d11f4bb92dc1' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d' '438ce44e3409d644f0a99b05c3208ae3f1d46b8efe0edfc7d52ce3625e381ae9') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -104,9 +102,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/kernels/linux-libre-grsec-knock/config.i686 b/kernels/linux-libre-grsec-knock/config.i686 index 2baad6b4b..52d05bd76 100644 --- a/kernels/linux-libre-grsec-knock/config.i686 +++ b/kernels/linux-libre-grsec-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.18.1-gnu-201412281149-1-grsec-knock Kernel Configuration +# Linux/x86 3.18.4-gnu-201501272307-1-grsec-knock Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7002,6 +7002,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y CONFIG_GRKERNSEC_CHROOT_CAPS=y CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/kernels/linux-libre-grsec-knock/config.x86_64 b/kernels/linux-libre-grsec-knock/config.x86_64 index ae1197f5d..ce230aa76 100644 --- a/kernels/linux-libre-grsec-knock/config.x86_64 +++ b/kernels/linux-libre-grsec-knock/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.18.1-gnu-201412281149-1-grsec-knock Kernel Configuration +# Linux/x86 3.18.4-gnu-201501272307-1-grsec-knock Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -6699,6 +6699,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y CONFIG_GRKERNSEC_CHROOT_CAPS=y CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/kernels/linux-libre-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index feb55814c..6b11ca1fd 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-knock # Build stock knock kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.4-gnu _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -37,12 +37,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' @@ -54,7 +53,6 @@ sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d' '81adca8b3f58156f4a245cb7f20750041a9e6848b282942d7d9e213a04c96c9f') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -89,9 +87,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD index 586b4a56d..4432b7428 100644 --- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec-knock # Build kernel with lts-grsec-knock localname _pkgbasever=3.14-gnu -_pkgver=3.14.29-gnu +_pkgver=3.14.30-gnu _grsecver=3.0 -_timestamp=201501182217 +_timestamp=201501272307 _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -53,9 +53,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' + '35dfc46806b6a1196c8be9fe336cf16ccd576b81268865dbf03e241c06c36ad3' 'SKIP' - '3f22ab2bdba95d82bf186670fd6b2dfa77d6d9863eb9b13b149132ca329771bc' + '8da6bbf7eb97012e27875e0b19075bde4c5c23baff1272e7a97b449c53e5475f' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index 7a2adb551..134a5eb5b 100644 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec # Build kernel with lts-grsec localname _pkgbasever=3.14-gnu -_pkgver=3.14.29-gnu +_pkgver=3.14.30-gnu _grsecver=3.0 -_timestamp=201501182217 +_timestamp=201501272307 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -50,9 +50,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' + '35dfc46806b6a1196c8be9fe336cf16ccd576b81268865dbf03e241c06c36ad3' 'SKIP' - '3f22ab2bdba95d82bf186670fd6b2dfa77d6d9863eb9b13b149132ca329771bc' + '8da6bbf7eb97012e27875e0b19075bde4c5c23baff1272e7a97b449c53e5475f' 'SKIP' '064ba6595f578bb09175508df8f8d824d6db9afc828f59b8e50f3f17063a134b' 'd7c0c0431e7b81d95b5239ae285b48a58fa3c9ae1fd87d990cdeb44fb27e0b3d' diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index 9610f872b..7395d69a3 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts-knock # Build stock -lts-knock kernel _pkgbasever=3.14-gnu -_pkgver=3.14.29-gnu +_pkgver=3.14.30-gnu _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -45,7 +45,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' + '35dfc46806b6a1196c8be9fe336cf16ccd576b81268865dbf03e241c06c36ad3' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' diff --git a/kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 48a19b973..d91258bf3 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pae # Build stock -pae kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.4-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,19 +33,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} - 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch') + 'change-default-console-loglevel.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' 'SKIP' '8d255e4551bb88252ede8cc0f5046794372076da6bd97582229172537f0cc922' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -70,9 +68,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/kernels/linux-libre-xen/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-xen/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-xen/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 390feab1b..1f3fd9b0f 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-xen # Build stock -xen kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.4-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,19 +33,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} - 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch') + 'change-default-console-loglevel.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' 'SKIP' '345716983e32033e17967cb0b3a2a13bbe3aa2ccdc39ab165cb0ee7c01310e47' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -70,9 +68,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index ec53f0858..9285b0e80 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=18 + _archrel=19 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD index bcd226a29..9c555aba4 100644 --- a/libre/bbswitch/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=22 + _archrel=23 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index eef28bd92..11346e6b7 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=icecat pkgbase=$_pkgbase-l10n -pkgver=31.2.0 +pkgver=31.4.0 pkgrel=1 pkgdesc="Language pack for GNU IceCat." arch=('any') @@ -155,93 +155,93 @@ _package() { fi } -sha512sums=('d772c5b73adaf7dfc7d7304ee94d8e68ff8643fdcabe51fde2a62a2091a81e950728ebb004fd23e715f2f55020b6bfe4008434b4b16f1869e1384de68c69c6e6' - 'ca9e7daa3df7d29d50cf6ec2b96c3bc641e1bd70f87e209d12fab0a0a7e257f9fc78317dba7abfc1bc632ec922cff50a63b6111ad419cde35335f46a7a76a299' - '90bf95d3a395f0b93893f8b73cf5463c4263938db83fd415702bb53eec60597619967ca15a2bc47ebef0acfa964125d25580938280b5889e0f7a02d33da45a15' - '6fd2810608ce12fe46901f6d271447cafa96370e45ca08b1c8db92c6d61d46894a83197aad16eebefb988cf314e3e867a304629b5d2d602fa8c4ce4e6f1ecef3' - 'ef1bb8a20b500bab11ee92128635677bb480b1e1d7769bd50d40557e0bab1b3c81577ce8450288f0c7383f4b4d307fb01c9e0c63138d4006c8340258eefb110c' - '976fe98bc9ad96fdd45542dc5d4e7eb7dd3d7989c86cea726902f621775f4e87ec8b27b863133a942ab767d1cbdc25944893d6e7d8d2f01f7d7042c730057fa8' - '88386a0bc6e13714b8459c63ddaf8f9936dff4105ea954ca5a6eef44124e5b53a51f0343004cd305e1270ce7db1d3f29b6a9f3e63a0ac53636db919463a598cb' - '50aac5bb75647248c7d2c82cf4ae51d5289b336d10a2ad3feb4b5c1acc15e640546f74e6f9bb9a4c8b1bc002283c26402502a984cd7fde49c92febf3aa153fa4' - '88b3e90ab52d15d37979842b4171751c164ef4b700ad2ea5535c61ebdd74cdd67aa965bdd129730030d6635af50adc1085fab97b6308ac00e18d51f7ca247111' - '7c8a60dac0e79261bb68c139d9a369a8c22428ca3ae6f45c244cb64145690be46c5f8756ed29ce46d4837c745d848943b96e31d0eaf2e7e3cd0e9f7bc512340e' - 'ca06037ca7e2c7d8ed80d24bb7b8c593e79505260ec886c795e07010ee6e75431e2bc7986a936a5c9ca98e457c9d9b3ef346eaa06127cdd654b485d2e54b9ed5' - '45ab9d5722ce1b9839098c2743041d2c345e5f5c07fa7fb6ba9f838ed3cb6d2b2832156e8fefea57f54ef001063ca9b28a8f16c13e6f8d88aaf57bc450c08f9b' - '3304863fbc4f49a65ed8e1e6375f90fa008df9a8492159b2cf6d8050f4d29ab89ef6b01e8507eb442d8b77d77af0b081e1d5b7f867aa410e049f857aa6bc44e9' - 'fb3c680f0e23705762660ca687d4e850368fe110e2742f92302b59d96ca295be6d10a792d3bb76aad36a3531c64ba722b3376acdc976734b17c31d1851e100ca' - '86070c9dfc7d84377538597473606cb5ca627af4f56124b380e6de5aefe13ecad29bdebedb300626296e573fea5ca6cc7f8394e7787606329738403d6ef7961f' - '4f0a09ed2b2294e0e3564c9a522e3de1ac047b87c9e909c2e5ef66a1877617a5f0d59087d8c703603657e44eb205f9fb8e0826530541865b2ca99a1890bdc686' - 'b9bab563dc7f8ef18291e3bd4ad617324731217e9d55e2b1ecadc75b6b1827473c3cbdc104c7a5f8d9640c8352104648d67eeac176ea0b2658643370cb51f0f2' - '45d04aa6c501df2c92adca0ee5bc19bba366e5895962f6b36d5dc52914a2a5307578388a2814185c73f320565322f6db74b02fc7671f05c821a6c69f40cec6c8' - '680fca9e356f3849749b9da79003380c9655274389866e5acfb38eb18bc4fb283a92d395dd8e3e82e3070e0b6576be40db62cb642703ead5fe220ce0d4a75642' - '4dbd95650087a4354287203c7be456e8775c9a9279c85c49a5654916f84c4652a7053296b9ac63ad3275afd4db08b1629db1f7682fbf322875d4d72dfafb9977' - '9b823a3695eb9fe5c6217341205dcc345d484181d9c8d642f5d560bcb0a8454d0ec8de4f10fa07b47be61485b3e8ffe4554fb87807bb8a91ddf50d09a87d298b' - 'ccca76cd08b5598d5426765f0096b3d766d02f6f14e4cef93a05c148069cdb121bc9fde5964bbc1931aea0bf77da2839e4aafedc28929ad747e9b1ee97f1afef' - '97a5d34278a448437977a7c73bc7804447d870cf0bc7f7a6dec6410c35654584eb352e6b7f6279f4192f4beed0fdfb46ba34e6f32e67d3f604fa855986bbe2ba' - '352b243950071d1285edf3a4041090afde39b2629d9475097ad0de333a92665ccd61b7b92704f06e6573f0305f4b04fd80a74dca4f82f05c848449e441e96625' - 'b83a611c491beddbedc7673b603d2e1c470340e2a8a7f6911c29ed9ddca32e710ce4989f474219c8cdd7fe34278caa205618e05750932d7538c78b10196058ff' - '4057a646b4ffe0571702f4485203bc631cc481d3af5d9116d6df757e5a9f0fcf52fa965aaffb7c4d1997c45cfd080b79df06b0a4470c02b0770190d82031102c' - '491de247e8b2aa7632ad845cc2045988a3e37ef453e51a3ef823206d3a47d42c3ac3253bb557389b9b6cab1a7cc32babde2187c672db55365ad203a3fe278020' - '29979a754cc945472bcf208a5772d11cb8abb873bd1adf65986436b81b16f41b2aff093caaa7a3343cc5462cd6e076bee81f99914d2dfb34dc91033f5c8be151' - 'eef74b375b4180a772b01621351b4f41246e371d987a448fd677ce44be281461dec7535ebb4aaed5748999ef75ae338ed58a8a9b83f61f680f5d813a636abbcc' - 'e99764fdef32814d372b5df17087c95f57aa73924c2bd67eaf6eb493a81c22eeb0f423995ca6f0e29430cbef78c9edcf4b6de8992f5965d6a94fc787e666e204' - '5dad9cc436258f6b074232ff1d14e71599efac30c31feefdae7271f18ee6947b0c7f7bb2d791fe008ba0211504ded99b0406f1ce7bd78ab1f35b483a93c881eb' - '2645fdefc71cde29d5ba6e10b74982c284cd6391b7901d527776c0fc15b4567b4d2b50e2e7cd26e0857bb0e14a9c39a63cd2587c455e4e2bd92f4aedac5115e4' - '0a3db2b3155b48def8ee6857e42ccb8fede0d59adb037b0be2422af73213781aed0abc01ae432bbf4502433c5a0c3c742280944a398c709d21cc7bf217c6542f' - 'dd70360a993d28410903e6dd091f47ab9e029bc8b7e1f4ad7af599076ebf78665c53b1341e8695cb0ca99f130cb900fb3166b56cd4f9ff02a8090d2b6d83ec51' - 'e81b749495a4b89400f7b696ad8706d986cf1f73745c58734e4d42ed823e57e4a152d6f08f4a392c4f0d7e9abd40c29bb0432ffe2d846c8358e78353e2395c68' - 'bc0625794cb444bbf9038a4d4aa7a96f6a0592dc93273cfd6ae2011910e6136b423da45f30d07be8578b46f097d733dc3b62b9bb88987090708ea9baa531d594' - 'a315e0bda0b2fef69d538c10ce28db674f960a68e525ba585156fdc6d176fc641d6cabcc65fd9095b54be62bb33cb9e4e73ca467cbd224d221b8cafd9f1551e4' - '1f239bd73b3acc1a836286954c3d3ea44394acdc2659f0bfad3fe2922727569b9ca4667ff9243fa35a4b92be5018ff243ccd0c8f5c32d014ea42fcdac652ca4f' - '498040ae24805fd2b16bb34965f113eae6cc9d6bc630a3983d69421120491a1d16fc5ec8e836ad31f09fb4c4003a0b79e06d7372c0ad8030d821112508019faf' - 'd9135e598d4a2648a772c0364658fc0da39e420e113f61ea202c07f9aacb3ff1990376f45bf0b860dd33274c613ad33770cab191187cc9714a66d845c717c4bb' - 'e5ed53c900b7af771397bd354f9a770aa8f8235858a8fb318a02fef440566158468d1efb4220ee353bb1e37205fe16bdd320d272409aa3692c6dc0e17b0a74fe' - '6f20922e8b88dba320ba3ee7b83f9f74f4074eae0e34a474f7a763f22723e3549bd84eab7d54142f11ef0fa9193f91c5f4696e8c859af109433ab5f33566a867' - 'f70b7ff0e6b410e987caa4c5ab165818b75194202cb564a15640294bbe51c58cdcd40bc6f292b480493c59145712573f517142f6dd1252c3d5fec52cc41ab594' - '30cddbc69150647046c2a259ad8404c03b0a589796d2ccc8db0ccb82a18182791e261aefc72551be0a4f517bccd391da4cbf8fec8f2c2b325f563d7662959b53' - '1e37cdab4b079cee3bfa5c6bfe8efc276b033de854d9b7143d7e71f72d39e5dd13137a900c7ef49c8545a8b321200c497c64327981a89b92abee84a6cf5f37e9' - '9f90627d8502c9b3eef41f4635438dac8996fe134f3f76192d1ddcbb6cc5499fb1fb3d69103b55080afb738997ca1b369cf4891c2ace70fbd3f08fb557040957' - '129ea54a9f3cb1f6a77d2dbcb80de94fcb08b485f83618fc914f8f1aa4c4247b5ff38912517dd54e36f0de7da565f680ce8721be1e7044a7908fb95aa48782b6' - 'f2ddff39e765f393a23f00c9833b8b5c712d10664b8580429fcb2fcbb0c0bce3e79c6cfa95ccbd3e43b1bad5e5f99749625e299979b0527a84c6a950c0c77ba6' - '9835149ca753fdf122e3fa43429ed653ca8a8159bebbd198b9dc03be3cfca5949daf0511081aa806b34c56ec906c13ac81118bf45531b0ab623a999b269bb701' - 'f07dba37f390e639a07645f8a262c9f20e339292770aac0156f02714f34fbbf067407f20a7caa9a0ec83d072d28a6ca66c3fe9083298b82684a27190ec796879' - '25f2c88688d2e795702db710317e1a3a24e369e0ac706a54abcea9aaa58ee385e39b0d08ff68fde5e54e66b1893414e81e3ecdb3a1d0c39c42209ca22aee3b0d' - '012d41f51f7c086bffc5a39859408a449b7fb6ffbbfdd109901fa589b7af431f3d04cf91cf5f6eb973be9f52ec92e0ea26c096a5a57fbe7f3c5b2af545d5b91c' - '6fb6ab8e05b0d7c24e7b31046af355444211a628fa5d13fc7b65c77ed6a9c31b547580be340ac88ba6750b48ab63b4137b26e03f2fbd61dd47fd73aa80cc4107' - '0cfe26a0e69d5e71f58b69a137ffcfc4b809822a8bb6bab3d469348231fb1a3789c4ab189ba56eb6100f8bd3b0dbba120c2bb389dc68c013509ed47fefe50479' - '3fd5e8319f811a3c1139b088cf82690b6db5e4e39e5ad1689bdc168a0bb6e234ae4e37b92917909b03a4019a09b3dbea6e1644c039ac222356a99815f4624e91' - 'f13b06ebb879034365c1133db91bcb2bb78ff224bebfa901180ae828cfc9a78cabd955134e703805d89f3f04b8da8bc625755ae06b76f6cd7d1e386928f9cf98' - '6d936faebd9e7d3afab8ab4d05990f11a50f0dfdf17b631d73fb872f1432f3fc67a46cc2df4af172f56350c78132caea00093cfcc44632eab3ae3ba882edb3ee' - '37f6bccc1f08f0f3c251f8e14e4b1259b67e442dff2d63a04cb745f78e71c9c21f9269f9831a676bf42f6857fac1c8817ef7ebe6a014676ba8e8135961f9021d' - '00adb2073c9bb2e9cf603e1871a551d518d99b4af65c7254113c6f8c96c8263a310f3e7b4650872e32964ce31207a277f4d9e18465762341b465c707f787b448' - 'eff038c627b8021623211da5be08585d86c9f443b4d53e81196699c0a72e81609aeb9be1495eaa400a9ba98a227d938e1850c9d7c12e4f9da415f0d8b453c681' - '974838ea89ce8a85265ad3b53cd29b4cc70fce06536adbe56dd03c7eb1554706e0abed4d3ff41d345f27b0cd78a62c9981a6e80baa9759c9832376b69fc7afd2' - '112f05cd0c5b35c4affb5f15a4ff7933f6fa5ecffc358685b8292fab04bf1a1533cf4971b0a4af6beae8658374623298c9c6cab154151b741eba8d69cea2316e' - 'f9157181fb5f3c4f5a9e095119957f9d1c8677dc9b365ffa772a6c3a12872720af5027b347699fd9881c909bb4766d00a9e3aa595cb4838d39976a55ad0a1b63' - '39b841def0a21dc898ee6a6620d83dc3bcfdf2e2bc822254d5f80dca8b322de3bd4d379b7a3ad621fd82b30a02285c7fc8916dc7788f6689019003e4b5387cba' - '61a20288eb2a1f60be5c28ed3cb0f0272827707fc249f39fe3570bd85cc5375fc758083c20a43aab0f648f544f382975286dec32b1639638ef4394ddfee6701a' - 'd3116badd0da77ae467452d2a98632e3eb9d77ae166ff5c43edd48c77621c141799addc629da890563f3ebc1404b0ffe1e8ea8a32d0d8fd1d2942352fbde3e04' - 'e474135b2458e8ddc1b080d4672e4f5c5c43b07d265acecdfd35462d046948c214a36a91af0ec822204c444a017f07199bf7f7af5a2fcebae0ad43cc27bde301' - '5167a59bb358897a7a6c8c61053a51375a5bd9ab8445302ef9b050b27173efe9db191312dca57d2f18f19b88d8c38ca800805d84e139d905d8f8dd2363d50eee' - '83fb2d098ca82ce5fb96c62935b7c4dd2b939080ea7063fa224dfd444174ba38fb24d178f78119fa0fcdeb4a5cb0ef8af392c7eacaae29a32ce37087decacff1' - 'f61c6763d740ef118c3b758ff44a0f0dad358be0b8736ffd9b0eda56253728da1a9abc6cdbab5fa91caf2022f212ad0cbf4245506bda5698ad91a880d74a05bd' - '794e9ce6ee11903be7e3aaa5331a52a310c00f9540478073d784ece803899ae51c0e5bf3d1f325ed0526160fa3269123197ae95b021db47878ed8fc8e6bd5074' - '980cd0f93ab74d67c404ef38afff703b0f78cbb28dcaabb5f69522dcb7c05e549103bebfb1c6bbb2b003870fbb66b8d3e6c2f2dfa6393d9181181c514e8e7645' - '219184fa58f2a8eacfd12cf250e65d2f543767dbca3ac1d30b387d3ed1c06f7791c359647c967693313ce7f1e16969b4fdbae108deffb70cbdd7516f0005a94a' - '538332ccb0a65774bf73a660639a417b48fa0b4d76d0d9971fa458708f0e38cd3166fdee98f443fdafa4928d1d3af82c1dc9c60506ba028fec3c1bf5cfa02db3' - 'a4717bba1e9c702430d0a19f170f23624dd1ecc76606d3981cb06d2a0077a94cab78d8524af443b8667750b966b2a09289a69b26f218797be5cf2ef2449052dd' - '5321dc72af13802fea031c53fdce584cb2e2060b4a0be58c3efc51087e65e5b005aea32ee5e1727943b89d8639f9f54166c67696eca7d9052483ad1d16038414' - '7970086b57256a1182c28480b67836ad29dc4b3a7fa1b859b826af41e95a4c0ba300fb91d25e13865f8ff479dfce9dbda7146b5ec8e2f8d1801d74e012725958' - 'da993e50600559e96d4f09a3b2c0c786cc3d44dcd62f202f3d93503533f11d01b1ec117e4ee69de92982edf5d39b1bf5591452f54dea80468291da1a4d75641f' - 'ea9d960b41effdd3970428d428e6f95acf9e23b51fd86353f4978df7b710ac2eb64c6447583b271c149389b38632b4924e141e72283ff755b7d88c8ddc950101' - '71bbbbb684e9308a862a675a206ee61454dade90dabb5c3df199a1277ff46a2ebe9d1693375bd6bacbde7e4cd2fa5db8d66a09b743e164eb91e9b252eb042ad8' - 'f0a9e601bf6162e603bbc4e538d71d6cf77f0b2cc46e3fce5dcacd293bc57bc1ec04aeedc88030ee3341bfbf318f7a7b15bab6898539a0137ec2430b5d1e46af' - '402443177ed90a41cf793f00ae82e73e76c142a009393a4dd0489c45c89632a527fb7557912db1b9f1e171b53bfb65b0ec0b117941e04c44aa93ddcc7da7ad6b' - '1f3ad929e214da997e4585d854458f12f6fbe9b4b73a6469e048664600a77d1225bfcc4935e0a9647a4495393e19f3c6f4480c37abeb276a849982ca8779bbbc' - '3c242e62c3818dd4e64d535c06ec2d3dfa74835eb19b51d73c16ebfcde7e5776d90f32297e9ac98f2722d05ebe6b658280ef096df69f2157b84b68ff1d338b4f' - '6f0fc0971bbcb5f0068b132d68a72ed53313e940521edf4fce9beb66562a8e889356c640455e637b9a130b79f88bda9d1670a420de39a24a67d8a5cd35b855b0' - '95fb69f75f79bea35c382feeacfa22c30b110697f36b9da2759e9cc384fbb98e1028c44aa5fad2be7e9089b5a1ff9ebe9bfa6c6ab6c9f67d0235e334ed6ca2fa' - '2903a54ff5ceeb40314822c3a940b9b0cb4123d84ea0b2eceeb7aea3ee21f7d632185e397f11037a56f89cfa61f008ac4ab09f087cc6bd0aabd68dd23cda2096' - '0e041a55903585f755e9e436276d5b65b26256a202402b167526727209057d6859adab4c503cd38e326b9b0f563edd80d3e68f4b0747fe046aafc737a1f66e6f' - 'd4439e065dcfb70149a1df3d8bf04f3e875cfb8d054028ff21663e45b731c58b7035c540f8fed293d2a138f1a5df0468c04bae9bac5ee274732988a4b3567ea7' - '7fb680dedef0b3fa01817b92f366adef24ccbb13637aeee7381a6aff7c3e0567858270db4eefc38896de43bc332e8a24082ecb055909048cf2616daf4ab53a28') +sha256sums=('0e638fc7d47c3931a3e676a690c50f5e9f6c889e06f12a8e0b19aff0c987631c' + 'f16c6218486e531675f5f91abbb264a179c9c12274eca8efdcdb69e3a3fcd100' + '79dfda66e7e9b0fc4b6069eea4f1f9c7d6c1f9ab5b95797728a121da480cc8e7' + 'e628786aa12310c46d11b1f71877a977b37cf35ccbba20f72bcf43deba32014e' + '033ca17a63687200104be2d9a2ce62d59ea7c828f24687ffdfefc66b01b553e5' + 'ffb62f1f180d6f6e9b86423688e1c0372bc4aa186ae5da8e2f6f812b813150b4' + '1e973777013b99477465a1227f42e37d8ac0d235c02f84ec69aaa26d847fa249' + 'cad3a753d5186539f42782394348305170a570a5a98e0c33949cd966032604c2' + '42578688e1d7116ed696bf3e181d24600a2060e431986756fbf7f00d6e8a9724' + '8979674c91c1e35b70fe70942eb6fa24369a6a679af3e3f006433d05f045b96e' + '343f54a1c158390ec1a2b5403971b8b66f19636e2943a3e83263fd71f43ee7d8' + 'e32886c82030cd4c6a433659be33e2933165bca268782f73a40629a5e250f20f' + '0cab052e3dc5b9a02d609cb713da1ada2584f9e757167daa1cb75999db7e8d4b' + 'ec01e7b6d3a34c27ff445ddf4d24415e30cd07e77633204adcc4fb0025526f9e' + 'a8385cdeac58153aff3d205fb2697d6a87879baf8a91e13a89fc486ed3de3e10' + 'a8815688647f5ceca3bc4891910cea77b6201698db3c9505b4b833f89a939274' + 'bd33a5b744d6e0bb1bbff44031659ca33425e15d2dfd246fae1984ebb321ed2a' + '4ae0e6cac7248f81165d6789bcb779d468fb0615069d1ffd9063496e3db453b7' + 'd21193066bbec6445fb78a351ec292b35ad8885bc52c07ee85e002f202afbbd3' + 'd1ef945f7d54811500377f4cfc596f7a54e57a7aca4ae581ed25f6802b1e00ed' + '56039ef0d41761143a0b6ef00f9d487f4b818d75d749bf6274859afa7851f542' + 'ced2c9307286c610b0fcff00256e7a3b13d06203f280feb2dbc371f9959342c2' + 'f5898f7df2549db0c4e96377cced53d86e8ab5f72b748fbc1da2b8b5ed9ffb07' + 'a705fab5da5777c145b7b288ddacf229597efa6c7dfd1fa01b73b82149134bb2' + '2cc59b439aad1b10a496eb099a4bdb3c10bb095243ea73199ea4b04ca97174c5' + '60eddc30eddff57d7f478825d200134977b4369e38965c2aafe779410906894e' + '4041644cfd9e8eceeb0fd4350381f879f15b5fd329639fb033f6418978c3214f' + '7ec7a9a83f6998430e636e2c483d4fe726f0d7e4e463c6e564b9a24a91d5298a' + 'afbbfeeec9fb4662daf3fcb2483e57fd7b3c5c084e6e8eb717f94905d9ff5da5' + 'aa38c7771524baebe861577506f8b7b89fe81ece9cbe9e08e16a34989cd03146' + 'b94b116ef16c91b21983b9e68b4c1f5cf63ce17a44566ff3e95a350d269e0ff5' + 'df13119cc8edb181abb270390f2f09b3f1cb6017895d9ec762ec71ed58e77ead' + '2537225b157bc26ab5766cad529c31d942c5bef3e3109d0511a4738a30e39e2d' + '94d5098ea924fe763a567fe5efbfb68de474498d510357b549100f68bef51193' + '4af710ee7aa36682e76860aa0c2d2803f125040e83a69986b8897b139c772176' + 'd945a2a4ae9c20da41a3505b941b18477e560d17f5befcdced56121cbbb617a2' + '6c92c057dd9f3180617c015985dfd6818bbb131ac076a7fb91dc657dd8fdb6ef' + '6fff4cc8493fa683c55dec3a0e20afcdf5af62ae35d52dcc9970f82d238284b8' + 'b66c9d9380fa8fd691c26e13b33a5c2917de9882701ae91deb7db3621ad50587' + '3efd3249949bcc007532c197580913bdf73b803f44276714d1a1e5e216352504' + 'b47c491a79dba0c54f8322f2aa79c478f051cc58020289df5cbb941b1580f24e' + 'b612518b19317c39cee09b23fbf5ba0948a54e95a43706e3c4eeff33ce36484f' + 'efa3aa667cfa0b70ec7afbbe25e0b8ed6ad1156b04dacd7c250560b0553ebbb1' + 'e5a9b31002b90d0d2ec32e809be13f179b990c7a0caea7501559397b1c18089c' + '7840f00764213b35f7c3689ac4d9cedc560c2a7d64491e2a8a4908c6348ee64b' + '806df25b6f83f66fff97b25b5fcb466ba301354c5cf4b5889d748b2bdbaddcf9' + '537dca2cd79bd9bc2d299ef69fb7bae6991a2b81c530a91ddcb87b255d9051ed' + '91c3492db220467b772ee2f18bba745098f9ef16de728f7b3c12b4c3ad9d63a5' + '0094cc051bad72342f1da26583564df20ad65bbe9efee2bd571e21adfc90f6af' + '900495810324de5b9f330db06363438e83d10e57e6a3a20045d5685f7bf7ba36' + '6226fd3aa56a8284386ca50d2a9ad790b7133f622e8f3815f0cfd4b6c236532d' + '1ae9fb004977ebb676ae9fc485a464861524566263d10d6c0353e0ce2debe861' + '0d814b2375f23f997300f981d360055051d30f19188bda029428d67ced277304' + 'f4156f048e6f914cd878a78b45c564816d0c1fa788cd39a151bfdff8e4ac5d55' + '1ac373ceb3a5e8dadc76b81bea37cfa0aff45aeae76b2c98a27e5caac1759d11' + '0900603947b55627065979d5fc911bcc3ea859115b9061b242326679ddf20f73' + '5383ee89cd9f3ec711acf7d8b4fdda3ee4212956f955652471b273d4177fcf9c' + 'f69e238f6a9803f0d313d47e87e689a54c5e83361c8ab00da88433667337aff4' + 'ee6074fd5101f5bdf8046a3cdc7929981e1f6e6854a20c89cf070c6a0cb95422' + '3c6b66fdd7206fc821caaccbf8b067857b2e5c9c1d536d4e47a326ec78e27920' + 'eb615a0cda57ed3387a832e89cb034484eefe67672d0cd75079f3cd44ee56511' + '87e26105380d5344399aacd0daf5f834e7ceebc139cc6ba9029c33639995652c' + '1af6742c896ad489d8cd5e82af8c4e3f4fa53a604a0df60b7149df9d7864d3c1' + '14eccc3276257d1dbece635b96ae57b2ee0f4a0512f64840cf724367442137cc' + '5bfb9303b3ddb34577888c1039e284bf4e62a1dd9f453556b0ad08877f121abe' + '788b43eb9f0a513610fc68e55f1611bdfcda2accf88c55852fed75e7bfb16d2a' + '5105c8402436018a24bd2d113c662768c285cc88ffb64b9acf4261550487d0fb' + '4f81e82b5a3597221898287e48a0c196a569c82a14d7824050978ce81d5c1723' + 'dd374a60033f9c8cd5f88e80d88696ef6aaa16845850cb35031aaa5070a7da51' + 'd6682c7aadd28c03797d977ebf5625e77c2496376f4c0ccece47951d863715cd' + 'ae11ec89879388b347f6f4d28162cdec2cfed753a4fb6687626aea301d9792b4' + 'd2a5032289cb207d884d4a0c8a4763549ef0d3392339a4c8607e24ad2848f5dc' + '387429bb8b139ccd13b4b3a8656f2f35b8d3606c1373d9fe2ccf85e9ef9321f3' + 'c8f992484ab7984e2d3c6b791133ec5df7dacca7b2f66feddc0bc3f1100e3543' + '08a8110d96a9a1a505cd6856582bae9d9bda66dd02690acf2598883292a828c4' + '330aaa9a1e7b99418a586d23d9a71c6803fb3321a68d1d6fe603662b1161dbf9' + '08f264cd2f984ed2b34fb3a162b1cdbcc9fe44cbab73aa2461e11f12771adc85' + '1cac68b02f1059fc4e8134626f55d085aab452d2dd13e603a2962c40fd5f4716' + '1e45010b5f39ed2e1da3f9729067f4d5d9711d620977ddc3ba22e13c6d9840a1' + 'f5e3291406996368bc96bd99e0e49a41df01f54b34034d2632a858bf0d218705' + '4cc8af0e5ac6a56283985b790bd494bdb72dfa50a3464d45e306535e97925f04' + 'c19255a732eec9ac0071becf1153fb7c74c85558ef5971036da6d60611a89678' + 'b8768e4dad22e4770b52f304f2da44d40266d63aaa2dde01157d0c281cd59508' + '2f0e89c993e2f845eb0bdb4b909c527190419ff8fd39adceb12c4f52bf239a90' + 'a2f1d4c9944d3b4e1bd4ca64081fd91040e0acf5d1f130538ff8d18fe9018dbe' + '668448d5d39687c89d03ae4e62abc38d978a61fb94ad00e871a0144793174648' + '35a48ea550d93f5f3b18930430300b35969cd00fe7125e40deaf08e38c1dad89' + '1dd53edfe74f81f23ba87b55a09e1bb613ec20031c9eba1357e0d604bd02a17e' + '9083ec3b54d594e85d5f69a3572b0685f0445681cab7d9aa73611d8c5cae7a64' + '4d362983eef432b43d8f29eb4162ad50668d5a33ce162e0f3663d3ba0f54f4ef') diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties index 5654eb9ee..dba40e1ff 100644 --- a/libre/icecat-l10n/region.properties +++ b/libre/icecat-l10n/region.properties @@ -11,7 +11,7 @@ browser.search.order.2=DuckDuckGo Lite browser.search.order.3=Seeks Search # 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 +# cause IceCat to re-read these prefs and inject any new handlers into the # profile database. Note that "new" is defined as "has a different URL"; this # means that it's not possible to update the name of existing handler, so # don't make any spelling errors here. diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index ecc2b688c..a04318b7a 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,8 +13,8 @@ _pgo=true pkgname=icecat -pkgver=31.2.0 -pkgrel=4 +pkgver=31.4.0 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -31,7 +31,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'gst-libav: h.264 video') url="http://www.gnu.org/software/gnuzilla/" install=$pkgname.install -source=("http://ftp.gnu.org/gnu/gnuzilla/$pkgver/$pkgname-$pkgver.tar.xz" +source=("http://ftp.gnu.org/gnu/gnuzilla/$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig} mozconfig mozconfig.pgo libre.patch @@ -41,16 +41,18 @@ source=("http://ftp.gnu.org/gnu/gnuzilla/$pkgver/$pkgname-$pkgver.tar.xz" vendor.js rhbz-966424.patch $pkgname-fixed-loading-icon.png) -sha256sums=('b0c532e7b768230b66e5fb43bebfe300c344842806db088ee0467cc01c9d290b' +sha256sums=('82cd59faa3e8e5cc72cfad4a6b5bbb01436a2f0bec270c93e32bb3e5dda3b160' + 'SKIP' 'e0779596c2aafa0f77f09094a218940b1dc5120cd6425d4ea1e8c96be44711ff' '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4' - 'b993969d075bce1a8021719347dbbad79f0adc0dc9c549efe4948806253c1882' + '168516e130019250a8bd91e4a61f5c437b0dccd224165ff3e85d2bce69e91a84' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' 'c2c636fc65e7f6506a7305b930ad403100bc0b51401bd7d6567b48df3654f82e' '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' '536e82133ba06faccd31620c742dd2b95f1c2e0331934bb8ff17843436dc2142' 'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') +validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez prepare() { export GNU_BUILD="gnuzilla-release" diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index f69c535b9..b20ddba8d 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -655,8 +655,8 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-10-21 14:25:19.071641759 -0200 +--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-27 16:19:19.000000000 -0200 ++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-29 12:19:21.741429014 -0200 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -670,14 +670,14 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales ---> -<!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your IceCat exactly the way you want it. <a>Choose from thousands of add-ons</a>."> -<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights --> --<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>"> +-<!ENTITY abouthome.rightsSnippet "&brandFullName; is Free Software from the non-profit Mozilla Foundation. <a>Know your rights…</a>"> - <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> <!ENTITY abouthome.settingsButton.label "Settings"> diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ---- a/browser/locales/en-US/chrome/browser-region/region.properties 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser-region/region.properties 2014-10-21 18:02:51.771216707 -0200 +--- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-27 16:20:32.000000000 -0200 ++++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-29 12:21:13.202346944 -0200 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -716,15 +716,15 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow - # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit --gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s +-gecko.handlerService.schemes.irc.0.uriTemplate= +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit --gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net +-gecko.handlerService.schemes.ircs.0.uriTemplate= ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in --- a/browser/locales/generic/profile/bookmarks.html.in 2014-10-09 12:53:30.000000000 -0200 +++ b/browser/locales/generic/profile/bookmarks.html.in 2014-10-21 18:02:15.103296484 -0200 diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 1b95a473d..808d37ff7 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -5,7 +5,7 @@ epoch=1 _pkgbase=icedove pkgbase=$_pkgbase-l10n _pkgver=31.4.0 -pkgver=31.4.0.deb1 +pkgver=31.4.0.deb2 pkgrel=1 pkgdesc="Language pack for Debian ${_pkgbase^}." arch=('any') diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index d9a518c18..f4bf1c39e 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -4,7 +4,7 @@ # We're getting this from Debian Sid _debname=icedove _debver=31.4.0 -_debrel=deb1 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,7 +31,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" ${pkgname}.desktop) options=(!emptydirs) sha256sums=('7b47a053fe1f10097350d4a599a80b91eed1dc21dfcda1618b229f97493cb93c' - '6217e7ef89d6c9c9caa616280051345e6ef09645d1ffe4006e13c940bb8b5a1b' + 'ff0db7a63f3e0648131ca59e4e3c6ff911e795030a49bcf1edb8585a01b33437' '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec' '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index 38aa2f1cd..1c5203899 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 228005 2014-12-24 13:30:15Z jgc $ +# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -8,7 +8,7 @@ pkgbase=digikam pkgname=kipi-plugins pkgver=4.5.0 -pkgrel=4.parabola1 +pkgrel=5.parabola1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ conflicts=("${pkgname}-libre") makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' - 'libbaloo4' 'libpgf' 'libusb-compat') + 'libbaloo4' 'libpgf' 'libusb-compat' 'libkface') depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2') optdepends=('libkgeomap: Geolocalize tool' 'libmediawiki: MediaWiki Export plugin' diff --git a/libre/linux-libre-grsec/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/libre/linux-libre-grsec/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/libre/linux-libre-grsec/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 5efdc74a9..2f6006f1f 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec # Build kernel with -grsec localname _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.4-gnu _grsecver=3.0 -_timestamp=201501182219 +_timestamp=201501272307 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -41,25 +41,23 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' 'SKIP' - 'ba8d2a97211522e8fb1797e06f77e5a83c0f331d763e4bb5ce2931ddf714461b' + '655d998d6436c84e630696a94f9f53d0036fed82d5ff02119db2ab9e37db835f' 'SKIP' - '1c9235ee7f1daadc6b710db787a36b2bf143610eed44071d9ed99b98f7199b04' - '4d733a9eec545743872b5baceaac19273ef1e3f76cc3a43928ddd0ceef107689' + '45486e39850926a4695bd21258d0a73333c014ff38fbfcdc78cf19298a4b1feb' + '5b4f43875196306cf81f864172dc6ceaf09c2d08b44809fdf11111d217e18e17' 'a2f86e2f2b0924d493cd4b655aba5df776c6e8057fdb15551f31c8692ec071a8' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d' '438ce44e3409d644f0a99b05c3208ae3f1d46b8efe0edfc7d52ce3625e381ae9') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -95,9 +93,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index 2b5e6d128..f8281538c 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.18.1-gnu-201412281149-1-grsec Kernel Configuration +# Linux/x86 3.18.4-gnu-201501272307-1-grsec Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7001,6 +7001,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y CONFIG_GRKERNSEC_CHROOT_CAPS=y CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index 5b4e533ca..bd0acb45e 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.18.1-gnu-201412281149-1-grsec Kernel Configuration +# Linux/x86 3.18.4-gnu-201501272307-1-grsec Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -6698,6 +6698,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y CONFIG_GRKERNSEC_CHROOT_CAPS=y CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index c7bf0c074..561c04c3f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu -_pkgver=3.14.29-gnu +_pkgver=3.14.30-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -42,7 +42,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' + '35dfc46806b6a1196c8be9fe336cf16ccd576b81268865dbf03e241c06c36ad3' 'SKIP' '7c771ed094882d9df69271f19eab456c0266db6d5f8e680f18f4b1f4b89da066' '42e5795bd25dfba1d1275bd28fc53209e18d4cf824cf7ae6c45b5ce5701800fc' diff --git a/libre/linux-libre/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/libre/linux-libre/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/libre/linux-libre/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8075c2f64..8af191e8a 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.4-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -34,12 +34,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' 'SKIP' '2f03d1b7c6a198c3f5c1ff15583d468b93dd50d1c37d41a71075935eebb786e7' '81f1a730420c689da73554e323ca9cb4453aa20b8aeeed3864d3034b5470cc0b' @@ -49,7 +48,6 @@ sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d' '81adca8b3f58156f4a245cb7f20750041a9e6848b282942d7d9e213a04c96c9f') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -80,9 +78,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index c6749f5b8..8ef4240df 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,5 +1,5 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 228108 2014-12-28 09:07:13Z allan $ +# $Id: PKGBUILD 228934 2015-01-12 05:54:31Z allan $ # Maintainer (Arch): Dan McGee <dan@archlinux.org> # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -9,7 +9,7 @@ pkgname=pacman pkgver=4.2.0 -pkgrel=5.parabola1 +pkgrel=6.parabola2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -18,9 +18,8 @@ groups=('base' 'base-devel') depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0' 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'ca-certificates-cacert') -makedepends=('asciidoc') # build man pages +makedepends=('asciidoc') # roundup patch alters docs checkdepends=('python2' 'fakechroot') -optdepends=('fakeroot: for makepkg usage as normal user') provides=("$pkgname-contrib") conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') @@ -40,8 +39,8 @@ md5sums=('184ce14f1f326fede72012cca51bba51' '7279d086428df483fd60c33f7c88cf3e' 'a12b1a4533c170aecc8b9b8561048248' 'ce525a9af50f1d9b824806d2e5a4f0c8' - '8b8e478e3b6f785f6fb0029f792cea38' - '8c339b2bf027979d1edcfc6ac0e7e81d' + 'abe3baaf610d9cc42b4e3748c936bbce' + 'e86946908762aa44e8d3c582d4d872bb' '3cfc5d2867a6672f4f629220632948f4' '0ee98dc38ff80ba127772f5104e18e46' '093f0779ac55ae781ba028ad74b95f84') @@ -53,6 +52,10 @@ prepare() { # v4.2.0-13-gacc639a patch -p1 -i "$srcdir/pacman-4.2.0-roundup.patch" + # fix bad translation mistake - corrected in transifex + sed -i 's#pacman-db-update#pacman-db-upgrade#' src/pacman/po/nl.po + + # treat pkgrel more similarly to pkgver patch -p1 -i "$srcdir/makepkg-pkgrel-4.patch" } @@ -123,8 +126,8 @@ package() { "${pkgdir}/etc/cron.weekly/refresh-pacman-keys" install -Dm644 "${srcdir}/sks-keyservers.netCA.pem" \ - "${pkgdir}/etc/pacman.d/sks-keyservers.netCA.pem" + "${pkgdir}/etc/pacman.d/gnupg/sks-keyservers.netCA.pem" install -Dm644 "${srcdir}/gpg.conf" \ - "${pkgdir}/etc/pacman.d/gpg.conf" + "${pkgdir}/etc/pacman.d/gnupg/gpg.conf" } diff --git a/libre/pacman/gpg.conf b/libre/pacman/gpg.conf index 7fc6fc661..48ce83628 100644 --- a/libre/pacman/gpg.conf +++ b/libre/pacman/gpg.conf @@ -19,7 +19,7 @@ default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB # https://crabgrass.riseup.net/riseuplabs+paow/openpgp-best-practices # Only use secure keyservers keyserver hkps://hkps.pool.sks-keyservers.net -keyserver-options ca-cert-file=~/.gnupg/sks-keyservers.netCA.pem +keyserver-options ca-cert-file=/etc/pacman.d/gnupg/sks-keyservers.netCA.pem keyserver-options no-honor-keyserver-url # when outputting certificates, view user IDs distinctly from keys: diff --git a/libre/pacman/pacman-4.2.0-roundup.patch b/libre/pacman/pacman-4.2.0-roundup.patch index db18e1800..4441910f7 100644 --- a/libre/pacman/pacman-4.2.0-roundup.patch +++ b/libre/pacman/pacman-4.2.0-roundup.patch @@ -1,3 +1,16 @@ +diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in +index 6a68d4d..1690583 100644 +--- a/contrib/paccache.sh.in ++++ b/contrib/paccache.sh.in +@@ -256,6 +256,8 @@ while :; do + delete=1 ;; + -u|--uninstalled) + IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq) ++ # pacman -Qq may exit with an error, thus making ign an empty array ++ (( ${#ign[@]} )) || die 'failed to retrieve the list of installed packages' + blacklist+=("${ign[@]}") + unset ign ;; + -V|--version) diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in index 1c10b32..f4fd540 100644 --- a/contrib/paclist.sh.in @@ -11,15 +24,68 @@ index 1c10b32..f4fd540 100644 echo printf "List all packages installed from a given repository\n" "${myname}" echo +diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in +index b0d2d69..7b92efe 100644 +--- a/contrib/updpkgsums.sh.in ++++ b/contrib/updpkgsums.sh.in +@@ -82,9 +82,6 @@ fi + export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX) + newbuildfile=$(mktemp --tmpdir updpkgsums.XXXXXX) + +-# In case the eventual replacement fails, we don't want to leave behind +-# $newbuildfile as garbage in $TMPDIR. This fails silently if the replacement +-# succeeds. + trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT + newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums' + awk -v newsums="$newsums" ' +@@ -100,8 +97,9 @@ awk -v newsums="$newsums" ' + END { if (!w) print newsums } + ' "$buildfile" > "$newbuildfile" || die 'Failed to write new PKGBUILD' + +-# Replace the original buildfile. +-if ! mv -- "$newbuildfile" "$buildfile"; then ++# Rewrite the original buildfile. Use cat instead of mv/cp to preserve ++# permissions implicitly. ++if ! cat -- "$newbuildfile" >"$buildfile"; then + die "Failed to update %s. The file has not been modified." "$buildfile" + fi + +diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt +index 7fa91ff..c95c41d 100644 +--- a/doc/PKGBUILD.5.txt ++++ b/doc/PKGBUILD.5.txt +@@ -216,7 +216,7 @@ underscore and the architecture name e.g., 'checkdepends_x86_64=()'. + and are not utilized by pacman during dependency resolution. The format + for specifying optdepends is: + +- optdepends=('fakeroot: for makepkg usage as normal user') ++ optdepends=('python: for library bindings') + + + Additional architecture-specific optdepends can be added by appending an + underscore and the architecture name e.g., 'optdepends_x86_64=()'. +@@ -336,10 +336,9 @@ files into the packaging directory, with optional `prepare()`, `build()`, and + *package() Function*:: + The `package()` function is used to install files into the directory that + will become the root directory of the built package and is run after all +- the optional functions listed below. When specified in combination with +- the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage +- will be limited to running the packaging stage. All other functions will +- be run as the user calling makepkg. ++ the optional functions listed below. The packaging stage is run using ++ fakeroot to ensure correct file permissions in the resulting package. ++ All other functions will be run as the user calling makepkg. + + *prepare() Function*:: + An optional `prepare()` function can be specified in which operations to diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in -index 712ca60..9ed7ef9 100644 +index 712ca60..19f673d 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -19,6 +19,13 @@ DLAGENTS=('ftp::/usr/bin/curl -qfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o # /usr/bin/lftpget -c # /usr/bin/wget -+#-- The the package required by makepkg to download VCS sources ++#-- The package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::bzr' + 'git::git' @@ -69,9 +135,23 @@ index 6e6d944..d9da167 100755 } $values{$key} = $val; diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index 33dff24..18b2822 100644 +index 33dff24..da68dc7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in +@@ -362,11 +362,11 @@ download_file() { + # replace %o by the temporary dlfile if it exists + if [[ ${cmdline[*]} = *%o* ]]; then + dlfile=$filename.part +- cmdline=("${cmdline[@]//%o/"$dlfile"}") ++ cmdline=("${cmdline[@]//%o/$dlfile}") + fi + # add the URL, either in place of %u or at the end + if [[ ${cmdline[*]} = *%u* ]]; then +- cmdline=("${cmdline[@]//%u/"$url"}") ++ cmdline=("${cmdline[@]//%u/$url}") + else + cmdline+=("$url") + fi @@ -1317,47 +1317,41 @@ verify_integrity_sums() { fi } @@ -133,6 +213,15 @@ index 33dff24..18b2822 100644 error "$(gettext "Integrity checks are missing.")" exit 1 # TODO: error code fi +@@ -1504,7 +1498,7 @@ check_pgpsigs() { + esac + errors=1 + else +- if (( ${#validpgpkeys[@]} == 0 && ! $trusted )); then ++ if (( ${#validpgpkeys[@]} == 0 && !trusted )); then + printf "%s ($(gettext "the public key %s is not trusted"))" $(gettext "FAILED") "$fingerprint" >&2 + errors=1 + elif (( ${#validpgpkeys[@]} > 0 )) && ! in_array "$fingerprint" "${validpgpkeys[@]}"; then @@ -1627,7 +1621,10 @@ merge_arch_attrs() { source_buildfile() { @@ -145,16 +234,26 @@ index 33dff24..18b2822 100644 } run_function_safe() { -@@ -2142,8 +2139,6 @@ write_pkginfo() { - local size="$(@DUPATH@ @DUFLAGS@)" - size="$(( ${size%%[^0-9]*} * 1024 ))" +@@ -1835,7 +1832,7 @@ tidy_install() { + # check existence of backup files + local file + for file in "${backup[@]}"; do +- if [[ ! -f $file ]]; then ++ if [[ ! -f $file && ! -h $file ]]; then + warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" + fi + done +@@ -2469,6 +2466,9 @@ array_build() { + # Build an array of the indicies of the source array. + eval "keys=(\"\${!$2[@]}\")" -- merge_arch_attrs -- - msg2 "$(gettext "Generating %s file...")" ".PKGINFO" - printf "# Generated by makepkg %s\n" "$makepkg_version" - printf "# using %s\n" "$(fakeroot -v)" -@@ -2896,7 +2891,7 @@ get_vcsclient() { ++ # Clear the destination array ++ eval "$dest=()" ++ + # Read values indirectly via their index. This approach gives us support + # for associative arrays, sparse arrays, and empty strings as elements. + for i in "${keys[@]}"; do +@@ -2896,7 +2896,7 @@ get_vcsclient() { } check_vcs_software() { @@ -163,7 +262,7 @@ index 33dff24..18b2822 100644 if (( SOURCEONLY == 1 )); then # we will not download VCS sources -@@ -2908,7 +2903,17 @@ check_vcs_software() { +@@ -2908,7 +2908,17 @@ check_vcs_software() { return $ret fi @@ -182,7 +281,7 @@ index 33dff24..18b2822 100644 local proto=$(get_protocol "$netfile") case $proto in -@@ -2921,7 +2926,7 @@ check_vcs_software() { +@@ -2921,7 +2931,7 @@ check_vcs_software() { uninstalled="$(set +E; check_deps $client)" || exit 1 # if not installed, check presence in depends or makedepends if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then @@ -191,7 +290,7 @@ index 33dff24..18b2822 100644 error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ "$client" "${proto%%+*}" ret=1 -@@ -3435,7 +3440,7 @@ CARCH=${_CARCH:-$CARCH} +@@ -3435,7 +3445,7 @@ CARCH=${_CARCH:-$CARCH} if (( ! INFAKEROOT )); then if (( EUID == 0 )); then error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ @@ -200,7 +299,7 @@ index 33dff24..18b2822 100644 exit 1 # $E_USER_ABORT fi else -@@ -3597,7 +3602,7 @@ if (( SOURCEONLY )); then +@@ -3597,7 +3607,7 @@ if (( SOURCEONLY )); then download_sources allarch elif ( (( ! SKIPCHECKSUMS )) || \ ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ); then diff --git a/libre/qupzilla/PKGBUILD b/libre/qupzilla/PKGBUILD index fca6413f7..9565202e7 100644 --- a/libre/qupzilla/PKGBUILD +++ b/libre/qupzilla/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123979 2014-12-16 14:47:34Z speps $ +# $Id: PKGBUILD 126621 2015-01-27 01:41:35Z speps $ # Maintainer (Arch): speps <speps at aur dot archlinux dot org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgbase=qupzilla pkgname=(qupzilla qupzilla-qt4) -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1.parabola1 arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" @@ -17,7 +17,7 @@ source=("$pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v 'speeddial.cpp.sed' 'start.html.sed') noextract=("$pkgbase-$pkgver.tar.gz") -md5sums=('0d163296f2514512be944ba3b29bf920' +md5sums=('24c4033cbf20223eb73a33af9c037862' '1d926e97a5b287d40fb695f6516f2a06' '0f166fa102af975b3b8ac030d477e9b8' '77120a0c39ba8254e5b2c273910f029a') diff --git a/libre/spectrwm/PKGBUILD b/libre/spectrwm/PKGBUILD index 54df148ae..a5e29caed 100644 --- a/libre/spectrwm/PKGBUILD +++ b/libre/spectrwm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121464 2014-10-27 10:28:15Z kkeen $ +# $Id: PKGBUILD 126653 2015-01-27 19:06:39Z kkeen $ # Maintainer (Arch): Kyle Keen <keenerd@gmail.com> # Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spectrwm -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1.parabola1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') @@ -27,7 +27,7 @@ source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz LICENSE \ baraction.sh \ spectrwm-no-preload) -md5sums=('df479348cb17cc69eff2582e9b81d9ff' +md5sums=('eba7cba0c85706435657f744bf9086bc' 'd9aec3342920e31cbe60f1032571043a' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index b3e7c0f38..a450188f9 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -14,7 +14,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=59 + _archrel=60 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD index 5c2aeac2b..7a269688a 100644 --- a/libre/vhba-module/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=2 + _archrel=3 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/nonprism/choqok/PKGBUILD b/nonprism/choqok/PKGBUILD index fe43c768b..d4403c3c4 100644 --- a/nonprism/choqok/PKGBUILD +++ b/nonprism/choqok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 119696 2014-09-28 15:42:16Z fyan $ +# $Id: PKGBUILD 126479 2015-01-24 09:42:46Z andrea $ # Maintainer (Arch): Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Emanuele Rossi <newdna1510@yahoo.it> @@ -6,8 +6,8 @@ # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=choqok -pkgver=1.4 -pkgrel=2.nonprism1 +pkgver=1.5 +pkgrel=1.nonprism1 pkgdesc="A status.net client for KDE, without Twitter support" url='http://choqok.gnufolks.org/' license=('GPL') @@ -15,23 +15,24 @@ arch=('i686' 'x86_64' 'mips64el') conflicts=(${pkgname}-nonprism) replaces=(${pkgname}-nonprism) depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl') -makedepends=('cmake' 'automoc4') -optdepends=('kdebase-konqueror: proxy support') +makedepends=('cmake' 'automoc4' 'telepathy-qt') +optdepends=('kdebase-konqueror: proxy support' + 'telepathy-qt: IMstatus plugin') install="${pkgname}.install" source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('2efe34ed903b448a21d9233d8033dbdb') +md5sums=('f2efdd76199f8276e8ac2f76dc600596') prepare() { mkdir build cd "${srcdir}/${pkgname}-${pkgver}" - # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services + # remove twitter service and keep only twitterapi (choqok software) for status.net and libre collaboration services sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp - # remove uploaders plugin (with only nonprivacy services) + # remove uploaders plugin (with nonprivacy services only) sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop diff --git a/nonprism/duplicity/PKGBUILD b/nonprism/duplicity/PKGBUILD index 31220cb30..5da804b78 100644 --- a/nonprism/duplicity/PKGBUILD +++ b/nonprism/duplicity/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125883 2015-01-13 21:43:27Z lfleischer $ +# $Id: PKGBUILD 126742 2015-01-29 10:04:01Z lfleischer $ # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com> # Contributor (Arch): Aaron Schaefer <aaron@elasticdog.com> @@ -6,7 +6,7 @@ pkgname=duplicity pkgver=0.7.01 -pkgrel=1.nonprism1 +pkgrel=2.nonprism1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-boto, python2-dropbox and python2-gdata recommendation' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD index 4a921ecd4..c69a94769 100644 --- a/nonprism/icedove/PKGBUILD +++ b/nonprism/icedove/PKGBUILD @@ -4,7 +4,7 @@ # We're getting this from Debian Sid _debname=icedove _debver=31.4.0 -_debrel=deb1 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,7 +31,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" ${pkgname}.desktop) options=(!emptydirs) sha256sums=('7b47a053fe1f10097350d4a599a80b91eed1dc21dfcda1618b229f97493cb93c' - '6217e7ef89d6c9c9caa616280051345e6ef09645d1ffe4006e13c940bb8b5a1b' + 'ff0db7a63f3e0648131ca59e4e3c6ff911e795030a49bcf1edb8585a01b33437' '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec' '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD index 518633273..87aed3f52 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 228005 2014-12-24 13:30:15Z jgc $ +# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -8,7 +8,7 @@ pkgbase=digikam pkgname=kipi-plugins pkgver=4.5.0 -pkgrel=4.parabola1.nonprism1 +pkgrel=5.parabola1.nonprism1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism") makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' - 'libbaloo4' 'libpgf' 'libusb-compat') + 'libbaloo4' 'libpgf' 'libusb-compat' 'libkface') depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2') optdepends=('libkgeomap: Geolocalize tool' 'libmediawiki: MediaWiki Export plugin' diff --git a/pcr/pybitmessage-git/PKGBUILD b/pcr/pybitmessage-git/PKGBUILD index f1d577a71..86d65b7aa 100644 --- a/pcr/pybitmessage-git/PKGBUILD +++ b/pcr/pybitmessage-git/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=pybitmessage pkgname=${_pkgname}-git -pkgver=0.4.2.r7.g44f31d7 +pkgver=0.4.4.r43.gd16077b pkgrel=1 pkgdesc="Bitcoin inspired P2P encrypted messenger" arch=('any') |