summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--artistic/aqsis/PKGBUILD33
-rw-r--r--artistic/aqsis/aqsis.install14
-rw-r--r--community/cppcheck/PKGBUILD6
-rw-r--r--community/deja-dup/PKGBUILD6
-rw-r--r--community/fwbuilder/PKGBUILD31
-rw-r--r--community/fwbuilder/fwbuilder-gcc47.patch13
-rw-r--r--community/fwbuilder/fwbuilder.install12
-rw-r--r--community/keepalived/PKGBUILD13
-rw-r--r--community/keepalived/keepalived.service9
-rw-r--r--community/libcryptui/PKGBUILD6
-rw-r--r--community/mlt/PKGBUILD22
-rw-r--r--community/odt2txt/PKGBUILD21
-rw-r--r--community/ted/PKGBUILD26
-rw-r--r--community/ucarp/PKGBUILD29
-rw-r--r--community/ucarp/ucarp.conf2
-rw-r--r--community/ucarp/ucarp.rc1
-rw-r--r--community/ucarp/ucarp.service9
-rw-r--r--community/zynaddsubfx/PKGBUILD33
-rw-r--r--core/libgcrypt/PKGBUILD16
-rw-r--r--core/libgpg-error/PKGBUILD9
-rw-r--r--core/openssl/PKGBUILD12
-rw-r--r--core/openssl/vpaes.patch69
-rw-r--r--core/rfkill/PKGBUILD7
-rw-r--r--extra/cabal-install/PKGBUILD20
-rw-r--r--extra/freeciv/PKGBUILD8
-rw-r--r--extra/imagemagick/PKGBUILD6
-rw-r--r--extra/lua/PKGBUILD10
-rw-r--r--extra/lua/lua-arch.patch57
-rw-r--r--extra/mpg123/PKGBUILD8
-rw-r--r--extra/sox/PKGBUILD13
-rw-r--r--libre/file-roller-libre/PKGBUILD6
-rw-r--r--libre/file-roller-libre/file-roller.install17
-rw-r--r--libre/liferea-libre/PKGBUILD8
33 files changed, 388 insertions, 164 deletions
diff --git a/artistic/aqsis/PKGBUILD b/artistic/aqsis/PKGBUILD
new file mode 100644
index 000000000..ed04e585e
--- /dev/null
+++ b/artistic/aqsis/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Former contributor: Gino Pezzin <pezzin@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+pkgname=aqsis
+pkgver=1.8.1
+pkgrel=1
+pkgdesc="A high quality, photorealistic, 3D rendering solution"
+arch=('i686' 'x86_64')
+url="http://www.aqsis.org"
+license=('GPL2')
+optdepends=('qt: graphical interface' 'libgl: ptview')
+depends=('boost-libs' 'openexr' 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils')
+makedepends=('cmake' 'boost' 'openexr' 'libpng' 'qt' 'mesa')
+options=('!libtool')
+install=aqsis.install
+source=(http://downloads.sourceforge.net/project/aqsis/aqsis-source/1.8.1/$pkgname-$pkgver.tar.gz)
+md5sums=('1fb9b07c6d3c5195ad72e308fb584598')
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ mkdir -p "$srcdir"/$pkgname-build
+ cd "$srcdir"/$pkgname-build
+
+ cmake "$srcdir"/$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/aqsis
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-build
+ make DESTDIR="$pkgdir" install
+}
diff --git a/artistic/aqsis/aqsis.install b/artistic/aqsis/aqsis.install
new file mode 100644
index 000000000..b2086e07b
--- /dev/null
+++ b/artistic/aqsis/aqsis.install
@@ -0,0 +1,14 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor/
+ update-mime-database usr/share/mime > /dev/null
+ update-desktop-database -q
+}
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 2c6cde67e..0897f0159 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 65291 2012-02-20 15:31:22Z stephane $
+# $Id: PKGBUILD 69536 2012-04-18 02:12:09Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=cppcheck
-pkgver=1.53
+pkgver=1.54
pkgrel=1
pkgdesc="A tool for static C/C++ code analysis"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
depends=('pcre')
makedepends=('docbook-xsl')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('e1c8431cab1ef07c725f1556bdb0fc5d3e912c9f')
+sha1sums=('f63abbd9bda7179c3ce3a399123bd7fb476e4537')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index a8b359d78..52599dcff 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68348 2012-03-22 18:06:16Z bgyorgy $
+# $Id: PKGBUILD 69507 2012-04-17 14:32:37Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=deja-dup
-pkgver=22.0
+pkgver=22.1
pkgrel=1
pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('nautilus: backup extension')
options=('!libtool')
install=$pkgname.install
source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
-md5sums=('b8a71a26cdf3c460a9e5104212527d29')
+md5sums=('cbf7af6f0392ab9ef355a3aeb74c8a79')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD
new file mode 100644
index 000000000..ae559607c
--- /dev/null
+++ b/community/fwbuilder/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id
+# Maintainer: Kevin Piche <kevin@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=fwbuilder
+pkgver=5.1.0.3599
+pkgrel=1
+pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
+url="http://www.fwbuilder.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libxslt' 'net-snmp' 'qt')
+conflicts=('libfwbuilder')
+install=fwbuilder.install
+source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz"
+ 'fwbuilder-gcc47.patch')
+sha256sums=('452514a1ec0be1416bfca93603e6c89deb91d1a3a19671c64b5a8868a3743daf'
+ 'd7c602d5b99c6e40403c0b02e34abf15de83802257ca5ce80ad53d486b692f27')
+
+build() {
+ cd "${srcdir}/fwbuilder-${pkgver}"
+ patch -p1 -i "$srcdir/fwbuilder-gcc47.patch"
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/fwbuilder-${pkgver}"
+ make INSTALL_ROOT="${pkgdir}" install
+}
diff --git a/community/fwbuilder/fwbuilder-gcc47.patch b/community/fwbuilder/fwbuilder-gcc47.patch
new file mode 100644
index 000000000..59cd64a6f
--- /dev/null
+++ b/community/fwbuilder/fwbuilder-gcc47.patch
@@ -0,0 +1,13 @@
+Only in fwbuilder-5.0.1.3592: patches
+Only in fwbuilder-5.0.1.3592: .pc
+diff -upr fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h
+--- fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2011-12-08 02:02:07.000000000 +0100
++++ /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-03-17 22:29:16.317275376 +0100
+@@ -31,6 +31,7 @@
+
+ #include <time.h> //for time_t definition
+ #include <pthread.h>
++#include <unistd.h>
+
+ #include <string>
+ #include <queue>
diff --git a/community/fwbuilder/fwbuilder.install b/community/fwbuilder/fwbuilder.install
new file mode 100644
index 000000000..45f0c2242
--- /dev/null
+++ b/community/fwbuilder/fwbuilder.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index ad7fa29f4..0652947d2 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 69505 2012-04-17 12:51:53Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Andrea Zucchelli <zukka77@gmail.com>
pkgname=keepalived
pkgver=1.2.2
-pkgrel=3
+pkgrel=4
pkgdesc='Failover and monitoring daemon for LVS clusters'
arch=('i686' 'x86_64')
url='http://www.keepalived.org/'
@@ -13,10 +13,12 @@ backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived')
depends=('openssl' 'popt' 'libnl1')
source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
'keepalived.rc'
+ 'keepalived.service'
'keepalived.conf'
'ip_vs_moved.patch')
md5sums=('f68327ca142616a8463d2d105db122cd'
'baeb62a682c2b59d732cea84bf52cc87'
+ '7a327df915700dcd45a049d099c9c42b'
'9c8142da8730ad27a345587dea83ced7'
'87ee19c85adaedd3eb11bea8a5865d47')
@@ -37,8 +39,11 @@ package() {
mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples"
# add initscripts
- install -D -m 755 ../$pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
- install -D -m 644 ../$pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
+ cd ..
+ install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+ install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
+ install -D -m 644 $pkgname.service \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
}
diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service
new file mode 100644
index 000000000..c20f18695
--- /dev/null
+++ b/community/keepalived/keepalived.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Keepalive Daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/keepalived
+ExecStart=/usr/sbin/keepalived --dont-fork $DAEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD
index 3e015cecf..cae4d802c 100644
--- a/community/libcryptui/PKGBUILD
+++ b/community/libcryptui/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69329 2012-04-13 22:06:22Z bgyorgy $
+# $Id: PKGBUILD 69509 2012-04-17 14:38:21Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=libcryptui
-pkgver=3.4.0
+pkgver=3.4.1
pkgrel=1
pkgdesc="Library for OpenPGP prompts"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
options=('!libtool')
install=$pkgname.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('23e84fd9e733e58bd1640b229cfc35830287628125f0f15604ea6aecd606fac7')
+sha256sums=('fad4addf5c5b6588f492a720edce59f925190e4cdf3672984f53b25327f10fd5')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 7913effef..c93ca71ee 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65327 2012-02-21 01:36:41Z spupykin $
+# $Id: PKGBUILD 69518 2012-04-17 19:42:41Z ebelanger $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
# Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -8,7 +8,7 @@
pkgbase=mlt
pkgname=('mlt' 'mlt-python-bindings')
pkgver=0.7.8
-pkgrel=1
+pkgrel=2
pkgdesc="An open source multimedia framework"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.mltframework.org"
@@ -20,7 +20,7 @@ md5sums=('4bdce45d832e065ac4c8c8ca56765e1d')
build() {
# mlt
- cd $srcdir/mlt-$pkgver
+ cd "$srcdir/mlt-$pkgver"
# [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
SSE2=--disable-sse2
@@ -33,7 +33,7 @@ build() {
make
# mlt python bindings
- cd $srcdir/mlt-$pkgver/src/swig/python
+ cd "$srcdir/mlt-$pkgver/src/swig/python"
sed -i 's_path=`which python_path=`which python2_' build
sed -i 's_`python -c_`python2 -c_' build
sed -i 's#python-config#python2-config#' build
@@ -45,16 +45,16 @@ package_mlt() {
optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa")
conflicts=('mlt++<=0.3.8')
- cd $srcdir/mlt-$pkgver
- make DESTDIR=$pkgdir install
+ cd "$srcdir/mlt-$pkgver"
+ make DESTDIR="$pkgdir" install
}
package_mlt-python-bindings() {
depends=('python2' 'mlt')
- cd $srcdir/mlt-$pkgver/src/swig/python
- mkdir -p $pkgdir/usr/lib/python2.7/
- install -m755 mlt.py $pkgdir/usr/lib/python2.7/
- install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
- install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+ cd "$srcdir/mlt-$pkgver/src/swig/python"
+ mkdir -p "$pkgdir/usr/lib/python2.7/"
+ install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
+ install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
+ install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
}
diff --git a/community/odt2txt/PKGBUILD b/community/odt2txt/PKGBUILD
new file mode 100644
index 000000000..8ff16fba4
--- /dev/null
+++ b/community/odt2txt/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 69493 2012-04-17 10:36:52Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Vladimir Chizhov <jagoterr@gmail.com>
+
+pkgname=odt2txt
+pkgver=0.4
+pkgrel=1
+pkgdesc="extracts the text out of OpenDocument Texts"
+url="http://stosberg.net/odt2txt/"
+license=("GPL2")
+arch=('i686' 'x86_64')
+depends=('zlib')
+source=(http://stosberg.net/odt2txt/$pkgname-$pkgver.tar.gz)
+md5sums=('6fe3bd261ce2dde2810244bbe969bbc5')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ make
+ install -Dm755 odt2txt $pkgdir/usr/bin/odt2txt
+ install -Dm644 odt2txt.1 $pkgdir/usr/share/man/man1/odt2txt.1
+}
diff --git a/community/ted/PKGBUILD b/community/ted/PKGBUILD
index d6dede015..b81d0edc9 100644
--- a/community/ted/PKGBUILD
+++ b/community/ted/PKGBUILD
@@ -1,36 +1,40 @@
-# $Id: PKGBUILD 64361 2012-02-11 23:24:27Z allan $
+# $Id: PKGBUILD 69512 2012-04-17 16:00:05Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=ted
-pkgver=2.21
-pkgrel=5
+pkgver=2.22
+pkgrel=1
pkgdesc="An easy rich text processor (with footnote support)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.nllgg.nl/Ted/"
depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2')
license=('GPL')
-source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz
+source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz
ted-2.21-libpng15.patch)
-md5sums=('34ae855938a3b364eb587cca504ba356'
+md5sums=('08162c9164dfdde1d46e41ae64df16be'
'0c339b0fa7aec6b150e07e9027cd360c')
build() {
cd "$srcdir/Ted-$pkgver"
sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile
- patch -p0 -i ../ted-2.21-libpng15.patch
make compile.shared
make package.shared
}
package() {
- cd "$srcdir/Ted-$pkgver"
- mkdir -p "$pkgdir/usr/share/"
- cd "$pkgdir/usr/share/"
- tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz"
+ # unpack package
+ mkdir -p $pkgdir/usr/share
+ cd "$pkgdir/usr/share"
+ tar xzf $srcdir/Ted-$pkgver/tedPackage/*.tar.gz
+ # move bin/* and share/*
mv bin ../
- mkdir -p "$pkgdir/usr/share/man/man1"
+ mv share/* ./
+ rmdir share
+ # move man pages
cd "$pkgdir/usr/share/Ted/"
+ mkdir -p "$pkgdir/usr/share/man/man1"
mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/
+ # fix shell script and move them to /usr/bin
sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh
mv *.sh "$pkgdir/usr/bin/"
}
diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD
index 9b2d22f94..90158ebc1 100644
--- a/community/ucarp/PKGBUILD
+++ b/community/ucarp/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id$
+# $Id: PKGBUILD 69498 2012-04-17 12:05:31Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgname=ucarp
pkgver=1.5.2
-pkgrel=2
+pkgrel=3
pkgdesc='UCARP is a portable implementation of the CARP protocol'
arch=('i686' 'x86_64')
url='http://www.ucarp.org/project/ucarp'
license=('GPL2')
depends=('libpcap')
optdepends=('iproute2')
+backup=('etc/conf.d/ucarp')
source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz"
'ucarp.rc'
'ucarp.conf'
+ 'ucarp.service'
'ucarp.8'
'01-fix-getopt.patch'
'02-fix-downscript-on-error.c')
md5sums=('e3caa733316a32c09e5d3817617e9145'
- 'd941d2978c5b43154a29212115729519'
- '9b27f0cf552511716b1ce3678b7a77ca'
+ '11675170473c7e11131d90c3d64ff333'
+ '79c01b9ba580d2431997efb9df59cf5d'
+ '582d59cd969b6447a710f58bbaf28846'
'05b64a5daeb7aab45a2a59e0f4d83c8f'
'3f20699aaf2ef8139dcd337f1e7f06ab'
'09d26233c37956cf08e629554a91b8cd')
@@ -37,13 +40,6 @@ build() {
}
package() {
- # add initscripts
- install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
- install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
-
- # add manpage
- install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8"
-
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
@@ -55,6 +51,17 @@ package() {
# install README
install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README"
+
+ # add initscripts
+ cd ..
+ install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
+ install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
+ install -D -m 644 $pkgname.service \
+ "${pkgdir}/usr/lib/systemd/system/$pkgname.service"
+
+ # add manpage
+ install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8"
+
}
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ucarp/ucarp.conf b/community/ucarp/ucarp.conf
index 386c1df8f..1fb8eae07 100644
--- a/community/ucarp/ucarp.conf
+++ b/community/ucarp/ucarp.conf
@@ -1,3 +1,3 @@
# vim:set ts=2 sw=2 ft=sh noet:
-DAEMON_OPTS='--daemonize --interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh'
+DAEMON_OPTS='--interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh'
diff --git a/community/ucarp/ucarp.rc b/community/ucarp/ucarp.rc
index 33f40268f..f8c9d54f3 100644
--- a/community/ucarp/ucarp.rc
+++ b/community/ucarp/ucarp.rc
@@ -7,6 +7,7 @@
NAME=ucarp
DAEMON=/usr/sbin/ucarp
PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTS="--daemonize $DAEMON_OPTS"
case "$1" in
start)
diff --git a/community/ucarp/ucarp.service b/community/ucarp/ucarp.service
new file mode 100644
index 000000000..d4afd4d0d
--- /dev/null
+++ b/community/ucarp/ucarp.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=UCARP daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/ucarp
+ExecStart=/usr/sbin/ucarp $DAEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
index a1488fcd8..5469f3265 100644
--- a/community/zynaddsubfx/PKGBUILD
+++ b/community/zynaddsubfx/PKGBUILD
@@ -1,36 +1,39 @@
-# $Id: PKGBUILD 66272 2012-02-23 07:06:41Z spupykin $
+# $Id: PKGBUILD 69533 2012-04-17 22:54:21Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: SpepS <dreamspepser at yahoo dot it>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: DonVla <donvla@users.sourceforge.net>
pkgname=zynaddsubfx
-pkgver=2.4.1
-pkgrel=7
-pkgdesc="An opensource software synthesizer capable of making a countless number of instruments."
+pkgver=2.4.2
+pkgrel=1
+pkgdesc="Opensource software synthesizer capable of making a countless number of instruments."
arch=('i686' 'x86_64')
url="http://zynaddsubfx.sourceforge.net"
license=('GPL')
depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml')
-makedepends=('cmake' 'pkgconfig' 'mesa')
+makedepends=('cmake' 'pkgconfig' 'mesa' 'setconf' 'gendesk')
options=('!emptydirs')
source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2"
- "$pkgname.desktop"
- "$pkgname.svg"
"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch"
- "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch")
-md5sums=('59eb69ce24d6f8c605f8ba43958d0526'
- '5da6735ee59fdfa21f171fdc4d6c80cb'
- '6f7e9c3ce3947088a10c99c46a65431f'
+ "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch"
+ "$pkgname.svg")
+md5sums=('4e1f15fd872f5cc649fc2217676e248e'
'eb95d339ff5deac8c6b54965f04a8c60'
- '49464a33ab9c4250520eda0df7705663')
+ '49464a33ab9c4250520eda0df7705663'
+ '6f7e9c3ce3947088a10c99c46a65431f')
build() {
- cd "$srcdir/ZynAddSubFX-$pkgver"
+ cd "$srcdir"
+ gendesk
+ setconf "$pkgname.desktop" Icon "$pkgname.svg"
+
+ cd "ZynAddSubFX-$pkgver"
# patches
- patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch"
- patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
+# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch"
+# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
+ sed -i '1,1i#include <unistd.h>' src/Nio/NulEngine.cpp
[ -d build ] || mkdir build && cd build
cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack -DGuiModule=fltk ..
diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index ec4077548..84aa8284c 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 130865 2011-07-08 14:06:03Z andyrtr $
+# $Id: PKGBUILD 156348 2012-04-17 15:57:54Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=libgcrypt
pkgver=1.5.0
-pkgrel=1
+pkgrel=3
pkgdesc="a general purpose crypto library based on the code used"
arch=(i686 x86_64 'mips64el')
url="http://www.gnupg.org"
license=('LGPL')
-depends=('libgpg-error>=1.9')
+depends=('libgpg-error>=1.10-2')
options=('!libtool' '!emptydirs')
install=$pkgname.install
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2
@@ -18,24 +18,18 @@ sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- [ "$CARCH" = "i686" ] && EXTRAFLAGS="--disable-aesni-support"
./configure --prefix=/usr \
--disable-static \
- --disable-padlock-support $EXTRAFLAGS
+ --disable-padlock-support #$EXTRAFLAGS
make
}
check() {
cd ${srcdir}/${pkgname}-${pkgver}
- make -k check
+ make check
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-
- # Move dynamic libraries to /lib
- install -d -m755 "${pkgdir}"/lib/
- mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/
- ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so
}
diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD
index d24c58623..382465a09 100644
--- a/core/libgpg-error/PKGBUILD
+++ b/core/libgpg-error/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132298 2011-07-22 15:47:59Z andyrtr $
+# $Id: PKGBUILD 156350 2012-04-17 15:57:56Z andyrtr $
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=libgpg-error
pkgver=1.10
-pkgrel=1
+pkgrel=2
pkgdesc="Support library for libgcrypt"
arch=(i686 x86_64 'mips64el')
url="http://www.gnupg.org"
@@ -29,9 +29,4 @@ check() {
package() {
cd "${srcdir}"/${pkgname}-${pkgver}
make DESTDIR="${pkgdir}/" install
-
- # Move dynamic libraries to /lib
- install -d -m755 "${pkgdir}"/lib/
- mv "${pkgdir}"/usr/lib/libgpg-error.so* "${pkgdir}"/lib/
- ln -sf /lib/libgpg-error.so "${pkgdir}"/usr/lib/libgpg-error.so
}
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 4835d5941..9cf6d19c7 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $
+# $Id: PKGBUILD 156330 2012-04-17 06:27:45Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=openssl
@@ -6,7 +6,7 @@ _ver=1.0.1
# use a pacman compatible version scheme
# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgver=$_ver
-pkgrel=2
+pkgrel=3
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('i686' 'x86_64' 'mips64el')
url='https://www.openssl.org'
@@ -20,13 +20,15 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
'no-rpath.patch'
'gnu-linux-mips64el-gcc.patch'
'ca-dir.patch'
- 'disable-tls12-client.patch')
+ 'disable-tls12-client.patch'
+ 'vpaes.patch')
md5sums=('134f168bc2a8333f19f81d684841710b'
'5bbc0655bda2af95bc8eb568963ce8ba'
'dc78d3d06baffc16217519242ce92478'
'd7115f0cc44df346d7b68c681819f94b'
'3bf51be3a1bbd262be46dc619f92aa90'
- '26432b9d7af63c63828b6405c9185400')
+ '26432b9d7af63c63828b6405c9185400'
+ '55ad53e8ec3db1db6978af55e3ce1b5d')
build() {
cd $srcdir/$pkgname-$_ver
@@ -40,6 +42,8 @@ build() {
patch -p0 -i $srcdir/ca-dir.patch
# workaround for PR#2771
patch -p1 -i $srcdir/disable-tls12-client.patch
+ # fix for PR#2775
+ patch -p1 -i $srcdir/vpaes.patch
# patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch
diff --git a/core/openssl/vpaes.patch b/core/openssl/vpaes.patch
new file mode 100644
index 000000000..2688b0c0a
--- /dev/null
+++ b/core/openssl/vpaes.patch
@@ -0,0 +1,69 @@
+Index: openssl/crypto/aes/asm/vpaes-x86.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v
+rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2>/dev/null
+--- vpaes-x86.pl 2011/12/15 22:20:26 1.5.4.4
++++ vpaes-x86.pl 2012/03/31 16:55:18 1.5.4.5
+@@ -843,6 +843,8 @@
+ &mov ($out,&wparam(1)); # out
+ &mov ($round,&wparam(2)); # len
+ &mov ($key,&wparam(3)); # key
++ &sub ($round,16);
++ &jc (&label("cbc_abort"));
+ &lea ($base,&DWP(-56,"esp"));
+ &mov ($const,&wparam(4)); # ivp
+ &and ($base,-16);
+@@ -853,7 +855,6 @@
+ &mov (&DWP(48,"esp"),$base);
+
+ &mov (&DWP(0,"esp"),$out); # save out
+- &sub ($round,16);
+ &mov (&DWP(4,"esp"),$key) # save key
+ &mov (&DWP(8,"esp"),$const); # save ivp
+ &mov ($out,$round); # $out works as $len
+@@ -896,6 +897,7 @@
+ &mov ($base,&DWP(8,"esp")); # restore ivp
+ &mov ("esp",&DWP(48,"esp"));
+ &movdqu (&QWP(0,$base),"xmm1"); # write IV
++&set_label("cbc_abort");
+ &function_end("${PREFIX}_cbc_encrypt");
+
+ &asm_finish();
+Index: openssl/crypto/aes/asm/vpaes-x86_64.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v
+rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2>/dev/null
+--- vpaes-x86_64.pl 2011/11/14 21:01:17 1.4.4.2
++++ vpaes-x86_64.pl 2012/03/31 16:55:18 1.4.4.3
+@@ -263,7 +263,7 @@
+ pshufb %xmm2, %xmm4 # 4 = sbou
+ pxor %xmm0, %xmm4 # 4 = sb1u + k
+ movdqa 0x70(%r10), %xmm0 # 0 : sbot
+- movdqa .Lk_sr-.Lk_dsbd(%r11), %xmm2
++ movdqa -0x160(%r11), %xmm2 # .Lk_sr-.Lk_dsbd=-0x160
+ pshufb %xmm3, %xmm0 # 0 = sb1t
+ pxor %xmm4, %xmm0 # 0 = A
+ pshufb %xmm2, %xmm0
+@@ -869,6 +869,8 @@
+ ___
+ ($len,$key)=($key,$len);
+ $code.=<<___;
++ sub \$16,$len
++ jc .Lcbc_abort
+ ___
+ $code.=<<___ if ($win64);
+ lea -0xb8(%rsp),%rsp
+@@ -887,7 +889,6 @@
+ $code.=<<___;
+ movdqu ($ivp),%xmm6 # load IV
+ sub $inp,$out
+- sub \$16,$len
+ call _vpaes_preheat
+ cmp \$0,${enc}d
+ je .Lcbc_dec_loop
+@@ -932,6 +933,7 @@
+ .Lcbc_epilogue:
+ ___
+ $code.=<<___;
++.Lcbc_abort:
+ ret
+ .size ${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt
+ ___
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 040eef5b6..611229827 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 142840 2011-11-16 20:25:37Z dan $
+# $Id: PKGBUILD 156346 2012-04-17 15:19:00Z bisson $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=rfkill
pkgver=0.4
-pkgrel=3
+pkgrel=4
pkgdesc="A tool for enabling and disabling wireless devices"
arch=('i686' 'x86_64' 'mips64el')
url="http://linuxwireless.org/en/users/Documentation/rfkill"
license=('custom')
-depends=('glibc' 'filesystem>=2010.01')
source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
60-rfkill.rules
rfkill.conf.d
@@ -31,7 +30,7 @@ package() {
# License
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
# Udev rule
- install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules"
+ install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
# Init script
install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill"
install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill"
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 01aeeea8e..0dc8c8e87 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,29 +3,31 @@
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
pkgname=cabal-install
-pkgver=0.10.4
-pkgrel=3
+pkgver=0.14.0
+pkgrel=1
pkgdesc="The command-line interface for Cabal and Hackage."
url="http://hackage.haskell.org/package/cabal-install"
license=('custom:BSD3')
arch=('i686' 'x86_64' 'mips64el')
makedepends=('haskell-http=4000.2.2-1' 'haskell-zlib=0.5.3.3-3' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1' 'haskell-random=1.0.1.1-1')
depends=('ghc' 'gmp' 'zlib')
-#source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
-# switch back to regular cabal-install once it gets updated...
-source=("http://hackage.haskell.org/packages/archive/cabal-install-ghc74/${pkgver}/cabal-install-ghc74-${pkgver}.tar.gz")
-md5sums=('49b3301cc80775ebf19fe9d949f15df5')
+source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
+md5sums=('638514bd1a5792d75866481852148ae5')
build() {
- cd cabal-install-ghc74-${pkgver}
+ cd cabal-install-${pkgver}
runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr
runhaskell Setup build
}
package() {
- cd cabal-install-ghc74-${pkgver}
+ cd cabal-install-${pkgver}
runhaskell Setup copy --destdir=$pkgdir
- #install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+ # rm license installed to wrong location
+ rm -rf ${pkgdir}/usr/share/doc
+
+ install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
# add bash completion
install -d ${pkgdir}/usr/share/bash-completion/completions
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index d284831b3..08a0e8859 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143020 2011-11-21 02:06:36Z eric $
+# $Id: PKGBUILD 156372 2012-04-17 18:59:36Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=freeciv
-pkgver=2.3.1
+pkgver=2.3.2
pkgrel=1
pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,11 @@ depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
options=('!libtool')
install=freeciv.install
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9d9ee9f48f4c945fc6525139d340443d5a25aac4')
+sha1sums=('e6267b5e0483cf9c29d01793d2f9433e73d62191')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --enable-client=gtk --enable-shared
+ ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client
make
}
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 911ba9b54..3003bdf52 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154479 2012-03-29 01:47:21Z eric $
+# $Id: PKGBUILD 156324 2012-04-17 04:29:39Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.6.2
+pkgver=6.7.6.5
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
perlmagick.rpath.patch)
-sha1sums=('5411be21304520ae6a24d3f3e6d5c60eabdd57af'
+sha1sums=('ecb6d2614ca8f44c1857ff28a88feb083403f7be'
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
build() {
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index 2b567ab04..1c3d9ee33 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153491 2012-03-14 23:43:56Z eric $
+# $Id: PKGBUILD 156332 2012-04-17 10:35:09Z bluewind $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=lua
pkgver=5.1.5
-pkgrel=1
+pkgrel=2
pkgdesc="A powerful light-weight programming language designed for extending applications"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lua.org/"
@@ -14,7 +14,7 @@ options=('!makeflags' '!emptydirs')
source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
lua-arch.patch lua-5.1-cflags.diff)
md5sums=('2e115fe26e435e33b0d5c022e4490567'
- '6c5953f63904bf20a0183cdab05b80de'
+ 'fa25feb70ef9fec975b1c20da5098b3c'
'249582bf1fd861ccf492d2c35a9fe732')
build() {
@@ -23,14 +23,14 @@ build() {
patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
export CFLAGS="$CFLAGS -fPIC"
- make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
+ make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \
INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
linux
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
+ make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \
INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
install
install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
diff --git a/extra/lua/lua-arch.patch b/extra/lua/lua-arch.patch
index cc1f3ce1b..d8650c3a2 100644
--- a/extra/lua/lua-arch.patch
+++ b/extra/lua/lua-arch.patch
@@ -1,8 +1,7 @@
-diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc
---- lua-5.1.orig/etc/lua.pc 2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/etc/lua.pc 2006-03-21 11:52:05.000000000 +0100
-@@ -6,7 +6,7 @@
- V= 5.1
+diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
+--- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200
++++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100
+@@ -8,6 +8,6 @@
# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-prefix= /usr/local
@@ -10,11 +9,23 @@ diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc
INSTALL_BIN= ${prefix}/bin
INSTALL_INC= ${prefix}/include
INSTALL_LIB= ${prefix}/lib
-diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
---- lua-5.1.orig/src/Makefile 2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/src/Makefile 2006-03-21 11:52:09.000000000 +0100
+diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100
++++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100
+@@ -94,7 +94,7 @@
+ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+
+ #else
+-#define LUA_ROOT "/usr/local/"
++#define LUA_ROOT "/usr/"
+ #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT \
+diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
+--- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100
@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd generic linux macosx mingw posix solaris
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
LUA_A= liblua.a
+LUA_SO= liblua.so
@@ -30,26 +41,26 @@ diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
ALL_A= $(LUA_A)
default: $(PLAT)
-@@ -51,6 +52,10 @@
+@@ -51,6 +52,11 @@
$(AR) $@ $?
$(RANLIB) $@
+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? -lm $(MYLDFLAGS)
-+ ln -s $@.5.1 $@
++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO)
+
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-diff -ur lua-5.1.orig/src/luaconf.h lua-5.1/src/luaconf.h
---- lua-5.1.orig/src/luaconf.h 2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/src/luaconf.h 2006-03-21 11:52:05.000000000 +0100
-@@ -82,7 +82,7 @@
- ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+--- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200
++++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100
+@@ -53,7 +53,7 @@
+ all: $(PLAT)
- #else
--#define LUA_ROOT "/usr/local/"
-+#define LUA_ROOT "/usr/"
- #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT \
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test: dummy
+ src/lua test/hello.lua
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index 34064fd85..5571989e1 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154304 2012-03-26 01:26:00Z eric $
+# $Id: PKGBUILD 156357 2012-04-17 16:57:42Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=mpg123
-pkgver=1.13.7
+pkgver=1.13.8
pkgrel=1
pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,8 +17,8 @@ conflicts=('mpg321')
provides=('mpg321')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('33b71c932b87004f3c8fed527b1f9a4b5f4337b2'
- '6f7593c0c14647c61cd57d1a03fe89eb6528aebe')
+sha1sums=('ae6fe5f60502fb694527113dd7508ce042b7256b'
+ '6895e5e3120579418007d705836ae1d3b786e771')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 8f8f8bbbf..241dee6e1 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149755 2012-02-10 04:38:45Z eric $
+# $Id: PKGBUILD 156376 2012-04-17 19:41:18Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=sox
-pkgver=14.3.2
-pkgrel=6
+pkgver=14.4.0
+pkgrel=1
pkgdesc="The Swiss Army knife of sound processing tools"
arch=('i686' 'x86_64' 'mips64el')
url="http://sox.sourceforge.net/"
@@ -17,14 +17,11 @@ optdepends=('libao: for ao plugin'
'wavpack: for wavpack plugin'
'libpulse: for pulse plugin')
options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- sox-14.3.2-ffmpeg.patch)
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
- '86caa6aa86a0bf7a048522114d4efd11acbbda70')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
./configure --prefix=/usr --sysconfdir=/etc \
--with-dyn-default --with-distro="Arch Linux"
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index e5c488b79..14e9eab77 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154606 2012-03-30 12:35:17Z heftig $
+# $Id: PKGBUILD 156381 2012-04-17 20:08:15Z ibiru $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
_pkgname=file-roller
pkgname=file-roller-libre
-pkgver=3.4.0
+pkgver=3.4.1
pkgrel=1
pkgdesc="Archive manipulator for GNOME"
arch=('i686' 'x86_64' 'mips64el')
@@ -25,7 +25,7 @@ options=('!libtool' '!emptydirs')
install=file-roller.install
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('79dfb3bc2e0fb68094180ae1845e4b6c253d5f231e3cf355521193848610c5dc')
+sha256sums=('94600d880ce65ab171a174a83519e4911f570fd000c33497b4805100029ebd8b')
build() {
cd $_pkgname-$pkgver
diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install
index 10a148241..8b17fa3d4 100644
--- a/libre/file-roller-libre/file-roller.install
+++ b/libre/file-roller-libre/file-roller.install
@@ -1,22 +1,13 @@
-pkgname=file-roller
-
post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
+ glib-compile-schemas /usr/share/glib-2.0/schemas
update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
}
post_upgrade() {
- post_install $1
+ post_install
}
-
post_remove() {
- post_install $1
+ post_install
}
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index c2b31d5eb..eb468e4da 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 154470 2012-03-28 23:15:22Z eric $
+# $Id: PKGBUILD 156321 2012-04-17 02:30:26Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor (Parabola): bitlord
# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
_pkgname=liferea
pkgname=liferea-libre
-pkgver=1.8.4
+pkgver=1.8.5
pkgrel=1
pkgdesc="A desktop news aggregator for online news feeds and weblogs"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,8 +20,8 @@ options=('!libtool' '!emptydirs')
install=liferea.install
source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
remove-non-free-suggestions.patch)
-sha1sums=('f887a3928116f56e1b68719c150d40bd1c3c6dff'
- '0d68c567c3d37932a49709c58c37c3f138fd19cb')
+sha1sums=('076cde160fff49a4b8c59fdae0571659ce8acd88'
+ '0d68c567c3d37932a49709c58c37c3f138fd19cb')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"