From f113f9f1663263f381bd999767c2a4946003e44b Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Mon, 23 Jan 2012 00:00:36 +0000 Subject: [PATCH] updated on Mon Jan 23 00:00:36 UTC 2012 --- amok-exif-sorter/PKGBUILD | 8 +- aweather/PKGBUILD | 9 +- grits/PKGBUILD | 4 +- haveged/PKGBUILD | 10 +- haveged/haveged | 80 ++-- initscripts-systemd-git/PKGBUILD | 9 +- lua-cjson/PKGBUILD | 11 +- lynis/PKGBUILD | 6 +- owx/PKGBUILD | 4 +- perl-app-cmd/PKGBUILD | 16 +- {perl-module-corelist => perl-b-keywords}/PKGBUILD | 16 +- perl-catalyst-action-rest/PKGBUILD | 8 +- perl-class-accessor-grouped/PKGBUILD | 14 +- perl-cpan-meta/PKGBUILD | 12 +- perl-cpan-mini/PKGBUILD | 15 +- perl-dancer-plugin-database/PKGBUILD | 12 +- perl-datetime-format-flexible/PKGBUILD | 12 +- perl-dist-zilla/PKGBUILD | 12 +- perl-getopt-euclid/PKGBUILD | 10 +- perl-imager/PKGBUILD | 8 +- perl-module-corelist/PKGBUILD | 10 +- perl-moo/PKGBUILD | 12 +- perl-moosex-getopt/PKGBUILD | 13 +- perl-moosex-methodattributes/PKGBUILD | 13 +- perl-moosex-role-parameterized/PKGBUILD | 14 +- perl-moosex-types/PKGBUILD | 12 +- perl-namespace-clean/PKGBUILD | 13 +- po-debconf/PKGBUILD | 13 +- pytouhou-hg/PKGBUILD | 4 +- smokeping/PKGBUILD | 5 +- smokeping/smokeping.install | 3 + spacefm/PKGBUILD | 10 +- swami/PKGBUILD | 32 +- swami/swami.install | 2 +- th06-demo-data/PKGBUILD | 3 +- th06-demo/PKGBUILD | 12 +- vym-git/PKGBUILD | 10 +- vym-git/vym.install | 12 + wmfs2-git/PKGBUILD | 2 +- xen-4.2/09_xen | 123 ++++++ xen-4.2/PKGBUILD | 94 +++++ xen-4.2/archinit.patch | 411 +++++++++++++++++++++ xen-4.2/yajl-patch | 188 ++++++++++ 43 files changed, 1058 insertions(+), 229 deletions(-) rewrite haveged/haveged (88%) mode change 100644 => 100755 copy {perl-module-corelist => perl-b-keywords}/PKGBUILD (64%) create mode 100644 smokeping/smokeping.install create mode 100644 vym-git/vym.install create mode 100755 xen-4.2/09_xen create mode 100644 xen-4.2/PKGBUILD create mode 100644 xen-4.2/archinit.patch create mode 100644 xen-4.2/yajl-patch diff --git a/amok-exif-sorter/PKGBUILD b/amok-exif-sorter/PKGBUILD index 1209092b0..b340aa82d 100644 --- a/amok-exif-sorter/PKGBUILD +++ b/amok-exif-sorter/PKGBUILD @@ -1,5 +1,6 @@ # Author: Andreas Krist # Contributor: Xi0N + pkgname=amok-exif-sorter pkgver=2.56 pkgrel=1 @@ -8,7 +9,6 @@ arch=(i686 x86_64) url="http://www.amok.am/en/freeware/amok_exif_sorter/" license=(FREEWARE) depends=('java-runtime') -noextract=(${source[@]##*/}) _source_arch="32Bit" [ "$CARCH" = "x86_64" ] && _source_arch="64Bit" @@ -23,8 +23,8 @@ source=("http://www.amok.am/files/releases/AmoK_Exif_Sorter_v${pkgver}_(Linux_${ "amok-exif-sorter.png") build() { - mkdir -p $pkgdir/opt/AmokExifSorter/ - install -D amok-exif-sorter.png $pkgdir/opt/AmokExifSorter/ install -D amok-exif-sorter.desktop $pkgdir/usr/share/applications/amok-exif-sorter.desktop - cp -rp $srcdir/* $pkgdir/opt/AmokExifSorter/ + mkdir -p $pkgdir/opt/AmokExifSorter + cp amok-exif-sorter.png $pkgdir/opt/AmokExifSorter/ + cp * $pkgdir/opt/AmokExifSorter -rp } diff --git a/aweather/PKGBUILD b/aweather/PKGBUILD index dd7632ec8..0f1396f1a 100755 --- a/aweather/PKGBUILD +++ b/aweather/PKGBUILD @@ -1,22 +1,21 @@ # Maintainer: archtux pkgname=aweather -pkgver=0.6.1 +pkgver=0.6.3 pkgrel=1 pkgdesc="Advanced weather reporting program" arch=('i686' 'x86_64') url="http://lug.rose-hulman.edu/proj/aweather/" license='GPL3' -depends=('grits=0.6.1' 'rsl') +depends=('grits=0.6.3' 'rsl') makedepends=('hdf5') -options=(!libtool) source=(http://lug.rose-hulman.edu/proj/aweather/$pkgname-$pkgver.tar.gz) -md5sums='bc5bd4a8946a0c8a32732c5945c33a66' +md5sums='e58ab0c0843e2187c9fd237ff4ca32a5' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + CFLAGS='-ldl' ./configure --prefix=/usr make make DESTDIR=$pkgdir install } diff --git a/grits/PKGBUILD b/grits/PKGBUILD index 7b4310fee..6a661bd79 100755 --- a/grits/PKGBUILD +++ b/grits/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: archtux pkgname=grits -pkgver=0.6.1 +pkgver=0.6.3 pkgrel=1 pkgdesc="Virtual Globe library using GTK+ and OpenGL" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ url="http://lug.rose-hulman.edu/proj/aweather/grits" license='GPL3' depends=('gtk2' 'libsoup') source=(http://lug.rose-hulman.edu/proj/grits/$pkgname-$pkgver.tar.gz) -md5sums='b988649784b880bf6d4d4fa130e231e7' +md5sums='cdcc377c697163df292576751fe0daab' build() { cd $srcdir/$pkgname-$pkgver diff --git a/haveged/PKGBUILD b/haveged/PKGBUILD index 76f693d69..67021c478 100644 --- a/haveged/PKGBUILD +++ b/haveged/PKGBUILD @@ -1,18 +1,16 @@ -# Maintainer: kfgz -# Contributor: pootzko +# Maintainer: chol pkgname=haveged pkgver=1.3a _r_ver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="A simple entropy daemon." arch=('i686' 'x86_64') url="http://www.issihosts.com/haveged" license=('GPL') -source=(${url}/${pkgname}-${pkgver}.tar.gz - haveged) +source=(${url}/${pkgname}-${pkgver}.tar.gz haveged) md5sums=('dad8b95c6eafcec7eb42eb8454e60a0d' - '264b725be5271288b40f363d7cfc6b68') + '6478347e8c246ee89a8db4fc37a858f9') build() { cd "${srcdir}"/${pkgname}-${_r_ver} diff --git a/haveged/haveged b/haveged/haveged old mode 100644 new mode 100755 dissimilarity index 88% index c0e13b40d..c78cb32cd --- a/haveged/haveged +++ b/haveged/haveged @@ -1,44 +1,36 @@ -#!/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 +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/haveged` +case "$1" in + start) + stat_busy "Starting havege entropy daemon" + [ -z "$PID" ] && /usr/sbin/haveged + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon haveged + stat_done + fi + ;; + stop) + stat_busy "Stopping havege entropy daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon haveged + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/initscripts-systemd-git/PKGBUILD b/initscripts-systemd-git/PKGBUILD index 5e960cbb1..f92797aca 100644 --- a/initscripts-systemd-git/PKGBUILD +++ b/initscripts-systemd-git/PKGBUILD @@ -1,13 +1,12 @@ # Contributor: Dave Reisner pkgname=initscripts-systemd-git -pkgver=20110420 +pkgver=20120122 pkgrel=1 pkgdesc="Arch specific systemd initialization/bootup scripts for systemd" arch=('any') url="http://www.github.com/falconindy/initscripts-systemd" license=('GPL') -groups=('systemd') depends=('systemd-git') provides=("initscripts-systemd=$pkgver") conflicts=('initscripts-systemd') @@ -21,7 +20,7 @@ build() { cd "$srcdir" msg "Connecting to GIT server...." - if [ -d $_gitname ] ; then + if [[ -d $_gitname ]] ; then cd $_gitname && git pull origin msg "The local files are updated." else @@ -36,7 +35,5 @@ build() { } package() { - cd "$srcdir/$_gitname-build" - - make DESTDIR="$pkgdir" install + make -C "$srcdir/$_gitname-build" DESTDIR="$pkgdir" install } diff --git a/lua-cjson/PKGBUILD b/lua-cjson/PKGBUILD index 086b27182..1e83ece2b 100644 --- a/lua-cjson/PKGBUILD +++ b/lua-cjson/PKGBUILD @@ -1,15 +1,16 @@ # Maintainer: SpepS pkgname=lua-cjson -pkgver=1.0.4 +pkgver=2.0.0 pkgrel=1 pkgdesc="A fast JSON parsing and encoding support for Lua." arch=(i686 x86_64) url="http://www.kyne.com.au/~mark/software/lua-cjson.php" -license=('MIT') +license=('custom:MIT') depends=('lua') -source=("http://www.kyne.com.au/~mark/software/$pkgname-$pkgver.tar.gz") -md5sums=('9b04196a37f724c7530794248f8e1f96') +optdepends=('perl: UTF8 implementation test') +source=("http://www.kyne.com.au/~mark/software/download/$pkgname-$pkgver.tar.gz") +md5sums=('f26478dec5de30d657264314974bde8c') build() { cd "$srcdir/$pkgname-$pkgver" @@ -20,7 +21,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir/" install + make PREFIX=/usr DESTDIR="$pkgdir/" install{,-extra} # license install -Dm644 LICENSE \ diff --git a/lynis/PKGBUILD b/lynis/PKGBUILD index 3ed971128..ad85aecc2 100644 --- a/lynis/PKGBUILD +++ b/lynis/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Sébastien Luttringer pkgname=lynis -pkgver=1.2.9 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc='Lynis is an auditing tool for Unix (specialists)' url='http://www.rootkit.nl/projects/lynis.html' license=('GPL3') arch=('i686' 'x86_64') source=("http://www.rootkit.nl/files/$pkgname-$pkgver.tar.gz") -md5sums=('69b369173ffc0f10f021035f73857e1f') +md5sums=('cb74fbf73b3dc42f838eaedd3ce9f738') package() { cd $pkgname-$pkgver diff --git a/owx/PKGBUILD b/owx/PKGBUILD index 72031d7c8..5c35bff87 100644 --- a/owx/PKGBUILD +++ b/owx/PKGBUILD @@ -2,11 +2,11 @@ # Contributor: Vitaliy Berdinskikh, aka UR6LAD pkgname=owx pkgver=7 -pkgrel=1 +pkgrel=2 pkgdesc="A CLI tool for programming KG669V (Wouxun) HTs." arch=('i686' 'x86_64') url="http://owx.chmurka.net" -license=('custom:beerware') +license=('Apache' 'custom:beerware') depends=('gcc-libs') makedepends=('gcc' 'sed' 'subversion') replaces=('wouxun') diff --git a/perl-app-cmd/PKGBUILD b/perl-app-cmd/PKGBUILD index 445379ee4..f745af5e8 100644 --- a/perl-app-cmd/PKGBUILD +++ b/perl-app-cmd/PKGBUILD @@ -1,20 +1,20 @@ -# Contributor: AUR Perl -# Generator : CPANPLUS::Dist::Arch 1.18 +# Contributor: Justin Davis +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-app-cmd' -pkgver='0.312' +pkgver='0.314' pkgrel='1' pkgdesc="write command line apps with less suffering" arch=('any') license=('PerlArtistic' 'GPL') options=('!emptydirs') -depends=('perl-class-load>=0.06' 'perl-data-optlist' 'perl-getopt-long-descriptive>=0.084' 'perl-io-tiecombine' 'perl-string-rewriteprefix' 'perl-sub-exporter' 'perl-sub-install') +depends=('perl-capture-tiny>=0.13' 'perl-class-load>=0.06' 'perl-data-optlist' 'perl-getopt-long-descriptive>=0.084' 'perl-io-tiecombine' 'perl-string-rewriteprefix' 'perl-sub-exporter' 'perl-sub-install') makedepends=('perl-test-fatal') url='http://search.cpan.org/dist/App-Cmd' -source=('http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/App-Cmd-0.312.tar.gz') -md5sums=('5e2b552c5fa03588d1585398b73e7b23') -sha512sums=('dbc14ff9003ea0ac9937fc01e878fb5813edd05d9288a7ed07afc1cdf603de3f5378a17ce9ed67815420eee2dd83ba1a1583d5112e73bbf29a29c96402cc3d8c') -_distdir="${srcdir}/App-Cmd-0.312" +source=('http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/App-Cmd-0.314.tar.gz') +md5sums=('85b17ae8fe87d91c84d64b06ab35d791') +sha512sums=('79c82655c67fb78fee4a4e0607f1f66eee390e718aa37a88e3a779707cb0e2e359824659c0287c0e85abc88a24013a5282b9cc569f04205cd57fca18a373287f') +_distdir="${srcdir}/App-Cmd-0.314" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-module-corelist/PKGBUILD b/perl-b-keywords/PKGBUILD similarity index 64% copy from perl-module-corelist/PKGBUILD copy to perl-b-keywords/PKGBUILD index 02bbe0d62..7cac07dd0 100644 --- a/perl-module-corelist/PKGBUILD +++ b/perl-b-keywords/PKGBUILD @@ -1,20 +1,20 @@ # Contributor: Justin Davis # Generator : CPANPLUS::Dist::Arch 1.19 -pkgname='perl-module-corelist' -pkgver='2.59' +pkgname='perl-b-keywords' +pkgver='1.11' pkgrel='1' -pkgdesc="what modules shipped with versions of perl" +pkgdesc="Lists of reserved barewords and symbol names" arch=('any') license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl') makedepends=() -url='http://search.cpan.org/dist/Module-CoreList' -source=('http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/Module-CoreList-2.59.tar.gz') -md5sums=('ce46604f6cffe7b774473007cffad1be') -sha512sums=('270ef41294e38756274fa1e48767755392f50ecf4c643a6e12ebfbb0209c67f9a6ff6f31aff57b8f109f517494b757341d2fd5c00fad922025fb7339cc75caab') -_distdir="${srcdir}/Module-CoreList-2.59" +url='http://search.cpan.org/dist/B-Keywords' +source=('http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/B-Keywords-1.11.tar.gz') +md5sums=('2c957056281623ad76ed65517e1c82c2') +sha512sums=('02062f10b7462de1d512f5281be763de801fbf2fa97d88fe67e2bc78887c3515178583b7586cdeb2aa0bf38946aad5f28c5deae588ad5c82bc062db1537022de') +_distdir="${srcdir}/B-Keywords-1.11" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-catalyst-action-rest/PKGBUILD b/perl-catalyst-action-rest/PKGBUILD index cc41e0c87..c05cdceb4 100644 --- a/perl-catalyst-action-rest/PKGBUILD +++ b/perl-catalyst-action-rest/PKGBUILD @@ -3,7 +3,7 @@ # Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-catalyst-action-rest' -pkgver='0.94' +pkgver='0.95' pkgrel='1' pkgdesc="Automated REST Method Dispatching" arch=('any') @@ -24,9 +24,9 @@ optdepends=('perl-data-taxi: text/x-data-taxi support' 'perl-json: application/json support' 'perl-json-xs: install with perl-json for faster JSON') url='http://search.cpan.org/dist/Catalyst-Action-REST' -source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Action-REST-0.94.tar.gz') -md5sums=('64a6714d8ae01c1272afb2cbbf61b2ed') -_distdir="${srcdir}/Catalyst-Action-REST-0.94" +source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Action-REST-0.95.tar.gz') +md5sums=('e9bbae032c739b0412d62ad319e8ae7f') +_distdir="${srcdir}/Catalyst-Action-REST-0.95" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-class-accessor-grouped/PKGBUILD b/perl-class-accessor-grouped/PKGBUILD index 601564e4b..3129aec23 100644 --- a/perl-class-accessor-grouped/PKGBUILD +++ b/perl-class-accessor-grouped/PKGBUILD @@ -2,19 +2,19 @@ # Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-class-accessor-grouped' -pkgver='0.10004' +pkgver='0.10006' pkgrel='1' pkgdesc="Lets you build groups of accessors" arch=('any') license=('PerlArtistic' 'GPL') options=('!emptydirs') -depends=('perl>=5.6.2' 'perl-class-inspector' 'perl-class-xsaccessor>=1.11' 'perl-sub-name>=0.05') -makedepends=('perl-extutils-makemaker>=6.6302' 'perl-test-exception>=0.31') +depends=('perl>=5.6.2' 'perl-class-inspector' 'perl-class-xsaccessor>=1.13' 'perl-sub-name>=0.05') +makedepends=('perl-extutils-makemaker>=6.62' 'perl-test-exception>=0.31') url='http://search.cpan.org/dist/Class-Accessor-Grouped' -source=('http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10004.tar.gz') -md5sums=('7f415adb577ee181a77c6b04cd5fadab') -sha512sums=('f5d76961dfced08676164441ff20cef9075bbbb8beaedc30a73983bbc6e4f15ca3990d2e3b8b74fd42db5568105d19273e26cfeda3db093e0a5e44585e9cda63') -_distdir="${srcdir}/Class-Accessor-Grouped-0.10004" +source=('http://search.cpan.org/CPAN/authors/id/C/CL/CLACO/Class-Accessor-Grouped-0.10006.tar.gz') +md5sums=('7a8d81346ded9927ab76b561e62a39a8') +sha512sums=('9724705f114f22c176fe2f4ad9e56b490e33c61ad00142d072856a71b3c341c7bb360cf639191afa942691a86370a91ad4312f5811af2463cb623f07111e5847') +_distdir="${srcdir}/Class-Accessor-Grouped-0.10006" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-cpan-meta/PKGBUILD b/perl-cpan-meta/PKGBUILD index 47439a4c7..30b0a519f 100644 --- a/perl-cpan-meta/PKGBUILD +++ b/perl-cpan-meta/PKGBUILD @@ -1,8 +1,8 @@ # Contributor: Justin Davis -# Generator : CPANPLUS::Dist::Arch 1.18 +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-cpan-meta' -pkgver='2.112621' +pkgver='2.113640' pkgrel='1' pkgdesc="the distribution metadata for a CPAN dist" arch=('any') @@ -11,10 +11,10 @@ options=('!emptydirs') depends=('perl') makedepends=() url='http://search.cpan.org/dist/CPAN-Meta' -source=('http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.112621.tar.gz') -md5sums=('a37c34f3bc650fc7347182ba86ce317d') -sha512sums=('d03d4a6c4e71b7ad64874275406d1c45e3affc11150c6f212dad223003d963db47253c1a676b407c1ca8d6e25e3c1414f01aab47698cd7a2f8ffc2f82a680b74') -_distdir="${srcdir}/CPAN-Meta-2.112621" +source=('http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/CPAN-Meta-2.113640.tar.gz') +md5sums=('7276ea318cfa9a49826c3b63e681503a') +sha512sums=('8cd22d445c7a464f107d3c71a68490772e2b6b2f3d5805439b48179c17a65af76e4bc52018919f807cbc5be135bc0853970477bf1bdf59c244edc3242f369f19') +_distdir="${srcdir}/CPAN-Meta-2.113640" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-cpan-mini/PKGBUILD b/perl-cpan-mini/PKGBUILD index 0c8152372..9aefa78c3 100644 --- a/perl-cpan-mini/PKGBUILD +++ b/perl-cpan-mini/PKGBUILD @@ -1,19 +1,20 @@ -# Contributor: AUR Perl -# Generator : CPANPLUS::Dist::Arch 1.12 +# Contributor: Justin Davis +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-cpan-mini' -pkgver='1.111007' +pkgver='1.111008' pkgrel='1' pkgdesc="create a minimal mirror of CPAN" arch=('any') license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl-file-homedir>=0.57' 'perl-libwww' 'perl-uri>=1') -makedepends=('perl-test-simple') +makedepends=() url='http://search.cpan.org/dist/CPAN-Mini' -source=('http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/CPAN-Mini-1.111007.tar.gz') -md5sums=('b0feff371b555ae8f79b5c8bb2ff5e7e') -_distdir="${srcdir}/CPAN-Mini-1.111007" +source=('http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/CPAN-Mini-1.111008.tar.gz') +md5sums=('90a8e76add7ee7d71e7a64d26ab96093') +sha512sums=('997050bb977c2e91c330006de477a5f92a90bcd375b820d0d2204a4800d65ee940b40f2c30f59274e37b62f4926bbd80ddcc044a6ca45d49bdb6a5c72db8814f') +_distdir="${srcdir}/CPAN-Mini-1.111008" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-dancer-plugin-database/PKGBUILD b/perl-dancer-plugin-database/PKGBUILD index da7758f59..db82041a6 100644 --- a/perl-dancer-plugin-database/PKGBUILD +++ b/perl-dancer-plugin-database/PKGBUILD @@ -2,19 +2,19 @@ # Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-dancer-plugin-database' -pkgver='1.51' +pkgver='1.60' pkgrel='1' pkgdesc="easy database connections for Dancer applications" arch=('any') license=('PerlArtistic' 'GPL') options=('!emptydirs') -depends=('perl-dancer>=1.175' 'perl-dbi') +depends=('perl-dancer>=1.305' 'perl-dbi') makedepends=() url='http://search.cpan.org/dist/Dancer-Plugin-Database' -source=('http://search.cpan.org/CPAN/authors/id/B/BI/BIGPRESH/Dancer-Plugin-Database-1.51.tar.gz') -md5sums=('c45ae910205252eb7eb78813cb127681') -sha512sums=('8d9d02a5a62bd577c7e5ee84613e0b1b110e654d8d0a804ee04d9ee2751113bfeb08bfed6a80f3d435559133f9eea27cbab0ff288b65ac7f8e9656e72f023099') -_distdir="${srcdir}/Dancer-Plugin-Database-1.51" +source=('http://search.cpan.org/CPAN/authors/id/B/BI/BIGPRESH/Dancer-Plugin-Database-1.60.tar.gz') +md5sums=('c01781cd6027fe511108044e414f78f2') +sha512sums=('56d9c0fc5b801914719a1a6ed8fc95e1a0aae0f6dc05037ae70e52949e3750ec7e3bddd6aeee506bc80bd609d305db66623b35bbc4a0ea8f193413e1a615b278') +_distdir="${srcdir}/Dancer-Plugin-Database-1.60" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-datetime-format-flexible/PKGBUILD b/perl-datetime-format-flexible/PKGBUILD index 7014b8bca..0afd9caf7 100644 --- a/perl-datetime-format-flexible/PKGBUILD +++ b/perl-datetime-format-flexible/PKGBUILD @@ -1,8 +1,8 @@ # Contributor: Justin Davis -# Generator : CPANPLUS::Dist::Arch 1.18 +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-datetime-format-flexible' -pkgver='0.20' +pkgver='0.21' pkgrel='1' pkgdesc="DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects." arch=('any') @@ -11,10 +11,10 @@ options=('!emptydirs') depends=('perl-datetime' 'perl-datetime-format-builder>=0.74' 'perl-datetime-timezone' 'perl-list-moreutils') makedepends=('perl-test-mocktime') url='http://search.cpan.org/dist/DateTime-Format-Flexible' -source=('http://search.cpan.org/CPAN/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.20.tar.gz') -md5sums=('decfbbf0238b74d596263e09264a3c14') -sha512sums=('533d0f670178491a436a7d705d563b77b85575abbb92f3d935880e95c7ea70e8d3192909505784538827630974e4b4b11bc69c112558c3d28eccf8a4b7476182') -_distdir="${srcdir}/DateTime-Format-Flexible-0.20" +source=('http://search.cpan.org/CPAN/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.21.tar.gz') +md5sums=('513c033bb61f2c9bbf581da99e650f76') +sha512sums=('d219b77941c1829adacd06ee937bd1188ff5bc8b49b32410ef3dd02edc44ce028a93157eae7988ab70bb2d4271fa1fd1bd3a1423b4aa948a6f38880faa04e8b5') +_distdir="${srcdir}/DateTime-Format-Flexible-0.21" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-dist-zilla/PKGBUILD b/perl-dist-zilla/PKGBUILD index e6b6ef4be..8ad1b8d6b 100644 --- a/perl-dist-zilla/PKGBUILD +++ b/perl-dist-zilla/PKGBUILD @@ -2,19 +2,19 @@ # Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-dist-zilla' -pkgver='4.300005' +pkgver='4.300006' pkgrel='1' pkgdesc="distribution builder; installer not included!" arch=('any') license=('PerlArtistic' 'GPL') options=('!emptydirs') -depends=('perl-app-cmd' 'perl-autobox>=2.53' 'perl-class-load' 'perl-config-ini' 'perl-config-mvp' 'perl-config-mvp-reader-ini>=2' 'perl-cpan-uploader>=0.101550' 'perl-data-section>=0.004' 'perl-datetime>=0.44' 'perl-file-copy-recursive' 'perl-file-find-rule' 'perl-file-homedir' 'perl-file-pushd' 'perl-file-sharedir' 'perl-file-sharedir-install>=0.03' 'perl-hash-merge-simple' 'perl-json>=2' 'perl-list-moreutils' 'perl-log-dispatchouli>=1.102220' 'perl-moose>=0.92' 'perl-moose-autobox>=0.10' 'perl-moosex-lazyrequire' 'perl-moosex-role-parameterized' 'perl-moosex-setonce' 'perl-moosex-types' 'perl-moosex-types-path-class' 'perl-moosex-types-perl' 'perl-namespace-autoclean' 'perl-params-util' 'perl-path-class' 'perl-perl-prereqscanner>=1.005' 'perl-perl-version' 'perl-pod-eventual>=0.091480' 'perl-ppi' 'perl-software-license>=0.101370' 'perl-string-formatter>=0.100680' 'perl-string-rewriteprefix>=0.005' 'perl-sub-exporter' 'perl-sub-exporter-formethods' 'perl-term-readkey' 'perl-text-glob>=0.08' 'perl-text-template' 'perl-try-tiny' 'perl-yaml-tiny') +depends=('perl-app-cmd' 'perl-autobox>=2.53' 'perl-class-load' 'perl-config-ini' 'perl-config-mvp' 'perl-config-mvp-reader-ini>=2' 'perl-cpan-meta' 'perl-cpan-uploader>=0.101550' 'perl-data-section>=0.004' 'perl-datetime>=0.44' 'perl-file-copy-recursive' 'perl-file-find-rule' 'perl-file-homedir' 'perl-file-pushd' 'perl-file-sharedir' 'perl-file-sharedir-install>=0.03' 'perl-hash-merge-simple' 'perl-json>=2' 'perl-list-moreutils' 'perl-log-dispatchouli>=1.102220' 'perl-moose>=0.92' 'perl-moose-autobox>=0.10' 'perl-moosex-lazyrequire' 'perl-moosex-role-parameterized' 'perl-moosex-setonce' 'perl-moosex-types' 'perl-moosex-types-path-class' 'perl-moosex-types-perl' 'perl-namespace-autoclean' 'perl-params-util' 'perl-path-class' 'perl-perl-prereqscanner>=1.005' 'perl-perl-version' 'perl-pod-eventual>=0.091480' 'perl-ppi' 'perl-software-license>=0.101370' 'perl-string-formatter>=0.100680' 'perl-string-rewriteprefix>=0.005' 'perl-sub-exporter' 'perl-sub-exporter-formethods' 'perl-term-readkey' 'perl-text-glob>=0.08' 'perl-text-template' 'perl-try-tiny' 'perl-yaml-tiny') makedepends=('perl-file-sharedir-install>=0.03' 'perl-test-deep' 'perl-test-fatal') url='http://search.cpan.org/dist/Dist-Zilla' -source=('http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Dist-Zilla-4.300005.tar.gz') -md5sums=('b6d28020a5df3884c22fd39c334db689') -sha512sums=('6876b49200f587fc31dc7fd8faa747618f088a58be7918d723176a8ed291671968995abbc91d2ece6d85a123b959be20e2a293f171644c664e55f0dfe4c34e00') -_distdir="${srcdir}/Dist-Zilla-4.300005" +source=('http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Dist-Zilla-4.300006.tar.gz') +md5sums=('9795ed118d6d774a78fe36d17f5f38c6') +sha512sums=('c0f9c3698a94fe44b9823c492c076b417536a46cad5421b07b0d96bee33254257dd4eb27017d59b2c455089f5584865108ef192f7b2498d9b64d87c637f960c7') +_distdir="${srcdir}/Dist-Zilla-4.300006" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-getopt-euclid/PKGBUILD b/perl-getopt-euclid/PKGBUILD index 981abb205..d0479d54b 100644 --- a/perl-getopt-euclid/PKGBUILD +++ b/perl-getopt-euclid/PKGBUILD @@ -2,7 +2,7 @@ # Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-getopt-euclid' -pkgver='0.3.2' +pkgver='0.3.3' pkgrel='1' pkgdesc="Executable Uniform Command-Line Interface Descriptions" arch=('any') @@ -11,10 +11,10 @@ options=('!emptydirs') depends=('perl-tidy') makedepends=() url='http://search.cpan.org/dist/Getopt-Euclid' -source=('http://search.cpan.org/CPAN/authors/id/F/FA/FANGLY/Getopt-Euclid-0.3.2.tar.gz') -md5sums=('70de1b3351f52ba8a741c1e7d51049b0') -sha512sums=('74dfb29e88fc71b39ce11bba95620e03dfd0cd0802561e85bbdee0a7cf571cfa1698676720650f70147e6a4a79885929b61d6ac55d9f2efdddec316bcd0a8efd') -_distdir="${srcdir}/Getopt-Euclid-0.3.2" +source=('http://search.cpan.org/CPAN/authors/id/F/FA/FANGLY/Getopt-Euclid-0.3.3.tar.gz') +md5sums=('77fe156e5c96221957009e2121f4170b') +sha512sums=('fc26dac0c7295ac6344801c52fe13b3b41c8ada9d34e2d908c5009e98508a748985670f60ca02814ce596f1903559db2e7a2a6f82729478cc87973ce975c325c') +_distdir="${srcdir}/Getopt-Euclid-0.3.3" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-imager/PKGBUILD b/perl-imager/PKGBUILD index af2a245a6..4d8685dd5 100644 --- a/perl-imager/PKGBUILD +++ b/perl-imager/PKGBUILD @@ -3,7 +3,7 @@ # Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-imager' -pkgver='0.86' +pkgver='0.87' pkgrel='1' pkgdesc="Perl extension for Generating 24 bit Images" arch=('i686' 'x86_64') @@ -14,9 +14,9 @@ depends=('perl' 'libjpeg' 'libpng>=1.0.5' 'giflib>=4.1.4' 'libtiff>3.9.0' optdepends=('perl-parse-recdescent: needed to parse transform2() expressions') makedepends=() url='http://search.cpan.org/dist/Imager' -source=('http://search.cpan.org/CPAN/authors/id/T/TO/TONYC/Imager-0.86.tar.gz') -md5sums=('ca2b2bbc5ab31fb63f7019034e84fba4') -_distdir="${srcdir}/Imager-0.86" +source=('http://search.cpan.org/CPAN/authors/id/T/TO/TONYC/Imager-0.87.tar.gz') +md5sums=('fa4c46df54277c211829d5472502a23b') +_distdir="${srcdir}/Imager-0.87" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-module-corelist/PKGBUILD b/perl-module-corelist/PKGBUILD index 02bbe0d62..0d9b1cbdb 100644 --- a/perl-module-corelist/PKGBUILD +++ b/perl-module-corelist/PKGBUILD @@ -2,7 +2,7 @@ # Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-module-corelist' -pkgver='2.59' +pkgver='2.60' pkgrel='1' pkgdesc="what modules shipped with versions of perl" arch=('any') @@ -11,10 +11,10 @@ options=('!emptydirs') depends=('perl') makedepends=() url='http://search.cpan.org/dist/Module-CoreList' -source=('http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/Module-CoreList-2.59.tar.gz') -md5sums=('ce46604f6cffe7b774473007cffad1be') -sha512sums=('270ef41294e38756274fa1e48767755392f50ecf4c643a6e12ebfbb0209c67f9a6ff6f31aff57b8f109f517494b757341d2fd5c00fad922025fb7339cc75caab') -_distdir="${srcdir}/Module-CoreList-2.59" +source=('http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/Module-CoreList-2.60.tar.gz') +md5sums=('0bb3fcb0ff4500c9932032f68af5c6f8') +sha512sums=('da5810c4c976cc0cd1a4bf0736e1e4f00f8b1abdd64d41da2f1e6a4614dd459ea7ff0aa02c9d820947b6e55f3380e4d9045c0b8b4120a0f01dbea525793be0d2') +_distdir="${srcdir}/Module-CoreList-2.60" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-moo/PKGBUILD b/perl-moo/PKGBUILD index d8ed30c97..e71cf4097 100644 --- a/perl-moo/PKGBUILD +++ b/perl-moo/PKGBUILD @@ -2,19 +2,19 @@ # Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-moo' -pkgver='0.009012' +pkgver='0.009013' pkgrel='1' pkgdesc="Minimalist Object Orientation (with Moose compatiblity)" arch=('any') license=('PerlArtistic' 'GPL') options=('!emptydirs') -depends=('perl-class-method-modifiers>=1.05' 'perl-strictures>=1.001001') +depends=('perl-class-method-modifiers>=1.07' 'perl-strictures>=1.001001') makedepends=('perl-test-fatal>=0.003') url='http://search.cpan.org/dist/Moo' -source=('http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/Moo-0.009012.tar.gz') -md5sums=('58eb7e75104407bc7380f7019f1e7b75') -sha512sums=('07417d9d75a8a3b0c23f62727e6138edb5a08cafc4268155490908bb4511c42372a45ccf00b98e227d7c091d21d4af38daef9e9d926f134ac114a445321856ce') -_distdir="${srcdir}/Moo-0.009012" +source=('http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/Moo-0.009013.tar.gz') +md5sums=('80ec444a3d274abe66b37ea4e5006ab9') +sha512sums=('5e6f3a7527d60e0107870773cd0a5bcdc2b0a6e8fa90a603db2ec42a3fdf2530c349d31bd91bcc307a61d1f16a97ac22bcd4733a83ecf2422871b5c138d234d3') +_distdir="${srcdir}/Moo-0.009013" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-moosex-getopt/PKGBUILD b/perl-moosex-getopt/PKGBUILD index 56f6d33cb..f96a2ca24 100644 --- a/perl-moosex-getopt/PKGBUILD +++ b/perl-moosex-getopt/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: AUR Perl -# Generator : CPANPLUS::Dist::Arch 1.12 +# Contributor: Justin Davis +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-moosex-getopt' -pkgver='0.37' +pkgver='0.38' pkgrel='1' pkgdesc="A Moose role for processing command line options" arch=('any') @@ -11,9 +11,10 @@ options=('!emptydirs') depends=('perl-getopt-long-descriptive>=0.081' 'perl-moose>=0.56' 'perl-moosex-role-parameterized') makedepends=('perl-test-fatal>=0.003' 'perl-test-requires>=0.05' 'perl-test-warn>=0.21') url='http://search.cpan.org/dist/MooseX-Getopt' -source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Getopt-0.37.tar.gz') -md5sums=('cfe4159989ec3c700e23930c67c18654') -_distdir="${srcdir}/MooseX-Getopt-0.37" +source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Getopt-0.38.tar.gz') +md5sums=('745916eaa9b633aafdbdcd0cfed92071') +sha512sums=('bd29c96fec6ca09dcadb1d309ad929caca4391b3eeb206c8309a6c2b64310c7c7bd03dc5152cf0834313dccb4409e2c3218ca2c593cc58be49b356f2b0f58245') +_distdir="${srcdir}/MooseX-Getopt-0.38" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-moosex-methodattributes/PKGBUILD b/perl-moosex-methodattributes/PKGBUILD index 32ff4a23f..c50cc3c4b 100644 --- a/perl-moosex-methodattributes/PKGBUILD +++ b/perl-moosex-methodattributes/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: AUR Perl -# Generator : CPANPLUS::Dist::Arch 1.15 +# Contributor: Justin Davis +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-moosex-methodattributes' -pkgver='0.25' +pkgver='0.26' pkgrel='1' pkgdesc="code attribute introspection" arch=('any') @@ -11,9 +11,10 @@ options=('!emptydirs') depends=('perl-moose>=0.98' 'perl-moosex-types' 'perl-namespace-clean>=0.10') makedepends=('perl-namespace-autoclean' 'perl-test-exception') url='http://search.cpan.org/dist/MooseX-MethodAttributes' -source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-MethodAttributes-0.25.tar.gz') -md5sums=('a9feec0157fe84a02f6fc5ce6957a546') -_distdir="${srcdir}/MooseX-MethodAttributes-0.25" +source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-MethodAttributes-0.26.tar.gz') +md5sums=('556fa58ae5b0cd2e150cc9075efc7460') +sha512sums=('224adbf229e44b1026a4792b0e9996b42d513261f54bcd7343985cc2e79348dde56908e9ba7d0a1c48feec34f8d76b832b14ec80386254fc91718c7a229b8957') +_distdir="${srcdir}/MooseX-MethodAttributes-0.26" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-moosex-role-parameterized/PKGBUILD b/perl-moosex-role-parameterized/PKGBUILD index 2068e33f3..42176433c 100644 --- a/perl-moosex-role-parameterized/PKGBUILD +++ b/perl-moosex-role-parameterized/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: AUR Perl -# Generator : CPANPLUS::Dist::Arch 1.18 +# Contributor: Justin Davis +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-moosex-role-parameterized' -pkgver='0.27' +pkgver='1.00' pkgrel='1' pkgdesc="roles with composition parameters" arch=('any') @@ -11,10 +11,10 @@ options=('!emptydirs') depends=('perl>=5.8.1') makedepends=('perl-moose' 'perl-test-fatal') url='http://search.cpan.org/dist/MooseX-Role-Parameterized' -source=('http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-0.27.tar.gz') -md5sums=('ff42187afa323a8fe7cba57ff78685de') -sha512sums=('8cb7c573f8a5d832f2f0da2c640ad552d4ffeb60d372937c9bfc04cb0cd4d936be8a395254fb59d2aac256ec996a172534bcd06a478620a72d833aec4b1334cb') -_distdir="${srcdir}/MooseX-Role-Parameterized-0.27" +source=('http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-1.00.tar.gz') +md5sums=('8afd9b244bf8b2f60ef18c2fd94d821a') +sha512sums=('57f558cc49f2bdc37f37221e7961fe7e2a791c254079fe99f93575c1ae63f976572396181acf6f9d2b3d3fb2db34351dcf8086ac9187312d5e4109b8169b26d5') +_distdir="${srcdir}/MooseX-Role-Parameterized-1.00" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-moosex-types/PKGBUILD b/perl-moosex-types/PKGBUILD index 59b62b8e5..32f15714b 100644 --- a/perl-moosex-types/PKGBUILD +++ b/perl-moosex-types/PKGBUILD @@ -1,8 +1,8 @@ # Contributor: Justin Davis -# Generator : CPANPLUS::Dist::Arch 1.18 +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-moosex-types' -pkgver='0.30' +pkgver='0.31' pkgrel='1' pkgdesc="Organise your Moose types in libraries" arch=('any') @@ -11,10 +11,10 @@ options=('!emptydirs') depends=('perl-carp-clan>=6.00' 'perl-namespace-clean>=0.19' 'perl-sub-install>=0.924' 'perl-sub-name') makedepends=('perl-moose' 'perl-test-fatal' 'perl-test-requires') url='http://search.cpan.org/dist/MooseX-Types' -source=('http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-Types-0.30.tar.gz') -md5sums=('fc49977cba30c6ef6ce9bb888aa9df25') -sha512sums=('880cbc3dea903b7b3210d8035907a38d542a74e3f8fc6fd0dcfa420dfdbb4d592333f6a4363237d69c1ed51a190174100c6aaf08dd8659d8cbdeb12b893f5f87') -_distdir="${srcdir}/MooseX-Types-0.30" +source=('http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-Types-0.31.tar.gz') +md5sums=('aea9a4cc6760e73ebb41604006e65ca1') +sha512sums=('cc01ec1282bca6d7db699e490a62ef0acfd6600cdb97cbe515ca498bfb4d8faa45e64784dba66f41f65bcab72ee1bfff10a63d889b73f7dde8a60f6f63b2ba80') +_distdir="${srcdir}/MooseX-Types-0.31" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/perl-namespace-clean/PKGBUILD b/perl-namespace-clean/PKGBUILD index b028ac8e7..4d4461a92 100644 --- a/perl-namespace-clean/PKGBUILD +++ b/perl-namespace-clean/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: AUR Perl -# Generator : CPANPLUS::Dist::Arch 1.17 +# Contributor: Justin Davis +# Generator : CPANPLUS::Dist::Arch 1.19 pkgname='perl-namespace-clean' -pkgver='0.21' +pkgver='0.22' pkgrel='1' pkgdesc="Keep imports and functions out of your namespace" arch=('any') @@ -11,9 +11,10 @@ options=('!emptydirs') depends=('perl-b-hooks-endofscope>=0.07' 'perl-package-stash>=0.23') makedepends=() url='http://search.cpan.org/dist/namespace-clean' -source=('http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/namespace-clean-0.21.tar.gz') -md5sums=('eabf88eec3f5952c4bb87461b69fd1d8') -_distdir="${srcdir}/namespace-clean-0.21" +source=('http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/namespace-clean-0.22.tar.gz') +md5sums=('6c79f5de86159682deea09ee13311eaa') +sha512sums=('9d568830939b38a6829b2c1f806e943d22f91caf8bcbfc37e7f08ef5f4c643919d0f5642257260f64f45de47e8a3594d116d7432c1250575160cfffc7581e367') +_distdir="${srcdir}/namespace-clean-0.22" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ diff --git a/po-debconf/PKGBUILD b/po-debconf/PKGBUILD index bfd3d811c..d17b446e5 100644 --- a/po-debconf/PKGBUILD +++ b/po-debconf/PKGBUILD @@ -1,19 +1,20 @@ # Contributer: Toni Foerster , André Klitzing +# Contributor: Stéphane Marguet (Stemp) + pkgname=po-debconf -pkgver=1.0.15 +pkgver=1.0.16 pkgrel=1 -pkgdesc="Tools to manage translated Debconf templates files with common gettext utilities." +pkgdesc="Debian manage translated Debconf templates files with gettext" arch=('i686' 'x86_64') url="http://www.debian.org/" license=('GPL') depends=('gettext' 'perl' 'intltool-debian') -source=(ftp://ftp.debian.org/debian/pool/main/p/po-debconf/${pkgname}_${pkgver}_all.deb) -md5sums=('fe27b58798840b21977ae36720b888f1') +source=(http://ftp.de.debian.org/debian/pool/main/p/po-debconf/${pkgname}_${pkgver}+nmu2_all.deb) +md5sums=('17e175bbf41358ce6c47cba821663d7f') build() { cd ${startdir}/src - ar -x ${startdir}/src/${pkgname}_${pkgver}_all.deb data.tar.gz + ar -x ${startdir}/src/${pkgname}_${pkgver}+nmu2_all.deb data.tar.gz tar -zxf ${startdir}/src/data.tar.gz cp -r ${startdir}/src/usr/ ${startdir}/pkg/ } - diff --git a/pytouhou-hg/PKGBUILD b/pytouhou-hg/PKGBUILD index 676ae7bdb..70a14461e 100644 --- a/pytouhou-hg/PKGBUILD +++ b/pytouhou-hg/PKGBUILD @@ -3,13 +3,13 @@ _name=pytouhou pkgname=$_name-hg pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc='Libre reimplementation of the Touhou 6 engine.' arch=('i686' 'x86_64') url='http://linkmauve.fr/doc/touhou/' license=('GPL3') depends=('pyglet' 'th06-demo-data') -makedepends=('cython2') +makedepends=('mercurial' 'cython2') provides=('pytouhou') conflicts=('pytouhou') diff --git a/smokeping/PKGBUILD b/smokeping/PKGBUILD index 8de2058d5..54be765d1 100644 --- a/smokeping/PKGBUILD +++ b/smokeping/PKGBUILD @@ -2,7 +2,7 @@ pkgname=smokeping pkgver=2.6.7 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to keep track of your network latency" arch=('any') url="http://oss.oetiker.ch/smokeping/" @@ -11,11 +11,12 @@ depends=('perl-config-grammar' 'perl-digest-hmac') makedepends=() source=(http://oss.oetiker.ch/smokeping/pub/smokeping-${pkgver}.tar.gz) sha256sums=('40c07e1edd5b1f66308e3af72b21f547c948cd0afe1465934387f48ac5e3c426') +install=${pkgname}.install build() { cd "$srcdir"/${pkgname}-${pkgver} pwd - ./configure --prefix=/usr + ./configure --prefix=/usr --sysconfdir=/etc/smokeping --with-htdocs-dir=/srv/http/smokeping make } diff --git a/smokeping/smokeping.install b/smokeping/smokeping.install new file mode 100644 index 000000000..d6397b369 --- /dev/null +++ b/smokeping/smokeping.install @@ -0,0 +1,3 @@ +post_install() { + chown -R http.http /srv/http/smokeping +} diff --git a/spacefm/PKGBUILD b/spacefm/PKGBUILD index 26be653cf..04af22a4a 100644 --- a/spacefm/PKGBUILD +++ b/spacefm/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Thanks to ridikulus_rat for PKGBUILD improvements pkgname="spacefm" -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="A multi-panel tabbed file manager" arch=('i686' 'x86_64') @@ -10,14 +10,16 @@ license=('GPL2') makedepends=('intltool' 'gettext') depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification') -optdepends=('ktsuss: perform as root functionality' 'gksu: perform as root functionality' 'gnome-icon-theme' 'wget' 'lsof' 'udisks: automount and device manager' 'eject') +optdepends=('ktsuss: perform as root functionality' + 'gksu: perform as root functionality' + 'udisks: automount and device manager' 'wget' 'lsof' 'eject') options=('!strip') install="spacefm.install" source=("http://downloads.sourceforge.net/project/spacefm/spacefm-${pkgver}.tar.xz") -md5sums=('93041d05af5e10c4cadc6cc991c9859a') -sha256sums=('fc3e0775d0d7d44d81b898bbba5a2d9b89d5c33b266f59695ee6107d31978278') +md5sums=('bc18e18882458d9019a36d30fa00518c') +sha256sums=('485f7ba1d14e02ec5e1450ecd46afa3e2a372470f106a47fdfa718884e442aa1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/swami/PKGBUILD b/swami/PKGBUILD index 770d0e9d4..e096675e7 100644 --- a/swami/PKGBUILD +++ b/swami/PKGBUILD @@ -5,37 +5,45 @@ pkgname=swami pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of free software for editing and sharing MIDI instruments and sounds" arch=('i686' 'x86_64') url="http://swami.resonance.org/trac" license=('GPL') depends=('audiofile' 'libgnomecanvas' 'libinstpatch' 'librsvg' 'fluidsynth' - 'gtksourceview' 'hicolor-icon-theme' 'shared-mime-info') + 'fftw' 'gtksourceview2' 'hicolor-icon-theme' 'desktop-file-utils') options=('!libtool') -install=$pkgname.install +install="$pkgname.install" source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") md5sums=('849b40e4a97c4f52faf069006358dd4f') build() { - cd "$srcdir/$pkgname-$pkgver" - # Python2 fix - export PYTHON="python2" + # fPIC fix for x86_64 + [ "$CARCH" = 'x86_64' ] && \ + export CFLAGS="$CFLAGS -fPIC" + + # set python2 + export PYTHON=python2 - # Configure Fix - sed -i "s_echo\( \$PYTHON\)_which\1_g" -i configure + # python2 locate path fix + sed -i "s/echo\( \$PYTHON\)/which\1/g" configure - # X86_64 Fix - CFLAGS="${CFLAGS} -fPIC" + # build against gtksourceview-2.0 + sed -i "s/\(gtksourceview-\)1.0/\12.0/g" configure - ./configure --prefix="/usr" + sed -e "s/\(anguage\)s/\1/" \ + -e "s/_from_mime_type//" \ + -e "s/light/&_syntax/" \ + -i src/swamigui/SwamiguiPythonView.c + + ./configure --prefix=/usr \ + --enable-static=no make } package() { - cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install diff --git a/swami/swami.install b/swami/swami.install index 7ca796d4b..f66b50c37 100644 --- a/swami/swami.install +++ b/swami/swami.install @@ -5,7 +5,7 @@ post_install() { } post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } post_remove() { diff --git a/th06-demo-data/PKGBUILD b/th06-demo-data/PKGBUILD index 4cd6904aa..a60f143fb 100644 --- a/th06-demo-data/PKGBUILD +++ b/th06-demo-data/PKGBUILD @@ -3,7 +3,7 @@ _pkgbase='th06-demo' pkgname="$_pkgbase-data" pkgver=0.13 -pkgrel=3 +pkgrel=4 pkgdesc='Embodiment of Scarlet Devil trial version. Sixth game of the Touhou Project serie; data files.' arch=('i686') url='http://www16.big.or.jp/~zun/html/th06.html' @@ -24,6 +24,7 @@ package() { cd "$srcdir/東方紅魔郷　体験版" install -dm755 "$pkgdir/usr/share/$_pkgbase" + install -m755 *.exe "$pkgdir/usr/share/$_pkgbase" install -m644 *.DAT "$pkgdir/usr/share/$_pkgbase" rename 紅魔郷 '' "$pkgdir/usr/share/$_pkgbase"/* diff --git a/th06-demo/PKGBUILD b/th06-demo/PKGBUILD index e9267c9b9..9be97fa2f 100644 --- a/th06-demo/PKGBUILD +++ b/th06-demo/PKGBUILD @@ -3,7 +3,7 @@ _pkgbase=th06-demo pkgname="$_pkgbase" pkgver=0.13 -pkgrel=1 +pkgrel=2 pkgdesc='Embodiment of Scarlet Devil trial version. Sixth game of the Touhou Project serie.' arch=('i686') url='http://www16.big.or.jp/~zun/html/th06.html' @@ -11,14 +11,12 @@ license=('custom') depends=("$_pkgbase-data" 'wine') makedepends=('lha-autoconf-git') optdepends=('timidity++: for MIDI musics') -source=('http://www16.big.or.jp/~zun/data/soft/kouma_tr013.lzh' "$_pkgbase.desktop" "$_pkgbase.sh") -sha1sums=('dfeb4dd358c6613ec4d8b701d41672ca75b6a0c9' - 'd28ea005b9ef4a901a3e0fb52969972904071126' +source=("$_pkgbase.desktop" "$_pkgbase.sh") +sha1sums=('d28ea005b9ef4a901a3e0fb52969972904071126' '76cd2e8256bb32f6e2b614ac5dd125d18b4fd1f9') build() { cd "$srcdir" - lha e 'kouma_tr013.lzh' } package_th06-demo() { @@ -27,8 +25,4 @@ package_th06-demo() { install -dm755 "$pkgdir/usr/bin" install -m644 "$_pkgbase.sh" "$pkgdir/usr/bin/$_pkgbase" - - cd "$srcdir/東方紅魔郷　体験版" - install -dm755 "$pkgdir/usr/share/$_pkgbase" - install -m755 *.exe "$pkgdir/usr/share/$_pkgbase" } diff --git a/vym-git/PKGBUILD b/vym-git/PKGBUILD index b2f8d942d..c166a32e8 100644 --- a/vym-git/PKGBUILD +++ b/vym-git/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Stefan Husmann pkgname=vym-git -pkgver=20110418 +pkgver=20120122 pkgrel=1 pkgdesc="A mindmapping tool - developement version from git" arch=('i686' 'x86_64') @@ -14,9 +14,11 @@ conflicts=('vym') options=('!emptydirs') source=('vym-git.desktop') md5sums=('ef7cfe93f97803159da7c9a136d58b47') +install=vym.install _gitroot="git://vym.git.sourceforge.net/vym/vym" _gitname="vym" + build() { cd "$srcdir" msg "Connecting to GIT server...." @@ -39,10 +41,8 @@ build() { # BUILD HERE # - qmake PREFIX=/usr + qmake PREFIX=/usr DOCDIR=/usr/share/doc/$pkgname make - gzip -d doc/vym.1.gz - sed -i 's+packages\/++' doc/vym.1 cd tex for _i in *.tex @@ -55,7 +55,7 @@ package() { cd "$srcdir/$_gitname-build" make INSTALL_ROOT=${pkgdir} install - install -Dm644 doc/vym.1 ${pkgdir}/usr/share/man/man1/vym.1 +# install -Dm644 doc/vym.1 ${pkgdir}/usr/share/man/man1/vym.1 cd tex for _i in *.pdf do diff --git a/vym-git/vym.install b/vym-git/vym.install new file mode 100644 index 000000000..9cfbbd315 --- /dev/null +++ b/vym-git/vym.install @@ -0,0 +1,12 @@ +post_install() { + echo "update desktop mime database..." + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/wmfs2-git/PKGBUILD b/wmfs2-git/PKGBUILD index 225fd77a8..453de8065 100644 --- a/wmfs2-git/PKGBUILD +++ b/wmfs2-git/PKGBUILD @@ -2,7 +2,7 @@ pkgname=wmfs2-git pkgver=20120122 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight and highly configurable tiling window manager for X" arch=('i686' 'x86_64') url="http://www.wmfs.info/" diff --git a/xen-4.2/09_xen b/xen-4.2/09_xen new file mode 100755 index 000000000..0251c2400 --- /dev/null +++ b/xen-4.2/09_xen @@ -0,0 +1,123 @@ +#! /bin/sh -e + +if [ -f /usr/lib/grub/grub-mkconfig_lib ]; then + . /usr/lib/grub/grub-mkconfig_lib +else + # no grub file, so we notify and exit gracefully + echo "Cannot find grub config file, exiting." >&2 + exit 0 +fi + +XEN_HYPERVISOR_CMDLINE= +XEN_LINUX_CMDLINE="console=tty0" +[ -r /etc/xen/grub.conf ] && . /etc/xen/grub.conf + +CLASS="--class gnu-linux --class gnu --class os" + +if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux +else + OS="${GRUB_DISTRIBUTOR} GNU/Linux" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}" +fi + +# loop-AES arranges things so that /dev/loop/X can be our root device, but +# the initrds that Linux uses don't like that. +case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` + ;; +esac + +if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ + || [ "`grub-probe -t abstraction --device ${GRUB_DEVICE} | sed -e 's,.*\(lvm\).*,\1,'`" = "lvm" ] ; then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} +else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +fi + +xen_entry () +{ + os="$1" + xen_version="$2" + version="$3" + xen_args="$4" + args="$5" + printf "menuentry 'Xen %s / %s, with Linux %s' --class xen ${CLASS} {\n" "${xen_version}" "${os}" "${version}" + save_default_entry | sed -e "s/^/\t/" + + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" + fi + printf '%s\n' "${prepare_boot_cache}" + cat << EOF + echo '$(printf "Loading Xen %s ..." ${xen_version})' + multiboot ${rel_dirname}/${xen_basename} ${rel_dirname}/${xen_basename} ${xen_args} + echo $(printf "$(gettext "Loading Linux %s ...")" ${version}) + module ${rel_dirname}/${basename} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +EOF + if test -n "${initrd}" ; then + cat << EOF + echo "Loading initial ramdisk ..." + module ${rel_dirname}/${initrd} +EOF + fi + cat << EOF +} +EOF +} + +xen_list=`for i in /boot/xen-*.gz /xen-*.gz ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i "; fi +done` +prepare_boot_cache= + +while [ "x$xen_list" != "x" ] ; do + xen=`version_find_latest $xen_list` + echo "Found Xen hypervisor image: $xen" >&2 + xen_basename=`basename $xen` + xen_dirname=`dirname $xen` + rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname` + xen_version=`echo $xen_basename | sed -e "s,^[^0-9]*-,,g" | sed -e "s,.gz,,g"` + alt_xen_version=`echo $xen_version | sed -e "s,\.old$,,g"` + + xen_configfiles=`grep -l 'CONFIG_XEN_PRIVILEGED_GUEST=y' /boot/config-*` + + list="/boot/vmlinuz-linux"; + + while [ "x$list" != "x" ] ; do + linux=`version_find_latest $list` + echo -e "\tFound linux image: $linux" >&2 + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` + version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` + base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"` + alt_version="${base_init}-fallback" + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + initrd= + + for i in "${base_init}.img"; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break + fi + done + if test -n "${initrd}" ; then + echo -e "\tFound initrd image: ${dirname}/${initrd}" >&2 + else + # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. + linux_root_device_thisversion=${GRUB_DEVICE} + fi + + xen_entry "${OS}" "${xen_version}" "${version}" \ + "${XEN_HYPERVISOR_CMDLINE}" \ + "${XEN_LINUX_CMDLINE}" + + list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` + done + + xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $xen | tr '\n' ' '` +done + diff --git a/xen-4.2/PKGBUILD b/xen-4.2/PKGBUILD new file mode 100644 index 000000000..39c06842b --- /dev/null +++ b/xen-4.2/PKGBUILD @@ -0,0 +1,94 @@ +# Maintainer: Tritron +# This pkgbuild is a modified xen4.1.2 pkgbuild. Most credits go to that maintainer. + +pkgname=xen-4.2 +pkgver=24533 +pkgrel=1 +pkgdesc="Xen 4.2 unstable (hypervisor tools and doc) HG" +arch=(i686 x86_64) +url="http://xen.org/" +license="GPL" +depends=('xz-utils' 'bzip2' 'iproute' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'glibc') +makedepends=('dev86' 'mercurial' 'git' 'ghostscript') +conflicts=('xen' 'xen3' 'xen4' 'xen-hv-tools' 'libxen4') +provides=('xen') +source=(archinit.patch + yajl-patch + 09_xen) + +md5sums=('d3ab9bbae472e613a04dc8e62377ed93' + '647c5edd85ab58483deecbfc6b712635' + '1eb1de5675e4499018a37c3a5de973fe') + +_hgroot="http://xenbits.xensource.com/" +_hgrepo="xen-unstable.hg" + +build() { + + cd "$srcdir" + msg "Connecting to Mercurial server...." + + if [ -d $_hgrepo ] ; then + cd $_hgrepo + hg pull -u || return 1 + msg "The local files are updated." + else + hg clone $_hgroot $_hgrepo || return 1 + fi + + msg "Mercurial checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_hgrepo-build" + cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" + cd "$srcdir/$_hgrepo-build" + + patch -p1 -F99 -i ../archinit.patch + patch -p1 -F99 -i ../yajl-patch + unset CFLAGS LDFLAGS + + make PYTHON=python2 DESTDIR=$pkgdir install-xen + make PYTHON=python2 DESTDIR=$pkgdir install-tools + + sed -i 's#XENDOM_CONFIG=/etc/sysconfig/xendomains#XENDOM_CONFIG=/etc/conf.d/xendomains#' $pkgdir/etc/init.d/xendomains + sed -i "s#touch /var/lock/subsys/xend#mkdir -p /var/lock/subsys\n touch /var/lock/subsys/xend#" $pkgdir/etc/init.d/xend + + [ -d $pkgdir/usr/lib64 ] && ( cd $pkgdir/usr && cp -R lib64/* lib/ && rm -R lib64 ) + ( cd $pkgdir/etc && mv init.d rc.d ) || return 1 + rm -f $pkgdir/usr/share/man/man1/qemu-img.1* \ + $pkgdir/usr/share/man/man1/qemu.1* + # First experiment to generate grub2.cfg entry + mkdir -p $pkgdir/etc/grub.d + chmod +x $srcdir/09_xen + cp $srcdir/09_xen $pkgdir/etc/grub.d + + ############ kill unwanted stuff ############ + # stubdom: newlib +rm -rf $pkgdir/usr/*-xen-elf + +# hypervisor symlinks +rm -rf $pkgdir/boot/xen-4.1.gz +rm -rf $pkgdir/boot/xen-4.gz +rm -rf $pkgdir/boot/xen.gz + +# silly doc dir fun +rm -fr $pkgdir/usr/share/doc/xen +rm -rf $pkgdir/usr/share/doc/qemu + +# Pointless helper +rm -f $pkgdir/usr/sbin/xen-python-path + +# qemu stuff (unused or available from upstream) +rm -rf $pkgdir/usr/share/xen/man +rm -rf $pkgdir/usr/bin/qemu-*-xen +for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \ + pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \ + vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb +do + rm -f $pkgdir/usr/share/xen/qemu/$file +done + +# adhere to Static Library Packaging Guidelines +rm -rf $pkgdir/usr/lib/*.a + +} diff --git a/xen-4.2/archinit.patch b/xen-4.2/archinit.patch new file mode 100644 index 000000000..5a89b549f --- /dev/null +++ b/xen-4.2/archinit.patch @@ -0,0 +1,411 @@ +diff -Naur orig.xen-4.1.1//tools/hotplug/Linux/init.d/xencommons xen-4.1.1//tools/hotplug/Linux/init.d/xencommons +--- orig.xen-4.1.1//tools/hotplug/Linux/init.d/xencommons 2011-07-03 03:08:44.953747064 -0700 ++++ xen-4.1.1//tools/hotplug/Linux/init.d/xencommons 2011-07-05 13:47:54.627029164 -0700 +@@ -18,6 +18,9 @@ + # Description: Starts and stops the daemons neeeded for xl/xend + ### END INIT INFO + ++. /etc/rc.conf ++. /etc/rc.d/functions ++ + if [ -d /etc/sysconfig ]; then + xencommons_config=/etc/sysconfig + else +@@ -26,7 +29,7 @@ + + test -f $xencommons_config/xencommons && . $xencommons_config/xencommons + +-XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid ++XENCONSOLED_PIDFILE=/run/daemons/xenconsoled.pid + shopt -s extglob + + if test "x$1" = xstart && \ +@@ -60,33 +64,39 @@ + time=$(($time+1)) + sleep 1 + done +- echo +- + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then +- echo Could not start xenstored ++ #echo Could not start xenstored ++ stat_fail + exit 1 + fi ++ stat_done + +- echo Setting domain 0 name... ++ stat_busy "Setting domain 0 name..." + xenstore-write "/local/domain/0/name" "Domain-0" ++ stat_done + fi + +- echo Starting xenconsoled... ++ #echo Starting xenconsoled... ++ stat_busy "Starting xenconsoled" + test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" + xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + test -z "$XENBACKENDD_DEBUG" || XENBACKENDD_ARGS="-d" + test "`uname`" != "NetBSD" || xenbackendd $XENBACKENDD_ARGS ++ stat_done ++ add_daemon xencommons + } + do_stop () { +- echo Stopping xenconsoled ++ stat_busy "Stopping xenconsoled" + if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $XENCONSOLED_PIDFILE + fi ++ stat_done + +- echo WARNING: Not stopping xenstored, as it cannot be restarted. ++ printhl "WARNING: Not stopping xenstored, as it cannot be restarted." ++ rm_daemon xencommons + } + + case "$1" in +diff -Naur orig.xen-4.1.1//tools/hotplug/Linux/init.d/xend xen-4.1.1//tools/hotplug/Linux/init.d/xend +--- orig.xen-4.1.1//tools/hotplug/Linux/init.d/xend 2011-07-03 03:08:44.953747064 -0700 ++++ xen-4.1.1//tools/hotplug/Linux/init.d/xend 2011-07-05 01:47:40.981951191 -0700 +@@ -18,6 +18,10 @@ + # Description: Starts and stops the Xen control daemon. + ### END INIT INFO + ++. /etc/rc.conf ++. /etc/rc.d/functions ++ ++ + shopt -s extglob + + # Wait for Xend to be up +@@ -37,23 +41,30 @@ + case "$1" in + start) + if [ -z "`ps -C xenconsoled -o pid=`" ]; then +- echo "xencommons should be started first." ++ printhl "xencommons should be started first." + exit 1 + fi + # mkdir shouldn't be needed as most distros have this already created. Default to using subsys. + # See docs/misc/distro_mapping.txt +- mkdir -p /var/lock +- if [ -d /var/lock/subsys ] ; then +- touch /var/lock/subsys/xend ++ if [ -d /run/lock/subsys ] ; then ++ touch /run/lock/subsys/xend + else +- touch /var/lock/xend ++ touch /run/lock/xend + fi ++ stat_busy "Starting xend" + xend start + await_daemons_up ++ stat_done ++ add_daemon xend + ;; ++ ++ + stop) ++ stat_busy "Stopping xend" + xend stop +- rm -f /var/lock/subsys/xend /var/lock/xend ++ rm -f /run/lock/xend /var/lock/xend ++ stat_done ++ rm_daemon xend + ;; + status) + xend status +@@ -62,8 +73,10 @@ + xend reload + ;; + restart|force-reload) ++ stat_busy "Restarting xend" + xend restart + await_daemons_up ++ stat_done + ;; + *) + # do not advertise unreasonable commands that there is no reason +diff -Naur orig.xen-4.1.1//tools/hotplug/Linux/init.d/xendomains xen-4.1.1//tools/hotplug/Linux/init.d/xendomains +--- orig.xen-4.1.1//tools/hotplug/Linux/init.d/xendomains 2011-07-03 03:08:44.953747064 -0700 ++++ xen-4.1.1//tools/hotplug/Linux/init.d/xendomains 2011-07-05 13:46:36.208222760 -0700 +@@ -26,6 +26,9 @@ + # Description: Start / stop domains automatically when domain 0 + # boots / shuts down. + ### END INIT INFO ++. /etc/rc.conf ++. /etc/rc.d/functions ++ + + CMD=xm + $CMD list &> /dev/null +@@ -46,93 +49,52 @@ + exit 0 + fi + +-# See docs/misc/distro_mapping.txt +-if [ -d /var/lock/subsys ]; then +- LOCKFILE=/var/lock/subsys/xendomains +-else +- LOCKFILE=/var/lock/xendomains +-fi +- +-if [ -d /etc/sysconfig ]; then +- XENDOM_CONFIG=/etc/sysconfig/xendomains +-else +- XENDOM_CONFIG=/etc/default/xendomains +-fi ++LOCKFILE=/run/lock/xendomains ++XENDOM_CONFIG=/etc/default/xendomains + +-test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; ++test -r $XENDOM_CONFIG || { ++ printhl "$XENDOM_CONFIG not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + + . $XENDOM_CONFIG + +-# Use the SUSE rc_ init script functions; +-# emulate them on LSB, RH and other systems +-if test -e /etc/rc.status; then +- # SUSE rc script library +- . /etc/rc.status +-else +- _cmd=$1 +- declare -a _SMSG +- if test "${_cmd}" = "status"; then ++_cmd=$1 ++declare -a _SMSG ++if test "${_cmd}" = "status"; then + _SMSG=(running dead dead unused unknown) + _RC_UNUSED=3 +- else ++else + _SMSG=(done failed failed missed failed skipped unused failed failed) + _RC_UNUSED=6 +- fi +- if test -e /etc/init.d/functions; then +- # REDHAT +- . /etc/init.d/functions +- echo_rc() +- { +- #echo -n " [${_SMSG[${_RC_RV}]}] " +- if test ${_RC_RV} = 0; then +- success " [${_SMSG[${_RC_RV}]}] " +- else +- failure " [${_SMSG[${_RC_RV}]}] " +- fi +- } +- elif test -e /lib/lsb/init-functions; then +- # LSB +- . /lib/lsb/init-functions +- if alias log_success_msg >/dev/null 2>/dev/null; then +- echo_rc() +- { +- echo " [${_SMSG[${_RC_RV}]}] " +- } +- else +- echo_rc() +- { +- if test ${_RC_RV} = 0; then +- log_success_msg " [${_SMSG[${_RC_RV}]}] " +- else +- log_failure_msg " [${_SMSG[${_RC_RV}]}] " +- fi +- } +- fi +- else +- # emulate it +- echo_rc() +- { +- echo " [${_SMSG[${_RC_RV}]}] " +- } +- fi +- rc_reset() { _RC_RV=0; } +- rc_failed() +- { ++fi ++ ++ ++ ++echo_rc() { ++ echo ++ printhl "Return Status: ${_SMSG[${_RC_RV}]}" ++} ++ ++ ++rc_reset() { _RC_RV=0; } ++ ++ ++rc_failed() { + if test -z "$1"; then +- _RC_RV=1; ++ _RC_RV=1; + elif test "$1" != "0"; then +- _RC_RV=$1; +- fi ++ _RC_RV=$1; ++ fi + return ${_RC_RV} +- } +- rc_check() +- { ++} ++ ++rc_check() { + return rc_failed $? +- } +- rc_status() +- { ++} ++ ++ ++rc_status() { + rc_failed $? + if test "$1" = "-r"; then _RC_RV=0; shift; fi + if test "$1" = "-s"; then rc_failed 5; echo_rc; rc_failed 3; shift; fi +@@ -140,26 +102,24 @@ + if test "$1" = "-v"; then echo_rc; shift; fi + if test "$1" = "-r"; then _RC_RV=0; shift; fi + return ${_RC_RV} +- } +- rc_exit() { exit ${_RC_RV}; } +- rc_active() +- { ++} ++ ++ ++rc_exit() { exit ${_RC_RV}; } ++ ++ ++rc_active() { + if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi + if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi + return 1 +- } +-fi ++} + +-if ! which usleep >&/dev/null +-then +- usleep() +- { +- if [ -n "$1" ] +- then +- sleep $(( $1 / 1000000 )) +- fi +- } +-fi ++usleep() { ++ if [ -n "$1" ] ++ then ++ sleep $(( $1 / 1000000 )) ++ fi ++} + + # Reset status of this service + rc_reset +@@ -235,10 +195,12 @@ + start() + { + if [ -f $LOCKFILE ]; then +- echo -e "xendomains already running (lockfile exists)" ++ stat_busy "xendomains already running (lockfile exists)" ++ stat_fail + return; + fi + ++ printhl "Starting Xen Domains" + saved_domains=" " + if [ "$XENDOMAINS_RESTORE" = "true" ] && + contains_something "$XENDOMAINS_SAVE" +@@ -299,6 +261,7 @@ + fi + done + fi ++ add_daemon xendomains + } + + all_zombies() +@@ -352,7 +315,7 @@ + if test "$XENDOMAINS_AUTO_ONLY" = "true"; then + rdnames + fi +- echo -n "Shutting down Xen domains:" ++ printhl "Shutting down Xen domains" + name=;id= + while read LN; do + parseln "$LN" || continue +@@ -465,6 +428,7 @@ + rm -f $LOCKFILE + + exec 2>&3 ++ rm_daemon xendomains + } + + check_domain_up() +diff -Naur orig.xen-4.1.1//tools/hotplug/Linux/init.d/xen-watchdog xen-4.1.1//tools/hotplug/Linux/init.d/xen-watchdog +--- orig.xen-4.1.1//tools/hotplug/Linux/init.d/xen-watchdog 2011-07-03 03:08:44.957080397 -0700 ++++ xen-4.1.1//tools/hotplug/Linux/init.d/xen-watchdog 2011-07-05 13:20:22.515289867 -0700 +@@ -17,49 +17,32 @@ + ### END INIT INFO + # + ++. /etc/rc.conf ++. /etc/rc.d/functions ++ + DAEMON=/usr/sbin/xenwatchdogd + base=$(basename $DAEMON) ++initname="xen-watchdog" + +-# Source function library. +-if [ -e /etc/init.d/functions ] ; then +- . /etc/init.d/functions +-elif [ -e /lib/lsb/init-functions ] ; then +- . /lib/lsb/init-functions +- success () { +- log_success_msg $* +- } +- failure () { +- log_failure_msg $* +- } +-else +- success () { +- echo $* +- } +- failure () { +- echo $* +- } +-fi + + start() { + local r +- echo -n $"Starting domain watchdog daemon: " ++ stat_busy "Starting domain watchdog daemon" + + $DAEMON 30 15 + r=$? +- [ "$r" -eq 0 ] && success $"$base startup" || failure $"$base startup" +- echo ++ [ "$r" -eq 0 ] && stat_done ; add_daemon $initname || stat_fail + + return $r + } + + stop() { + local r +- echo -n $"Stopping domain watchdog daemon: " ++ stat_busy "Stopping domain watchdog daemon" + + killall -USR1 $base 2>/dev/null + r=$? +- [ "$r" -eq 0 ] && success $"$base stop" || failure $"$base stop" +- echo ++ [ "$r" -eq 0 ] && stat_done ; rm_daemon $initname || stat_fail + + return $r + } diff --git a/xen-4.2/yajl-patch b/xen-4.2/yajl-patch new file mode 100644 index 000000000..2140e1589 --- /dev/null +++ b/xen-4.2/yajl-patch @@ -0,0 +1,188 @@ +diff -r f72b99fccfca -r 716d6d48e647 Config.mk +--- a/Config.mk Tue Dec 20 08:31:40 2011 +0100 ++++ b/Config.mk Tue Dec 20 13:52:55 2011 +0100 +@@ -186,6 +186,11 @@ CONFIG_LIBICONV := $(shell export OS=" + . $(XEN_ROOT)/tools/check/funcs.sh; \ + has_lib libiconv.so && echo 'y' || echo 'n') + ++CONFIG_YAJL_VERSION := $(shell export OS="`uname -s`"; \ ++ export CHECK_INCLUDES="$(CHECK_INCLUDES)"; \ ++ . $(XEN_ROOT)/tools/check/funcs.sh; \ ++ has_header yajl/yajl_version.h && echo 'y' || echo 'n') ++ + # Enable XSM security module (by default, Flask). + XSM_ENABLE ?= n + FLASK_ENABLE ?= $(XSM_ENABLE) +diff -r f72b99fccfca -r 716d6d48e647 tools/check/check_yajl_lib +--- a/tools/check/check_yajl_lib Tue Dec 20 08:31:40 2011 +0100 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +@@ -1,6 +0,0 @@ +-#!/bin/sh +-# CHECK-BUILD CHECK-INSTALL +- +-. ./funcs.sh +- +-has_lib libyajl.so.1 || fail "can't find libyajl.so.1 version 1" +diff -r f72b99fccfca -r 716d6d48e647 tools/libxl/Makefile +--- a/tools/libxl/Makefile Tue Dec 20 08:31:40 2011 +0100 ++++ b/tools/libxl/Makefile Tue Dec 20 13:52:55 2011 +0100 +@@ -19,6 +19,10 @@ ifeq ($(CONFIG_Linux),y) + LIBUUID_LIBS += -luuid + endif + ++ifeq ($(CONFIG_YAJL_VERSION),y) ++CFLAGS += -DHAVE_YAJL_VERSION ++endif ++ + LIBXL_LIBS = + LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) + $(LDLIBS_libblktapctl) $(UTIL_LIBS) $(LIBUUID_LIBS) + +diff -r f72b99fccfca -r 716d6d48e647 tools/libxl/libxl_json.c +--- a/tools/libxl/libxl_json.c Tue Dec 20 08:31:40 2011 +0100 ++++ b/tools/libxl/libxl_json.c Tue Dec 20 13:52:55 2011 +0100 +@@ -519,7 +519,11 @@ static bool is_decimal(const char *s, un + return false; + } + ++#ifdef HAVE_YAJL_V2 ++static int json_callback_number(void *opaque, const char *s, size_t len) ++#else + static int json_callback_number(void *opaque, const char *s, unsigned int len) ++#endif + { + libxl__yajl_ctx *ctx = opaque; + libxl__json_object *obj = NULL; +@@ -575,8 +579,13 @@ out: + return 1; + } + ++#ifdef HAVE_YAJL_V2 ++static int json_callback_string(void *opaque, const unsigned char *str, ++ size_t len) ++#else + static int json_callback_string(void *opaque, const unsigned char *str, + unsigned int len) ++#endif + { + libxl__yajl_ctx *ctx = opaque; + char *t = NULL; +@@ -608,8 +617,13 @@ static int json_callback_string(void *op + return 1; + } + ++#ifdef HAVE_YAJL_V2 ++static int json_callback_map_key(void *opaque, const unsigned char *str, ++ size_t len) ++#else + static int json_callback_map_key(void *opaque, const unsigned char *str, + unsigned int len) ++#endif + { + libxl__yajl_ctx *ctx = opaque; + char *t = NULL; +@@ -772,17 +786,26 @@ libxl__json_object *libxl__json_parse(li + DEBUG_GEN_ALLOC(&yajl_ctx); + + if (yajl_ctx.hand == NULL) { ++#ifdef HAVE_YAJL_V2 ++ yajl_ctx.hand = yajl_alloc(&callbacks, NULL, &yajl_ctx); ++#else + yajl_parser_config cfg = { + .allowComments = 1, + .checkUTF8 = 1, + }; + yajl_ctx.hand = yajl_alloc(&callbacks, &cfg, NULL, &yajl_ctx); ++#endif + } + status = yajl_parse(yajl_ctx.hand, (const unsigned char *)s, strlen(s)); + if (status != yajl_status_ok) + goto out; ++ ++#ifdef HAVE_YAJL_V2 ++ status = yajl_complete_parse(yajl_ctx.hand); ++#else ++ status = yajl_parse_complete(yajl_ctx.hand); ++#endif + +- status = yajl_parse_complete(yajl_ctx.hand); + if (status != yajl_status_ok) + goto out; + +@@ -834,14 +857,25 @@ static const char *yajl_gen_status_to_st + char *libxl__object_to_json(libxl_ctx *ctx, const char *type, + libxl__gen_json_callback gen, void *p) + { ++#ifndef HAVE_YAJL_V2 + yajl_gen_config conf = { 1, " " }; ++#endif + const unsigned char *buf; + char *ret = NULL; ++#ifdef HAVE_YAJL_V2 ++ size_t len = 0; ++#else + unsigned int len = 0; ++#endif + yajl_gen_status s; + yajl_gen hand; + ++#ifdef HAVE_YAJL_V2 ++ hand = yajl_gen_alloc(NULL); ++#else + hand = yajl_gen_alloc(&conf, NULL); ++#endif ++ + if (!hand) + return NULL; + +diff -r f72b99fccfca -r 716d6d48e647 tools/libxl/libxl_json.h +--- a/tools/libxl/libxl_json.h Tue Dec 20 08:31:40 2011 +0100 ++++ b/tools/libxl/libxl_json.h Tue Dec 20 13:52:55 2011 +0100 +@@ -17,7 +17,16 @@ + + #include + ++#ifdef HAVE_YAJL_VERSION ++# include ++#endif ++ + #include <_libxl_types_json.h> + #include <_libxl_types_internal_json.h> + ++/* YAJL version check */ ++#if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1) ++# define HAVE_YAJL_V2 1 ++#endif ++ + #endif /* LIBXL_JSON_H */ +diff -r f72b99fccfca -r 716d6d48e647 tools/libxl/libxl_qmp.c +--- a/tools/libxl/libxl_qmp.c Tue Dec 20 08:31:40 2011 +0100 ++++ b/tools/libxl/libxl_qmp.c Tue Dec 20 13:52:55 2011 +0100 +@@ -453,15 +453,26 @@ static char *qmp_send_prepare(libxl__gc + qmp_callback_t callback, void *opaque, + qmp_request_context *context) + { ++#ifndef HAVE_YAJL_V2 + yajl_gen_config conf = { 0, NULL }; ++#endif + const unsigned char *buf = NULL; + char *ret = NULL; ++#ifdef HAVE_YAJL_V2 ++ size_t len = 0; ++#else + unsigned int len = 0; ++#endif + yajl_gen_status s; + yajl_gen hand; + callback_id_pair *elm = NULL; + ++#ifdef HAVE_YAJL_V2 ++ hand = yajl_gen_alloc(NULL); ++#else + hand = yajl_gen_alloc(&conf, NULL); ++#endif ++ + if (!hand) { + return NULL; + } + -- 2.11.4.GIT