diff options
78 files changed, 2471 insertions, 148 deletions
diff --git a/community-staging/ipvsadm/PKGBUILD b/community-staging/ipvsadm/PKGBUILD new file mode 100644 index 000000000..407487a23 --- /dev/null +++ b/community-staging/ipvsadm/PKGBUILD @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=ipvsadm +pkgver=1.26 +pkgrel=2 +pkgdesc='The IP Virtual Server administration utility' +arch=('i686' 'x86_64') +url='http://www.linuxvirtualserver.org/software/ipvs.html' +license=('GPL2') +depends=('libnl1' 'popt') +backup=('etc/conf.d/ipvsadm') +#options=('!makeflags') +source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz" + 'ipvsadm.rc' + 'ipvsadm.conf' + 'ipvsadm.rules') +md5sums=('eac3ba3f62cd4dea2da353aeddd353a8' + '0e106fce0675e014bea0f9355b947bd6' + 'cd358130967a9cc0d31fc61282df43e7' + 'cd6649c647e495d4d6f981542ce5a93b') + +build() { + cd ${pkgname}-${pkgver} + make INCLUDE="-I/usr/src/linux-`uname -r`/include -I.. -I." || return 1 +} + +package() { + cd ${pkgname}-${pkgver} + make BUILD_ROOT=${pkgdir} MANDIR=usr/share/man INIT="$pkgdir/etc/rc.d" install + cd "$srcdir" + # add initscripts + install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" + install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + # add ipvsadm rules + install -D -m 644 $pkgname.rules "${pkgdir}/etc/$pkgname.rules" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/ipvsadm/ipvsadm.conf b/community-staging/ipvsadm/ipvsadm.conf new file mode 100644 index 000000000..aac7ba729 --- /dev/null +++ b/community-staging/ipvsadm/ipvsadm.conf @@ -0,0 +1,3 @@ +# vim:set ts=2 sw=2 ft=sh et: + +IPVSADM_CONF='/etc/ipvsadm.rules' diff --git a/community-staging/ipvsadm/ipvsadm.rc b/community-staging/ipvsadm/ipvsadm.rc new file mode 100644 index 000000000..91ed32e3b --- /dev/null +++ b/community-staging/ipvsadm/ipvsadm.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/ipvsadm + +case "$1" in + start) + stat_busy 'Loading IPVS table' + if [[ -f $IPVSADM_CONF ]] && /sbin/ipvsadm-restore < "$IPVSADM_CONF"; then + add_daemon ipvsadm + stat_done + else + stat_fail + fi + ;; + stop) + status 'Clearing IPVS table' /sbin/ipvsadm -C + rm_daemon ipvsadm + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + save) + stat_busy 'Saving IPVS table' + if /sbin/ipvsadm-save -n > "$IPVSADM_CONF" 2>/dev/null; then + stat_done + else + stat_fail + fi + ;; + *) + echo "usage: ${0##*/} {start|stop|restart|save}" +esac +exit 0 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/ipvsadm/ipvsadm.rules b/community-staging/ipvsadm/ipvsadm.rules new file mode 100644 index 000000000..6740463a1 --- /dev/null +++ b/community-staging/ipvsadm/ipvsadm.rules @@ -0,0 +1 @@ +# emtpy rules file for ipvsadm diff --git a/community-staging/keepalived/PKGBUILD b/community-staging/keepalived/PKGBUILD new file mode 100644 index 000000000..ad7fa29f4 --- /dev/null +++ b/community-staging/keepalived/PKGBUILD @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Andrea Zucchelli <zukka77@gmail.com> + +pkgname=keepalived +pkgver=1.2.2 +pkgrel=3 +pkgdesc='Failover and monitoring daemon for LVS clusters' +arch=('i686' 'x86_64') +url='http://www.keepalived.org/' +license=('GPL2') +backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived') +depends=('openssl' 'popt' 'libnl1') +source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" + 'keepalived.rc' + 'keepalived.conf' + 'ip_vs_moved.patch') +md5sums=('f68327ca142616a8463d2d105db122cd' + 'baeb62a682c2b59d732cea84bf52cc87' + '9c8142da8730ad27a345587dea83ced7' + '87ee19c85adaedd3eb11bea8a5865d47') + +build() { + cd $pkgname-$pkgver + patch -p1 -i ../ip_vs_moved.patch + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # clean pacakge init scripts + rm -r "$pkgdir/etc/rc.d/init.d" "$pkgdir/etc/sysconfig" + # move examples to /usr/share + install -d -m 755 "$pkgdir/usr/share/$pkgname" + mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples" + + # add initscripts + install -D -m 755 ../$pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" + install -D -m 644 ../$pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/keepalived/ip_vs_moved.patch b/community-staging/keepalived/ip_vs_moved.patch new file mode 100644 index 000000000..e27873810 --- /dev/null +++ b/community-staging/keepalived/ip_vs_moved.patch @@ -0,0 +1,23 @@ +--- keepalived-1.2.2/configure 2011-01-06 01:51:33.000000000 +0100 ++++ keepalived-1.2.2.orig/configure 2011-11-24 19:36:32.051486626 +0100 +@@ -3973,7 +3973,7 @@ + + IPVS_SUPPORT="_WITHOUT_LVS_" + if test "$enable_lvs" != "no"; then +- ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "linux/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default" + if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then : + IPVS_SUPPORT="_WITH_LVS_" + else +diff -ru keepalived-1.2.2/configure.in keepalived-1.2.2.orig/configure.in +--- keepalived-1.2.2/configure.in 2011-01-06 01:51:30.000000000 +0100 ++++ keepalived-1.2.2.orig/configure.in 2011-11-24 19:36:11.797860077 +0100 +@@ -124,7 +124,7 @@ + dnl ----[ Checks for LVS and VRRP support ]---- + IPVS_SUPPORT="_WITHOUT_LVS_" + if test "$enable_lvs" != "no"; then +- AC_CHECK_HEADER([net/ip_vs.h], ++ AC_CHECK_HEADER([linux/ip_vs.h], + [IPVS_SUPPORT="_WITH_LVS_"], + [ + IPVS_SUPPORT="_WITHOUT_LVS_" diff --git a/community-staging/keepalived/keepalived.conf b/community-staging/keepalived/keepalived.conf new file mode 100644 index 000000000..225f02bf9 --- /dev/null +++ b/community-staging/keepalived/keepalived.conf @@ -0,0 +1,16 @@ +# vim:set ts=2 sw=2 ft=sh et: +# Options for keepalived. See `keepalived --help' output and keepalived(8) and +# keepalived.conf(5) man pages for a list of all options. Here are the most +# common ones : +# +# --vrrp -P Only run with VRRP subsystem. +# --check -C Only run with Health-checker subsystem. +# --dont-release-vrrp -V Dont remove VRRP VIPs & VROUTEs on daemon stop. +# --dont-release-ipvs -I Dont remove IPVS topology on daemon stop. +# --dump-conf -d Dump the configuration data. +# --log-detail -D Detailed log messages. +# --log-facility -S 0-7 Set local syslog facility (default=LOG_DAEMON) +# + +DAEMON_OPTS='-D' + diff --git a/community-staging/keepalived/keepalived.rc b/community-staging/keepalived/keepalived.rc new file mode 100644 index 000000000..88bb90724 --- /dev/null +++ b/community-staging/keepalived/keepalived.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +NAME=keepalived +DAEMON=/usr/sbin/keepalived +PID=$(pidof -o %PPID $DAEMON) + +case "$1" in + start) + stat_busy "Starting $NAME daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping $NAME daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + reload) + stat_busy "Reloading $NAME daemon" + [[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0 + stat_fail + ;; + *) + echo "usage: ${0##*/} {start|stop|restart|reload}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh noet: diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD index 172baf2bd..ac6942bcb 100644 --- a/community/arptables/PKGBUILD +++ b/community/arptables/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59644 2011-11-29 01:04:59Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net +# $Id: PKGBUILD 64145 2012-02-09 09:48:15Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=arptables pkgver=0.0.3_4 -pkgrel=1 +pkgrel=2 pkgdesc='ARP filtering utility' arch=('i686' 'x86_64') url='http://ebtables.sourceforge.net/' @@ -20,9 +20,6 @@ build() { } package() { - # install rc script - install -D -m 0755 arptables.rc "$pkgdir/etc/rc.d/arptables" - # setup arptables cd $pkgname-v${pkgver//_/-} make install \ @@ -33,6 +30,9 @@ package() { MANDIR=/usr/share/man \ INITDIR=/etc/rc.d \ SYSCONFIGDIR=/etc/arptables + + # install rc script + install -D -m 0755 ../arptables.rc "$pkgdir/etc/rc.d/arptables" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ccrypt/PKGBUILD b/community/ccrypt/PKGBUILD index c2960de0e..9a99deec7 100644 --- a/community/ccrypt/PKGBUILD +++ b/community/ccrypt/PKGBUILD @@ -1,21 +1,28 @@ -# $Id: PKGBUILD 6074 2009-11-29 08:39:09Z giovanni $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 64159 2012-02-09 16:27:49Z ttopper $ +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=ccrypt pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="A command-line utility for encrypting and decrypting files and streams" arch=('i686' 'x86_64') url="http://ccrypt.sourceforge.net" license=('GPL2') depends=('glibc') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('c3f78019d7a166dd66f1d4b1390c62c2') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$pkgdir install + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install } diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD index e423110d6..2d7f3d77b 100755 --- a/community/confuse/PKGBUILD +++ b/community/confuse/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 64161 2012-02-09 16:35:50Z ttopper $ +# Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=confuse pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="C-library for parsing configuration files" arch=('i686' 'x86_64') url="http://www.nongnu.org/confuse" license=('LGPL') depends=('glibc') -source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz") options=('!libtool' '!emptydirs') md5sums=('45932fdeeccbb9ef4228f1c1a25e9c8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-shared - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/community/e3/PKGBUILD b/community/e3/PKGBUILD index b23534ff6..542a0c649 100644 --- a/community/e3/PKGBUILD +++ b/community/e3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63897 2012-02-06 16:46:33Z arodseth $ +# $Id: PKGBUILD 64154 2012-02-09 14:16:08Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=e3 pkgver=2.8 -pkgrel=2 -pkgdesc="Tiny text editor written in assembly, that doesn't depend on any libraries" +pkgrel=3 +pkgdesc="Editor written in assembly. Tiny, with no library dependencies." arch=('x86_64' 'i686') url="http://sites.google.com/site/e3editor/" license=('GPL2') diff --git a/community/etherape/PKGBUILD b/community/etherape/PKGBUILD index eb7e1f045..8fc090151 100644 --- a/community/etherape/PKGBUILD +++ b/community/etherape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48609 2011-06-03 09:54:50Z ttopper $ +# $Id: PKGBUILD 64163 2012-02-09 16:45:19Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: kevin <kevin@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=etherape pkgver=0.9.12 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical network monitor for various OSI layers and protocols" arch=('i686' 'x86_64') url="http://etherape.sourceforge.net/" diff --git a/community/fswebcam/PKGBUILD b/community/fswebcam/PKGBUILD index 73d890c07..ae1493bdb 100644 --- a/community/fswebcam/PKGBUILD +++ b/community/fswebcam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54317 2011-08-16 18:16:02Z ttopper $ +# $Id: PKGBUILD 64170 2012-02-09 17:15:43Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Philipp Robbel <robbel@gmail.com> pkgname=fswebcam pkgver=20110717 -pkgrel=1 +pkgrel=2 pkgdesc="Tiny and flexible webcam app." arch=('i686' 'x86_64') url="http://www.firestorm.cx/fswebcam" diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 09fe68ab1..78129a3a3 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20120204 -pkgrel=2 +pkgver=20120209 +pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') url="http://www.dsource.org/projects/ldc" license=('BSD') -makedepends=('git' 'cmake' 'libconfig') -depends=('llvm') +depends=('llvm' 'libconfig') +makedepends=('git' 'cmake') source=() md5sums=() diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD index 69e379160..4dc9e4d5d 100644 --- a/community/libdbi-drivers/PKGBUILD +++ b/community/libdbi-drivers/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 64177 2012-02-09 17:50:10Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Olivier Médoc <o_medoc@yahoo.fr> # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com> @@ -5,7 +6,7 @@ pkgname=libdbi-drivers pkgver=0.8.3_1 _pkgver=0.8.3-1 -pkgrel=2 +pkgrel=3 pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)" url="http://libdbi-drivers.sourceforge.net/" license=('GPL') diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD index 6d795f55a..25c1988a7 100644 --- a/community/librep/PKGBUILD +++ b/community/librep/PKGBUILD @@ -1,33 +1,34 @@ -# $Id: PKGBUILD 59710 2011-11-29 13:35:00Z stephane $ -# Maintainer: stefan-husmann@t-online.de +# $Id: PKGBUILD 64157 2012-02-09 14:54:32Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> - pkgname=librep pkgver=0.92.1b -pkgrel=2 -pkgdesc="A Lisp system for UNIX" +pkgrel=3 +pkgdesc="Lisp system for Sawfish" license=('GPL2') -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') url="http://sawfish.wikia.com/wiki/Librep" depends=('gmp' 'gdbm' 'libffi') -install=${pkgname}.install +install=$pkgname.install options=('!emptydirs' '!libtool') -source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('f75e1197646bbf1594fc4765802aab0bffe1bb02') +source=("http://download.tuxfamily.org/$pkgname/$pkgname-$pkgver.tar.xz") +sha256sums=('aedca2716252a1ff2256aca321cce35646b795840b65a3c481708c04a6fd7e3e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + ./configure --disable-static \ --prefix=/usr \ - --libexecdir=/usr/lib/$pkgname \ + --libexecdir="/usr/lib/$pkgname" \ --with-readline make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - # create some directories or make install fails -# install -d $pkgdir/usr/{share/aclocal,lib/pkgconfig} - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 592833c16..7132e4735 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63660 2012-02-05 12:04:09Z ibiru $ +# $Id: PKGBUILD 64173 2012-02-09 17:40:27Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.6.0.2 +pkgver=3.6.0.3 pkgrel=2 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' ' 'libircclient' 'miniupnpc' 'wxgtk') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('9d840a04b41aef2cba503de7bf433b8d') +md5sums=('5a4a2429435031d9f9cc5d9535a9de9d') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 32fce25f2..fb95c3280 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -4,23 +4,28 @@ pkgname=paraview pkgver=3.12.0 -pkgrel=3 +pkgrel=5 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff' 'libtheora') +depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2' + # The following is a list of libraries we explicitly tell cmake to use the system library of + 'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora' + ) makedepends=('cmake' 'desktop-file-utils' 'boost') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" 'paraview.png' 'paraview.desktop' 'fix-boost-graph-api-changes.diff' - '12859-VisItBrige-external-tiff-support.diff') + '12859-VisItBrige-external-tiff-support.diff' + 'fix-build-with-zlib-1.2.6.diff') md5sums=('8feabc6261e2060648eaac593d85b1de' 'db623002bc71a257ddfdd0c9c7b14c3f' '4e4b7172ed18171c37446fd7c4f1e8f5' '2aa5b98288cadd201ffbd057f18929b0' - '9321279c8fc6f289a7cf228648edcb5f') + '9321279c8fc6f289a7cf228648edcb5f' + 'e4506b4ed0d2ae60072388f098be6c33') build() { cd ParaView-${pkgver}/VTK @@ -32,6 +37,10 @@ build() { # fix http://paraview.org/Bug/view.php?id=12849 remove on next pkgver bump patch -Np1 -i ${srcdir}/12859-VisItBrige-external-tiff-support.diff + cd ${srcdir}/ParaView-${pkgver} + # fix http://paraview.org/Bug/view.php?id=12924 + patch -Np0 -i ${srcdir}/fix-build-with-zlib-1.2.6.diff + mkdir ${srcdir}/build cd ${srcdir}/build diff --git a/community/paraview/fix-build-with-zlib-1.2.6.diff b/community/paraview/fix-build-with-zlib-1.2.6.diff new file mode 100644 index 000000000..6540de045 --- /dev/null +++ b/community/paraview/fix-build-with-zlib-1.2.6.diff @@ -0,0 +1,36 @@ +--- Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C.original 2012-02-09 16:22:56.420371795 +0000 ++++ Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C 2012-02-09 16:25:59.652228526 +0000 +@@ -703,10 +703,10 @@ + { + // Read past the specified offset. + if(byteOffset > 0) +- gzseek(gz_handle, byteOffset, SEEK_SET); ++ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET); + + // Read the whole dataset +- gzread(gz_handle, whole_buff, whole_nelem * unit_size); ++ gzread((gzFile)gz_handle, whole_buff, whole_nelem * unit_size); + } + else + { +@@ -1046,9 +1046,9 @@ + { + // Read past the specified offset. + if(byteOffset > 0) +- gzseek(gz_handle, byteOffset, SEEK_SET); ++ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET); + +- gzread(gz_handle, rv->GetVoidPointer(0), ++ gzread((gzFile)gz_handle, rv->GetVoidPointer(0), + nvals * dataNumComponents * unit_size); + } + else +@@ -1192,7 +1192,7 @@ + // Close the file descriptors. + // + if (gzipped) +- gzclose(gz_handle); ++ gzclose((gzFile)gz_handle); + else + fclose(file_handle); + diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 3eea37da6..1523e8653 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.19_rel24.0 +pkgver=5.5.20_rel24.1 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -98,6 +98,6 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -md5sums=('eb8c21bbb8179e0a4709d51c037e682c' +md5sums=('0f61fde172ed1168a3ca9b7b003a6698' '243864805611764a7e5883c1dba7afd8' '1c949c0dbea5206af0db14942d9927b6') diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index fdd3acd26..b6d8915ba 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -3,12 +3,12 @@ pkgname=quagga pkgver=0.99.20 -pkgrel=2 +pkgrel=3 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' license=('GPL2') -depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses') +depends=('libcap' 'net-snmp' 'readline' 'ncurses') options=('!libtool' '!buildflags') backup=() install=quagga.install diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index 478eb7fce..f52714348 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62660 2012-01-23 13:31:10Z lfleischer $ +# $Id: PKGBUILD 64182 2012-02-09 20:42:45Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy pkgver=1.8.3 -pkgrel=3 +pkgrel=4 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64') url='https://banu.com/tinyproxy/' @@ -22,7 +22,7 @@ md5sums=('292ac51da8ad6ae883d4ebf56908400d' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --localstatedir=/var --enable-transparent make } diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD new file mode 100644 index 000000000..19e8c83f5 --- /dev/null +++ b/community/wesnoth/PKGBUILD @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Jacobo Arvelo <unix4all@ya.com> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=wesnoth +pkgver=1.10 +pkgrel=1 +pkgdesc="A turn-based strategy game on a fantasy world" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.wesnoth.org/" +depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data" 'dbus-core' 'python2') +makedepends=('boost' 'cmake') +install=wesnoth.install +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + wesnoth.tmpfiles.conf + wesnothd.rc.d) +md5sums=('707daa13e2f5b3976d9b169aab62dc29' + 'b8122f5054e3895c9c054e87460869dc' + '85659b47d22dfdf4e4d046556973fc3e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir build && cd build + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_OMP=ON \ + -DENABLE_TOOLS=ON \ + -DMANDIR=share/man \ + -DFIFO_DIR=/var/run/wesnothd + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + cd build + make DESTDIR="$pkgdir" install + + rm -r $pkgdir/usr/share/applications + rm -r $pkgdir/usr/share/doc + rm -r $pkgdir/usr/share/pixmaps + rm -r $pkgdir/usr/share/wesnoth + + install -Dm644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" + install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd" +} diff --git a/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch new file mode 100644 index 000000000..5aee3118c --- /dev/null +++ b/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch @@ -0,0 +1,70 @@ +--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 ++++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 +@@ -238,6 +238,17 @@ void ttree_view_node::clear() + + struct ttree_view_node_implementation + { ++ template<class W, class It> ++ static W* find_at_aux(It begin, It end, ++ const tpoint& coordinate, const bool must_be_active) { ++ for (It it = begin; it != end; ++it) { ++ if(W* widget = it->find_at(coordinate, must_be_active)) { ++ return widget; ++ } ++ } ++ return NULL; ++ } ++ + template<class W> + static W* find_at( + typename tconst_duplicator<W, ttree_view_node>::type& +@@ -255,13 +266,9 @@ struct ttree_view_node_implementation + } + + typedef typename tconst_duplicator<W, ttree_view_node>::type thack; +- foreach(thack& node, tree_view_node.children_) { +- if(W* widget = node.find_at(coordinate, must_be_active)) { +- return widget; +- } +- } +- +- return NULL; ++ return find_at_aux<W>(tree_view_node.children_.begin(), ++ tree_view_node.children_.end(), ++ coordinate, must_be_active); + } + }; + +@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size + return size; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz + size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s + + DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; diff --git a/community/wesnoth/wesnoth-libpng-1.4.0.patch b/community/wesnoth/wesnoth-libpng-1.4.0.patch new file mode 100644 index 000000000..338f467af --- /dev/null +++ b/community/wesnoth/wesnoth-libpng-1.4.0.patch @@ -0,0 +1,24 @@ +diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 +@@ -174,8 +174,8 @@ + //TODO: review whether providing NULL error handlers is something + //sensible + png_struct* png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), ++ NULL, NULL); + if(!png_ptr) + throw exploder_failure("Unable to initialize the png write structure"); + +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600 +@@ -15,6 +15,7 @@ + #include "exploder_utils.hpp" + #include "game_config.hpp" + #include "serialization/string_utils.hpp" ++#include <zlib.h> + #include <png.h> + + exploder_point::exploder_point(const std::string &s) diff --git a/community/wesnoth/wesnoth.install b/community/wesnoth/wesnoth.install new file mode 100644 index 000000000..4f1e419ae --- /dev/null +++ b/community/wesnoth/wesnoth.install @@ -0,0 +1,9 @@ +# arg 1: the new package version +post_install() { +cat << EOF +Note: +==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" +==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth +==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. +EOF +} diff --git a/community/wesnoth/wesnoth.tmpfiles.conf b/community/wesnoth/wesnoth.tmpfiles.conf new file mode 100644 index 000000000..3ec0f6013 --- /dev/null +++ b/community/wesnoth/wesnoth.tmpfiles.conf @@ -0,0 +1 @@ +D /run/wesnothd 0700 root root - diff --git a/community/wesnoth/wesnothd.rc.d b/community/wesnoth/wesnothd.rc.d new file mode 100755 index 000000000..95e312b7b --- /dev/null +++ b/community/wesnoth/wesnothd.rc.d @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/wesnothd) + +case "$1" in + start) + stat_busy "Starting Wesnoth Server Daemon" + [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd + [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + PID=$(pidof -o %PPID /usr/bin/wesnothd) + echo $PID > /var/run/wesnotd/pid + add_daemon wesnothd + stat_done + fi + ;; + stop) + stat_busy "Stopping Wesnoth Server Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon wesnothd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 2bfdc78b0..8bdc641c8 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 136115 2011-08-23 03:22:03Z eric $ +# $Id: PKGBUILD 149749 2012-02-10 03:59:10Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.88 +pkgver=2.02.90 pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_install lvm2_hook 11-dm-initramfs.rules) -md5sums=('321429cd1b1526a29cf6d75018b1e4bb' - 'dcb82506d732cc7b10159a89b579dba8' - '8d613b84a175cd85f752a75198e40e15' - '69e40679cd8b3658bfc619e48baae125') -sha1sums=('05a4fb09cb5e3d680ad1b268c941968853fb1979' +sha1sums=('de37e533e5f3af6a18c1acadd7a07ae06150d7d6' + '61c4b46dff520f9c178062930ea9f169019f57e6' '7f108b2f2056eb050fc898bf5190ecf9145aed8a' - 'a0e0513c2efb183006e57e595d93ce18be297928' + '7d63aa838703c9f986531a78164b556f765f5cce' 'f6a554eea9557c3c236df2943bb6e7e723945c41') build() { diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook index 874b91d06..efb104998 100644 --- a/core/lvm2/lvm2_hook +++ b/core/lvm2/lvm2_hook @@ -4,22 +4,22 @@ run_hook () /sbin/modprobe -q dm-mod >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then + local major minor + IFS=: read major minor < /sys/class/misc/device-mapper/dev mkdir /dev/mapper - mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mknod "/dev/mapper/control" c ${major} ${minor} fi # If the lvmwait= parameter has been specified on the command line # wait for the device(s) before trying to activate the volume group(s) - if [ -n "${lvmwait}" ]; then - for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do - poll_device ${pvdev} ${rootdelay} - done - fi + for pvdev in ${lvmwait//,/ }; do + poll_device ${pvdev} ${rootdelay} + done [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" msg "Activating logical volumes..." - [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit + [ -d /etc/lvm ] && /sbin/lvm vgscan eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET fi } diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 63a86ea2e..b1b74d4b4 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147794 2012-01-28 10:33:10Z andrea $ +# $Id: PKGBUILD 149702 2012-02-09 14:11:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" arch=('i686' 'x86_64') @@ -13,10 +13,15 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2") -sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d') +source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2" + 'fix-with-qt48.patch') +sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d' + '3ec130564aa1b7a61a0c3cd51533c69c6c35bd0e') build() { + cd "${srcdir}"/marble-${pkgver} + patch -p1 -i "${srcdir}"/fix-with-qt48.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdeedu-marble/fix-with-qt48.patch b/extra/kdeedu-marble/fix-with-qt48.patch new file mode 100644 index 000000000..3694a48fb --- /dev/null +++ b/extra/kdeedu-marble/fix-with-qt48.patch @@ -0,0 +1,87 @@ +commit 79c39f45468bace95169d1ba959884ce27087d1e +Author: Torsten Rahn <rahn@kde.org> +Date: Wed Feb 8 17:18:15 2012 +0100 + + Fixes for Marble with Qt 4.8: + + - Provide proper colors for Marble's Atlas, Temperature, + Precipitation and Venus/Mars Topography maps. + ( due to introduction of QImage::fill( QColor ) overload ) + + - Show proper icons for MarbleLegendBrowser + ( due to new interpretation of the "current directory" in + QTextBrowser ) + +diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp +index 4a25095..ffa0a23 100644 +--- a/src/lib/MarbleLegendBrowser.cpp ++++ b/src/lib/MarbleLegendBrowser.cpp +@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend() + t.start(); + + // Read the html string. +- QString finalHtml; ++ QString legendPath; + + // Check for a theme specific legend.html first + if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 ) + { + GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme(); + +- QString customLegendPath = MarbleDirs::path( "maps/" + ++ legendPath = MarbleDirs::path( "maps/" + + currentMapTheme->head()->target() + '/' + + currentMapTheme->head()->theme() + "/legend.html" ); +- if ( !customLegendPath.isEmpty() ) +- finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath ) ); +- else +- finalHtml.clear(); + } +- +- if ( finalHtml.isEmpty() ) { +- finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) ); ++ if ( legendPath.isEmpty() ) { ++ legendPath = MarbleDirs::path( "legend.html" ); + } + ++ QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) ); ++ finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' ); ++ + // Generate some parts of the html from the MapTheme <Legend> tag. + const QString sectionsHtml = generateSectionsHtml(); + +diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp +index 4a4f8f3..d0deead 100644 +--- a/src/lib/TextureColorizer.cpp ++++ b/src/lib/TextureColorizer.cpp +@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport + m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 ); + + // update coast image +- m_coastImage.fill( Qt::transparent ); ++ m_coastImage.fill( QColor( 0, 0, 255, 0) ); + + bool doClip = false; //assume false + switch( viewport->projection() ) { +commit b89ff577fcbd085fbd180f59aa669dded1818082 +Author: Bernhard Beschow <bbeschow@cs.tu-berlin.de> +Date: Wed Feb 8 18:14:59 2012 +0100 + + compile with Qt < 4.8 + + * take into account the comment in the API doc, which suggests to use QColor::rgb() + (cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9) + +diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp +index d0deead..9319a89 100644 +--- a/src/lib/TextureColorizer.cpp ++++ b/src/lib/TextureColorizer.cpp +@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport + m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 ); + + // update coast image +- m_coastImage.fill( QColor( 0, 0, 255, 0) ); ++ m_coastImage.fill( QColor( 0, 0, 255, 0).rgb() ); + + bool doClip = false; //assume false + switch( viewport->projection() ) { diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD index 9dffccc24..43a5f4421 100644 --- a/extra/libdmtx/PKGBUILD +++ b/extra/libdmtx/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 149591 2012-02-08 15:18:48Z andrea $ +# $Id: PKGBUILD 149704 2012-02-09 14:15:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: jose <jose1711 [at] gmail (dot) com> pkgname=libdmtx pkgver=0.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="A software for reading and writing Data Matrix 2D barcodes" url="http://www.libdmtx.org/" arch=('i686' 'x86_64') license=('GPL2') -depends=('imagemagick') +depends=('glibc') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('d3a4c0becd92895eb606dbdb78b023e2') options=('!libtool') diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD index 84d11dbad..c99afeaeb 100644 --- a/extra/libshout/PKGBUILD +++ b/extra/libshout/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137685 2011-09-10 12:10:13Z pierre $ +# $Id: PKGBUILD 149753 2012-02-10 04:20:16Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=libshout -pkgver=2.2.2 -pkgrel=4 +pkgver=2.3.0 +pkgrel=1 epoch=1 pkgdesc="Library for accessing a shoutcast/icecast server" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url="http://www.icecast.org/" options=('!libtool' '!emptydirs') license=('LGPL') source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('4f75fc9901c724b712c371c9a1e782d3') +md5sums=('976a5979505f3de4026ae7fffb10754b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index a888f813f..55da0fa3c 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145886 2012-01-03 19:05:26Z giovanni $ +# $Id: PKGBUILD 149745 2012-02-09 23:48:35Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=5.2.1 +pkgver=5.3.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('d4942dc6427935838e914b8b7b83021a') +md5sums=('2cd84ff24e1d9217dd3caf170f34e758') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD index 8c2c5ed53..d01f70a47 100644 --- a/extra/ntfs-3g_ntfsprogs/PKGBUILD +++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 149625 2012-02-08 20:40:04Z pierre $ +# $Id: PKGBUILD 149729 2012-02-09 19:52:17Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Bächler <thomas.archlinux.org> pkgbase=ntfs-3g_ntfsprogs pkgname=('ntfs-3g' 'ntfsprogs') -pkgver=2011.4.12 -pkgrel=2 +pkgver=2012.1.15 +pkgrel=1 url="http://www.tuxera.com" arch=('i686' 'x86_64') license=('GPL2') depends=('glibc' 'fuse') makedepends=('pkgconfig') options=('!libtool') -source=(http://tuxera.com/opensource/${pkgbase}-${pkgver}.tgz - 25-ntfs-config-write-policy.fdi) -sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7' - '200029f2999a2c284fd30ae25734abf6459c3501') +source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz) +sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "$srcdir/$pkgbase-$pkgver" ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \ --with-fuse=external --disable-static \ --mandir=/usr/share/man @@ -29,19 +27,17 @@ package_ntfs-3g() { pkgdesc="Stable read and write NTFS driver" for DIR in src libntfs-3g include; do - cd "${srcdir}/${pkgbase}-${pkgver}/${DIR}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgbase-$pkgver/$DIR" + make DESTDIR="$pkgdir" install done - ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs" - install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor" - install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/" + ln -s /bin/ntfs-3g "$pkgdir/sbin/mount.ntfs" } package_ntfsprogs() { pkgdesc="NTFS filesystem utilities" depends=('util-linux' 'ntfs-3g') - cd "${srcdir}/${pkgbase}-${pkgver}/ntfsprogs" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgbase-$pkgver/ntfsprogs" + make DESTDIR="$pkgdir" install } diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index f3f4d22c2..83f1867d3 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 149216 2012-02-06 13:29:48Z jgc $ +# $Id: PKGBUILD 149727 2012-02-09 19:48:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman -pkgver=0.24.2 -pkgrel=2 +pkgver=0.24.4 +pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64) url="http://xorg.freedesktop.org" license=('custom') depends=('glibc') options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 -revert-reject-trapezoids-where-top-is-above-the-edges.patch) -sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418' - 'ee36251d47ccefd5e276cabdba9917fbb2be787a') +source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('683450f917015366ac7918fc517c76801aeff374') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/revert-reject-trapezoids-where-top-is-above-the-edges.patch" ./configure --prefix=/usr --disable-static make } diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 5973fa422..40aedb9a7 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 148932 2012-02-05 11:56:32Z ibiru $ +# $Id: PKGBUILD 149755 2012-02-10 04:38:45Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') -depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') +depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm') makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD index 2a2faef20..46b88cecf 100644 --- a/extra/testdisk/PKGBUILD +++ b/extra/testdisk/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 143223 2011-11-23 16:04:33Z tpowa $ +# $Id: PKGBUILD 149731 2012-02-09 19:52:20Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=testdisk pkgver=6.13 -pkgrel=1 +pkgrel=2 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool" arch=('i686' 'x86_64') url="http://www.cgsecurity.org/index.html?testdisk.html" license=('GPL') -depends=('libjpeg>=8' 'openssl' 'progsreiserfs' 'ntfsprogs') -makedepends=('pkgconfig') -source=(http://www.cgsecurity.org/${pkgname}-${pkgver}.tar.bz2) +depends=('libjpeg' 'openssl' 'progsreiserfs' 'ntfsprogs') +source=(http://www.cgsecurity.org/$pkgname-$pkgver.tar.bz2) +md5sums=('3bcbf0722d3823ca155e633969ce9f0b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --without-ewf \ --enable-sudo - make || return 1 - make DESTDIR="${pkgdir}/" install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } -md5sums=('3bcbf0722d3823ca155e633969ce9f0b') diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 24ca456e6..ac58d1ea4 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146756 2012-01-17 03:35:55Z eric $ +# $Id: PKGBUILD 149747 2012-02-10 02:50:07Z eric $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=401 -__hgrev=0dabc2ce136c +_patchlevel=434 +__hgrev=9140571d01ab _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -18,8 +18,8 @@ makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig} pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 vimrc archlinux.vim gvim.desktop) -sha1sums=('99498cb48c0c720ae9972a6cd33d4926bdf733b7' - 'ad14ce56f99ae1a86c96c5a5d0f44e48ad18a00e' +sha1sums=('008d6a6e8af0bcfc8eb1f2c05db5621b9782dd4c' + 'efdd011d2daa8238166b777b5b5e37e0a08bd7d4' '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' '3494baf53a63581ba69f86a81293640ff681c5c5' '25dd3c2ce436e73a367c8f73b68f7f6889682437' @@ -48,6 +48,7 @@ mksource() { rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* rm -r ${pkgname}-${pkgver} +# gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz } build() { diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 0effda0b4..8d2b6e9d1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -29,6 +29,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'i915-gpu-finish.patch') +md5sums=('27c641c4f6785fc647cdd3e44963a55c' + 'f81e60e49e4fb471f82ddfa2b8a8bd45' + '8116d2a3c35808f3fceece95d0b6ee96' + '92f62a90c1df8d74704a510d28146c52' + '576ba68b171efd4a3333736c30f334ef' + 'a8a3843046926eb7ab81312cd438c5c5' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + '4cd79aa147825837dc8bc9f6b736c0a0') build() { cd "${srcdir}/linux-${_basekernel}" @@ -340,15 +352,3 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } -md5sums=('27c641c4f6785fc647cdd3e44963a55c' - '39d471f90b754fd60529166cd37e5e0d' - '5c654bfed9005675317794c492bd2d8c' - '92f62a90c1df8d74704a510d28146c52' - '576ba68b171efd4a3333736c30f334ef' - 'a8a3843046926eb7ab81312cd438c5c5' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0') diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 6dc0e247d..58ad94d49 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.2.2-1-LIBRE +KERNEL_VERSION=3.2.5-1-LIBRE post_install () { # updating module dependencies diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD new file mode 100644 index 000000000..9c29caf0b --- /dev/null +++ b/libre/parabola-themes-slim/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Mark J.R.P. <l1mpm4rk@gmail.com> +# Contributor: Mark J.R.P. <l1mpm4rk@gmail.com> + +provides=("parabola-themes-slim=$pkgver") +replaces=('archlinux-themes-slim') +conflicts=('archlinux-themes-slim') +pkgname=parabola-themes-slim +pkgver=1.0 +pkgrel=1 +pkgdesc="a theme parabolero to the Slim login manager" +arch=('any') +url="https://parabolagnulinux.org/" +license=('CCPL') +optdepends=('slim: simple login manager' + 'ttf-liberation: to have a beautiful style of letter in the login') +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar) +md5sums=(bf6bead07cbcca9aa562907230496ba1) + +package() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/slim/themes + cp -a Parabola-*/ $pkgdir/usr/share/slim/themes +} diff --git a/staging/bluez/PKGBUILD b/staging/bluez/PKGBUILD new file mode 100644 index 000000000..e54c8da73 --- /dev/null +++ b/staging/bluez/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 149719 2012-02-09 18:45:25Z heftig $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> + +pkgname=bluez +pkgver=4.98 +pkgrel=3 +pkgdesc="Libraries and tools for the Bluetooth protocol stack" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('dbus-core') +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile') +optdepends=("gstreamer0.10-base: bluetooth GStreamer support" + "alsa-lib: Audio bluetooth devices support" + "dbus-python: to run bluez-simple-agent" + "pygobject: to run bluez-simple-agent" + "libusb-compat: USB adapters support" + "cups: CUPS backend") +conflicts=('bluez-libs' 'bluez-utils') +provides=('bluez-libs' 'bluez-utils') +replaces=('bluez-libs' 'bluez-utils') +options=('!libtool' 'emptydirs') +backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf + 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" + 'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch') +md5sums=('4aca8a0929250212e9a75fb60dd75b05' + '7412982b440f29fa7f76a41a87fef985' + '8f9498707f809506928b2e480d3b6789' + 'd6a34317e56b7c2bd990791d89d6c3cb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/fix-a2dp.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/lib \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-tools \ + --enable-bccmd \ + --enable-dfutool \ + --enable-hid2hci \ + --enable-hidd \ + --enable-pand \ + --enable-dund \ + --enable-cups \ + --enable-wiimote \ + --disable-test + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth + + install -d ${pkgdir}/etc/bluetooth + install -m644 network/network.conf \ + input/input.conf \ + audio/audio.conf \ + serial/serial.conf \ + ${pkgdir}/etc/bluetooth/ + + install -Dm644 ${srcdir}/bluetooth.conf.d \ + ${pkgdir}/etc/conf.d/bluetooth + + # FS#27630 + install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent + install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device + install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input + sed -i 's#/usr/bin/python#/usr/bin/python2#' \ + "${pkgdir}"/usr/bin/bluez-simple-agent \ + "${pkgdir}"/usr/bin/bluez-test-device \ + "${pkgdir}"/usr/bin/bluez-test-input + + # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html + rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules +} diff --git a/staging/bluez/bluetooth.conf.d b/staging/bluez/bluetooth.conf.d new file mode 100644 index 000000000..1c1e02589 --- /dev/null +++ b/staging/bluez/bluetooth.conf.d @@ -0,0 +1,30 @@ +# Bluetooth configuraton file + +# Bluetooth services (allowed values are "true" and "false") + +# Run the bluetoothd daemon (default: true) +#DAEMON_ENABLE="false" + +# Run the sdp daemon (default: false) +# If this is disabled, hcid's internal sdp daemon will be used +#SDPD_ENABLE="true" + +# Run the bluetooth HID daemon (default: false) +#HIDD_ENABLE="true" + +# Activate rfcomm ports (default: false) +#RFCOMM_ENABLE="true" + +# Run bluetooth dial-up networking daemon (default: false) +#DUND_ENABLE="true" + +# Run bluetooth PAN daemon (default: false) +#PAND_ENABLE="true" + +# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) +#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +# Options for hidd, dund and pand (default: none) +HIDD_OPTIONS="--server" +#DUND_OPTIONS="" +#PAND_OPTIONS="" diff --git a/staging/bluez/fix-a2dp.patch b/staging/bluez/fix-a2dp.patch new file mode 100644 index 000000000..e4bb1372a --- /dev/null +++ b/staging/bluez/fix-a2dp.patch @@ -0,0 +1,68 @@ +From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> +Date: Thu, 26 Jan 2012 23:39:02 +0200 +Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket + is disabled + +Local endpoints can only be used when UNIX socket API is available. +--- + audio/a2dp.c | 15 +++++++-------- + 1 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/audio/a2dp.c b/audio/a2dp.c +index 5ca105c..bbb91ce 100644 +--- a/audio/a2dp.c ++++ b/audio/a2dp.c +@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src) + + int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + { +- int sbc_srcs = 1, sbc_sinks = 1; ++ int sbc_srcs = 0, sbc_sinks = 0; + int mpeg12_srcs = 0, mpeg12_sinks = 0; +- gboolean source = TRUE, sink = FALSE, socket = TRUE; ++ gboolean source = TRUE, sink = FALSE, socket = FALSE; + gboolean delay_reporting = FALSE; + char *str; + GError *err = NULL; +@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + source = TRUE; + if (strstr(str, "Source")) + sink = TRUE; ++ if (strstr(str, "Socket")) ++ socket = TRUE; + g_free(str); + } + +@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + } + + /* Don't register any local sep if Socket is disabled */ +- if (socket == FALSE) { +- sbc_srcs = 0; +- sbc_sinks = 0; +- mpeg12_srcs = 0; +- mpeg12_sinks = 0; ++ if (socket == FALSE) + goto proceed; +- } + + str = g_key_file_get_string(config, "A2DP", "SBCSources", &err); + if (err) { + DBG("audio.conf: %s", err->message); + g_clear_error(&err); ++ sbc_srcs = 1; + } else { + sbc_srcs = atoi(str); + g_free(str); +@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + if (err) { + DBG("audio.conf: %s", err->message); + g_clear_error(&err); ++ sbc_sinks = 1; + } else { + sbc_sinks = atoi(str); + g_free(str); +-- +1.7.6.5 + diff --git a/staging/bluez/rc.bluetooth b/staging/bluez/rc.bluetooth new file mode 100644 index 000000000..a46ee2abb --- /dev/null +++ b/staging/bluez/rc.bluetooth @@ -0,0 +1,100 @@ +#!/bin/bash +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="bluetoothd" +HIDD_NAME="hidd" +RFCOMM_NAME="rfcomm" +PAND_NAME="pand" +DUND_NAME="dund" + +DAEMON_EXEC="/usr/sbin/bluetoothd" +HIDD_EXEC="/usr/bin/hidd" +RFCOMM_EXEC="/usr/bin/rfcomm" +PAND_EXEC="/usr/bin/pand" +DUND_EXEC="/usr/bin/dund" + +DAEMON_ENABLE="true" +HIDD_ENABLE="false" +RFCOMM_ENABLE="false" +DUND_ENABLE="false" +PAND_ENABLE="false" + +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +HIDD_OPTIONS="" +DUND_OPTIONS="" +PAND_OPTIONS="" + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + +case "$1" in + start) + stat_busy "Starting bluetooth subsystem:" + if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then + stat_append " $DAEMON_NAME" + $DAEMON_EXEC + sleep 1 + fi + if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then + stat_append " $SDPD_NAME" + $SDPD_EXEC + fi + if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then + stat_append " $HIDD_NAME" + $HIDD_EXEC $HIDD_OPTIONS + fi + if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then + stat_append " $RFCOMM_NAME" + $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all + fi + if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then + stat_append " $DUND_NAME" + $DUND_EXEC $DUND_OPTIONS + fi + if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then + stat_append " $PAND_NAME" + $PAND_EXEC $PAND_OPTIONS + fi + add_daemon bluetooth + stat_done + ;; + stop) + stat_busy "Stopping bluetooth subsystem:" + + stat_append " $PAND_NAME" + killall $PAND_NAME >/dev/null 2>&1 + + stat_append " $DUND_NAME" + killall $DUND_NAME >/dev/null 2>&1 + + if [ -x "$RFCOMM_EXEC" ]; then + stat_append " $RFCOMM_NAME" + $RFCOMM_EXEC release all >/dev/null 2>&1 + fi + + stat_append " $HIDD_NAME" + killall $HIDD_NAME >/dev/null 2>&1 + + stat_append " $SDPD_NAME" + killall $SDPD_NAME >/dev/null 2>&1 + + stat_append " $DAEMON_NAME" + killall $DAEMON_NAME >/dev/null 2>&1 + + rm_daemon bluetooth + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/crda/PKGBUILD b/staging/crda/PKGBUILD new file mode 100644 index 000000000..163872220 --- /dev/null +++ b/staging/crda/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 149713 2012-02-09 17:56:54Z heftig $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=crda +pkgver=1.1.2 +pkgrel=2 +pkgdesc="Central Regulatory Domain Agent for wireless networks" +arch=(i686 x86_64) +url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" +license=('custom') +depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw') +makedepends=('python-m2crypto') +install=crda.install +source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 + crda.rc libnl32.patch) +md5sums=('5226f65aebacf94baaf820f8b4e06df4' + '014eef3f8655e9a130064ec6891317fc' + 'c1f7aff29f15a0364ae6f7905a1d4ae6') + +build() { + msg "Compiling crda ..." + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i "$srcdir/libnl32.patch" + sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py + make crda regdbdump +} + +package() { + # Install crda, regdbdump and udev rules + msg "Installing crda ..." + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + # This rule automatically sets the regulatory domain when cfg80211 is loaded + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules + + msg "Installing license ..." + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE + + msg "Installing boot script ..." + install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom +} diff --git a/staging/crda/crda.install b/staging/crda/crda.install new file mode 100644 index 000000000..c18e15f71 --- /dev/null +++ b/staging/crda/crda.install @@ -0,0 +1,18 @@ +## arg 1: the new package version +post_install() { + echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom." + echo "It will automatically be set when necessary." +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package + # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one + # from wireless-regdb by the user-defined one + if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then + if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then + mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom + fi + fi +} diff --git a/staging/crda/crda.rc b/staging/crda/crda.rc new file mode 100755 index 000000000..13dbd870e --- /dev/null +++ b/staging/crda/crda.rc @@ -0,0 +1,26 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/wireless-regdom + +case "$1" in + start) + if [ -n "${WIRELESS_REGDOM}" ]; then + stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}" + if iw reg set ${WIRELESS_REGDOM}; then + stat_done + else + stat_fail + fi + fi + ;; + stop) + ;; + restart) + $0 start + ;; + *) + echo "usage: $0 start" +esac +exit 0 diff --git a/staging/crda/libnl32.patch b/staging/crda/libnl32.patch new file mode 100644 index 000000000..682b6c5de --- /dev/null +++ b/staging/crda/libnl32.patch @@ -0,0 +1,12 @@ +diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile +--- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200 ++++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100 +@@ -51,7 +51,7 @@ + + ifeq ($(NL3FOUND),Y) + CFLAGS += -DCONFIG_LIBNL30 +-NLLIBS += -lnl-genl ++NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) + NLLIBNAME = libnl-3.0 + else + ifeq ($(NL2FOUND),Y) diff --git a/staging/iw/PKGBUILD b/staging/iw/PKGBUILD new file mode 100644 index 000000000..c2b7b1dc9 --- /dev/null +++ b/staging/iw/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 149711 2012-02-09 17:33:21Z heftig $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=iw +pkgver=3.3 +pkgrel=2 +pkgdesc="nl80211 based CLI configuration utility for wireless devices" +arch=("i686" "x86_64") +url="http://wireless.kernel.org/en/users/Documentation/iw" +license=("GPL") +depends=("libnl") +makedepends=("kernel-headers") +source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60') + +build() { + cd "$srcdir"/$pkgname-$pkgver + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/staging/libnl/PKGBUILD b/staging/libnl/PKGBUILD new file mode 100644 index 000000000..835062bfb --- /dev/null +++ b/staging/libnl/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 149708 2012-02-09 17:20:44Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=libnl +pkgver=3.2.7 +pkgrel=1 +pkgdesc="Library for applications dealing with netlink sockets" +arch=(i686 x86_64) +url="http://www.infradead.org/~tgr/libnl/" +license=(GPL) +depends=(glibc) +backup=(etc/libnl/classid etc/libnl/pktloc) +options=(!libtool) +source=("$url/files/$pkgname-$pkgver.tar.gz") +md5sums=('6a233a9dffa0ee3a7f6110c95c5410ab') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/libnl1/PKGBUILD b/staging/libnl1/PKGBUILD new file mode 100644 index 000000000..15c0c45c1 --- /dev/null +++ b/staging/libnl1/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 149709 2012-02-09 17:21:50Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=libnl1 +pkgver=1.1 +pkgrel=1 +pkgdesc="Library for applications dealing with netlink sockets (Legacy version)" +arch=('i686' 'x86_64') +url="http://www.infradead.org/~tgr/libnl/" +license=('GPL') +depends=('glibc') +source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz" + 'fix-compilation.patch') +md5sums=('ae970ccd9144e132b68664f98e7ceeb1' + 'e1f5e82c8aa1b3ad025c7b588178de1e') + +build() { + cd ${srcdir}/libnl-${pkgver} + patch -Np1 -i ${srcdir}/fix-compilation.patch + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/libnl-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/libnl1/fix-compilation.patch b/staging/libnl1/fix-compilation.patch new file mode 100644 index 000000000..891562a39 --- /dev/null +++ b/staging/libnl1/fix-compilation.patch @@ -0,0 +1,10 @@ +--- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200 +@@ -26,6 +26,7 @@ + #include <sys/socket.h> + #include <inttypes.h> + #include <assert.h> ++#include <limits.h> + + #include <arpa/inet.h> + #include <netdb.h> diff --git a/staging/libpcap/PKGBUILD b/staging/libpcap/PKGBUILD new file mode 100644 index 000000000..ada9d9021 --- /dev/null +++ b/staging/libpcap/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 149717 2012-02-09 18:32:50Z heftig $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=libpcap +pkgver=1.2.1 +pkgrel=2 +pkgdesc="A system-independent interface for user-level packet capture" +arch=('i686' 'x86_64') +url="http://www.tcpdump.org/" +license=('BSD') +depends=('glibc' 'libnl' 'sh') +makedepends=('flex') +source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} + libnl32.patch) +sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd' + 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4' + '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}/libnl32.patch" + autoreconf -f -i + ./configure --prefix=/usr --enable-ipv6 --with-libnl + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + install -d -m755 ${pkgdir}/usr/bin + make DESTDIR=${pkgdir} install + # remove static library + rm -rf ${pkgdir}/usr/lib/libpcap.a + + # backwards compatibility, programs often look for net/bpf.h + mkdir -p ${pkgdir}/usr/include/net + cd ${pkgdir}/usr/include/net + ln -s ../pcap-bpf.h bpf.h + + #install the license + install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/staging/libpcap/libnl32.patch b/staging/libpcap/libnl32.patch new file mode 100644 index 000000000..633fd003e --- /dev/null +++ b/staging/libpcap/libnl32.patch @@ -0,0 +1,19 @@ +diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in +--- libpcap-1.2.1/configure.in 2012-01-02 01:47:37.000000000 +0100 ++++ libpcap-1.2.1-libnl32/configure.in 2012-02-09 19:29:29.405603749 +0100 +@@ -433,12 +433,13 @@ + # + # Try libnl 2.x first. + # +- AC_CHECK_LIB(nl, nl_socket_alloc, ++ AC_CHECK_LIB(nl-3, nl_socket_alloc, + [ + # + # Yes, we have libnl 2.x. + # +- LIBS="-lnl-genl -lnl $LIBS" ++ LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS" ++ V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)" + AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) + AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) + ], diff --git a/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD new file mode 100644 index 000000000..e7120f95b --- /dev/null +++ b/staging/net-snmp/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 149723 2012-02-09 19:22:22Z heftig $ +# Maintainer: +# Contributor: Dale Blount <dale@archlinux.org> + +pkgname=net-snmp +pkgver=5.7.1 +pkgrel=2 +pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" +arch=('i686' 'x86_64') +url="http://www.net-snmp.org/" +license=('BSD') +depends=('openssl' 'libnl' 'pciutils') +makedepends=('python2-distribute') +optdepends=('perl-term-readkey: for snmpcheck application' + 'perl-tk: for snmpcheck and tkmib applications' + 'python2: for the python modules') +provides=('ucd-snmp') +backup=('etc/conf.d/snmpd') +options=('!libtool' '!makeflags' '!emptydirs') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} + snmpd.confd snmpd.rc libnl32.patch) +sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' + '2bdc2839ce09d7daa608cd54687fa8beb47ed907' + 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' + '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' + '74a9848b95f63378eb1753fc309d2b74de5afb0f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694 + patch -Np1 -i "$srcdir/libnl32.patch" + autoreconf -f -i + + sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in + PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-ucd-snmp-compatibility \ + --enable-ipv6 \ + --with-python-modules \ + --with-default-snmp-version="3" \ + --with-sys-contact="root@localhost" \ + --with-sys-location="Unknown" \ + --with-logfile="/var/log/snmpd.log" \ + --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ + --with-persistent-directory="/var/net-snmp" \ + --disable-static + make NETSNMP_DONT_CHECK_VERSION=1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install + install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" + install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/net-snmp/libnl32.patch b/staging/net-snmp/libnl32.patch new file mode 100644 index 000000000..d93d7ef67 --- /dev/null +++ b/staging/net-snmp/libnl32.patch @@ -0,0 +1,80 @@ +diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c +--- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28 06:53:47.000000000 +0200 ++++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09 20:02:49.136022132 +0100 +@@ -566,8 +566,9 @@ + static int + tcpTable_load_netlink(void) + { ++ int err; + /* TODO: perhaps use permanent nl handle? */ +- struct nl_handle *nl = nl_handle_alloc(); ++ struct nl_sock *nl = nl_socket_alloc(); + + if (nl == NULL) { + DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); +@@ -575,10 +576,10 @@ + return -1; + } + +- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + +@@ -590,10 +591,10 @@ + struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + +- if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_send_auto_complete(nl, nm)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + nlmsg_free(nm); +@@ -604,9 +605,9 @@ + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); ++ nl_socket_free(nl); + return -1; + } + +@@ -655,7 +656,7 @@ + free(buf); + } + +- nl_handle_destroy(nl); ++ nl_socket_free(nl); + + if (tcp_head) { + DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); +diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 +--- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000 +0200 ++++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09 20:10:44.282165275 +0100 +@@ -224,8 +224,9 @@ + if test "x$with_nl" != "xno"; then + case $target_os in + linux*) # Check for libnl (linux) ++ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)" + NETSNMP_SEARCH_LIBS( +- nl_connect, nl, ++ nl_connect, nl-3, + [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS) + ;; + esac diff --git a/staging/net-snmp/snmpd.confd b/staging/net-snmp/snmpd.confd new file mode 100644 index 000000000..926b09bbf --- /dev/null +++ b/staging/net-snmp/snmpd.confd @@ -0,0 +1,5 @@ +# +# Parameters to be passed to snmpd +# +SNMPD_ARGS="" + diff --git a/staging/net-snmp/snmpd.rc b/staging/net-snmp/snmpd.rc new file mode 100644 index 000000000..b00c09f4f --- /dev/null +++ b/staging/net-snmp/snmpd.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/snmpd + +PID=`pidof -o %PPID /usr/sbin/snmpd` +case "$1" in + start) + stat_busy "Starting Net-SNMP" + [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/snmpd.pid + add_daemon snmpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Net-SNMP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/snmpd.pid + rm_daemon snmpd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/networkmanager/NetworkManager.conf b/staging/networkmanager/NetworkManager.conf new file mode 100644 index 000000000..c37b59680 --- /dev/null +++ b/staging/networkmanager/NetworkManager.conf @@ -0,0 +1,2 @@ +[main] +plugins=keyfile diff --git a/staging/networkmanager/PKGBUILD b/staging/networkmanager/PKGBUILD new file mode 100644 index 000000000..dd4713872 --- /dev/null +++ b/staging/networkmanager/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 149721 2012-02-09 18:49:54Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinxu.org> +# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Will Rea <sillywilly@gmail.com> +# Contributor: Valentine Sinitsyn <e_val@inbox.ru> + +pkgname=networkmanager +pkgver=0.9.2.0 +pkgrel=2 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') +optdepends=('modemmanager: for modem management service' + 'dhclient: alternative DHCP/DHCPv6 client' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support' + 'openresolv: openresolv support') +options=('!libtool') +backup=('etc/NetworkManager/NetworkManager.conf') +install=networkmanager.install +source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') + +build() { + cd "${srcdir}/NetworkManager-${pkgver}" + + patch -Np1 -i "${srcdir}/disable_set_hostname.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-distro=arch \ + --with-dhclient=/usr/sbin/dhclient \ + --with-dhcpcd=/sbin/dhcpcd \ + --with-iptables=/usr/sbin/iptables \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --with-resolvconf=/usr/sbin/resolvconf \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax + + make +} + +package() { + cd "${srcdir}/NetworkManager-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" + + rm -rf "${pkgdir}/var/run/" +} diff --git a/staging/networkmanager/disable_set_hostname.patch b/staging/networkmanager/disable_set_hostname.patch new file mode 100644 index 000000000..ee95dd0e1 --- /dev/null +++ b/staging/networkmanager/disable_set_hostname.patch @@ -0,0 +1,19 @@ +diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c +--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 ++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 +@@ -302,6 +302,7 @@ + return; + } + ++#if 0 + /* Try automatically determined hostname from the best device's IP config */ + if (!best4) + best4 = get_best_ip4_device (policy->manager, &best_req4); +@@ -356,6 +357,7 @@ + } + } + ++#endif + /* If no automatically-configured hostname, try using the hostname from + * when NM started up. + */ diff --git a/staging/networkmanager/networkmanager.install b/staging/networkmanager/networkmanager.install new file mode 100644 index 000000000..de40c17ed --- /dev/null +++ b/staging/networkmanager/networkmanager.install @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG +ATTENTION: + /etc/NetworkManager/nm-system-settings.conf has been replaced + by /etc/NetworkManager/NetworkManager.conf. Make sure you move + any custom settings to the new config file. +MSG + true +} diff --git a/staging/ntrack/PKGBUILD b/staging/ntrack/PKGBUILD new file mode 100644 index 000000000..8cfdece06 --- /dev/null +++ b/staging/ntrack/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 149725 2012-02-09 19:30:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=ntrack +pkgver=16 +pkgrel=2 +epoch=1 +pkgdesc="A network connectivity tracking library" +arch=('i686' 'x86_64') +url="http://launchpad.net/ntrack/" +license=('LGPL') +depends=('qt' 'libnl') +makedepends=('python2') +options=('!libtool' '!emptydirs') +source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz" + 'libnl3.patch') +md5sums=('21691dac43460a6791cba3decbc68242' + '0a1f6b7f9a01c323e81d6da95cad93cd') + +build() { + cd "${srcdir}/${pkgname}-0${pkgver}" + patch -p1 -i "${srcdir}"/libnl3.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-0${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/ntrack/libnl3.patch b/staging/ntrack/libnl3.patch new file mode 100644 index 000000000..879b52c8c --- /dev/null +++ b/staging/ntrack/libnl3.patch @@ -0,0 +1,99 @@ +From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> +Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 and glib. + +Index: ntrack/glib/Makefile.am +=================================================================== +--- ntrack.orig/glib/Makefile.am 2011-12-22 19:25:13.137470000 -0500 ++++ ntrack/glib/Makefile.am 2011-12-22 20:07:10.243344976 -0500 +@@ -26,7 +26,6 @@ + AM_CFLAGS = \ + -Wall \ + -Werror \ +- -pedantic \ + -I$(srcdir)/../common/ + + AM_LDFLAGS = +Index: ntrack/glib/Makefile.in +=================================================================== +--- ntrack.orig/glib/Makefile.in 2011-12-22 20:05:46.243208000 -0500 ++++ ntrack/glib/Makefile.in 2011-12-22 20:07:14.871344769 -0500 +@@ -325,7 +325,6 @@ + AM_CFLAGS = \ + -Wall \ + -Werror \ +- -pedantic \ + -I$(srcdir)/../common/ + + AM_LDFLAGS = +Index: ntrack/glib/test/Makefile.am +=================================================================== +--- ntrack.orig/glib/test/Makefile.am 2011-12-22 19:25:13.137470000 -0500 ++++ ntrack/glib/test/Makefile.am 2011-12-22 20:07:19.451344565 -0500 +@@ -27,7 +27,6 @@ + ../../common/libntrack.la + + AM_CFLAGS = \ +- -pedantic \ + -Wall \ + -Werror \ + -I$(srcdir)/.. \ +Index: ntrack/glib/test/Makefile.in +=================================================================== +--- ntrack.orig/glib/test/Makefile.in 2011-12-22 20:05:46.243208000 -0500 ++++ ntrack/glib/test/Makefile.in 2011-12-22 20:07:23.903344367 -0500 +@@ -260,7 +260,6 @@ + ../../common/libntrack.la + + AM_CFLAGS = \ +- -pedantic \ + -Wall \ + -Werror \ + -I$(srcdir)/.. \ +Index: ntrack/gobject/Makefile.am +=================================================================== +--- ntrack.orig/gobject/Makefile.am 2011-12-22 20:05:46.243208000 -0500 ++++ ntrack/gobject/Makefile.am 2011-12-22 20:07:27.515344206 -0500 +@@ -26,7 +26,6 @@ + AM_CFLAGS = \ + -Wall \ + -Werror \ +- -pedantic \ + -I$(srcdir)/../common/ \ + -I$(srcdir)/../glib/ + +Index: ntrack/gobject/Makefile.in +=================================================================== +--- ntrack.orig/gobject/Makefile.in 2011-12-22 20:05:46.243208000 -0500 ++++ ntrack/gobject/Makefile.in 2011-12-22 20:07:31.519344028 -0500 +@@ -347,7 +347,6 @@ + AM_CFLAGS = \ + -Wall \ + -Werror \ +- -pedantic \ + -I$(srcdir)/../common/ \ + -I$(srcdir)/../glib/ + +Index: ntrack/modules/Makefile.am +=================================================================== +--- ntrack.orig/modules/Makefile.am 2011-12-22 20:05:46.243208000 -0500 ++++ ntrack/modules/Makefile.am 2011-12-22 20:07:35.519343851 -0500 +@@ -26,7 +26,6 @@ + -Wall \ + -Werror \ + -Wno-variadic-macros \ +- -pedantic \ + -I$(top_srcdir)/common/ + + AM_LDFLAGS = +Index: ntrack/modules/Makefile.in +=================================================================== +--- ntrack.orig/modules/Makefile.in 2011-12-22 20:05:46.243208000 -0500 ++++ ntrack/modules/Makefile.in 2011-12-22 20:07:39.391343676 -0500 +@@ -352,7 +352,6 @@ + -Wall \ + -Werror \ + -Wno-variadic-macros \ +- -pedantic \ + -I$(top_srcdir)/common/ + + AM_LDFLAGS = diff --git a/staging/wpa_supplicant/PKGBUILD b/staging/wpa_supplicant/PKGBUILD new file mode 100644 index 000000000..da34d9dc0 --- /dev/null +++ b/staging/wpa_supplicant/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 149715 2012-02-09 18:09:11Z heftig $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=wpa_supplicant +pkgver=0.7.3 +pkgrel=5 +pkgdesc="A utility providing key negotiation for WPA wireless networks" +url="http://hostap.epitest.fi/wpa_supplicant" +arch=('i686' 'x86_64') +depends=('openssl' 'dbus-core>=1.2.4' 'readline>=6.0' 'libnl') +optdepends=('wpa_supplicant_gui: wpa_gui program') +license=('GPL') +groups=('base') +backup=('etc/wpa_supplicant.conf') +source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz + config dbus.patch hostap_allow-linking-with-libnl-3.2.patch) +sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443' + 'd00f306e53c22cc0d7352a0d4ed701fd77b9ff20e3a2422d81ac1fddcc11dff4' + '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a' + 'ac805bf6e5aaec733dfc2c333417e519239cd58663a6e1cb34a54fd0f2bcc3c5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" + + cd ${pkgname} + # Required by NetworkManager 0.8.995 + patch -Np2 -i "$srcdir/dbus.patch" + cp "${srcdir}/config" ./.config + sed -i 's@/usr/local@$(PREFIX)@g' Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + make PREFIX=/usr DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc" + install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf" + install -d -m755 "${pkgdir}/usr/share/man/man"{5,8} + install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/" + install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/" + rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8 + + install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services" + install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/" + sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service + install -m755 -d "${pkgdir}/etc/dbus-1/system.d" + install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf" +} diff --git a/staging/wpa_supplicant/config b/staging/wpa_supplicant/config new file mode 100644 index 000000000..eef35d045 --- /dev/null +++ b/staging/wpa_supplicant/config @@ -0,0 +1,406 @@ +# Example wpa_supplicant build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cases, these lines should use += in order not +# to override previous values of the variables. + + +# Uncomment following two lines and fix the paths if you have installed OpenSSL +# or GnuTLS in non-default location +#CFLAGS += -I/usr/local/openssl/include +#LIBS += -L/usr/local/openssl/lib + +# Some Red Hat versions seem to include kerberos header files from OpenSSL, but +# the kerberos files are not in the default include path. Following line can be +# used to fix build issues on such systems (krb5.h not found). +#CFLAGS += -I/usr/include/kerberos + +# Example configuration for various cross-compilation platforms + +#### sveasoft (e.g., for Linksys WRT54G) ###################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS += -I../src/include -I../../src/router/openssl/include +#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl +############################################################################### + +#### openwrt (e.g., for Linksys WRT54G) ####################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ +# -I../WRT54GS/release/src/include +#LIBS = -lssl +############################################################################### + + +# Driver interface for Host AP driver +#CONFIG_DRIVER_HOSTAP=y + +# Driver interface for Agere driver +#CONFIG_DRIVER_HERMES=y +# Change include directories to match with the local setup +#CFLAGS += -I../../hcf -I../../include -I../../include/hcf +#CFLAGS += -I../../include/wireless + +# Driver interface for madwifi driver +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_MADWIFI=y +# Set include directory to the madwifi source tree +#CFLAGS += -I../../madwifi + +# Driver interface for ndiswrapper +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_NDISWRAPPER=y + +# Driver interface for Atmel driver +#CONFIG_DRIVER_ATMEL=y + +# Driver interface for old Broadcom driver +# Please note that the newer Broadcom driver ("hybrid Linux driver") supports +# Linux wireless extensions and does not need (or even work) with the old +# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. +#CONFIG_DRIVER_BROADCOM=y +# Example path for wlioctl.h; change to match your configuration +#CFLAGS += -I/opt/WRT54GS/release/src/include + +# Driver interface for Intel ipw2100/2200 driver +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_IPW=y + +# Driver interface for Ralink driver +#CONFIG_DRIVER_RALINK=y + +# Driver interface for generic Linux wireless extensions +CONFIG_DRIVER_WEXT=y + +# Driver interface for Linux drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib +#LIBS_p += -L/usr/local/lib +#LIBS_c += -L/usr/local/lib + +# Driver interface for Windows NDIS +#CONFIG_DRIVER_NDIS=y +#CFLAGS += -I/usr/include/w32api/ddk +#LIBS += -L/usr/local/lib +# For native build using mingw +#CONFIG_NATIVE_WINDOWS=y +# Additional directories for cross-compilation on Linux host for mingw target +#CFLAGS += -I/opt/mingw/mingw32/include/ddk +#LIBS += -L/opt/mingw/mingw32/lib +#CC=mingw32-gcc +# By default, driver_ndis uses WinPcap for low-level operations. This can be +# replaced with the following option which replaces WinPcap calls with NDISUIO. +# However, this requires that WZC is disabled (net stop wzcsvc) before starting +# wpa_supplicant. +# CONFIG_USE_NDISUIO=y + +# Driver interface for development testing +#CONFIG_DRIVER_TEST=y + +# Include client MLME (management frame processing) for test driver +# This can be used to test MLME operations in hostapd with the test interface. +# space. +#CONFIG_CLIENT_MLME=y + +# Driver interface for wired Ethernet drivers +CONFIG_DRIVER_WIRED=y + +# Driver interface for the Broadcom RoboSwitch family +#CONFIG_DRIVER_ROBOSWITCH=y + +# Driver interface for no driver (e.g., WPS ER only) +#CONFIG_DRIVER_NONE=y + +# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is +# included) +CONFIG_IEEE8021X_EAPOL=y + +# EAP-MD5 +CONFIG_EAP_MD5=y + +# EAP-MSCHAPv2 +CONFIG_EAP_MSCHAPV2=y + +# EAP-TLS +CONFIG_EAP_TLS=y + +# EAL-PEAP +CONFIG_EAP_PEAP=y + +# EAP-TTLS +CONFIG_EAP_TTLS=y + +# EAP-FAST +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + +# EAP-GTC +CONFIG_EAP_GTC=y + +# EAP-OTP +CONFIG_EAP_OTP=y + +# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) +#CONFIG_EAP_SIM=y + +# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-PAX +#CONFIG_EAP_PAX=y + +# LEAP +CONFIG_EAP_LEAP=y + +# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) +#CONFIG_EAP_AKA=y + +# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# Enable USIM simulator (Milenage) for EAP-AKA +#CONFIG_USIM_SIMULATOR=y + +# EAP-SAKE +#CONFIG_EAP_SAKE=y + +# EAP-GPSK +#CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +#CONFIG_EAP_GPSK_SHA256=y + +# EAP-TNC and related Trusted Network Connect support (experimental) +#CONFIG_EAP_TNC=y + +# Wi-Fi Protected Setup (WPS) +CONFIG_WPS=y + +# EAP-IKEv2 +#CONFIG_EAP_IKEV2=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# Smartcard support (i.e., private key on a smartcard), e.g., with openssl +# engine. +CONFIG_SMARTCARD=y + +# PC/SC interface for smartcards (USIM, GSM SIM) +# Enable this if EAP-SIM or EAP-AKA is included +#CONFIG_PCSC=y + +# Development testing +#CONFIG_EAPOL_TEST=y + +# Select control interface backend for external programs, e.g, wpa_cli: +# unix = UNIX domain sockets (default for Linux/*BSD) +# udp = UDP sockets using localhost (127.0.0.1) +# named_pipe = Windows Named Pipe (default for Windows) +# y = use default (backwards compatibility) +# If this option is commented out, control interface is not included in the +# build. +CONFIG_CTRL_IFACE=y + +# Include support for GNU Readline and History Libraries in wpa_cli. +# When building a wpa_cli binary for distribution, please note that these +# libraries are licensed under GPL and as such, BSD license may not apply for +# the resulting binary. +CONFIG_READLINE=y + +# Remove debugging code that is printing out debug message to stdout. +# This can be used to reduce the size of the wpa_supplicant considerably +# if debugging code is not needed. The size reduction can be around 35% +# (e.g., 90 kB). +#CONFIG_NO_STDOUT_DEBUG=y + +# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save +# 35-50 kB in code size. +#CONFIG_NO_WPA=y + +# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to +# save about 1 kB in code size when building only WPA-Personal (no EAP support) +# or 6 kB if building for WPA-Enterprise. +#CONFIG_NO_WPA2=y + +# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support +# This option can be used to reduce code size by removing support for +# converting ASCII passphrases into PSK. If this functionality is removed, the +# PSK can only be configured as the 64-octet hexstring (e.g., from +# wpa_passphrase). This saves about 0.5 kB in code size. +#CONFIG_NO_WPA_PASSPHRASE=y + +# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. +# This can be used if ap_scan=1 mode is never enabled. +#CONFIG_NO_SCAN_PROCESSING=y + +# Select configuration backend: +# file = text file (e.g., wpa_supplicant.conf; note: the configuration file +# path is given on command line, not here; this option is just used to +# select the backend that allows configuration files to be used) +# winreg = Windows registry (see win_example.reg for an example) +CONFIG_BACKEND=file + +# Remove configuration write functionality (i.e., to allow the configuration +# file to be updated based on runtime configuration changes). The runtime +# configuration can still be changed, the changes are just not going to be +# persistent over restarts. This option can be used to reduce code size by +# about 3.5 kB. +#CONFIG_NO_CONFIG_WRITE=y + +# Remove support for configuration blobs to reduce code size by about 1.5 kB. +#CONFIG_NO_CONFIG_BLOBS=y + +# Select program entry point implementation: +# main = UNIX/POSIX like main() function (default) +# main_winsvc = Windows service (read parameters from registry) +# main_none = Very basic example (development use only) +#CONFIG_MAIN=main + +# Select wrapper for operatins system and C library specific functions +# unix = UNIX/POSIX like systems (default) +# win32 = Windows systems +# none = Empty template +#CONFIG_OS=unix + +# Select event loop implementation +# eloop = select() loop (default) +# eloop_win = Windows events and WaitForMultipleObject() loop +# eloop_none = Empty template +#CONFIG_ELOOP=eloop + +# Select layer 2 packet implementation +# linux = Linux packet socket (default) +# pcap = libpcap/libdnet/WinPcap +# freebsd = FreeBSD libpcap +# winpcap = WinPcap with receive thread +# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) +# none = Empty template +#CONFIG_L2_PACKET=linux + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +#CONFIG_IEEE80211W=y + +# Select TLS implementation +# openssl = OpenSSL (default) +# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) +# internal = Internal TLSv1 implementation (experimental) +# none = Empty template +#CONFIG_TLS=openssl + +# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. +# You need CONFIG_TLS=gnutls for this to have any effect. Please note that +# even though the core GnuTLS library is released under LGPL, this extra +# library uses GPL and as such, the terms of GPL apply to the combination +# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not +# apply for distribution of the resulting binary. +#CONFIG_GNUTLS_EXTRA=y + +# If CONFIG_TLS=internal is used, additional library and include paths are +# needed for LibTomMath. Alternatively, an integrated, minimal version of +# LibTomMath can be used. See beginning of libtommath.c for details on benefits +# and drawbacks of this option. +#CONFIG_INTERNAL_LIBTOMMATH=y +#ifndef CONFIG_INTERNAL_LIBTOMMATH +#LTM_PATH=/usr/src/libtommath-0.39 +#CFLAGS += -I$(LTM_PATH) +#LIBS += -L$(LTM_PATH) +#LIBS_p += -L$(LTM_PATH) +#endif +# At the cost of about 4 kB of additional binary size, the internal LibTomMath +# can be configured to include faster routines for exptmod, sqr, and div to +# speed up DH and RSA calculation considerably +#CONFIG_INTERNAL_LIBTOMMATH_FAST=y + +# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. +# This is only for Windows builds and requires WMI-related header files and +# WbemUuid.Lib from Platform SDK even when building with MinGW. +#CONFIG_NDIS_EVENTS_INTEGRATED=y +#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" + +# Add support for old DBus control interface +# (fi.epitest.hostap.WPASupplicant) +CONFIG_CTRL_IFACE_DBUS=y + +# Add support for new DBus control interface +# (fi.w1.hostap.wpa_supplicant1) +CONFIG_CTRL_IFACE_DBUS_NEW=y + +# Add introspection support for new DBus control interface +CONFIG_CTRL_IFACE_DBUS_INTRO=y + +# Add support for loading EAP methods dynamically as shared libraries. +# When this option is enabled, each EAP method can be either included +# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn). +# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to +# be loaded in the beginning of the wpa_supplicant configuration file +# (see load_dynamic_eap parameter in the example file) before being used in +# the network blocks. +# +# Note that some shared parts of EAP methods are included in the main program +# and in order to be able to use dynamic EAP methods using these parts, the +# main program must have been build with the EAP method enabled (=y or =dyn). +# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries +# unless at least one of them was included in the main build to force inclusion +# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included +# in the main build to be able to load these methods dynamically. +# +# Please also note that using dynamic libraries will increase the total binary +# size. Thus, it may not be the best option for targets that have limited +# amount of memory/flash. +#CONFIG_DYNAMIC_EAP_METHODS=y + +# IEEE Std 802.11r-2008 (Fast BSS Transition) +#CONFIG_IEEE80211R=y + +# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) +CONFIG_DEBUG_FILE=y + +# Enable privilege separation (see README 'Privilege separation' for details) +#CONFIG_PRIVSEP=y + +# Enable mitigation against certain attacks against TKIP by delaying Michael +# MIC error reports by a random amount of time between 0 and 60 seconds +#CONFIG_DELAYED_MIC_ERROR_REPORT=y + +# Enable tracing code for developer debugging +# This tracks use of memory allocations and other registrations and reports +# incorrect use with a backtrace of call (or allocation) location. +#CONFIG_WPA_TRACE=y +# For BSD, comment out these. +#LIBS += -lexecinfo +#LIBS_p += -lexecinfo +#LIBS_c += -lexecinfo + +# Use libbfd to get more details for developer debugging +# This enables use of libbfd to get more detailed symbols for the backtraces +# generated by CONFIG_WPA_TRACE=y. +#CONFIG_WPA_TRACE_BFD=y +# For BSD, comment out these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz + +CONFIG_LIBNL32=y diff --git a/staging/wpa_supplicant/dbus.patch b/staging/wpa_supplicant/dbus.patch new file mode 100644 index 000000000..4c5002003 --- /dev/null +++ b/staging/wpa_supplicant/dbus.patch @@ -0,0 +1,61 @@ +From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 +From: Dan Williams <dcbw@redhat.com> +Date: Fri, 17 Dec 2010 15:56:01 +0200 +Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes + +The supplicant was not emitting property changed events when the BSSs +property changed. + +Signed-off-by: Dan Williams <dcbw@redhat.com> +(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) +--- + wpa_supplicant/dbus/dbus_new.c | 6 ++++++ + wpa_supplicant/dbus/dbus_new.h | 1 + + 2 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c +index bdfbbac..c66640a 100644 +--- a/wpa_supplicant/dbus/dbus_new.c ++++ b/wpa_supplicant/dbus/dbus_new.c +@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, + wpas_dbus_getter_current_network; + prop = "CurrentNetwork"; + break; ++ case WPAS_DBUS_PROP_BSSS: ++ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; ++ prop = "BSSs"; ++ break; + default: + wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", + __func__, property); +@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, + } + + wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); ++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); + + return 0; + } +@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, + } + + wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); ++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); + + return 0; + +diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h +index 80ea98c..9cdefcb 100644 +--- a/wpa_supplicant/dbus/dbus_new.h ++++ b/wpa_supplicant/dbus/dbus_new.h +@@ -30,6 +30,7 @@ enum wpas_dbus_prop { + WPAS_DBUS_PROP_STATE, + WPAS_DBUS_PROP_CURRENT_BSS, + WPAS_DBUS_PROP_CURRENT_NETWORK, ++ WPAS_DBUS_PROP_BSSS, + }; + + enum wpas_dbus_bss_prop { +-- +1.7.4-rc1 + diff --git a/staging/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/staging/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..8e7cd9a97 --- /dev/null +++ b/staging/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,42 @@ +Subject: [RFC] hostap: Allow linking with libnl-3. +Date: Tue, 15 Nov 2011 14:30:04 -0000 +From: Ben Greear <greearb@candelatech.com> + +I needed this patch to compile against the latest +libnl code. I added this to my config file: + +CONFIG_LIBNL32=y + +Signed-hostap: Ben Greear <greearb@candelatech.com> +rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de> + +--- +:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak + src/drivers/drivers.mak | 21 ++++++++++++++------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +--- a/src/drivers/drivers.mak ++++ b/src/drivers/drivers.mak +@@ -31,11 +31,18 @@ NEED_SME=y + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++ifdef CONFIG_LIBNL32 ++ DRV_LIBS += -lnl-3 ++ DRV_LIBS += -lnl-genl-3 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -I/usr/include/libnl3/ ++else ++ DRV_LIBS += -lnl + +-ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl +-DRV_CFLAGS += -DCONFIG_LIBNL20 ++ ifdef CONFIG_LIBNL20 ++ DRV_LIBS += -lnl-genl ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ endif + endif + endif + diff --git a/staging/xf86-video-apm/PKGBUILD b/staging/xf86-video-apm/PKGBUILD new file mode 100644 index 000000000..070c63729 --- /dev/null +++ b/staging/xf86-video-apm/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 149743 2012-02-09 21:16:17Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-apm +pkgver=1.2.3 +pkgrel=5 +pkgdesc="X.org Alliance ProMotion video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.99.902') +conflicts=('xorg-server<1.11.99.902') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + apm-1.2.3-git.patch) +sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac' + 'ad9468519eb959bb879ba4e4993d6a83848d5c6f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/apm-1.2.3-git.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-video-apm/apm-1.2.3-git.patch b/staging/xf86-video-apm/apm-1.2.3-git.patch new file mode 100644 index 000000000..1c6afb29d --- /dev/null +++ b/staging/xf86-video-apm/apm-1.2.3-git.patch @@ -0,0 +1,34 @@ +diff --git a/src/apm.h b/src/apm.h +index bc66714..86c7663 100644 +--- a/src/apm.h ++++ b/src/apm.h +@@ -109,7 +109,7 @@ typedef struct { + char *MemMap; + pointer BltMap; + Bool UnlockCalled; +- IOADDRESS iobase, xport, xbase; ++ unsigned long iobase, xport, xbase; + unsigned char savedSR10; + CARD8 MiscOut; + CARD8 c9, d9, db, Rush; +diff --git a/src/apm_driver.c b/src/apm_driver.c +index f172bab..f77bb2b 100644 +--- a/src/apm_driver.c ++++ b/src/apm_driver.c +@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) + + hwp = VGAHWPTR(pScrn); + vgaHWGetIOBase(hwp); +- pApm->iobase = hwp->PIOOffset; +- pApm->xport = hwp->PIOOffset + 0x3C4; ++#if ABI_VIDEODRV_VERSION < 12 ++#define PIOOFFSET hwp->PIOOffset ++#else ++/* FIXME reintroduce domain support */ ++#define PIOOFFSET 0 ++#endif ++ pApm->iobase = PIOOFFSET; ++ pApm->xport = PIOOFFSET + 0x3C4; + + /* Set pScrn->monitor */ + pScrn->monitor = pScrn->confScreen->monitor; diff --git a/staging/xf86-video-ark/PKGBUILD b/staging/xf86-video-ark/PKGBUILD new file mode 100644 index 000000000..c1239fe1c --- /dev/null +++ b/staging/xf86-video-ark/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 149741 2012-02-09 21:12:21Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-ark +pkgver=0.7.4 +pkgrel=1 +pkgdesc="X.org ark video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.99.902') +conflicts=('xorg-server<1.11.99.902') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + #git-fixes.patch + ) +sha1sums=('d95cb9aa56e7db542b3ac8fed9cb519b11f77556') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + #patch -Np1 -i "${srcdir}/git-fixes.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-video-ark/git-fixes.patch b/staging/xf86-video-ark/git-fixes.patch new file mode 100644 index 000000000..2de0f64be --- /dev/null +++ b/staging/xf86-video-ark/git-fixes.patch @@ -0,0 +1,118 @@ +From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001 +From: Ondrej Zary <linux@rainbow-software.org> +Date: Sat, 04 Dec 2010 00:23:51 +0000 +Subject: Don't assume that FB address registers are initialized properly + +https://bugs.freedesktop.org/show_bug.cgi?id=28249 + +ark driver does not work with Hercules Stingray 64 card (ark2000pv). +X fails to start with: + +[...] +(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is +0x0000 +(II) ark(0): Creating default Display subsection in Screen section + "Default Screen Section" for depth/fbbpp 24/32 +(==) ark(0): Depth 24, (--) framebuffer bpp 32 +(==) ark(0): RGB weight 888 +(==) ark(0): Default visual is TrueColor +(**) ark(0): Chipset: "ark2000pv" +(--) ark(0): Framebuffer @ 0xe5e50000 +(==) ark(0): Using gamma correction (1.0, 1.0, 1.0) +(--) ark(0): Detected 2048 bytes video ram +[...] +Fatal server error: +AddScreen/ScreenInit failed for driver 0 + +Comparing with lspci, the framebuffer address is wrong: +00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller]) + Flags: medium devsel + Memory at e5000000 (32-bit, prefetchable) [size=4M] + [virtual] Expansion ROM at 1c000000 [disabled] [size=64K] + +Reviewed-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ark.h b/src/ark.h +index de301dc..077f93b 100644 +--- a/src/ark.h ++++ b/src/ark.h +@@ -34,7 +34,6 @@ typedef struct _ARKRec { + #endif + EntityInfoPtr pEnt; + CARD32 IOAddress; +- CARD32 FBAddress; + unsigned char * FBBase; + unsigned char * MMIOBase; + unsigned long videoRam; +diff --git a/src/ark_driver.c b/src/ark_driver.c +index 5de3b9a..fec3e1a 100644 +--- a/src/ark_driver.c ++++ b/src/ark_driver.c +@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) + outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f); + modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01); + +- /* use membase's later on ??? */ +- pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) + +- (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24); +- +- pScrn->memPhysBase = pARK->FBAddress; ++#ifndef XSERVER_LIBPCIACCESS ++ pScrn->memPhysBase = pARK->PciInfo->memBase[0]; ++#else ++ pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr; ++#endif + + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n", +- (unsigned long)pARK->FBAddress); ++ (unsigned long)pScrn->memPhysBase); + + if (!xf86SetGamma(pScrn, gzeros)) + return FALSE; +@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) + new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f; + new->sr10 |= 0x1f; + +- new->sr13 = pARK->FBAddress >> 16; +- new->sr14 = pARK->FBAddress >> 24; ++#ifndef XSERVER_LIBPCIACCESS ++ new->sr13 = pARK->PciInfo->memBase[0] >> 16; ++ new->sr14 = pARK->PciInfo->memBase[0] >> 24; ++#else ++ new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16; ++ new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24; ++#endif + + new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03; + switch (pScrn->videoRam) { +@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) + pARK->PciTag, 0xb8000, 0x8000); + + pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, +- pARK->PciTag, pARK->FBAddress, ++ pARK->PciTag, pARK->PciInfo->memBase[0], + pScrn->videoRam * 1024); + #else + +@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) + { + void** result = (void**)&pARK->FBBase; + int err = pci_device_map_range(pARK->PciInfo, +- pARK->FBAddress, ++ pARK->PciInfo->regions[0].base_addr, + pScrn->videoRam * 1024, + PCI_DEV_MAP_FLAG_WRITABLE | + PCI_DEV_MAP_FLAG_WRITE_COMBINE, + result); + +- if (err) ++ if (err) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Cound not map framebuffer: %d\n", err); + return FALSE; ++ } + } + #endif + +-- +cgit v0.9.0.2-2-gbebe diff --git a/testing/nmap/PKGBUILD b/testing/nmap/PKGBUILD index ded9ea3c4..272ac00de 100644 --- a/testing/nmap/PKGBUILD +++ b/testing/nmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149673 2012-02-08 23:59:46Z allan $ +# $Id: PKGBUILD 149735 2012-02-09 20:44:02Z heftig $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=nmap pkgver=5.51 -pkgrel=2 +pkgrel=3 pkgdesc="A network exploration tool and security/port scanner" arch=('i686' 'x86_64') url="http://nmap.org" @@ -15,6 +15,7 @@ makedepends=('python2') optdepends=('pygtk: gui for nmap') options=('!makeflags') source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2) +md5sums=('0b80d2cb92ace5ebba8095a4c2850275') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -22,6 +23,11 @@ build() { echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap.desktop echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap-root.desktop + # Force usage of external libpcap + # OSX bug check fails because of missing types + # autoreconf fails because our autotools are too new (?) + sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure + ./configure --prefix=/usr --mandir=/usr/share/man \ --libexecdir=/usr/lib make @@ -37,5 +43,3 @@ package() { # install custom GPL2 license install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } - -md5sums=('0b80d2cb92ace5ebba8095a4c2850275') diff --git a/testing/xmlto/PKGBUILD b/testing/xmlto/PKGBUILD new file mode 100644 index 000000000..09664049a --- /dev/null +++ b/testing/xmlto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 149751 2012-02-10 04:10:06Z allan $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> +# Contributor: Robert Stoffers <rob1@ubuntu.com> + +pkgname=xmlto +pkgver=0.0.25 +pkgrel=2 +pkgdesc="Convert xml to many other formats" +arch=('i686' 'x86_64') +url="http://cyberelk.net/tim/software/xmlto/" +license=('GPL') +depends=('libxslt' 'perl-yaml-syck' 'perl-test-pod') +makedepends=('docbook-xsl') +source=("https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('6b6267b1470f8571fe5f63a128970364') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} |