diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-06-30 12:33:38 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-06-30 12:33:38 -0300 |
commit | 060482ecc73ac88ec22dd7b91d7af1aa6d350e6c (patch) | |
tree | 03e95bb1b974b3cbee409505a5f39078d9ee3cc8 /libre | |
parent | eb9735afbc08bb6232a8a3befd4c85877535dc77 (diff) | |
parent | 960078142fa2c0df29bbb002a0662ebe58d83795 (diff) | |
download | abslibre-060482ecc73ac88ec22dd7b91d7af1aa6d350e6c.tar.gz abslibre-060482ecc73ac88ec22dd7b91d7af1aa6d350e6c.tar.bz2 abslibre-060482ecc73ac88ec22dd7b91d7af1aa6d350e6c.zip |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre')
-rw-r--r-- | libre/linux-libre-grsec/PKGBUILD | 14 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/mozilla-searchplugins/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/mozilla-searchplugins/duckduckgo-html.xml | 17 | ||||
-rw-r--r-- | libre/mozilla-searchplugins/duckduckgo-lite.xml | 17 | ||||
-rw-r--r-- | libre/syslinux/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/unzip-libre/PKGBUILD | 50 | ||||
-rw-r--r-- | libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch | 54 | ||||
-rw-r--r-- | libre/vhba-module-libre/PKGBUILD | 22 |
10 files changed, 59 insertions, 143 deletions
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 6bf9e5c0f..db875bd7b 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.15 -_sublevel=1 +_sublevel=2 _grsecver=3.0 -_timestamp=201406222112 +_timestamp=201406262058 _pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel}.${_sublevel}.${_timestamp} -pkgrel=3 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="https://grsecurity.net/" license=('GPL2') @@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'sysctl.conf' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' - '1016625bbc6e408e2f055ec1d814c2b2975dcb278e8f5f49189490299f446611' - '24835ddd8b524b11d1179697052a3d669efcaef56a254ba384c73ef77ebd4b13' + 'fb558c5bb18d57ac481528be068ea5ce858264fe3547f1fc2731fc66c739900b' + '6dc34077fc1115fd7dac8f3caf61758e7f8959caa0406efd1a3cc2f0b4ea290b' 'SKIP' '20d7aa7723620bcdefc0828c2ba0c5b17049e7ecb8475703ddccd9f3e84c30d7' 'e686e05416e6060d1345f58c0b77eff9d554c412d97df086bbcf2a97a39564ae' @@ -52,7 +52,7 @@ sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' 'd4d4ae0b9c510547f47d94582e4ca08a7f12e9baf324181cb54d328027305e31' - 'f769db2fa56c7cba2c62ff52071dbf46a46a817ad39ec4d62bc2cecff3911954') + '09210211de26e59dcc20e48b355233fdaa572aea8e80e17acc915defc7aa7166') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 45f75b63f..0102f12f7 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 215294 2014-06-18 17:07:44Z bpiotrowski $ +# $Id: PKGBUILD 215500 2014-06-27 06:59:41Z 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=44 +_sublevel=45 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.43 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.45 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ 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' - '09cc6f81e759bcce141ae8494bb480ea' + '579b8346ac19629094df70f8cd80ce46' 'c4c1ffeb312c2a70685fd960cc328e01' '16867e648e4b9f89bec949cb643888c2' 'c072b17032e80debc6a8626299245d46' @@ -41,7 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - 'fba85c7666c65dbce6f3523cb26fa267') + 'a129af70f9e028dc9ce2ba2496844fe7') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 1ff8b9bc9..0e446b3d2 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 215241 2014-06-17 07:43:02Z tpowa $ +# $Id: PKGBUILD 215498 2014-06-27 06:17:02Z tpowa $ # 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 # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.15 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0012-fix-saa7134.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' - '1016625bbc6e408e2f055ec1d814c2b2975dcb278e8f5f49189490299f446611' + 'fb558c5bb18d57ac481528be068ea5ce858264fe3547f1fc2731fc66c739900b' '175d44c73dcbf16a2f9921c6bc53b2d1a63d7d921e5db73dde9666fd031a7e9e' '1ae3cd02b38698dcf18416074bd2a44fb02f700a5a5026c4e686961d4679b456' 'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176' @@ -41,7 +41,7 @@ sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177' 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - 'f769db2fa56c7cba2c62ff52071dbf46a46a817ad39ec4d62bc2cecff3911954') + '09210211de26e59dcc20e48b355233fdaa572aea8e80e17acc915defc7aa7166') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 7df354571..1578d8857 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.5 -pkgrel=1 +pkgrel=2 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -32,8 +32,8 @@ package() { install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins" } -md5sums=('3412ff5311c1ba8d883ba9c6fd805bb7' - 'edb15da251e25cec39d471d885463db3' +md5sums=('e00e9588650df8a254dc963a0b5f7a50' + '752cee267a514d2fd21cec08b3366f6f' '462c68585461f8cdc23c93c46f6ee4cf' '92f834a3a1d85c9ae202955cdfe941eb' 'b9a0893d7f6d41d755c478fd60c44be8' diff --git a/libre/mozilla-searchplugins/duckduckgo-html.xml b/libre/mozilla-searchplugins/duckduckgo-html.xml index 14575dd12..b58eca813 100644 --- a/libre/mozilla-searchplugins/duckduckgo-html.xml +++ b/libre/mozilla-searchplugins/duckduckgo-html.xml @@ -1,17 +1,10 @@ -<SearchPlugin - xmlns="http://www.mozilla.org/2006/browser/search/" -xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> <os:ShortName>DuckDuckGo HTML</os:ShortName> -<os:Description>Search DuckDuckGo (HTML)</os:Description> +<os:Description>Search DuckDuckGo HTML</os:Description> <os:InputEncoding>UTF-8</os:InputEncoding> -<os:Image width="16" -height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</os:Image> -<os:Url - type="text/html" method="POST" -template="https://duckduckgo.com/html/"> +<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</os:Image> +<os:Url type="text/html" method="POST" template="https://duckduckgo.com/html/"> <os:Param name="q" value="{searchTerms}"/> -</os:Url><os:Url type="application/x-suggestions+json" -method="GET" -template="https://duckduckgo.com/ac/?q={searchTerms}&type=list"> +</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://duckduckgo.com/ac/?q={searchTerms}&type=list"> </os:Url> </SearchPlugin> diff --git a/libre/mozilla-searchplugins/duckduckgo-lite.xml b/libre/mozilla-searchplugins/duckduckgo-lite.xml index 12436fb9a..70cb71f2b 100644 --- a/libre/mozilla-searchplugins/duckduckgo-lite.xml +++ b/libre/mozilla-searchplugins/duckduckgo-lite.xml @@ -1,17 +1,10 @@ -<SearchPlugin - xmlns="http://www.mozilla.org/2006/browser/search/" -xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> <os:ShortName>DuckDuckGo Lite</os:ShortName> -<os:Description>Search DuckDuckGo (Lite)</os:Description> +<os:Description>Search DuckDuckGo Lite</os:Description> <os:InputEncoding>UTF-8</os:InputEncoding> -<os:Image width="16" -height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</os:Image> -<os:Url - type="text/html" method="POST" -template="https://duckduckgo.com/lite/"> +<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</os:Image> +<os:Url type="text/html" method="POST" template="https://duckduckgo.com/lite/"> <os:Param name="q" value="{searchTerms}"/> -</os:Url><os:Url type="application/x-suggestions+json" -method="GET" -template="https://duckduckgo.com/ac/?q={searchTerms}&type=list"> +</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://duckduckgo.com/ac/?q={searchTerms}&type=list"> </os:Url> </SearchPlugin> diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index d60dbe1f3..ff818d075 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -6,7 +6,7 @@ ## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable _IA32_EFI_IN_ARCH_X64="1" -_VER="6.03-pre17" +_VER="6.03-pre18" _GIT_TAG="syslinux-${_VER}" pkgname="syslinux" diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD index 6b3cc76b0..6cdb2159d 100644 --- a/libre/unzip-libre/PKGBUILD +++ b/libre/unzip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150452 2012-02-17 23:21:23Z allan $ +# $Id: PKGBUILD 215748 2014-06-30 11:29:59Z bisson $ # Maintainer (Arch): # Contributor (Arch): Douglas Soares de Andrade <douglas@archlinux.org> # Contributor (Arch): Robson Peixoto @@ -6,52 +6,46 @@ _pkgname=unzip pkgname=unzip-libre pkgver=6.0 -pkgrel=6 -pkgdesc="Unpacks .zip archives such as those made by PKZIP" +_pkgver=${pkgver/./} +pkgrel=7 +pkgdesc='For extracting and viewing files in .zip archives' +url='http://www.info-zip.org/UnZip.html' arch=('i686' 'x86_64') -url="http://www.info-zip.org/" license=('custom') depends=('bzip2' 'bash') provides=("${_pkgname}=${pkgver}") conflicts=("${_pkgname}") replaces=("${_pkgname}") -mksource=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' +mksource=('http://downloads.sourceforge.net/infozip/${_pkgname}${_pkgver}.tar.gz' 'match.patch') -source=('https://repo.parabolagnulinux.org/other/$pkgname/unzip60-libre.tar.gz') +source=('https://repo.parabolagnulinux.org/other/${pkgname}/${_pkgname}${_pkgver}-libre.tar.gz') mkmd5sums=('62b490407489521db863b523a7f86375' 'e6d9f0c204c2abe6a57dc5e1637d5140') md5sums=('bbe4b7f4d48b2f939b5e43fde0ac7762') mksource() { - cd ${srcdir}/${_pkgname}${pkgver/./} + cd "${srcdir}/${_pkgname}${_pkgver}" - # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch - patch -Np0 -i ${srcdir}/match.patch + # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch + patch -Np0 -i ${srcdir}/match.patch } build() { - cd ${srcdir}/${_pkgname}${pkgver/./} + cd "${srcdir}/${_pkgname}${_pkgver}" - # set CFLAGS -- from Debian - export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ - -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ - -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ - -DUSE_BZIP2 -DNATIVE" + # DEFINES, make, and install args from Debian + DEFINES='-DACORN_FTYPE_NFS -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT \ + -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD \ + -DDATE_FORMAT=DF_YMD -DUSE_BZIP2 -DNOMEMCPY -DNO_WORKING_ISPRINT' - sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile - - # make -- from Debian - make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ - D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips + make -f unix/Makefile prefix=/usr \ + D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 \ + LF2="$LDFLAGS" CF="$CFLAGS $CPPFLAGS -I. $DEFINES" \ + unzips } package(){ - cd ${srcdir}/${_pkgname}${pkgver/./} - - # install -- from Debian - make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install - - # install the license file - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE + cd "${srcdir}/${_pkgname}${_pkgver}" + make -f unix/Makefile prefix="${pkgdir}"/usr install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } - diff --git a/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch b/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch deleted file mode 100644 index 8f4603ebc..000000000 --- a/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6545ad1e266f4eb2428e93ba0fdb43d8b87d5fcd Mon Sep 17 00:00:00 2001 -From: Rok Mandeljc <rok.mandeljc@gmail.com> -Date: Sat, 19 Apr 2014 12:06:23 +0200 -Subject: [PATCH] VHBA module: define scmd_dbg() and scmd_warn() macros only if - they are not defined already; fix for compilation on kernel 3.15 and newer - (bug #76) - ---- - vhba-module/vhba.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c -index ae9b554..eb1c5e6 100644 ---- a/vhba-module/vhba.c -+++ b/vhba-module/vhba.c -@@ -54,12 +54,16 @@ MODULE_LICENSE("GPL"); - #define DPRINTK(fmt, args...) - #endif - -+/* scmd_dbg was introduced in 3.15 */ -+#ifndef scmd_dbg - #define scmd_dbg(scmd, fmt, a...) \ - dev_dbg(&(scmd)->device->sdev_gendev, fmt, ##a) -+#endif - -+#ifndef scmd_warn - #define scmd_warn(scmd, fmt, a...) \ - dev_warn(&(scmd)->device->sdev_gendev, fmt, ##a) -- -+#endif - - #define VHBA_MAX_SECTORS_PER_IO 256 - #define VHBA_MAX_ID 32 -@@ -276,7 +280,7 @@ static void vhba_scan_devices (struct work_struct *work) - } - change = vhost->chgtype[id]; - exists = vhost->devices[id] != NULL; -- -+ - vhost->chgtype[id] = 0; - clear_bit(id, vhost->chgmap); - -@@ -289,7 +293,7 @@ static void vhba_scan_devices (struct work_struct *work) - dev_dbg(&vhost->shost->shost_gendev, "trying to add target 0:%d:0\n", id); - vhba_scan_devices_add(vhost, id); - } else { -- /* quick sequence of add/remove or remove/add; we determine -+ /* quick sequence of add/remove or remove/add; we determine - which one it was by checking if device structure exists */ - if (exists) { - /* remove followed by add: remove and (re)add */ --- -2.0.0 - diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index c32ba0309..8d55022b5 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 113281 2014-06-17 08:06:25Z tpowa $ +# $Id: PKGBUILD 113764 2014-06-29 21:23:52Z heftig $ # Maintainer (Arch): Ray Rashif <schiv@archlinux.org> # Contributor (Arch): Mateusz Herych <heniekk@gmail.com> # Contributor (Arch): Charles Lindsay <charles@chaoslizard.org> @@ -6,9 +6,9 @@ _pkgname=vhba-module pkgname=vhba-module-libre -pkgver=20130607 +pkgver=20140629 _extramodules=extramodules-3.15-LIBRE -pkgrel=29 +pkgrel=1 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" @@ -21,19 +21,9 @@ replaces=('vhba-module') conflicts=('vhba-module') provides=("vhba-module=$pkgver") source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2" - '60-vhba.rules' - '0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch') -md5sums=('660df41d08b1fd86baad1f16a0264438' - '4dc37dc348b5a2c83585829bde790dcc' - '8c929ef662de89f348d277983cbb3952') - -prepare() { - cd $_pkgname-$pkgver - - # Fix build with Linux-libre 3.15 - # http://sourceforge.net/p/cdemu/bugs/76/ - patch -Np2 -i ../0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch -} + '60-vhba.rules') +md5sums=('6b307a80df9c163768cc7ecb3ccebb71' + '4dc37dc348b5a2c83585829bde790dcc') build() { cd $_pkgname-$pkgver |