From 2d8813df5b3f8a63835a228496f998914755d820 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 1 Feb 2014 03:35:09 +0000 Subject: Sat Feb 1 03:33:52 UTC 2014 --- extra/efl/PKGBUILD | 8 +- extra/elementary/PKGBUILD | 6 +- extra/emotion_generic_players/PKGBUILD | 8 +- extra/enlightenment/PKGBUILD | 4 +- extra/gnutls/PKGBUILD | 6 +- extra/hdf5-cpp-fortran/PKGBUILD | 16 +-- extra/hdf5-openmpi/PKGBUILD | 22 ++-- extra/mariadb/PKGBUILD | 18 +-- extra/octave/PKGBUILD | 8 +- extra/pidgin/PKGBUILD | 20 ++- ...ix-login-issues-with-certain-xmpp-servers.patch | 145 +++++++++++++++++++++ extra/r/PKGBUILD | 6 +- 12 files changed, 210 insertions(+), 57 deletions(-) create mode 100644 extra/pidgin/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch (limited to 'extra') diff --git a/extra/efl/PKGBUILD b/extra/efl/PKGBUILD index 0e2a1ec89..0d637ad4f 100644 --- a/extra/efl/PKGBUILD +++ b/extra/efl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204339 2014-01-17 09:41:33Z ronald $ +# $Id: PKGBUILD 204914 2014-01-31 11:05:39Z ronald $ # Maintainer: Ronald van Haren # Contributor: Enlightenment Developers pkgbase=efl pkgname=('efl' 'efl-docs') -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=1 pkgdesc="Enlightenment Foundation Libraries" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' options=('!emptydirs') source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz) install=efl.install -sha1sums=('48f8c82931153eef23ad9e694be4ed8f7ba857a1') +sha1sums=('6ab88b263f784f935310b1055d67578ae66e50df') prepare() { sed -i 's/env python$/&2/' "${srcdir}/${pkgname}-${pkgver}/src/scripts/eina/eina-bench-cmp" @@ -42,7 +42,7 @@ build() { package_efl(){ cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make -j1 DESTDIR=${pkgdir} install # install non-standard license files install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \ diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index 09751d894..449229d37 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204342 2014-01-17 09:42:37Z ronald $ +# $Id: PKGBUILD 204916 2014-01-31 11:21:42Z ronald $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgbase=elementary pkgname=('elementary' 'elementary-docs') -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('efl' 'evas_generic_loaders') makedepends=('doxygen' 'imagemagick') options=('!emptydirs') source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('818b01fb029fa45af41680da5f1aec938ffcc26e') +sha1sums=('ceaae46c7b8e936e2e4cea9e9fe41fdcff6b45d8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/emotion_generic_players/PKGBUILD b/extra/emotion_generic_players/PKGBUILD index f29311a09..c0d7b6e2b 100644 --- a/extra/emotion_generic_players/PKGBUILD +++ b/extra/emotion_generic_players/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204341 2014-01-17 09:42:17Z ronald $ +# $Id: PKGBUILD 204920 2014-01-31 11:38:05Z ronald $ # Maintainer: Ronald van Haren # Contributor: Enlightenment Developers pkgname=emotion_generic_players -pkgver=1.8.0 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 pkgdesc="Enlightenment Foundation Libraries" arch=('i686' 'x86_64') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('efl' 'vlc') options=('!emptydirs') source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('945c003150ceb912eabbd22323ada5363f0e40d1') +sha1sums=('4466aca9801cd2bf69dcc7509f5eb8504518e8ab') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index 6af489c9c..f7080625e 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Enlightenment Developers > pkgname=enlightenment -pkgver=0.18.2 +pkgver=0.18.3 pkgrel=1 pkgdesc="Enlightenment window manager" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ backup=('etc/enlightenment/sysactions.conf' 'etc/xdg/menus/enlightenment.menu') source=(http://download.enlightenment.org/rel/apps/${pkgname}/$pkgname-$pkgver.tar.gz) install=enlightenment.install -sha1sums=('e293108b8c5d6c7643ea868550763c9e8e0d6d08') +sha1sums=('c753ea32e74250b5ad1241f8499d4ac98ae47a78') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 8efdd16eb..ed3865c4f 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 204692 2014-01-25 10:02:55Z andyrtr $ +# $Id: PKGBUILD 204939 2014-01-31 17:05:45Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgname=gnutls -pkgver=3.2.9 +pkgver=3.2.10 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('valgrind' 'strace' 'datefudge') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('9ae2bfa55d4c12dd6005cfb7014977f9' +md5sums=('5b74319f1e6462a68d886d1266b282fc' 'SKIP') build() { diff --git a/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD index 89099eda9..0d467a5b4 100644 --- a/extra/hdf5-cpp-fortran/PKGBUILD +++ b/extra/hdf5-cpp-fortran/PKGBUILD @@ -6,7 +6,7 @@ pkgname=hdf5-cpp-fortran _pkgname=hdf5 -pkgver=1.8.11 +pkgver=1.8.12 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="General purpose library and file format for storing scientific data" @@ -17,10 +17,10 @@ makedepends=('time' 'gcc-fortran') conflicts=('hdf5') provides=('hdf5') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2) -sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e') +sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f') build() { - cd $srcdir/${_pkgname}-${pkgver/_/-} + cd "$srcdir/${_pkgname}-${pkgver/_/-}" export CFLAGS="${CFLAGS/O2/O0}" export CXXFLAGS="${CFLAGS}" ./configure --prefix=/usr --disable-static \ @@ -37,12 +37,12 @@ build() { } package() { - cd $srcdir/${_pkgname}-${pkgver/_/-} + cd "$srcdir/${_pkgname}-${pkgver/_/-}" - make -j1 DESTDIR=${pkgdir} install + make -j1 DESTDIR="${pkgdir}" install - install -d -m755 $pkgdir/usr/share/licenses/${pkgname} - install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \ - $pkgdir/usr/share/licenses/${pkgname}/LICENSE + install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}" + install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \ + "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD index bc38f68c3..d9aa832d6 100644 --- a/extra/hdf5-openmpi/PKGBUILD +++ b/extra/hdf5-openmpi/PKGBUILD @@ -8,7 +8,7 @@ pkgname=hdf5-openmpi _pkgname=hdf5 -pkgver=1.8.11 +pkgver=1.8.12 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)" @@ -20,14 +20,14 @@ provides=('hdf5') conflicts=('hdf5') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2 mpi.patch) -sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e' +sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f' '658d4a3e537c9c76da3200effa8f95b656a21936') build() { - cd $srcdir/${_pkgname}-${pkgver/_/-} + cd "$srcdir/${_pkgname}-${pkgver/_/-}" # FS#33343 - patch -Np1 -i ${srcdir}/mpi.patch + patch -Np1 -i "${srcdir}/mpi.patch" export CFLAGS="${CFLAGS/O2/O0}" export CXXFLAGS="${CFLAGS}" @@ -55,15 +55,15 @@ build() { } package() { - cd $srcdir/${_pkgname}-${pkgver/_/-} + cd "$srcdir/${_pkgname}-${pkgver/_/-}" - make -j1 DESTDIR=${pkgdir} install + make -j1 DESTDIR="${pkgdir}" install - install -d -m755 $pkgdir/usr/share/$_pkgname - mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples} + install -d -m755 "$pkgdir/usr/share/$_pkgname" + mv "$pkgdir"/usr/share/{hdf5_examples,$_pkgname/examples} - install -d -m755 $pkgdir/usr/share/licenses/${pkgname} - install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \ - $pkgdir/usr/share/licenses/${pkgname}/LICENSE + install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}" + install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \ + "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index fffe70323..f14483d18 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 200716 2013-12-03 07:22:47Z bpiotrowski $ +# $Id: PKGBUILD 204924 2014-01-31 12:48:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb') -pkgver=5.5.34 +pkgver=5.5.35 _pkgver=${pkgver/.a/a} -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url='http://mariadb.org/' @@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaun mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89' +sha256sums=('b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') @@ -66,11 +66,11 @@ build() { package_libmariadbclient() { pkgdesc='MariaDB client libraries' - depends=('openssl' 'libaio') + depends=('openssl' 'libaio' 'zlib') conflicts=('libmysqlclient') provides=("libmysqlclient=$pkgver") options=('staticlibs') - + cd build for dir in include libmysql libmysqld libservices; do make -C $dir DESTDIR="$pkgdir" install @@ -85,10 +85,10 @@ package_libmariadbclient() { package_mariadb-clients() { pkgdesc='MariaDB client tools' - depends=('libmariadbclient') + depends=('libmariadbclient' 'zlib') conflicts=('mysql-clients') provides=("mysql-clients=$pkgver") - + cd build make -C client DESTDIR="$pkgdir" install @@ -134,7 +134,7 @@ package_mariadb() { rm usr/lib/libmysql* rm -r usr/include/ rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - + # provided by mariadb-clients rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 12be4d12d..e759630ab 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 204807 2014-01-27 19:22:09Z ronald $ +# $Id: PKGBUILD 204926 2014-01-31 13:36:05Z ronald $ # Maintainer: Ronald van Haren # Contributor : shining # Contributor : cyberdune pkgname=octave pkgver=3.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" license=('GPL') depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu') -makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot') +makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 'qscintilla') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' - 'qt4: experimental gui') + 'qscintilla: experimental gui') source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}) options=('!emptydirs') install=octave.install diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 9c1638653..3c3f89092 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 204842 2014-01-28 15:36:21Z foutrelis $ +# $Id: PKGBUILD 204922 2014-01-31 12:35:17Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -7,23 +7,31 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc}) +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc} + pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch) sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227' - 'SKIP') - -build() { + 'SKIP' + '4b4cc2d0816bbc7de83d34de6880935163007193a36dcc13afc89fc1ffacc5d2') +prepare() { cd "$srcdir/$pkgname-$pkgver" + # https://developer.pidgin.im/ticket/15879 + patch -Np1 -i "$srcdir/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch" + # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} +} + +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure \ --prefix=/usr \ diff --git a/extra/pidgin/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch b/extra/pidgin/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch new file mode 100644 index 000000000..32f28aa25 --- /dev/null +++ b/extra/pidgin/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch @@ -0,0 +1,145 @@ + +# HG changeset patch +# User Mark Doliner +# Date 1391153359 28800 +# Node ID b8e2a5fbffd3052ccba7160b56eac70f8e19c49a +# Parent e733020a9d3840275ffa931a9aeefe4d8befc08e +Fix problems logging into some servers including jabber.org and +chat.facebook.com. + +See my length comment in iq.c for details. + +diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c +--- a/libpurple/protocols/jabber/iq.c ++++ b/libpurple/protocols/jabber/iq.c +@@ -283,6 +283,52 @@ + g_hash_table_remove(js->iq_callbacks, id); + } + ++/** ++ * Verify that the 'from' attribute of an IQ reply is a valid match for ++ * a given IQ request. The expected behavior is outlined in section ++ * 8.1.2.1 of the XMPP CORE spec (RFC 6120). We consider the reply to ++ * be a valid match if any of the following is true: ++ * - Request 'to' matches reply 'from' (including the case where ++ * neither are set). ++ * - Request 'to' was empty and reply 'from' is server JID. ++ * - Request 'to' was empty and reply 'from' is my JID. The spec says ++ * we should only allow bare JID, but we also allow full JID for ++ * compatibility with some servers. ++ * ++ * These rules should allow valid IQ replies while preventing spoofed ++ * ones. ++ * ++ * For more discussion see the "Spoofing of iq ids and misbehaving ++ * servers" email thread from January 2014 on the jdev and security ++ * mailing lists. ++ * ++ * @return TRUE if this reply is valid for the given request. ++ */ ++static gboolean does_reply_from_match_request_to(JabberStream *js, JabberID *to, JabberID *from) ++{ ++ if (jabber_id_equal(to, from)) { ++ /* Request 'to' matches reply 'from' */ ++ return TRUE; ++ } ++ ++ if (!to && purple_strequal(from->domain, js->user->domain)) { ++ /* Request 'to' is empty and reply 'from' domain matches our domain */ ++ ++ if (!from->node && !from->resource) { ++ /* Reply 'from' is server bare JID */ ++ return TRUE; ++ } ++ ++ if (purple_strequal(from->node, js->user->node) ++ && (!from->resource || purple_strequal(from->resource, js->user->resource))) { ++ /* Reply 'from' is my full or bare JID */ ++ return TRUE; ++ } ++ } ++ ++ return FALSE; ++} ++ + void jabber_iq_parse(JabberStream *js, xmlnode *packet) + { + JabberIqCallbackData *jcd; +@@ -377,8 +423,9 @@ + + /* First, lets see if a special callback got registered */ + if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) { +- if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) { +- if(jabber_id_equal(js, jcd->to, from_id)) { ++ jcd = g_hash_table_lookup(js->iq_callbacks, id); ++ if (jcd) { ++ if (does_reply_from_match_request_to(js, jcd->to, from_id)) { + jcd->callback(js, from, type, id, packet, jcd->data); + jabber_iq_remove_callback_by_id(js, id); + jabber_id_free(from_id); +diff --git a/libpurple/protocols/jabber/jutil.c b/libpurple/protocols/jabber/jutil.c +--- a/libpurple/protocols/jabber/jutil.c ++++ b/libpurple/protocols/jabber/jutil.c +@@ -510,30 +510,21 @@ + + + gboolean +-jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2) ++jabber_id_equal(const JabberID *jid1, const JabberID *jid2) + { +- const JabberID *j1, *j2; +- JabberID *bare_user_jid; +- gboolean equal; ++ if (!jid1 && !jid2) { ++ /* Both are null therefore equal */ ++ return TRUE; ++ } + +- /* If an outgoing stanza has no 'to', or an incoming has no 'from', +- * then those are "the server acting as my account". This function will +- * handle that correctly. +- */ +- if (!jid1 && !jid2) +- return TRUE; ++ if (!jid1 || !jid2) { ++ /* One is null, other is non-null, therefore not equal */ ++ return FALSE; ++ } + +- bare_user_jid = jabber_id_to_bare_jid(js->user); +- j1 = jid1 ? jid1 : bare_user_jid; +- j2 = jid2 ? jid2 : bare_user_jid; +- +- equal = purple_strequal(j1->node, j2->node) && +- purple_strequal(j1->domain, j2->domain) && +- purple_strequal(j1->resource, j2->resource); +- +- jabber_id_free(bare_user_jid); +- +- return equal; ++ return purple_strequal(jid1->node, jid2->node) && ++ purple_strequal(jid1->domain, jid2->domain) && ++ purple_strequal(jid1->resource, jid2->resource); + } + + char *jabber_get_domain(const char *in) +diff --git a/libpurple/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h +--- a/libpurple/protocols/jabber/jutil.h ++++ b/libpurple/protocols/jabber/jutil.h +@@ -46,12 +46,10 @@ + JabberID* jabber_id_new(const char *str); + + /** +- * Compare two JIDs for equality. +- * +- * Warning: If either JID is NULL then this function uses the user's +- * bare JID, instead! ++ * Compare two JIDs for equality. In addition to the node and domain, ++ * the resources of the two JIDs must also be equal (or both absent). + */ +-gboolean jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2); ++gboolean jabber_id_equal(const JabberID *jid1, const JabberID *jid2); + + void jabber_id_free(JabberID *jid); + + diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 1981804b9..e02efc3e4 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 196711 2013-10-16 19:03:48Z ronald $ +# $Id: PKGBUILD 204929 2014-01-31 14:12:03Z ronald $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa # Contributor: K. Piche pkgname=r pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') license=('GPL') url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' - 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') + 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip') makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk') optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf') -- cgit v1.2.3-54-g00ecf