From c77c7fc60c48c9aaa8f915eb112405e8879e46aa Mon Sep 17 00:00:00 2001 From: root Date: Wed, 27 Jun 2012 00:01:57 +0000 Subject: Wed Jun 27 00:01:57 UTC 2012 --- community/avr-gcc/PKGBUILD | 4 +- community/bitcoin/PKGBUILD | 8 +- .../conntrack-tools/01-config-file-path.patch | 3 +- community/conntrack-tools/PKGBUILD | 12 +- community/denemo/PKGBUILD | 11 +- community/distcc/PKGBUILD | 5 +- community/evas_generic_loaders-svn/PKGBUILD | 6 +- community/gambas2/PKGBUILD | 4 +- community/gambas3/PKGBUILD | 4 +- community/grafx2/PKGBUILD | 30 +- community/grafx2/grafx2.install | 2 - community/gummi/PKGBUILD | 6 +- community/libextractor/PKGBUILD | 4 +- community/libnetfilter_acct/PKGBUILD | 24 + community/libnetfilter_log/PKGBUILD | 24 + community/moreutils/PKGBUILD | 4 +- community/passenger/PKGBUILD | 13 +- community/pdf2djvu/PKGBUILD | 4 +- community/polipo/PKGBUILD | 5 +- community/polipo/polipo.install | 4 +- community/raptor1/PKGBUILD | 36 ++ community/raptor1/curl.patch | 11 + community/ulogd/PKGBUILD | 37 +- core/iputils/PKGBUILD | 83 +-- core/iputils/iputils.install | 11 + core/iputils/tftp.xinetd | 10 + core/libusbx/PKGBUILD | 9 +- core/openssh/PKGBUILD | 2 +- core/openssh/sshd@.service | 8 + core/traceroute/PKGBUILD | 23 + core/xz/PKGBUILD | 15 +- extra/bftpd/PKGBUILD | 6 +- extra/calligra/PKGBUILD | 4 +- extra/clutter-gst/PKGBUILD | 14 +- extra/git/PKGBUILD | 8 +- extra/inkscape/PKGBUILD | 4 +- extra/libgadu/PKGBUILD | 13 +- extra/libreoffice/PKGBUILD | 8 +- extra/libreoffice/PKGBUILD.36 | 700 +++++++++++++++++++++ extra/libreoffice/buildfix.diff | 12 + extra/poppler/PKGBUILD | 6 +- extra/xournal/PKGBUILD | 4 +- extra/xterm/PKGBUILD | 6 +- libre/cups-filters-libre/PKGBUILD | 4 +- libre/foomatic-filters-libre/PKGBUILD | 16 +- testing/cryptsetup/PKGBUILD | 35 ++ testing/cryptsetup/encrypt_hook | 138 ++++ testing/cryptsetup/encrypt_install | 44 ++ testing/libnl/PKGBUILD | 30 + testing/libpcap/PKGBUILD | 41 ++ testing/libpcap/libnl32.patch | 19 + testing/openldap/PKGBUILD | 8 +- testing/openldap/slapd.tmpfiles | 1 + testing/wpa_supplicant/PKGBUILD | 56 ++ testing/wpa_supplicant/config | 468 ++++++++++++++ .../hostap_allow-linking-with-libnl-3.2.patch | 12 + testing/wpa_supplicant_gui/PKGBUILD | 32 + testing/wpa_supplicant_gui/compile-fix.patch | 14 + 58 files changed, 1938 insertions(+), 187 deletions(-) create mode 100644 community/libnetfilter_acct/PKGBUILD create mode 100644 community/libnetfilter_log/PKGBUILD create mode 100644 community/raptor1/PKGBUILD create mode 100644 community/raptor1/curl.patch create mode 100644 core/iputils/iputils.install create mode 100644 core/iputils/tftp.xinetd create mode 100644 core/openssh/sshd@.service create mode 100644 core/traceroute/PKGBUILD create mode 100644 extra/libreoffice/PKGBUILD.36 create mode 100644 extra/libreoffice/buildfix.diff create mode 100644 testing/cryptsetup/PKGBUILD create mode 100644 testing/cryptsetup/encrypt_hook create mode 100644 testing/cryptsetup/encrypt_install create mode 100644 testing/libnl/PKGBUILD create mode 100644 testing/libpcap/PKGBUILD create mode 100644 testing/libpcap/libnl32.patch create mode 100644 testing/openldap/slapd.tmpfiles create mode 100644 testing/wpa_supplicant/PKGBUILD create mode 100644 testing/wpa_supplicant/config create mode 100644 testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch create mode 100644 testing/wpa_supplicant_gui/PKGBUILD create mode 100644 testing/wpa_supplicant_gui/compile-fix.patch diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD index 0e48adec9..eb2b80368 100644 --- a/community/avr-gcc/PKGBUILD +++ b/community/avr-gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72864 2012-06-24 08:07:58Z schuay $ +# $Id: PKGBUILD 72946 2012-06-25 12:14:03Z schuay $ # Maintainer: schuay # Contributor: Brad Fanella # Contributor: Corrado Primier @@ -9,7 +9,7 @@ pkgname=avr-gcc _pkgname=gcc pkgver=4.7.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="The GNU AVR Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'custom') diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index fc1930db8..f986423c6 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70477 2012-05-09 10:21:50Z tredaelli $ +# $Id: PKGBUILD 72962 2012-06-25 16:40:54Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: shahid pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.6.2 -_commit=06d764e +pkgver=0.6.3 +_commit=bbe1084 pkgrel=1 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" @@ -14,7 +14,7 @@ conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') license=('MIT') source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver") -sha256sums=('03c72d7bcdec70cb88033abb785b50686880b95d4768e8586891a9728d498c5a') +sha256sums=('3f1a0df5d713c9e4f54f00a8f3f75c6828041afd826e16976b00229de0aecb70') build() { cd "$srcdir/bitcoin-$pkgbase-$_commit" diff --git a/community/conntrack-tools/01-config-file-path.patch b/community/conntrack-tools/01-config-file-path.patch index 8512cc9ab..9041ddbc4 100644 --- a/community/conntrack-tools/01-config-file-path.patch +++ b/community/conntrack-tools/01-config-file-path.patch @@ -6,6 +6,7 @@ -#define DEFAULT_CONFIGFILE "/etc/conntrackd/conntrackd.conf" +#define DEFAULT_CONFIGFILE "/etc/conntrackd.conf" - #define DEFAULT_LOCKFILE "/var/lock/conntrackd.lock" +-#define DEFAULT_LOCKFILE "/var/lock/conntrackd.lock" ++#define DEFAULT_LOCKFILE "/run/lock/conntrackd.lock" #define DEFAULT_LOGFILE "/var/log/conntrackd.log" #define DEFAULT_STATS_LOGFILE "/var/log/conntrackd-stats.log" diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD index 541456cd8..9630101af 100644 --- a/community/conntrack-tools/PKGBUILD +++ b/community/conntrack-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72534 2012-06-16 14:02:03Z seblu $ +# $Id: PKGBUILD 72966 2012-06-25 17:24:52Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Valere Monseur # Contributor: Alessandro Sagratini # Contributor: Kevin Edmonds pkgname=conntrack-tools -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system' arch=('i686' 'x86_64') @@ -18,14 +18,12 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b 'conntrackd.rc' 'conntrackd.conf' 'conntrackd.service' - '01-config-file-path.patch' - '02-fix-compilation-of-timeout-extension.patch') -md5sums=('8e20330d6ca3a3f23552aa900b1d467c' + '01-config-file-path.patch') +md5sums=('48d414cb7a354001babf184ae6c16db9' '478fe76da0202fcb5249bf65968d1c26' 'd3e73e81b54e3e8166d357d434680684' 'bd135eaefb47923bb8e8d26f084d3e9d' - '411fc0eb97c02595aab69b14c26c1d00' - '0144021bbec4d5b496ddd86a7ff7a257') + 'e71ff7b8c4997b797cab3eaaccb693f4') build() { cd $pkgname-$pkgver diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD index e11a3e4b7..bf7aa71ac 100644 --- a/community/denemo/PKGBUILD +++ b/community/denemo/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 60150 2011-12-06 08:50:04Z spupykin $ +# $Id: PKGBUILD 72932 2012-06-25 10:29:45Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Philipp Sandhaus # Contributor: Robert Emil Berge # Contributor: Gnud pkgname=denemo -pkgver=0.9.2 +pkgver=0.9.4 pkgrel=1 pkgdesc="A music score editor" arch=('i686' 'x86_64') url="http://www.denemo.org" license=('GPL') -depends=('aubio' 'portaudio' 'lilypond' 'gtk2' 'libxml2' 'guile' 'fftw' 'gtksourceview2' - 'librsvg' 'fluidsynth' 'libsmf') +depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw' + 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi') options=('!libtool') backup=('etc/denemo/denemo.conf') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('6dbe944f45cf8818b199e831ac7a5e4f') +md5sums=('25f141beedbb067aa361975935588862') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc + sed -i 's|#include |#include |' src/pitchrecog.c make make DESTDIR=$pkgdir install } diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index 42edd6cb8..044e5a622 100644 --- a/community/distcc/PKGBUILD +++ b/community/distcc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57046 2011-10-19 10:30:08Z spupykin $ +# $Id: PKGBUILD 72942 2012-06-25 11:01:19Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Judd Vinet # Contributor: Giovanni Scafora pkgname=distcc pkgver=3.1 -pkgrel=6 +pkgrel=7 pkgdesc="A distributed C, C++, Obj C compiler" arch=('i686' 'x86_64') url="http://code.google.com/p/distcc/" @@ -49,5 +49,6 @@ package() { ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cc ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/gcc ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/g++ + ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/c++ ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cpp } diff --git a/community/evas_generic_loaders-svn/PKGBUILD b/community/evas_generic_loaders-svn/PKGBUILD index f8309be89..402a429f5 100644 --- a/community/evas_generic_loaders-svn/PKGBUILD +++ b/community/evas_generic_loaders-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72755 2012-06-22 09:43:40Z rvanharen $ -# Maintainer: Ronald van Haren +# $Id: PKGBUILD 72970 2012-06-25 18:51:00Z foutrelis $ +# Maintainer: Daniel Wallace # Contributor: Ronald van Haren pkgname=evas_generic_loaders-svn pkgver=72171 -pkgrel=1 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') groups=('e17-libs-svn' 'e17-svn') diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 7591abe02..ebe2a2b12 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71272 2012-05-26 07:54:42Z pschmitz $ +# $Id: PKGBUILD 72971 2012-06-25 18:51:13Z foutrelis $ # Maintainer : Laurent Carlier # Contributor: Biru Ionut # Contributor: Andrea Scarpino @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index cf13c1a9b..b09b3640b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71274 2012-05-26 07:54:52Z pschmitz $ +# $Id: PKGBUILD 72972 2012-06-25 18:51:23Z foutrelis $ # Maintainer: Laurent Carlier pkgbase=gambas3 @@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD index d7756ee14..bbd6c8d17 100644 --- a/community/grafx2/PKGBUILD +++ b/community/grafx2/PKGBUILD @@ -1,43 +1,43 @@ -# $Id: PKGBUILD 63612 2012-02-05 12:00:25Z ibiru $ +# $Id: PKGBUILD 72950 2012-06-25 12:33:19Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Simon Parzer + pkgname=grafx2 pkgver=2.3 -pkgrel=3 +pkgrel=2 pkgdesc="Pixelart-oriented painting program" arch=('x86_64' 'i686') url="http://code.google.com/p/grafx2/" license=('GPL2') install=grafx2.install depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') -source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz" - "grafx2.desktop") -md5sums=('916a35c4762e85b4210a1041fbbfd830' - '9b3ecb5c2d44b987d65257184f46e6c4') +makedepends=('gendesk' 'setconf') +options=('!emptydirs') +source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz") +sha256sums=('b43fa837e30abfb0830f9a1b793a78ed690fbafdcd378e51197f01998bbf392e') +_name=('GrafX2') +_exec=('grafx2 %U') +_genericname=('Drawing program') +_mimetype=('image/bmp;image/gif;image/png;image/x-tga;image/tiff') build() { - cd "$srcdir/$pkgname/src" - - msg2 "Compiling..." + cd "$srcdir" + gendesk -n + setconf "$pkgname.desktop" Categories 'Graphics;2DGraphics;RasterGraphics' + cd "$pkgname/src" make } package() { cd "$srcdir/$pkgname/src" - msg2 "Packaging files..." make prefix="/usr" DESTDIR="$pkgdir" install - msg2 "Packaging shortcut..." install -Dm644 "$srcdir/$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" - msg2 "Packaging documentation..." install -Dm644 "$srcdir/$pkgname/doc/README.txt" \ "$pkgdir/usr/share/doc/$pkgname/readme.txt" - msg2 "Packaging license..." install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - msg2 "Cleaning up..." - rmdir "$pkgdir/usr/share/grafx2/scripts/libs" } # vim:set ts=2 sw=2 et: diff --git a/community/grafx2/grafx2.install b/community/grafx2/grafx2.install index 12589796c..ef816a666 100644 --- a/community/grafx2/grafx2.install +++ b/community/grafx2/grafx2.install @@ -1,5 +1,3 @@ -pkgname=grafx2 - post_upgrade() { gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor update-desktop-database -q diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index e0f58ec7c..7d4a125d4 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68592 2012-03-28 22:12:45Z arodseth $ +# $Id: PKGBUILD 72952 2012-06-25 13:05:56Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Sergio A. Morales # Contributor: soeren pkgname=gummi -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc='Simple LaTex editor for GTK users' arch=('x86_64' 'i686') @@ -15,7 +15,7 @@ depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') install=$pkgname.install source=("http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz") -sha256sums=('d44196e56ed61e125bba01e5949be0928cf09919fdb80e62e6a41999a478f0ed') +sha256sums=('ac5c1de476f8689040a185b01515544a5e53da45ff4e10a072b8944e9de8a6ff') build() { cd "$pkgname-$pkgver" diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 512560db8..4f9173dc0 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71278 2012-05-26 07:55:04Z pschmitz $ +# $Id: PKGBUILD 72973 2012-06-25 18:51:29Z foutrelis $ # Maintainer: Sergej Pupykin # Contributor: damir pkgname=libextractor pkgver=0.6.3 -pkgrel=4 +pkgrel=5 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64") license=('GPL') diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD new file mode 100644 index 000000000..3f105d946 --- /dev/null +++ b/community/libnetfilter_acct/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Kevin Edmonds +# Maintainer: Filip Wojciechowski, filip at loka dot pl + +pkgname=libnetfilter_acct +pkgver=1.0.0 +pkgrel=1 +pkgdesc="userspace library providing interface to extended accounting infrastructure" +arch=('i686' 'x86_64') +url="http://www.netfilter.org/projects/libnetfilter_acct/index.html" +license=('GPL') +depends=('libnfnetlink' 'libmnl') +makedepends=('pkgconfig') +options=('!libtool') +source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) +md5sums=('246e97feb9cf98f7ddf70d71a3813336') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install +} diff --git a/community/libnetfilter_log/PKGBUILD b/community/libnetfilter_log/PKGBUILD new file mode 100644 index 000000000..37027d898 --- /dev/null +++ b/community/libnetfilter_log/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Kevin Edmonds +# Maintainer: Filip Wojciechowski, filip at loka dot pl + +pkgname=libnetfilter_log +pkgver=1.0.1 +pkgrel=1 +pkgdesc="userspace library providing interface to packets that have been logged by the kernel packet filter" +arch=('i686' 'x86_64') +url="http://www.netfilter.org/projects/libnetfilter_log/index.html" +license=('GPL') +depends=('libnfnetlink') +makedepends=('pkgconfig') +options=('!libtool') +source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) +md5sums=('2a4bb0654ae675a52d2e8d1c06090b94') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install +} diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index 255c0933e..1f1772ccf 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69438 2012-04-16 10:51:02Z spupykin $ +# $Id: PKGBUILD 72927 2012-06-25 09:00:21Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Alessio 'mOLOk' Bolognino @@ -7,7 +7,7 @@ pkgver=0.46 pkgrel=1 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64') -url="http://kitenet.net/~joey/code/moreutils.html" +url="http://joeyh.name/code/moreutils/" license=('GPL') makedepends=('docbook2x' 'docbook-xml' 'perl-xml-sax') depends=('perl') diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index a6ba60993..79448d605 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70838 2012-05-17 15:56:46Z spupykin $ +# $Id: PKGBUILD 72940 2012-06-25 10:53:59Z spupykin $ # Maintainer: Sergej Pupykin pkgname=passenger -pkgver=3.0.12 +pkgver=3.0.13 pkgrel=1 -_pkgdlnr=76005 +_pkgdlnr=76249 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') url="http://www.modrails.com" @@ -14,16 +14,13 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz - passenger-install-apache2-module.patch build-fix-git-2012-05-17.diff) -md5sums=('fedcf948a46b76e00ddd25527dac4b6d' - '3d04eba10c55a955c378678d5df8497f' +md5sums=('1b3a65c77feee86e64891daae66c0c3d' 'e2d3409bae3676232f411f03abac440c') build(){ cd $srcdir/passenger-$pkgver -# patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch - patch -p1 <$srcdir/build-fix-git-2012-05-17.diff +# patch -p1 <$srcdir/build-fix-git-2012-05-17.diff ./bin/passenger-install-apache2-module -a rake nginx diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 5436f861e..4cf9443d0 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71982 2012-06-04 19:27:21Z jelle $ +# $Id: PKGBUILD 72974 2012-06-25 18:51:32Z foutrelis $ # Contributor: Paulo Matias # Maintainer: Jelle van der Waa pkgname=pdf2djvu pkgver=0.7.13 -pkgrel=1 +pkgrel=2 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD index 9493308a1..dbffcd127 100644 --- a/community/polipo/PKGBUILD +++ b/community/polipo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72884 2012-06-24 12:10:09Z ttopper $ +# $Id: PKGBUILD 72964 2012-06-25 17:08:53Z ttopper $ # Maintainer: Thorsten Töpper # Contributor: Jelle van der Waa # Contributor: Thomas Holmquist @@ -7,7 +7,7 @@ pkgname=polipo pkgver=1.0.4.1 -pkgrel=4 +pkgrel=5 pkgdesc="A small and fast caching web proxy." arch=('i686' 'x86_64') url="http://www.pps.jussieu.fr/~jch/software/polipo/" @@ -50,6 +50,7 @@ package() { install -Dm 755 $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo install -Dm 755 $srcdir/polipo.cron $pkgdir/usr/share/polipo/polipo.cron install -Dm 644 $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service + install -Dm 644 $srcdir/polipo.conf.d $pkgdir/etc/conf.d/polipo.conf } # vim:set ts=2 sw=2 et: diff --git a/community/polipo/polipo.install b/community/polipo/polipo.install index 9c1117321..bacc46377 100644 --- a/community/polipo/polipo.install +++ b/community/polipo/polipo.install @@ -7,8 +7,8 @@ post_install() { install-info $infodir/$file $infodir/dir 2> /dev/null done install -d /var/cache/polipo 2> /dev/null - touch /var/log/polipo 2> /dev/null - chown -R nobody:nobody /var/cache/polipo /var/log/polipo 2> /dev/null + touch /var/log/polipo.log 2> /dev/null + chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null } post_upgrade() { diff --git a/community/raptor1/PKGBUILD b/community/raptor1/PKGBUILD new file mode 100644 index 000000000..0401aee5a --- /dev/null +++ b/community/raptor1/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 72968 2012-06-25 18:19:15Z andrea $ +# Maintainer: +# Contributor: Andreas Radke +# Contributor: eric +# Contributor: Damir Perisa + +pkgname=raptor1 +pkgver=1.4.21 +pkgrel=4 +pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility" +arch=('i686' 'x86_64') +url="http://librdf.org/raptor" +depends=('curl' 'libxslt') +license=('LGPL') +options=('!libtool' '!docs') +source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz" + 'curl.patch') +md5sums=('992061488af7a9e2d933df6b694bb876' + '8fe28761645d6a6607b25c94f9ada964') + +build() { + cd "${srcdir}"/raptor-${pkgver} + patch -p1 -i "${srcdir}"/curl.patch + + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "${srcdir}/raptor-${pkgver}" + make prefix="${pkgdir}"/usr install + + mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1 + rm -f "${pkgdir}"/usr/share/man/man1/rapper.1 +} diff --git a/community/raptor1/curl.patch b/community/raptor1/curl.patch new file mode 100644 index 000000000..590140536 --- /dev/null +++ b/community/raptor1/curl.patch @@ -0,0 +1,11 @@ +diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h +--- raptor-1.4.21/src/raptor_internal.h.curl 2010-01-29 17:54:42.000000000 -0600 ++++ raptor-1.4.21/src/raptor_internal.h 2011-07-31 11:02:44.182465296 -0500 +@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch + + #ifdef RAPTOR_WWW_LIBCURL + #include +-#include + #include + #endif + diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index b002d8e49..3ece04c8a 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,47 +1,48 @@ -# $Id: PKGBUILD 62776 2012-01-26 14:46:13Z spupykin $ +# $Id: PKGBUILD 72938 2012-06-25 10:44:11Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Sebastien Luttringer # Contributor: Dale Blount # Contributor: Sergej Pupykin pkgname=ulogd -pkgver=1.24 -pkgrel=8 +pkgver=2.0.0 +pkgrel=1 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') -makedepends=('mysql' 'postgresql' 'sqlite3' 'libpcap') +depends=('libmnl') +makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi' + 'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack') optdepends=('postgresql-libs' - 'sqlite3' + 'sqlite' 'libpcap' - 'libmysqlclient') + 'libmysqlclient' + 'libdbi' + 'libnetfilter_acct' + 'libnetfilter_log' + 'libnetfilter_conntrack') +options=('!libtool') backup=('etc/ulogd.conf') source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'rc' - 'logrotate' - 'mac-addr.patch') -md5sums=('05b4ed2926b9a22aaeaf642917bbf8ff' + 'logrotate') +md5sums=('211e68781e3860959606fc94b97cf22e' 'c42230c1cabf5dd9b80bf9a0fd87ca7e' - 'fe40b3073b7474a77e0b8b0bfd19ab63' - 'ca41a10a9f230614cd15e2bb037e057d') + 'fe40b3073b7474a77e0b8b0bfd19ab63') build() { cd $pkgname-$pkgver - export MAKEFLAGS="-j1" - patch -p0 extensions/ulogd_BASE.c <$srcdir/mac-addr.patch - ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-sqlite3 - make || true - (cd mysql && ld -shared -L/usr/lib -L/usr/lib -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -o ulogd_MYSQL.so ulogd_MYSQL_sh.o -lc) + ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi make } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - chmod 644 "$pkgdir/etc/ulogd.conf" + install -Dm0644 ulogd.conf $pkgdir/etc/ulogd.conf install -d -m 755 "$pkgdir/usr/share/ulogd" - install -m644 doc/*.table "$pkgdir/usr/share/ulogd" + install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd" install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd" install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd" } diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index 0d585e312..efc4eda5c 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,65 +1,66 @@ -# $Id: PKGBUILD 142315 2011-11-08 10:57:52Z tpowa $ +# $Id: PKGBUILD 162361 2012-06-25 20:10:09Z stephane $ +# Maintainer: Stéphane Gaudreault # Maintainer: Tobias Powalowski # Contributor: Aaron Griffin pkgname=iputils pkgver=20101006 -_traceroutever=1.4a12 -pkgrel=2 +pkgrel=3 pkgdesc="IP Configuration Utilities (and Ping)" arch=('i686' 'x86_64') license=('GPL') url="http://www.linuxfoundation.org/en/Net:Iputils" groups=('base') -depends=('glibc' 'openssl' 'sysfsutils') -conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute') -replaces=('netkit-base' 'traceroute') -source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 - ftp://ftp.ee.lbl.gov/traceroute-${_traceroutever}.tar.gz - 'permission-fix.patch' - 'iputils-s20101006-manpages.patch') -options=('!makeflags') -md5sums=('a36c25e9ec17e48be514dc0485e7376c' - '964d599ef696efccdeebe7721cd4828d' - '66109966cad06e425bb12a78bab85b70' - 'd02dffac6f16e841921a9fc73bd2d3bd') +depends=('openssl' 'sysfsutils' 'libcap') +optdepends=('xinetd: for tftpd') +makedepends=('docbook2x' 'opensp') +conflicts=('netkit-base' 'arping' 'netkit-tftpd') +replaces=('netkit-base') +backup=(etc/xinetd.d/tftp) +install=${pkgname}.install +source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd) +sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242' + 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd') build() { - #build iptuils cd "${srcdir}/${pkgname}-s${pkgver}" - - # Doc fails to build (see FS#20251) - # As a temporary workaround, we use these man pages from Fedora & LFS - patch -Np1 -i ../iputils-s20101006-manpages.patch + + # Use our CFLAGS + sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile + make - # build traceroute - # this is combined in this package because it's awkward as a separate package - cd "${srcdir}/traceroute-${_traceroutever}" - patch -Np1 -i ../permission-fix.patch - ./configure --prefix=/usr \ - --sbindir=/bin \ - --mandir=/usr/share/man - make CFLAGS="${CFLAGS} -Ilinux-include/" + cd doc + for file in *.sgml; do + xf=${file/.sgml/.xml} + osx -xlower -xno-nl-in-tag $file > $xf || true + sed -i "s|\(.*\), \(.*\)|\1, \2|g" $xf + docbook2man $xf + done } package() { cd "${srcdir}/${pkgname}-s${pkgver}" - for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do - install -D -m755 $i "${pkgdir}/usr/sbin/$i" - done - for i in ping ping6 traceroute6; do - install -D -m4755 $i "${pkgdir}/bin/$i" - done - - install -dm755 "${pkgdir}/usr/share/man/man8" - install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath,traceroute6}.8 \ - "${pkgdir}/usr/share/man/man8/" - cd "${pkgdir}/usr/share/man/man8" + install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin + + install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \ + "${pkgdir}"/usr/sbin/ + + install -m755 ping{,6} "${pkgdir}"/usr/bin/ + ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/ + + install -dm755 "${pkgdir}"/usr/share/man/man8 + install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \ + "${pkgdir}"/usr/share/man/man8/ + + cd "${pkgdir}"/usr/share/man/man8 ln -sf ping.8.gz ping6.8.gz ln -sf tracepath.8.gz tracepath6.8.gz - cd "${srcdir}/traceroute-${_traceroutever}" - make DESTDIR="${pkgdir}" install install-man + # FS#24768 + install -dm755 "${pkgdir}"/etc/xinetd.d/ + install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp } + +# vim:set ts=2 sw=2 et: diff --git a/core/iputils/iputils.install b/core/iputils/iputils.install new file mode 100644 index 000000000..2481fb396 --- /dev/null +++ b/core/iputils/iputils.install @@ -0,0 +1,11 @@ +post_install() { + setcap cap_net_raw=ep usr/bin/ping + setcap cap_net_raw=ep usr/bin/ping6 + echo " >> Traceroute is now provided by core/traceroute" +} + +post_upgrade() { + post_install "$1" +} + +# vim:set ts=2 sw=2 et: diff --git a/core/iputils/tftp.xinetd b/core/iputils/tftp.xinetd new file mode 100644 index 000000000..26041a3f9 --- /dev/null +++ b/core/iputils/tftp.xinetd @@ -0,0 +1,10 @@ +service tftp +{ + socket_type = dgram + protocol = udp + wait = yes + user = nobody + server = /usr/sbin/tftpd + server_args = /var/tftpboot + disable = yes +} diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD index ac1363119..fb184b219 100644 --- a/core/libusbx/PKGBUILD +++ b/core/libusbx/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160804 2012-06-06 10:38:17Z tpowa $ +# $Id: PKGBUILD 162327 2012-06-25 07:06:06Z tpowa $ # Maintainer: Tobias Powalowski pkgname=libusbx -pkgver=1.0.11 -pkgrel=2 +pkgver=1.0.12 +pkgrel=1 depends=('glibc') pkgdesc="Library that provides generic access to USB device" arch=(i686 x86_64) @@ -13,8 +13,7 @@ options=(!libtool) replaces=('libusb1' 'libusb') provides=("libusb=$pkgver") conflicts=("libusb") - -md5sums=('9aaab6aee72f65900cc731ecbffb4cf4') +md5sums=('c41352ac755c7992edfcbb2ea4ad1349') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 02fef6c1f..fced1e18d 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162156 2012-06-22 12:56:57Z dreisner $ +# $Id: PKGBUILD 162326 2012-06-25 06:10:45Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Aaron Griffin # Contributor: judd diff --git a/core/openssh/sshd@.service b/core/openssh/sshd@.service new file mode 100644 index 000000000..2fd9b0814 --- /dev/null +++ b/core/openssh/sshd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSSH Per-Connection Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=-/usr/sbin/sshd -i +StandardInput=socket +StandardError=syslog diff --git a/core/traceroute/PKGBUILD b/core/traceroute/PKGBUILD new file mode 100644 index 000000000..cb8c6351e --- /dev/null +++ b/core/traceroute/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 162362 2012-06-25 20:10:12Z stephane $ +# Maintainer: Stéphane Gaudreault + +pkgname=traceroute +pkgver=2.0.18 +pkgrel=1 +pkgdesc="Tracks the route taken by packets over an IP network" +arch=('i686' 'x86_64') +url="http://traceroute.sourceforge.net/" +license=('GPL2') +depends=('glibc') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +sha1sums=('6bdccfd12f93b89aea53728b3c365db5a4362b6d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=/usr DESTDIR="${pkgdir}" install +} diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD index f74c8ac58..ef2581b27 100644 --- a/core/xz/PKGBUILD +++ b/core/xz/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154939 2012-03-31 12:48:19Z pierre $ +# $Id: PKGBUILD 162329 2012-06-25 09:10:55Z pierre $ # Maintainer: Pierre Schmitz # Contributor: François Charette pkgname=xz -pkgver=5.0.3 -pkgrel=2 +pkgver=5.0.4 +pkgrel=1 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('i686' 'x86_64') url='http://tukaani.org/xz/' @@ -12,15 +12,12 @@ license=('GPL' 'LGPL' 'custom') depends=('sh') options=('!libtool') source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig" - 'compile-fix.patch') -md5sums=('fefe52f9ecd521de2a8ce38c21a27574' - 'd0725667a6dae0853194dc691e900e26' - 'b74e4f7793848cc5765c848ea30f971f') + "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") +md5sums=('df3df690aef18384e1e031be7ec3a964' + '6e203465ee9b8f646d85cf84755e2b32') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/compile-fix.patch ./configure --prefix=/usr \ --disable-rpath \ diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index da44fbf68..538708952 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153626 2012-03-16 18:21:58Z thomas $ +# $Id: PKGBUILD 162345 2012-06-25 18:19:31Z thomas $ # Maintainer: Thomas Bächler pkgname=bftpd -pkgver=3.7 +pkgver=3.8 pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64) @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz bftpd.logrotate bftpd.pam bftpd.xinetd) -md5sums=('6614e25ef1864ad80d92724d03832407' +md5sums=('880c1274e623ddd1e3e37f9f0cf09d70' '56a1bf7738a6db2b2cff89e611f4f11a' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 3eca5fab7..c8414750d 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160210 2012-05-30 19:45:47Z andrea $ +# $Id: PKGBUILD 162354 2012-06-25 18:50:36Z foutrelis $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -23,7 +23,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.4.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 27625f16c..ffb007e5d 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160595 2012-06-02 19:09:24Z ibiru $ +# $Id: PKGBUILD 162364 2012-06-25 23:16:17Z ibiru $ # Maintainer: Jan "heftig" Steffens pkgname=clutter-gst -pkgver=1.5.6 +pkgver=1.6.0 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') @@ -11,11 +11,11 @@ license=('LGPL') depends=('clutter' 'gstreamer0.10-base' 'libxdamage') makedepends=('gobject-introspection') options=('!libtool') -source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f12b59d5a548abe38c63750ae2e6cb909afd90cfdcc06d2c4288097f962b08bc') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc @@ -23,8 +23,8 @@ build() { } package() { - cd "$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index a4902fdd5..4026a264e 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162030 2012-06-19 01:03:02Z dan $ +# $Id: PKGBUILD 162371 2012-06-26 03:37:25Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.11 +pkgver=1.7.11.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -100,7 +100,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('15abe2c5b6b7cf9b738e3fb57ab9234ae02a1e61' - '9f963243dfdbf5d77049e5fbb1e8e571effa4285' +sha1sums=('d09664978931d215e43241689eb09371b509c7ce' + 'e2defbf75ff15d7684d70457e41bc45fb22f0e1f' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index b7003ad51..4d33eec6c 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159706 2012-05-26 07:54:18Z andyrtr $ +# $Id: PKGBUILD 162356 2012-06-25 18:50:49Z foutrelis $ # Contributor: tobias # Contributor: Tobias Kieslich # Maintainer: Gaetan Bisson pkgname=inkscape pkgver=0.48.3.1 -pkgrel=3 +pkgrel=4 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD index 23d872f0e..e12be99e8 100644 --- a/extra/libgadu/PKGBUILD +++ b/extra/libgadu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 148371 2012-01-30 19:05:43Z eric $ +# $Id: PKGBUILD 162324 2012-06-25 04:48:31Z eric $ # Maintainer: Andrea Scarpino # Contributor: Mateusz Herych pkgname=libgadu -pkgver=1.11.1 +pkgver=1.11.2 pkgrel=1 pkgdesc="This library implements the client side of the Gadu-Gadu protocol" arch=('i686' 'x86_64') url="http://toxygen.net/libgadu/" -license=('GPL') +license=('LGPL2.1') depends=('openssl') options=('!libtool') source=("http://toxygen.net/${pkgname}/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('01016ad3b0ea955b61ef4badf2bd48bf') +md5sums=('832432fef251f69f31e68574c17f0c51') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -23,6 +23,11 @@ build() { make } +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 4dc5d797b..8e2755bfa 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160068 2012-05-29 19:23:15Z andyrtr $ +# $Id: PKGBUILD 162357 2012-06-25 18:51:18Z foutrelis $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -24,13 +24,13 @@ pkgname=('libreoffice-common' 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built _LOver=3.5.4.2 pkgver=3.5.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' + 'apache-ant' 'gperf' 'poppler>=0.20.1' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' #'saxon' - currently broken @@ -50,6 +50,7 @@ _additional_source_url="http://dev-www.libreoffice.org/src" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 +# ${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -81,6 +82,7 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz fix_broken_hebrew_wordwrapping.diff libreoffice-common.sh libreoffice-common.csh) noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 +# 90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 diff --git a/extra/libreoffice/PKGBUILD.36 b/extra/libreoffice/PKGBUILD.36 new file mode 100644 index 000000000..6a3d0fe0d --- /dev/null +++ b/extra/libreoffice/PKGBUILD.36 @@ -0,0 +1,700 @@ +# $Id: PKGBUILD 160067 2012-05-29 19:20:54Z andyrtr $ +# Maintainer: AndyRTR + +pkgbase="libreoffice" +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' + 'libreoffice-postgresql-connector' + 'libreoffice-extension-pdfimport' + 'libreoffice-extension-presenter-screen' + 'libreoffice-extension-presentation-minimizer' + 'libreoffice-extension-report-builder' + 'libreoffice-scripting-beanshell' + 'libreoffice-scripting-javascript' + 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built +_LOver=3.6.0.0.beta2 +pkgver=3.6.0beta2 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' + #'saxon' - currently broken + # the runtime dependencies + "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' + 'ttf-dejavu') # to satisfy regression tests + +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors + +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" +source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz + ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + ${_additional_source_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz + ${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + ${_additional_source_url}/ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz + ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + buildfix.diff + libreoffice-common.sh libreoffice-common.csh) +noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 + 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz + 185d60944ea767075d27247c3162b3bc-unowinreg.dll + 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) +md5sums=('97183afb02576d5542a1eda3f29f9517' + '3368bc1adfa9e7d6d6f3ce2cee9e164e' + '7191e46a3f48ad7a7d5a21e985790e6a' + '18f577b374d60b3c760a3a3350407632' + '48d647fbd8ef8889e5a7f422c1bfda94' + '90010e213dd25648e70f0cc12f8fed55' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + 'fdb27bfe2dbe2e7b57ae194d9bf36bab' + 'ada24d37d8d638b3d8a9985e80bc2978' + '2a177023f9ea8ec8bd00837605c5df1b' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '2ae988b339daec234019a7066f96733e' + '2c9b0f83ed5890af02c0df1c1776f39b' + 'af3c3acf618de6108d65fcdc92b492e1' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '0ff7d225d087793c8c2c680d77aac3e7' + '6097739c841f671cb21332b9cc593ae7' + 'ce31ac7b92cb5e66459f67213bbb6168' + 'ce5a1def34578b75959ac31210f031f6' + '185d60944ea767075d27247c3162b3bc' + '234e91ac65945ce1ab1e3839780e90f7' + 'f0e72d0e1bc93a50a3aa9d31350b156c' + '867c682b45f477f916786e00c45d7ab7') + +build() { + + unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh + [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh + + cd ${srcdir}/libreoffice-core-$_LOver + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + ln -s ../libreoffice-help-$_LOver/helpcontent2 . + ln -s ../libreoffice-translations-$_LOver/translations . + + # buildfixes & bugfixes + patch -Np1 -i ${srcdir}/buildfix.diff + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + # python2 fix + export PYTHON=python2 + + autoconf -f + + # non-SMP test build + export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ +# touch autogen.lastrun + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + --with-unix-wrapper="libreoffice" \ + --enable-split-app-modules \ + --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --disable-verbose \ + --with-lang="" \ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-gtk3 \ + --enable-lockdown\ + --enable-mergelibs \ + --enable-opengl \ + --enable-odk\ + --enable-ext-scripting-beanshell \ + --enable-ext-scripting-javascript \ + --disable-ext-mysql-connector \ + --with-system-mysql \ + --enable-librsvg=system \ + --without-fonts\ + --without-afms\ + --without-ppds\ + --without-system-libwps\ + --without-system-libcdr \ + --without-system-mdds\ + --without-myspell-dicts \ + --without-system-libvisio \ + --without-system-libcmis \ + --without-system-libexttextcat \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-saxon\ + --disable-mozilla \ + --without-system-mozilla \ + --without-system-mozilla-headers \ + --with-ant-home="/usr/share/apache-ant"\ + --with-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mythes\ + --with-system-headers\ + --with-system-hsqldb \ + --with-alloc=system\ + --without-system-clucene\ + --with-java-target-version=1.5 \ + $EXTRAOPTS + +# --disable-ext-lightproof \ + + +#--with-install-dirname="${pkgbase}" +# --enable-cairo\ +# --with-system-libtextcat \ +# --with-external-libtextcat-data \ +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + +#--with-servlet-api-jar=JARFILE +# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 +# --with-system-saxon\ +# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ + + touch src.downloaded + #./download + make + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-common() { + + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" + install=libreoffice-common.install + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') + #'saxon' + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' + 'libcups: adds printing support' + 'gconf: adds additional gnome support' + 'nss: adds support for signed files/macros' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'poppler: for shipped pdfimport extension' + 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping /macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' + 'clucene: full-text search engine library needed in the help section' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf) + groups=('libreoffice') + provides=('go-openoffice') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # set python-uno PYTHON path + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh + rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb +} + +package_libreoffice-base() { + pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + install=libreoffice-base.install + depends=('libreoffice-common' 'hsqldb-java') + optdepends=('libreoffice-postgresql-connector') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-postgresql-connector() { + pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" + depends=('libreoffice-base' 'postgresql-libs') + groups=('libreoffice') + replaces=('libreoffice') + + # no file-list so far + install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry + + # create directories from *list.txt file +# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do +# install -dm755 ${pkgdir}/${directory/\%dir/} +# done +# # install files into the pkg from fakeinstall dir +# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do +# dirname=`dirname $file` +# # check if directory has been already been created - some are missing like manpages +# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname +# # mv file from fakeinstall to pkgdir +# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file +# done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + install=libreoffice-calc.install + depends=('libreoffice-common' 'lpsolve' ) + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + install=libreoffice-draw.install + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib' + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + install=libreoffice-impress.install + depends=('libreoffice-common') + optdepends=('mesa: for the OGLTrans extension') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Applicationfor LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # fix environment path to keep compatibility with openjdk6 and openjdk7 + #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} +} + +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; +} + +package_libreoffice-writer() { + pkgdesc="Word Processor Applicationfor LibreOffice." + install=libreoffice-writer.install + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-extension-pdfimport() { + + pkgdesc="This extension allows you to import and modify PDF documents" + depends=('libreoffice-common' 'poppler') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport +} + +package_libreoffice-extension-presenter-screen() { + + pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen +} + +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice-common' 'gcc-libs') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer +} + +package_libreoffice-extension-report-builder() { + + pkgdesc="This extension creates smart-looking database reports" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder +} + +package_libreoffice-scripting-beanshell() { + + pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} + mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/ + mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ +} + +package_libreoffice-scripting-javascript() { + + pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ +} + +package_libreoffice-extension-scripting-python() { + + pkgdesc="LibreOffice extension - Enables support for scripts in Python" + depends=('libreoffice-common' 'python2') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python +} diff --git a/extra/libreoffice/buildfix.diff b/extra/libreoffice/buildfix.diff new file mode 100644 index 000000000..327b10bb1 --- /dev/null +++ b/extra/libreoffice/buildfix.diff @@ -0,0 +1,12 @@ +--- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk 2012-06-07 13:57:10.000000000 +0200 ++++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new 2012-06-09 18:21:03.376024873 +0200 +@@ -49,9 +49,6 @@ + StaticLibrary_pdfimport_s \ + )) + +-$(eval $(call gb_Module_add_check_targets,sdext,\ +- CppunitTest_pdfimport \ +-)) + endif + + ifeq ($(ENABLE_PRESENTER_SCREEN),YES) diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 21bf5f959..7c8a9dd95 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159712 2012-05-26 07:54:31Z andyrtr $ +# $Id: PKGBUILD 162358 2012-06-25 18:51:22Z foutrelis $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.0 +pkgver=0.20.1 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('5bca54b9561bf5b14d9344efce2cd4f3' +md5sums=('a61e3b844061f5324512a16d6d16984c' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/extra/xournal/PKGBUILD b/extra/xournal/PKGBUILD index aede2f778..011895afd 100644 --- a/extra/xournal/PKGBUILD +++ b/extra/xournal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160591 2012-06-02 17:08:42Z bisson $ +# $Id: PKGBUILD 162360 2012-06-25 18:51:41Z foutrelis $ # Maintainer: Gaetan Bisson pkgname=xournal pkgver=0.4.6 -pkgrel=1 +pkgrel=2 pkgdesc='Notetaking and sketching application' url='http://xournal.sourceforge.net/' license=('GPL') diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 95fd807dc..779b90f5a 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158920 2012-05-13 08:00:04Z andyrtr $ +# $Id: PKGBUILD 162336 2012-06-25 16:30:47Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xterm -pkgver=279 +pkgver=280 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('42a76a871c1d640719702801a0795d72' +md5sums=('9ba6bf015b5eca93fe273bd75c1a35ac' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 09db17876..662ed4d1a 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -4,12 +4,12 @@ pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.18 -pkgrel=2.1 +pkgrel=3 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler') +depends=('lcms2' 'poppler>=0.20.1') makedepends=('ghostscript') optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD index 1149a2558..87b155c0c 100644 --- a/libre/foomatic-filters-libre/PKGBUILD +++ b/libre/foomatic-filters-libre/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 155770 2012-04-06 10:08:29Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgbase="foomatic" pkgname=('foomatic-filters-libre') arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20120406 -_filtersver=4.0.15 +_snapdate=20120626 +_filtersver=4.0.16 pkgver=${_filtersver}_${_snapdate} -pkgrel=1.2 +pkgrel=1 epoch=1 makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') -#_url=http://www.openprinting.org/download/foomatic/ # switch after build -_url=ftp://ftp.archlinux.org/other/foomatic/ -source=(${_url}/$pkgbase-filters-${_filtersver}.tar.gz) +source=(http://www.openprinting.org/download/foomatic/$pkgbase-filters-${_filtersver}.tar.gz) url="http://www.linuxprinting.org/foomatic.html" options=('!emptydirs') -md5sums=('1b7efcdc57340915647daa5b5c15b0ef') +md5sums=('ec907d9ea17e03bccb91db66e9470586') package_foomatic-filters-libre() { diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD new file mode 100644 index 000000000..e089b8055 --- /dev/null +++ b/testing/cryptsetup/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 162353 2012-06-25 18:43:44Z thomas $ +# Maintainer: Thomas Bächler +pkgname=cryptsetup +pkgver=1.4.3 +pkgrel=1 +pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" +arch=(i686 x86_64) +license=('GPL') +url="http://code.google.com/p/cryptsetup/" +groups=('base') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt' 'util-linux') +conflicts=('mkinitcpio<0.7') +options=('!libtool' '!emptydirs') +source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 + http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc + encrypt_hook + encrypt_install) +sha256sums=('d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a' + 'ad610fe77d78bf7e91b7473f9d9c84de46ed1cc21f006fe3ae4791b0b6f42f3a' + 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' + 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') + +build() { + cd "${srcdir}"/$pkgname-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}"/$pkgname-${pkgver} + make DESTDIR="${pkgdir}" install + # install hook + install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt + install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt +} diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook new file mode 100644 index 000000000..372b7ba57 --- /dev/null +++ b/testing/cryptsetup/encrypt_hook @@ -0,0 +1,138 @@ +#!/usr/bin/ash + +run_hook() { + modprobe -a -q dm-crypt >/dev/null 2>&1 + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" + + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ -n "$cryptkey" ]; then + IFS=: read ckdev ckarg1 ckarg2 </dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 + ;; + esac + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi + + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + IFS=: read cryptdev cryptname cryptoptions <&2 + ;; + esac + done + + if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then + if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then + dopassphrase=0 + else + echo "Invalid keyfile. Reverting to passphrase." + fi + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "A password is required to access the ${cryptname} volume:" + + #loop until we get a real password + while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="cryptsetup create $cryptname $resolved $cryptargs" + IFS=: read c_hash c_cipher c_keysize c_offset c_skip < + +pkgname=libnl +pkgver=3.2.11 +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") +sha256sums=('9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d') + +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/testing/libpcap/PKGBUILD b/testing/libpcap/PKGBUILD new file mode 100644 index 000000000..44b921483 --- /dev/null +++ b/testing/libpcap/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 162349 2012-06-25 18:35:21Z thomas $ +# Maintainer: Thomas Bächler + +pkgname=libpcap +pkgver=1.3.0 +pkgrel=1 +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' 'libusbx') +makedepends=('flex') +source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} + libnl32.patch) +sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9' + '8004a6655fb98acd89f3dea7ce95f182f4874298ce692f5b8f4a7dae65d7993f' + '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/testing/libpcap/libnl32.patch b/testing/libpcap/libnl32.patch new file mode 100644 index 000000000..633fd003e --- /dev/null +++ b/testing/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/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD index 6856a2615..e07dbcfff 100644 --- a/testing/openldap/PKGBUILD +++ b/testing/openldap/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 161934 2012-06-16 17:16:14Z dreisner $ +# $Id: PKGBUILD 162366 2012-06-26 01:03:29Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.31 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd slapd.default slapd.service + slapd slapd.default slapd.service slapd.tmpfiles ntlm.patch mutex-end-of-struct-sigsegv.patch) sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' 'd89b8a533045123f1ab46c9c430cf132d58a20a4' 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4' + 'f86a82e35ebe15026980467c9dee4007e686b795' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' '694269dad78c7a806649c2d7f57bb7e503df3af1') @@ -100,5 +101,6 @@ package_openldap() { install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service + install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/testing/openldap/slapd.tmpfiles b/testing/openldap/slapd.tmpfiles new file mode 100644 index 000000000..5f63bd636 --- /dev/null +++ b/testing/openldap/slapd.tmpfiles @@ -0,0 +1 @@ +D /run/openldap 0750 ldap ldap - diff --git a/testing/wpa_supplicant/PKGBUILD b/testing/wpa_supplicant/PKGBUILD new file mode 100644 index 000000000..10540bd95 --- /dev/null +++ b/testing/wpa_supplicant/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 162331 2012-06-25 10:10:22Z heftig $ +# Maintainer: Thomas Bächler + +pkgname=wpa_supplicant +pkgver=1.0 +pkgrel=1 +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' 'readline' 'libnl') +optdepends=('wpa_supplicant_gui: wpa_gui program') +license=('GPL') +groups=('base') +backup=('etc/wpa_supplicant/wpa_supplicant.conf') +source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz" + config hostap_allow-linking-with-libnl-3.2.patch) +md5sums=('8650f6aa23646ef634402552d0669640' + '380d8d1fe24bccb2a2636cb2a6038c39' + '473fb6b77909ec5a50b6f4d91370e86b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + # from fedora + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" + + cd "${pkgname}" + + cp "${srcdir}/config" ./.config + + sed -i 's@/usr/local@$(PREFIX)@g' Makefile + + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + make PREFIX=/usr DESTDIR="${pkgdir}" install + + install -d -m755 "${pkgdir}/etc/wpa_supplicant" + install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/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 -d -m755 "${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/" + + install -d -m755 "${pkgdir}/etc/dbus-1/system.d" + install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf" + + install -d -m755 "${pkgdir}/usr/lib/systemd/system" + install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/" +} diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config new file mode 100644 index 000000000..59da1e27e --- /dev/null +++ b/testing/wpa_supplicant/config @@ -0,0 +1,468 @@ +# 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 +# Note: WEXT is deprecated in the current Linux kernel version and no new +# functionality is added to it. nl80211-based interface is the new +# replacement for WEXT and its use allows wpa_supplicant to properly control +# the driver to improve existing functionality like roaming and to support new +# functionality. +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 + +# 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 + +# Solaris libraries +#LIBS += -lsocket -ldlpi -lnsl +#LIBS_c += -lsocket + +# 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-pwd (secure authentication using only a password) +#CONFIG_EAP_PWD=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 +# Enable WSC 2.0 support +#CONFIG_WPS2=y +# Enable WPS external registrar functionality +#CONFIG_WPS_ER=y +# Disable credentials for an open network by default when acting as a WPS +# registrar. +#CONFIG_WPS_REG_DISABLE_OPEN=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 + +# Include internal line edit mode in wpa_cli. This can be used as a replacement +# for GNU Readline to provide limited command line editing and history support. +#CONFIG_WPA_CLI_EDIT=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 +# internal = Internal TLSv1 implementation (experimental) +# none = Empty template +#CONFIG_TLS=openssl + +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) +# can be enabled to get a stronger construction of messages when block ciphers +# are used. It should be noted that some existing TLS v1.0 -based +# implementation may not be compatible with TLS v1.1 message (ClientHello is +# sent prior to negotiating which version will be used) +#CONFIG_TLSV11=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_=y) or dynamically (CONFIG_EAP_=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 + +# Send debug messages to syslog instead of stdout +#CONFIG_DEBUG_SYSLOG=y +# Set syslog facility for debug messages +#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON + +# 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, uncomment 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, uncomment these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz + +# wpa_supplicant depends on strong random number generation being available +# from the operating system. os_get_random() function is used to fetch random +# data when needed, e.g., for key generation. On Linux and BSD systems, this +# works by reading /dev/urandom. It should be noted that the OS entropy pool +# needs to be properly initialized before wpa_supplicant is started. This is +# important especially on embedded devices that do not have a hardware random +# number generator and may by default start up with minimal entropy available +# for random number generation. +# +# As a safety net, wpa_supplicant is by default trying to internally collect +# additional entropy for generating random data to mix in with the data fetched +# from the OS. This by itself is not considered to be very strong, but it may +# help in cases where the system pool is not initialized properly. However, it +# is very strongly recommended that the system pool is initialized with enough +# entropy either by using hardware assisted random number generator or by +# storing state over device reboots. +# +# wpa_supplicant can be configured to maintain its own entropy store over +# restarts to enhance random number generation. This is not perfect, but it is +# much more secure than using the same sequence of random numbers after every +# reboot. This can be enabled with -e command line option. The +# specified file needs to be readable and writable by wpa_supplicant. +# +# If the os_get_random() is known to provide strong random data (e.g., on +# Linux/BSD, the board in question is known to have reliable source of random +# data from /dev/urandom), the internal wpa_supplicant random pool can be +# disabled. This will save some in binary size and CPU use. However, this +# should only be considered for builds that are known to be used on devices +# that meet the requirements described above. +CONFIG_NO_RANDOM_POOL=y + +# IEEE 802.11n (High Throughput) support (mainly for AP mode) +#CONFIG_IEEE80211N=y + +# Interworking (IEEE 802.11u) +# This can be used to enable functionality to improve interworking with +# external networks (GAS/ANQP to learn more about the networks and network +# selection based on available credentials). +#CONFIG_INTERWORKING=y + +CONFIG_LIBNL32=y diff --git a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..5d8903906 --- /dev/null +++ b/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,12 @@ +diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak +--- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 ++++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 +@@ -48,7 +48,7 @@ NEED_RFKILL=y + ifdef CONFIG_LIBNL32 + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 +- DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` + else + ifdef CONFIG_LIBNL_TINY + DRV_LIBS += -lnl-tiny diff --git a/testing/wpa_supplicant_gui/PKGBUILD b/testing/wpa_supplicant_gui/PKGBUILD new file mode 100644 index 000000000..e8ad8125a --- /dev/null +++ b/testing/wpa_supplicant_gui/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 162332 2012-06-25 10:11:07Z heftig $ +# Maintainer: Thomas Bächler + +pkgname=wpa_supplicant_gui +pkgver=1.0 +pkgrel=1 +pkgdesc="A Qt frontend to wpa_supplicant" +url="http://hostap.epitest.fi/wpa_supplicant" +arch=('i686' 'x86_64') +depends=('qt' "wpa_supplicant=$pkgver") +license=('GPL') +source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz" + compile-fix.patch) +sha256sums=('91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c' + '044be1032faf93c5f0abf22d7ae77dc0d1d1fef0c2c30646d54950b86601709f') + +build() { + cd wpa_supplicant-${pkgver} + patch -p1 <../compile-fix.patch + cd wpa_supplicant/wpa_gui-qt4 + qmake + make +} + +package() { + cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4" + install -Dm755 wpa_gui "${pkgdir}/usr/sbin/wpa_gui" + install -Dm644 icons/wpa_gui.svg "${pkgdir}/usr/share/pixmaps/wpa_gui.svg" + install -Dm644 wpa_gui.desktop "${pkgdir}/usr/share/applications/wpa_gui.desktop" + install -Dm644 "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8" \ + "${pkgdir}/usr/share/man/man8/wpa_gui.8" +} diff --git a/testing/wpa_supplicant_gui/compile-fix.patch b/testing/wpa_supplicant_gui/compile-fix.patch new file mode 100644 index 000000000..3303b3699 --- /dev/null +++ b/testing/wpa_supplicant_gui/compile-fix.patch @@ -0,0 +1,14 @@ +diff -u -r wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +--- wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-05-09 23:56:09.000000000 +0200 ++++ wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-06-25 12:06:46.045261398 +0200 +@@ -12,10 +12,8 @@ + * See README and COPYING for more details. + */ + +-#ifdef __MINGW32__ + /* Need to get getopt() */ + #include +-#endif + + #ifdef CONFIG_NATIVE_WINDOWS + #include -- cgit v1.2.3