diff options
24 files changed, 355 insertions, 463 deletions
diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD index eb45c7f30..a0b7ca127 100644 --- a/community/elasticsearch/PKGBUILD +++ b/community/elasticsearch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105667 2014-02-13 10:14:53Z mtorromeo $ +# $Id: PKGBUILD 106303 2014-02-27 08:53:59Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost> # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer> pkgname=elasticsearch -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Distributed RESTful search engine built on top of Lucene" arch=('i686' 'x86_64') @@ -74,7 +74,7 @@ package() { install -Dm644 "$srcdir/elasticsearch-sysctl.conf" "$pkgdir/usr/lib/sysctl.d/elasticsearch.conf" } -sha256sums=('0150bc7609c885eb2868bd27b817051e08b4bbe50a8aad5a51698c43283cd51b' +sha256sums=('6acdf3528b40d8aea93f1b8cfd9e3bdcc2e529f0bd5fe6a82269bec3293d9b5b' 'ab13ccda28bf90a10b570e095afc47ddef68da7e45546b2d45e74722c9095f0a' 'a04ac09172158611a03dda096b670fe6586ae11b6b3d4de7965ed2b90cb3319f' '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f' diff --git a/community/emelfm2/PKGBUILD b/community/emelfm2/PKGBUILD index 15788b386..5c67aef99 100644 --- a/community/emelfm2/PKGBUILD +++ b/community/emelfm2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97298 2013-09-16 17:59:16Z kkeen $ +# $Id: PKGBUILD 106313 2014-02-27 17:50:17Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: contrasutra pkgname=emelfm2 -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="A file manager that implements the popular two-pane design" arch=('i686' 'x86_64') @@ -12,7 +12,9 @@ url="http://emelfm2.net/" depends=('gtk2') license=('GPL3') source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('322089d0f08d0de80f49313b7912ff5b970adbf3') +sha1sums=('62eb6299d0a33281feae2e6ec4ddab2194c36963') + +# WITH_SYSTEM_ICONS=1 added 0.9.1 ? build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD index 8ed1666a7..e9a2a950d 100644 --- a/community/jemalloc/PKGBUILD +++ b/community/jemalloc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104634 2014-01-23 14:58:20Z mtorromeo $ +# $Id: PKGBUILD 106301 2014-02-27 08:35:14Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Kovivchak Evgen <oneonfire@gmail.com> pkgname=jemalloc -pkgver=3.5.0 +pkgver=3.5.1 pkgrel=1 pkgdesc="General-purpose scalable concurrent malloc implementation" arch=('i686' 'x86_64') @@ -30,4 +30,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha256sums=('5b13dbef27c46e9efbe19b5eef574e298409ed9dbbde85ec805e29d04c05e473') +sha256sums=('1a09f2570167ebc5fba4ddcc09176575d8acbb77017faf27797b9ab7f38f349f') diff --git a/community/par2cmdline/PKGBUILD b/community/par2cmdline/PKGBUILD index 112da7347..fb52888ce 100644 --- a/community/par2cmdline/PKGBUILD +++ b/community/par2cmdline/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 103377 2014-01-04 19:33:08Z idevolder $ +# $Id: PKGBUILD 106319 2014-02-27 21:14:28Z idevolder $ # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org pkgname=par2cmdline -pkgver=0.6.4 +pkgver=0.6.5 pkgrel=1 pkgdesc='A PAR 2.0 compatible file verification and repair tool' url='https://github.com/BlackIkeEagle/par2cmdline' license=('GPL2') arch=('i686' 'x86_64') source=("$pkgname-$pkgver.tar.gz::https://github.com/BlackIkeEagle/$pkgname/archive/v$pkgver.tar.gz") -sha256sums=('431da50fdd794881bad7e1b0dee234e8102d7065f53abd7ce1e86be758810116') +sha256sums=('727d668fa932dda6a013248dc8b73e6c8805ccfa45fed6bf8d99b718bbaf44a1') build() { cd "$pkgname-$pkgver" diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD index cd8409a94..1832514b6 100644 --- a/community/python-bsddb/PKGBUILD +++ b/community/python-bsddb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96111 2013-08-20 06:32:46Z lcarlier $ +# $Id: PKGBUILD 106305 2014-02-27 10:21:41Z spupykin $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> @@ -6,8 +6,8 @@ pkgbase=python-bsddb pkgname=('python2-bsddb' 'python-bsddb') -pkgver=6.0.0 -pkgrel=2 +pkgver=6.0.1 +pkgrel=1 pkgdesc="Python interface for BerkeleyDB" license=('MIT') arch=('i686' 'x86_64') @@ -17,6 +17,8 @@ source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz LICENSE) sha1sums=('ca5c204b2c9cf4fff396ba3d49994fe1a95d669f' 'ef4e4caf618781104dbf5824279ed39d127b4713') +sha1sums=('c12e47f7c21b4bc586c68cce64e0079d070312e8' + 'ef4e4caf618781104dbf5824279ed39d127b4713') prepare() { cp -r bsddb3-${pkgver}{,-python2} diff --git a/community/python-reportlab/PKGBUILD b/community/python-reportlab/PKGBUILD deleted file mode 100644 index 7b4873f45..000000000 --- a/community/python-reportlab/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 97429 2013-09-19 20:25:51Z jelle $ -# Maintainer: -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-reportlab -pkgname=python2-reportlab -_origname=reportlab -pkgver=2.7 -pkgrel=1 -pkgdesc="A proven industry-strength PDF generating solution" -arch=('i686' 'x86_64') -url="http://www.reportlab.org/rl_toolkit.html" -depends=('python2' 'freetype2') -conflicts=('python-reportlab<=2.5-2') -replaces=('python-reportlab<=2.5-2') -license=('CUSTOM') -source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz) -md5sums=('78300e6fe8a0d020fc16734a3de80cc4') - -build() { - cd $srcdir/${_origname}-$pkgver - - # python2 fix - for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \ - src/reportlab/pdfgen/pycanvas.py; do - sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file - done -} - -package_python2-reportlab() { - cd $srcdir/${_origname}-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 - install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt -} - -check() { - cd ${srcdir}/${_origname}-${pkgver} -# python2 setup.py tests -} diff --git a/core/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD index 2a6515a72..d1552f30e 100755 --- a/core/efibootmgr/PKGBUILD +++ b/core/efibootmgr/PKGBUILD @@ -1,15 +1,18 @@ -# $Id: PKGBUILD 197808 2013-10-30 11:03:08Z allan $ +# $Id: PKGBUILD 206469 2014-02-27 10:35:34Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Murtuza Akhtari <inxsible at gmail dot com> -# Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -pkgname="efibootmgr" +_pkgname="efibootmgr" +pkgname="${_pkgname}" -_gitroot="git://github.com/vathpela/efibootmgr.git" -_gitname="${pkgname}-pjones" -_gitbranch="libefivars" +_gitroot="https://github.com/vathpela/efibootmgr.git" +_gitname="${_pkgname}" +_gitbranch="master" -pkgver=0.6.0.138.1132342 +_GIT_COMMIT="f4e29e4200ed1e866c9cf98d2ebdcb8ac2e9826c" + +pkgver=0.6.1.29.gf4e29e4 pkgrel=1 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables" arch=('x86_64' 'i686') @@ -17,21 +20,16 @@ url="https://github.com/vathpela/efibootmgr" license=('GPL2') makedepends=('git') depends=('pciutils' 'efivar' 'zlib') +conflicts=("${_pkgname}-pjones") +provides=("${_pkgname}-pjones=${pkgver}") options=('strip' 'zipman' '!emptydirs') -source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}") +source=("${_gitname}::git+${_gitroot}#commit=${_GIT_COMMIT}") sha1sums=('SKIP') pkgver() { cd "${srcdir}/${_gitname}/" - - _RELEASE_MAJOR="$(grep 'RELEASE_MAJOR' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_MAJOR := ||g')" - _RELEASE_MINOR="$(grep 'RELEASE_MINOR' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_MINOR := ||g')" - _RELEASE_SUBLEVEL="$(grep 'RELEASE_SUBLEVEL' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_SUBLEVEL := ||g')" - - _ACTUAL_VER="$(echo ${_RELEASE_MAJOR}.${_RELEASE_MINOR}.${_RELEASE_SUBLEVEL} | sed 's| ||g')" - - echo "${_ACTUAL_VER}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" + echo "$(git describe --tags)" | sed -e 's|-|\.|g' } build() { diff --git a/core/efivar/PKGBUILD b/core/efivar/PKGBUILD index e8d8995d1..82913db7c 100644 --- a/core/efivar/PKGBUILD +++ b/core/efivar/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 199468 2013-11-13 11:07:43Z tpowa $ +# $Id: PKGBUILD 206468 2014-02-27 10:35:33Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> -# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> - -_gitroot="git://github.com/vathpela/efivar.git" -_gitname="efivar" -_gitbranch="master" +# Contributor : Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> _pkgname="efivar" pkgname="${_pkgname}" +_gitroot="https://github.com/vathpela/efivar.git" +_gitname="${_pkgname}" +_gitbranch="master" + pkgdesc="Library to manipulate EFI variables" pkgver=0.7 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') url="https://github.com/vathpela/efivar" license=('LGPL2.1') makedepends=('git') depends=('popt') conflicts=('libefivar') -provides=('libefivar') +provides=("libefivar=${pkgver}") options=('zipman' 'docs' '!makeflags') source=("${_gitname}::git+${_gitroot}#tag=${pkgver}") @@ -26,18 +26,28 @@ sha1sums=('SKIP') pkgver() { cd "${srcdir}/${_gitname}/" - echo "$(git describe --tags)" | sed 's|-|\.|g' + echo "$(git describe --tags)" | sed -e 's|-|\.|g' } -build() { +prepare() { + + cd "${srcdir}/${_gitname}/" + + git clean -x -d -f + echo rm -rf "${srcdir}/${_gitname}_build/" || true cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build" cd "${srcdir}/${_gitname}_build/" - git clean -x -d -f - echo + sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true + +} + +build() { + + cd "${srcdir}/${_gitname}_build/" unset CFLAGS unset CPPFLAGS @@ -45,8 +55,6 @@ build() { unset LDFLAGS unset MAKEFLAGS - sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true - make libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" V=1 -j1 echo diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index 1823febb6..0b91dcefb 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 203054 2014-01-03 00:30:46Z allan $ +# $Id: PKGBUILD 206460 2014-02-26 23:09:38Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.16 +pkgver=2.18 pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('502350a6c8f7c2b12ee58829e760b44d' +md5sums=('7439f8266f50844b56cc3e2721606541' 'SKIP') build() { diff --git a/core/wpa_supplicant/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch b/core/wpa_supplicant/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch new file mode 100644 index 000000000..8b0b1b351 --- /dev/null +++ b/core/wpa_supplicant/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch @@ -0,0 +1,74 @@ +From b62d5b5450101676a0c05691b4bcd94e11426397 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <j@w1.fi> +Date: Wed, 19 Feb 2014 11:56:02 +0200 +Subject: [PATCH] Revert "OpenSSL: Do not accept SSL Client certificate for + server" + +This reverts commit 51e3eafb68e15e78e98ca955704be8a6c3a7b304. There are +too many deployed AAA servers that include both id-kp-clientAuth and +id-kp-serverAuth EKUs for this change to be acceptable as a generic rule +for AAA authentication server validation. OpenSSL enforces the policy of +not connecting if only id-kp-clientAuth is included. If a valid EKU is +listed with it, the connection needs to be accepted. + +Signed-off-by: Jouni Malinen <j@w1.fi> +--- + src/crypto/tls.h | 3 +-- + src/crypto/tls_openssl.c | 13 ------------- + 2 files changed, 1 insertion(+), 15 deletions(-) + +diff --git a/src/crypto/tls.h b/src/crypto/tls.h +index 287fd33..feba13f 100644 +--- a/src/crypto/tls.h ++++ b/src/crypto/tls.h +@@ -41,8 +41,7 @@ enum tls_fail_reason { + TLS_FAIL_ALTSUBJECT_MISMATCH = 6, + TLS_FAIL_BAD_CERTIFICATE = 7, + TLS_FAIL_SERVER_CHAIN_PROBE = 8, +- TLS_FAIL_DOMAIN_SUFFIX_MISMATCH = 9, +- TLS_FAIL_SERVER_USED_CLIENT_CERT = 10 ++ TLS_FAIL_DOMAIN_SUFFIX_MISMATCH = 9 + }; + + union tls_event_data { +diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c +index a13fa38..8cf1de8 100644 +--- a/src/crypto/tls_openssl.c ++++ b/src/crypto/tls_openssl.c +@@ -105,7 +105,6 @@ struct tls_connection { + unsigned int ca_cert_verify:1; + unsigned int cert_probe:1; + unsigned int server_cert_only:1; +- unsigned int server:1; + + u8 srv_cert_hash[32]; + +@@ -1480,16 +1479,6 @@ static int tls_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx) + TLS_FAIL_SERVER_CHAIN_PROBE); + } + +- if (!conn->server && err_cert && preverify_ok && depth == 0 && +- (err_cert->ex_flags & EXFLAG_XKUSAGE) && +- (err_cert->ex_xkusage & XKU_SSL_CLIENT)) { +- wpa_printf(MSG_WARNING, "TLS: Server used client certificate"); +- openssl_tls_fail_event(conn, err_cert, err, depth, buf, +- "Server used client certificate", +- TLS_FAIL_SERVER_USED_CLIENT_CERT); +- preverify_ok = 0; +- } +- + if (preverify_ok && context->event_cb != NULL) + context->event_cb(context->cb_ctx, + TLS_CERT_CHAIN_SUCCESS, NULL); +@@ -2541,8 +2530,6 @@ openssl_handshake(struct tls_connection *conn, const struct wpabuf *in_data, + int res; + struct wpabuf *out_data; + +- conn->server = !!server; +- + /* + * Give TLS handshake data from the server (if available) to OpenSSL + * for processing. +-- +1.9.0 + diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index e99d67561..b7fe9b38e 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,35 +1,42 @@ -# $Id: PKGBUILD 187048 2013-06-03 11:15:42Z allan $ +# $Id: PKGBUILD 206485 2014-02-27 17:25:23Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant -pkgver=2.0 -pkgrel=4 +pkgver=2.1 +pkgrel=3 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') -depends=('openssl' 'dbus-core' 'readline' 'libnl') +depends=('openssl' 'libdbus' 'readline' 'libnl') optdepends=('wpa_supplicant_gui: wpa_gui program') license=('GPL') backup=('etc/wpa_supplicant/wpa_supplicant.conf') source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz" - config) -md5sums=('3be2ebfdcced52e00eda0afe2889839d' - '4aa1e5accd604091341b989b47fe1076') + config + 0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch) +sha256sums=('91632e7e3b49a340ce408e2f978a93546a697383abf2e5a60f146faae9e1b277' + '522b1e2b330bd3fcb9c3c964b0f05ad197a2f1160741835a47585ea45ba8e0a4' + '3c85fa2cf2465fea86383eece75fa5479507a174da6f0cd09e691fbaaca03c74') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}/" - cd "${pkgname}" + patch -p1 -i "${srcdir}"/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch + cd "${pkgname}/" cp "${srcdir}/config" ./.config +} - sed -i 's@/usr/local@$(PREFIX)@g' Makefile +build() { + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - make PREFIX=/usr + # The Makefile does not pick up our CPPFLAGS + export CFLAGS="$CPPFLAGS $CFLAGS" + make LIBDIR=/usr/lib BINDIR=/usr/bin } package() { cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - make PREFIX=/usr DESTDIR="${pkgdir}" install + make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/etc/wpa_supplicant" install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/wpa_supplicant.conf" @@ -47,8 +54,4 @@ package() { install -d -m755 "${pkgdir}/usr/lib/systemd/system" install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/" - - # usrmove - cd "$pkgdir"/usr - mv sbin bin } diff --git a/core/wpa_supplicant/config b/core/wpa_supplicant/config index 50426bf92..c1035b484 100644 --- a/core/wpa_supplicant/config +++ b/core/wpa_supplicant/config @@ -20,63 +20,6 @@ # used to fix build issues on such systems (krb5.h not found). #CFLAGS += -I/usr/include/kerberos -# Example configuration for various cross-compilation platforms - -#### sveasoft (e.g., for Linksys WRT54G) ###################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS += -I../src/include -I../../src/router/openssl/include -#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl -############################################################################### - -#### openwrt (e.g., for Linksys WRT54G) ####################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ -# -I../WRT54GS/release/src/include -#LIBS = -lssl -############################################################################### - - -# Driver interface for Host AP driver -#CONFIG_DRIVER_HOSTAP=y - -# Driver interface for Agere driver -#CONFIG_DRIVER_HERMES=y -# Change include directories to match with the local setup -#CFLAGS += -I../../hcf -I../../include -I../../include/hcf -#CFLAGS += -I../../include/wireless - -# Driver interface for madwifi driver -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_MADWIFI=y -# Set include directory to the madwifi source tree -#CFLAGS += -I../../madwifi - -# Driver interface for ndiswrapper -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_NDISWRAPPER=y - -# Driver interface for Atmel driver -#CONFIG_DRIVER_ATMEL=y - -# Driver interface for old Broadcom driver -# Please note that the newer Broadcom driver ("hybrid Linux driver") supports -# Linux wireless extensions and does not need (or even work) with the old -# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. -#CONFIG_DRIVER_BROADCOM=y -# Example path for wlioctl.h; change to match your configuration -#CFLAGS += -I/opt/WRT54GS/release/src/include - -# Driver interface for Intel ipw2100/2200 driver -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_IPW=y - -# Driver interface for Ralink driver -#CONFIG_DRIVER_RALINK=y - # Driver interface for generic Linux wireless extensions # Note: WEXT is deprecated in the current Linux kernel version and no new # functionality is added to it. nl80211-based interface is the new @@ -88,6 +31,19 @@ CONFIG_DRIVER_WEXT=y # Driver interface for Linux drivers using the nl80211 kernel interface CONFIG_DRIVER_NL80211=y +# driver_nl80211.c requires libnl. If you are compiling it yourself +# you may need to point hostapd to your version of libnl. +# +#CFLAGS += -I$<path to libnl include files> +#LIBS += -L$<path to libnl library files> + +# Use libnl v2.0 (or 3.0) libraries. +#CONFIG_LIBNL20=y + +# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) +CONFIG_LIBNL32=y + + # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) #CONFIG_DRIVER_BSD=y #CFLAGS += -I/usr/local/include @@ -147,11 +103,10 @@ CONFIG_EAP_PEAP=y CONFIG_EAP_TTLS=y # EAP-FAST -# Note: Default OpenSSL package does not include support for all the -# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, -# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) -# to add the needed functions. -#CONFIG_EAP_FAST=y +# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed +# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g., +# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. +CONFIG_EAP_FAST=y # EAP-GTC CONFIG_EAP_GTC=y @@ -210,6 +165,9 @@ CONFIG_WPS_NFC=y # EAP-IKEv2 #CONFIG_EAP_IKEV2=y +# EAP-EKE +#CONFIG_EAP_EKE=y + # PKCS#12 (PFX) support (used to read private key and certificate file from # a file that usually has extension .p12 or .pfx) CONFIG_PKCS12=y @@ -225,6 +183,9 @@ CONFIG_SMARTCARD=y # Support HT overrides (disable HT/HT40, mask MCS rates, etc.) CONFIG_HT_OVERRIDES=y +# Support VHT overrides (disable VHT, mask MCS rates, etc.) +CONFIG_VHT_OVERRIDES=y + # Development testing #CONFIG_EAPOL_TEST=y @@ -258,11 +219,6 @@ CONFIG_READLINE=y # 35-50 kB in code size. #CONFIG_NO_WPA=y -# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to -# save about 1 kB in code size when building only WPA-Personal (no EAP support) -# or 6 kB if building for WPA-Enterprise. -#CONFIG_NO_WPA2=y - # Remove IEEE 802.11i/WPA-Personal ASCII passphrase support # This option can be used to reduce code size by removing support for # converting ASCII passphrases into PSK. If this functionality is removed, the @@ -306,7 +262,6 @@ CONFIG_BACKEND=file # Select event loop implementation # eloop = select() loop (default) # eloop_win = Windows events and WaitForMultipleObject() loop -# eloop_none = Empty template #CONFIG_ELOOP=eloop # Should we use poll instead of select? Select is used by default. @@ -326,7 +281,7 @@ CONFIG_PEERKEY=y # IEEE 802.11w (management frame protection), also known as PMF # Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y +CONFIG_IEEE80211W=y # Select TLS implementation # openssl = OpenSSL (default) @@ -420,6 +375,10 @@ CONFIG_DEBUG_FILE=y # same file, e.g., using trace-cmd. #CONFIG_DEBUG_LINUX_TRACING=y +# Add support for writing debug log to Android logcat instead of standard +# output +#CONFIG_ANDROID_LOG=y + # Enable privilege separation (see README 'Privilege separation' for details) #CONFIG_PRIVSEP=y @@ -477,7 +436,11 @@ CONFIG_DEBUG_FILE=y CONFIG_NO_RANDOM_POOL=y # IEEE 802.11n (High Throughput) support (mainly for AP mode) -#CONFIG_IEEE80211N=y +CONFIG_IEEE80211N=y + +# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) +# (depends on CONFIG_IEEE80211N) +CONFIG_IEEE80211AC=y # Wireless Network Management (IEEE Std 802.11v-2011) # Note: This is experimental and not complete implementation. @@ -492,6 +455,9 @@ CONFIG_NO_RANDOM_POOL=y # Hotspot 2.0 #CONFIG_HS20=y +# Disable roaming in wpa_supplicant +#CONFIG_NO_ROAMING=y + # AP mode operations with wpa_supplicant # This can be used for controlling AP mode operations with wpa_supplicant. It # should be noted that this is mainly aimed at simple cases like @@ -504,9 +470,17 @@ CONFIG_AP=y # more information on P2P operations. CONFIG_P2P=y +# Enable TDLS support +CONFIG_TDLS=y + +# Wi-Fi Direct +# This can be used to enable Wi-Fi Direct extensions for P2P using an external +# program to control the additional information exchanges in the messages. +CONFIG_WIFI_DISPLAY=y + # Autoscan # This can be used to enable automatic scan support in wpa_supplicant. -# See wpa_supplicant.conf for more information on autoscan usage. +# See wpa_supplicant.conf for more information on autoscan usage. # # Enabling directly a module will enable autoscan support. # For exponential module: @@ -522,9 +496,7 @@ CONFIG_AUTOSCAN_PERIODIC=y # External password backend for testing purposes (developer use) #CONFIG_EXT_PASSWORD_TEST=y -CONFIG_LIBNL32=y - -# More options that are not in defconfig: +# Options that are present not in defconfig: # RSN IBSS/AdHoc support CONFIG_IBSS_RSN=y diff --git a/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch deleted file mode 100644 index 5d8903906..000000000 --- a/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak ---- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 -+++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 -@@ -48,7 +48,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 4e003ed5a..05ebfe611 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198340 2013-10-30 14:16:21Z allan $ +# $Id: PKGBUILD 206473 2014-02-27 12:21:34Z eric $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp -pkgver=5.7.2 -pkgrel=8 +pkgver=5.7.2.1 +pkgrel=1 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" @@ -17,7 +17,7 @@ optdepends=('perl-term-readkey: for snmpcheck application' options=('!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} snmpd.service snmptrapd.service libnl32.patch) -sha1sums=('c493027907f32400648244d81117a126aecd27ee' +sha1sums=('ea5b8952ca482eceac8cb1f3ffbac50e13c0a5b0' 'SKIP' '84e32c54d32e6b608747054e04a3ddfe6d6638cc' '0244e91c7baa0abebfb5c0560e8ce04c966c5992' @@ -25,6 +25,7 @@ sha1sums=('c493027907f32400648244d81117a126aecd27ee' prepare() { cd ${pkgname}-${pkgver} + make PERL_ARCHLIB=/usr/lib/perl5/core_perl PERL_INC=/usr/lib/perl5/core_perl/CORE distclean # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694 patch -Np1 -i "$srcdir/libnl32.patch" autoreconf -f -i @@ -43,8 +44,7 @@ build() { --with-sys-location="Unknown" \ --with-logfile="/var/log/snmpd.log" \ --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ - --with-persistent-directory="/var/net-snmp" \ - --disable-static + --with-persistent-directory="/var/net-snmp" make NETSNMP_DONT_CHECK_VERSION=1 } diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD index c90e36cc5..c454f8a17 100644 --- a/extra/wpa_supplicant_gui/PKGBUILD +++ b/extra/wpa_supplicant_gui/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 187078 2013-06-03 11:17:10Z allan $ +# $Id: PKGBUILD 206486 2014-02-27 17:25:26Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant_gui -pkgver=2.0 -pkgrel=3 +pkgver=2.1 +pkgrel=1 pkgdesc="A Qt frontend to wpa_supplicant" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') depends=('qt4' "wpa_supplicant") license=('GPL') source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz") -sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09') +sha256sums=('91632e7e3b49a340ce408e2f978a93546a697383abf2e5a60f146faae9e1b277') build() { cd wpa_supplicant-${pkgver} cd wpa_supplicant/wpa_gui-qt4 - qmake-qt4 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" + qmake-qt4 QMAKE_CFLAGS_RELEASE="$CPPFLAGS $CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CPPFLAGS $CXXFLAGS" QMAKE_LFLAGS_RELEASE="$LDFLAGS" make } diff --git a/extra/wpa_supplicant_gui/compile-fix.patch b/extra/wpa_supplicant_gui/compile-fix.patch deleted file mode 100644 index 3303b3699..000000000 --- a/extra/wpa_supplicant_gui/compile-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp ---- wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-05-09 23:56:09.000000000 +0200 -+++ wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-06-25 12:06:46.045261398 +0200 -@@ -12,10 +12,8 @@ - * See README and COPYING for more details. - */ - --#ifdef __MINGW32__ - /* Need to get getopt() */ - #include <unistd.h> --#endif - - #ifdef CONFIG_NATIVE_WINDOWS - #include <windows.h> diff --git a/community/python-reportlab/ChangeLog b/libre/python-reportlab-libre/ChangeLog index 85b5db51f..85b5db51f 100644 --- a/community/python-reportlab/ChangeLog +++ b/libre/python-reportlab-libre/ChangeLog diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD new file mode 100644 index 000000000..401d61c9f --- /dev/null +++ b/libre/python-reportlab-libre/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 106308 2014-02-27 10:52:25Z jelle $ +# Maintainer: +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: William Rea <sillywilly@gmail.com> +# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contributor: borgo <nomail> +# Contributor (Parabola): André Silva <emulatorman@parabola.nu> + +pkgbase=python-reportlab-libre +pkgname=(python2-reportlab-libre python-reportlab-libre) +_origname=reportlab +pkgver=3.0 +pkgrel=1 +pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" +arch=('i686' 'x86_64') +url="http://www.reportlab.org/rl_toolkit.html" +depends=('freetype2') +checkdepends=('python' 'python2') +license=('custom') +source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz + free-fonts.patch) +md5sums=('a4fd40abcfb604aa3bd907181133c071' + 'eb3ac47734efb05b939fb88026aff8ed') + +prepare() { + cd $srcdir + cp -rf ${_origname}-$pkgver "${_origname}2-$pkgver" + + _reportlab_source=("${_origname}-$pkgver" "${_origname}2-$pkgver") + + for x in ${_reportlab_source[@]}; do + cd $srcdir/$x + + # remove nonfree Adobe T1 fonts support + patch -p1 -i $srcdir/free-fonts.patch + + # Parabola contains those fonts from the ttf-bitstream-vera package + rm -fv src/reportlab/fonts/{bitstream-vera-license.txt,Vera*} + done +} + +package_python2-reportlab-libre() { + conflicts+=('python2-reportlab' 'python-reportlab<=2.5-2') + replaces+=('python2-reportlab' 'python-reportlab<=2.5-2') + provides=("python2-reportlab=$pkgver") + depends=('python2') + cd "$srcdir/${_origname}2-$pkgver" + python2 setup.py install --root=$pkgdir --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt +} + +package_python-reportlab-libre() { + conflicts+=('python-reportlab' 'python-reportlab-libre<=2.5-2') + replaces+=('python-reportlab' 'python-reportlab-libre<=2.5-2') + provides=("python-reportlab=$pkgver") + depends=('python3') + cd "$srcdir/${_origname}-$pkgver" + python3 setup.py install --root=$pkgdir --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt +} + + +check() { + cd ${srcdir}/${_origname}-${pkgver} + python2 setup.py tests + python setup.py tests +} diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python-reportlab-libre/free-fonts.patch new file mode 100644 index 000000000..d88b3b31b --- /dev/null +++ b/libre/python-reportlab-libre/free-fonts.patch @@ -0,0 +1,61 @@ +diff -Nur reportlab-3.0.orig/setup.py reportlab-3.0/setup.py +--- reportlab-3.0.orig/setup.py 2014-02-14 12:22:37.000000000 -0200 ++++ reportlab-3.0/setup.py 2014-02-27 22:46:48.998702565 -0200 +@@ -254,11 +254,6 @@ + infoline('not downloading T1 font curve files') + return + try: +- infoline("Downloading standard T1 font curves") +- +- remotehandle = ureq.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") +- zipdata = io.BytesIO(remotehandle.read()) +- remotehandle.close() + archive = zipfile.ZipFile(zipdata) + dst = pjoin(rl_dir, 'fonts') + +@@ -271,7 +266,6 @@ + except: + xitmsg = "Failed to download standard T1 font curves" + reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] +- infoline(xitmsg) + + def main(): + #test to see if we've a special command +diff -Nur reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py reportlab-3.0/src/reportlab/pdfbase/_fontdata.py +--- reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py 2014-02-14 12:22:37.000000000 -0200 ++++ reportlab-3.0/src/reportlab/pdfbase/_fontdata.py 2014-02-27 22:26:55.438002204 -0200 +@@ -72,20 +72,20 @@ + } + if sys.platform in ('linux2',): + _font2fnrMapLinux2 ={ +- 'symbol': 'Symbol', +- 'zapfdingbats': 'ZapfDingbats', +- 'helvetica': 'Arial', +- 'helvetica-bold': 'Arial-Bold', +- 'helvetica-boldoblique': 'Arial-BoldItalic', +- 'helvetica-oblique': 'Arial-Italic', +- 'times-bold': 'TimesNewRoman-Bold', +- 'times-bolditalic':'TimesNewRoman-BoldItalic', +- 'times-italic': 'TimesNewRoman-Italic', +- 'times-roman': 'TimesNewRoman', +- 'courier-bold': 'Courier-Bold', +- 'courier-boldoblique': 'Courier-BoldOblique', +- 'courier': 'Courier', +- 'courier-oblique': 'Courier-Oblique', ++ 'symbol': 's050000l.pfb', ++ 'zapfdingbats': 'd050000l.pfb', ++ 'helvetica': 'n019003l.pfb', ++ 'helvetica-bold': 'n019004l.pfb', ++ 'helvetica-boldoblique': 'n019024l.pfb', ++ 'helvetica-oblique': 'n019023l.pfb', ++ 'times-bold': 'n021004l.pfb', ++ 'times-bolditalic':'n021024l.pfb', ++ 'times-italic': 'n021023l.pfb', ++ 'times-roman': 'n021003l.pfb', ++ 'courier-bold': 'n022004l.pfb', ++ 'courier-boldoblique': 'n022024l.pfb', ++ 'courier': 'n022003l.pfb', ++ 'courier-oblique': 'n022023l.pfb', + } + _font2fnrMap = _font2fnrMapLinux2 + for k, v in _font2fnrMap.items(): diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD deleted file mode 100644 index 0f608f7a0..000000000 --- a/libre/python2-reportlab-libre/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 97428 2013-09-19 18:56:42Z jelle $ -# Maintainer: -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor: borgo <nomail> -# Contributor (Parabola): André Silva <emulatorman@parabola.nu> - -pkgbase=python-reportlab-libre -pkgname=python2-reportlab-libre -_origname=reportlab -pkgver=2.7 -pkgrel=1 -pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" -arch=('i686' 'x86_64') -url="http://www.reportlab.org/rl_toolkit.html" -depends=('python2' 'freetype2') -conflicts=('python-reportlab<=2.5-2' 'python2-reportlab') -replaces=('python-reportlab<=2.5-2' 'python2-reportlab') -provides=("python2-reportlab=$pkgver") -license=('custom') -source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz - free-fonts.patch) -md5sums=('78300e6fe8a0d020fc16734a3de80cc4' - '1588b88851711cc6c868db4c7d4f4dea') - -build() { - cd $srcdir/${_origname}-$pkgver - - # remove nonfree Adobe T1 fonts support - patch -p1 -i $srcdir/free-fonts.patch - - # Parabola contains those fonts from the ttf-bitstream-vera package - rm -f src/reportlab/fonts/{bitstream-vera-license.txt,Vera*} - - # python2 fix - for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \ - src/reportlab/pdfgen/pycanvas.py; do - sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file - done -} - -package_python2-reportlab-libre() { - cd $srcdir/${_origname}-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 - install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt -} - -check() { - cd ${srcdir}/${_origname}-${pkgver} -# python2 setup.py tests -} diff --git a/libre/python2-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch deleted file mode 100644 index b2683931b..000000000 --- a/libre/python2-reportlab-libre/free-fonts.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -rupN reportlab-2.6.orig/setup.py reportlab-2.6/setup.py ---- reportlab-2.6.orig/setup.py 2012-09-27 13:14:06.000000000 -0300 -+++ reportlab-2.6/setup.py 2012-10-18 14:34:16.750336101 -0200 -@@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - infoline("Standard T1 font curves already downloaded") - return - try: -- infoline("Downloading standard T1 font curves") -+ #infoline("Downloading standard T1 font curves") - -- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") -- zipdata = StringIO.StringIO(remotehandle.read()) -- remotehandle.close() -+ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") -+ #zipdata = StringIO.StringIO(remotehandle.read()) -+ #remotehandle.close() - archive = zipfile.ZipFile(zipdata) - dst = pjoin(rl_dir, 'fonts') - -@@ -239,7 +239,7 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - except: - xitmsg = "Failed to download standard T1 font curves" - reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] -- infoline(xitmsg) -+ #infoline(xitmsg) - - def main(): - #test to see if we've a special command -diff -rupN reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.6/src/reportlab/pdfbase/_fontdata.py ---- reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py 2012-09-27 11:39:39.000000000 -0300 -+++ reportlab-2.6/src/reportlab/pdfbase/_fontdata.py 2012-10-18 14:36:08.018365073 -0200 -@@ -72,20 +72,20 @@ _font2fnrMapWin32 = { - } - if sys.platform in ('linux2',): - _font2fnrMapLinux2 ={ -- 'symbol': 'Symbol', -- 'zapfdingbats': 'ZapfDingbats', -- 'helvetica': 'Arial', -- 'helvetica-bold': 'Arial-Bold', -- 'helvetica-boldoblique': 'Arial-BoldItalic', -- 'helvetica-oblique': 'Arial-Italic', -- 'times-bold': 'TimesNewRoman-Bold', -- 'times-bolditalic':'TimesNewRoman-BoldItalic', -- 'times-italic': 'TimesNewRoman-Italic', -- 'times-roman': 'TimesNewRoman', -- 'courier-bold': 'Courier-Bold', -- 'courier-boldoblique': 'Courier-BoldOblique', -- 'courier': 'Courier', -- 'courier-oblique': 'Courier-Oblique', -+ 'symbol': 's050000l.pfb', -+ 'zapfdingbats': 'd050000l.pfb', -+ 'helvetica': 'n019003l.pfb', -+ 'helvetica-bold': 'n019004l.pfb', -+ 'helvetica-boldoblique': 'n019024l.pfb', -+ 'helvetica-oblique': 'n019023l.pfb', -+ 'times-bold': 'n021004l.pfb', -+ 'times-bolditalic':'n021024l.pfb', -+ 'times-italic': 'n021023l.pfb', -+ 'times-roman': 'n021003l.pfb', -+ 'courier-bold': 'n022004l.pfb', -+ 'courier-boldoblique': 'n022024l.pfb', -+ 'courier': 'n022003l.pfb', -+ 'courier-oblique': 'n022023l.pfb', - } - _font2fnrMap = _font2fnrMapLinux2 - for k, v in _font2fnrMap.items(): -diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/reportlab/rl_config.py ---- reportlab-2.6.orig/src/reportlab/rl_config.py 2012-09-27 11:39:39.000000000 -0300 -+++ reportlab-2.6/src/reportlab/rl_config.py 2012-10-18 16:05:12.683766581 -0200 -@@ -49,25 +49,7 @@ ttfAsciiReadable= 1 - - # places to look for T1Font information - T1SearchPath = ( -- 'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6 -- 'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5 -- 'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4 -- '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac? -- '/usr/lib/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4 -- '/usr/local/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat4/Resource/Font', #Linux, Acrobat 4 -+ '/usr/share/fonts/Type1', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts', #special -@@ -76,44 +58,17 @@ T1SearchPath = ( - - # places to look for TT Font information - TTFSearchPath = ( -- 'c:/winnt/fonts', -- 'c:/windows/fonts', -- '/usr/lib/X11/fonts/TrueType/', -- '/usr/share/fonts/truetype', -+ '/usr/share/fonts/TTF', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts',#special - '%(HOME)s/fonts', #special -- #mac os X - from -- #http://developer.apple.com/technotes/tn/tn2024.html -- '~/Library/Fonts', -- '/Library/Fonts', -- '/Network/Library/Fonts', -- '/System/Library/Fonts', -- - ) - - # places to look for CMap files - should ideally merge with above - CMapSearchPath = ( -- '/usr/lib/Acrobat9/Resource/CMap', -- '/usr/lib/Acrobat8/Resource/CMap', -- '/usr/lib/Acrobat7/Resource/CMap', -- '/usr/lib/Acrobat6/Resource/CMap', -- '/usr/lib/Acrobat5/Resource/CMap', -- '/usr/lib/Acrobat4/Resource/CMap', -- '/usr/local/Acrobat9/Resource/CMap', -- '/usr/local/Acrobat8/Resource/CMap', -- '/usr/local/Acrobat7/Resource/CMap', -- '/usr/local/Acrobat6/Resource/CMap', -- '/usr/local/Acrobat5/Resource/CMap', -- '/usr/local/Acrobat4/Resource/CMap', -- 'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap', -+ '/usr/share/ghostscript/9.04/Resource/CMap', -+ '/usr/share/ghostscript/9.06/Resource/CMap', - '%(REPORTLAB_DIR)s/fonts/CMap', #special - '%(REPORTLAB_DIR)s/../fonts/CMap', #special - '%(REPORTLAB_DIR)s/../../fonts/CMap', #special diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index d7d01b498..c1ea8c449 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103873 2014-01-13 00:22:03Z kkeen $ +# $Id: PKGBUILD 106288 2014-02-26 16:09:20Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> _pkgname=spectrwm pkgname=spectrwm-libre -pkgver=2.4.0 -pkgrel=2 +pkgver=2.5.0 +pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') url="http://www.spectrwm.org" @@ -21,12 +21,10 @@ backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ LICENSE \ baraction.sh \ - swmhack_path.patch \ spectrwm-no-preload) -md5sums=('23e32c1e292f2fc94ed88195ffe60023' +md5sums=('22355256693393779b2d366d312c4577' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' - '8914dc2bef96e3587fc9317a25c1cbe8' '974d109ce0af39cc73936d5efd682480') build() { @@ -42,9 +40,6 @@ build() { # see spectrwm FS#403 sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c - # FS#37998, remove on 2.4.1 - patch -p1 -i "$srcdir/swmhack_path.patch" - cd linux make PREFIX="/usr" } diff --git a/libre/spectrwm-libre/swmhack_path.patch b/libre/spectrwm-libre/swmhack_path.patch deleted file mode 100644 index a4f1c3cf0..000000000 --- a/libre/spectrwm-libre/swmhack_path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/linux/Makefile b/linux/Makefile -index 73c3d37..f48a32f 100644 ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -1,16 +1,16 @@ --CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g --CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" --LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -- - PREFIX?= /usr/local - BINDIR?= $(PREFIX)/bin - LIBDIR?= $(PREFIX)/lib - MANDIR?= $(PREFIX)/share/man - --CC?= cc -- - LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor) - -+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g -+CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" -+LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -+ -+CC?= cc -+ - BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh) - ifneq ("${BUILDVERSION}", "") - CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" diff --git a/pcr/pybitmessage-git/PKGBUILD b/pcr/pybitmessage-git/PKGBUILD index e6cad32b3..a62d45523 100644 --- a/pcr/pybitmessage-git/PKGBUILD +++ b/pcr/pybitmessage-git/PKGBUILD @@ -3,11 +3,10 @@ # Contributor: Asta <gatien.bovyn@gmail.com> # Contributor: ptrv <mail@petervasil.net> -pkgname=pybitmessage-git -_gitname='PyBitmessage' -_realname='pybitmessage' -pkgver=7ad8ce7 -pkgrel=2 +_pkgname=pybitmessage +pkgname=${_pkgname}-git +pkgver=0.4.2.r7.g44f31d7 +pkgrel=1 pkgdesc="Bitcoin inspired P2P encrypted messenger" arch=('any') depends=('hicolor-icon-theme' 'python2' 'python2-pyqt' 'qt4') @@ -15,7 +14,7 @@ makedepends=('git') optdepends=('python2-gevent') url="https://github.com/Bitmessage/PyBitmessage" license=('MIT') -source=(git+https://github.com/Bitmessage/PyBitmessage +source=($pkgname::git+https://github.com/Bitmessage/PyBitmessage pybitmessage.sh) sha256sums=('SKIP' 'c20eeeffd4931d8bcd50de5e6e1a974323ebbd3f5ad1d34483c6adeb3b5f3ae1') @@ -23,12 +22,12 @@ provides=('pybitmessage') conflicts=('pybitmessage') pkgver() { - cd $_gitname - git describe --always | sed 's|-|.|g' + cd $pkgname + git describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' } prepare() { - cd $_gitname + cd $pkgname msg 'Fixing Python version...' find . -type f -print0 | xargs -0 sed -i 's#/usr/bin/python#/usr/bin/python2#g' @@ -36,17 +35,17 @@ prepare() { } package() { - cd $_gitname + cd $pkgname msg 'Installing shared files...' - mkdir -p "$pkgdir"/usr/share/${_realname} - cp -R src/* "$pkgdir"/usr/share/${_realname} + mkdir -p "$pkgdir"/usr/share/${_pkgname} + cp -R src/* "$pkgdir"/usr/share/${_pkgname} msg 'Installing desktop icons...' - install -D -m644 desktop/${_realname}.desktop "${pkgdir}/usr/share/applications/${_realname}.desktop" - install -D -m644 src/images/can-icon-24px.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_realname}.png" - install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_realname}.svg" - install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/pixmaps/${_realname}.svg" + install -D -m644 desktop/${_pkgname}.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop" + install -D -m644 src/images/can-icon-24px.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_pkgname}.png" + install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg" + install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/pixmaps/${_pkgname}.svg" msg 'Installing executable...' install -D -m755 ${srcdir}/pybitmessage.sh "${pkgdir}/usr/bin/pybitmessage" |