diff options
39 files changed, 645 insertions, 193 deletions
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index 323a033ce..1b6183e7d 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,8 +6,8 @@ pkgname=john pkgver=1.7.9 -pkgrel=3 -_jumbover=5 +pkgrel=4 +_jumbover=6 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -17,12 +17,13 @@ optdepends=("perl: for executing some of the scripts at /usr/share/john" "ruby: for executing some of the scripts at /usr/share/john" "python: for executing some of the scripts at /usr/share/john") backup=('etc/john/john.conf') -source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 - http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz - ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz - params.h.patch) +install=john.install +source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 + http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz + ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz + params.h.patch) md5sums=('45f54fc59386ecd67daaef9f19781d93' - '68cacb612f20c71eed6c24cbaf28148a' + '685c759ec6f865ea81f40a487cd56882' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') @@ -58,32 +59,46 @@ package() { # config file sed -i 's|$JOHN|/usr/share/john|g' ${srcdir}/john-$pkgver/run/john.conf install -Dm644 ${srcdir}/john-$pkgver/run/john.conf ${pkgdir}/etc/john/john.conf - + # docs install -d ${pkgdir}/usr/share/doc/john install -m644 ${srcdir}/john-$pkgver/doc/* ${pkgdir}/usr/share/doc/john/ install -Dm644 ${srcdir}/john-$pkgver/doc/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE - # install password list, charset files and other stuff + # install password list, charset files install -d ${pkgdir}/usr/share/john/ install -m644 ${srcdir}/${pkgname}-${pkgver}/run/password.lst ${pkgdir}/usr/share/john/ + install -m644 ${srcdir}/${pkgname}-${pkgver}/run/dictionary.rfc2865 ${pkgdir}/usr/share/john/ install -m644 ${srcdir}/${pkgname}-${pkgver}/run/stats ${pkgdir}/usr/share/john/ install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{all,alnum,alpha,digits,lanman}.chr \ - ${pkgdir}/usr/share/john/ + ${pkgdir}/usr/share/john/ install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,dynamic}.conf \ - ${pkgdir}/usr/share/john/ - install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{cmpt_cp,ldif2john,lion2john-alt,lion2john}.pl \ - ${pkgdir}/usr/share/john - install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{netntlm,radius2john,sap_prepare,sha-dump}.pl \ - ${pkgdir}/usr/share/john - install -m644 ${srcdir}/${pkgname}-${pkgver}/run/sha-test.pl \ - ${pkgdir}/usr/share/john - install -m644 ${srcdir}/${pkgname}-${pkgver}/run/genincstats.rb \ - ${pkgdir}/usr/share/john - install -m644 ${srcdir}/${pkgname}-${pkgver}/run/netscreen.py \ - ${pkgdir}/usr/share/john + ${pkgdir}/usr/share/john/ + + # install scripts + john_scripts=(benchmark-unify \ + cracf2john.py \ + genincstats.rb \ + ldif2john.pl \ + lion2john-alt.pl \ + lion2john.pl \ + netntlm.pl \ + netscreen.py \ + odf2john.py \ + pass_gen.pl \ + radius2john.pl \ + sap2john.pl \ + sha-dump.pl \ + sha-test.pl \ + sipdump2john.py) + for john_script in "${john_scripts[@]}"; do + install -m755 ${srcdir}/${pkgname}-${pkgver}/run/${john_script} \ + ${pkgdir}/usr/share/john + done install -m644 ${srcdir}/${pkgname}-${pkgver}/run/dynamic.conf ${pkgdir}/etc/john/ + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/run/john.bash_completion \ + ${pkgdir}/etc/bash_completion.d/john # install binaries install -Dm755 ${srcdir}/john-$pkgver/run/john ${pkgdir}/usr/bin/john @@ -93,16 +108,21 @@ package() { install -Dm755 ${srcdir}/john-$pkgver/run/relbench ${pkgdir}/usr/bin/relbench install -Dm755 ${srcdir}/john-$pkgver/run/tgtsnarf ${pkgdir}/usr/bin/tgtsnarf install -Dm755 ${srcdir}/john-$pkgver/run/mailer ${pkgdir}/usr/bin/john-mailer - - # create links - cd ${pkgdir}/usr/bin + install -Dm755 ${srcdir}/john-$pkgver/run/raw2dyna ${pkgdir}/usr/bin/raw2dyna + + # create links + cd ${pkgdir}/usr/bin + ln -s john hccap2john + ln -s john keepass2john + ln -s john pdf2john + ln -s john pwsafe2john + ln -s john racf2john + ln -s john rar2john + ln -s john ssh2john ln -s john unafs ln -s john unique ln -s john unshadow ln -s john undrop - ln -s john pdf2john - ln -s john rar2john - ln -s john ssh2john ln -s john zip2john } diff --git a/community/john/john.install b/community/john/john.install new file mode 100644 index 000000000..21bc51c70 --- /dev/null +++ b/community/john/john.install @@ -0,0 +1,10 @@ +post_install() { + touch /etc/john/john.local.conf 2> /dev/null +} + + +post_upgrade() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD index 4cdeafce2..38aab9086 100644 --- a/community/minitube/PKGBUILD +++ b/community/minitube/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 68258 2012-03-20 19:50:34Z andrea $ +# $Id: PKGBUILD 73056 2012-06-29 18:18:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=minitube -pkgver=1.7.1 -pkgrel=3 +pkgver=1.8 +pkgrel=1 pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player" arch=('i686' 'x86_64') url='http://flavio.tordini.org/minitube' license=('GPL') depends=('phonon') install="${pkgname}.install" -source=("http://flavio.tordini.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('ce336b8cca8294f85d8e34b6a7828e38') +source=("http://flavio.tordini.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'fix-build.patch') +md5sums=('dabfe4776ab6a19eff14e644f68714bb' + 'b6d67acdfc5ef17235449ca13575ba97') build() { cd "${srcdir}"/${pkgname} + + patch -p1 -i "${srcdir}"/fix-build.patch + qmake } diff --git a/community/minitube/fix-build.patch b/community/minitube/fix-build.patch new file mode 100644 index 000000000..9ac61d21b --- /dev/null +++ b/community/minitube/fix-build.patch @@ -0,0 +1,11 @@ +--- minitube/src/qtsingleapplication/qtlocalpeer.cpp~ 2012-06-29 18:13:35.133070928 +0000 ++++ minitube/src/qtsingleapplication/qtlocalpeer.cpp 2012-06-29 18:14:16.359420453 +0000 +@@ -57,6 +57,8 @@ + static PProcessIdToSessionId pProcessIdToSessionId = 0; + #endif + #if defined(Q_OS_UNIX) ++#include <sys/types.h> ++#include <unistd.h> + #include <time.h> + #endif + diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index 070f23417..ff4edb976 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71898 2012-06-03 04:13:02Z bisson $ +# $Id: PKGBUILD 73038 2012-06-29 11:35:44Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: sysrq pkgname=picard pkgver=1.0 -pkgrel=1 +pkgrel=3 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' license=('GPL') diff --git a/community/python2-matplotlib/PKGBUILD b/community/python2-matplotlib/PKGBUILD index 72c1d053e..65f6c9303 100644 --- a/community/python2-matplotlib/PKGBUILD +++ b/community/python2-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73010 2012-06-27 23:33:52Z stephane $ +# $Id: PKGBUILD 73039 2012-06-29 11:35:49Z andrea $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,12 +6,13 @@ pkgname=python2-matplotlib pkgver=1.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64' 'mips64el') url="http://matplotlib.sourceforge.net/" +license=('custom') backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc) -depends=('python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt') +depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt') optdepends=('pygtk: for use with the GTK or GTKAgg backend' 'tk: used by the TkAgg backend' 'wxpython: for use with the WXAgg backend') @@ -22,8 +23,7 @@ conflicts=('python-matplotlib') source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz" setup.cfg) sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae' - 'bcb5a83db9d95c96a57ca518fa6bd1897b23558f') -license=('custom') + 'f074495fc965298e0372751b34c8edb319437c5f') build() { cd "${srcdir}/matplotlib-${pkgver}" @@ -34,6 +34,9 @@ build() { rm lib/matplotlib/pyparsing.py sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py + # remove internal copy of dateutil + rm -r lib/dateutil + # python2 fix for file in $(find . -name '*.py' -print); do sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \ diff --git a/community/python2-matplotlib/setup.cfg b/community/python2-matplotlib/setup.cfg index 4b82986e9..778b04ccc 100644 --- a/community/python2-matplotlib/setup.cfg +++ b/community/python2-matplotlib/setup.cfg @@ -28,7 +28,7 @@ tag_svn_revision = 1 # ## Date/timezone support: #pytz = False -#dateutil = False +dateutil = False [gui_support] # Matplotlib supports multiple GUI toolkits, including Cocoa, diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 2d9bf6474..2029bd920 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71108 2012-05-24 08:34:09Z spupykin $ +# $Id: PKGBUILD 73047 2012-06-29 15:41:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.4.14 +pkgver=2.4.15 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('1bc8f833b955ef119d643da08084433f' +md5sums=('ef273152151c3f905d284cbdbbdb234c' '4f2c02b481283d1336508c988e60e8d8' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 1dd29b70b..e9f6cde95 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72057 2012-06-07 14:10:55Z speps $ +# $Id: PKGBUILD 73052 2012-06-29 16:50:17Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: <farid at archlinux-br.org> _name=SuperCollider pkgname=supercollider -pkgver=3.5.2 +pkgver=3.5.3 pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('emacs: emacs interface' 'ruby: vim support') install="$pkgname.install" source=("http://download.sourceforge.net/project/$pkgname/Source/$pkgver/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('2bf4399ec9a7e37f155bafd018913bac') +md5sums=('84fde920c32e9644902f989136a35b91') build() { cd "$srcdir/$_name-Source" diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD index e9bb68bf9..46feb657f 100644 --- a/community/sylpheed/PKGBUILD +++ b/community/sylpheed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71851 2012-06-02 10:42:33Z speps $ +# $Id: PKGBUILD 73041 2012-06-29 12:56:08Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: dorphell <dorphell@archlinux.org> pkgname=sylpheed -pkgver=3.1.4 +pkgver=3.2.0 pkgrel=1 pkgdesc="Lightweight and user-friendly e-mail client" arch=('i686' 'x86_64') @@ -14,15 +14,11 @@ depends=('gpgme' 'gtkspell' 'desktop-file-utils') makedepends=('compface' 'openssl') options=('!libtool') install="$pkgname.install" -source=("http://sylpheed.sraoss.jp/$pkgname/v3.1/$pkgname-$pkgver.tar.bz2") -md5sums=('4e0e41f05607e5c2542a7dfd166aee77') +source=("http://sylpheed.sraoss.jp/$pkgname/v3.2/$pkgname-$pkgver.tar.bz2") +md5sums=('bbb691cf2bb11f84b329e68b58a62918') build() { cd "$srcdir/$pkgname-$pkgver" - - # glib2 fix - sed -i 's/glibconfig/glib/' libsylph/defs.h - ./configure --prefix=/usr \ --enable-ldap make diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 421825648..b02cd56cc 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 160396 2012-06-01 13:21:45Z dreisner $ +# $Id: PKGBUILD 162744 2012-06-29 11:46:09Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.4.2 -pkgrel=2 +pkgver=1.4.3 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://code.google.com/p/cryptsetup/" groups=('base') -depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt' 'util-linux') conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' - '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' +sha256sums=('d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a' + 'ad610fe77d78bf7e91b7473f9d9c84de46ed1cc21f006fe3ae4791b0b6f42f3a' 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index 8ab0ec9dc..6189f67f4 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 159173 2012-05-17 10:12:14Z thomas $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> +# $Id: PKGBUILD 162745 2012-06-29 11:46:12Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libnl -pkgver=3.2.9 +pkgver=3.2.11 pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +12,7 @@ depends=(glibc) backup=(etc/libnl/classid etc/libnl/pktloc) options=(!libtool) source=("$url/files/$pkgname-$pkgver.tar.gz") -sha256sums=('9f23e9460bd9bb7fbe09af5eb281e4a43a26fa245ea864ed5e28fe4e8118af63') +sha256sums=('9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index d938932fe..2f093bf37 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 150894 2012-02-23 13:54:08Z allan $ +# $Id: PKGBUILD 162746 2012-06-29 11:46:18Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org/" license=('BSD') -depends=('glibc' 'libnl' 'sh') +depends=('glibc' 'libnl' 'sh' 'libusbx') makedepends=('flex') source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} libnl32.patch) -sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd' - 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4' +sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9' + '8004a6655fb98acd89f3dea7ce95f182f4874298ce692f5b8f4a7dae65d7993f' '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') build() { diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD index 71575c47c..f33893555 100644 --- a/core/libusbx/PKGBUILD +++ b/core/libusbx/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162327 2012-06-25 07:06:06Z tpowa $ +# $Id: PKGBUILD 162758 2012-06-29 16:50:44Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libusbx pkgver=1.0.12 -pkgrel=1 +pkgrel=2 depends=('glibc') pkgdesc="Library that provides generic access to USB device" arch=(i686 x86_64 mips64el) @@ -17,7 +17,7 @@ md5sums=('c41352ac755c7992edfcbb2ea4ad1349') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD index ef3538c6e..ae7d1b23d 100644 --- a/core/psmisc/PKGBUILD +++ b/core/psmisc/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 162110 2012-06-20 09:21:46Z eric $ +# $Id: PKGBUILD 162759 2012-06-29 18:27:42Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=psmisc -pkgver=22.18 -pkgrel=2 +pkgver=22.19 +pkgrel=1 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://psmisc.sourceforge.net/index.html" license=('GPL') groups=('base') depends=('ncurses') -source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz psmisc22.18-usage.patch) -sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c' - '5cd326dd969b07c46d10c7d1172b91d65cbc6e10') +source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) +sha1sums=('4c8fb774449f966f78c4c6e1d77d1a24b4187410') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/psmisc22.18-usage.patch" ./configure --prefix=/usr make } diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 98789a832..8294cc2fb 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=185 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -64,7 +64,7 @@ package_systemd() { "systemd-tools=$pkgver" 'util-linux' 'xz') optdepends=('python2-dbus: systemd-analyze' 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' + 'initscripts-systemd: legacy generator for initialization scripts' 'python2-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') @@ -181,7 +181,7 @@ package_libsystemd() { package_systemd-tools() { pkgdesc='standalone tools from systemd' url='http://www.freedesktop.org/wiki/Software/systemd' - depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd') + depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') optdepends=('cryptsetup: required for encrypted block devices') provides=("udev=$pkgver") conflicts=('udev') diff --git a/core/sysvinit/0001-simplify-writelog.patch b/core/sysvinit/0001-simplify-writelog.patch new file mode 100644 index 000000000..cc28f14bc --- /dev/null +++ b/core/sysvinit/0001-simplify-writelog.patch @@ -0,0 +1,126 @@ +From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001 +From: Florian Pritz <bluewind@xinu.at> +Date: Fri, 15 Jun 2012 16:41:52 +0200 +Subject: [PATCH 1/2] simplify writelog() + +All we do is prepend the date and remove \r. We don't handle color +codes, but the user can just cat the log file in a terminal and it will +interpret the codes correctly. + +Signed-off-by: Florian Pritz <bluewind@xinu.at> +--- + bootlogd.c | 76 +++++++++++++++++------------------------------------------- + 1 file changed, 21 insertions(+), 55 deletions(-) + +diff --git a/bootlogd.c b/bootlogd.c +index 570d382..e36e261 100644 +--- a/bootlogd.c ++++ b/bootlogd.c +@@ -68,11 +68,6 @@ int didnl = 1; + int createlogfile = 0; + int syncalot = 0; + +-struct line { +- char buf[256]; +- int pos; +-} line; +- + /* + * Console devices as listed on the kernel command line and + * the mapping to actual devices in /dev +@@ -351,63 +346,34 @@ int consolename(char *res, int rlen) + */ + void writelog(FILE *fp, unsigned char *ptr, int len) + { +- time_t t; +- char *s; +- char tmp[8]; +- int olen = len; +- int dosync = 0; +- int tlen; +- +- while (len > 0) { +- tmp[0] = 0; +- if (didnl) { ++ int dosync = 0; ++ int i; ++ static int first_run = 1; ++ ++ for (i = 0; i < len; i++) { ++ int ignore = 0; ++ ++ /* prepend date to every line */ ++ if (*(ptr-1) == '\n' || first_run) { ++ time_t t; ++ char *s; + time(&t); + s = ctime(&t); + fprintf(fp, "%.24s: ", s); +- didnl = 0; ++ dosync = 1; ++ first_run = 0; + } +- switch (*ptr) { +- case 27: /* ESC */ +- strcpy(tmp, "^["); +- break; +- case '\r': +- line.pos = 0; +- break; +- case 8: /* ^H */ +- if (line.pos > 0) line.pos--; +- break; +- case '\n': +- didnl = 1; +- dosync = 1; +- break; +- case '\t': +- line.pos += (line.pos / 8 + 1) * 8; +- if (line.pos >= (int)sizeof(line.buf)) +- line.pos = sizeof(line.buf) - 1; +- break; +- case 32 ... 127: +- case 161 ... 255: +- tmp[0] = *ptr; +- tmp[1] = 0; +- break; +- default: +- sprintf(tmp, "\\%03o", *ptr); +- break; +- } +- ptr++; +- len--; + +- tlen = strlen(tmp); +- if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) { +- memcpy(line.buf + line.pos, tmp, tlen); +- line.pos += tlen; ++ if (*ptr == '\r') { ++ ignore = 1; + } +- if (didnl) { +- fprintf(fp, "%s\n", line.buf); +- memset(&line, 0, sizeof(line)); ++ ++ if (!ignore) { ++ fwrite(ptr, sizeof(char), 1, fp); + } +- } + ++ ptr++; ++ } + if (dosync) { + fflush(fp); + if (syncalot) { +@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + } + } + +- outptr += olen; ++ outptr += len; + if (outptr >= endptr) + outptr = ringbuf; + +-- +1.7.10.4 + diff --git a/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch b/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch new file mode 100644 index 000000000..89b3280df --- /dev/null +++ b/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch @@ -0,0 +1,80 @@ +From 8d0022d9540112a92ce8d88c91c4ac10bad8c9ef Mon Sep 17 00:00:00 2001 +From: Florian Pritz <bluewind@xinu.at> +Date: Sun, 24 Jun 2012 15:49:51 +0200 +Subject: [PATCH 2/2] remove ansi escape codes from log file + +References: https://en.wikipedia.org/wiki/ANSI_escape_code + +Signed-off-by: Florian Pritz <bluewind@xinu.at> +--- + bootlogd.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 43 insertions(+), 2 deletions(-) + +diff --git a/bootlogd.c b/bootlogd.c +index e36e261..88e610d 100644 +--- a/bootlogd.c ++++ b/bootlogd.c +@@ -349,6 +349,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + int dosync = 0; + int i; + static int first_run = 1; ++ static int inside_esc = 0; + + for (i = 0; i < len; i++) { + int ignore = 0; +@@ -364,10 +365,50 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + first_run = 0; + } + +- if (*ptr == '\r') { +- ignore = 1; ++ /* remove escape sequences, but do it in a way that allows us to stop ++ * in the middle in case the string was cut off */ ++ if (inside_esc == 1) { ++ /* first '[' is special because if we encounter it again, it should be considered the final byte */ ++ if (*ptr == '[') { ++ /* multi char sequence */ ++ ignore = 1; ++ inside_esc = 2; ++ } else { ++ /* single char sequence */ ++ if (*ptr >= 64 && *ptr <= 95) { ++ ignore = 1; ++ } ++ inside_esc = 0; ++ } ++ } else if (inside_esc == 2) { ++ switch (*ptr) { ++ case '0' ... '9': /* intermediate chars of escape sequence */ ++ case ';': ++ case 32 ... 47: ++ if (inside_esc) { ++ ignore = 1; ++ } ++ break; ++ case 64 ... 126: /* final char of escape sequence */ ++ if (inside_esc) { ++ ignore = 1; ++ inside_esc = 0; ++ } ++ break; ++ } ++ } else { ++ switch (*ptr) { ++ case '\r': ++ ignore = 1; ++ break; ++ case 27: /* ESC */ ++ ignore = 1; ++ inside_esc = 1; ++ break; ++ } + } + ++ + if (!ignore) { + fwrite(ptr, sizeof(char), 1, fp); + } +-- +1.7.10.4 + diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index b521d1895..9218e7e2f 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 137779 2011-09-10 22:03:10Z tomegun $ +# $Id: PKGBUILD 162726 2012-06-29 06:27:09Z bluewind $ # Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> pkgname=sysvinit pkgver=2.88 -pkgrel=3.1 +pkgrel=6 pkgdesc="Linux System V Init" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') groups=('base') -depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk') +depends=('util-linux' 'coreutils' 'glibc' 'awk') install=sysvinit.install -source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2) -md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f') -sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26') +source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2 + "0001-simplify-writelog.patch" + "0002-remove-ansi-escape-codes-from-log-file.patch") +sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' + '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d' + 'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32') build() { cd "${srcdir}/${pkgname}-${pkgver}dsf" + + # FS#30005 + patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch" + patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch" + make } diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 877efd21e..8342a31e2 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159201 2012-05-17 21:37:52Z heftig $ +# $Id: PKGBUILD 162754 2012-06-29 15:28:24Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.21 +pkgver=0.6.22 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'libsystemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz) -md5sums=('b501d48963b70983170983258c19cc2c') +md5sums=('6159898955b4c7079a8ae64cd7aa5bf1') build() { cd $pkgname-$pkgver diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index df7d8cc08..0078ccb4e 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146432 2012-01-11 00:54:52Z eric $ +# $Id: PKGBUILD 162767 2012-06-29 22:10:56Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.12 +pkgver=9.15 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('lcms' 'jasper') source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz license.txt) -sha1sums=('b0110f83692b14940a8e43759d7ccefa77103cc6' +sha1sums=('0b06047603640fe19b5d3b2461319d6ba22eee6a' '502c8f0ac7434d48f5dcb2eefe7599627cb69454') build() { diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD index 65fda4b8c..036a60751 100644 --- a/extra/hyphen/PKGBUILD +++ b/extra/hyphen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140476 2011-10-15 10:01:23Z andyrtr $ +# $Id: PKGBUILD 162738 2012-06-29 10:59:41Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase=hyphen pkgname=('hyphen' 'hyphen-en') -pkgver=2.8.3 -pkgrel=1.1 +pkgver=2.8.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://hunspell.sf.net" license=('GPL' 'LGPL' 'MPL') @@ -12,7 +12,7 @@ groups=() makedepends=('glibc' 'perl') options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz) -md5sums=('86261f06c097d3e425a2f6d0b0635380') +md5sums=('a2f6010987e1c601274ab5d63b72c944') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 7a93cd72b..bc2cf88ed 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162136 2012-06-22 03:39:00Z eric $ +# $Id: PKGBUILD 162725 2012-06-29 04:45:55Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.7.9 +pkgver=6.7.7.10 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('d45a936b59afa3bc484c0ea1b512f8fc026c14e4' +sha1sums=('289e539f7fd40ca9b06f94a3348641abf0e56a1f' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -33,7 +33,7 @@ build() { check() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} -# make check + make check } package_imagemagick() { diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 070f71d6b..1c1aaba1a 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 161107 2012-06-08 06:34:53Z andrea $ +# $Id: PKGBUILD 162743 2012-06-29 11:34:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') pkgver=4.8.4 -pkgrel=1 +pkgrel=2 url='http://kde.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' + 'pyqt' 'qscintilla' 'python-sip' 'python2-sip') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") sha1sums=('e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256') @@ -23,6 +24,7 @@ build() { cmake ../pykde4-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0 make cd .. diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD index c5e5899da..d57a1363c 100644 --- a/extra/libmythes/PKGBUILD +++ b/extra/libmythes/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 145626 2011-12-24 14:41:49Z andyrtr $ +# $Id: PKGBUILD 162736 2012-06-29 10:55:24Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmythes -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 epoch=1 pkgdesc="a simple thesaurus" @@ -14,7 +14,7 @@ makedepends=('hunspell') options=('!libtool') provides=('mythes') source=(http://downloads.sourceforge.net/hunspell/${pkgname/lib/}-${pkgver}.tar.gz) -md5sums=('e1e255dc43dbcbb34cb19e8a0eba90ae') +md5sums=('46e92b68e31e858512b680b3b61dc4c1') build() { cd ${srcdir}/${pkgname/lib/}-$pkgver diff --git a/extra/lynx/PKGBUILD b/extra/lynx/PKGBUILD index 122248b0b..b342e6b46 100644 --- a/extra/lynx/PKGBUILD +++ b/extra/lynx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149487 2012-02-08 10:10:55Z pierre $ +# $Id: PKGBUILD 162749 2012-06-29 12:15:20Z pierre $ # Maintainer: # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -6,10 +6,10 @@ pkgname=lynx pkgver=2.8.7 _pkgver=2-8-7 -pkgrel=5 +pkgrel=6 pkgdesc="A text browser for the World Wide Web" url="http://lynx.isc.org/" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('ncurses' 'openssl') backup=('etc/lynx.cfg') diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 51d8cb634..c4d5cd01b 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162703 2012-06-28 17:12:56Z andyrtr $ +# $Id: PKGBUILD 162757 2012-06-29 15:32:58Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx @@ -12,7 +12,7 @@ options=('!makeflags') makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends ) -source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz +source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz nx-x11.ld.so.conf.d) md5sums=('f20f5a12e15849bae8a1f2d7b44830ab' 'f2ec60c7e2d81bef2f7292d2b33681a6') diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 49a7c000c..c2d6b4ff0 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,27 +1,21 @@ -# $Id: PKGBUILD 161771 2012-06-13 17:06:46Z andrea $ +# $Id: PKGBUILD 162740 2012-06-29 11:34:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt -pkgname=('pyqt' 'python2-pyqt') -pkgver=4.9.1 -pkgrel=2 +pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') +pkgver=4.9.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" - 'fix-qthelp-build.patch') -md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c' - '6acfe0a5a00779f946c29d5fac647ce1') + source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('a0b6a820633366365af5124ddbd059c7') build() { - # Build QtHelp (FS#27665) - cd "${srcdir}"/PyQt-x11-gpl-${pkgver} - patch -p1 -i "${srcdir}"/fix-qthelp-build.patch - cd "${srcdir}" cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} @@ -48,37 +42,52 @@ build() { make } +package_pyqt-common(){ + pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" + + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + make -C pyrcc DESTDIR="${pkgdir}" install + make -C pylupdate DESTDIR="${pkgdir}" install + make -C designer INSTALL_ROOT="${pkgdir}" install + + install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api +} + package_pyqt(){ pkgdesc="A set of Python 3.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip' 'python-dbus') + depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - replaces=('python-qt') - provides=('python-qt') cd "${srcdir}/PyQt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by pyqt-common + rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } package_python2-pyqt(){ pkgdesc="A set of Python 2.x bindings for the Qt toolkit" - depends=('pyqt' 'python2-sip' 'python2-dbus') + depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' 'python-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - replaces=('python2-qt') provides=('python2-qt') - options=('!emptydirs') cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - # Provided by pyqt - rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4} - rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so - rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api + # Fix conflicts with pyqt + mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 + + # Provided by pyqt-common + rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 9d424235f..8f1e4f199 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,41 +1,42 @@ -# $Id: PKGBUILD 150137 2012-02-13 11:40:55Z eric $ +# $Id: PKGBUILD 162741 2012-06-29 11:34:22Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla -pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.6.1 +pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' + 'python-qscintilla-common') +pkgver=2.6.2 pkgrel=1 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt' 'chrpath') +makedepends=('python2-pyqt' 'pyqt' 'chrpath') source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('39a1d0567a20b416177eb1a8afe225a7' +md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9' '8cf9c06252e2f11ab00e62848e322fd3') build() { cd "${srcdir}/QScintilla-gpl-${pkgver}" patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" - cd Qt4 + cd Qt4Qt5 qmake qscintilla.pro make cd ../designer-Qt4 - qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 + qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make cd ../ cp -rf Python Python2 cd Python - python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 + python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 make cd ../Python2 - python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 + python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 make } @@ -43,16 +44,27 @@ package_qscintilla() { pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" depends=('qt') - cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4" + cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install } +package_python-qscintilla-common() { + pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" + depends=('qscintilla') + + cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by python-qscintilla + rm "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" +} + package_python-qscintilla() { - pkgdesc="Python 3 bindings for QScintilla2" - depends=('pyqt' 'qscintilla') + pkgdesc="Python 3.x bindings for QScintilla2" + depends=('python-qscintilla-common' 'pyqt') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ @@ -60,9 +72,10 @@ package_python-qscintilla() { } package_python2-qscintilla() { - pkgdesc="Python 2 bindings for QScintilla2" - depends=('python-qscintilla' 'python2-pyqt') + pkgdesc="Python 2.x bindings for QScintilla2" + depends=('python-qscintilla-common' 'python2-pyqt') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + install -Dm755 Qsci.so \ + "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so" } diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 5e0733772..fa3893cdf 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154825 2012-03-30 19:44:16Z ronald $ +# $Id: PKGBUILD 162765 2012-06-29 20:58:34Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.15.0 +pkgver=2.15.1 pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') @@ -12,21 +12,28 @@ license=('GPL') url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' - 'tk' 'libxt' 'libxmu' 'pango' 'xz') -makedepends=('openjdk6' 'gcc-fortran') + 'libxt' 'libxmu' 'pango' 'xz' 'texlive-bin' 'desktop-file-utils') +makedepends=('openjdk6' 'gcc-fortran' 'tk') +optdepends=('tk: tcl/tk interface') backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') -options=('!makeflags') +options=('!makeflags' '!emptydirs') source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" 'r.desktop' - 'r.png') + 'r.png' + 'R.conf') install=r.install -sha1sums=('a633f87fdbd22e8c371971c535ca815e63c297f6' +sha1sums=('f0e6912be6dfc0d1fdc4be66048304d8befe8424' '13aa29219bcaa102e575de8c1c8e0833d233e836' - 'a69a07ec363440efc18ce0a7f2af103375dea978') + 'a69a07ec363440efc18ce0a7f2af103375dea978' + '43668da6cfd1b4455a99f23e79e2059294dddac9') build() { cd "${srcdir}/R-${pkgver}" sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c + + # set texmf dir correctly in makefile + sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in + ./configure --prefix=/usr \ --libdir=/usr/lib \ --sysconfdir=/etc/R \ @@ -66,4 +73,7 @@ package() { mv -f ${i} "${pkgdir}/etc/R" ln -s /etc/R/${i} ${i} done + + # Install ld.so.conf.d file to ensure other applications access the shared lib + install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf } diff --git a/extra/r/R.conf b/extra/r/R.conf new file mode 100644 index 000000000..e360859db --- /dev/null +++ b/extra/r/R.conf @@ -0,0 +1,2 @@ +/usr/lib/R/lib + diff --git a/extra/r/r.install b/extra/r/r.install index d3289ab64..89fea599b 100644 --- a/extra/r/r.install +++ b/extra/r/r.install @@ -1,5 +1,7 @@ post_install() { update-desktop-database -q + echo ">>> updating the filename database for texlive..." + mktexlsr --quiet usr/share/texmf } post_upgrade() { diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 0dd0920a3..14123a53b 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 150174 2012-02-14 07:57:34Z andrea $ +# $Id: PKGBUILD 162739 2012-06-29 11:34:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip -pkgname=('sip' 'python2-sip') -pkgver=4.13.2 -pkgrel=1 +pkgname=('sip' 'python-sip' 'python2-sip') +pkgver=4.13.3 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84') +md5sums=('76192829cc42ec558db46e4f9e1d8ba9') build() { cd "${srcdir}" @@ -30,25 +30,36 @@ build() { package_sip() { pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries" - depends=('python') - replaces=('python-sip') - provides=('python-sip') + depends=('glibc') cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install -C sipgen install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +package_python-sip() { + pkgdesc="Python 3.x SIP bindings for C and C++ libraries" + depends=('sip' 'python') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install -C siplib + + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipdistutils.py + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + package_python2-sip() { - pkgdesc="A tool that makes it easy to create Python2 bindings for C and C++ libraries" + pkgdesc="Python 2.x SIP bindings for C and C++ libraries" depends=('sip' 'python2') cd "${srcdir}/python2-${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - + make DESTDIR="${pkgdir}" install -C siplib + + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - # Provided by sip - rm "${pkgdir}/usr/bin/sip" } diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index dd9f8cce3..4cba29cb9 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158030 2012-05-01 10:41:36Z giovanni $ +# $Id: PKGBUILD 162734 2012-06-29 09:39:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.16 +pkgver=5.0.17 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('6d689965473c23db6be890c7e5260c67') +md5sums=('754ff9a089913bf198400eb937e24055') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index f5962063a..51668c454 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,14 +1,14 @@ -# $Id$ -# Arch Contributor: Alexander Fehr <pizzapunk gmail com> -# Arch Contributor: William Rea <sillywilly@gmail.com> -# Arch maintainer: Gaetan Bisson <bisson@archlinux.org> -# Parabola maintainer: Brendan Tildesley -# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy> +# $Id: PKGBUILD 162794 2012-06-30 14:17:02Z bisson $ +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: William Rea <sillywilly@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Maintainer (Parabola): Brendan Tildesley +# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.2.3 -pkgrel=1 +pkgver=3.2.4 +pkgrel=2 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' arch=('i686' 'x86_64') @@ -60,7 +60,7 @@ optdepends=('oss: Open Sound System v4 output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('87a795c4ecf645ad36ffe7bb3a7b5691e0316f71') +sha1sums=('7538a0391504ce4a92967dc7c5bd4948751efa91') build() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure @@ -105,9 +105,9 @@ build() { popd ./configure \ - --prefix=/usr \ - --enable-amidiplug \ - --disable-adplug \ + --prefix=/usr \ + --enable-amidiplug \ + --disable-adplug \ make } diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index a0bf5ac31..25084c92c 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162049 2012-06-19 08:17:58Z andrea $ +# $Id: PKGBUILD 162798 2012-06-30 15:30:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.8.4 -pkgrel=3.1 +pkgrel=4 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD new file mode 100644 index 000000000..2ba356831 --- /dev/null +++ b/multilib-testing/lib32-libdrm/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 73060 2012-06-29 20:06:36Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +_pkgbasename=libdrm +pkgname=lib32-$_pkgbasename +pkgver=2.4.37 +pkgrel=1 +pkgdesc="Userspace interface to kernel DRM services (32-bit)" +arch=(x86_64) +license=('custom') +depends=('lib32-libpciaccess' $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool') +url="http://dri.freedesktop.org/" +source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 + no-pthread-stubs.patch) +# git_fixes.diff) +sha1sums=('fa8463e390eee9b589dc369abc4cbe3e4ef16d16' + '2a5410baa3e6e078f9378ce486a88f41d22fd838') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" + + # git fixes - currently none + # patch -Np1 -i ${srcdir}/git_fixes.diff + + # libtoolize --force + autoreconf --force --install + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --enable-udev \ + --enable-vmwgfx-experimental-api + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share,bin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch new file mode 100644 index 000000000..6745f4bc4 --- /dev/null +++ b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch @@ -0,0 +1,70 @@ +diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac +--- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000 ++++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000 +@@ -47,10 +47,6 @@ + LT_INIT([disable-static]) + + +-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) +-AC_SUBST(PTHREADSTUBS_CFLAGS) +-AC_SUBST(PTHREADSTUBS_LIBS) +- + pkgconfigdir=${libdir}/pkgconfig + AC_SUBST(pkgconfigdir) + AC_ARG_ENABLE([udev], +diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am +--- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000 ++++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000 +@@ -26,7 +26,6 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/intel \ +- $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ + $(VALGRIND_CFLAGS) \ + -I$(top_srcdir)/include/drm +@@ -35,7 +34,6 @@ + libdrm_intel_ladir = $(libdir) + libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined + libdrm_intel_la_LIBADD = ../libdrm.la \ +- @PTHREADSTUBS_LIBS@ \ + @PCIACCESS_LIBS@ \ + @CLOCK_LIB@ + +diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am +--- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000 ++++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000 +@@ -2,14 +2,13 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/nouveau \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm \ + -DDEBUG + + libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la + libdrm_nouveau_ladir = $(libdir) + libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined +-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_nouveau_la_LIBADD = ../libdrm.la + + libdrm_nouveau_la_SOURCES = nouveau.c \ + pushbuf.c \ +diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am +--- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000 ++++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000 +@@ -26,13 +26,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/radeon \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la + libdrm_radeon_ladir = $(libdir) + libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_radeon_la_LIBADD = ../libdrm.la + + libdrm_radeon_la_SOURCES = \ + radeon_bo_gem.c \ diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD new file mode 100644 index 000000000..a9845c449 --- /dev/null +++ b/testing/run-parts/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 162728 2012-06-29 07:39:29Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=run-parts +pkgver=4.3.2 +pkgrel=1 +pkgdesc='run scripts or programs in a directory' +arch=('i686' 'x86_64') +url='http://packages.qa.debian.org/d/debianutils.html' +license=('GPL') +depends=('glibc') +source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") +sha256sums=('0062d774306a6acc34d3b855a5c4eeb845653b0cd34dbb5c13aa00b4ecb8af22') + +build() { + cd $srcdir/debianutils-$pkgver + ./configure --prefix=/usr + make run-parts +} + +package() { + cd $srcdir/debianutils-$pkgver + install -D -m755 run-parts $pkgdir/usr/bin/run-parts + install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 + for l in po4a/*/run-parts.8; do + install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 + done +} |