diff options
Diffstat (limited to 'community')
98 files changed, 1655 insertions, 300 deletions
diff --git a/community/avr-gdb/PKGBUILD b/community/avr-gdb/PKGBUILD index ba22c2407..2dbb56ee0 100644 --- a/community/avr-gdb/PKGBUILD +++ b/community/avr-gdb/PKGBUILD @@ -8,7 +8,7 @@ pkgname=avr-gdb _pkgname=gdb pkgver=7.4 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Debugger for AVR" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gdb/" diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index 5abc52346..7abc25c16 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 73941 2012-07-17 09:53:35Z spupykin $ +# $Id: PKGBUILD 78176 2012-10-17 10:22:59Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman pkgver=1.23 -pkgrel=4 +pkgrel=5 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64') license=('GPL') url="http://blueman-project.org" -depends=('python-notify' 'bluez' 'dbus-python' 'gtk2' 'pygobject' 'startup-notification' +depends=('python2-notify' 'bluez' 'python2-dbus' 'gtk2' 'python2-gobject2' 'startup-notification' 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme' 'libpulse' 'notification-daemon') makedepends=('pyrex' 'intltool') diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 4256d4599..7b7cde8b3 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75753 2012-08-30 21:02:36Z spupykin $ +# $Id: PKGBUILD 78397 2012-10-17 18:44:11Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.11 -pkgrel=2 +pkgver=2.0.12 +pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') url="http://cxx-gtk-utils.sourceforge.net/" @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('30e0299d677fb857bb0291e467408279') +md5sums=('0b85fb1726a8b6fb60292372e6bae7b8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index d4897a6a3..07b489d6d 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72861 2012-06-24 07:28:13Z giovanni $ +# $Id: PKGBUILD 78395 2012-10-17 18:38:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.7 +pkgver=1.4.8 pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('LGPL' 'GPL') depends=('pcsclite' 'libusbx') makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/3730/${pkgname}-${pkgver}.tar.bz2") -md5sums=('907037484e000504dad1ccfe6c36e1f1') +source=("https://alioth.debian.org/frs/download.php/3768/${pkgname}-${pkgver}.tar.bz2") +md5sums=('b6c37110f50b059a8ba94f118cfd679a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 144add3db..b6c03e3d5 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75754 2012-08-30 21:02:43Z spupykin $ +# $Id: PKGBUILD 78310 2012-10-17 14:02:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" @@ -17,9 +17,13 @@ backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc} - "rc-script.patch") + "couchdb.service" + "couchdb.tmpfiles" + "rc-script.patch") md5sums=('a5cbbcaac288831b3d8a08b725657f10' '890a85b22219ea113a4901a289c442f8' + '8914a7ffc6745f94106d96206709acb4' + '1e254ebe32eeb061be64193bafa35dbf' '8a3b1a1ff98a6411827ad991db7a355b') build() { @@ -42,4 +46,7 @@ package() { sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb rm -rf $pkgdir/etc/default/ $pkgdir/var/run + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/couchdb/couchdb.service b/community/couchdb/couchdb.service new file mode 100644 index 000000000..50284f4c3 --- /dev/null +++ b/community/couchdb/couchdb.service @@ -0,0 +1,12 @@ +[Unit] +Description=CouchDB Server + +[Service] +User=couchdb +Type=forking +PermissionsStartOnly=true +ExecStart=/usr/bin/couchdb -b -o /dev/null -e /dev/null +ExecStop=/usr/bin/couchdb -d + +[Install] +WantedBy=multi-user.target diff --git a/community/couchdb/couchdb.tmpfiles b/community/couchdb/couchdb.tmpfiles new file mode 100644 index 000000000..de4378746 --- /dev/null +++ b/community/couchdb/couchdb.tmpfiles @@ -0,0 +1 @@ +d /run/couchdb 0755 couchdb daemon - diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index 456db45ae..d64af7d32 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76034 2012-09-09 18:02:06Z spupykin $ +# $Id: PKGBUILD 78181 2012-10-17 10:23:17Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=('cython' 'cython2') pkgbase=cython pkgver=0.17 -pkgrel=1 +pkgrel=2 pkgdesc="C-Extensions for Python " arch=(i686 x86_64) url="http://www.cython.org" @@ -23,6 +23,8 @@ package_cython() { cd $srcdir/Cython-$pkgver python setup.py install --root=$pkgdir + + sed -i 's|#!.*python|#!/usr/bin/python3|' $pkgdir/usr/bin/* } package_cython2() { diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index a2cecbd7b..41f9b7551 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55000 2011-08-30 09:22:57Z spupykin $ +# $Id: PKGBUILD 78352 2012-10-17 15:16:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64) @@ -14,9 +14,11 @@ backup=('etc/socks.conf' 'etc/sockd.conf') options=('!libtool') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz - sockd.rc) + sockd.rc + sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' - '5110dfd78a2b38fff27a886ee88b58a6') + '5110dfd78a2b38fff27a886ee88b58a6' + '41f1ca885e2383d9db0c29bb7904de65') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -36,4 +38,5 @@ package() { # rc-script install -D -m755 ${srcdir}/sockd.rc ${pkgdir}/etc/rc.d/sockd echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf + install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service } diff --git a/community/dante/sockd.service b/community/dante/sockd.service new file mode 100644 index 000000000..6a18a8b0a --- /dev/null +++ b/community/dante/sockd.service @@ -0,0 +1,11 @@ +[Unit] +Description=SOCKS v4 and v5 compatible proxy server and client + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/sockd.conf +PIDFile=/var/run/sockd.pid +ExecStart=sockd $SOCKD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index fdcdd78dc..c03f041cb 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 69208 2012-04-10 03:44:54Z spupykin $ +# $Id: PKGBUILD 78362 2012-10-17 15:24:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=darkstat pkgver=3.0.715 -pkgrel=2 -pkgdesc="Network statistics gatherer (packet sniffer)." +pkgrel=3 +pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") arch=(i686 x86_64) depends=('libpcap' 'zlib' 'gcc-libs') source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 darkstat + darkstat.service darkstat.conf) install=darkstat.install md5sums=('5b7abc7538dcd8e30667dac150e81d77' '1021f95fabe16cfab4c95f6264d535e5' + 'd22a09fa1f66b2b1afb8521ceea693d6' 'aa9a9effd1e8f08860afcd6439fc94c5') build() { @@ -30,4 +32,5 @@ package() { # darkstat script install -D -m755 "$srcdir"/darkstat "$pkgdir"/etc/rc.d/darkstat install -D -m644 "$srcdir"/darkstat.conf "$pkgdir"/etc/conf.d/darkstat.conf + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/darkstat/darkstat.service b/community/darkstat/darkstat.service new file mode 100644 index 000000000..5e303411f --- /dev/null +++ b/community/darkstat/darkstat.service @@ -0,0 +1,15 @@ +[Unit] +Description=Network statistics gatherer (packet sniffer) + +[Service] +User=couchdb +Type=forking +EnvironmentFile=/etc/conf.d/darkstat.conf +PIDFile=/var/darkstat/darkstat.pid +ExecStart=/usr/sbin/darkstat --user "darkstat" --chroot "/var/darkstat" \ + --import "darkstat.dat" --export "darkstat.dat" \ + --pidfile /var/darkstat/darkstat.pid \ + -i "$DARKSTAT_IFACE" $DARKSTAT_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD index a09ddcb79..6400d7956 100644 --- a/community/dee/PKGBUILD +++ b/community/dee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75926 2012-09-05 16:57:29Z bgyorgy $ +# $Id: PKGBUILD 78182 2012-10-17 10:23:20Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=dee pkgver=1.0.14 -pkgrel=1 +pkgrel=2 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" arch=('i686' 'x86_64') url="https://launchpad.net/dee" @@ -29,6 +29,6 @@ package() { make DESTDIR="$pkgdir/" install # Install GI overrides for python 3 as well - install -dm755 "$pkgdir/usr/lib/python3.2/site-packages/gi/overrides" - ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.2/site-packages/gi/overrides/Dee.py" + install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides" + ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py" } diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 7582d22f7..b28c2b551 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 71055 2012-05-22 21:28:05Z lfleischer $ +# $Id: PKGBUILD 78184 2012-10-17 10:23:31Z allan $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.19 -pkgrel=1 +pkgrel=2 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64') url='http://www.nongnu.org/duplicity/' license=('GPL') -depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface' 'python-paramiko') +depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) md5sums=('c88122d0b651f84f3bfa42e55591c36b' 'df672ed47b8eb4fd8ffa99711623b6b5') @@ -22,7 +22,11 @@ build() { sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py install --root="$pkgdir" --optimize=1 # fix broken documentation permissions until upstream does (FS#27301) diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 87f4d10e8..453925d4a 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 72201 2012-06-10 19:51:58Z foutrelis $ +# $Id: PKGBUILD 78187 2012-10-17 10:23:42Z allan $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=gcompris pkgver=12.05 -pkgrel=1 +pkgrel=2 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64') url="http://gcompris.net/" license=('GPL3') -depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite' +depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python2-pysqlite' 'gstreamer0.10-base-plugins') optdepends=('gnucap: for computer simulation within the electricity activity' 'tuxpaint: for the painting activity' diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index ee46e850e..82f7ed14e 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77640 2012-10-13 11:43:07Z allan $ +# $Id: PKGBUILD 78189 2012-10-17 10:23:49Z allan $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: fana-m <geminin@gmx.net> @@ -7,7 +7,7 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=13 +pkgrel=14 _fixedrevision=5208 pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)" url="http://gigi.sourceforge.net/" @@ -66,6 +66,11 @@ package() { sed -i "s:$srcdir:/:g" "$f" done + msg2 "Fixing python3 shebang..." + for f in `find "$pkgdir/usr" -name "*.py"`; do + sed -i "s:/env python:/python3:g" "$f" + done + msg2 "Packaging license..." install -Dm 644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index 4a6a82c1d..1f63c7d37 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71937 2012-06-03 21:24:21Z spupykin $ +# $Id: PKGBUILD 78354 2012-10-17 15:17:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64') url="http://gnunet.org" @@ -17,10 +17,12 @@ options=('!libtool' '!makeflags') install=gnunet.install source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz gnunet.rc + gnunet.service gnunet.conf.d defaults.conf) -md5sums=('7d2b75d8662804b8047c98ed59979dcb' +md5sums=('4234ad22e3204941773632a1d0c2e0e8' '5baf691913b007fb33e365239e3f7217' + '54cce3d2415d95b2e5bd1bd88db3a0ea' 'f161b46915736e4017e77ad735521453' '0fe23b2ca5b3fc47a0b5645e04406da0') @@ -38,4 +40,5 @@ package() { install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd install -D -m0644 $srcdir/defaults.conf $pkgdir/etc/gnunetd.conf rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/gnunet/gnunet.service b/community/gnunet/gnunet.service new file mode 100644 index 000000000..5625978a5 --- /dev/null +++ b/community/gnunet/gnunet.service @@ -0,0 +1,10 @@ +[Unit] +Description=A framework for secure peer-to-peer networking + +[Service] +User=nobody +Type=forking +ExecStart=/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD index b1903b387..f5e1eaffd 100644 --- a/community/guake/PKGBUILD +++ b/community/guake/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 74682 2012-08-02 06:19:50Z bgyorgy $ +# $Id: PKGBUILD 78192 2012-10-17 10:24:02Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org> pkgname=guake pkgver=0.4.4 -pkgrel=1 +pkgrel=2 pkgdesc='Drop-down terminal for GNOME' arch=('i686' 'x86_64') url="http://guake.org/" license=('GPL') -depends=('python-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') +depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool') options=('!libtool') install=$pkgname.install diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD index 833cadbd0..dcb0e0c78 100644 --- a/community/gwibber/PKGBUILD +++ b/community/gwibber/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72619 2012-06-17 14:19:03Z bgyorgy $ +# $Id: PKGBUILD 78193 2012-10-17 10:24:07Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=gwibber pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku" arch=('i686' 'x86_64') url="http://gwibber.com/" license=('GPL') -depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python-egenix-mx-base' 'python2-oauth' 'python-imaging' 'pyxdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python2-egenix-mx-base' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool' 'vala>=0.15.0') options=('!libtool') install=$pkgname.install diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index 4d8e06c53..d5998b124 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77347 2012-10-09 04:17:42Z tdziedzic $ +# $Id: PKGBUILD 78308 2012-10-17 13:44:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-hslogger -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) -md5sums=('e0737887b0df75a3781989c8f6689850') +md5sums=('d94e39cd6a262565cf0758a6ead74919') build() { cd ${srcdir}/hslogger-${pkgver} diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD index 698537172..88e1233e9 100644 --- a/community/ibus/PKGBUILD +++ b/community/ibus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75443 2012-08-24 03:59:47Z ebelanger $ +# $Id: PKGBUILD 78196 2012-10-17 10:24:17Z allan $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,13 +6,13 @@ pkgname=ibus pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') url="http://ibus.googlecode.com" license=('LGPL') depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \ - 'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme') + 'iso-codes' 'librsvg' 'python2-notify' 'hicolor-icon-theme') makedepends=('intltool' 'gobject-introspection') optdepends=('notification-daemon') options=('!libtool') diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index 67e672807..1ca011b8c 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77124 2012-10-05 11:03:22Z spupykin $ +# $Id: PKGBUILD 78385 2012-10-17 16:23:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> pkgname=ipsec-tools pkgver=0.8.0 -pkgrel=4 +pkgrel=5 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64') url="http://ipsec-tools.sourceforge.net/" @@ -15,11 +15,13 @@ options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 racoon.rc ipsec.rc - racoon.service) + racoon.service + ipsec.service) md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' '416b8e362d86987b8c55f7153cdafbeb' '90d0810267cbd847383ae3101699b192' - '1632fce55ba5592dea1f8bf661106e7d') + '1632fce55ba5592dea1f8bf661106e7d' + 'bc05a2b85e41bf89dac809657e857730') build() { cd $srcdir/$pkgname-$pkgver @@ -36,4 +38,5 @@ package() { install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service + install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service } diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service new file mode 100644 index 000000000..63db40b22 --- /dev/null +++ b/community/ipsec-tools/ipsec.service @@ -0,0 +1,11 @@ +[Unit] +Description=Load IPSec Security Policy Database +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf +ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F + +[Install] +WantedBy=multi-user.target diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index 2f92c0577..e58ee970d 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74858 2012-08-07 14:19:39Z spupykin $ +# $Id: PKGBUILD 78201 2012-10-17 10:24:34Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> pkgname=ktoblzcheck pkgver=1.39 -pkgrel=1 +pkgrel=3 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64) url="http://ktoblzcheck.sourceforge.net" @@ -13,18 +13,18 @@ license=("LGPL") depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz - ktoblzcheck-python3.patch) + ktoblzcheck-python3.patch) md5sums=('ef5efd6e2c31aaf6405060ec477c200c' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { cd "$srcdir/ktoblzcheck-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr patch -p1 <$srcdir/ktoblzcheck-python3.patch make } package() { cd "$srcdir/ktoblzcheck-$pkgver" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD index 7661c0698..fb7abe438 100644 --- a/community/luafilesystem/PKGBUILD +++ b/community/luafilesystem/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 66063 2012-02-22 17:23:57Z cbrannon $ +# $Id: PKGBUILD 78389 2012-10-17 16:41:35Z bpiotrowski $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> + pkgname=luafilesystem -pkgver=1.5.0 -pkgrel=2 -pkgdesc="File System Library for the Lua Programming Language" +pkgver=1.6.2 +pkgrel=1 +pkgdesc='File System Library for the Lua Programming Language' arch=('i686' 'x86_64') -url="http://www.keplerproject.org/luafilesystem/" +url='http://www.keplerproject.org/luafilesystem/' license=('MIT') -depends=(lua) +depends=('lua') source=(http://github.com/downloads/keplerproject/$pkgname/$pkgname-$pkgver.tar.gz LICENSE) +md5sums=('4e7ec93678c760c4e42cea7d28aafa13' + 'beb2b58c4b5c2782304a5b0267a5651b') build() { - cd "$srcdir/$pkgname-$pkgver" - make + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir/usr } package() { - cd "$srcdir/$pkgname-$pkgver" - install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm755 src/lfs.so "$pkgdir/usr/lib/lua/5.1/lfs.so" + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir/usr install + install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } - -md5sums=('3cf4882bbce956e7a0b010f148f194a3' - 'beb2b58c4b5c2782304a5b0267a5651b') diff --git a/community/luajit/Makefile.patch b/community/luajit/Makefile.patch index 69e172145..395a04501 100644 --- a/community/luajit/Makefile.patch +++ b/community/luajit/Makefile.patch @@ -1,6 +1,15 @@ ---- Makefile.orig 2011-12-14 15:15:00.000000000 +0100 -+++ Makefile 2012-03-04 14:53:43.137778596 +0100 -@@ -41,7 +41,7 @@ +--- Makefile.orig 2012-10-16 20:30:00.000000000 +0200 ++++ Makefile 2012-10-17 17:17:05.707727130 +0200 +@@ -34,7 +34,7 @@ + INSTALL_SHARE= $(DPREFIX)/share + INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) + +-INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) ++INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit + INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit + INSTALL_LMODD= $(INSTALL_SHARE)/lua + INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) +@@ -43,7 +43,7 @@ INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index 7a9480d86..97f18eda2 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,37 +1,35 @@ -# $Id: PKGBUILD 70509 2012-05-09 20:30:54Z bpiotrowski $ +# $Id: PKGBUILD 78364 2012-10-17 15:26:40Z bpiotrowski $ # Maintainer: Chris Brannon <chris@the-brannons.com> # Maintainer: Bartłomiej Piotrowski # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> pkgname=luajit -pkgver=2.0.0b10 -pkgrel=1 -pkgdesc="A Just-In-Time Compiler for Lua" +pkgver=2.0.0b11 +pkgrel=2 +pkgdesc='A Just-In-Time Compiler for Lua' arch=('i686' 'x86_64') -url="http://luajit.org/" +url='http://luajit.org/' license=('MIT') depends=('gcc-libs') -source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz" - 'luaconf.patch' - 'Makefile.patch') -md5sums=('ed66689b96f7ad7bfeffe0b4ff2d63d4' - 'c8da9c6790e20a12a0e2496f438d9dc3' - '8997c5e5fa4f6e8e0b86cc6b888de631') +source=(http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz + Makefile.patch) +md5sums=('824aa2684a11e3cc3abe87350a7b6139' + 'c9dff2a84424fa0af322379a5f115fb7') build() { - cd "$srcdir/LuaJIT-${pkgver/b/-beta}" - - patch -Np0 -i "$srcdir/luaconf.patch" - patch -Np0 -i "$srcdir/Makefile.patch" - + cd $srcdir/LuaJIT-${pkgver/b/-beta} + patch -Np0 -i $srcdir/Makefile.patch make } package() { - cd "$srcdir/LuaJIT-${pkgver/b/-beta}" - make install DESTDIR="$pkgdir" PREFIX=/usr + cd $srcdir/LuaJIT-${pkgver/b/-beta} + make install DESTDIR=$pkgdir PREFIX=/usr + + install -Dm644 $srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT \ + $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT - install -Dm644 "$srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT" \ - "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" + # Poor man's slot system + ln -s /usr/share/$pkgname $pkgdir/usr/share/$pkgname-${pkgver/b/-beta} } diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index a635b2fe0..30718c787 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76207 2012-09-14 04:30:59Z bpiotrowski $ +# $Id: PKGBUILD 78391 2012-10-17 16:47:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> @@ -6,12 +6,12 @@ pkgname=luakit pkgver=2012.09.13.r1 _pkgver=2012.09.13-r1 -pkgrel=1 +pkgrel=2 pkgdesc='Fast, small, webkit based browser framework extensible by Lua' arch=('i686' 'x86_64') url='http://www.luakit.org/projects/luakit' license=('GPL3') -depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit') +depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils') makedepends=('git' 'help2man') options=(!makeflags) install='luakit.install' @@ -20,7 +20,7 @@ md5sums=('77b02e6d19ba021409f1778fddd94a42') build() { cd mason-larobina-luakit-* - make USE_LUAJIT=1 PREFIX=/usr DESTDIR=$pkgdir all + make PREFIX=/usr DESTDIR=$pkgdir all } package() { diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 0f59eb835..704adc119 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 76091 2012-09-11 09:36:55Z stativ $ +# $Id: PKGBUILD 78368 2012-10-17 15:33:35Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays -pkgver=1.0 -_pkgver=77f43d452539 -pkgrel=1 +pkgver=1.1 +_pkgver=589aa5dac899 +pkgrel=2 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') depends=('freeimage' 'freeglut' 'glew' 'libcl') -makedepends=('cmake' 'boost' 'opencl-headers') +makedepends=('cmake' 'boost' 'mesa' 'opencl-headers') source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('04dbda4a999f60a9ec26418bac5243cd') +md5sums=('7513d71148fa14bc1779b816816580b9') build() { cd "$srcdir/luxrender-$pkgname-$_pkgver" diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index c3211a00e..be12d5880 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76093 2012-09-11 09:48:44Z stativ $ +# $Id: PKGBUILD 78304 2012-10-17 13:34:29Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> pkgname=luxrender -pkgver=1.0 -_pkgver=a041e87b9732 -pkgrel=1 +pkgver=1.1 +_pkgver=4b4289cda943 +pkgrel=2 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" @@ -16,25 +16,22 @@ optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ 'nvidia-utils: OpenCL support for nVidia GPUs' \ 'amdstream: OpenCL support for AMD GPUs' \ 'intel-opencl-sdk: OpenCL support for Intel CPUs') -makedepends=('cmake' 'boost' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers') -source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ - boost_1.50_fix.diff) -md5sums=('28228a8ef311aa5e665e7b9d3708b026' - '4cddc606ef3ea7f0bbbc9b3415be38b0') +makedepends=('cmake' 'boost' 'mesa' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers') +source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2) +md5sums=('accca65afdc4cc38db49a6e54f20e0f2') build() { cd "$srcdir"/luxrender-lux-$_pkgver - # fix for boost 1.50 - # the boost::TIME_UTC has been renamed due to the conflict with C++11 - patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true + # fix the installation + sed -i '/.*wxgui.*/ d' CMakeLists.txt export CXXFLAGS="$CXXFLAGS -lpthread" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ . make } @@ -47,7 +44,7 @@ package() { [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so } # vim:set ts=2 sw=2 et: diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index 4398de8b7..907cb531f 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 76639 2012-09-25 15:05:50Z spupykin $ +# $Id: PKGBUILD 78383 2012-10-17 15:54:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy pkgver=2.5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" arch=('i686' 'x86_64') license=('GPL') depends=('python2' 'libnetfilter_conntrack' 'iptables' - 'python-application' 'python-cjson' 'python-gnutls') + 'python2-application' 'python2-cjson' 'python2-gnutls') #backup=('opt/mediaproxy/config.ini') source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz" - "mediaproxy.init") + "mediaproxy.init" + "mediaproxy-dispatcher.service" + "mediaproxy-relay.service" + "mediaproxy.tmpfiles") md5sums=('840de8f52e656991be728c15ec30bb5e' - '64042f4686de69a9bdd27d51cbe8a548') + '66f4417f40dda0dfa31569ee4ccc32c7' + '4a1fa0b6ce0a8bd44bf0f1d9d36a6154' + '23c1a584835de00a958ef963cdd40040' + '60a25f2cb6429a0a7d62d45d0c75a0ea') build() { cd $srcdir/mediaproxy-$pkgver install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy python2 setup.py install --root=$pkgdir + install -Dm0644 $srcdir/$pkgname-dispatcher.service $pkgdir/usr/lib/systemd/system/$pkgname-dispatcher.service + install -Dm0644 $srcdir/$pkgname-relay.service $pkgdir/usr/lib/systemd/system/$pkgname-relay.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/mediaproxy/mediaproxy-dispatcher.service b/community/mediaproxy/mediaproxy-dispatcher.service new file mode 100644 index 000000000..500bb33c7 --- /dev/null +++ b/community/mediaproxy/mediaproxy-dispatcher.service @@ -0,0 +1,11 @@ +[Unit] +Description=Mediaproxy dispatcher service +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/var/run/mediaproxy/dispatcher.pid +ExecStart=media-dispatcher + +[Install] +WantedBy=multi-user.target diff --git a/community/mediaproxy/mediaproxy-relay.service b/community/mediaproxy/mediaproxy-relay.service new file mode 100644 index 000000000..2618800e6 --- /dev/null +++ b/community/mediaproxy/mediaproxy-relay.service @@ -0,0 +1,11 @@ +[Unit] +Description=Mediaproxy relay service +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/var/run/mediaproxy/relay.pid +ExecStart=media-relay + +[Install] +WantedBy=multi-user.target diff --git a/community/mediaproxy/mediaproxy.init b/community/mediaproxy/mediaproxy.init index c8c600aea..ba9fe90b2 100755 --- a/community/mediaproxy/mediaproxy.init +++ b/community/mediaproxy/mediaproxy.init @@ -1,6 +1,6 @@ #!/bin/sh -# -# mediaproxy starts and stops the SER MediaProxy server + +# mediaproxy starts and stops the SER MediaProxy server . /etc/rc.conf . /etc/rc.d/functions @@ -14,19 +14,19 @@ case "$1" in else stat_done fi - ;; + ;; stop) stat_busy "Stopping mediaproxy" - kill `cat /var/run/mediaproxy/relay.pid` - kill `cat /var/run/mediaproxy/dispatcher.pid` - stat_done - ;; + kill `cat /var/run/mediaproxy/relay.pid` + kill `cat /var/run/mediaproxy/dispatcher.pid` + stat_done + ;; restart) - $0 stop - sleep 3 - $0 start - ;; + $0 stop + sleep 3 + $0 start + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" ;; esac diff --git a/community/mediaproxy/mediaproxy.tmpfiles b/community/mediaproxy/mediaproxy.tmpfiles new file mode 100644 index 000000000..a102c489f --- /dev/null +++ b/community/mediaproxy/mediaproxy.tmpfiles @@ -0,0 +1 @@ +d /var/run/mediaproxy 0755 root root - diff --git a/community/mezogis/PKGBUILD b/community/mezogis/PKGBUILD index bed55dc27..ec459f9fd 100644 --- a/community/mezogis/PKGBUILD +++ b/community/mezogis/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67954 2012-03-16 12:03:52Z giovanni $ +# $Id: PKGBUILD 78274 2012-10-17 10:28:19Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=mezogis pkgver=0.1.5 -pkgrel=5 +pkgrel=6 pkgdesc="A GIS application to query and analyse spatial data" arch=('i686' 'x86_64') url="http://www.mezogis.org" license=('GPL') -depends=('pygtk' 'python-geotypes' 'postgis') +depends=('pygtk' 'python2-geotypes' 'postgis') source=("http://www.mezogis.org/files/mezogis-$pkgver.tar.gz") md5sums=('1f886b849109a1a1bd3e165353b82368') diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD index dd7628a23..46f8b95f2 100644 --- a/community/neatx/PKGBUILD +++ b/community/neatx/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 69462 2012-04-16 14:21:32Z spupykin $ +# $Id: PKGBUILD 78204 2012-10-17 10:24:52Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nicolas Doualot <packages@slubman.info> pkgname=neatx pkgver=0.3.1 -pkgrel=12 +pkgrel=13 pkgdesc="A free NX server by google" arch=('i686' 'x86_64') url="http://code.google.com/p/neatx/" license=('GPL') -depends=('nxserver' 'python-pexpect' 'python-simplejson' 'netcat' 'pygtk') +depends=('nxserver' 'python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk') makedepends=('docutils') optdepends=('xorg-xdm: if you want to use KDE or GNOME session' 'xorg-fonts-misc: to use default font' @@ -26,6 +26,11 @@ build() { ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html2 make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install chmod 777 "$pkgdir/var/lib/neatx/sessions" diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index ef038dab1..1571a4dc7 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76260 2012-09-15 09:38:36Z bgyorgy $ +# $Id: PKGBUILD 78206 2012-10-17 10:25:00Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard -pkgver=0.98.0 -pkgrel=2 +pkgver=0.98.1 +pkgrel=1 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" arch=('i686' 'x86_64') url="https://launchpad.net/onboard" @@ -15,10 +15,13 @@ optdepends=('at-spi2-atk: auto-show when editing text' options=('!emptydirs') install=$pkgname.install source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('0a2627840740f271e5daba4c1c9c9096') +md5sums=('107e031b429329b71deb67c9b90195d6') package() { cd "$srcdir/$pkgname-$pkgver" - python setup.py install --root=$pkgdir/ --optimize=1 + # Do not set getpreferredencoding, because it breaks getstatusoutput() in the setup script + sed -i '/getpreferredencoding =/ d' setup.py + + python3 setup.py install --root=$pkgdir/ --optimize=1 } diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index b822689f8..8bfab528d 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75522 2012-08-26 20:09:44Z spupykin $ +# $Id: PKGBUILD 78344 2012-10-17 14:52:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim pkgver=2.6.7 -pkgrel=1 +pkgrel=2 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" @@ -15,11 +15,13 @@ options=(!libtool) backup=(etc/conf.d/opendkim) install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz - opendkim.conf - opendkim.rc) + opendkim.conf + opendkim.rc + opendkim.service) md5sums=('8dd327c1c3f3ffdbc436ef7df877940e' '3e2bb1058ac0662f01e675aa6ac7ee8f' - '093f5c098a45cc68753f97e45a5b374c') + '093f5c098a45cc68753f97e45a5b374c' + 'bc1b73856bc1941faaa4842e00437cb5') build() { cd "$srcdir/$pkgname-$pkgver" @@ -55,4 +57,6 @@ package() { for f in LICENSE LICENSE.Sendmail; do ln -s ../../doc/opendkim/$f "$pkgdir/usr/share/licenses/opendkim/$f" done + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/opendkim/opendkim.service b/community/opendkim/opendkim.service new file mode 100644 index 000000000..d34c62960 --- /dev/null +++ b/community/opendkim/opendkim.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenDKIM daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/opendkim +ExecStart=/usr/sbin/opendkim $OPENDKIM_FILTER + +[Install] +WantedBy=multi-user.target diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 8ce667753..06f1f7ed1 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76218 2012-09-14 10:04:13Z spupykin $ +# $Id: PKGBUILD 78328 2012-10-17 14:22:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips pkgver=1.8.1 -pkgrel=1 +pkgrel=3 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') @@ -24,9 +24,11 @@ license=('GPL') install=opensips.install options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz - opensips.init) -md5sums=('b3d10665ba7a47d440d60391f162dfd2' - '685fbe00826df1285b410d4610dcbb0c') + opensips.init + opensips.service) +md5sums=('9fa0f8b7c58668ff4669e5c54bf4c00a' + '685fbe00826df1285b410d4610dcbb0c' + '0d80ef75b5c10324e6db790b7741c2eb') build() { @@ -64,4 +66,6 @@ build() cd $pkgdir/etc find -type f -exec sed -i "s#$pkgdir##" {} \; + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service new file mode 100644 index 000000000..042ff7c9a --- /dev/null +++ b/community/opensips/opensips.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenSIPS daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/var/run/opensips.pid +ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index 04fb34f64..81b659984 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66263 2012-02-23 05:35:33Z spupykin $ +# $Id: PKGBUILD 78366 2012-10-17 15:27:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: jlvsimoes pkgname=osiris pkgver=4.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="A file integrity management system" arch=('i686' 'x86_64') url="http://osiris.shmoo.com/" @@ -14,10 +14,14 @@ install=$pkgname.install #source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz osirismd.init - osirisd.init) + osirisd.init + osirismd.service + osirisd.service) md5sums=('1951c7dc0fe729af9ffaf58910340d12' - '44281b8fc30ab3d452c6f35d3539d7ff' - 'b859445803e4df59a4f82d7f411e1297') + '96c1ba5433bd0ed7d9520583a07b9bdd' + 'b6dde0a539ca798fa81489f717507f25' + '48644676b88b231803785b8e2da956e5' + 'c0355b453770f6bbc6a58f5cd80766b4') build() { cd $srcdir/$pkgname-$pkgver @@ -38,4 +42,7 @@ build() { install -D -m755 $srcdir/osirismd.init $pkgdir/etc/rc.d/osirismd install -D -m755 $srcdir/osirisd.init $pkgdir/etc/rc.d/osirisd rm -rf $pkgdir/usr/osiris + + install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service + install -Dm0644 $srcdir/osirismd.service $pkgdir/usr/lib/systemd/system/osirismd.service } diff --git a/community/osiris/osiris.install b/community/osiris/osiris.install index 5b139f45f..24497d8fd 100644 --- a/community/osiris/osiris.install +++ b/community/osiris/osiris.install @@ -1,10 +1,10 @@ post_install() { - if [ ! `/bin/grep osiris /etc/group` ]; then - /usr/sbin/groupadd -g 18 osiris &>/dev/null; + if [ ! `grep osiris etc/group` ]; then + groupadd -g 18 osiris &>/dev/null; fi - /usr/bin/id osiris &>/dev/null || \ - /usr/sbin/useradd -u 18 -g osiris -d /var/lib/osiris -s /bin/false osiris + id osiris &>/dev/null || \ + useradd -u 18 -g osiris -d /var/lib/osiris -s /bin/false osiris } post_upgrade() { @@ -12,12 +12,6 @@ post_upgrade() { } pre_remove() { - /usr/sbin/userdel osiris &> /dev/null - /usr/sbin/groupdel osiris &> /dev/null + userdel osiris &> /dev/null + groupdel osiris &> /dev/null } - -post_remove() { - /bin/true -} - -# vim: ts=2 sw=2 et ft=sh diff --git a/community/osiris/osirisd.init b/community/osiris/osirisd.init index d38255621..8262d902e 100755 --- a/community/osiris/osirisd.init +++ b/community/osiris/osirisd.init @@ -30,6 +30,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/osiris/osirisd.service b/community/osiris/osirisd.service new file mode 100644 index 000000000..199737c9f --- /dev/null +++ b/community/osiris/osirisd.service @@ -0,0 +1,10 @@ +[Unit] +Description=A file integrity management system + +[Service] +User=osiris +Type=forking +ExecStart=/usr/sbin/osirisd + +[Install] +WantedBy=multi-user.target diff --git a/community/osiris/osirismd.init b/community/osiris/osirismd.init index 3b9e38598..0bdae5e10 100755 --- a/community/osiris/osirismd.init +++ b/community/osiris/osirismd.init @@ -30,6 +30,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/osiris/osirismd.service b/community/osiris/osirismd.service new file mode 100644 index 000000000..d51cef22c --- /dev/null +++ b/community/osiris/osirismd.service @@ -0,0 +1,10 @@ +[Unit] +Description=A file integrity management system + +[Service] +User=osiris +Type=forking +ExecStart=/usr/sbin/osirismd + +[Install] +WantedBy=multi-user.target diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index c2dd1382b..7312974e8 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 64345 2012-02-11 23:22:52Z allan $ +# $Id: PKGBUILD 78346 2012-10-17 14:53:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: v01d <phreakuencies@gmail.com> pkgname=p3scan pkgver=2.3.2 -pkgrel=6 +pkgrel=7 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection" arch=('i686' 'x86_64') url="http://p3scan.sourceforge.net/" depends=('pcre' 'openssl') license=('GPL') -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "rc.p3scan") -md5sums=('9f8decc7d4701228788e3c8717096ca0' 'f6e3450c3a932477c49082559b7abef8') install=p3scan.install +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + "rc.p3scan" + "p3scan.service" + "p3scan.tmpfiles") md5sums=('9f8decc7d4701228788e3c8717096ca0' - '482a783e699b6532cbc478977f429eb5') + '482a783e699b6532cbc478977f429eb5' + 'dc724b50963d80be7924fc4d9d4856f0' + '265a730e20e3d8aaf0cd7816dc98ca71') build() { cd $srcdir/$pkgname-$pkgver @@ -52,4 +56,7 @@ package() { mv $pkgdir/usr/man $pkgdir/usr/share/ mv $pkgdir/usr/doc $pkgdir/usr/share/ rm -rf $pkgdir/var/run + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/p3scan/p3scan.service b/community/p3scan/p3scan.service new file mode 100644 index 000000000..0bab3e7ec --- /dev/null +++ b/community/p3scan/p3scan.service @@ -0,0 +1,10 @@ +[Unit] +Description=p3scan proxy + +[Service] +Type=forking +PIDFile=/var/run/p3scan/p3scan.pid +ExecStart=/usr/sbin/p3scan + +[Install] +WantedBy=multi-user.target diff --git a/community/p3scan/p3scan.tmpfiles b/community/p3scan/p3scan.tmpfiles new file mode 100644 index 000000000..17f0a4c22 --- /dev/null +++ b/community/p3scan/p3scan.tmpfiles @@ -0,0 +1 @@ +d /run/p3scan 0755 root root - diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index 97b236233..852bc535f 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69456 2012-04-16 13:52:48Z spupykin $ +# $Id: PKGBUILD 78356 2012-10-17 15:19:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=pound pkgver=2.6 -pkgrel=2 +pkgrel=3 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64') url="http://www.apsis.ch/pound/index_html" @@ -15,26 +15,30 @@ backup=(etc/pound/pound.cfg) source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz pound.init pound.runit + pound.service pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' 'bd3bddb6dc17fdcab824815a4705b055' '4bd5e2a8d8e707eb900ae88929e00d4c' + '23c70776fcd1cf71572f90a8809f7408' '8937808acd22c6391ebe4340af8df854') build() { - cd $srcdir/Pound-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc/pound - make + cd $srcdir/Pound-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/pound + make } + package() { - cd $srcdir/Pound-$pkgver - install -d $pkgdir/usr/sbin - make DESTDIR=$pkgdir install - chown root.root -R $pkgdir/usr - install -d $pkgdir/etc/rc.d - install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound - install -d $pkgdir/etc/sv - install -d $pkgdir/etc/sv/pound - install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run - install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg + cd $srcdir/Pound-$pkgver + install -d $pkgdir/usr/sbin + make DESTDIR=$pkgdir install + chown root.root -R $pkgdir/usr + install -d $pkgdir/etc/rc.d + install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound + install -d $pkgdir/etc/sv + install -d $pkgdir/etc/sv/pound + install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run + install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/pound/pound.service b/community/pound/pound.service new file mode 100644 index 000000000..0a91f3424 --- /dev/null +++ b/community/pound/pound.service @@ -0,0 +1,10 @@ +[Unit] +Description=A reverse proxy, load balancer, and SSL wrapper + +[Service] +Type=forking +PIDFile=/var/run/pound.pid +ExecStart=/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 77482ad20..5e9855861 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72795 2012-06-22 12:52:02Z dreisner $ +# $Id: PKGBUILD 78387 2012-10-17 16:24:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.0@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgname=prosody pkgver=0.8.2 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64') url="http://prosody.im/" @@ -42,12 +42,16 @@ package() { cd "$srcdir/prosody-$pkgver" make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install -C tools/migration rm $pkgdir/etc/prosody/certs/* install -d "$pkgdir/etc/rc.d" install -d "$pkgdir/etc/logrotate.d" install -d "$pkgdir/var/log/prosody" + for i in tools/*.lua; do + install -Dm0644 $i $pkgdir/usr/share/prosody/$i + done install -o root -g root -m 755 "$srcdir/prosody.rcd" \ "$pkgdir/etc/rc.d/prosody" diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD index 570273e69..26291aead 100644 --- a/community/python-bsddb/PKGBUILD +++ b/community/python-bsddb/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 71894 2012-06-02 22:27:02Z allan $ +# $Id: PKGBUILD 78214 2012-10-17 10:25:23Z allan $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgbase=python-bsddb pkgname=('python2-bsddb' 'python-bsddb') pkgver=5.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python interface for BerkeleyDB" license=('MIT') arch=('i686' 'x86_64') @@ -25,7 +25,7 @@ build () { # Build python 3 module cd bsddb3-${pkgver} - python setup.py --berkeley-db=/usr build + python3 setup.py --berkeley-db=/usr build # Build python 2 module cd ../bsddb3-${pkgver}-python2 @@ -41,9 +41,9 @@ package_python2-bsddb() { } package_python-bsddb() { - depends=('db' 'python>=3.2') + depends=('db' 'python>=3.3') cd "${srcdir}/bsddb3-${pkgver}" - python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + python3 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/python-gnupginterface/PKGBUILD b/community/python-gnupginterface/PKGBUILD index 6f1e69381..33446e9b3 100644 --- a/community/python-gnupginterface/PKGBUILD +++ b/community/python-gnupginterface/PKGBUILD @@ -1,20 +1,21 @@ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Aaron Schaefer <aaron@elasticdog.com> -pkgname=python-gnupginterface +pkgbase=python-gnupginterface +pkgname=python2-gnupginterface pkgver=0.3.2 -pkgrel=6 +pkgrel=1 pkgdesc='A Python interface to GNU Privacy Guard (GnuPG).' arch=('i686' 'x86_64') url='http://py-gnupg.sourceforge.net/' license=('GPL') depends=('gnupg' 'python2') -provides=('gnupginterface') -replaces=('gnupginterface') +conflicts=('python-gnupginterface<=0.3.2-6') +replaces=('python-gnupginterface<=0.3.2-6') source=("http://downloads.sourceforge.net/sourceforge/py-gnupg/GnuPGInterface-$pkgver.tar.gz") md5sums=('d4627d83446f96bd8c22f8d15db3f7c2') -build() { +package_python2-gnupginterface() { cd "$srcdir/GnuPGInterface-$pkgver" python2 setup.py install --root="$pkgdir" -O1 } diff --git a/community/python-mpi4py/PKGBUILD b/community/python-mpi4py/PKGBUILD index 83574c743..1f87c3c66 100644 --- a/community/python-mpi4py/PKGBUILD +++ b/community/python-mpi4py/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62551 2012-01-21 03:26:53Z stephane $ +# $Id: PKGBUILD 78230 2012-10-17 10:26:03Z allan $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sebastien Binet <binet@cern.ch> pkgbase=python-mpi4py pkgname=('python-mpi4py' 'python2-mpi4py') pkgver=1.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://mpi4py.scipy.org" license=('BSD') @@ -19,7 +19,7 @@ build() { # Build python 3 module cd mpi4py-${pkgver} - python setup.py build + python3 setup.py build # Build python 2 module cd ../mpi4py-${pkgver}-python2 @@ -28,10 +28,10 @@ build() { package_python-mpi4py() { pkgdesc="Python bindings of the Message Passing Interface (MPI)" - depends=('python>=3.2' 'openmpi') + depends=('python>=3.3' 'openmpi') cd "${srcdir}/mpi4py-${pkgver}" - python setup.py install --root "${pkgdir}" --optimize=1 --skip-build + python3 setup.py install --root "${pkgdir}" --optimize=1 --skip-build } package_python2-mpi4py() { diff --git a/community/python-numarray/PKGBUILD b/community/python-numarray/PKGBUILD index 02d098a71..788f59063 100644 --- a/community/python-numarray/PKGBUILD +++ b/community/python-numarray/PKGBUILD @@ -1,15 +1,18 @@ -# $Id: PKGBUILD 57888 2011-11-04 08:26:37Z lfleischer $ +# $Id: PKGBUILD 78232 2012-10-17 10:26:10Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> -pkgname=python-numarray +pkgbase=python-numarray +pkgname=python2-numarray pkgver=1.5.2 -pkgrel=5 +pkgrel=6 pkgdesc='Provides array manipulation and computational capabilities.' arch=('i686' 'x86_64') url='http://numpy.scipy.org/' license=('BSD') depends=('python2') +conflicts=('python2-numarray<=1.5.2-6') +replaces=('python2-numarray<=1.5.2-6') source=("http://downloads.sourceforge.net/sourceforge/numpy/numarray-${pkgver}.tar.gz" 'LICENSE') md5sums=('d2ecfc60fe4869c328b872540d04e0f7' @@ -22,7 +25,7 @@ build() { sed -i 's_#! /usr/bin/env python_#! /usr/bin/env python2_' Examples/convolve/benchmark.py } -package() { +package_python2-numarray() { cd "${srcdir}/numarray-${pkgver}" python2 setup.py install --root="${pkgdir}" diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD index 303cb3d7d..f94a6bac3 100644 --- a/community/python-openbabel/PKGBUILD +++ b/community/python-openbabel/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67417 2012-03-11 14:35:31Z cbrannon $ +# $Id: PKGBUILD 78233 2012-10-17 10:26:13Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Michal Bozon <bozonm@vscht.cz> pkgname=python-openbabel pkgver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings of openbabel library" arch=('i686' 'x86_64') url="http://openbabel.org/wiki/Python" license=('GPL') -depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen') +depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2') makedepends=('swig' 'cmake') options=('!libtool') source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 043ae3513..4b00d7e8c 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75268 2012-08-17 10:49:54Z seblu $ +# $Id: PKGBUILD 78236 2012-10-17 10:26:22Z allan $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') pkgver=0.6.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') diff --git a/community/python-psycopg1/PKGBUILD b/community/python-psycopg1/PKGBUILD index de92e5214..143034103 100755 --- a/community/python-psycopg1/PKGBUILD +++ b/community/python-psycopg1/PKGBUILD @@ -1,14 +1,17 @@ -# $Id: PKGBUILD 67660 2012-03-13 16:23:29Z lcarlier $ +# $Id: PKGBUILD 78237 2012-10-17 10:26:25Z allan $ # Contributor: William Rea <sillywilly@gmail.com> -pkgname=python-psycopg1 +pkgbase=python-psycopg1 +pkgname=python2-psycopg1 pkgver=1.1.21 -pkgrel=6 +pkgrel=8 pkgdesc="A PostgreSQL database adapter for Python" arch=('i686' 'x86_64') url="http://initd.org/projects/psycopg1" license=('GPL') -depends=('python-egenix-mx-base' 'postgresql') +depends=('python2-egenix-mx-base' 'postgresql') +conflicts=('python-psycopg1<=1.1.21-7') +replaces=('python-psycopg1<=1.1.21-7') source=(http://initd.org/psycopg/tarballs/PSYCOPG-1-1/psycopg-$pkgver.tar.gz) md5sums=('a31f79f68d6d32898d6f24e11369a106') sha1sums=('02d8a8b5dd682306117896c7c63a9a1b518997b6') @@ -24,7 +27,7 @@ build() { make } -package() { +package_python2-psycopg1() { cd "$srcdir/psycopg-$pkgver" make DESTDIR="$pkgdir" install diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index 42ba11164..8ff3a92dc 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68833 2012-04-03 16:20:19Z foutrelis $ +# $Id: PKGBUILD 78238 2012-10-17 10:26:30Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') pkgver=2.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64') url="http://initd.org/psycopg/" diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 61cc96781..457777408 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,23 +1,37 @@ -# $Id: PKGBUILD 75966 2012-09-07 11:19:50Z arodseth $ +# $Id: PKGBUILD 78242 2012-10-17 10:26:39Z allan $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> -pkgname=python-pymongo +pkgbase=python-pymongo +pkgname=('python-pymongo' 'python2-pymongo') pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686') license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' -depends=('python') -makedepends=('python-distribute') +makedepends=('python-distribute' 'python2-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc') -package() { +build() { + cd "$srcdir" + cp -a "pymongo-$pkgver" "pymongo2-$pkgver" + +} + +package_python2-pymongo() { + depends=('python2') + cd "$srcdir/pymongo2-$pkgver" + + python2 setup.py install --root="$pkgdir" --optimize=1 +} + +package_python-pymongo() { + depends=('python') + cd "$srcdir/pymongo-$pkgver" python setup.py install --root="$pkgdir" --optimize=1 } - # vim:set ts=2 sw=2 et: diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD index cb5cd4e25..61f8d8e78 100644 --- a/community/python-pyopencl/PKGBUILD +++ b/community/python-pyopencl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74334 2012-07-24 17:36:16Z stephane $ +# $Id: PKGBUILD 78243 2012-10-17 10:26:44Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgbase=python-pyopencl -pkgname=('python2-pyopencl' 'python-pyopencl') +pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers') pkgver=2012.1 -pkgrel=3 +pkgrel=5 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64') url="http://mathema.tician.de/software/pyopencl" @@ -21,28 +21,41 @@ build() { cp -a pyopencl-$pkgver{,-python2} cd "${srcdir}/pyopencl-${pkgver}" - python ./configure.py --cl-enable-gl --no-use-shipped-boost - python setup.py build + python3 ./configure.py --cl-enable-gl --no-use-shipped-boost + python3 setup.py build cd "$srcdir/pyopencl-$pkgver-python2" python2 ./configure.py --cl-enable-gl --no-use-shipped-boost python2 setup.py build - } package_python-pyopencl() { - depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python' 'python-numpy' 'python-mako' 'python-pytools') + depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers') cd "${srcdir}/pyopencl-${pkgver}" - python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + rm -fr "${pkgdir}"/usr/include install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } + package_python2-pyopencl() { - depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools') + depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers') cd "${srcdir}/pyopencl-${pkgver}-python2" python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + rm -fr "${pkgdir}"/usr/include + install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } + +package_pyopencl-headers() { + cd "${srcdir}/pyopencl-${pkgver}" + install -dm755 "${pkgdir}"/usr/include/pyopencl + + for file in pyopencl-bessel-j.cl pyopencl-cephes.cl pyopencl-airy.cl pyopencl-ranluxcl.cl pyopencl-complex.h; do + install -m644 src/cl/${file} "${pkgdir}"/usr/include/pyopencl + done +} diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD index c066a372d..70ccf4529 100644 --- a/community/python-pyproj/PKGBUILD +++ b/community/python-pyproj/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71233 2012-05-25 14:39:53Z stephane $ +# $Id: PKGBUILD 78245 2012-10-17 10:26:49Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgbase=python-pyproj pkgname=('python-pyproj' 'python2-pyproj') -pkgver=1.9.0 +pkgver=1.9.2 pkgrel=1 pkgdesc="Python interfaces to PROJ.4 library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://code.google.com/p/pyproj" license=('custom') source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz) makedepends=('python' 'python2') -sha1sums=('9a49ff24dbf88d725adddd1ba255609b558e6b03') +sha1sums=('a7a4bf95f3492e45704bccd4aeafe3bbe32fb023') build() { cd "${srcdir}" @@ -20,7 +20,7 @@ build() { # Build python 3 module cd pyproj-${pkgver} - python setup.py build + python3 setup.py build # Build python 2 module cd ../pyproj-${pkgver}-python2 @@ -28,10 +28,10 @@ build() { } package_python-pyproj() { - depends=('proj' 'python>=3.2') + depends=('proj' 'python>=3.3') cd "${srcdir}"/pyproj-${pkgver} - python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/community/python-pyxattr/PKGBUILD b/community/python-pyxattr/PKGBUILD index 996d8d6b4..3932c12dd 100644 --- a/community/python-pyxattr/PKGBUILD +++ b/community/python-pyxattr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66406 2012-02-24 13:20:20Z lfleischer $ +# $Id: PKGBUILD 78249 2012-10-17 10:26:58Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jon Bergli Heier <snakebite@jvnv.net> @@ -6,7 +6,7 @@ pkgname=('python2-pyxattr' 'python-pyxattr') pkgbase=python-pyxattr _pkgname=pyxattr pkgver=0.5.0 -pkgrel=3 +pkgrel=4 pkgdesc='A python extension module that allows you to manipulate the extended attributes.' arch=('i686' 'x86_64') url='http://pyxattr.sourceforge.net/' diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index 8307aa178..f3d299334 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75372 2012-08-21 15:10:09Z kkeen $ +# $Id: PKGBUILD 78250 2012-10-17 10:27:01Z allan $ # Maintainer: Kyle Keen <keenerd at gmail dot com> pkgname=python-pyzmq pkgver=2.2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Python3 bindings for zeromq, written in Cython" arch=(i686 x86_64) url="http://www.zeromq.org/bindings:python" diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 3d3097b44..49f943dc5 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('python-scipy' 'python2-scipy') pkgver=0.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64') url="http://www.scipy.org/" diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index ccb2cc764..764bfd0b4 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 75475 2012-08-25 20:53:22Z jelle $ +# $Id: PKGBUILD 78255 2012-10-17 10:27:16Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.7.8 +pkgver=0.7.9 pkgrel=1 arch=('i686' 'x86_64') # python2 package contain .so url="http://www.sqlalchemy.org/" license=('custom: MIT') makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose') source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('a5346f007e79c08cccb62ccec267309a') +md5sums=('c4852d586d95a59fbc9358f4467875d5') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver diff --git a/community/python-yaml/PKGBUILD b/community/python-yaml/PKGBUILD index 157f5d986..c71d9e086 100644 --- a/community/python-yaml/PKGBUILD +++ b/community/python-yaml/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66141 2012-02-23 01:45:30Z spupykin $ +# $Id: PKGBUILD 78260 2012-10-17 10:27:30Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Bozon <michal.bozon__at__gmail.com> pkgbase=python-yaml pkgname=(python2-yaml python-yaml) pkgver=3.10 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for YAML, using fast libYAML library" arch=('i686' 'x86_64') url="http://pyyaml.org" diff --git a/community/python2-cjson/PKGBUILD b/community/python2-cjson/PKGBUILD new file mode 100644 index 000000000..2d95793a4 --- /dev/null +++ b/community/python2-cjson/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Lincoln de Sousa <lincoln@archlinux-br.org> + +pkgname=python2-cjson +pkgver=1.0.5 +pkgrel=5 +arch=('i686' 'x86_64') +license=('LGPL') +pkgdesc="Fast JSON encoder/decoder for Python" +url="http://pypi.python.org/pypi/python-cjson/" +depends=('python2') +source=("http://pypi.python.org/packages/source/p/python-cjson/python-cjson-$pkgver.tar.gz") +md5sums=('4d55b66ecdf0300313af9d030d9644a3') + +build() { + cd $srcdir/python-cjson-$pkgver + python2 setup.py install --root=$pkgdir +} diff --git a/community/python2-galago/PKGBUILD b/community/python2-galago/PKGBUILD new file mode 100644 index 000000000..6076c3a9e --- /dev/null +++ b/community/python2-galago/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 66128 2012-02-23 01:37:06Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=python2-galago +pkgver=0.5.0 +pkgrel=6 +pkgdesc="A library of simple functions that are optimized for various CPUs" +arch=('i686' 'x86_64') +url="http://galago-project.org" +options=('!libtool') +license=('LGPL') +depends=('libgalago' 'pygtk') +source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2) +md5sums=('27be31fcf2886aa21823caec15dc34aa') + +build() { + cd $srcdir/galago-python-$pkgver + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install +} diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD new file mode 100644 index 000000000..3a7c86a04 --- /dev/null +++ b/community/python2-gnutls/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 74655 2012-08-01 13:54:20Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Hugo Doria <hugo@archlinux.org> +# Contributor: N3RD3X <n3rd3x@linuxmail.org> + +pkgname=python2-gnutls +pkgver=1.2.4 +pkgrel=2 +pkgdesc="Python wrapper for the GNUTLS library" +arch=('i686' 'x86_64') +url="http://cheeseshop.python.org/pypi/python-gnutls" +depends=('python2' 'gnutls') +license=('LGPL') +source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz + gnutls3.patch) +md5sums=('e3536c421291a791869d875a41dcb26a' + '24bc95d9f5e71e9f5e180706cbb09248') + +build() { + cd ${srcdir}/python-gnutls-${pkgver} + patch -Np0 <$srcdir/gnutls3.patch + python2 setup.py install --root=${pkgdir} +} diff --git a/community/python2-gnutls/gnutls3.patch b/community/python2-gnutls/gnutls3.patch new file mode 100644 index 000000000..5110de2f2 --- /dev/null +++ b/community/python2-gnutls/gnutls3.patch @@ -0,0 +1,271 @@ +diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py +--- gnutls/library/functions.py 2011-08-19 04:48:14.000000000 +0100 ++++ gnutls.fixed/library/functions.py 2012-08-01 11:56:43.450975419 +0100 +@@ -4,7 +4,7 @@ + import sys + from ctypes import * + +-from gnutls.library import libgnutls, libgnutls_extra ++from gnutls.library import libgnutls + from gnutls.library.types import * + + +@@ -121,14 +121,6 @@ + gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)] + gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t) + +-gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas +-gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)] +-gnutls_certificate_get_x509_cas.restype = None +- +-gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls +-gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)] +-gnutls_certificate_get_x509_crls.restype = None +- + gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence + gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int] + gnutls_certificate_send_x509_rdn_sequence.restype = None +@@ -221,10 +213,6 @@ + gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)] + gnutls_certificate_type_set_priority.restype = c_int + +-gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers +-gnutls_certificate_verify_peers.argtypes = [gnutls_session_t] +-gnutls_certificate_verify_peers.restype = c_int +- + gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2 + gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)] + gnutls_certificate_verify_peers2.restype = c_int +@@ -393,10 +381,6 @@ + gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)] + gnutls_error_to_alert.restype = c_int + +-gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version +-gnutls_extra_check_version.argtypes = [c_char_p] +-gnutls_extra_check_version.restype = c_char_p +- + gnutls_fingerprint = libgnutls.gnutls_fingerprint + gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)] + gnutls_fingerprint.restype = c_int +@@ -409,10 +393,6 @@ + gnutls_global_init.argtypes = [] + gnutls_global_init.restype = c_int + +-gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra +-gnutls_global_init_extra.argtypes = [] +-gnutls_global_init_extra.restype = c_int +- + gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function + gnutls_global_set_log_function.argtypes = [gnutls_log_func] + gnutls_global_set_log_function.restype = None +@@ -461,86 +441,6 @@ + gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] + gnutls_hex_encode.restype = c_int + +-gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials +-gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)] +-gnutls_ia_allocate_client_credentials.restype = c_int +- +-gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials +-gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)] +-gnutls_ia_allocate_server_credentials.restype = c_int +- +-gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable +-gnutls_ia_enable.argtypes = [gnutls_session_t, c_int] +-gnutls_ia_enable.restype = None +- +-gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send +-gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int] +-gnutls_ia_endphase_send.restype = c_int +- +-gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret +-gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p] +-gnutls_ia_extract_inner_secret.restype = None +- +-gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials +-gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t] +-gnutls_ia_free_client_credentials.restype = None +- +-gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials +-gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t] +-gnutls_ia_free_server_credentials.restype = None +- +-gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge +-gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p] +-gnutls_ia_generate_challenge.restype = c_int +- +-gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr +-gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t] +-gnutls_ia_get_client_avp_ptr.restype = c_void_p +- +-gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr +-gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t] +-gnutls_ia_get_server_avp_ptr.restype = c_void_p +- +-gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake +-gnutls_ia_handshake.argtypes = [gnutls_session_t] +-gnutls_ia_handshake.restype = c_int +- +-gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p +-gnutls_ia_handshake_p.argtypes = [gnutls_session_t] +-gnutls_ia_handshake_p.restype = c_int +- +-gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret +-gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p] +-gnutls_ia_permute_inner_secret.restype = c_int +- +-gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv +-gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t] +-gnutls_ia_recv.restype = ssize_t +- +-gnutls_ia_send = libgnutls_extra.gnutls_ia_send +-gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t] +-gnutls_ia_send.restype = ssize_t +- +-gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function +-gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func] +-gnutls_ia_set_client_avp_function.restype = None +- +-gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr +-gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p] +-gnutls_ia_set_client_avp_ptr.restype = None +- +-gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function +-gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func] +-gnutls_ia_set_server_avp_function.restype = None +- +-gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr +-gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p] +-gnutls_ia_set_server_avp_ptr.restype = None +- +-gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase +-gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p] +-gnutls_ia_verify_endphase.restype = c_int +- + gnutls_init = libgnutls.gnutls_init + gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t] + gnutls_init.restype = c_int +@@ -733,10 +633,6 @@ + gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t] + gnutls_psk_free_server_credentials.restype = None + +-gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key +-gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)] +-gnutls_psk_netconf_derive_key.restype = c_int +- + gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username + gnutls_psk_server_get_username.argtypes = [gnutls_session_t] + gnutls_psk_server_get_username.restype = c_char_p +@@ -857,10 +753,6 @@ + gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t] + gnutls_session_enable_compatibility_mode.restype = None + +-gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random +-gnutls_session_get_client_random.argtypes = [gnutls_session_t] +-gnutls_session_get_client_random.restype = c_void_p +- + gnutls_session_get_data = libgnutls.gnutls_session_get_data + gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] + gnutls_session_get_data.restype = c_int +@@ -873,18 +765,10 @@ + gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] + gnutls_session_get_id.restype = c_int + +-gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret +-gnutls_session_get_master_secret.argtypes = [gnutls_session_t] +-gnutls_session_get_master_secret.restype = c_void_p +- + gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr + gnutls_session_get_ptr.argtypes = [gnutls_session_t] + gnutls_session_get_ptr.restype = c_void_p + +-gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random +-gnutls_session_get_server_random.argtypes = [gnutls_session_t] +-gnutls_session_get_server_random.restype = c_void_p +- + gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed + gnutls_session_is_resumed.argtypes = [gnutls_session_t] + gnutls_session_is_resumed.restype = c_int +@@ -905,10 +789,6 @@ + gnutls_set_default_priority.argtypes = [gnutls_session_t] + gnutls_set_default_priority.restype = c_int + +-gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name +-gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t] +-gnutls_sign_algorithm_get_name.restype = c_char_p +- + gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get + gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)] + gnutls_sign_callback_get.restype = gnutls_sign_func +@@ -937,14 +817,6 @@ + gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int] + gnutls_transport_set_errno.restype = None + +-gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno +-gnutls_transport_set_global_errno.argtypes = [c_int] +-gnutls_transport_set_global_errno.restype = None +- +-gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat +-gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int] +-gnutls_transport_set_lowat.restype = None +- + gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr + gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t] + gnutls_transport_set_ptr.restype = None +@@ -1501,10 +1373,6 @@ + gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] + gnutls_x509_privkey_sign_hash.restype = c_int + +-gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data +-gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] +-gnutls_x509_privkey_verify_data.restype = c_int +- + gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get + gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] + gnutls_x509_rdn_get.restype = c_int +diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py +--- gnutls/library/__init__.py 2011-11-11 17:23:49.000000000 +0000 ++++ gnutls.fixed/library/__init__.py 2012-08-01 11:57:42.284290997 +0100 +@@ -53,6 +53,9 @@ + else: + raise RuntimeError('cannot find lib%s on this system' % name) + ++def do_nothing(*args, **kwargs): ++ pass ++ + + def initialize_gcrypt(): + from ctypes import c_void_p +@@ -104,7 +107,7 @@ + libgcrypt = load_library(name='gcrypt', version=11) + gcry_control = libgcrypt.gcry_control + else: +- gcry_control = libgnutls.gcry_control ++ gcry_control = do_nothing + + gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr)) + if system == 'cygwin': +@@ -117,12 +120,10 @@ + + + +-libgnutls = load_library(name='gnutls', version=26) +-libgnutls_extra = load_library(name='gnutls-extra', version=26) ++libgnutls = load_library(name='gnutls', version=28) + + initialize_gcrypt() + libgnutls.gnutls_global_init() +-libgnutls_extra.gnutls_global_init_extra() + + + from gnutls.library import constants +@@ -136,9 +137,6 @@ + if functions.gnutls_check_version(__need_version__) is None: + version = functions.gnutls_check_version(None) + raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__)) +-if functions.gnutls_extra_check_version(__need_version__) is None: +- version = functions.gnutls_extra_check_version(None) +- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__)) + + + del get_system_name, library_locations, load_library, initialize_gcrypt diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD index d9f5b18f5..49b368ada 100644 --- a/community/python2-imaging/PKGBUILD +++ b/community/python2-imaging/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77148 2012-10-05 14:37:44Z kkeen $ +# $Id: PKGBUILD 78281 2012-10-17 10:28:39Z allan $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> diff --git a/community/python2-lcms/PKGBUILD b/community/python2-lcms/PKGBUILD new file mode 100644 index 000000000..3b75364ab --- /dev/null +++ b/community/python2-lcms/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 66130 2012-02-23 01:39:55Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Connor Behan <connor.behan@gmail.com> + +pkgname=python2-lcms +pkgver=1.19 +_mver=1.19 +pkgrel=4 +pkgdesc="LittleCMS Python bindings" +arch=(i686 x86_64) +license=('CUSTOM') +depends=('libtiff' 'python2' 'lcms') +url="http://www.littlecms.com" +options=('!libtool') +source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz) +md5sums=('8af94611baf20d9646c7c2c285859818') + +build() { + cd $srcdir/lcms-${_mver} + ./configure --prefix=/usr --with-python + make +} + +package() { + cd $srcdir/lcms-${_mver} + make DESTDIR=$pkgdir install + install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + rm -rf $pkgdir/usr/bin \ + $pkgdir/usr/include \ + $pkgdir/usr/lib/pkgconfig \ + $pkgdir/usr/lib/liblcms.* \ + $pkgdir/usr/share/man/man1/icc2ps.1 \ + $pkgdir/usr/share/man/man1/icclink.1 \ + $pkgdir/usr/share/man/man1/jpegicc.1 \ + $pkgdir/usr/share/man/man1/tifficc.1 \ + $pkgdir/usr/share/man/man1/wtpt.1 +} diff --git a/community/python2-m2crypto/PKGBUILD b/community/python2-m2crypto/PKGBUILD new file mode 100644 index 000000000..a68c5a35d --- /dev/null +++ b/community/python2-m2crypto/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=python2-m2crypto +pkgver=0.21.1 +pkgrel=2 +pkgdesc="A crypto and SSL toolkit for Python" +arch=('i686' 'x86_64') +url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" +license=('BSD') +depends=('python2' 'openssl') +makedepends=('swig') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") +md5sums=('f93d8462ff7646397a9f77a2fe602d17') + +build() { + cd "${srcdir}/M2Crypto-${pkgver}" + python2 setup.py build +} + +package() { + cd "${srcdir}/M2Crypto-${pkgver}" + python2 setup.py install --root="${pkgdir}/" --optimize=1 + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python2-m2crypto/openssl1.patch b/community/python2-m2crypto/openssl1.patch new file mode 100644 index 000000000..59dba554d --- /dev/null +++ b/community/python2-m2crypto/openssl1.patch @@ -0,0 +1,531 @@ +Index: tests/test_ssl.py +=================================================================== +--- tests/test_ssl.py (revision 698) ++++ tests/test_ssl.py (working copy) +@@ -405,8 +405,11 @@ + try: + ctx = SSL.Context('sslv23', weak_crypto=1) + s = SSL.Connection(ctx) +- s.connect(self.srv_addr) +- self.failUnlessEqual(s.get_version(), 'SSLv2') ++ if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL ++ s.connect(self.srv_addr) ++ self.failUnlessEqual(s.get_version(), 'SSLv2') ++ else: ++ self.assertRaises(SSL.SSLError, s.connect, self.srv_addr) + s.close() + finally: + self.stop_server(pid) +Index: tests/test_x509.py +=================================================================== +--- tests/test_x509.py (revision 698) ++++ tests/test_x509.py (working copy) +@@ -142,7 +142,7 @@ + cn.set_data("Hello There!") + assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text() + +- assert n.as_hash() == 1697185131 ++ self.assertEquals(n.as_hash(), 1697185131) + + self.assertRaises(IndexError, lambda: n[100]) + self.assert_(n[10]) +Index: tests/test_smime.py +=================================================================== +--- tests/test_smime.py (revision 698) ++++ tests/test_smime.py (working copy) +@@ -6,7 +6,7 @@ + """ + + import unittest +-from M2Crypto import SMIME, BIO, Rand, X509, EVP ++from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err + + class SMIMETestCase(unittest.TestCase): + cleartext = 'some text to manipulate' +@@ -213,7 +213,7 @@ + + self.filenameSmime = 'tests/sig.p7s' + f = BIO.openfile(self.filenameSmime, 'wb') +- assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1 ++ assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error() + f.close() + + def test_write_pkcs7_der(self): +Index: SWIG/_evp.i +=================================================================== +--- SWIG/_evp.i (revision 695) ++++ SWIG/_evp.i (working copy) +@@ -180,7 +180,7 @@ + + PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter, + keylen, key); +- ret = PyString_FromStringAndSize(key, keylen); ++ ret = PyString_FromStringAndSize((char*)key, keylen); + OPENSSL_cleanse(key, keylen); + return ret; + } +@@ -339,7 +339,7 @@ + klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, + (unsigned char *)dbuf, dlen, iter, + key, NULL); /* Since we are not returning IV no need to derive it */ +- ret = PyString_FromStringAndSize(key, klen); ++ ret = PyString_FromStringAndSize((char*)key, klen); + return ret; + } + +@@ -435,7 +435,7 @@ + PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error())); + return NULL; + } +- ret = PyString_FromStringAndSize(sigbuf, siglen); ++ ret = PyString_FromStringAndSize((char*)sigbuf, siglen); + OPENSSL_cleanse(sigbuf, siglen); + OPENSSL_free(sigbuf); + return ret; +@@ -513,7 +513,7 @@ + PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed"); + return NULL; + } +- der = PyString_FromStringAndSize(pp, len); ++ der = PyString_FromStringAndSize((char*)pp, len); + OPENSSL_free(pp); + return der; + } +Index: SWIG/_ssl.i +=================================================================== +--- SWIG/_ssl.i (revision 695) ++++ SWIG/_ssl.i (working copy) +@@ -17,13 +17,17 @@ + %apply Pointer NONNULL { SSL_CTX * }; + %apply Pointer NONNULL { SSL * }; + %apply Pointer NONNULL { SSL_CIPHER * }; +-%apply Pointer NONNULL { STACK * }; ++%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * }; ++%apply Pointer NONNULL { STACK_OF(X509) * }; + %apply Pointer NONNULL { BIO * }; + %apply Pointer NONNULL { DH * }; + %apply Pointer NONNULL { RSA * }; + %apply Pointer NONNULL { EVP_PKEY *}; + %apply Pointer NONNULL { PyObject *pyfunc }; + ++%rename(ssl_get_ciphers) SSL_get_ciphers; ++extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl); ++ + %rename(ssl_get_version) SSL_get_version; + extern const char *SSL_get_version(CONST SSL *); + %rename(ssl_get_error) SSL_get_error; +@@ -668,29 +672,25 @@ + return SSL_CIPHER_get_bits(c, NULL); + } + +-STACK *ssl_get_ciphers(SSL *ssl) { +- return (STACK *)SSL_get_ciphers(ssl); ++int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) { ++ return sk_SSL_CIPHER_num(stack); + } + +-int sk_ssl_cipher_num(STACK *stack) { +- return sk_num(stack); ++SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) { ++ return sk_SSL_CIPHER_value(stack, idx); + } + +-SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) { +- return (SSL_CIPHER *)sk_value(stack, idx); ++STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) { ++ return SSL_get_peer_cert_chain(ssl); + } + +-STACK *ssl_get_peer_cert_chain(SSL *ssl) { +- return (STACK *)SSL_get_peer_cert_chain(ssl); ++int sk_x509_num(STACK_OF(X509) *stack) { ++ return sk_X509_num(stack); + } + +-int sk_x509_num(STACK *stack) { +- return sk_num(stack); ++X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) { ++ return sk_X509_value(stack, idx); + } +- +-X509 *sk_x509_value(STACK *stack, int idx) { +- return (X509 *)sk_value(stack, idx); +-} + %} + + %threadallow i2d_ssl_session; +Index: SWIG/_x509.i +=================================================================== +--- SWIG/_x509.i (revision 695) ++++ SWIG/_x509.i (working copy) +@@ -148,8 +148,15 @@ + extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long); + %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp; + extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long); ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++%rename(x509_name_hash) X509_NAME_hash_old; ++extern unsigned long X509_NAME_hash_old(X509_NAME *); ++#else + %rename(x509_name_hash) X509_NAME_hash; + extern unsigned long X509_NAME_hash(X509_NAME *); ++#endif ++ + %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID; + extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int); + +@@ -171,7 +178,7 @@ + if (PyString_Check($input)) { + Py_ssize_t len; + +- $1 = PyString_AsString($input); ++ $1 = (unsigned char *)PyString_AsString($input); + len = PyString_Size($input); + if (len > INT_MAX) { + PyErr_SetString(PyExc_ValueError, "object too large"); +@@ -184,7 +191,7 @@ + } + } + %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data; +-extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int); ++extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int); + %typemap(in) (CONST unsigned char *, int); + + %rename(x509_req_new) X509_REQ_new; +@@ -230,7 +237,7 @@ + %rename(x509_store_ctx_free) X509_STORE_CTX_free; + extern void X509_STORE_CTX_free(X509_STORE_CTX *); + %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain; +-extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); ++extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); + + %rename(x509_extension_get_critical) X509_EXTENSION_get_critical; + extern int X509_EXTENSION_get_critical(X509_EXTENSION *); +@@ -348,7 +355,7 @@ + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + } + else { +- ret = PyString_FromStringAndSize(buf, len); ++ ret = PyString_FromStringAndSize((char*)buf, len); + OPENSSL_free(buf); + } + return ret; +@@ -435,12 +442,12 @@ + } + + int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) { +- return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0); ++ return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0); + } + + /* x509_name_add_entry_by_txt */ + int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) { +- return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set); ++ return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set); + } + + PyObject *x509_name_get_der(X509_NAME *name) +@@ -450,23 +457,23 @@ + } + + /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */ +-STACK *sk_x509_new_null(void) { +- return (STACK *)sk_X509_new_null(); ++STACK_OF(X509) *sk_x509_new_null(void) { ++ return sk_X509_new_null(); + } + + /* sk_X509_free() is a macro. */ +-void sk_x509_free(STACK *stack) { +- sk_X509_free((STACK_OF(X509) *)stack); ++void sk_x509_free(STACK_OF(X509) *stack) { ++ sk_X509_free(stack); + } + + /* sk_X509_push() is a macro. */ +-int sk_x509_push(STACK *stack, X509 *x509) { +- return sk_X509_push((STACK_OF(X509) *)stack, x509); ++int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) { ++ return sk_X509_push(stack, x509); + } + + /* sk_X509_pop() is a macro. */ +-X509 *sk_x509_pop(STACK *stack) { +- return sk_X509_pop((STACK_OF(X509) *)stack); ++X509 *sk_x509_pop(STACK_OF(X509) *stack) { ++ return sk_X509_pop(stack); + } + + int x509_store_load_locations(X509_STORE *store, const char *file) { +@@ -493,21 +500,29 @@ + return X509_REQ_set_version(x, version); + } + +-int x509_req_add_extensions(X509_REQ *req, STACK *exts) { +- return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts); ++int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) { ++ return X509_REQ_add_extensions(req, exts); + } + +-X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { +- return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len); ++X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { ++ return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len); + } + +-LHASH * +-x509v3_lhash(){ +- return lh_new(NULL,NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++LHASH_OF(CONF_VALUE) ++#else ++LHASH ++#endif ++*x509v3_lhash() { ++ return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */ + } + + X509V3_CTX * +-x509v3_set_conf_lhash(LHASH * lhash){ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) { ++#else ++x509v3_set_conf_lhash(LHASH * lhash) { ++#endif + X509V3_CTX * ctx; + if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) { + PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash"); +@@ -517,11 +532,20 @@ + return ctx; + } + +-X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { ++X509_EXTENSION * ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) { ++#else ++x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { ++#endif + X509_EXTENSION * ext = NULL; + ext = X509V3_EXT_conf(conf, ctx, name, value); + PyMem_Free(ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ lh_CONF_VALUE_free(conf); ++#else + lh_free(conf); ++#endif + return ext; + } + +@@ -543,33 +567,33 @@ + } + + /* sk_X509_EXTENSION_new_null is a macro. */ +-STACK *sk_x509_extension_new_null(void) { +- return (STACK *)sk_X509_EXTENSION_new_null(); ++STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) { ++ return sk_X509_EXTENSION_new_null(); + } + + /* sk_X509_EXTENSION_free() is a macro. */ +-void sk_x509_extension_free(STACK *stack) { +- sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack); ++void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) { ++ sk_X509_EXTENSION_free(stack); + } + + /* sk_X509_EXTENSION_push() is a macro. */ +-int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) { +- return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext); ++int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) { ++ return sk_X509_EXTENSION_push(stack, x509_ext); + } + + /* sk_X509_EXTENSION_pop() is a macro. */ +-X509_EXTENSION *sk_x509_extension_pop(STACK *stack) { +- return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack); ++X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) { ++ return sk_X509_EXTENSION_pop(stack); + } + + /* sk_X509_EXTENSION_num() is a macro. */ +-int sk_x509_extension_num(STACK *stack) { +- return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack); ++int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) { ++ return sk_X509_EXTENSION_num(stack); + } + + /* sk_X509_EXTENSION_value() is a macro. */ +-X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) { +- return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i); ++X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) { ++ return sk_X509_EXTENSION_value(stack, i); + } + + /* X509_STORE_CTX_get_app_data is a macro. */ +@@ -590,7 +614,7 @@ + #define I2DTYPE int (*)() + #endif + +-STACK * ++STACK_OF(X509) * + make_stack_from_der_sequence(PyObject * pyEncodedString){ + STACK_OF(X509) *certs; + Py_ssize_t encoded_string_len; +@@ -606,7 +630,7 @@ + return NULL; + } + +- certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); ++ certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); + if (!certs) { + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + return NULL; +@@ -616,13 +640,13 @@ + } + + PyObject * +-get_der_encoding_stack(STACK * stack){ ++get_der_encoding_stack(STACK_OF(X509) *stack){ + PyObject * encodedString; + + unsigned char * encoding; + int len; + +- encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); ++ encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); + if (!encoding) { + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + return NULL; +Index: SWIG/_aes.i +=================================================================== +--- SWIG/_aes.i (revision 695) ++++ SWIG/_aes.i (working copy) +@@ -76,7 +76,7 @@ + AES_encrypt((const unsigned char *)in, out, key); + else + AES_decrypt((const unsigned char *)in, out, key); +- return PyString_FromStringAndSize(out, outlen); ++ return PyString_FromStringAndSize((char*)out, outlen); + } + + int AES_type_check(AES_KEY *key) { +Index: SWIG/_util.i +=================================================================== +--- SWIG/_util.i (revision 695) ++++ SWIG/_util.i (working copy) +@@ -48,7 +48,7 @@ + PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error())); + return NULL; + } +- obj = PyString_FromStringAndSize(ret, len); ++ obj = PyString_FromStringAndSize((char*)ret, len); + OPENSSL_free(ret); + return obj; + } +Index: SWIG/_m2crypto.i +=================================================================== +--- SWIG/_m2crypto.i (revision 695) ++++ SWIG/_m2crypto.i (working copy) +@@ -38,6 +38,19 @@ + #define CONST098 + #endif + ++/* Bring in STACK_OF macro definition */ ++%include <openssl/safestack.h> ++ ++/* Bring in LHASH_OF macro definition */ ++/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes ++ XXX stdio.h etc. which we fail to include. So we have to (re)define ++ XXX LHASH_OF here instead. ++%include <openssl/lhash.h> ++*/ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define LHASH_OF(type) struct lhash_st_##type ++#endif ++ + %include constraints.i + %include _threads.i + %include _lib.i +Index: SWIG/_rand.i +=================================================================== +--- SWIG/_rand.i (revision 695) ++++ SWIG/_rand.i (working copy) +@@ -87,7 +87,7 @@ + Py_INCREF(Py_None); + return Py_None; + } else { +- PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n)); ++ PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n)); + PyMem_Free(blob); + PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret)); + return tuple; +Index: SWIG/_pkcs7.i +=================================================================== +--- SWIG/_pkcs7.i (revision 695) ++++ SWIG/_pkcs7.i (working copy) +@@ -12,7 +12,7 @@ + %apply Pointer NONNULL { EVP_CIPHER * }; + %apply Pointer NONNULL { EVP_PKEY * }; + %apply Pointer NONNULL { PKCS7 * }; +-%apply Pointer NONNULL { STACK * }; ++%apply Pointer NONNULL { STACK_OF(X509) * }; + %apply Pointer NONNULL { X509 * }; + + %rename(pkcs7_new) PKCS7_new; +@@ -54,8 +54,8 @@ + + %threadallow pkcs7_encrypt; + %inline %{ +-PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { +- return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags); ++PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { ++ return PKCS7_encrypt(stack, bio, cipher, flags); + } + + PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) { +@@ -96,14 +96,14 @@ + + %threadallow pkcs7_sign1; + %inline %{ +-PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) { +- return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags); ++PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) { ++ return PKCS7_sign(x509, pkey, stack, bio, flags); + } + %} + + %threadallow pkcs7_verify1; + %inline %{ +-PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) { ++PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) { + int outlen; + char *outbuf; + BIO *bio; +@@ -113,7 +113,7 @@ + PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1"); + return NULL; + } +- if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) { ++ if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) { + PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error())); + BIO_free(bio); + return NULL; +@@ -131,7 +131,7 @@ + return ret; + } + +-PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) { ++PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) { + return pkcs7_verify1(pkcs7, stack, store, NULL, flags); + } + %} +@@ -229,7 +229,7 @@ + } + + /* return STACK_OF(X509)* */ +-STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) { ++STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) { + return PKCS7_get0_signers(p7, certs, flags); + } + diff --git a/community/python2-pybluez/PKGBUILD b/community/python2-pybluez/PKGBUILD new file mode 100644 index 000000000..6007614a6 --- /dev/null +++ b/community/python2-pybluez/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: cs-cam - me.at.camdaniel.com + +pkgname=python2-pybluez +pkgver=0.18 +pkgrel=4 +pkgdesc="Python wrapper for the BlueZ Bluetooth stack" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pybluez/" +license=('GPL') +provides=('pybluez') +conflicts=('pybluez') +replaces=('pybluez') +depends=('python2' 'bluez') +source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) +md5sums=('be8c8ce615c3189fda1aaf3d568314b2') + +build() { + cd $srcdir/PyBluez-$pkgver + python2 setup.py install --root=$pkgdir + ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so +} diff --git a/community/python2-pyxmpp/PKGBUILD b/community/python2-pyxmpp/PKGBUILD new file mode 100644 index 000000000..49096a86f --- /dev/null +++ b/community/python2-pyxmpp/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 72078 2012-06-08 09:35:02Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=python2-pyxmpp +pkgver=1.1.2 +pkgrel=2 +pkgdesc="A Python XMPP and Jabber implementation based on libxml2" +arch=('i686' 'x86_64') +url="http://pyxmpp.jajcus.net/" +license=('LGPL') +depends=('python2-dnspython' 'libxml2' 'python2-m2crypto') +source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz) +md5sums=('a38abf032aca0408b6055cd94296eb75') + +build() { + cd $srcdir/pyxmpp-$pkgver + python2 setup.py build + python2 setup.py install --root=$pkgdir +} diff --git a/community/python2-simplejson/PKGBUILD b/community/python2-simplejson/PKGBUILD new file mode 100644 index 000000000..1ec0a97b5 --- /dev/null +++ b/community/python2-simplejson/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 74926 2012-08-09 22:02:03Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: David Moore <davidm@sjsoft.com> + +pkgname=python2-simplejson +pkgver=2.6.1 +pkgrel=3 +pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" +license=('MIT') +arch=('i686' 'x86_64') +url="http://undefined.org/python/#simplejson" +depends=('python2') +makedepends=('python2-distribute') +provides=("python-simplejson=$pkgver") +conflicts=('python-simplejson') +replaces=('python-simplejson') +changelog=$pkgname.changelog +source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}) +sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31') + +build() { + cd ${srcdir}/simplejson-simplejson-* + + python2 setup.py install --root=${pkgdir} + +# License + install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/python2-simplejson/python2-simplejson.changelog b/community/python2-simplejson/python2-simplejson.changelog new file mode 100644 index 000000000..c1e227d24 --- /dev/null +++ b/community/python2-simplejson/python2-simplejson.changelog @@ -0,0 +1,20 @@ +2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.6.1-1 + +2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.5.2-1 + +2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.3.3-1 + +2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.2.1-1 + +2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.1.3-1 + +2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 2.1.1 + +2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 2.1.0 diff --git a/community/python2-vorbissimple/PKGBUILD b/community/python2-vorbissimple/PKGBUILD new file mode 100644 index 000000000..ba0a8be63 --- /dev/null +++ b/community/python2-vorbissimple/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 66136 2012-02-23 01:43:46Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=python2-vorbissimple +pkgver=0.0.2 +pkgrel=6 +pkgdesc="Python bindings for vorbissimple" +arch=('i686' 'x86_64') +url="http://kamaelia.sourceforge.net" +license=('MPL') +depends=('python2' 'vorbissimple') +makedepends=('pyrex') +source=(http://downloads.sourceforge.net/kamaelia/vorbissimple-$pkgver.tar.gz) +md5sums=('332077b25a4c9547947ab0922361ffda') + +build() { + cd $srcdir/vorbissimple-$pkgver/python + sed -i 's#__new__#__cinit__#' vorbissimple.pyx + python2 setup.py install --root=$pkgdir +} diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD index 469ce7788..6a21c4821 100644 --- a/community/sdcc/PKGBUILD +++ b/community/sdcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74603 2012-07-31 12:45:11Z spupykin $ +# $Id: PKGBUILD 78263 2012-10-17 10:27:37Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jose Negron <josenj.arch@mailnull.net> pkgname=sdcc pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" arch=('i686' 'x86_64') license=('GPL') @@ -29,4 +29,6 @@ build() { mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/ rm -rf $pkgdir/usr/lib/lib fi + + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' $pkgdir/usr/bin/as2gbmap } diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index b7a8d83ed..a88efc2db 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 65443 2012-02-21 05:48:36Z spupykin $ +# $Id: PKGBUILD 78374 2012-10-17 15:45:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=7 +pkgrel=8 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64) url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl>=7.6' 'tk>=4.2' 'python-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl>=7.6' 'tk>=4.2' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD index f48e1233c..fd24d859b 100644 --- a/community/tix/PKGBUILD +++ b/community/tix/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65401 2012-02-21 03:26:02Z spupykin $ +# $Id: PKGBUILD 78264 2012-10-17 10:27:42Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brice Méalier <mealier_brice@yahoo.fr> pkgname=tix pkgver=8.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="Tk Interface eXtension, a powerful set of user interface components" arch=(i686 'x86_64') url="http://tix.sourceforge.net/" license=("BSD") -depends=('tk' 'python' 'libx11') +depends=('tk' 'libx11') source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz tcl-tk-path.patch) md5sums=('2b8bf4b10a852264678182652f477e59' diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index 296bed607..52f6262af 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 77827 2012-10-15 01:33:32Z bgyorgy $ +# $Id: PKGBUILD 78266 2012-10-17 10:27:54Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client pkgver=4.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Ubuntu One helps you store, sync and share files between your computers" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client" license=('GPL') -depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') +depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool' 'imake' 'gobject-introspection') options=('!libtool') install=$pkgname.install diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD index f65652a7f..88aaeff64 100644 --- a/community/ultimate-ircd/PKGBUILD +++ b/community/ultimate-ircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65335 2012-02-21 02:11:06Z spupykin $ +# $Id: PKGBUILD 78358 2012-10-17 15:20:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ultimate-ircd pkgver=3.0.2 -pkgrel=5 +pkgrel=6 pkgdesc="ultimate irc server" arch=(i686 x86_64) url="http://www.shadow-realm.org/" @@ -16,10 +16,14 @@ provides=(ircd) backup=() install=ircd.install source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2 - ultimate-ircd - conf-fix.patch) + ultimate-ircd + ultimate-ircd.service + ultimate-ircd.tmpfiles + conf-fix.patch) md5sums=('8bc14b97d22a3ce3415cc0540ae459f6' 'cf6ab14d8dd8805342b70a9beb01c9af' + '526fd78018b9b011787e4e9012437116' + 'e51723ab29e7a3ddc3589846815de0c9' '5e0f2a02e12675ac070a148c3234e111') build() { @@ -52,4 +56,6 @@ build() { mv ssl-search.sh irc-ssl-search.sh install -D -m 0755 $srcdir/ultimate-ircd $pkgdir/etc/rc.d/ultimate-ircd install -d -m 0755 $pkgdir/var/lib/ircd + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/ultimate-ircd/ultimate-ircd.service b/community/ultimate-ircd/ultimate-ircd.service new file mode 100644 index 000000000..4b79c371d --- /dev/null +++ b/community/ultimate-ircd/ultimate-ircd.service @@ -0,0 +1,12 @@ +[Unit] +Description=IRC daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +User=ircd +PIDFile=/var/run/ircd/ircd.pid +ExecStart=/usr/bin/ircd -f /etc/ircd/ircd.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/ultimate-ircd/ultimate-ircd.tmpfiles b/community/ultimate-ircd/ultimate-ircd.tmpfiles new file mode 100644 index 000000000..c9a9c98e3 --- /dev/null +++ b/community/ultimate-ircd/ultimate-ircd.tmpfiles @@ -0,0 +1 @@ +d /run/ircd 0755 ircd irc - diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD index 89351743f..5a2c6f383 100644 --- a/community/uniconvertor/PKGBUILD +++ b/community/uniconvertor/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65343 2012-02-21 02:13:57Z spupykin $ +# $Id: PKGBUILD 78268 2012-10-17 10:27:59Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=uniconvertor pkgver=1.1.5 -pkgrel=5 +pkgrel=6 pkgdesc="A universal vector graphics translator using sK1 engine." arch=('i686' 'x86_64') url="http://sk1project.org/modules.php?name=Products&product=uniconvertor" license=('GPL') -depends=('python2' 'pil' 'python-reportlab' 'sk1libs') +depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs') makedepends=('gcc') source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz) md5sums=('d1272315a58304ece2ff588834e23f72') @@ -21,5 +21,9 @@ build() { sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py python2 setup.py build +} + +package() { + cd "$srcdir/uniconvertor-$pkgver" python2 setup.py install --root="$pkgdir" } diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 6e0d58232..052a65379 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60367 2011-12-12 09:58:46Z spupykin $ +# $Id: PKGBUILD 78360 2012-10-17 15:21:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.9 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') url="http://unrealircd.com" @@ -15,9 +15,11 @@ provides=('ircd') backup=(etc/unrealircd/unrealircd.conf) source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc + unrealircd.service arch-fixes.patch) md5sums=('bde023695347969f545ce5f2a9ac9aed' '07ffa1e82a01f319a8b997e155d2af1d' + '2103ce8a4a4e79f6955920bfebea0202' '77807313c4578f2c30286b9f9e3fb21c') build() { @@ -60,4 +62,6 @@ build() { find $pkgdir/usr -type f -exec chmod ugo+r {} \; find $pkgdir/usr -type d -exec chmod ugo+rx {} \; + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service new file mode 100644 index 000000000..42279fae0 --- /dev/null +++ b/community/unrealircd/unrealircd.service @@ -0,0 +1,12 @@ +[Unit] +Description=IRC daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +User=ircd +PIDFile=/var/run/unrealircd.pid +ExecStart=/usr/bin/unrealircd -p + +[Install] +WantedBy=multi-user.target diff --git a/community/virtkey/PKGBUILD b/community/virtkey/PKGBUILD index bdbe2675e..7d350b553 100644 --- a/community/virtkey/PKGBUILD +++ b/community/virtkey/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=virtkey pkgname=('python2-virtkey' 'python-virtkey') pkgver=0.61.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="https://launchpad.net/virtkey" license=('LGPL') @@ -42,5 +42,5 @@ package_python-virtkey() { cd "$srcdir/$pkgbase-$pkgver" - python setup.py install --root=$pkgdir/ --optimize=1 + python3 setup.py install --root=$pkgdir/ --optimize=1 } diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index fcbf5aa33..6629ac7ee 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73487 2012-07-08 09:31:59Z ibiru $ +# $Id: PKGBUILD 78342 2012-10-17 14:41:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=7 +pkgrel=8 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -47,13 +47,15 @@ optdepends=('alsa-lib: ALSA audio output' # somehow connected with resid i guess(not in repos also) conflicts=('xmms2-devel') install=xmms2.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - xmms2d.conf - xmms2d.rc - 'ffmpeg-0.11.diff') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "xmms2d.conf" + "xmms2d.rc" + "xmms2d.service" + "ffmpeg-0.11.diff") md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' '9d8e3e1a434f271423bdd228a1e9bd7c' + '19167aa54e4745853689abad72443b3e' 'e176971ef96807f72fa8fc17d260c20a') build() { @@ -78,6 +80,7 @@ build() { ./waf build ./waf --destdir=${pkgdir} install - install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d - install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf + install -Dm0755 $srcdir/xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d + install -Dm0644 $srcdir/xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf + install -Dm0644 $srcdir/xmms2d.service $pkgdir/usr/lib/systemd/system/xmms2d.service } diff --git a/community/xmms2/xmms2d.service b/community/xmms2/xmms2d.service new file mode 100644 index 000000000..a38584df1 --- /dev/null +++ b/community/xmms2/xmms2d.service @@ -0,0 +1,12 @@ +[Unit] +Description=XMMS2 daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/xmms2d.conf +ExecStart=su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER +ExecStop=su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER + +[Install] +WantedBy=multi-user.target diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index fd9981586..362fe2348 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71849 2012-06-02 10:32:56Z bluewind $ +# $Id: PKGBUILD 78271 2012-10-17 10:28:08Z allan $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc pkgver=0.206 -pkgrel=2 +pkgrel=3 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') @@ -47,4 +47,4 @@ package() { make DESTDIR="$pkgdir" install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: |