diff options
26 files changed, 497 insertions, 120 deletions
diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD index 1abe33063..a035498ff 100644 --- a/community/chicken/PKGBUILD +++ b/community/chicken/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 67462 2012-03-11 21:18:54Z lcarlier $ +# $Id: PKGBUILD 81004 2012-12-09 14:30:25Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: <david@pako.st> +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=chicken -pkgver=4.7.0 -pkgrel=2 -pkgdesc='A compiler for R5RS scheme, featuring handy extensions' -arch=('i686' 'x86_64') +pkgver=4.8.0 +pkgrel=1 +pkgdesc='Compiler for R5RS scheme, featuring handy extensions' +arch=('x86_64' 'i686') url='http://www.call-with-current-continuation.org/' license=('BSD') depends=('gcc') -source=("http://code.call-cc.org/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('9389388fdf04c3c64de29633aae12539') +source=("http://code.call-cc.org/releases/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('5b2e8c6b4b13b502d8c684b394d80ed490d2884c03789353d895ab85d19979ab') build() { - cd ${pkgname}-${pkgver} + cd $pkgname-$pkgver # parallel builds are not supported.. export MAKEFLAGS="${MAKEFLAGS/-j?/}" @@ -24,13 +25,14 @@ build() { } package() { - cd ${pkgname}-${pkgver} - + cd $pkgname-$pkgver # parallel builds are not supported.. export MAKEFLAGS="${MAKEFLAGS/-j?/}" - make PLATFORM=linux PREFIX=/usr DESTDIR=${pkgdir} install + make PLATFORM=linux PREFIX=/usr DESTDIR=$pkgdir install install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + $pkgdir/usr/share/licenses/$pkgname/LICENSE } + +# vim:set ts=2 sw=2 et: diff --git a/community/ibus-m17n/PKGBUILD b/community/ibus-m17n/PKGBUILD index 534e2f4e1..37a284df9 100644 --- a/community/ibus-m17n/PKGBUILD +++ b/community/ibus-m17n/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 79165 2012-10-31 05:47:23Z ebelanger $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 81008 2012-12-09 15:58:18Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Lonfucius <Lonfucius@gmail.com> # Contributor: Jesse Jaara <jesse.jaara@gmail.com> pkgname=ibus-m17n pkgver=1.3.4 -pkgrel=2 +pkgrel=3 pkgdesc='M17N engine for IBus' arch=('i686' 'x86_64') url='http://code.google.com/p/ibus/' license=('LGPL') -depends=('python-pyenchant' 'ibus' 'm17n-db' 'm17n-lib') +depends=('python2-pyenchant' 'ibus' 'm17n-db' 'm17n-lib') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") sha1sums=('068de56caa87c002adeae0de9e908f47e3f9fde9') diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 0570b3162..dba41dccd 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80198 2012-11-17 14:50:42Z bpiotrowski $ +# $Id: PKGBUILD 81010 2012-12-09 18:03:32Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 -pkgver=20120729 -pkgrel=2 +pkgver=20121128 +pkgrel=1 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64') license=('GPL') @@ -20,19 +20,12 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz - mplayer2-20120729-fix-vf_lavc-compilation.patch - mplayer2-20120729-libquvi-support.patch) -md5sums=('53a266106f4c0dd687af3f807727812c' - 'b1e9188001d31b066488aa35401b62bc' - 'd5a23b19d1f84399526bd0dd9bae0e90') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('696adb2503b2202fe39de6c98b573cd6') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/mplayer2-20120729-libquvi-support.patch - patch -Np1 -i $srcdir/mplayer2-20120729-fix-vf_lavc-compilation.patch - sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop find -type f -exec sed -e 's/python3/python/' -i {} \; diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD index 678713b5d..f3f62c704 100644 --- a/community/smem/PKGBUILD +++ b/community/smem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79614 2012-11-08 22:44:40Z stephane $ +# $Id: PKGBUILD 81012 2012-12-10 02:49:14Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org> # Contributor: Sebastien Duquette <ekse.0x@gmail.com> pkgname=smem -pkgver=1.0 -pkgrel=3 +pkgver=1.2 +pkgrel=1 pkgdesc="Generate reports on memory usage." url="http://www.selenic.com/smem/" license=("GPL") @@ -13,7 +13,7 @@ depends=('python2') optdepends=('python2-matplotlib: for chart generation') arch=('i686' 'x86_64') source=("http://www.selenic.com/smem/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('5620f20cae4d4f0e8eb33bdc2736b0f3') +md5sums=('b8975840a08172ba8a1abbe7cb202dfe') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD index db984ea91..10a21ffba 100644 --- a/community/sqliteman/PKGBUILD +++ b/community/sqliteman/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58342 2011-11-12 08:23:16Z andrea $ +# $Id: PKGBUILD 81006 2012-12-09 15:39:03Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Porizka <artee@beer.cz> @@ -6,10 +6,10 @@ pkgname=sqliteman pkgver=1.2.2 -pkgrel=5 +pkgrel=6 pkgdesc="The best developer's and/or admin's GUI tool for Sqlite3 in the world" arch=('i686' 'x86_64') -url="http://sqliteman.sf.net" +url="http://sqliteman.com/" license=('GPL') depends=('qscintilla') makedepends=('cmake') @@ -18,7 +18,6 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz md5sums=('5ecdf710e23606e1b924f740ea69306d') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -28,6 +27,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD index 520b900f5..eb0b7d867 100644 --- a/core/libssh2/PKGBUILD +++ b/core/libssh2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159788 2012-05-27 02:25:20Z dreisner $ +# $Id: PKGBUILD 173038 2012-12-09 15:23:11Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ # Contributor: ice-man <icemanf@gmail.com> pkgname=libssh2 -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" @@ -17,8 +17,8 @@ makedepends=('zlib') provides=('libssh2.so') options=('!libtool') source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) -md5sums=('42e2b3796ac07fc1dbafc7abcc002cd3' - '872cfb1d61dbd5acd0481ab030e8f130') +md5sums=('071004c60c5d6f90354ad1b701013a0b' + 'bd01eca1e58c15233d69dae411dd2656') build() { cd "$pkgname-$pkgver" diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index fcc599665..8cf902069 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155725 2012-04-06 00:03:55Z tomegun $ +# $Id: PKGBUILD 173074 2012-12-10 03:04:40Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=pcmciautils pkgver=018 -pkgrel=4 +pkgrel=5 pkgdesc="Utilities for inserting and removing PCMCIA cards" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" license=('GPL') groups=('base') @@ -13,23 +13,22 @@ groups=('base') depends=('udev' 'sysfsutils') conflicts=('pcmcia-cs') # source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz - initcpio-install-pcmcia) +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + initcpio-install-pcmcia) options=(!makeflags) +md5sums=('964c802994677a71b38ec56554aa229f' + '041af04025daee5b3b05812ac3896c8f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" sed -i -e 's,/usr/bin/install,install,g; s,/lib/udev,/usr/lib/udev,g' Makefile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install # install the mkinitpcio hook - install -D -m644 ../initcpio-install-pcmcia ${pkgdir}/usr/lib/initcpio/install/pcmcia + install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia" } -md5sums=('964c802994677a71b38ec56554aa229f' - '2659576a4637c58c4e79a96f8e43e316') diff --git a/core/pcmciautils/initcpio-install-pcmcia b/core/pcmciautils/initcpio-install-pcmcia index 71052d6b2..af89c4c9c 100644 --- a/core/pcmciautils/initcpio-install-pcmcia +++ b/core/pcmciautils/initcpio-install-pcmcia @@ -1,14 +1,14 @@ #!/bin/bash build() { - FILES="/etc/pcmcia/config.opts" - MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" - - [[ $MODULES ]] && MODULES+=" sd_mod?" + if add_checked_modules -f 'sound|net' '/drivers/pcmcia/'; then + add_module 'sd_mod?' + fi add_binary "/usr/lib/udev/pcmcia-socket-startup" add_binary "/usr/lib/udev/pcmcia-check-broken-cis" add_file "/usr/lib/udev/rules.d/60-pcmcia.rules" + add_file "/etc/pcmcia/config.opts" } help() { diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index b50f9be50..25359b5c0 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 172469 2012-12-03 11:51:15Z foutrelis $ +# $Id: PKGBUILD 173049 2012-12-09 18:14:06Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=exo -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64') -url="http://www.xfce.org/projects/exo" +url="http://www.xfce.org/" license=('GPL2' 'LGPL') groups=('xfce4') depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' ) @@ -17,7 +17,7 @@ optdepends=('perl-uri: for mail-compose helper script') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('bd5342f5d56a86521315d3ed5834973f28ab58d4f3d76351b590bebbb87afc66') +sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index d7bf7f6d2..9d8c28a20 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172801 2012-12-06 08:19:00Z andrea $ +# $Id: PKGBUILD 173044 2012-12-09 15:36:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt pkgver=4.9.4 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" arch=('i686' 'x86_64') diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 4af8130f9..ca0dfa82f 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 172799 2012-12-06 08:18:55Z andrea $ +# $Id: PKGBUILD 173031 2012-12-09 07:45:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime pkgver=4.9.4 -pkgrel=1 +pkgrel=2 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdepim-runtime' license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi') +depends=('kdebase-runtime' 'libkgapi' 'libkolab') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 6b8199a75..72b1e3de7 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 169113 2012-10-18 10:41:05Z andrea $ +# $Id: PKGBUILD 173040 2012-12-09 15:29:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') -pkgver=4.9.5 -pkgrel=3 +pkgver=4.9.6 +pkgrel=1 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('e4cdd6619c63655f7510efb4df8462fb') +md5sums=('514e1f9597771dc732ba75ba9fa5c6b6') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 0935ff4b7..ffa43b9a9 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 169036 2012-10-17 10:21:11Z allan $ +# $Id: PKGBUILD 173042 2012-12-09 15:31:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.6.2 -pkgrel=3 +pkgver=2.7 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" makedepends=('python2-pyqt' 'pyqt' 'chrpath') source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9' +md5sums=('a3857d75a2b332e0460131e0aa4cc4b5' '8cf9c06252e2f11ab00e62848e322fd3') build() { diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index e992397d7..a58fa3135 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 169038 2012-10-17 10:21:15Z allan $ +# $Id: PKGBUILD 173037 2012-12-09 15:06:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14 -pkgrel=2 +pkgver=4.14.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('9a48ad975e04ac824188840ea498ac32') +md5sums=('b93442e745b3be2fad89de0686a76ce9') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index b266a89da..3244651b3 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172898 2012-12-06 12:48:55Z foutrelis $ +# $Id: PKGBUILD 173051 2012-12-09 18:17:19Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar -pkgver=1.6.0 -pkgrel=3 +pkgver=1.6.1 +pkgrel=1 pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64') url="http://thunar.xfce.org" @@ -22,17 +22,12 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems 'thunar-media-tags-plugin: view/edit id3/ogg tags') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2 - thunar-1.6.0-show-nodisplay-true-applications.patch) -sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a' - 'f7377aad1eb60420d0c1c878c3916913934f994df810f3a60d580fc2be3b80c0') +source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2) +sha256sums=('a81021af558802b8c2c6cd7db47cca262477c4f3d2b6d8cfa8dbba88568048f1') build() { cd "$srcdir/Thunar-$pkgver" - # https://bugzilla.xfce.org/show_bug.cgi?id=9595 - patch -Np1 -i "$srcdir/thunar-1.6.0-show-nodisplay-true-applications.patch" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 916fc6075..2161516d6 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 157532 2012-04-28 22:21:55Z foutrelis $ +# $Id: PKGBUILD 173054 2012-12-09 18:45:26Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler -pkgver=0.1.25 +pkgver=0.1.26 pkgrel=1 pkgdesc="D-Bus service for applications to request thumbnails" arch=('i686' 'x86_64') -url="http://git.xfce.org/xfce/tumbler/" +url="http://www.xfce.org/" license=('GPL2' 'LGPL') groups=('xfce4') depends=('dbus-glib' 'gdk-pixbuf2') -makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib' - 'libgsf' 'libopenraw' 'freetype2') +makedepends=('intltool' 'ffmpegthumbnailer' 'gst-plugins-base-libs' + 'poppler-glib' 'libgsf' 'libopenraw' 'freetype2') optdepends=('ffmpegthumbnailer: for video thumbnails' - 'gstreamer0.10: for video thumbnails' + 'gstreamer: for video thumbnails' 'poppler-glib: for PDF thumbnails' 'libgsf: for ODF thumbnails' 'libopenraw: for RAW thumbnails' 'freetype2: for font thumbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) -sha256sums=('02d5de508d8c18692a25a832a9280c2043f6b7c90dd3fcbd87f5955337015546') +sha256sums=('6602ce700160d09edd88ea0b9bcb16abbc28974f372e646709e0ed8fbacc8a78') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD new file mode 100644 index 000000000..ef62a98d8 --- /dev/null +++ b/extra/xerces-c/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 173034 2012-12-09 09:01:09Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: pukyxd + +pkgname=xerces-c +pkgver=3.1.1 +pkgrel=3 +pkgdesc="A validating XML parser written in a portable subset of C++." +arch=('i686' 'x86_64') +url="http://xerces.apache.org/xerces-c" +license=("APACHE") +depends=('gcc-libs' 'curl') +options=('!libtool') +source=("http://apache.osuosl.org/xerces/c/3/sources/xerces-c-${pkgver}.tar.gz") +md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc + make + make DESTDIR=${pkgdir}/ install +} diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 675f07577..136f087ba 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170786 2012-11-11 10:23:23Z andyrtr $ +# $Id: PKGBUILD 173032 2012-12-09 08:33:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.13.0 -pkgrel=4 +pkgver=1.13.0.902 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -19,25 +19,24 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf - git-fixes.patch + #git-fixes.patch use-pixman-glyph-cache.patch) -sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a' +sha256sums=('7164157ef3b4ef96499526aa6fea85abf7e1416adc2a4a86614dce09fe36fe8f' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - 'd49e534b77ead809eb873a1a86cd47c791a8ddd10557bfa635197bba6bc00b71' '7c1dacd30c46b01424c7c75974285cd348dafd0327eb3f211cbe446ad90dd308') build() { cd "${srcdir}/${pkgbase}-${pkgver}" # Apply upstream fixes from server-1.13 branch - patch -Np1 -i "${srcdir}/git-fixes.patch" +# patch -Np1 -i "${srcdir}/git-fixes.patch" # Use pixman 0.28.0 glyph cache - backported from git master - patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch" +# patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch" # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD index 049f33286..90e0e4fd0 100644 --- a/libre/chroottools/PKGBUILD +++ b/libre/chroottools/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=chroottools -pkgver=20121128.6 +pkgver=20121202 pkgdesc='Chroot tools for Arch and Parabola package maintainers' url='http://projects.parabolagnulinux.org/packages/chroottools.git/' license=('GPL') @@ -25,4 +25,4 @@ package() { make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('32f0cc7fe772a946d8184125011154e1') +md5sums=('68bb7fb792c55031ad68a970b65ab793') diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index f47b71243..26b14ff86 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172214 2012-12-02 07:43:07Z andrea $ +# $Id: PKGBUILD 172988 2012-12-08 05:56:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -7,15 +7,17 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' pkgver=4.9.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" + 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff' "konq-about-fsdg.diff") sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747' + '998f1db2309744dd2c054aec3462a717bc107c2e' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') @@ -26,12 +28,14 @@ replaces=('kdebase-nsplugins' 'kdebase-konqueror') provides=("kdebase-konqueror=$pkgver") build() { - cd "${srcdir}"/kde-baseapps-${pkgver} + cd kde-baseapps-${pkgver} + patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff # Don't recommend nonfree software or Google. patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" - cd ${srcdir} + cd ../ + mkdir build cd build cmake ../kde-baseapps-${pkgver} \ diff --git a/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff b/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff new file mode 100644 index 000000000..9f328ec60 --- /dev/null +++ b/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff @@ -0,0 +1,232 @@ +diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp +index f92cab5..af16954 100644 +--- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp ++++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp +@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor + m_additionalInfoTextColor(), + m_overlay(), + m_rating(), +- m_roleEditor(0) ++ m_roleEditor(0), ++ m_oldRoleEditor(0) + { + } + +@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget() + m_textInfo.clear(); + + delete m_roleEditor; ++ delete m_oldRoleEditor; + } + + void KStandardItemListWidget::setLayout(Layout layout) +@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const + this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant))); + disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), + this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant))); +- // Do not delete the role editor using deleteLater() because we might be +- // inside a nested event loop which has been started by one of its event +- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()). +- m_roleEditor->deleteWhenIdle(); ++ m_oldRoleEditor = m_roleEditor; ++ m_roleEditor->hide(); + m_roleEditor = 0; + } + return; ++ } else if (m_oldRoleEditor) { ++ // Delete the old editor before constructing the new one to ++ // prevent a memory leak. ++ m_oldRoleEditor->deleteLater(); ++ m_oldRoleEditor = 0; + } + + Q_ASSERT(!m_roleEditor); +@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const + + void KStandardItemListWidget::closeRoleEditor() + { ++ disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)), ++ this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant))); ++ disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), ++ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant))); ++ + if (m_roleEditor->hasFocus()) { + // If the editing was not ended by a FocusOut event, we have + // to transfer the keyboard focus back to the KItemListContainer. + scene()->views()[0]->parentWidget()->setFocus(); + } + +- disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)), +- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant))); +- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), +- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant))); +- +- // Do not delete the role editor using deleteLater() because we might be +- // inside a nested event loop which has been started by one of its event +- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()). +- m_roleEditor->deleteWhenIdle(); ++ m_oldRoleEditor = m_roleEditor; ++ m_roleEditor->hide(); + m_roleEditor = 0; + } + +diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h +index 787722d..386f60e 100644 +--- a/dolphin/src/kitemviews/kstandarditemlistwidget.h ++++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h +@@ -241,6 +241,7 @@ private: + QPixmap m_rating; + + KItemListRoleEditor* m_roleEditor; ++ KItemListRoleEditor* m_oldRoleEditor; + + friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to + // share a common layout calculation +diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp +index 78dbfe9..1e4b5fd 100644 +--- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp ++++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp +@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) : + KTextEdit(parent), + m_index(0), + m_role(), +- m_blockFinishedSignal(false), +- m_eventHandlingLevel(0), +- m_deleteAfterEventHandling(false) ++ m_blockFinishedSignal(false) + { + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); +@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const + return m_role; + } + +-void KItemListRoleEditor::deleteWhenIdle() +-{ +- if (m_eventHandlingLevel > 0) { +- // We are handling an event at the moment. It could be that we +- // are in a nested event loop run by contextMenuEvent() or a +- // call of mousePressEvent() which results in drag&drop. +- // -> do not call deleteLater() to prevent a crash when we +- // return from the nested event loop. +- m_deleteAfterEventHandling = true; +- } else { +- deleteLater(); +- } +-} +- + bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event) + { + if (watched == parentWidget() && event->type() == QEvent::Resize) { +@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event) + + bool KItemListRoleEditor::event(QEvent* event) + { +- ++m_eventHandlingLevel; +- + if (event->type() == QEvent::FocusOut) { + QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event); + if (focusEvent->reason() != Qt::PopupFocusReason) { + emitRoleEditingFinished(); + } + } +- +- const int result = KTextEdit::event(event); +- --m_eventHandlingLevel; +- +- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) { +- // Schedule this object for deletion and make sure that we do not try +- // to deleteLater() again when the DeferredDelete event is received. +- deleteLater(); +- m_deleteAfterEventHandling = false; +- } +- +- return result; +-} +- +-bool KItemListRoleEditor::viewportEvent(QEvent* event) +-{ +- ++m_eventHandlingLevel; +- const bool result = KTextEdit::viewportEvent(event); +- --m_eventHandlingLevel; +- +- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) { +- // Schedule this object for deletion and make sure that we do not try +- // to deleteLater() again when the DeferredDelete event is received. +- deleteLater(); +- m_deleteAfterEventHandling = false; +- } +- +- return result; ++ return KTextEdit::event(event); + } + + void KItemListRoleEditor::keyPressEvent(QKeyEvent* event) +@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event) + return; + case Qt::Key_Enter: + case Qt::Key_Return: +- // TODO: find a better way to fix the bug 309760 +- clearFocus(); // emitRoleEditingFinished(); results in a crash ++ emitRoleEditingFinished(); + event->accept(); + return; + default: +diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h +index a2f7058..aa2c977 100644 +--- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h ++++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h +@@ -47,15 +47,6 @@ public: + void setRole(const QByteArray& role); + QByteArray role() const; + +- /** +- * Calls deleteLater() if no event is being handled at the moment. +- * Otherwise, the deletion is deferred until the event handling is +- * finished. This prevents that the deletion happens inside a nested +- * event loop which might be run in contextMenuEvent() or +- * mouseMoveEvent() because this would probably cause a crash. +- */ +- void deleteWhenIdle(); +- + virtual bool eventFilter(QObject* watched, QEvent* event); + + signals: +@@ -64,7 +55,6 @@ signals: + + protected: + virtual bool event(QEvent* event); +- virtual bool viewportEvent(QEvent* event); + virtual void keyPressEvent(QKeyEvent* event); + + private slots: +@@ -85,8 +75,6 @@ private: + int m_index; + QByteArray m_role; + bool m_blockFinishedSignal; +- int m_eventHandlingLevel; +- bool m_deleteAfterEventHandling; + }; + + #endif +diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp +index 70a7394..0e97c5a 100644 +--- a/dolphin/src/views/dolphinview.cpp ++++ b/dolphin/src/views/dolphinview.cpp +@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState() + + QSet<int> selectedItems = selectionManager->selectedItems(); + +- for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) { ++ QList<KUrl>::iterator it = m_selectedUrls.begin(); ++ while (it != m_selectedUrls.end()) { + const int index = m_model->index(*it); + if (index >= 0) { + selectedItems.insert(index); +- m_selectedUrls.erase(it); ++ it = m_selectedUrls.erase(it); ++ } else { ++ ++it; + } + } + diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 01d835b1a..a5d718ad1 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: fauno <fauno@kiwwwi.com.ar> pkgbase=libretools -pkgname=(libretools libretools-pr libretools-mips64el) -pkgver=20121128.3 +pkgname=(libretools libretools-mips64el) +pkgver=20121209 pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/libretools.git/" license=('GPL3+' 'GPL2') @@ -12,7 +12,7 @@ license=('GPL3+' 'GPL2') pkgrel=1 arch=('any') groups=(base-devel) -depends=(openssh rsync git wget chroottools tokyocabinet) +depends=(openssh rsync git wget 'chroottools>=20121202' tokyocabinet) source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar) build() { @@ -29,14 +29,6 @@ package_libretools() { install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto } -package_libretools-pr() { - pkgdesc="Scripts for Parabola development (pr)" - backup=('etc/libretools.d/prtools.conf') - - cd "$srcdir/$pkgbase-$pkgver" - make install-libretools-pr DESTDIR="$pkgdir" -} - package_libretools-mips64el() { pkgdesc="Scripts for Parabola development (for mips64el architecture)" backup=('etc/libretools.d/mips64el.conf') @@ -45,4 +37,4 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('510f69ff043095b60f8a23ee28fd0a16') +md5sums=('0a9bea328886b7745a513fa322f16d88') diff --git a/pcr/nfacct/PKGBUILD b/pcr/nfacct/PKGBUILD new file mode 100644 index 000000000..88af2acb5 --- /dev/null +++ b/pcr/nfacct/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> + +pkgname=nfacct +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Command line tool to create/retrieve/delete accounting objects." +arch=('i686' 'x86_64') +url="http://www.netfilter.org/projects/nfacct/index.html" +license=('GPL') +depends=('libnetfilter_acct') +options=(!libtool) +source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ulogd2/PKGBUILD b/pcr/ulogd2/PKGBUILD new file mode 100644 index 000000000..c00c462e5 --- /dev/null +++ b/pcr/ulogd2/PKGBUILD @@ -0,0 +1,42 @@ +# Contributor: Andrzej Boreczko <0rion@wp.pl> +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> + +pkgname=ulogd2 +pkgver=2.0.0 +pkgrel=6 +pkgdesc="Userspace Packet Logging for netfilter" +arch=(i686 x86_64) +url="http://www.netfilter.org/projects/ulogd/index.html" +license=('GPL') +depends=('libnetfilter_conntrack>=1.0.0' 'libnetfilter_log>=1.0.0' 'libnfnetlink>=1.0.0' 'libmnl>=1.0.0' 'libnetfilter_acct>=1.0.0') +optdepends=('ulogd2_output_mysql: MySQL output' 'ulogd2_output_pgsql: PostgreSQL output' \ + 'ulogd2_output_sqlite3: Sqlite3 output' 'ulogd2_output_pcap: libpcap-style logfiles output' \ + 'ulogd2_output_dbi: Libdbi framework output') +conflicts=('ulogd>1.24') +backup=('etc/ulogd2.conf') +source=("http://www.netfilter.org/projects/ulogd/files/ulogd-${pkgver}.tar.bz2" 'ulogd2' 'logrotate') + +build() { + export MAKEFLAGS="-j1" + cd $startdir/src/ulogd-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --with-mysql \ + --with-pgsql --with-dbi --program-suffix=2 + make || return 1 +} + +package() { + cd $startdir/src/ulogd-${pkgver} + make DESTDIR=$startdir/pkg install || return 1 + rm $startdir/pkg/usr/lib/ulogd/*.la + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_MYSQL.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_MYSQL.* + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_PGSQL.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_PGSQL.* + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_SQLITE3.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_SQLITE3.* + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_PCAP.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_PCAP.* + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_DBI.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_DBI.* + install -D -m755 $startdir/src/ulogd2 $startdir/pkg/etc/rc.d/ulogd2 + sed 's/\/var\/log\/ulogd.log/\/var\/log\/ulogd2.log/' ulogd.conf > $startdir/pkg/etc/ulogd2.conf + mkdir -p $startdir/pkg/usr/share/ulogd2 + install -m644 doc/*.table $startdir/pkg/usr/share/ulogd2 + install -m644 doc/*.sql $startdir/pkg/usr/share/ulogd2 + install -D -m644 ${srcdir}/logrotate $pkgdir/etc/logrotate.d/ulogd2 +} diff --git a/pcr/ulogd2/logrotate b/pcr/ulogd2/logrotate new file mode 100644 index 000000000..7a53c4d52 --- /dev/null +++ b/pcr/ulogd2/logrotate @@ -0,0 +1,10 @@ +/var/log/ulogd2.log { + missingok + notifempty + sharedscripts + create 0640 root root + + postrotate + [ -e /var/run/ulogd2.pid ] && /etc/rc.d/ulogd2 restart > /dev/null + endscript +} diff --git a/pcr/ulogd2/ulogd2 b/pcr/ulogd2/ulogd2 new file mode 100644 index 000000000..09ef2756f --- /dev/null +++ b/pcr/ulogd2/ulogd2 @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof /usr/sbin/ulogd2 +} + +case "$1" in + start) + stat_busy "Starting ulogd2" + + [ -f /var/run/ulogd2.pid ] && rm -f /var/run/ulogd2.pid + PID=`get_pid` + if [ -z "$PID" ]; then + /usr/sbin/ulogd2 -d -c /etc/ulogd2.conf + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo `get_pid` > /var/run/ulogd2.pid + add_daemon ulogd2 + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping ulogd2" + PID=`get_pid` + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/ulogd2.pid &> /dev/null + rm_daemon ulogd2 + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 |