diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
commit | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (patch) | |
tree | 0dfcf0ebb742c6e359f0502d9207b3a600aa3462 /community | |
parent | 7a501772e3cb37f438506df7c22a34ed9bba9d88 (diff) | |
parent | db0dace84403023c8d89b8801f12a5ab278dc440 (diff) |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
core/glibc/PKGBUILD
Diffstat (limited to 'community')
88 files changed, 1900 insertions, 345 deletions
diff --git a/community/alsa-tools/PKGBUILD b/community/alsa-tools/PKGBUILD index 1e097048e..c49246f5d 100644 --- a/community/alsa-tools/PKGBUILD +++ b/community/alsa-tools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59642 2011-11-28 23:44:29Z seblu $ +# $Id: PKGBUILD 62752 2012-01-25 20:12:30Z seblu $ #Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> #Contributor: Jochen Immend�rfer <jochen dot immendoerfer at gmail dot com> pkgname=alsa-tools -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc='ALSA tools package' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL2') depends=('fltk' 'alsa-lib' 'gtk2') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2") -md5sums=('08fe93a12006093e590d7ecc02b119dd') +md5sums=('57bfec98a814d12e0f7ab379aaeccd87') build() { for f in $(find "$srcdir/$pkgname-$pkgver" -type f -name configure ); do diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 38d4c5bb3..07961fe67 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,9 +1,9 @@ # $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=bird pkgname=('bird' 'bird6') -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://bird.network.cz/' @@ -14,7 +14,7 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.conf' 'bird.service' 'bird6.service') -md5sums=('9efc2b1c05fa6298a8df60f5147ad5c1' +md5sums=('fa5621a41dcd86b6cb8cbe4fbd74af7e' '1a4b98756d64f52333a83eff2e95d233' '25241a4d7ef639506e0080431b2c1690' 'e82a0519dca0b289685fda44787f5911' diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 42a52f376..096d73e90 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61987 2012-01-13 12:17:48Z giovanni $ +# $Id: PKGBUILD 62819 2012-01-27 11:13:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.35 +pkgver=0.8.37 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('0a1170534492c6ca5b9f849cbfaa7acc' +md5sums=('7e313e9bf84e046d5ccfa0e9e4c06b26' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 9bd00f25a..8087bcef1 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 55877 2011-09-24 16:48:18Z stephane $ +# $Id: PKGBUILD 62687 2012-01-24 14:37:57Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> pkgname=cegui -pkgver=0.7.5 -pkgrel=5 +pkgver=0.7.6 +pkgrel=1 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" @@ -15,7 +15,8 @@ license=("MIT") depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') makedepends=('python2' 'doxygen') source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) -md5sums=('38c79d1fdfaaa10f481c99a2ac479516') +options=(!libtool) +md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3') build() { cd $srcdir/CEGUI-${pkgver} diff --git a/community/chromaprint/PKGBUILD b/community/chromaprint/PKGBUILD new file mode 100644 index 000000000..ea7e1ef90 --- /dev/null +++ b/community/chromaprint/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 62590 2012-01-22 09:25:04Z bisson $ +# Contributor: Wieland Hoffmann <the_mineo@web.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=chromaprint +pkgver=0.6 +pkgrel=2 +pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' +url='http://acoustid.org/chromaprint/' +arch=('i686' 'x86_64') +license=('LGPL') +depends=('ffmpeg') +makedepends=('cmake') +source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON . + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index c9272ed0e..83ceb2f38 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58389 2011-11-12 17:16:28Z ibiru $ +# $Id: PKGBUILD 62726 2012-01-25 08:16:40Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.1 -pkgrel=3 +pkgrel=4 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' @@ -32,11 +32,18 @@ optdepends=('libsamplerate: for Resampler plugin' 'libzip: for vfs_zip plugin') options=('!libtool') install='deadbeef.install' -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch") +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch' + 'deadbeef-0.5.1-ffmpeg-version-check-fix.patch') +md5sums=('be8359d1bd9cf7679cf2ca748996e726' + 'd1c913c0ccefef33012732cf0ae49f7f' + '6d22855f61f4d2fea4b343dca76d5e85') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/ffmpeg.patch + + patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch + patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-version-check-fix.patch ./configure --prefix=/usr make @@ -47,5 +54,3 @@ package () { make prefix="${pkgdir}/usr" install } -md5sums=('be8359d1bd9cf7679cf2ca748996e726' - '6cc7623734af310095534c361c9f64e8') diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch new file mode 100644 index 000000000..db1c79638 --- /dev/null +++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch @@ -0,0 +1,118 @@ +From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001 +From: Igor Murzov <e-mail@date.by> +Date: Mon, 4 Jul 2011 16:47:25 +0400 +Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT() + +For ffmpeg < 0.5. Copied from libavutil 0.5. + +ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc + +fixes build with lavc 53. + +ffmpeg: fix erroneous version comparisons + +Comparing versions this way: (x.y < x1.y1) is obviously equivalent to +(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1). + +ffmpeg: use av_register_protocol2() if available + +fixes usage with ffmpeg-0.8 +--- + plugins/ffmpeg/ffmpeg.c | 37 ++++++++++++++++++++++++++++++------- + 1 files changed, 30 insertions(+), 7 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index cd7edf4..0cb9955 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -44,6 +44,10 @@ + #define av_register_protocol register_protocol + #endif + ++#ifndef AV_VERSION_INT ++#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) ++#endif ++ + #endif + + //#define trace(...) { fprintf(stderr, __VA_ARGS__); } +@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { + for (i = 0; i < info->fctx->nb_streams; i++) + { + info->ctx = info->fctx->streams[i]->codec; +- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (info->ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + info->codec = avcodec_find_decoder (info->ctx->codec_id); + if (info->codec != NULL) { +@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) { + int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; + int len; + //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size); +-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25) +- len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); +-#else ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0) + len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt); ++#else ++ len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); + #endif + trace ("out: out_size=%d, len=%d\n", out_size, len); + if (len <= 0) { +@@ -418,7 +427,7 @@ static const char *map[] = { + + static int + ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) { +-#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43 ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0) + if (!strlen (fctx->title)) { + // title is empty, this call will set track title to filename without extension + deadbeef->pl_add_meta (it, "title", NULL); +@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams +@@ -704,7 +718,11 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); ++#else + av_register_protocol (&vfswrapper); ++#endif + return 0; + } + +@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL) +-- +1.7.8.4 + diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch new file mode 100644 index 000000000..af8c282c0 --- /dev/null +++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch @@ -0,0 +1,25 @@ +From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001 +From: Igor Murzov <e-mail@date.by> +Date: Thu, 7 Jul 2011 22:31:44 +0400 +Subject: [PATCH 2/2] ffmpeg: version check fix + +--- + plugins/ffmpeg/ffmpeg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index 0cb9955..37c7e80 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -718,7 +718,7 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0) + av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); + #else + av_register_protocol (&vfswrapper); +-- +1.7.8.4 + diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD new file mode 100644 index 000000000..5c7dd4848 --- /dev/null +++ b/community/dos2unix/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> +# Contributor: Renato Garcia <fgar.renatoATgmailDOTcom> +# Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com> + +pkgname=dos2unix +pkgver=5.3.1 +pkgrel=3 +pkgdesc='Text file format converter' +arch=('i686' 'x86_64') +url='http://waterlan.home.xs4all.nl/dos2unix.html' +license=('BSD') +depends=('glibc') +makedepends=('perl') +conflicts=('hd2u') +source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('438c48ebd6891b80b58de14c022ca69e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 08a9f5a31..5c3163f90 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 60285 2011-12-08 22:52:59Z lfleischer $ +# $Id: PKGBUILD 62636 2012-01-23 00:53:34Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.17 -pkgrel=3 +pkgrel=4 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" - 'botobackend.patch') + 'botobackend.patch' + 'duplicity-0.6.17-fix-memleak.patch') md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f' - '49bbdc327230fe5985d18eaae37eec0c') + '49bbdc327230fe5985d18eaae37eec0c' + 'b77e98d006842414fdda9662c8081d3b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,6 +29,9 @@ build() { # add hotfix issued by upstream (FS#27390) patch -p0 -i ../botobackend.patch + # fix a memory leak (upstream bug #908228) + patch -p0 -i ../duplicity-0.6.17-fix-memleak.patch + python2 setup.py install --root="$pkgdir" --optimize=1 # fix broken documentation permissions until upstream does (FS#27301) diff --git a/community/duplicity/duplicity-0.6.17-fix-memleak.patch b/community/duplicity/duplicity-0.6.17-fix-memleak.patch new file mode 100644 index 000000000..1c4c8daff --- /dev/null +++ b/community/duplicity/duplicity-0.6.17-fix-memleak.patch @@ -0,0 +1,29 @@ +=== modified file 'duplicity/util.py' +--- duplicity/util.py 2011-08-23 18:14:17 +0000 ++++ duplicity/util.py 2012-01-20 21:50:01 +0000 +@@ -71,6 +71,10 @@ + else: + raise + ++class BlackHoleList(list): ++ def append(self, x): ++ pass ++ + class FakeTarFile: + debug = 0 + def __iter__(self): +@@ -83,7 +87,12 @@ + # yet. So we want to ignore ReadError exceptions, which are used to signal + # this. + try: +- return tarfile.TarFile("arbitrary", mode, fp) ++ tf = tarfile.TarFile("arbitrary", mode, fp) ++ # Now we cause TarFile to not cache TarInfo objects. It would end up ++ # consuming a lot of memory over the lifetime of our long-lasting ++ # signature files otherwise. ++ tf.members = BlackHoleList() ++ return tf + except tarfile.ReadError: + return FakeTarFile() + + diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index ce4c8437c..e0eb5ddec 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61453 2011-12-31 18:08:55Z spupykin $ +# $Id: PKGBUILD 62769 2012-01-26 14:42:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ejabberd pkgver=2.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="An erlang jabber server" arch=(i686 x86_64 'mips64el') url="http://www.ejabberd.im/" diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install index 579be7ed3..eceb73592 100644 --- a/community/ejabberd/ejabberd.install +++ b/community/ejabberd/ejabberd.install @@ -1,6 +1,6 @@ post_install() { - groupadd jabber - useradd -G jabber -d /var/lib/ejabberd ejabberd + groupadd -r jabber + useradd -r -G jabber -d /var/lib/ejabberd ejabberd chown -R ejabberd.jabber /var/log/ejabberd chown -R ejabberd.jabber /var/spool/ejabberd chown -R ejabberd.jabber /var/lib/ejabberd diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index 41402f4b6..f2ac0230c 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 58393 2011-11-12 17:16:52Z ibiru $ +# $Id: PKGBUILD 62754 2012-01-25 20:28:55Z ebelanger $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b12 -pkgrel=4 +pkgrel=5 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64' 'mips64el') url="http://community.electricsheep.org/" license=('GPL') -depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade') +depends=('curl' 'flam3' 'ffmpeg' 'mplayer' 'libglade') makedepends=('xscreensaver') optdepends=('xscreensaver: to use electricsheep with xscreensaver') source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - electricsheep-ffmpeg.patch) + electricsheep-ffmpeg.patch electricsheep-pref-segfault.patch) sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32' - 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825') + 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825' + 'bdf0f66fdbb5741671e8bb127bd76ef236d0e44a') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch" + patch -p1 -i "${srcdir}/electricsheep-pref-segfault.patch" ./configure --prefix=/usr make } diff --git a/community/electricsheep/PKGBUILD.svn b/community/electricsheep/PKGBUILD.svn new file mode 100644 index 000000000..2fc8a26ff --- /dev/null +++ b/community/electricsheep/PKGBUILD.svn @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 57680 2011-11-01 05:03:57Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +pkgname=electricsheep +pkgver=2.7b34 +pkgrel=1 +pkgdesc="Screensaver that realize the collective dream of computers all over the internet" +arch=('x86_64' 'i686') +url="http://community.electricsheep.org/" +license=('GPL') +depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade' 'tinyxml' 'boost' 'gtk2' 'lua') +#subversion libgtk2.0 libgl1-mesa libavcodec libavformat libswscale liblua5 libcurl4-openssl libxml2 libjpeg8 libgtop2 libboost libboost-filesystem libboost-thread libtinyxml libglut3 +makedepends=('xscreensaver') +optdepends=('xscreensaver: to use electricsheep with xscreensaver') +_fixed_revision=107 + +build() { + cd "$srcdir" + + msg2 "Checking out svn revision $_fixed_revision (in lack of a Linux release for $pkgver)..." + if [[ -d "$pkgname/.svn" ]]; then + (cd "$pkgname" && svn up -r $_fixed_revision) + else + svn co \ + http://electricsheep.googlecode.com/svn/trunk/ \ + --config-dir ./ -r $_fixed_revision "$pkgname" + fi + + msg2 "Setting up build directory..." + rm -rf "$srcdir/$pkgname-build" + cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build" + cd "$srcdir/$pkgname-build/client_generic" + + #patch -p1 -i ../electricsheep-ffmpeg.patch + msg2 "Configuring..." + ./autogen.sh + ./configure --prefix=/usr + + msg2 "Compiling..." + make +} + +package() { + cd "$srcdir/$pkgname-build/client_generic" + + install -d "$pkgdir/usr/share/applications/screensavers" + install -d "$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" + make DESTDIR="$pkgdir" \ + GNOME_SCREENSAVER_DATADIR="$pkgdir/usr/share/applications/screensavers" \ + GNOME_SCREENSAVER_PRIVEXEDIR="$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" \ + install + install -Dm644 electricsheep.desktop.kde \ + "$pkgdir/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" + install -Dm644 electricsheep.xml \ + "$pkgdir/usr/share/xscreensaver/config/electricsheep.xml" + install -Dm755 electricsheep-saver \ + "$pkgdir/usr/bin/electricsheep-saver" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/electricsheep/electricsheep-pref-segfault.patch b/community/electricsheep/electricsheep-pref-segfault.patch new file mode 100644 index 000000000..83bcd8a0f --- /dev/null +++ b/community/electricsheep/electricsheep-pref-segfault.patch @@ -0,0 +1,270 @@ +diff -Naur electricsheep-2.7b12/electricsheep.c electricsheep-2.7~b12+svn20091224/electricsheep.c +--- electricsheep-2.7b12/electricsheep.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep.c 2009-12-24 18:03:01.000000000 -0500 +@@ -564,6 +566,12 @@ + n++; + } + } ++ if (n < 1) { ++ if (debug) { ++ fprintf(logout, "median rank undefined\n"); ++ } ++ return; ++ } + qsort(tms, n, sizeof(int), compare_ints); + if (0 && debug) { + for (i = 0; i < n; i++) +@@ -1915,7 +1923,7 @@ + if (-1 == (decoder_pid = fork())) { + perror("decoder fork"); + } else if (0 == decoder_pid) { +- char *argv[20]; ++ char *argv[25]; + int c = 0; + /* child */ + snprintf(fps, 24, "%g", prefs.frame_rate); +@@ -1934,6 +1942,7 @@ + cleanup_and_exit(1); + } + argv[c++] = "mplayer"; ++ argv[c++] = "-nolirc"; + argv[c++] = "-cache"; + argv[c++] = "8192"; + argv[c++] = "-really-quiet"; +diff -Naur electricsheep-2.7b12/electricsheep.h electricsheep-2.7~b12+svn20091224/electricsheep.h +--- electricsheep-2.7b12/electricsheep.h 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep.h 2009-12-24 18:03:01.000000000 -0500 +@@ -74,4 +74,4 @@ + void init_list_cmd (char *buf); + void get_end_element(void *userData, const char *name); + void character_handler(void *userData, const XML_Char *s, int len); +-char *encry(char *pw); ++char *encry(char *pw, char *nick); +diff -Naur electricsheep-2.7b12/electricsheep-preferences.c electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c +--- electricsheep-2.7b12/electricsheep-preferences.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c 2009-12-24 18:03:01.000000000 -0500 +@@ -108,8 +108,9 @@ + prefs.password = strdup(""); + } else { + char *pw = (char*)gtk_entry_get_text(password_entry); ++ pw = strdup(pw); + if (strcmp(pw, pw_marker)) +- prefs.password = encry(pw); ++ prefs.password = encry(pw, prefs.nick); + } + prefs.video_driver = (char*)gtk_entry_get_text(video_driver_entry); + prefs.frame_rate = gtk_spin_button_get_value(frame_rate_spin); +@@ -207,72 +208,72 @@ + void get_widgets(GladeXML *xml) { + title_label = (GtkLabel *) glade_xml_get_widget(xml, "titleLabel"); + if (NULL == title_label) { +- fprintf(stderr, "titleLabel not found\n"); ++ fprintf(logout, "titleLabel not found\n"); + exit(1); + } + test_label = (GtkLabel *) glade_xml_get_widget(xml, "testLabel"); + if (NULL == test_label) { +- fprintf(stderr, "testLabel not found\n"); ++ fprintf(logout, "testLabel not found\n"); + exit(1); + } + test_button = (GtkButton *) glade_xml_get_widget(xml, "testButton"); + if (NULL == test_button) { +- fprintf(stderr, "testButton not found\n"); ++ fprintf(logout, "testButton not found\n"); + exit(1); + } + nick_entry = (GtkEntry *) glade_xml_get_widget(xml, "nickEntry"); + if (NULL == nick_entry) { +- fprintf(stderr, "nickEntry not found\n"); ++ fprintf(logout, "nickEntry not found\n"); + exit(1); + } + url_entry = (GtkEntry *) glade_xml_get_widget(xml, "urlEntry"); + if (NULL == url_entry) { +- fprintf(stderr, "urlEntry not found\n"); ++ fprintf(logout, "urlEntry not found\n"); + exit(1); + } + password_entry = (GtkEntry *) glade_xml_get_widget(xml, "passEntry"); + if (NULL == password_entry) { +- fprintf(stderr, "passEntry not found\n"); ++ fprintf(logout, "passEntry not found\n"); + exit(1); + } + video_driver_entry = (GtkEntry *) glade_xml_get_widget(xml, "vdEntry"); + if (NULL == video_driver_entry) { +- fprintf(stderr, "vdEntry not found\n"); ++ fprintf(logout, "vdEntry not found\n"); + exit(1); + } + frame_rate_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "frameSpin"); + if (NULL == frame_rate_spin) { +- fprintf(stderr, "frameSpin not found\n"); ++ fprintf(logout, "frameSpin not found\n"); + exit(1); + } + nrepeats_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "repeatSpin"); + if (NULL == nrepeats_spin) { +- fprintf(stderr, "repeatSpin not found\n"); ++ fprintf(logout, "repeatSpin not found\n"); + exit(1); + } + cache_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "cacheSpin"); + if (NULL == cache_spin) { +- fprintf(stderr, "cacheSpin not found\n"); ++ fprintf(logout, "cacheSpin not found\n"); + exit(1); + } + no_animation_check = (GtkCheckButton *) glade_xml_get_widget(xml, "noanimCheck"); + if (NULL == no_animation_check) { +- fprintf(stderr, "noanimCheck not found\n"); ++ fprintf(logout, "noanimCheck not found\n"); + exit(1); + } + standalone_check = (GtkCheckButton *) glade_xml_get_widget(xml, "standaloneCheck"); + if (NULL == standalone_check) { +- fprintf(stderr, "standaloneCheck not found\n"); ++ fprintf(logout, "standaloneCheck not found\n"); + exit(1); + } + hide_errors_check = (GtkCheckButton *) glade_xml_get_widget(xml, "hideCheck"); + if (NULL == hide_errors_check) { +- fprintf(stderr, "hideCheck not found\n"); ++ fprintf(logout, "hideCheck not found\n"); + exit(1); + } + save_frames_check = (GtkCheckButton *) glade_xml_get_widget(xml, "saveCheck"); + if (NULL == save_frames_check) { +- fprintf(stderr, "saveCheck not found\n"); ++ fprintf(logout, "saveCheck not found\n"); + exit(1); + } + } +diff -Naur electricsheep-2.7b12/utils.c electricsheep-2.7~b12+svn20091224/utils.c +--- electricsheep-2.7b12/utils.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/utils.c 2009-12-24 18:03:01.000000000 -0500 +@@ -69,19 +70,23 @@ + } + } + +-char *encry(char *pw) { ++ ++char *encry(char *pw, char *nick) { ++ static char *salt = "sh33p"; + unsigned char digest[16]; + char md5_pw[33]; ++ char *pw_salted = malloc(strlen(pw) + strlen(salt) + strlen(nick) + 1); + int i, j; +- md5_buffer(pw, strlen(pw), digest); ++ sprintf(pw_salted, "%s%s%s", pw, salt, nick); ++ md5_buffer(pw_salted, strlen(pw_salted), digest); + for (i = 0, j = 0; i < sizeof(digest); i++) { + char *hex_digits = "0123456789ABCDEF"; +- + md5_pw[j++] = hex_digits[digest[i] >> 4]; + md5_pw[j++] = hex_digits[digest[i] & 0x0F]; + } + md5_pw[j] = 0; + free(pw); ++ free(pw_salted); + return strdup(md5_pw); + } + +@@ -97,10 +102,11 @@ + free(prefs->url); + prefs->url = strdup(atts[i+1]); + } else if (!strcmp("password", atts[i])) { +- free(prefs->password); +- prefs->password = encry(strdup(atts[i+1])); ++ free(prefs->password); ++ /* assume nick comes before pw in the xml XXX */ ++ prefs->password = encry(strdup(atts[i+1]), prefs->nick); + } else if (!strcmp("password_md5", atts[i])) { +- free(prefs->password); ++ free(prefs->password); + prefs->password = strdup(atts[i+1]); + } else if (!strcmp("video_driver", atts[i])) { + free(prefs->video_driver); +@@ -133,7 +139,7 @@ + } else if (!strcmp("version", atts[i])) { + // nothing to check + } else { +- fprintf(stderr, "ignoring attribute %s\n", atts[i]); ++ fprintf(logout, "ignoring attribute %s\n", atts[i]); + } + i += 2; + } +@@ -146,7 +152,7 @@ + if (argc > 2) + strcpy(rc_file, argv[2]); + else { +- fprintf(stderr, ++ fprintf(logout, + "%s: --preferences option requires a file name argument.\n", + argv[0]); + exit(1); +@@ -155,7 +161,7 @@ + } + hom = getenv("HOME"); + if (!hom) { +- fprintf(stderr, "%s: HOME envar not defined\n", argv[0]); ++ fprintf(logout, "%s: HOME envar not defined\n", argv[0]); + exit(1); + } + snprintf(rc_file, PATH_MAX, "%s/.electricsheep/preferences.xml", hom); +@@ -281,15 +287,15 @@ + + int mysystem(char *cmd, char *msg) { + int n; +- if (0) fprintf(stderr, "subprocess; (%s)\n", cmd); ++ if (0) fprintf(logout, "subprocess; (%s)\n", cmd); + if (0 != (n = interruptable_system(cmd))) { + if (SIGINT != n) { + if (!prefs.hide_errors) +- fprintf(stderr, "subprocess error: %s, %d=%d<<8+%d\n", ++ fprintf(logout, "subprocess error: %s, %d=%d<<8+%d\n", + msg, n, n>>8, n&255); + return 1; + } +- fprintf(stderr, "control-c during %s, exiting\n", msg); ++ fprintf(logout, "control-c during %s, exiting\n", msg); + cleanup_and_exit(1); + } + return 0; +@@ -325,7 +331,7 @@ + int bytes_read; + void *buff = XML_GetBuffer(parser, XML_BUFF_SIZE); + if (buff == NULL) { +- fprintf(stderr, "unable to allocate buffer.\n"); ++ fprintf(logout, "unable to allocate buffer.\n"); + exit(1); + } + +@@ -334,7 +340,7 @@ + break; + + if (! XML_ParseBuffer(parser, bytes_read, bytes_read == 0)) { +- fprintf(stderr, "parse error.\n"); ++ fprintf(logout, "parse error.\n"); + exit(1); + } + } +@@ -441,7 +447,7 @@ + + void init_curl_cmd(int registration) { + +- if (debug) fprintf(stderr, "init_curl_cmd %d\n", registration); ++ if (debug) fprintf(logout, "init_curl_cmd %d\n", registration); + + if (prefs.proxy_name) { + snprintf(curl_cmd, MAXBUF, "nice -n %d curl --location --proxy %s", +@@ -472,7 +478,7 @@ + } + } + server = dream_server; +- if (debug) fprintf(stderr, "curl_cmd = %s\nserver = %s\n", curl_cmd, server); ++ if (debug) fprintf(logout, "curl_cmd = %s\nserver = %s\n", curl_cmd, server); + } + + void init_list_cmd (char *buf) { diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD index fe25715f7..9c1632d33 100644 --- a/community/fceux/PKGBUILD +++ b/community/fceux/PKGBUILD @@ -1,35 +1,45 @@ -# $Id: PKGBUILD 49458 2011-06-16 19:25:29Z angvp $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Jo Christian Bergskås <jcberg@gmail.com> - +# $Id: PKGBUILD 57567 2011-10-30 20:09:10Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Jo Christian BergskÃ¥s <jcberg@gmail.com> pkgname=fceux pkgver=2.1.5 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url="http://fceux.com/web/home.html" -pkgdesc="A fast and ultra-compatible NES/Famicom emulator with SDL, OpenGL and SVGALIB support" +pkgrel=3 +arch=('x86_64' 'i686' 'mips64el') +url="http://fceux.com/" +pkgdesc="Fast and ultra-compatible NES/Famicom emulator" license=('GPL') -depends=('sdl' 'lua' 'gtk2') -makedepends=('scons' 'mesa') -optdepends=('xchm: for viewing the help manual') +depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils') +makedepends=('scons' 'mesa' 'lua') +optdepends=('xchm: for viewing the manual') provides=('fceu' 'gfceux') replaces=('fceu' 'gfceux') -source=(http://downloads.sourceforge.net/fceultra/$pkgname-${pkgver}.src.tar.bz2 \ - fceux.desktop fceux.png) +install=fceux.install +source=("http://downloads.sourceforge.net/fceultra/$pkgname-$pkgver.src.tar.bz2" + "fceux.desktop" + "fceux.png") +md5sums=('e8b20e62bbbb061b1a59d51b47c827bd' + '3c6a259d88825ff1b9387d191a6c970e' + '3fe753731ac46b5fee528b1f73abd3e3') build() { - cd "${srcdir}/fceu$pkgver" - scons + cd "$srcdir/fceu${pkgver}" - sed -i "s|/usr/local|${pkgdir}/usr|" SConstruct - scons install + sed -i "s|/usr/local|$pkgdir/usr|" SConstruct + scons OPENGL=0 install +} - install -D -m644 bin/$pkgname.chm "${pkgdir}/usr/share/doc/$pkgname/$pkgname.chm" - install -D -m644 "$srcdir"/fceux.desktop "${pkgdir}"/usr/share/applications/fceux.desktop - install -D -m644 "$srcdir"/fceux.png "$pkgdir"/usr/share/pixmaps/fceux.png +package() { + cd "$srcdir/fceu${pkgver}" + + install -Dm644 bin/$pkgname.chm \ + "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm" + install -Dm644 $srcdir/fceux.desktop \ + "$pkgdir/usr/share/applications/fceux.desktop" + install -Dm644 $srcdir/fceux.png \ + "$pkgdir/usr/share/pixmaps/fceux.png" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: -md5sums=('e8b20e62bbbb061b1a59d51b47c827bd' - '30baf915c936926fa50f59d8276f6575' - '3fe753731ac46b5fee528b1f73abd3e3') diff --git a/community/fceux/fceux.desktop b/community/fceux/fceux.desktop new file mode 100644 index 000000000..c20271a77 --- /dev/null +++ b/community/fceux/fceux.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Fceux +GenericName=NES/Famicom emulator +Exec=fceux +Icon=fceux +Type=Application +Categories=Game;Emulator; +Encoding=UTF-8 +MimeType=application/x-nes;application/x-nes-rom diff --git a/community/fceux/fceux.install b/community/fceux/fceux.install new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/community/fceux/fceux.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fceux/fceux.png b/community/fceux/fceux.png Binary files differnew file mode 100644 index 000000000..1cf27b1fd --- /dev/null +++ b/community/fceux/fceux.png diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index 049eb0cda..269f3b872 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 58395 2011-11-12 17:16:59Z ibiru $ +# $Id: PKGBUILD 62853 2012-01-27 19:43:55Z arodseth $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> - +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ffmpeg2theora pkgver=0.28 -pkgrel=2 -pkgdesc="A simple converter to create Ogg Theora files" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3 +pkgdesc="Simple converter to create Ogg Theora files" +arch=('x86_64' 'i686' 'mips64el') url="http://www.v2v.cc/~j/ffmpeg2theora/" license=('GPL3') depends=('ffmpeg') -makedepends=('pkgconfig' 'scons') -changelog=$pkgname.changelog -source=(http://www.v2v.cc/~j/${pkgname}/downloads/${pkgname}-${pkgver}.tar.bz2) +makedepends=('pkgconfig' 'scons') # 'libkate') +source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2") sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's:pp_mode_t:pp_mode:' src/ffmpeg2theora.c + sed -i 's:pp_context_t:pp_context:' src/ffmpeg2theora.c scons } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man" + cd "$srcdir/$pkgname-$pkgver" + + scons install destdir="$pkgdir" prefix="/usr" mandir="PREFIX/share/man" } + +# vim:set ts=2 sw=2 et: diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index a2f839ed6..67a1fa216 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,45 +1,38 @@ -# $Id: PKGBUILD 58815 2011-11-18 15:51:12Z spupykin $ +# $Id: PKGBUILD 62525 2012-01-20 17:49:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=freemat -pkgver=4.0 -pkgrel=5 +pkgver=4.1 +pkgrel=1 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64' 'mips64el') url="http://freemat.sourceforge.net" license=('GPL') -depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio') -makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake') +depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi') +makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2') install=freemat.install source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz - freemat-gcc-4.3.0.patch - freemat-gcc-4.5.0.patch - freemat-qt46.patch - input-fix.patch) -md5sums=('adb58b9f2c508d9ae5b6041da2f75baf' - '3dc3848949183de2664c2cf67663c892' - 'a3edb7b51057a90a752aff5053f8eed6' - 'a8d2ffa9319eccaedb28a10f9c7617f4' - 'a78941563453feaca5c7463eaeea1a70') + build-fix.patch) +md5sums=('929d31e2310feaff5d380fc2f7b4d1a2' + '2d11a28aa2a7df89c4618ed1c4be5973') build() { - cd $srcdir/FreeMat-$pkgver.1-Source + cd $srcdir/FreeMat-$pkgver-Source - if [ $NOEXTRACT -ne 1 ]; then - patch -p1 <$srcdir/freemat-gcc-4.5.0.patch - patch -p1 <$srcdir/input-fix.patch - patch -p1 <$srcdir/freemat-qt46.patch - patch -p1 CMakeCache.txt <<EOF -23c23,25 -< CMAKE_CACHEFILE_DIR:INTERNAL=/home/basu/dev/branches/FreeMat4 ---- -> #CMAKE_CACHEFILE_DIR:INTERNAL=/home/basu/dev/branches/FreeMat4 -> USE_LLVM:BOOL=OFF -> CMAKE_INSTALL_PREFIX:PATH=/usr -EOF - cmake `pwd` - fi + rm -f CMakeCache.txt + find . -type f -name '*.moc.cpp' -exec rm -f {} \; + find . -type f -name 'add.so' -exec rm -f {} \; + patch -p1 <$srcdir/build-fix.patch + echo >libs/libMatC/CJitFuncClang.hpp + echo >libs/libMatC/CJitFuncClang.cpp + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_LLVM=OFF \ + -DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + . make make DESTDIR=$pkgdir install sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install diff --git a/community/freemat/build-fix.patch b/community/freemat/build-fix.patch new file mode 100644 index 000000000..c1ea63088 --- /dev/null +++ b/community/freemat/build-fix.patch @@ -0,0 +1,11 @@ +diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp +--- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp 2011-11-27 04:27:43.000000000 +0400 ++++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp 2012-01-20 19:07:48.000000000 +0400 +@@ -20,6 +20,7 @@ + #include <qimage.h> + #include <qpainter.h> + #include <QtOpenGL> ++#include <GL/glu.h> + #include <math.h> + #include "IEEEFP.hpp" + diff --git a/community/freemat/freemat.install b/community/freemat/freemat.install index e319f1a24..051cca866 100644 --- a/community/freemat/freemat.install +++ b/community/freemat/freemat.install @@ -1,7 +1,7 @@ post_install() { - echo "-- Use FreeMat -i /usr/share/FreeMat-4.0/ to adjust docs location" + echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location" } post_upgrade() { - echo "-- Use FreeMat -i /usr/share/FreeMat-4.0/ to adjust docs location" + echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location" } diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD index 1b7db8aaf..918eb548b 100644 --- a/community/gkrellm/PKGBUILD +++ b/community/gkrellm/PKGBUILD @@ -1,25 +1,37 @@ -# $Id: PKGBUILD 31931 2010-11-07 23:10:53Z lcarlier $ +# $Id: PKGBUILD 62784 2012-01-26 17:53:09Z arodseth $ +# Maintainer: dorphell <dorphell@archlinux.org> # Contributor: Matt Smith (Majik) <darkknight@helpdesk.zaz.net> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Maintainer: dorphell <dorphell@archlinux.org> - +# Contributor: Jozef Riha <jose1711@gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=gkrellm pkgver=2.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="System monitor package for GTK2" arch=('i686' 'x86_64' 'mips64el') url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html" license=('GPL3') -depends=('gtk2' 'openssl' 'libsm' 'lm_sensors') +depends=('gtk2' 'libsm' 'lm_sensors') makedepends=('gettext') backup=('etc/gkrellmd.conf') -source=(http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('e43a9416a6975e3be63d591bdeb33b04') +source=("http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2" + "gkrellmd") +sha256sums=('702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b' + 'c6d532dd7a706891aed92d750bceda74d4618e86ad82feadc0503214de904360') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make LOCALEDIR=/usr/share/locale - make DESTDIR=${pkgdir} PREFIX=/usr install - install -D -m644 "${srcdir}/${pkgname}-${pkgver}/server/gkrellmd.conf" "${pkgdir}/etc/gkrellmd.conf" } + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" PREFIX=/usr install + install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf" + install -Dm755 "../gkrellmd" "$pkgdir/etc/rc.d/gkrellmd" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gkrellm/gkrellmd b/community/gkrellm/gkrellmd new file mode 100644 index 000000000..1f255e755 --- /dev/null +++ b/community/gkrellm/gkrellmd @@ -0,0 +1,40 @@ +#!/bin/bash + +# source application-specific settings +GKRELLMD_ARGS='-d' + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/gkrellmd) +case "$1" in + start) + stat_busy "Starting GKrellM Daemon" + [ -z "$PID" ] && /usr/bin/gkrellmd ${GKRELLMD_ARGS} + PID=$(pidof -o %PPID /usr/bin/gkrellmd) + if [ -z "$PID" ]; then + stat_fail + else + add_daemon gkrellmd + stat_done + fi + ;; + stop) + stat_busy "Stopping GKrellM Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon gkrellmd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD new file mode 100644 index 000000000..e3a60bdb9 --- /dev/null +++ b/community/haveged/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> +# Contributor: kfgz <kfgz at interia dot pl> +# Contributor: pootzko <pootzko at gmail dot com> + +pkgname=haveged +pkgver=1.3a +pkgrel=1 +pkgdesc="A simple entropy daemon." +arch=('i686' 'x86_64') +url="http://www.issihosts.com/haveged" +license=('GPL') +depends=('bash') +source=(${url}/${pkgname}-${pkgver}.tar.gz + haveged) +md5sums=('dad8b95c6eafcec7eb42eb8454e60a0d' + '264b725be5271288b40f363d7cfc6b68') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver/a/} + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver/a/} + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/etc/init.d + + cd "${srcdir}" + install -D -m755 haveged "${pkgdir}"/etc/rc.d/haveged +} diff --git a/community/haveged/haveged b/community/haveged/haveged new file mode 100644 index 000000000..c0e13b40d --- /dev/null +++ b/community/haveged/haveged @@ -0,0 +1,44 @@ +#!/bin/bash +## +# chkconfig: 2345 75 25 +# description: havege entropy daemon +# +# source function library +. /etc/rc.conf +. /etc/rc.d/functions + +RETVAL=0 +prog="haveged" + +case "$1" in +start) + stat_busy $"Starting $prog" + /usr/sbin/$prog -w 1024 -v 1 + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $prog + stat_done + fi + ;; + +stop) + stat_busy $"Stopping $prog" + kill `cat /var/run/$prog.pid` + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $prog + stat_done + rm -f /var/lock/$prog + fi + ;; + +restart) + $0 stop + $0 start + ;; + +*) + echo "usage: $prog [start|stop|restart]" +esac diff --git a/community/i7z/PKGBUILD b/community/i7z/PKGBUILD new file mode 100644 index 000000000..f573fc123 --- /dev/null +++ b/community/i7z/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Nathan O <ndowens.aur at gmail dot com> + +pkgname=i7z +pkgver=0.27.1 +pkgrel=1 +pkgdesc="A better i7 (and now i3, i5) reporting tool for Linux" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('ncurses') +makedepends=('qt') +optdepends=('qt: for i7z-gui') +url="http://code.google.com/p/i7z/" +source=("http://i7z.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('4408e0e39b195b8fe6383cadc971a862') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + make + + cd GUI + qmake + make clean + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + install -Dm 755 i7z ${pkgdir}/usr/bin/i7z + install -Dm 755 GUI/i7z_GUI ${pkgdir}/usr/bin/i7z-gui +} diff --git a/community/ldns/Makefile.patch b/community/ldns/Makefile.patch new file mode 100644 index 000000000..d98291ac9 --- /dev/null +++ b/community/ldns/Makefile.patch @@ -0,0 +1,20 @@ +--- old/Makefile.in 2012-01-12 00:11:36.000000000 +1100 ++++ new/Makefile.in 2012-01-27 11:36:16.110154453 +1100 +@@ -130,7 +130,7 @@ + exit -1 ; \ + fi + drill/drill: $(DRILL_LOBJS) $(LIB) +- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill ++ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill + + install-drill: drill/drill + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) +@@ -157,7 +157,7 @@ + exit -1 ; \ + fi + $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB) +- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ ++ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ + + $(TESTNS): $(TESTNS_LOBJS) $(LIB) + $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD index 49febb4d2..46d7e1f5f 100644 --- a/community/ldns/PKGBUILD +++ b/community/ldns/PKGBUILD @@ -1,39 +1,38 @@ -# $Id: PKGBUILD 56190 2011-10-03 10:19:02Z bisson $ - +# $Id: PKGBUILD 62792 2012-01-27 01:01:36Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: jiribb <jiribb@gmail.com> and <mathieui> <mathieui@mathieui.net> # Contributor: mathieui <mathieui@mathieui.net> +# Contributor: jiribb <jiribb@gmail.com> pkgname=ldns -pkgver=1.6.11 +pkgver=1.6.12 pkgrel=1 -pkgdesc='Fast DNS library with DNSSEC support, including tools such as Drill' -arch=('i686' 'x86_64' 'mips64el') +pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools' url='http://www.nlnetlabs.nl/projects/ldns/' license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') +options=('!libtool') depends=('openssl') makedepends=('libpcap') optdepends=('libpcap: ldns-dpa tool') -options=('!libtool') -source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('2c4537eee39a1af63e8dde4f35498ce78c968c1f') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'Makefile.patch') +sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa' + '01bce260e9639d9cd26109a689dddf2498e5026a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - _conf='--prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-static=no --disable-rpath' - _tmp="$(mktemp -d)" + patch -p1 -i ../Makefile.patch - ./configure ${_conf} - make - make DESTDIR="${_tmp}" install + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --disable-rpath \ + --with-drill \ + --with-examples \ - cd drill - ./configure ${_conf} --with-ldns="${_tmp}" - make - - cd ../examples - ./configure ${_conf} --with-ldns="${_tmp}" make } @@ -41,11 +40,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - cd drill - make DESTDIR="${pkgdir}" install - cd ../examples - make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD index 2f14f4bf6..004c8d6fa 100644 --- a/community/libalkimia/PKGBUILD +++ b/community/libalkimia/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 58105 2011-11-06 17:14:04Z lcarlier $ +# $Id: PKGBUILD 62859 2012-01-27 20:47:22Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: gumper <gumper1034@gmail.com> pkgname=libalkimia -pkgver=4.3.1 -pkgrel=2 +pkgver=4.3.2 +pkgrel=1 pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC." depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') @@ -11,7 +12,7 @@ url=('http://kde-apps.org/content/show.php/libalkimia?content=137323') license=('LGPL') arch=('i686' 'x86_64') source=("http://kde-apps.org/CONTENT/content-files/137323-libalkimia-$pkgver.tar.bz2") -md5sums=('73d7f1365118019030b2045d95c92456') +md5sums=('8d7b529c7be5f72ae1cbb02e818e9b79') build() { cd "${srcdir}" @@ -21,7 +22,7 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=DebugFull \ + -DCMAKE_BUILD_TYPE=Release \ -Wno-dev make } diff --git a/community/libbsd/LICENSE b/community/libbsd/LICENSE new file mode 100644 index 000000000..7dcbfc2ba --- /dev/null +++ b/community/libbsd/LICENSE @@ -0,0 +1,28 @@ +/*- + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ diff --git a/community/libbsd/PKGBUILD b/community/libbsd/PKGBUILD new file mode 100644 index 000000000..23bb96d5a --- /dev/null +++ b/community/libbsd/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> + +pkgname=libbsd +pkgver=0.3.0 +pkgrel=1 +pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" +arch=('i686' 'x86_64') +url="http://libbsd.freedesktop.org" +license=('custom') +depends=('glibc') +source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz + LICENSE) +md5sums=('833e58531b4bd84b119b53d834d8e0d8' + '5bd59ff83a7df4873b034478ffae62a6') + +build() { + cd $srcdir/$pkgname-$pkgver + + make exec_prefix=/usr includedir=/usr/include/libbsd +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make exec_prefix=/usr includedir=/usr/include/libbsd DESTDIR=$pkgdir install + install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD new file mode 100644 index 000000000..dec3ed023 --- /dev/null +++ b/community/libee/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 62738 2012-01-25 15:37:48Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Brian Knox <taotetek@gmail.com> + +pkgname=libee +pkgver=0.3.1 +pkgrel=3 +pkgdesc="event expression library inspired by CEE" +url="http://www.libee.org/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('libestr') +makedepends=() +optdepends=() +options=(!libtool) +source=("http://www.libee.org/files/download/libee-$pkgver.tar.gz") +md5sums=('61403a9a62b984381cf48454664f915e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make -j1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD new file mode 100644 index 000000000..adb612d56 --- /dev/null +++ b/community/libestr/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 62740 2012-01-25 15:38:28Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Brian Knox <taotetek@gmail.com> + +pkgname=libestr +pkgver=0.1.2 +pkgrel=2 +pkgdesc="essentials for string handling (and a bit more)" +url="http://libestr.adiscon.com/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=() +options=(!libtool) +source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz") +md5sums=('30ec4054155dc7d7e9b06418181c4f12') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD index a982b3970..1ed0c439f 100644 --- a/community/libfaketime/PKGBUILD +++ b/community/libfaketime/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 47438 2011-05-23 06:26:34Z lfleischer $ +# $Id: PKGBUILD 62627 2012-01-22 21:34:26Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Dan Serban # Contributor: Ross Melin <rdmelin@gmail.com> pkgname=libfaketime -pkgver=0.8.1 +pkgver=0.9.1 pkgrel=1 pkgdesc='Report fake dates and times to programs without having to change the system-wide time.' arch=('i686' 'x86_64' 'mips64el') url='http://www.code-wizards.com/projects/libfaketime/' license=('GPL2') -source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('113d75d73e39f0f5022dc7385628d57c') +source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'libfaketime-0.9.1-fix-as-needed.patch' + 'libfaketime-0.9.1-fix-README-NEWS.patch') +md5sums=('ce3f996dfd5826b4ac62f1a7cc36ea27' + '90873e4df35283463ef54b159c318686' + 'b1b641a8e2298aa1646982e3bde96117') build() { cd "${pkgname}-${pkgver}" + + patch -p1 -i ../libfaketime-0.9.1-fix-as-needed.patch + patch -p1 -i ../libfaketime-0.9.1-fix-README-NEWS.patch + make } diff --git a/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch b/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch new file mode 100644 index 000000000..3d47c5404 --- /dev/null +++ b/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch @@ -0,0 +1,29 @@ +From c0c19a71c5481f3082afee2ac7962bd7abfcf134 Mon Sep 17 00:00:00 2001 +From: Lukas Fleischer <info@cryptocrack.de> +Date: Sun, 22 Jan 2012 22:19:50 +0100 +Subject: [PATCH] Makefile: Fix installation of "README" and "NEWS" + +Initialize "INSTALL" in the top-level Makefile in order to avoid broken +install(1) invocations such as: + + dm0755 "/build/pkg/usr/share/doc/faketime/" + /bin/sh: dm0755: command not found + +Signed-off-by: Lukas Fleischer <info@cryptocrack.de> +--- + Makefile | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/Makefile b/Makefile +index f90e18e..d0225ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,3 +1,5 @@ ++INSTALL = install ++ + all: + $(MAKE) -C src all + $(MAKE) -C test all +-- +1.7.8.4 + diff --git a/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch b/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch new file mode 100644 index 000000000..870349145 --- /dev/null +++ b/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch @@ -0,0 +1,39 @@ +From f0ee2ee1e0a2fa5f11614a55ab8543380faa9695 Mon Sep 17 00:00:00 2001 +From: Lukas Fleischer <info@cryptocrack.de> +Date: Sun, 22 Jan 2012 21:47:52 +0100 +Subject: [PATCH] Fix linking with "-Wl,--as-needed" + +Reorder linker flags in order to ensure proper linking when using +"--Wl,--as-needed". Read http://www.gentoo.org/proj/en/qa/asneeded.xml, +especially "Importance of linking order" for details: + + Basically, what the linker does is look for the symbols missing in a + given file (either an object file, a static archive or a library) + only in the files coming after it. When using the normal linking, + without --as-needed, this is not a problem, although there might be + some internal drawbacks on the linking stage, the files are linked + together without considering ordering. But with the flag, the + libraries that aren't used for resolving symbols are discarded and + thus not linked. + +Signed-off-by: Lukas Fleischer <info@cryptocrack.de> +--- + src/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 9118815..d4a04b5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -69,7 +69,7 @@ ${OBJ}: faketime.c + ${CC} -o $@ -c ${CFLAGS} ${EXTRA_FLAGS} $< + + lib%.so.${SONAME}: %.o +- ${CC} -o $@ -Wl,-soname,$@ ${LDFLAGS} $< ++ ${CC} -o $@ -Wl,-soname,$@ $< ${LDFLAGS} + + clean: + @rm -f ${OBJ} ${LIBS} +-- +1.7.8.4 + diff --git a/community/libircclient/PKGBUILD b/community/libircclient/PKGBUILD index 50e1c02a8..72a698e73 100644 --- a/community/libircclient/PKGBUILD +++ b/community/libircclient/PKGBUILD @@ -1,20 +1,18 @@ # Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> -# Contributor: SpepS <dreamspepser at yahoo dot it> +# Maintainer: SpepS <dreamspepser at yahoo dot it> # Contributor: Marcel Wysocki <maci@satgnu.net> # Contributor: coolkehon <coolkehon at g m a i l> pkgname=libircclient -pkgver=1.3 -pkgrel=5 +pkgver=1.6 +pkgrel=1 pkgdesc="A small but powerful library, which implements client-server IRC protocol." arch=('i686' 'x86_64') -url="http://libircclient.sf.net" +url="http://www.ulduzsoft.com/libircclient/" depends=('glibc') -license=("GPL2") -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "shared.patch") -md5sums=('b0e80d1d6b0c1cc61660fb9d2350b32d' - 'f2c350d140bd522990c15162645c72f0') +license=('GPL') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('eb6a2c4e91862cc10de3b13b198cfa23') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,15 +20,36 @@ build() { # add fPIC flag for x86_64 [ "$CARCH" = x86_64 ] && export CFLAGS="$CFLAGS -fPIC" - # shared and path patch - patch -p1 -i ../shared.patch + ## Makefile.in fixes: + # invalid `lib` requisite for `install` target + # install shared lib instead of static + # headers in /usr/include/$pkgname + sed -e "/install/s/lib/all/" \ + -e "/DESTDIR/s/\.a/\.so/g" \ + -e "s/@\/include/&\/$pkgname/" \ + -i src/Makefile.in - ./configure --prefix=/usr - cd src && make CFLAGS="$CFLAGS" + ./configure --prefix=/usr \ + --enable-shared + + cd src && make CFLAGS="$CFLAGS" } package() { cd "$srcdir/$pkgname-$pkgver/src" make DESTDIR="$pkgdir/" install + + # doc + install -d "$pkgdir/usr/share/doc/$pkgname" + cp -a ../doc/{html,rfc1459.txt} \ + "$pkgdir/usr/share/doc/$pkgname" + + # man + cp -a ../doc/man "$pkgdir/usr/share" + + # examples (optional) + install -d "$pkgdir/usr/share/$pkgname/examples" + install -Dm644 ../examples/* \ + "$pkgdir/usr/share/$pkgname/examples" } diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 37f165f92..d7ca5a4be 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59260 2011-11-22 06:42:34Z spupykin $ +# $Id: PKGBUILD 62677 2012-01-24 12:51:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.17 +pkgver=0.9.18 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('d6802049c806e903ef1fa9c5b847e555') +md5sums=('af0f282b92413f414cb6daf2d2f618c7') build() { cd ${pkgname}-${pkgver} diff --git a/community/libvisual-projectm/PKGBUILD b/community/libvisual-projectm/PKGBUILD index da278241b..976b3cbff 100644 --- a/community/libvisual-projectm/PKGBUILD +++ b/community/libvisual-projectm/PKGBUILD @@ -1,26 +1,36 @@ -# $Id: PKGBUILD 61634 2009-12-20 18:27:47Z andrea $ +# $Id: PKGBUILD 62640 2012-01-23 02:32:15Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libvisual-projectm pkgver=2.0.1 -pkgrel=1 -pkgdesc="ProjectM XMMS plugin" +pkgrel=3 +pkgdesc='ProjectM XMMS plugin.' arch=('i686' 'x86_64' 'mips64el') -url="http://projectm.sourceforge.net/" +url='http://projectm.sourceforge.net/' license=('GPL') depends=('projectm>=2.0.1' 'libvisual' 'sdl') makedepends=('pkgconfig' 'cmake' 'libxext') options=('!libtool') -source=(http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz) -md5sums=('35e09b09210d48b437e3574bd00b15a8') +source=("http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz" + 'libvisual-projectm-gcc-4.6.patch') +md5sums=('35e09b09210d48b437e3574bd00b15a8' + 'a1fa2fd4fc85b1f27e32d400e17a3196') build() { - cd ${srcdir} - mkdir build - cd build - cmake ../projectM_libvisual-${pkgver}-Source \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release || return 1 - make || return - make DESTDIR=${pkgdir} install || return + cd "${srcdir}" + + # fix build failure with GCC 4.6 (taken from SVN, revision 1355) + (cd "projectM_libvisual-${pkgver}-Source" && patch -p3 -i ../libvisual-projectm-gcc-4.6.patch) + + mkdir build && cd build + + cmake "../projectM_libvisual-${pkgver}-Source" \ + -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } diff --git a/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch new file mode 100644 index 000000000..0e1234f83 --- /dev/null +++ b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch @@ -0,0 +1,11 @@ +--- trunk/src/projectM-libvisual/actor_projectM.cpp 2009/02/20 19:07:44 1210 ++++ trunk/src/projectM-libvisual/actor_projectM.cpp 2011/05/06 12:04:58 1355 +@@ -209,7 +209,7 @@ + * we aren't with projectm, so just ignore :) */ + extern "C" VisPalette *lv_projectm_palette (VisPluginData *plugin) + { +- return NULL; ++ return (VisPalette *) NULL; + } + + /* This is where the real rendering happens! This function is what we call, many times diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index 2ffa1c59a..a49e2aa10 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=lightspark -pkgver=0.5.3 -pkgrel=2 +pkgver=0.5.4 +pkgrel=1 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://lightspark.sourceforge.net' @@ -15,12 +15,12 @@ optdepends=('gnash-gtk: fallback support') install="lightspark.install" source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" 'llvm29.diff') -md5sums=('2d4519c61aabc34cbba97120f5c01d18' +md5sums=('1101e1d1cb1b55b84b9214ef02217ec3' '5f717d1d9ead478184ca68f6ac068099') build() { - cd lightspark-${pkgver} - patch -Np0 -i ${srcdir}/llvm29.diff + #cd lightspark-${pkgver} + #patch -Np0 -i ${srcdir}/llvm29.diff cd ${srcdir} rm -rf build diff --git a/community/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD index fe902bd15..3efdf75d6 100644 --- a/community/linuxtv-dvb-apps/PKGBUILD +++ b/community/linuxtv-dvb-apps/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 58911 2011-11-20 05:15:40Z jconder $ +# $Id: PKGBUILD 62806 2012-01-27 05:32:06Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> pkgname=linuxtv-dvb-apps -pkgver=1452 +pkgver=1465 pkgrel=1 -_hgrev=d4e8bf5658ce +_hgrev=69fc03702a64 pkgdesc='Viewer programs for DVB cards' arch=('i686' 'x86_64' 'mips64el') url='http://www.linuxtv.org/' license=('GPL') source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2") -sha256sums=('c3bb865ea5c8dd97050d7b3a68ee158dadff50a2fb948d955b3a559be3cf31c5') +sha256sums=('4c32fd895d826254779f1020f69a1978ea3c0130440f82f7b18e2d8e5378804a') build() { cd "dvb-apps-$_hgrev" diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog new file mode 100644 index 000000000..a3097076c --- /dev/null +++ b/community/mednafen/ChangeLog @@ -0,0 +1,6 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Updated to 0.8.D.3 + * Removed fix_build patch + * Cleaned PKGBUILD + * Adding ChangeLog + diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD new file mode 100755 index 000000000..88e469afc --- /dev/null +++ b/community/mednafen/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> +# Contributor: kagan <juanynie@mi.madritel.es> +pkgname=mednafen +pkgver=0.8.D.3 +pkgrel=1 +pkgdesc="A command-line multi-system gaming emulator" +url="http://mednafen.sourceforge.net/" +license=(GPL) +arch=('i686' 'x86_64') +depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') +makedepends=('pkgconfig' 'mesa') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2) +md5sums=('57d22805071becd81858b0c088a275e5') + +build() { + cd $srcdir/$pkgname + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname + make DESTDIR=$pkgdir install +} diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index a1f316dc2..265ddeed9 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62066 2012-01-15 14:56:57Z svenstaro $ +# $Id: PKGBUILD 62705 2012-01-24 21:51:26Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.6.0.2 +pkgver=3.6.0.3 pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' ' 'libircclient' 'miniupnpc' 'wxgtk') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('9d840a04b41aef2cba503de7bf433b8d') +md5sums=('e939cbbb85c35e66c67ec2aa6f6b7f0b') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index 289ae5564..9c3ca8400 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 59154 2011-11-21 12:39:37Z spupykin $ +# $Id: PKGBUILD 62679 2012-01-24 12:52:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="Teredo client and server." arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2 miredo.install miredo.rc.d miredo-server.rc.d) -md5sums=('6ba484ad5e331514a8a3452da2b144e7' +md5sums=('1281e7e75bddbde244cd778d99fa22d4' '51ab6d091192605ee9206944869cb2ab' 'd1b655d7a851cdb46c91c3418ed1962f' 'c5a9be5c3175fecec387f1710bfd2788' diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 2097c4310..8dbcc7b9a 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48174 2011-05-29 12:47:11Z jconder $ +# $Id: PKGBUILD 62800 2012-01-27 02:41:18Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -14,21 +14,21 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -pkgver=0.24.1 -pkgrel=4 +pkgver=0.24.2 +pkgrel=2 epoch=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.mythtv.org" license=('GPL') makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libcdaudio' 'libexif' 'libvisual' 'libvorbis' 'mplayer' 'mythtv' - 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' - 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' - 'perl-xml-xpath' 'python2-oauth' 'python-imaging' 'python-pycurl' - 'sdl' 'taglib' 'zlib') + 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' + 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' + 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging' + 'python-pycurl' 'sdl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" 'mtd.rc') -md5sums=('76aeefeff70b550b2d35c2d9d751df18' +md5sums=('471836d48657afc488d560aee624931e' '476c12ba074794ad7f4ae092bdf949d6') build() { @@ -112,9 +112,9 @@ package_mythplugins-mythvideo() { package_mythplugins-mythweather() { pkgdesc="Weather checking plugin for MythTV" - depends=('mythtv' 'perl-date-manip' 'perl-libwww' - 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' - 'perl-image-size' 'perl-datetime-format-iso8601') + depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-libwww' 'perl-soap-lite' + 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size' + 'perl-datetime-format-iso8601') cd "$srcdir/$pkgbase-$pkgver/mythweather" make INSTALL_ROOT="$pkgdir" install diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 3c0a58764..4fae3d925 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61085 2011-12-21 20:51:44Z andrea $ +# $Id: PKGBUILD 62798 2012-01-27 02:10:36Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.24.1 -pkgrel=4 +pkgver=0.24.2 +pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64' 'mips64el') @@ -15,30 +15,23 @@ url="http://www.mythtv.org/" license=('GPL') depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' 'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients' - 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' - 'python-lxml' 'wget' 'qtwebkit') + 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' + 'python-lxml' 'wget' 'qtwebkit') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' - 'mythbackend.conf' - 'mythtv-v4l2-fix.patch' - 'build.patch') -md5sums=('6870c679619ec58456e76839745411d8' + 'mythbackend.conf') +md5sums=('7259fd24560da77da90b1494492f9550' 'feadcc9ad064d93d6dceab1efc0bd9ed' - 'bb8e4033d82428d827570fae9ba15e6a' - 'ba5c91df80f0d3f7563a873e71a3725c' - '3188962917e98c4e07818dccd64bc423') + 'bb8e4033d82428d827570fae9ba15e6a') build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch - patch -Np1 -i ${srcdir}/build.patch - ARCH="${CARCH/_/-}" ./configure --prefix=/usr --cpu="$ARCH" \ --enable-mmx \ diff --git a/community/nestopia/ChangeLog b/community/nestopia/ChangeLog new file mode 100644 index 000000000..5077d00b2 --- /dev/null +++ b/community/nestopia/ChangeLog @@ -0,0 +1,12 @@ +2008-12-16 Tiago Pierezan Camargo <tcamargo@gmail.com> + + * PKGBUILD: Minor corrections. + +2008-12-04 Tiago Pierezan Camargo <tcamargo@gmail.com> + + * PKGBUILD (source): Package adopted. + Variable/version cleanup. + Patch to remove bogus error messages on program exit. + New dependency: mesa. + Renamed executable to nestopia. + diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD new file mode 100644 index 000000000..0cff030f3 --- /dev/null +++ b/community/nestopia/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> +# Contributor: robb_force <robb_force@holybuffalo.net> + +pkgname=nestopia +pkgver=1.40h +pkgrel=4 +pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' +url='http://rbelmont.mameworld.info/?page_id=200' +license=('GPL') +arch=('i686' 'x86_64') +depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa') +makedepends=('unzip') +# rbelmont.mameworld.info blocks some user-agents +DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') +source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip" + "http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip" + "nestopia" + "nestopia_bogus_error_on_save_settings.patch") +md5sums=('526c99a06d2b257135e7047b0ed95ae0' + 'f9a9a905bada67e11dac1364612d0b35' + 'abc2f030dd291f58d65c9095ef024225' + '0160078c9afcbb1a6ac389c3989929f7') + +build() { + cd ${srcdir} + # remove a bogus error message on exit + patch -p0 < nestopia_bogus_error_on_save_settings.patch + make -j1 + + # Install the nestopia script that copies required files to ~/.nestopia + install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname} + + # Older releases used a .sh file. Make a symlink to make everyone happy + cd ${pkgdir}/usr/bin + ln -s ${pkgname} ${pkgname}.sh + + # Install the required files and executable in /usr/share + cd ${srcdir} + install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin + install -dm775 ${pkgdir}/usr/share/${pkgname}/ + install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/ + install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/ +} diff --git a/community/nestopia/nestopia b/community/nestopia/nestopia new file mode 100644 index 000000000..52bd2b2b3 --- /dev/null +++ b/community/nestopia/nestopia @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ ! -e $HOME/.nestopia ]; then + echo "Running NEStopia for the first time..." + echo "Copying required files to ~/.nestopia..." + mkdir $HOME/.nestopia + cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/ +fi + +nestopia-bin "$@" diff --git a/community/nestopia/nestopia_bogus_error_on_save_settings.patch b/community/nestopia/nestopia_bogus_error_on_save_settings.patch new file mode 100644 index 000000000..63f33bc72 --- /dev/null +++ b/community/nestopia/nestopia_bogus_error_on_save_settings.patch @@ -0,0 +1,11 @@ +--- source/linux/settings.cpp.old 2008-10-23 05:45:58.000000000 +0200 ++++ source/linux/settings.cpp 2008-12-04 23:17:59.000000000 +0100 +@@ -16,7 +16,7 @@ + using namespace LinuxNst; + + #define READ_SETTING(x) fread(&x, sizeof(x), 1, f) +-#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n" ++#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n" + + static int rates[4] = { 11025, 22050, 44100, 48000 }; + diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index a21312c36..b772e44c0 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.7 +pkgver=0.6.9 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -17,16 +17,20 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('e7b238356ea7fb230b956010931ca468') +md5sums=('c2d2aee123a141ba8431855f1d9c8200') build() { cd node-v${pkgver} msg 'fixing for python2 name' - find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -i {} \; + find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -e "s_'python'_'python2'_" -i {} \; + find test -type f -exec sed -e "s|python |python2 |" -i {} \; sed -i "s|cmd_R = 'python |cmd_R = 'python2 |" wscript sed -i "s|python |python2 |" Makefile find test -type f -exec sed -e 's/python/&2/' -i {} \; + sed -i "s/python/&2/" configure + + export PYTHON=python2 ./configure \ --prefix=/usr diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index 5be5138ce..87a7a8f21 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61569 2012-01-03 12:06:41Z spupykin $ +# $Id: PKGBUILD 62772 2012-01-26 14:44:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2011.12.20 _pkgsubver=562307 -pkgrel=1 +pkgrel=2 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" @@ -29,7 +29,7 @@ md5sums=('529c15cb6cfa2972a96664c504dee560' '199508b0d3fe6fa9b726d09170bf51f1' '8c333a979578bdc0c3134c1dd6bb7353' '79b0a14d86191fee70a4639da8bd7785' - '136ff53d0d3a303d09266a407fd2d215' + '67cb83a9e5a4dd016c1a1da2863ca36d' 'b55d15e2c4be396aad709aeca91033d3' '73cc1a2665b0dd62427733d62ead8b9a' '75a25d83417e683957321f97a00f8465') diff --git a/community/open-vm-tools/open-vm-tools.rc.d b/community/open-vm-tools/open-vm-tools.rc.d index 555fa1535..0c9221489 100644 --- a/community/open-vm-tools/open-vm-tools.rc.d +++ b/community/open-vm-tools/open-vm-tools.rc.d @@ -13,7 +13,7 @@ case "$1" in if [ "$VM_DRAG_AND_DROP" == "yes" ]; then VMBLOCK=`grep -w vmblock /proc/modules` - [ -z "$VMBLOCK" ] && modprobe -f vmblock + [ -z "$VMBLOCK" ] && modprobe vmblock if [ $? -gt 0 ]; then stat_fail exit 1 @@ -36,7 +36,7 @@ case "$1" in for m in vmhgfs vmsync; do VMMOD=`grep -w $m /proc/modules` [ -z "$VMMOD" ] && \ - { modprobe -f $m + { modprobe $m if [ $? -gt 0 ]; then stat_fail exit 1 diff --git a/community/opensc/PKGBUILD b/community/opensc/PKGBUILD new file mode 100644 index 000000000..1da03752e --- /dev/null +++ b/community/opensc/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 62576 2012-01-21 15:54:56Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: kevku <kevku@msn.com> + +pkgname=opensc +pkgver=0.12.2 +pkgrel=3 +pkgdesc='Access smart cards that support cryptographic operations' +arch=('x86_64' 'i686') +url='http://www.opensc-project.org/opensc/' +license=('LGPL') +backup=('etc/opensc.conf') +makedepends=('docbook-xsl') +depends=('openssl' 'pcsclite' 'libltdl') +options=('!libtool' '!emptydirs') +source=("http://www.opensc-project.org/files/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('5116adea5f2f9f22fb9896965789144b') + +build() { + cd $pkgname-$pkgver + export LIBS=-lltdl + _sheetdir=(/usr/share/xml/docbook/xsl-stylesheets-*) + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-man \ + --enable-doc \ + --enable-readline \ + --enable-openssl \ + --enable-pcsc \ + --enable-zlib \ + --with-xsl-stylesheetsdir="$_sheetdir" + make +} + +package(){ + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 etc/opensc.conf "$pkgdir/etc/opensc.conf" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index 95957f648..b29373993 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 62160 2012-01-17 00:26:49Z jconder $ +# $Id: PKGBUILD 62671 2012-01-24 01:58:04Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') pkgver=0.6.21 -pkgrel=1 +pkgrel=2 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64' 'mips64el') url="http://www.packagekit.org" license=('GPL') makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' 'networkmanager' 'pacman' 'pm-utils' 'polkit' 'python2' 'qt' - 'shared-mime-info' 'sqlite3' 'udev') + 'shared-mime-info' 'sqlite3' 'udev') options=('!libtool') source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz" 'alpm.patch') sha256sums=('68e5d4d07adf50b1fae6cbc0963555345ba7fc12d86d3e3387874547a5448b8e' - 'fbe54a89c3495376a0b939b67fec5b2e57bed46e92b3f4816d797745882481e6') + '44e7adbff7e2255fd9712eef33df866c3a868b3758ceff4adeef209927a97716') build() { cd "$srcdir/PackageKit-$pkgver" @@ -30,23 +30,24 @@ build() { # TODO: remove when upstream is patched autoreconf ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/PackageKit \ - --disable-static \ - --disable-gtk-doc \ - --disable-tests \ - --disable-local \ - --disable-browser-plugin \ - --disable-gstreamer-plugin \ - --disable-gtk-module \ - --disable-command-not-found \ - --disable-cron \ - --disable-debuginfo-install \ - --enable-pm-utils \ - --disable-dummy \ - --enable-alpm \ - --with-default-backend=alpm + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/PackageKit \ + --enable-strict \ + --disable-static \ + --disable-gtk-doc \ + --disable-tests \ + --disable-local \ + --disable-browser-plugin \ + --disable-gstreamer-plugin \ + --disable-gtk-module \ + --disable-command-not-found \ + --disable-cron \ + --disable-debuginfo-install \ + --enable-pm-utils \ + --disable-dummy \ + --enable-alpm \ + --with-default-backend=alpm make -s } diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch index d39ce14e1..997d252b2 100644 --- a/community/packagekit/alpm.patch +++ b/community/packagekit/alpm.patch @@ -19,7 +19,7 @@ index 5a5468a..d8c3dfc 100644 -DPK_BACKEND_DEFAULT_LOGFILE=\"$(PK_BACKEND_DEFAULT_LOGFILE)\" \ -DALPM_CACHE_PATH=\"$(ALPM_CACHE_PATH)\" \ diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c -index ba993f0..93f6d95 100644 +index ba993f0..5c6b629 100644 --- a/backends/alpm/pk-backend-alpm.c +++ b/backends/alpm/pk-backend-alpm.c @@ -22,10 +22,13 @@ @@ -219,6 +219,18 @@ index ba993f0..93f6d95 100644 } void +@@ -380,3 +442,11 @@ pk_backend_finish (PkBackend *self, GError *error) + pk_backend_thread_finished (self); + return (error == NULL); + } ++ ++void ++pk_backend_transaction_start (PkBackend *self) ++{ ++ g_return_if_fail (self != NULL); ++ ++ pk_backend_configure_environment (self); ++} diff --git a/backends/alpm/pk-backend-alpm.h b/backends/alpm/pk-backend-alpm.h index 23a2724..ecd6d0f 100644 --- a/backends/alpm/pk-backend-alpm.h @@ -234,7 +246,7 @@ index 23a2724..ecd6d0f 100644 extern gchar *xfercmd; extern alpm_list_t *holdpkgs; diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c -index 21a4c54..a51a984 100644 +index 21a4c54..d62b927 100644 --- a/backends/alpm/pk-backend-config.c +++ b/backends/alpm/pk-backend-config.c @@ -28,29 +28,44 @@ @@ -480,14 +492,14 @@ index 21a4c54..a51a984 100644 + } + + /* this also allows e.g. NeverEver, so put prefixes last */ -+ if (g_str_has_prefix (list, "Never") == 0) { ++ if (g_str_has_prefix (list, "Never")) { + if (package) { + *level &= ~ALPM_SIG_PACKAGE; + } + if (database) { + *level &= ~ALPM_SIG_DATABASE; + } -+ } else if (g_str_has_prefix (list, "Optional") == 0) { ++ } else if (g_str_has_prefix (list, "Optional")) { + if (package) { + *level |= ALPM_SIG_PACKAGE; + *level |= ALPM_SIG_PACKAGE_OPTIONAL; @@ -496,7 +508,7 @@ index 21a4c54..a51a984 100644 + *level |= ALPM_SIG_DATABASE; + *level |= ALPM_SIG_DATABASE_OPTIONAL; + } -+ } else if (g_str_has_prefix (list, "Required") == 0) { ++ } else if (g_str_has_prefix (list, "Required")) { + if (package) { + *level |= ALPM_SIG_PACKAGE; + *level &= ~ALPM_SIG_PACKAGE_OPTIONAL; @@ -505,7 +517,7 @@ index 21a4c54..a51a984 100644 + *level |= ALPM_SIG_DATABASE; + *level &= ~ALPM_SIG_DATABASE_OPTIONAL; + } -+ } else if (g_str_has_prefix (list, "TrustedOnly") == 0) { ++ } else if (g_str_has_prefix (list, "TrustedOnly")) { + if (package) { + *level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; + *level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -514,7 +526,7 @@ index 21a4c54..a51a984 100644 + *level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; + *level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK; + } -+ } else if (g_str_has_prefix (list, "TrustAll") == 0) { ++ } else if (g_str_has_prefix (list, "TrustAll")) { + if (package) { + *level |= ALPM_SIG_PACKAGE_MARGINAL_OK; + *level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -843,7 +855,7 @@ index cb8b8dc..412f59c 100644 -gboolean pk_backend_configure (const gchar *filename, GError **error); +alpm_handle_t *pk_backend_configure (const gchar *filename, GError **error); diff --git a/backends/alpm/pk-backend-databases.c b/backends/alpm/pk-backend-databases.c -index f6ab06e..ac530c7 100644 +index f6ab06e..a123297 100644 --- a/backends/alpm/pk-backend-databases.c +++ b/backends/alpm/pk-backend-databases.c @@ -26,7 +26,15 @@ @@ -873,7 +885,13 @@ index f6ab06e..ac530c7 100644 g_object_unref (output); g_object_unref (os); -@@ -128,37 +136,65 @@ disabled_repos_configure (GHashTable *table, GError **error) +@@ -124,41 +132,91 @@ disabled_repos_free (GHashTable *table) + } + + static gboolean +-disabled_repos_configure (GHashTable *table, GError **error) ++disabled_repos_configure (GHashTable *table, gboolean only_trusted, ++ GError **error) { const alpm_list_t *i; @@ -896,6 +914,7 @@ index f6ab06e..ac530c7 100644 - const gchar *repo = alpm_db_get_name (db); + for (i = configured; i != NULL; i = i->next) { + PkBackendRepo *repo = (PkBackendRepo *) i->data; ++ alpm_siglevel_t level = repo->level; + alpm_db_t *db; - if (g_hash_table_lookup (table, repo) == NULL) { @@ -904,12 +923,16 @@ index f6ab06e..ac530c7 100644 + if (g_hash_table_lookup (table, repo->name) != NULL) { + /* repo is disabled */ continue; ++ } else if (!only_trusted) { ++ level &= ~ALPM_SIG_PACKAGE; ++ level &= ~ALPM_SIG_DATABASE; ++ level &= ~ALPM_SIG_USE_DEFAULT; } - if (alpm_db_unregister (db) < 0) { - g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", - repo, alpm_strerrorlast ()); -+ db = alpm_db_register_sync (alpm, repo->name, repo->level); ++ db = alpm_db_register_sync (alpm, repo->name, level); + if (db == NULL) { + enum _alpm_errno_t errno = alpm_errno (alpm); + g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", @@ -942,7 +965,7 @@ index f6ab06e..ac530c7 100644 + + value = g_hash_table_lookup (levels, i->data); + if (value != NULL) { -+ repo->level = *(alpm_siglevel_t *)value; ++ repo->level = *(alpm_siglevel_t *) value; + } else { + repo->level = ALPM_SIG_USE_DEFAULT; + } @@ -951,10 +974,35 @@ index f6ab06e..ac530c7 100644 + } +} + ++gboolean ++pk_backend_disable_signatures (PkBackend *self, GError **error) ++{ ++ g_return_val_if_fail (self != NULL, FALSE); ++ ++ return disabled_repos_configure (disabled, FALSE, error); ++} ++ ++gboolean ++pk_backend_enable_signatures (PkBackend *self, GError **error) ++{ ++ g_return_val_if_fail (self != NULL, FALSE); ++ ++ return disabled_repos_configure (disabled, TRUE, error); ++} ++ gboolean pk_backend_initialize_databases (PkBackend *self, GError **error) { -@@ -179,11 +215,21 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) +@@ -169,7 +227,7 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) + return FALSE; + } + +- if (!disabled_repos_configure (disabled, error)) { ++ if (!disabled_repos_configure (disabled, TRUE, error)) { + return FALSE; + } + +@@ -179,11 +237,21 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) void pk_backend_destroy_databases (PkBackend *self) { @@ -976,7 +1024,7 @@ index f6ab06e..ac530c7 100644 } static gboolean -@@ -210,11 +256,12 @@ pk_backend_get_repo_list_thread (PkBackend *self) +@@ -210,11 +278,12 @@ pk_backend_get_repo_list_thread (PkBackend *self) gpointer key, value; g_return_val_if_fail (self != NULL, FALSE); @@ -991,7 +1039,12 @@ index f6ab06e..ac530c7 100644 const gchar *repo = alpm_db_get_name (db); if (pk_backend_cancelled (self)) { -@@ -269,7 +316,7 @@ pk_backend_repo_enable_thread (PkBackend *self) +@@ -265,11 +334,11 @@ pk_backend_repo_enable_thread (PkBackend *self) + + if (g_hash_table_remove (disabled, repo)) { + /* reload configuration to preserve ordering */ +- if (disabled_repos_configure (disabled, &error)) { ++ if (disabled_repos_configure (disabled, TRUE, &error)) { pk_backend_repo_list_changed (self); } } else { @@ -1000,7 +1053,7 @@ index f6ab06e..ac530c7 100644 g_set_error (&error, ALPM_ERROR, code, "[%s]: %s", repo, alpm_strerror (code)); } -@@ -292,21 +339,23 @@ pk_backend_repo_disable_thread (PkBackend *self) +@@ -292,21 +361,23 @@ pk_backend_repo_disable_thread (PkBackend *self) GError *error = NULL; g_return_val_if_fail (self != NULL, FALSE); @@ -1028,7 +1081,7 @@ index f6ab06e..ac530c7 100644 } else { g_hash_table_insert (disabled, g_strdup (repo), GINT_TO_POINTER (1)); -@@ -316,7 +365,7 @@ pk_backend_repo_disable_thread (PkBackend *self) +@@ -316,7 +387,7 @@ pk_backend_repo_disable_thread (PkBackend *self) } if (i == NULL) { @@ -1038,10 +1091,10 @@ index f6ab06e..ac530c7 100644 alpm_strerror (code)); } diff --git a/backends/alpm/pk-backend-databases.h b/backends/alpm/pk-backend-databases.h -index f9eb2f9..2636cae 100644 +index f9eb2f9..d9b9e78 100644 --- a/backends/alpm/pk-backend-databases.h +++ b/backends/alpm/pk-backend-databases.h -@@ -24,6 +24,10 @@ +@@ -24,6 +24,16 @@ #include <alpm.h> #include <pk-backend.h> @@ -1049,6 +1102,12 @@ index f9eb2f9..2636cae 100644 + GHashTable *servers, + GHashTable *levels); + ++gboolean pk_backend_disable_signatures (PkBackend *self, ++ GError **error); ++ ++gboolean pk_backend_enable_signatures (PkBackend *self, ++ GError **error); ++ gboolean pk_backend_initialize_databases (PkBackend *self, GError **error); @@ -1472,10 +1531,18 @@ index 28dcf65..d736e37 100644 -const gchar *alpm_pkg_get_group (pmpkg_t *pkg); +const gchar *alpm_pkg_get_group (alpm_pkg_t *pkg); diff --git a/backends/alpm/pk-backend-install.c b/backends/alpm/pk-backend-install.c -index 65a6c11..5b5e2b2 100644 +index 65a6c11..d0cbca2 100644 --- a/backends/alpm/pk-backend-install.c +++ b/backends/alpm/pk-backend-install.c -@@ -32,15 +32,19 @@ +@@ -25,6 +25,7 @@ + #include <pk-backend.h> + + #include "pk-backend-alpm.h" ++#include "pk-backend-databases.h" + #include "pk-backend-error.h" + #include "pk-backend-install.h" + #include "pk-backend-transaction.h" +@@ -32,15 +33,19 @@ static gint alpm_add_file (const gchar *filename) { @@ -1498,7 +1565,7 @@ index 65a6c11..5b5e2b2 100644 alpm_pkg_free (pkg); return -1; } -@@ -61,8 +65,9 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error) +@@ -61,8 +66,9 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error) for (; *paths != NULL; ++paths) { if (alpm_add_file (*paths) < 0) { @@ -1510,6 +1577,40 @@ index 65a6c11..5b5e2b2 100644 return FALSE; } } +@@ -89,17 +95,32 @@ pk_backend_simulate_install_files_thread (PkBackend *self) + static gboolean + pk_backend_install_files_thread (PkBackend *self) + { ++ gboolean only_trusted; + GError *error = NULL; + + g_return_val_if_fail (self != NULL, FALSE); + ++ only_trusted = pk_backend_get_bool (self, "only_trusted"); ++ ++ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { ++ goto out; ++ } ++ + if (pk_backend_transaction_initialize (self, 0, &error) && + pk_backend_transaction_add_targets (self, &error) && + pk_backend_transaction_simulate (self, &error)) { + pk_backend_transaction_commit (self, &error); + } + +- return pk_backend_transaction_finish (self, error); ++out: ++ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); ++ ++ if (!only_trusted) { ++ GError **e = (error == NULL) ? &error : NULL; ++ pk_backend_enable_signatures (self, e); ++ } ++ ++ return pk_backend_finish (self, error); + } + + void diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c index e9a7c94..2d057aa 100644 --- a/backends/alpm/pk-backend-packages.c @@ -2002,10 +2103,15 @@ index 592472d..c4e80ae 100644 break; } diff --git a/backends/alpm/pk-backend-sync.c b/backends/alpm/pk-backend-sync.c -index 9e1e02b..c770159 100644 +index 9e1e02b..d2f363b 100644 --- a/backends/alpm/pk-backend-sync.c +++ b/backends/alpm/pk-backend-sync.c -@@ -30,41 +30,13 @@ +@@ -26,45 +26,18 @@ + #include <string.h> + + #include "pk-backend-alpm.h" ++#include "pk-backend-databases.h" + #include "pk-backend-error.h" #include "pk-backend-sync.h" #include "pk-backend-transaction.h" @@ -2048,7 +2154,7 @@ index 9e1e02b..c770159 100644 packages = pk_backend_get_strv (self, "package_ids"); -@@ -75,9 +47,28 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error) +@@ -75,9 +48,28 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error) gchar *repo = package[PK_PACKAGE_ID_DATA]; gchar *name = package[PK_PACKAGE_ID_NAME]; @@ -2080,7 +2186,7 @@ index 9e1e02b..c770159 100644 g_strfreev (package); return FALSE; } -@@ -93,23 +84,27 @@ pk_backend_download_packages_thread (PkBackend *self) +@@ -93,23 +85,27 @@ pk_backend_download_packages_thread (PkBackend *self) { alpm_list_t *cachedirs; const gchar *directory; @@ -2114,7 +2220,7 @@ index 9e1e02b..c770159 100644 if (pk_backend_transaction_initialize (self, flags, &error) && pk_backend_transaction_sync_targets (self, &error) && -@@ -118,7 +113,7 @@ pk_backend_download_packages_thread (PkBackend *self) +@@ -118,7 +114,7 @@ pk_backend_download_packages_thread (PkBackend *self) } if (directory != NULL) { @@ -2123,7 +2229,40 @@ index 9e1e02b..c770159 100644 } return pk_backend_transaction_finish (self, error); -@@ -190,16 +185,17 @@ pk_backend_install_packages (PkBackend *self, gboolean only_trusted, +@@ -155,17 +151,31 @@ pk_backend_simulate_install_packages_thread (PkBackend *self) + static gboolean + pk_backend_install_packages_thread (PkBackend *self) + { ++ gboolean only_trusted; + GError *error = NULL; + + g_return_val_if_fail (self != NULL, FALSE); + ++ only_trusted = pk_backend_get_bool (self, "only_trusted"); ++ ++ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { ++ goto out; ++ } ++ + if (pk_backend_transaction_initialize (self, 0, &error) && + pk_backend_transaction_sync_targets (self, &error) && + pk_backend_transaction_simulate (self, &error)) { + pk_backend_transaction_commit (self, &error); + } + +- return pk_backend_transaction_finish (self, error); ++ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); ++out: ++ if (!only_trusted) { ++ GError **e = (error == NULL) ? &error : NULL; ++ pk_backend_enable_signatures (self, e); ++ } ++ ++ return pk_backend_finish (self, error); + } + + void +@@ -190,16 +200,17 @@ pk_backend_install_packages (PkBackend *self, gboolean only_trusted, } static gboolean @@ -2144,7 +2283,7 @@ index 9e1e02b..c770159 100644 const gchar *rname = alpm_pkg_get_name (rpkg); if (pk_backend_cancelled (self)) { -@@ -208,7 +204,7 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) +@@ -208,7 +219,7 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) continue; } @@ -2153,15 +2292,29 @@ index 9e1e02b..c770159 100644 return FALSE; } } -@@ -224,6 +220,7 @@ pk_backend_update_packages_thread (PkBackend *self) +@@ -219,13 +230,21 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) + static gboolean + pk_backend_update_packages_thread (PkBackend *self) + { ++ gboolean only_trusted; + const alpm_list_t *i; + alpm_list_t *asdeps = NULL; GError *error = NULL; g_return_val_if_fail (self != NULL, FALSE); + g_return_val_if_fail (alpm != NULL, FALSE); g_return_val_if_fail (localdb != NULL, FALSE); ++ only_trusted = pk_backend_get_bool (self, "only_trusted"); ++ ++ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { ++ goto out; ++ } ++ if (!pk_backend_transaction_initialize (self, 0, &error) || -@@ -233,8 +230,8 @@ pk_backend_update_packages_thread (PkBackend *self) + !pk_backend_transaction_sync_targets (self, &error) || + !pk_backend_transaction_simulate (self, &error)) { +@@ -233,8 +252,8 @@ pk_backend_update_packages_thread (PkBackend *self) } /* change the install reason of packages that replace dependencies */ @@ -2172,7 +2325,7 @@ index 9e1e02b..c770159 100644 const gchar *name = alpm_pkg_get_name (pkg); if (pk_backend_cancelled (self)) { -@@ -254,7 +251,8 @@ pk_backend_update_packages_thread (PkBackend *self) +@@ -254,14 +273,22 @@ pk_backend_update_packages_thread (PkBackend *self) for (i = asdeps; i != NULL; i = i->next) { const gchar *name = (const gchar *) i->data; @@ -2182,6 +2335,21 @@ index 9e1e02b..c770159 100644 } out: ++ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); ++ ++ if (!only_trusted) { ++ GError **e = (error == NULL) ? &error : NULL; ++ pk_backend_enable_signatures (self, e); ++ } ++ + alpm_list_free_inner (asdeps, g_free); + alpm_list_free (asdeps); + +- return pk_backend_transaction_finish (self, error); ++ return pk_backend_finish (self, error); + } + + void diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c index fdb840e..76402f0 100644 --- a/backends/alpm/pk-backend-transaction.c diff --git a/community/par2cmdline/PKGBUILD b/community/par2cmdline/PKGBUILD new file mode 100644 index 000000000..9b37571a5 --- /dev/null +++ b/community/par2cmdline/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 62520 2012-01-20 16:52:42Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org +# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > + +pkgname=par2cmdline +pkgver=0.5.3 +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=("https://github.com/downloads/BlackIkeEagle/$pkgname/$pkgname-$pkgver.tar.xz") +md5sums=('708db095eac3d83f21ce27b8be123c54') + +build() { + cd ${pkgname}-${pkgver} + aclocal + automake --add-missing + autoconf + ./configure --prefix=/usr + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index e3bed3e31..5c5fcf876 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58586 2011-11-16 05:16:04Z spupykin $ +# $Id: PKGBUILD 62750 2012-01-25 18:56:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributer: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=3.10.0 -_rel=devel -#_rel=stable +pkgver=4.0.0 +#_rel=devel +_rel=stable pkgrel=2 pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=(!emptydirs !makeflags) source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz) -md5sums=('36a839beaef511f178b0607a03f1ff0f') +md5sums=('fc613c41771baf79307c519072302299') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 19a115798..d12d492e8 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55077 2011-09-02 08:37:50Z andrea $ +# $Id: PKGBUILD 62774 2012-01-26 14:45:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.70 -pkgrel=3 +pkgver=0.72 +pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DateTime" @@ -15,7 +15,7 @@ LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('228a3ca93b49e308fc7a3b7a47341ab3') +md5sums=('f50b328919fe8bf2d2b16ca0df35c3f3') build() { cd $srcdir/DateTime-$pkgver diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index dcc8aba90..9feb1be34 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 58419 2011-11-12 17:18:36Z ibiru $ +# $Id: PKGBUILD 62594 2012-01-22 09:34:17Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: sysrq pkgname=picard pkgver=0.16 -pkgrel=3 +pkgrel=4 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg') -optdepends=('libdiscid: CD-Lookup feature') +optdepends=('libdiscid: CD lookup' + 'chromaprint: fingerprinting') source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") sha1sums=('274071410550ee29051bb0137d72602921a015f9') diff --git a/community/pidgin-gfire/PKGBUILD b/community/pidgin-gfire/PKGBUILD new file mode 100644 index 000000000..9abfa1f83 --- /dev/null +++ b/community/pidgin-gfire/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Slash <demodevil5[at]yahoo[dot]com> +# Contributor: LookTJ <jesus[dot]christ[dot]i[dot]love[at]gmail[dot]com> + +pkgname=pidgin-gfire +pkgver=0.9.4 +pkgrel=3 +pkgdesc="Gfire is an Plugin for the Pidgin IM client which allows you to connect the Xfire network." +arch=('i686' 'x86_64') +url="http://gfireproject.org/" +license=('GPL') +depends=('glib2' 'libpurple' 'libnotify' 'gtk2') +makedepends=('pkgconfig' 'intltool' 'libtool') +source=("http://downloads.sourceforge.net/gfire/pidgin-gfire-$pkgver.tar.bz2" "gfire-libnotify.patch") +md5sums=('7167828fd77200603a318afdd4d9ebd2' + '5d6fc2b98837fbebba6bef2648699d5e') +options=(!libtool) + +build() { + cd "$srcdir/pidgin-gfire-$pkgver" + + patch -p0 -i ../gfire-libnotify.patch + ./autogen.sh + ./configure --prefix=/usr --enable-libnotify + make + make DESTDIR="$pkgdir" install +} diff --git a/community/pidgin-gfire/gfire-libnotify.patch b/community/pidgin-gfire/gfire-libnotify.patch new file mode 100644 index 000000000..51e744cd9 --- /dev/null +++ b/community/pidgin-gfire/gfire-libnotify.patch @@ -0,0 +1,21 @@ +--- src/gf_util.c 2011-03-14 21:19:46.987545000 +0100 ++++ src/gf_util.c 2011-04-18 03:36:24.970676551 +0200 +@@ -612,7 +612,7 @@ + if(!gfire_notify_init() || !p_title) + return; + +- NotifyNotification *notification = notify_notification_new(p_title, p_msg, NULL, NULL); ++ NotifyNotification *notification = notify_notification_new(p_title, p_msg, NULL); + notify_notification_set_urgency(notification, NOTIFY_URGENCY_NORMAL); + notify_notification_set_timeout(notification, NOTIFY_EXPIRES_DEFAULT); + g_signal_connect(notification, "closed", G_CALLBACK(gfire_notify_closed_cb), NULL); +@@ -637,7 +637,7 @@ + return; + } + +- notification = notify_notification_new(p_title, p_msg, NULL, NULL); ++ notification = notify_notification_new(p_title, p_msg, NULL); + + // Get Buddy Icon + PurpleBuddyIcon *icon = purple_buddy_get_icon(p_buddy); + diff --git a/community/portmidi/PKGBUILD b/community/portmidi/PKGBUILD index 1ddd9bd97..033f881a6 100644 --- a/community/portmidi/PKGBUILD +++ b/community/portmidi/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 31348 2010-10-30 15:46:33Z lfleischer $ +# $Id: PKGBUILD 62694 2012-01-24 20:35:44Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Denis Martinez <deuns.martinez AT gmail DOT com> pkgname=portmidi pkgver=217 -pkgrel=2 +pkgrel=3 pkgdesc="Platform independent library for real-time MIDI input/output." arch=('i686' 'x86_64' 'mips64el') url='http://portmedia.sourceforge.net/' license=('GPL') depends=('alsa-lib') makedepends=('cmake' 'java-environment') -source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip") -md5sums=('03f46fd3947e2ef4c8c465baaf832241') +source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip" + 'portmidi-217-build-fix.patch') +md5sums=('03f46fd3947e2ef4c8c465baaf832241' + '59cb428b29a33bab3bb5811cda479a9b') build() { cd "${srcdir}/${pkgname}" @@ -21,6 +23,9 @@ build() { sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py mkdir -p pm_java/Release + # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118) + patch -p1 -i ../portmidi-217-build-fix.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ diff --git a/community/portmidi/portmidi-217-build-fix.patch b/community/portmidi/portmidi-217-build-fix.patch new file mode 100644 index 000000000..3e2dfef29 --- /dev/null +++ b/community/portmidi/portmidi-217-build-fix.patch @@ -0,0 +1,29 @@ +diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt +--- portmidi.orig/pm_java/CMakeLists.txt 2009-11-04 16:20:44.000000000 +0100 ++++ portmidi/pm_java/CMakeLists.txt 2012-01-24 21:13:08.513182169 +0100 +@@ -15,13 +15,11 @@ if(UNIX) + add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class + COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java + MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java +- DEPENDS pmdefaults/PmDefaults.java +- WORKING_DIRECTORY pm_java) ++ DEPENDS pmdefaults/PmDefaults.java) + add_custom_command(OUTPUT pmdefaults/PmDefaults.class + COMMAND javac -classpath . pmdefaults/PmDefaults.java + MAIN_DEPENDENCY pmdefaults/PmDefaults.java +- DEPENDS pmdefaults/PmDefaultsFrame.java +- WORKING_DIRECTORY pm_java) ++ DEPENDS pmdefaults/PmDefaultsFrame.java) + add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar + COMMAND cp pmdefaults/portmusic_logo.png . + COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar +@@ -31,8 +29,7 @@ if(UNIX) + COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + COMMAND rm portmusic_logo.png + MAIN_DEPENDENCY pmdefaults/PmDefaults.class +- DEPENDS ${PMDEFAULTS_ALL_CLASSES} +- WORKING_DIRECTORY pm_java) ++ DEPENDS ${PMDEFAULTS_ALL_CLASSES}) + add_custom_target(pmdefaults_target ALL + DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) + # message(STATUS "add_custom_target: pmdefaults.jar") diff --git a/community/python-memcached/PKGBUILD b/community/python-memcached/PKGBUILD index 52b99ad1f..f90b83dae 100644 --- a/community/python-memcached/PKGBUILD +++ b/community/python-memcached/PKGBUILD @@ -2,16 +2,16 @@ # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Nathan Jones <nathanj@insightbb.com> pkgname=python-memcached -pkgver=1.47 +pkgver=1.48 pkgrel=1 pkgdesc="A Python interface to memcached" -depends=('python2') -makedepends=('setuptools') -source=(ftp://ftp.tummy.com/pub/$pkgname/$pkgname-$pkgver.tar.gz LICENSE) url="ftp://ftp.tummy.com/pub/python-memcached/" -license=('Python') arch=('i686' 'x86_64' 'mips64el') -md5sums=('e4e9d65e5721a1bb01f8d657ddf3f03e' +license=('Python') +source=(ftp://ftp.tummy.com/pub/$pkgname/$pkgname-$pkgver.tar.gz LICENSE) +makedepends=('setuptools') +depends=('python2') +md5sums=('58f8c328304df6aca1f8b60170e98932' '5286ea4c34766a357085694e0984f116') build() { diff --git a/community/python-mpi4py/PKGBUILD b/community/python-mpi4py/PKGBUILD index e48458f39..454a96961 100644 --- a/community/python-mpi4py/PKGBUILD +++ b/community/python-mpi4py/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 60172 2011-12-06 14:17:13Z stephane $ +# $Id: PKGBUILD 62551 2012-01-21 03:26:53Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sebastien Binet <binet@cern.ch> pkgbase=python-mpi4py pkgname=('python-mpi4py' 'python2-mpi4py') -pkgver=1.2.2 -pkgrel=5 +pkgver=1.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://mpi4py.scipy.org" license=('BSD') makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'openmpi') source=(http://mpi4py.googlecode.com/files/mpi4py-${pkgver}.tar.gz) -sha1sums=('e08d09257794a85d010a22ad9bda9d1c89a6258f') +sha1sums=('282c1b9e35b242c9bd86126ebc5af6c70d8c2833') build() { cd "${srcdir}" diff --git a/community/python2-pycuda/PKGBUILD b/community/python2-pycuda/PKGBUILD new file mode 100644 index 000000000..37049dea1 --- /dev/null +++ b/community/python2-pycuda/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 62828 2012-01-27 14:09:50Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +pkgname=python2-pycuda +pkgver=2011.2.2 +pkgrel=1 +pkgdesc="Python wrapper for Nvidia CUDA" +arch=('i686' 'x86_64') +url="http://mathema.tician.de/software/pycuda" +license=('MIT/X Consortium') +source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz) +depends=('cuda-toolkit' 'python2-numpy' 'python2-pytools' 'python2') +optdepends=('python2-pytest') +makedepends=('ctags' 'python2-distribute' 'mesa') +provides=('pycuda') +replaces=('pycuda') +conflicts=('pycuda') +sha1sums=('026ca33f66d35c82a087a5ef3f8e0f213575059b') + +build() { + cd "${srcdir}/pycuda-${pkgver}" + python2 ./configure.py \ + --cuda-root=/opt/cuda-toolkit \ + --boost-compiler=gcc \ + --cuda-enable-gl \ + --cuda-inc-dir=/opt/cuda-toolkit/include \ + --cudadrv-lib-dir=/opt/cuda-toolkit/lib \ + --cudart-lib-dir=/opt/cuda-toolkit/lib + + make +} + +package() { + cd "${srcdir}/pycuda-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 +} diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 42d7051a2..66bbc18d0 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62226 2012-01-18 16:36:56Z ttopper $ +# $Id: PKGBUILD 62568 2012-01-21 14:00:13Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64' 'mips64el') url="http://roxterm.sourceforge.net/" @@ -20,13 +20,13 @@ md5sums=('7c3bb1471f814a8bfdfcf169ad18e425') build() { cd "${srcdir}/roxterm-${pkgver}" - python2 mscript.py configure + python2 mscript.py configure --prefix="/usr" python2 mscript.py build } package() { cd "${srcdir}/roxterm-${pkgver}" - python2 mscript.py install --destdir=${pkgdir} --prefix="usr" + python2 mscript.py install --destdir="${pkgdir}" } # vim:set ts=2 sw=2 et: diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 6d3bb3f4c..6f0bfed5e 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 58329 2011-11-11 14:26:11Z spupykin $ +# $Id: PKGBUILD 62742 2012-01-25 15:39:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.8.6 +pkgver=6.2.0 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -depends=('zlib') +depends=('zlib' 'libestr' 'libee') makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') optdepends=('postgresql-libs: PostgreSQL Database Support' 'libmysqlclient: MySQL Database Support' 'net-snmp' 'gnutls') -backup=('etc/rsyslog.conf' \ +backup=('etc/rsyslog.conf' 'etc/logrotate.d/rsyslog' 'etc/conf.d/rsyslog') options=('strip' 'zipman' '!libtool') @@ -22,13 +22,14 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('c46db0496066b82faf735bd4222208d7' +md5sums=('03e237abaa5d47f92c6e655f92f22532' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') build() { cd ${srcdir}/${pkgname}-${pkgver} + export LDFLAGS="-lestr" ./configure --prefix=/usr \ --enable-mysql \ --enable-pgsql \ diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index e8dcf7cec..7c1f188be 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# $Id: PKGBUILD 62734 2012-01-25 13:50:09Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=setconf pkgver=0.3.2 -pkgrel=1 -pkgdesc="Utility to easily change settings in Makefiles and other configuration files" +pkgrel=3 +pkgdesc="Utility to easily change settings in Makefiles and configuration files" arch=('x86_64' 'i686') url="http://setconf.roboticoverlords.org/" license=('GPL') depends=('pcre' 'gc') -makedepends=('shedskin>=0.1.2') +makedepends=('shedskin>=0.9.1') source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03') diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 7258bc6be..cfb9b390e 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61097 2011-12-21 20:52:48Z andrea $ +# $Id: PKGBUILD 62685 2012-01-24 13:11:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.4.2 -pkgrel=3 +pkgver=0.5.0 +pkgrel=1 pkgdesc="A WYSIWYG ebook editor" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/sigil/" @@ -14,7 +14,7 @@ makedepends=('cmake') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip" "${pkgname}.desktop") -md5sums=('ce27976254236f8b11b787fd05be9acb' +md5sums=('8deb8ae451d485698ab9330dccfe46e5' 'fef6aa492af487ccccd6b133635cee5a') build() { @@ -28,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON .. - make + make } package() { diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index d35dfeba4..178925eb6 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60676 2011-12-16 19:35:40Z lfleischer $ +# $Id: PKGBUILD 62466 2012-01-20 07:55:34Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.2 +pkgver=2.9.2.1 pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64' 'mips64el') @@ -21,10 +21,10 @@ backup=('etc/conf.d/snort' 'etc/snort/classification.config') options=('!makeflags' '!libtool') install='snort.install' -source=('http://www.snort.org/downloads/1347' +source=('http://www.snort.org/downloads/1419' 'snort' 'snort.conf.d') -md5sums=('22fa07ba915535b151329056439ae194' +md5sums=('2f3e2b6ee72adbdfac73cb1c6c14bd61' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index 841333712..230ccbc55 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 61689 2012-01-06 19:23:37Z lfleischer $ +# $Id: PKGBUILD 62660 2012-01-23 13:31:10Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy pkgver=1.8.3 -pkgrel=2 +pkgrel=3 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64' 'mips64el') url='https://banu.com/tinyproxy/' license=('GPL') makedepends=('asciidoc') +install="${pkgname}.install" backup=('etc/tinyproxy/tinyproxy.conf') source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2" 'tinyproxy' 'tinyproxy.tmpfiles.conf') md5sums=('292ac51da8ad6ae883d4ebf56908400d' - '464b5d60b1c9cbae26367fe2337c2d77' + '90eb2b3371e56d5a784fd826d4a6e5f8' '3c2764578f26581346fe312da0519a3e') build() { diff --git a/community/tinyproxy/tinyproxy b/community/tinyproxy/tinyproxy index 86ba7b77c..5580ea804 100755 --- a/community/tinyproxy/tinyproxy +++ b/community/tinyproxy/tinyproxy @@ -8,11 +8,7 @@ PID=$(pidof -o %PPID /usr/sbin/tinyproxy) start() { stat_busy "Starting Tinyproxy" - if [ ! -d /var/run/tinyproxy ]; then - mkdir -p /var/run/tinyproxy && chown nobody:nobody /var/run/tinyproxy - fi - - [ -z "$PID" ] && rm -f /var/run/tinyproxy.pid && \ + [ -z "$PID" ] && rm -f /var/run/tinyproxy/tinyproxy.pid && \ /usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf 2>/dev/null if [ $? -gt 0 ]; then diff --git a/community/tinyproxy/tinyproxy.install b/community/tinyproxy/tinyproxy.install new file mode 100644 index 000000000..85f3dfc41 --- /dev/null +++ b/community/tinyproxy/tinyproxy.install @@ -0,0 +1,9 @@ +post_install() { + if [ ! -d /var/run/tinyproxy ]; then + install -dm0770 -o nobody -g nobody /var/run/tinyproxy + fi +} + +post_upgrade() { + post_install "$@" +} diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD index c37dbd826..6f5bf908f 100644 --- a/community/tmux/PKGBUILD +++ b/community/tmux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51497 2011-07-10 19:49:12Z spupykin $ +# $Id: PKGBUILD 62681 2012-01-24 12:53:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> pkgname=tmux -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="A terminal multiplexer" url="http://tmux.sourceforge.net/" @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses' 'libevent') source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz LICENSE) -md5sums=('3d4b683572af34e83bc8b183a8285263' +md5sums=('3e37db24aa596bf108a0442a81c845b3' '71601bc37fa44e4395580b321963018e') build() { diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index a9bd200a1..1e4e50780 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 62318 2012-01-19 08:04:12Z spupykin $ +# $Id: PKGBUILD 62767 2012-01-26 14:20:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> @@ -8,7 +8,7 @@ _timestamp=20111025 _file=53357 pkgver=${_basever}.${_timestamp} pkgrel=1 -pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0' +pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' arch=('i686' 'x86_64' 'mips64el') url='http://tomoyo.sourceforge.jp' #url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index c4ea91a7c..b002d8e49 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55184 2011-09-05 09:03:02Z spupykin $ +# $Id: PKGBUILD 62776 2012-01-26 14:46:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=ulogd pkgver=1.24 -pkgrel=7 +pkgrel=8 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' @@ -19,14 +19,17 @@ optdepends=('postgresql-libs' backup=('etc/ulogd.conf') source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'rc' - 'logrotate') + 'logrotate' + 'mac-addr.patch') md5sums=('05b4ed2926b9a22aaeaf642917bbf8ff' 'c42230c1cabf5dd9b80bf9a0fd87ca7e' - 'fe40b3073b7474a77e0b8b0bfd19ab63') + 'fe40b3073b7474a77e0b8b0bfd19ab63' + 'ca41a10a9f230614cd15e2bb037e057d') build() { cd $pkgname-$pkgver export MAKEFLAGS="-j1" + patch -p0 extensions/ulogd_BASE.c <$srcdir/mac-addr.patch ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-sqlite3 make || true (cd mysql && ld -shared -L/usr/lib -L/usr/lib -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -o ulogd_MYSQL.so ulogd_MYSQL_sh.o -lc) diff --git a/community/ulogd/mac-addr.patch b/community/ulogd/mac-addr.patch new file mode 100644 index 000000000..87a76a22b --- /dev/null +++ b/community/ulogd/mac-addr.patch @@ -0,0 +1,22 @@ +--- ulogd_BASE.c-save 2007-08-06 11:23:53.000000000 +0200 ++++ ulogd_BASE.c 2007-08-06 11:28:47.000000000 +0200 +@@ -63,7 +63,7 @@ static ulog_iret_t *_interp_raw(ulog_int + { + unsigned char *p; + int i; +- char *buf, *oldbuf = NULL; ++ char *buf = NULL; + ulog_iret_t *ret = ip->result; + + if (pkt->mac_len) { +@@ -75,9 +75,8 @@ static ulog_iret_t *_interp_raw(ulog_int + *buf = '\0'; + + p = pkt->mac; +- oldbuf = buf; + for (i = 0; i < pkt->mac_len; i++, p++) +- sprintf(buf, "%s%02x%c", oldbuf, *p, i==pkt->mac_len-1 ? ' ':':'); ++ sprintf(buf + (i*3), "%02x%c", *p, i==pkt->mac_len-1 ? ' ':':'); + ret[0].value.ptr = buf; + ret[0].flags |= ULOGD_RETF_VALID; + } diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index 9e866e24e..ac58b852a 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 60976 2011-12-19 22:59:53Z bisson $ - +# $Id: PKGBUILD 62794 2012-01-27 01:24:10Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound -pkgver=1.4.14 +pkgver=1.4.15 pkgrel=1 pkgdesc='Validating, recursive, and caching DNS resolver' -arch=('i686' 'x86_64' 'mips64el') url='http://unbound.net/' license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') options=('!libtool') depends=('openssl' 'ldns') makedepends=('expat') @@ -19,7 +18,7 @@ backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" 'unbound.conf' 'rc.d') -sha1sums=('1435029abe63d0106213acb9f173b885183cf1d7' +sha1sums=('bbda46664ea8391ca7986300ce98a79787c0e322' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'dc96e772f467b32555df21d16fdb15e98194c228') diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD new file mode 100644 index 000000000..9bb33a812 --- /dev/null +++ b/community/vidalia/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 62747 2012-01-25 18:13:51Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Rorschach <r0rschach@lavabit.com> + +pkgname=vidalia +pkgver=0.2.15 +pkgrel=1 +pkgdesc="Controller GUI for Tor" +url="https://www.torproject.org/vidalia" +arch=('i686' 'x86_64') +license=('GPL') +depends=('qt' 'tor') +makedepends=('cmake') +install=vidalia.install +source=("https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz") +md5sums=(845b627eb2534aa5da29efd6c8d30978) + +build() { + [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh + + cd "$srcdir" + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgver + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir/" install + install -Dm644 ../$pkgname-$pkgver/doc/vidalia.1 "$pkgdir"/usr/share/man/man1/vidalia.1 || return 1 +} diff --git a/community/vidalia/vidalia.install b/community/vidalia/vidalia.install new file mode 100644 index 000000000..58b897a0a --- /dev/null +++ b/community/vidalia/vidalia.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 8ff5888e8..548827524 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62232 2012-01-18 17:19:12Z ibiru $ +# $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') pkgver=4.1.8 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') |