diff options
44 files changed, 1619 insertions, 101 deletions
diff --git a/community/addresses/PKGBUILD b/community/addresses/PKGBUILD index a49f6e751..6f6b65c75 100644 --- a/community/addresses/PKGBUILD +++ b/community/addresses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 50653 2011-06-29 11:36:38Z spupykin $ +# $Id: PKGBUILD 51616 2011-07-12 10:59:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=addresses pkgver=0.4.6 -pkgrel=7 +pkgrel=8 pkgdesc="A versatile address book application for GNUstep" arch=('i686' 'x86_64' 'mips64el') url="http://giesler.biz/bjoern/en/sw_addr.html" @@ -20,19 +20,18 @@ build() { . /etc/profile.d/GNUstep.sh cd $srcdir/Addresses-$pkgver sed -i -e 's|Versions/A|Versions/0|g' {Test,AddressManager}/GNUmakefile - - export PATH=$startdir/gcc-objc/src/gcc-4.2.1/build/qwe/usr/bin:$PATH - make } package() { . /etc/profile.d/GNUstep.sh cd $srcdir/Addresses-$pkgver - make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$pkgdir install - + make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep INSTALL_ROOT_DIR=$pkgdir install # buggy install scripts - cd $pkgdir/opt/GNUstep/System/Library/Headers/ + cd $pkgdir/usr/lib/GNUstep/Library/Headers/ rm AddressBook ln -sf Addresses AddressBook + cd $pkgdir/usr/lib/GNUstep/Library/ + mv * .. + cd .. && rmdir Library } diff --git a/community/gnumail/PKGBUILD b/community/gnumail/PKGBUILD index dcdddce20..b4c668e6f 100644 --- a/community/gnumail/PKGBUILD +++ b/community/gnumail/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 46065 2011-05-03 10:03:55Z spupykin $ +# $Id: PKGBUILD 51621 2011-07-12 11:00:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnumail pkgver=1.2.0pre3 -pkgrel=5 +pkgrel=6 pkgdesc="A complete and fast mail application for GNUstep" arch=('i686' 'x86_64' 'mips64el') url="http://www.collaboration-world.com/gnumail" license=('GPL') -depends=('pantomime' 'addresses' 'gcc' 'gnustep-gui') +depends=('pantomime' 'addresses' 'gnustep-gui') +makedepends=('gcc-objc') options=('!makeflags') -source=(GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103) +source=("GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103") md5sums=('0f91fe0c32ef369ea843a2ab3909fb2b') build() { cd $srcdir/GNUMail . /etc/profile.d/GNUstep.sh make \ - ADDITIONAL_OBJCFLAGS=-I/opt/GNUstep/System/Library/Headers \ - ADDITIONAL_GUI_LIBS="-L/opt/GNUstep/System/Library/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView" + ADDITIONAL_OBJCFLAGS=-I/usr/lib/GNUstep/Headers \ + ADDITIONAL_GUI_LIBS="-L/usr/lib/GNUstep/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView" } package() { cd $srcdir/GNUMail - make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install + make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep install + cd $pkgdir/usr/lib/GNUstep/Library/ + mv * .. + cd .. && rmdir Library } diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD index 80dbecc6d..84ca5d761 100644 --- a/community/gnustep-back/PKGBUILD +++ b/community/gnustep-back/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45208 2011-04-18 12:44:31Z spupykin $ +# $Id: PKGBUILD 51626 2011-07-12 11:01:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-back pkgver=0.20.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNUstep GUI Backend" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" @@ -22,5 +22,15 @@ build() { . /etc/profile.d/GNUstep.sh ./configure --prefix=/usr --sysconfdir=/etc/GNUstep make +} + +package() { + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh make DESTDIR=$pkgdir install + mkdir -p $pkgdir/etc/ld.so.conf.d + cat >$pkgdir/etc/ld.so.conf.d/gnustep.conf <<EOF +/opt/GNUstep/System/Library/Libraries +/usr/lib/GNUstep/Libraries +EOF } diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 4fc73a0b0..54d8ac4d5 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 42568 2011-03-17 15:04:00Z spupykin $ +# $Id: PKGBUILD 51657 2011-07-12 14:22:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc pkgver=5.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64 'mips64el') url="http://dev.mysql.com/downloads/connector/odbc/" depends=('unixodbc' 'libmysqlclient') license=('GPL') -options=('!libtool') source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz" myodbc-64bit.patch myodbc-add-mysys.patch @@ -23,16 +22,17 @@ md5sums=('c64d8cec9de453bdf48fcb168643b943' build() { cd $srcdir/mysql-connector-odbc-${pkgver} - [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-64bit.patch [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-add-mysys.patch [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-my-free.patch [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-shutdown.patch - - [ $NOEXTRACT -eq 1 ] || CFLAGS=-DTHREAD LDFLAGS=-lmysqld ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr \ - --with-mysql-path=/usr --without-samples --enable-thread-safe \ - --without-x --without-qt --disable-gui --enable-shared \ - --disable-static --disable-test + [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \ + ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \ + --with-mysql-path=/usr --without-x --disable-gui --disable-test make +} + +package() { + cd $srcdir/mysql-connector-odbc-${pkgver} make DESTDIR=$pkgdir install } diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index e998b7606..2d70d9449 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48812 2011-06-06 11:51:15Z spupykin $ +# $Id: PKGBUILD 51647 2011-07-12 14:13:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -12,7 +12,7 @@ _group=http pkgname=nginx pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') @@ -28,7 +28,7 @@ backup=("etc/nginx/conf/nginx.conf" source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) md5sums=('d23f6e6b07b57ac061e790b1ed64bb98' - '837b010afcbdfe82d8e65ef00c4e14ba') + '7e7cafa43a59762b81c4da64e49eca69') build() { cd $srcdir/nginx-${pkgver} diff --git a/community/nginx/nginx b/community/nginx/nginx index 2d5a02a47..811656eed 100644 --- a/community/nginx/nginx +++ b/community/nginx/nginx @@ -41,12 +41,16 @@ case "$1" in ;; stop) stat_busy "Stopping Nginx" - kill -QUIT `cat /var/run/nginx.pid` &>/dev/null + NGINX_PID=`cat /var/run/nginx.pid` + kill -QUIT $NGINX_PID &>/dev/null if [ $? -ne 0 ]; then stat_fail else - rm_daemon nginx - stat_done + for i in `seq 1 10`; do + [ -d /proc/$NGINX_PID ] || { stat_done; rm_daemon nginx; exit 0; } + sleep 1 + done + stat_fail fi ;; restart) diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index ba7d575b7..89970cf0e 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash <demodevil5 [at] yahoo [dot] com> pkgname=nut -pkgver=16.12 +pkgver=16.13 pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('12b33ddad0e04ce1e3846fdcdd927dde') +md5sums=('58f29a4510438ce4bd0622cd5971959c') build() { cd ${pkgname}-${pkgver} diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index c32d7c8e8..2225fcaa6 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -2,30 +2,23 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lone_Wolf <lonewolf@xs4all.nl> pkgname=oolite -pkgver=1.75.2 -pkgrel=2 +pkgver=1.75.3 +pkgrel=1 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64') url="http://oolite-linux.berlios.de" license=('GPL2') depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu') makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip') +options=(!makeflags) source=(oolite http://download2.berlios.de/oolite-linux/oolite-dev-source-${pkgver}.tar.bz2) -md5sums=('d4b3fdc553fbd4aa4418864eebd21ede' - '926720981d94fd09c9e2824dbc102d5e') +md5sums=('b182976fade9b64a3b3702e2a8c72bf0' + 'e6c3d1e41f60f8cf410f766a3ecadcc7') build() { cd $srcdir cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build -# running 'make -f libjs.make debug=no' and/or 'make -f Makefile release' -# works from commandline, but gives errors that cause makepkg to abort - cd ${srcdir}/${pkgname}-build/deps/Cocoa-deps/scripts - ./update-mozilla.sh - mkdir -p ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release - cd ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release - ../configure --disable-shared-js --enable-threadsafe --with-system-nspr --disable-tests --enable-trace-jscalls -# end of lines needed to avoid makepkg aborting cd ${srcdir}/${pkgname}-build make -f libjs.make debug=no make -f Makefile release diff --git a/community/oolite/oolite b/community/oolite/oolite index d20e28545..6c9de2446 100755 --- a/community/oolite/oolite +++ b/community/oolite/oolite @@ -3,5 +3,4 @@ source /usr/share/GNUstep/Makefiles/GNUstep.sh if [ ! -d ~/.Oolite/AddOns ]; then mkdir -p ~/.Oolite/AddOns fi -/usr/share/oolite/oolite - +/usr/share/oolite/oolite $@ diff --git a/community/pantomime/PKGBUILD b/community/pantomime/PKGBUILD index d8cfc9588..60597ac7e 100644 --- a/community/pantomime/PKGBUILD +++ b/community/pantomime/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 46068 2011-05-03 10:04:36Z spupykin $ +# $Id: PKGBUILD 51631 2011-07-12 11:02:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=pantomime pkgver=1.2.0pre3 -pkgrel=3 +pkgrel=4 pkgdesc="A set of Objective-C classes that model a mail system" arch=('i686' 'x86_64' 'mips64el') url="http://www.collaboration-world.com/pantomime" @@ -27,6 +27,9 @@ build() { package() { cd $srcdir/Pantomime - make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install + make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep install install -D -m644 Documentation/LICENSE.elm $pkgdir/usr/share/licenses/$pkgname/LICENSE.elm + cd $pkgdir/usr/lib/GNUstep/Library/ + mv * .. + cd .. && rmdir Library } diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index a9959e68e..9faad7bd5 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=2.26 +pkgver=2.27 pkgrel=1 pkgdesc='A generally useful editor with facilities for building and running programs.' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ install=scite.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz" 'SciTE.desktop' 'makefile.patch') -md5sums=('328865585758aca73292083ab4552af4' +md5sums=('ac5aafa1b47da3792a56d5fd9f383fda' '48526532ef677982a4b156ae90f25b6f' '87005d4c7262a1a698cde0628dc7e2a2') diff --git a/community/synce-librapi/PKGBUILD b/community/synce-librapi/PKGBUILD index ffb3f6476..0902d7d15 100644 --- a/community/synce-librapi/PKGBUILD +++ b/community/synce-librapi/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 26407 2010-09-15 11:58:40Z schuay $ +# $Id: PKGBUILD 51603 2011-07-12 06:27:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-librapi -pkgver=0.15 -pkgrel=2 +pkgver=0.15.2 +pkgrel=1 pkgdesc="provide a means of communication with a Windows CE device - libraries and tools for making remote calls to pocket pc" arch=('i686' 'x86_64' 'mips64el') url="http://synce.sourceforge.net/" license=('GPL') -depends=('synce-libsynce') +depends=('synce-libsynce' 'hal') makedepends=('pyrex') source=(http://downloads.sourceforge.net/sourceforge/synce/librapi2-$pkgver.tar.gz) -md5sums=('7341571d6f6b583bb4837bae42fb5d1c') +md5sums=('0a15bc22ee02794ca4714799611b4746') build() { cd $srcdir/librapi2-$pkgver diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index fea186f0f..3479de368 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 51237 2011-07-06 10:22:55Z spupykin $ +# $Id: PKGBUILD 51608 2011-07-12 08:24:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker pkgver=0.10.19 -pkgrel=1 +pkgrel=2 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/tracker/" license=('GPL') depends=('upower' 'poppler-glib' 'gstreamer0.10-base' 'libgee' 'gnome-desktop' 'libnotify' 'xdg-utils' 'gtkhtml' 'libgsf' 'gnome-panel-bonobo' 'exempi' 'networkmanager') -makedepends=('intltool' 'gnome-panel' 'nautilus' 'evolution' 'totem-plparser' 'icu') +makedepends=('intltool' 'gnome-panel' 'evolution' 'totem-plparser' 'icu') +# 'nautilus' optdepends=('nautilus' 'enca' 'gtkhtml' @@ -39,7 +40,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \ --enable-video-extractor=gstreamer --disable-hal \ - --disable-miner-evolution + --disable-miner-evolution --disable-nautilus-extension make } diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 5846f71ab..2105464b3 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42961 2011-03-22 21:16:11Z spupykin $ +# $Id: PKGBUILD 51652 2011-07-12 14:14:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 -_pkgdata=20110227 +_pkgdata=20110705 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64' 'mips64el') url="http://www.draisberghof.de/usb_modeswitch/" @@ -13,26 +13,31 @@ depends=('libusb-compat' 'tcl') makedepends=('gcc' 'make') backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" - "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2") -md5sums=('b75e42b7b2d30e9d4cbd5c159f925247' - '2f5e5bfa21a97b705a22f95bec367793') + "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" + "http://www.draisberghof.de/usb_modeswitch/device_reference.txt") +md5sums=('1aaaa45e0465843e4973d7778bfbafbb' + '5046e7be8d10d2fe699f9af21a0c3769' + 'c441eb16a3901052ce882ca844be2a20') build() { - cd $srcdir + cd $srcdir/usb-modeswitch-$pkgver/ + make clean + make +} +package() { cd $srcdir/usb-modeswitch-$pkgver/ + mkdir -p $pkgdir/lib/udev/usb_modeswitch mkdir -p $pkgdir/etc mkdir -p $pkgdir/usr/share/man/man1 - make clean - make make DESTDIR=${pkgdir} install mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch.sh rmdir ${pkgdir}/lib/udev/usb_modeswitch mv ${pkgdir}/lib/udev/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch - cp device_reference.txt $pkgdir/etc/usb_modeswitch.setup + cp $srcdir/device_reference.txt $pkgdir/etc/usb_modeswitch.setup cd $srcdir/usb-modeswitch-data-${_pkgdata} make DESTDIR=$pkgdir install diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index ed67782cb..9bce420a0 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $ +# $Id: PKGBUILD 131265 2011-07-12 13:19:41Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy pkgver=3.0.2 @@ -24,7 +24,7 @@ sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/empathy \ --disable-static \ diff --git a/extra/kdegraphics/PKGBUILD b/extra/kdegraphics/PKGBUILD index a6ea11d92..0bb7e9615 100644 --- a/extra/kdegraphics/PKGBUILD +++ b/extra/kdegraphics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130500 2011-07-06 23:50:56Z andrea $ +# $Id: PKGBUILD 131255 2011-07-12 11:55:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdegraphics-gwenview' 'kdegraphics-libs' 'kdegraphics-okular') pkgver=4.6.5 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 30796daa8..55535c10c 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130249 2011-07-04 19:26:50Z andrea $ +# $Id: PKGBUILD 131295 2011-07-12 17:46:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,11 +20,14 @@ replaces=('arts' 'kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch' - 'abs-syntax-highlight.patch') + 'abs-syntax-highlight.patch' + 'fix-lineedit-clear-button.patch' + 'fix-lineedit-completion-tab.patch') sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - 'd994f262356af5b9e4e9619646e471bd98c91efb') + 'd994f262356af5b9e4e9619646e471bd98c91efb' + '3deae3fc6733624759ad8bf5a1560d9a2f792d73' + 'a5f223b61499fa03043def0b3a45b1712cc72d70') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -34,6 +37,10 @@ build() { # add syntax highlightning for PKGBUILD and .install files patch -p1 -i $srcdir/abs-syntax-highlight.patch + # Already fixed upstream + patch -p1 -i "${srcdir}"/fix-lineedit-clear-button.patch + patch -p1 -i "${srcdir}"/fix-lineedit-completion-tab.patch + cd ${srcdir} mkdir build cd build @@ -61,6 +68,3 @@ package() { rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt } -sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'd994f262356af5b9e4e9619646e471bd98c91efb') diff --git a/extra/kdelibs/fix-lineedit-clear-button.patch b/extra/kdelibs/fix-lineedit-clear-button.patch new file mode 100644 index 000000000..315892940 --- /dev/null +++ b/extra/kdelibs/fix-lineedit-clear-button.patch @@ -0,0 +1,30 @@ +commit 0b7201c1fe4f12dc7b17abbf19047864d1cca302 +Author: Andrea Iacovitti <aiacovitti@libero.it> +Date: Sat Jul 9 19:51:40 2011 +0200 + + Fix regression about input text clearButton stopping to work on khtml forms + BUG: 246513 + FIXED-IN: 4.7.0 + +diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp +index 7382806..8f1c8a4 100644 +--- a/kdeui/widgets/klineedit.cpp ++++ b/kdeui/widgets/klineedit.cpp +@@ -1116,7 +1116,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e ) + if ( (e->button() == Qt::LeftButton || + e->button() == Qt::MidButton ) && + d->clearButton ) { +- d->clickInClear = d->clearButton == childAt( e->pos() ); ++ d->clickInClear = ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() ); + + if ( d->clickInClear ) { + d->possibleTripleClick = false; +@@ -1145,7 +1145,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e ) + void KLineEdit::mouseReleaseEvent( QMouseEvent* e ) + { + if ( d->clickInClear ) { +- if ( d->clearButton == childAt( e->pos() ) ) { ++ if ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() ) { + QString newText; + if ( e->button() == Qt::MidButton ) { + newText = QApplication::clipboard()->text( QClipboard::Selection ); diff --git a/extra/kdelibs/fix-lineedit-completion-tab.patch b/extra/kdelibs/fix-lineedit-completion-tab.patch new file mode 100644 index 000000000..0c88dffc9 --- /dev/null +++ b/extra/kdelibs/fix-lineedit-completion-tab.patch @@ -0,0 +1,56 @@ +--- kdelibs/khtml/rendering/render_form.cpp ++++ kdelibs/khtml/rendering/render_form.cpp +@@ -1012,11 +1012,11 @@ + // ----------------------------------------------------------------------------- + + RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element) +- : RenderFormElement(element) ++ : RenderFormElement(element), m_blockElementUpdates(false) + { + LineEditWidget *edit = new LineEditWidget(element, view(), view()->widget()); + connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed())); +- connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString))); ++ connect(edit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString))); + + if(element->inputType() == HTMLInputElementImpl::PASSWORD) + edit->setEchoMode( QLineEdit::Password ); +@@ -1142,17 +1142,21 @@ + } + + if (element()->value().string() != widget()->text()) { ++ m_blockElementUpdates = true; + int pos = widget()->cursorPosition(); + widget()->setText(element()->value().string()); + widget()->setCursorPosition(pos); ++ m_blockElementUpdates = false; + } + widget()->setReadOnly(element()->readOnly()); + + RenderFormElement::updateFromElement(); + } + +-void RenderLineEdit::slotTextEdited(const QString &string) ++void RenderLineEdit::slotTextChanged(const QString &string) + { ++ if (m_blockElementUpdates) return; ++ + // don't use setValue here! + element()->m_value = string; + element()->m_unsubmittedFormChange = true; +--- kdelibs/khtml/rendering/render_form.h ++++ kdelibs/khtml/rendering/render_form.h +@@ -282,12 +282,13 @@ + void setSelectionRange(long start, long end); + public Q_SLOTS: + void slotReturnPressed(); +- void slotTextEdited(const QString &string); ++ void slotTextChanged(const QString &string); + protected: + + private: + virtual bool isEditable() const { return true; } + virtual bool canHaveBorder() const { return true; } ++ bool m_blockElementUpdates; + }; + + // ------------------------------------------------------------------------- diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index 45e56ecbd..77a61b427 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130262 2011-07-04 19:27:51Z andrea $ +# $Id: PKGBUILD 131350 2011-07-12 19:23:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') pkgver=4.6.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -19,11 +19,16 @@ groups=('kde' 'kdemultimedia') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'mplayerthumbs.config') + 'mplayerthumbs.config' + 'fix-memleak-in-kmix.patch') sha1sums=('081bead5ee758d169f3119c138424929b001d04f' - 'ba016fa2563c14ffcba852c62506b66bfc6ee683') + 'ba016fa2563c14ffcba852c62506b66bfc6ee683' + '80370de30898f1ba1a6db057d34324abdcc57384') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-memleak-in-kmix.patch + cd ${srcdir} mkdir build cd build diff --git a/extra/kdemultimedia/fix-memleak-in-kmix.patch b/extra/kdemultimedia/fix-memleak-in-kmix.patch new file mode 100644 index 000000000..31ea4a606 --- /dev/null +++ b/extra/kdemultimedia/fix-memleak-in-kmix.patch @@ -0,0 +1,55 @@ +Index: kdemultimedia/kmix/backends/mixer_pulse.cpp +=================================================================== +--- kdemultimedia/kmix/backends/mixer_pulse.cpp (revision 1241345) ++++ kdemultimedia/kmix/backends/mixer_pulse.cpp (revision 1241346) +@@ -754,7 +754,12 @@ + return; + } + addDevice((*map)[index]); +- emit controlsReconfigured(_mixer->id()); ++ // Do not emit directly to ensure all connected slots are executed ++ // in their own event loop. ++ QMetaObject::invokeMethod(this, ++ "controlsReconfigured", ++ Qt::QueuedConnection, ++ Q_ARG(QString, _mixer->id())); + } + + void Mixer_PULSE::removeWidget(int index) +@@ -778,7 +783,12 @@ + { + delete *iter; + m_mixDevices.erase(iter); +- emit controlsReconfigured(_mixer->id()); ++ // Do not emit directly to ensure all connected slots are executed ++ // in their own event loop. ++ QMetaObject::invokeMethod(this, ++ "controlsReconfigured", ++ Qt::QueuedConnection, ++ Q_ARG(QString, _mixer->id())); + return; + } + } +@@ -799,7 +809,12 @@ + delete *iter; + m_mixDevices.erase(iter); + } +- emit controlsReconfigured(_mixer->id()); ++ // Do not emit directly to ensure all connected slots are executed ++ // in their own event loop. ++ QMetaObject::invokeMethod(this, ++ "controlsReconfigured", ++ Qt::QueuedConnection, ++ Q_ARG(QString, _mixer->id())); + } + + void Mixer_PULSE::addDevice(devinfo& dev) +@@ -990,7 +1005,7 @@ + kDebug(67100) << "Using PulseAudio for mixer: " << m_mixerName; + m_isOpen = true; + } +- ++ + return 0; + } + diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index f5c1fcbcb..b6dd3fbad 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 131169 2011-07-11 13:15:58Z giovanni $ +# $Id: PKGBUILD 131260 2011-07-12 12:02:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=mkvtoolnix -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis') makedepends=('boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('3f92443fe7897abd3d5e7d61bd758432') +md5sums=('5981f266e6d25da4a49f7464e4a97cdf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/raptor/Allow-instead-of-in-TRiG.patch b/extra/raptor/Allow-instead-of-in-TRiG.patch new file mode 100644 index 000000000..21639f600 --- /dev/null +++ b/extra/raptor/Allow-instead-of-in-TRiG.patch @@ -0,0 +1,550 @@ +diff -ur ../../raptor2-2.0.3/src/turtle_lexer.c ./src/turtle_lexer.c +--- ../../raptor2-2.0.3/src/turtle_lexer.c 2011-05-31 21:14:41.000000000 +0200 ++++ ./src/turtle_lexer.c 2011-07-12 15:31:39.620638699 +0200 +@@ -62,6 +62,7 @@ + typedef unsigned char flex_uint8_t; + typedef unsigned short int flex_uint16_t; + typedef unsigned int flex_uint32_t; ++#endif /* ! C99 */ + + /* Limits of integral types. */ + #ifndef INT8_MIN +@@ -92,8 +93,6 @@ + #define UINT32_MAX (4294967295U) + #endif + +-#endif /* ! C99 */ +- + #endif /* ! FLEXINT_H */ + + #ifdef __cplusplus +@@ -167,15 +166,7 @@ + + /* Size of default input buffer. */ + #ifndef YY_BUF_SIZE +-#ifdef __ia64__ +-/* On IA-64, the buffer size is 16k, not 8k. +- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. +- * Ditto for the __ia64__ case accordingly. +- */ +-#define YY_BUF_SIZE 32768 +-#else + #define YY_BUF_SIZE 16384 +-#endif /* __ia64__ */ + #endif + + /* The state buf must be large enough to hold one state per character in the main buffer. +@@ -371,7 +362,7 @@ + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +-static yyconst flex_int16_t yy_accept[114] = ++static yyconst flex_int16_t yy_accept[112] = + { 0, + 0, 0, 0, 0, 22, 22, 41, 39, 2, 1, + 1, 39, 38, 13, 14, 39, 5, 4, 28, 25, +@@ -384,8 +375,8 @@ + 26, 0, 0, 27, 0, 25, 0, 0, 33, 0, + 0, 24, 36, 36, 21, 0, 27, 0, 27, 0, + +- 0, 0, 0, 24, 36, 17, 0, 10, 0, 18, +- 0, 9, 0 ++ 0, 0, 24, 36, 17, 10, 0, 18, 0, 9, ++ 0 + } ; + + static yyconst flex_int32_t yy_ec[256] = +@@ -396,154 +387,157 @@ + 1, 2, 1, 5, 6, 1, 1, 1, 1, 7, + 8, 1, 9, 10, 11, 12, 1, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 14, 15, 16, +- 1, 17, 1, 18, 19, 19, 19, 19, 20, 19, +- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +- 21, 22, 23, 24, 25, 1, 26, 27, 19, 19, +- +- 28, 29, 19, 19, 30, 19, 19, 31, 19, 19, +- 19, 32, 19, 33, 34, 35, 36, 19, 19, 37, +- 19, 19, 38, 1, 39, 1, 1, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, +- 40, 40, 40, 40, 40 ++ 17, 18, 1, 19, 20, 20, 20, 20, 21, 20, ++ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, ++ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, ++ 22, 23, 24, 25, 26, 1, 27, 28, 20, 20, ++ ++ 29, 30, 20, 20, 31, 20, 20, 32, 20, 20, ++ 20, 33, 20, 34, 35, 36, 37, 20, 20, 38, ++ 20, 20, 39, 1, 40, 1, 1, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, ++ 41, 41, 41, 41, 41 + } ; + +-static yyconst flex_int32_t yy_meta[41] = ++static yyconst flex_int32_t yy_meta[42] = + { 0, + 1, 2, 3, 4, 5, 1, 1, 1, 1, 1, +- 6, 1, 6, 7, 1, 1, 1, 1, 8, 8, +- 1, 8, 1, 1, 8, 8, 8, 8, 8, 8, +- 8, 8, 8, 8, 8, 8, 8, 2, 1, 8 ++ 6, 1, 6, 7, 1, 1, 2, 1, 1, 8, ++ 8, 1, 8, 1, 1, 8, 8, 8, 8, 8, ++ 8, 8, 8, 8, 8, 8, 8, 8, 2, 1, ++ 8 + } ; + +-static yyconst flex_int16_t yy_base[126] = ++static yyconst flex_int16_t yy_base[124] = + { 0, +- 0, 0, 40, 0, 78, 79, 285, 299, 259, 299, +- 257, 80, 83, 299, 299, 76, 299, 246, 78, 90, +- 299, 227, 67, 81, 299, 229, 299, 207, 215, 83, +- 93, 83, 299, 299, 299, 225, 299, 211, 105, 107, +- 219, 108, 221, 299, 109, 217, 0, 114, 299, 218, +- 207, 112, 117, 121, 133, 133, 208, 136, 299, 201, +- 149, 191, 183, 189, 151, 200, 299, 0, 117, 86, +- 211, 198, 299, 153, 154, 155, 206, 299, 299, 153, +- 157, 169, 197, 196, 165, 170, 188, 196, 299, 172, +- 177, 0, 135, 153, 299, 191, 188, 187, 186, 190, +- +- 192, 170, 154, 0, 160, 133, 194, 299, 125, 100, +- 83, 299, 299, 232, 240, 248, 255, 263, 266, 269, +- 272, 280, 287, 88, 290 ++ 0, 0, 41, 0, 80, 81, 262, 301, 259, 301, ++ 243, 82, 85, 301, 301, 78, 301, 232, 80, 93, ++ 301, 215, 66, 83, 301, 217, 301, 205, 215, 84, ++ 88, 85, 301, 301, 301, 226, 301, 212, 97, 105, ++ 220, 111, 222, 301, 108, 218, 0, 114, 301, 219, ++ 208, 109, 113, 114, 128, 142, 144, 146, 301, 202, ++ 148, 192, 184, 190, 150, 202, 301, 0, 128, 96, ++ 212, 199, 301, 133, 151, 159, 207, 301, 301, 157, ++ 148, 162, 198, 197, 155, 176, 188, 193, 301, 174, ++ 179, 0, 145, 155, 301, 194, 193, 191, 190, 195, ++ ++ 173, 171, 0, 159, 173, 301, 168, 165, 138, 301, ++ 301, 234, 242, 250, 257, 265, 268, 271, 274, 282, ++ 289, 132, 292 + } ; + +-static yyconst flex_int16_t yy_def[126] = ++static yyconst flex_int16_t yy_def[124] = + { 0, +- 113, 1, 113, 3, 114, 114, 113, 113, 113, 113, +- 113, 115, 116, 113, 113, 113, 113, 113, 113, 117, +- 113, 118, 113, 119, 113, 120, 113, 113, 113, 119, +- 119, 31, 113, 113, 113, 113, 113, 121, 122, 122, +- 113, 122, 113, 113, 115, 113, 115, 116, 113, 113, +- 113, 113, 113, 113, 113, 113, 113, 123, 113, 118, +- 113, 113, 113, 31, 117, 120, 113, 124, 31, 31, +- 113, 121, 113, 122, 122, 122, 113, 113, 113, 113, +- 113, 113, 113, 113, 113, 123, 113, 113, 113, 113, +- 113, 125, 31, 31, 113, 113, 113, 113, 113, 113, +- +- 113, 113, 113, 125, 31, 31, 113, 113, 113, 31, +- 113, 113, 0, 113, 113, 113, 113, 113, 113, 113, +- 113, 113, 113, 113, 113 ++ 111, 1, 111, 3, 112, 112, 111, 111, 111, 111, ++ 111, 113, 114, 111, 111, 111, 111, 111, 111, 115, ++ 111, 116, 111, 117, 111, 118, 111, 111, 111, 117, ++ 117, 31, 111, 111, 111, 111, 111, 119, 120, 120, ++ 111, 120, 111, 111, 113, 111, 113, 114, 111, 111, ++ 111, 111, 111, 111, 111, 111, 111, 121, 111, 116, ++ 111, 111, 111, 31, 115, 118, 111, 122, 31, 31, ++ 111, 119, 111, 120, 120, 120, 111, 111, 111, 111, ++ 111, 111, 111, 111, 111, 121, 111, 111, 111, 111, ++ 111, 123, 31, 31, 111, 111, 111, 111, 111, 111, ++ ++ 111, 111, 123, 31, 31, 111, 111, 31, 111, 111, ++ 0, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111, 111 + } ; + +-static yyconst flex_int16_t yy_nxt[340] = ++static yyconst flex_int16_t yy_nxt[343] = + { 0, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, +- 16, 18, 19, 20, 21, 22, 8, 23, 24, 24, +- 25, 26, 27, 28, 29, 30, 24, 24, 31, 24, +- 24, 24, 24, 24, 32, 24, 24, 33, 34, 26, +- 35, 36, 35, 35, 35, 35, 35, 35, 35, 35, +- 35, 35, 35, 37, 35, 35, 35, 35, 38, 38, +- 35, 38, 35, 35, 35, 38, 38, 38, 38, 38, +- 38, 38, 38, 38, 38, 38, 38, 35, 35, 38, +- 40, 40, 41, 41, 46, 49, 50, 51, 52, 54, +- 52, 56, 56, 62, 65, 92, 65, 55, 63, 42, +- +- 42, 47, 66, 57, 66, 55, 65, 75, 64, 75, +- 113, 64, 74, 78, 66, 70, 49, 50, 69, 112, +- 66, 94, 66, 54, 52, 64, 76, 59, 76, 53, +- 47, 55, 66, 81, 56, 56, 80, 56, 56, 55, +- 82, 83, 64, 83, 80, 84, 57, 93, 82, 57, +- 87, 87, 56, 56, 111, 75, 75, 113, 64, 74, +- 64, 96, 88, 96, 57, 97, 100, 100, 105, 81, +- 59, 56, 56, 59, 76, 76, 82, 98, 64, 98, +- 106, 99, 109, 57, 82, 64, 89, 110, 59, 87, +- 87, 100, 100, 107, 107, 107, 107, 108, 99, 99, +- +- 97, 88, 59, 97, 103, 102, 101, 59, 84, 84, +- 95, 73, 71, 65, 64, 91, 90, 61, 85, 53, +- 49, 79, 43, 77, 73, 89, 71, 59, 68, 89, +- 67, 89, 39, 39, 39, 39, 39, 39, 39, 39, +- 45, 45, 65, 61, 45, 45, 45, 45, 48, 48, +- 48, 48, 48, 48, 48, 48, 58, 58, 53, 44, +- 43, 58, 58, 60, 60, 60, 60, 60, 60, 60, +- 60, 64, 64, 64, 66, 66, 66, 72, 72, 72, +- 74, 74, 74, 74, 113, 74, 74, 74, 86, 86, +- 113, 113, 86, 86, 86, 104, 113, 104, 7, 113, +- +- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, +- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, +- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, +- 113, 113, 113, 113, 113, 113, 113, 113, 113 ++ 16, 18, 19, 20, 21, 22, 8, 8, 23, 24, ++ 24, 25, 26, 27, 28, 29, 30, 24, 24, 31, ++ 24, 24, 24, 24, 24, 32, 24, 24, 33, 34, ++ 26, 35, 36, 35, 35, 35, 35, 35, 35, 35, ++ 35, 35, 35, 35, 37, 35, 35, 35, 35, 35, ++ 38, 38, 35, 38, 35, 35, 35, 38, 38, 38, ++ 38, 38, 38, 38, 38, 38, 38, 38, 38, 35, ++ 35, 38, 40, 40, 41, 41, 46, 49, 50, 51, ++ 52, 54, 52, 62, 56, 56, 65, 65, 63, 75, ++ ++ 55, 65, 42, 42, 47, 66, 66, 75, 55, 57, ++ 66, 64, 78, 111, 69, 74, 49, 50, 70, 76, ++ 54, 52, 64, 66, 66, 53, 81, 76, 66, 55, ++ 47, 59, 94, 80, 82, 75, 83, 55, 83, 92, ++ 84, 80, 82, 56, 56, 85, 85, 56, 56, 87, ++ 87, 56, 56, 75, 64, 76, 85, 85, 57, 93, ++ 81, 111, 57, 74, 88, 96, 57, 96, 82, 97, ++ 98, 64, 98, 76, 99, 110, 82, 56, 56, 104, ++ 59, 64, 59, 105, 59, 64, 89, 108, 59, 87, ++ 87, 64, 57, 59, 100, 100, 100, 100, 109, 64, ++ ++ 107, 106, 99, 99, 88, 97, 97, 102, 101, 84, ++ 84, 95, 73, 71, 59, 65, 64, 91, 90, 61, ++ 53, 49, 79, 43, 77, 73, 89, 71, 68, 67, ++ 65, 89, 61, 89, 39, 39, 39, 39, 39, 39, ++ 39, 39, 45, 45, 53, 44, 45, 45, 45, 45, ++ 48, 48, 48, 48, 48, 48, 48, 48, 58, 58, ++ 43, 111, 111, 111, 58, 60, 60, 60, 60, 60, ++ 60, 60, 60, 64, 64, 64, 66, 66, 66, 72, ++ 72, 72, 74, 74, 74, 74, 111, 74, 74, 74, ++ 86, 86, 111, 111, 86, 111, 86, 103, 111, 103, ++ ++ 7, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111 + } ; + +-static yyconst flex_int16_t yy_chk[340] = ++static yyconst flex_int16_t yy_chk[343] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +- 5, 6, 5, 6, 12, 13, 13, 16, 16, 19, +- 19, 20, 20, 23, 24, 124, 30, 19, 23, 5, ++ 3, 3, 5, 6, 5, 6, 12, 13, 13, 16, ++ 16, 19, 19, 23, 20, 20, 24, 30, 23, 39, + +- 6, 12, 24, 20, 30, 19, 31, 39, 32, 40, +- 42, 70, 42, 45, 31, 32, 48, 48, 31, 111, +- 24, 70, 30, 52, 52, 110, 39, 20, 40, 53, +- 45, 52, 31, 54, 56, 56, 53, 58, 58, 52, +- 54, 55, 69, 55, 53, 55, 56, 69, 54, 58, +- 61, 61, 65, 65, 109, 74, 75, 76, 106, 76, +- 93, 80, 61, 80, 65, 80, 85, 85, 93, 81, +- 56, 86, 86, 58, 74, 75, 81, 82, 94, 82, +- 94, 82, 103, 86, 81, 105, 61, 105, 65, 87, +- 87, 100, 100, 101, 101, 107, 107, 102, 99, 98, +- +- 97, 87, 85, 96, 91, 90, 88, 86, 84, 83, +- 77, 72, 71, 66, 64, 63, 62, 60, 57, 51, +- 50, 46, 43, 41, 38, 87, 36, 100, 29, 101, +- 28, 107, 114, 114, 114, 114, 114, 114, 114, 114, +- 115, 115, 26, 22, 115, 115, 115, 115, 116, 116, +- 116, 116, 116, 116, 116, 116, 117, 117, 18, 11, +- 9, 117, 117, 118, 118, 118, 118, 118, 118, 118, +- 118, 119, 119, 119, 120, 120, 120, 121, 121, 121, +- 122, 122, 122, 122, 7, 122, 122, 122, 123, 123, +- 0, 0, 123, 123, 123, 125, 0, 125, 113, 113, +- +- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, +- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, +- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, +- 113, 113, 113, 113, 113, 113, 113, 113, 113 ++ 19, 31, 5, 6, 12, 24, 30, 40, 19, 20, ++ 31, 32, 45, 42, 31, 42, 48, 48, 32, 39, ++ 52, 52, 70, 24, 30, 53, 54, 40, 31, 52, ++ 45, 20, 70, 53, 54, 74, 55, 52, 55, 122, ++ 55, 53, 54, 56, 56, 57, 57, 58, 58, 61, ++ 61, 65, 65, 75, 69, 74, 85, 85, 56, 69, ++ 81, 76, 58, 76, 61, 80, 65, 80, 81, 80, ++ 82, 93, 82, 75, 82, 109, 81, 86, 86, 93, ++ 56, 94, 57, 94, 58, 104, 61, 104, 65, 87, ++ 87, 108, 86, 85, 88, 88, 100, 100, 107, 105, ++ ++ 102, 101, 99, 98, 87, 97, 96, 91, 90, 84, ++ 83, 77, 72, 71, 86, 66, 64, 63, 62, 60, ++ 51, 50, 46, 43, 41, 38, 87, 36, 29, 28, ++ 26, 88, 22, 100, 112, 112, 112, 112, 112, 112, ++ 112, 112, 113, 113, 18, 11, 113, 113, 113, 113, ++ 114, 114, 114, 114, 114, 114, 114, 114, 115, 115, ++ 9, 7, 0, 0, 115, 116, 116, 116, 116, 116, ++ 116, 116, 116, 117, 117, 117, 118, 118, 118, 119, ++ 119, 119, 120, 120, 120, 120, 0, 120, 120, 120, ++ 121, 121, 0, 0, 121, 0, 121, 123, 0, 123, ++ ++ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, ++ 111, 111 + } ; + + /* The intent behind this definition is that it'll catch +@@ -704,7 +698,7 @@ + */ + /* similar to SPARQL but no need for <= check here */ + +-#line 708 "turtle_lexer.c" ++#line 702 "turtle_lexer.c" + + #define INITIAL 0 + #define PREF 1 +@@ -791,6 +785,10 @@ + + void turtle_lexer_set_lineno (int line_number ,yyscan_t yyscanner ); + ++int turtle_lexer_get_column (yyscan_t yyscanner ); ++ ++void turtle_lexer_set_column (int column_no ,yyscan_t yyscanner ); ++ + /* Macros after this point can all be overridden by user definitions in + * section 1. + */ +@@ -823,12 +821,7 @@ + + /* Amount of stuff to slurp up with each read. */ + #ifndef YY_READ_BUF_SIZE +-#ifdef __ia64__ +-/* On IA-64, the buffer size is 16k, not 8k */ +-#define YY_READ_BUF_SIZE 16384 +-#else + #define YY_READ_BUF_SIZE 8192 +-#endif /* __ia64__ */ + #endif + + /* Copy whatever the last rule matched to the standard output. */ +@@ -847,7 +840,7 @@ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ +- size_t n; \ ++ unsigned n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ +@@ -945,7 +938,7 @@ + + + +-#line 949 "turtle_lexer.c" ++#line 942 "turtle_lexer.c" + + if ( !yyg->yy_init ) + { +@@ -998,13 +991,13 @@ + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 114 ) ++ if ( yy_current_state >= 112 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } +- while ( yy_current_state != 113 ); ++ while ( yy_current_state != 111 ); + yy_cp = yyg->yy_last_accepting_cpos; + yy_current_state = yyg->yy_last_accepting_state; + +@@ -1321,7 +1314,7 @@ + while(1) { + int c = yytext[yyleng - 1]; + if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' || +- c == ':' || c == '-') { ++ c == '=') { + yyleng--; + } else + break; +@@ -1398,7 +1391,7 @@ + #line 439 "./turtle_lexer.l" + YY_FATAL_ERROR( "flex scanner jammed" ); + YY_BREAK +-#line 1402 "turtle_lexer.c" ++#line 1395 "turtle_lexer.c" + case YY_STATE_EOF(INITIAL): + case YY_STATE_EOF(PREF): + yyterminate(); +@@ -1694,7 +1687,7 @@ + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 114 ) ++ if ( yy_current_state >= 112 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; +@@ -1723,11 +1716,11 @@ + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 114 ) ++ if ( yy_current_state >= 112 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; +- yy_is_jam = (yy_current_state == 113); ++ yy_is_jam = (yy_current_state == 111); + + return yy_is_jam ? 0 : yy_current_state; + } +@@ -2130,8 +2123,8 @@ + + /** Setup the input buffer state to scan the given bytes. The next call to turtle_lexer_lex() will + * scan from a @e copy of @a bytes. +- * @param yybytes the byte buffer to scan +- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. ++ * @param bytes the byte buffer to scan ++ * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +diff -ur ../../raptor2-2.0.3/src/turtle_lexer.h ./src/turtle_lexer.h +--- ../../raptor2-2.0.3/src/turtle_lexer.h 2011-05-31 21:14:41.000000000 +0200 ++++ ./src/turtle_lexer.h 2011-07-12 15:31:39.600648777 +0200 +@@ -58,6 +58,7 @@ + typedef unsigned char flex_uint8_t; + typedef unsigned short int flex_uint16_t; + typedef unsigned int flex_uint32_t; ++#endif /* ! C99 */ + + /* Limits of integral types. */ + #ifndef INT8_MIN +@@ -88,8 +89,6 @@ + #define UINT32_MAX (4294967295U) + #endif + +-#endif /* ! C99 */ +- + #endif /* ! FLEXINT_H */ + + #ifdef __cplusplus +@@ -132,15 +131,7 @@ + + /* Size of default input buffer. */ + #ifndef YY_BUF_SIZE +-#ifdef __ia64__ +-/* On IA-64, the buffer size is 16k, not 8k. +- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. +- * Ditto for the __ia64__ case accordingly. +- */ +-#define YY_BUF_SIZE 32768 +-#else + #define YY_BUF_SIZE 16384 +-#endif /* __ia64__ */ + #endif + + #ifndef YY_TYPEDEF_YY_BUFFER_STATE +@@ -274,6 +265,10 @@ + + void turtle_lexer_set_lineno (int line_number ,yyscan_t yyscanner ); + ++int turtle_lexer_get_column (yyscan_t yyscanner ); ++ ++void turtle_lexer_set_column (int column_no ,yyscan_t yyscanner ); ++ + /* Macros after this point can all be overridden by user definitions in + * section 1. + */ +@@ -300,12 +295,7 @@ + + /* Amount of stuff to slurp up with each read. */ + #ifndef YY_READ_BUF_SIZE +-#ifdef __ia64__ +-/* On IA-64, the buffer size is 16k, not 8k */ +-#define YY_READ_BUF_SIZE 16384 +-#else + #define YY_READ_BUF_SIZE 8192 +-#endif /* __ia64__ */ + #endif + + /* Number of entries by which start-condition stack grows. */ +@@ -341,6 +331,6 @@ + #line 439 "./turtle_lexer.l" + + +-#line 345 "turtle_lexer.h" ++#line 335 "turtle_lexer.h" + #undef turtle_lexer_IN_HEADER + #endif /* turtle_lexer_HEADER_H */ +diff -ur ../../raptor2-2.0.3/src/turtle_lexer.l ./src/turtle_lexer.l +--- ../../raptor2-2.0.3/src/turtle_lexer.l 2011-05-31 21:14:36.000000000 +0200 ++++ ./src/turtle_lexer.l 2011-07-12 15:28:58.911660781 +0200 +@@ -345,7 +345,7 @@ + yyterminate(); } + + +-{QUOTEDURI}[\ \t\v\n]*(":-")?[\ \t\v\n]*"{" { ++{QUOTEDURI}[\ \t\v\n]*("=")?[\ \t\v\n]*"{" { + raptor_stringbuffer* sb; + unsigned char* uri_string; + +@@ -377,11 +377,11 @@ + TURTLE_LEXER_OOM(); + return GRAPH_NAME_LEFT_CURLY; } + +-{QNAME}[\ \t\v\n]*(":-")?[\ \t\v\n]*"{" { ++{QNAME}[\ \t\v\n]*("=")?[\ \t\v\n]*"{" { + while(1) { + int c = yytext[yyleng - 1]; + if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' || +- c == ':' || c == '-') { ++ c == '=') { + yyleng--; + } else + break;
\ No newline at end of file diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 2200c4ea7..b4fa579c6 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 130397 2011-07-06 11:19:50Z andrea $ +# $Id: PKGBUILD 131270 2011-07-12 17:27:06Z andrea $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor pkgver=2.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64' 'mips64el') url="http://librdf.org/raptor" @@ -13,20 +13,22 @@ depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26') license=('LGPL') options=('!libtool') source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz" - 'fix-soprano-bug.patch') + 'Allow-instead-of-in-TRiG.patch') md5sums=('46eff4b20f8752d1146a3e0c8b2168dd' - 'fd63150d1e9f83bb59af0d86c373c8fa') + '73cfb0c1098ded4eff8c7f64bcaa5471') build() { cd ${srcdir}/raptor2-${pkgver} # see http://bugs.librdf.org/mantis/view.php?id=451 - patch -p1 -i "${srcdir}"/fix-soprano-bug.patch + patch -p1 -i "${srcdir}"/Allow-instead-of-in-TRiG.patch # fix build with curl >= 7.21.2 sed -i '/#include <curl\/types.h>/d' src/raptor_internal.h - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr \ + --disable-static \ + --with-yajl=no make } diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD index 5475c3ecd..a4c2f02dc 100644 --- a/extra/squid/PKGBUILD +++ b/extra/squid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122870 2011-05-07 00:40:13Z kevin $ +# $Id: PKGBUILD 131635 2011-07-13 01:26:21Z kevin $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=squid -pkgver=3.1.12 +pkgver=3.1.14 pkgrel=1 pkgdesc="A full-featured Web proxy cache server." arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) install=squid.install source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch) -md5sums=('3b4979e4b44f46d4e13f50326c537d89' 'd213b0cc1db72b749bb8c88716fdab39' +md5sums=('8f82a451b04c3bf3c29202c548d2f2dd' 'd213b0cc1db72b749bb8c88716fdab39' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' '5e17df989e2a74e869790c066f61225b' '8e59089e4a8556fc18df51979f1cfbff') @@ -26,7 +26,7 @@ build() { sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure # fix compile errors with gcc 4.6 # http://bugs.squid-cache.org/show_bug.cgi?id=3178 - patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch + #patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch # fix cache_dir, cache_dir size, and effective group. sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in diff --git a/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch b/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch new file mode 100644 index 000000000..545072807 --- /dev/null +++ b/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch @@ -0,0 +1,133 @@ +commit 327ec9a67af653467b670115ebb3e26b00183c1d +Author: Sebastian Trueg <trueg@kde.org> +Date: Thu Jul 7 17:33:23 2011 +0200 + + Throttle the IndexCleaner the same way we do with the IndexScheduler. + + BUG: 276593 + +diff --git a/nepomuk/services/strigi/indexcleaner.cpp b/nepomuk/services/strigi/indexcleaner.cpp +index 5c604ab..9198d0b 100644 +--- a/nepomuk/services/strigi/indexcleaner.cpp ++++ b/nepomuk/services/strigi/indexcleaner.cpp +@@ -47,7 +47,8 @@ using namespace Soprano::Vocabulary; + + + Nepomuk::IndexCleaner::IndexCleaner(QObject* parent) +- : KJob(parent) ++ : KJob(parent), ++ m_delay(0) + { + setCapabilities( Suspendable ); + } +@@ -268,7 +269,7 @@ void Nepomuk::IndexCleaner::slotRemoveResourcesDone(KJob* job) + + QMutexLocker lock(&m_stateMutex); + if( !m_suspended ) { +- clearNextBatch(); ++ QTimer::singleShot(m_delay, this, SLOT(clearNextBatch())); + } + } + +@@ -313,4 +314,9 @@ bool Nepomuk::IndexCleaner::doResume() + return true; + } + ++void Nepomuk::IndexCleaner::setDelay(int msecs) ++{ ++ m_delay = msecs; ++} ++ + #include "indexcleaner.moc" +diff --git a/nepomuk/services/strigi/indexcleaner.h b/nepomuk/services/strigi/indexcleaner.h +index e1c38ca..bf0713e 100644 +--- a/nepomuk/services/strigi/indexcleaner.h ++++ b/nepomuk/services/strigi/indexcleaner.h +@@ -41,6 +41,16 @@ namespace Nepomuk { + virtual bool doSuspend(); + virtual bool doResume(); + ++ public slots: ++ /** ++ * Set the delay between the cleanup queries. ++ * Used for throtteling the cleaner to not grab too ++ * many resources. Default is 0. ++ * ++ * \sa IndexScheduler::setIndexingSpeed() ++ */ ++ void setDelay(int msecs); ++ + private slots: + void clearNextBatch(); + void slotRemoveResourcesDone(KJob* job); +@@ -52,6 +62,7 @@ namespace Nepomuk { + + QMutex m_stateMutex; + bool m_suspended; ++ int m_delay; + }; + } + +diff --git a/nepomuk/services/strigi/indexscheduler.cpp b/nepomuk/services/strigi/indexscheduler.cpp +index 3c92657..f3c6c36 100644 +--- a/nepomuk/services/strigi/indexscheduler.cpp ++++ b/nepomuk/services/strigi/indexscheduler.cpp +@@ -208,7 +208,7 @@ Nepomuk::IndexScheduler::IndexScheduler( QObject* parent ) + : QObject( parent ), + m_suspended( false ), + m_indexing( false ), +- m_speed( FullSpeed ) ++ m_indexingDelay( 0 ) + { + m_cleaner = new IndexCleaner(this); + connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) ); +@@ -266,7 +266,13 @@ void Nepomuk::IndexScheduler::setSuspended( bool suspended ) + void Nepomuk::IndexScheduler::setIndexingSpeed( IndexingSpeed speed ) + { + kDebug() << speed; +- m_speed = speed; ++ m_indexingDelay = 0; ++ if ( speed != FullSpeed ) { ++ m_indexingDelay = (speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay; ++ } ++ if( m_cleaner ) { ++ m_cleaner->setDelay(m_indexingDelay); ++ } + } + + +@@ -481,11 +487,7 @@ bool Nepomuk::IndexScheduler::analyzeDir( const QString& dir_, Nepomuk::IndexSch + void Nepomuk::IndexScheduler::callDoIndexing() + { + if( !m_suspended ) { +- uint delay = 0; +- if ( m_speed != FullSpeed ) { +- delay = (m_speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay; +- } +- QTimer::singleShot( delay, this, SLOT(doIndexing()) ); ++ QTimer::singleShot( m_indexingDelay, this, SLOT(doIndexing()) ); + } + } + +diff --git a/nepomuk/services/strigi/indexscheduler.h b/nepomuk/services/strigi/indexscheduler.h +index 9ae1f18..8756206 100644 +--- a/nepomuk/services/strigi/indexscheduler.h ++++ b/nepomuk/services/strigi/indexscheduler.h +@@ -121,8 +121,6 @@ namespace Nepomuk { + SnailPace + }; + +- IndexingSpeed currentSpeed() const { return m_speed; } +- + public Q_SLOTS: + void suspend(); + void resume(); +@@ -226,7 +224,7 @@ namespace Nepomuk { + QString m_currentFolder; + KUrl m_currentUrl; + +- IndexingSpeed m_speed; ++ int m_indexingDelay; + IndexCleaner* m_cleaner; + }; + diff --git a/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch b/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch new file mode 100644 index 000000000..31ea4a606 --- /dev/null +++ b/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch @@ -0,0 +1,55 @@ +Index: kdemultimedia/kmix/backends/mixer_pulse.cpp +=================================================================== +--- kdemultimedia/kmix/backends/mixer_pulse.cpp (revision 1241345) ++++ kdemultimedia/kmix/backends/mixer_pulse.cpp (revision 1241346) +@@ -754,7 +754,12 @@ + return; + } + addDevice((*map)[index]); +- emit controlsReconfigured(_mixer->id()); ++ // Do not emit directly to ensure all connected slots are executed ++ // in their own event loop. ++ QMetaObject::invokeMethod(this, ++ "controlsReconfigured", ++ Qt::QueuedConnection, ++ Q_ARG(QString, _mixer->id())); + } + + void Mixer_PULSE::removeWidget(int index) +@@ -778,7 +783,12 @@ + { + delete *iter; + m_mixDevices.erase(iter); +- emit controlsReconfigured(_mixer->id()); ++ // Do not emit directly to ensure all connected slots are executed ++ // in their own event loop. ++ QMetaObject::invokeMethod(this, ++ "controlsReconfigured", ++ Qt::QueuedConnection, ++ Q_ARG(QString, _mixer->id())); + return; + } + } +@@ -799,7 +809,12 @@ + delete *iter; + m_mixDevices.erase(iter); + } +- emit controlsReconfigured(_mixer->id()); ++ // Do not emit directly to ensure all connected slots are executed ++ // in their own event loop. ++ QMetaObject::invokeMethod(this, ++ "controlsReconfigured", ++ Qt::QueuedConnection, ++ Q_ARG(QString, _mixer->id())); + } + + void Mixer_PULSE::addDevice(devinfo& dev) +@@ -990,7 +1005,7 @@ + kDebug(67100) << "Using PulseAudio for mixer: " << m_mixerName; + m_isOpen = true; + } +- ++ + return 0; + } + diff --git a/testing/dirmngr/PKGBUILD b/testing/dirmngr/PKGBUILD new file mode 100644 index 000000000..49f81d6f4 --- /dev/null +++ b/testing/dirmngr/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 131241 2011-07-12 07:38:53Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=dirmngr +pkgver=1.1.0 +pkgrel=2 +pkgdesc="A daemon to handle CRL and certificate requests" +arch=('i686' 'x86_64') +license=('GPL') +url="ftp://ftp.gnupg.org/gcrypt/dirmngr" +depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +install=dirmngr.install + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib + make + make DESTDIR=$pkgdir install +} +md5sums=('f2570f0248f5947daac200e85291b328') diff --git a/testing/dirmngr/dirmngr.install b/testing/dirmngr/dirmngr.install new file mode 100644 index 000000000..e26e0e7fd --- /dev/null +++ b/testing/dirmngr/dirmngr.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(dirmngr.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/gpgme/PKGBUILD b/testing/gpgme/PKGBUILD new file mode 100644 index 000000000..3593bb5e7 --- /dev/null +++ b/testing/gpgme/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 131247 2011-07-12 07:42:52Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: Sarah Hay <sarah@archlinux.org> + +pkgname=gpgme +pkgver=1.3.1 +pkgrel=1 +pkgdesc="A C wrapper library for GnuPG" +arch=('i686' 'x86_64') +url="http://www.gnupg.org/related_software/gpgme/" +license=('GPL') +depends=('libgpg-error' 'pth' 'gnupg' 'gnupg2') +install=${pkgname}.install +options=('!libtool' '!emptydirs') +source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2) + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install || return 1 + rm ${pkgdir}/usr/share/info/dir + gzip ${pkgdir}/usr/share/info/* +} +md5sums=('90afa8436ce2b2683c001c824bd22601') diff --git a/testing/gpgme/gpgme.install b/testing/gpgme/gpgme.install new file mode 100644 index 000000000..b54620d9a --- /dev/null +++ b/testing/gpgme/gpgme.install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(gpgme.info gpgme.info-1 gpgme.info-2) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/testing/libassuan/PKGBUILD b/testing/libassuan/PKGBUILD new file mode 100644 index 000000000..29aa66536 --- /dev/null +++ b/testing/libassuan/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 131235 2011-07-12 07:35:37Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=libassuan +pkgver=2.0.2 +pkgrel=1 +pkgdesc="A IPC library used by some GnuPG related software" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnupg.org/related_software/libassuan" +depends=('libgpg-error') +options=('!libtool') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +install=libassuan.install + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} +md5sums=('3e7d00fd2ee8a0b9c51ac7616ef3f1ec') diff --git a/testing/libassuan/libassuan.install b/testing/libassuan/libassuan.install new file mode 100644 index 000000000..07e2672db --- /dev/null +++ b/testing/libassuan/libassuan.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(assuan.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/libksba/PKGBUILD b/testing/libksba/PKGBUILD new file mode 100644 index 000000000..b70d1b1fd --- /dev/null +++ b/testing/libksba/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 131238 2011-07-12 07:37:20Z tpowa $ +# Maintainer: damir <damir@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=libksba +pkgver=1.0.8 +pkgrel=2 +pkgdesc="Libksba is a CMS and X.509 access library" +arch=(i686 x86_64) +license=('GPL') +url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba" +depends=('bash' 'libgpg-error' 'glibc') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +options=(!libtool) +install=libksba.install + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr + make + make DESTDIR=$startdir/pkg install +} +md5sums=('8acac0b3cbd0030dfc6d0f6a58c9b5b2') diff --git a/testing/libksba/libksba.install b/testing/libksba/libksba.install new file mode 100644 index 000000000..3715b8960 --- /dev/null +++ b/testing/libksba/libksba.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(ksba.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/pinentry/PKGBUILD b/testing/pinentry/PKGBUILD new file mode 100644 index 000000000..71baf5bdc --- /dev/null +++ b/testing/pinentry/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 131244 2011-07-12 07:40:08Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=pinentry +pkgver=0.8.1 +pkgrel=2 +pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnupg.org/aegypten2" +depends=('ncurses' 'libcap>=2.16') +makedepends=('gtk' 'qt3' 'gtk2' 'qt') +optdepends=('gtk: for gtk backend' + 'gtk2: for gtk2 backend' + 'qt3: for qt3 backend' + 'qt: for qt4 backend') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz + gtk2-pinentry-segfault.patch) +install=pinentry.install + +build() { + cd $startdir/src/$pkgname-$pkgver + [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh + for file in qt4/*.moc; do + /usr/bin/moc ${file/.moc/.h} > ${file} + done + ./configure --prefix=/usr \ + --enable-pinentry-curses \ + --enable-pinentry-gtk \ + --enable-pinentry-gtk2 \ + --enable-pinentry-qt \ + --enable-pinentry-qt4 \ + --enable-fallback-curses + make + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/share/info/dir + rm ${pkgdir}/usr/bin/pinentry + ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry +} +md5sums=('81f99904daee5331eb6738408bb024b6' + 'bd9888fafc56464b2c4deaad5b8edb07') diff --git a/testing/pinentry/gtk2-pinentry-segfault.patch b/testing/pinentry/gtk2-pinentry-segfault.patch new file mode 100644 index 000000000..c0b9fb4ca --- /dev/null +++ b/testing/pinentry/gtk2-pinentry-segfault.patch @@ -0,0 +1,11 @@ +--- gtk+-2/pinentry-gtk-2.c.orig 2010-03-03 05:19:55.000000000 -0600 ++++ gtk+-2/pinentry-gtk-2.c 2010-07-07 00:11:30.413572124 -0500 +@@ -145,7 +145,7 @@ + { + gdk_keyboard_ungrab (gdk_event_get_time (event)); + /* Unmake window transient for the root window. */ +- gdk_window_set_transient_for (win->window, NULL); ++ gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR")); + } + + diff --git a/testing/pinentry/pinentry.install b/testing/pinentry/pinentry.install new file mode 100644 index 000000000..eed2c7124 --- /dev/null +++ b/testing/pinentry/pinentry.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(pinentry.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD new file mode 100644 index 000000000..3c4bc0767 --- /dev/null +++ b/testing/syslog-ng/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 131638 2011-07-13 03:09:27Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Aaron Griffin <aaron@archlinux.org> + +pkgname=syslog-ng +pkgver=3.2.4 +pkgrel=3 +pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" +arch=('i686' 'x86_64') +license=('GPL2') +groups=('base') +url="http://www.balabit.com/network-security/syslog-ng/" +depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk') +makedepends=('flex' 'pkg-config') +optdepends=('logrotate: for rotating log files') +provides=('logger') +options=('!libtool') +backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ + 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') +source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz + non-blocking-systemd-fds.patch + syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch) +md5sums=('5995f7dad0053a478b60a63f6f754203' + '25e43afe51eb2223c25168e3c3e7aaf6' + '344dddfff946300f5576b13a7e8ea19f' + '735636090be4582885974542d2a75855' + '8b4441343d859c2f01c2cf799a7e6f98' + '46e5dcff71f820d497898331a3f608fe') +sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1' + '73b83deae9a8b945dfb13adf331e6bf6f119b83e' + 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f' + 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' + '4481819762fd1b6f25903016a8878e63c0058fcb' + 'f093a09626a528d23f0f2aeece018cab15a735a9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # fix #22555 for kernels >=2.6.38 + patch -p1 -i ../cap_syslog.patch + + # fix systemd blocking FD bug + # https://bugzilla.balabit.com/show_bug.cgi?id=125 + patch -Np1 < "$srcdir/non-blocking-systemd-fds.patch" + + ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \ + --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \ + --enable-tcp-wrapper \ + --with-pidfile-dir=/var/run \ + --disable-spoof-source \ + --disable-tcp-wrapper \ + --enable-systemd + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d" + install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf" + install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng" + install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng" + install -Dm644 "doc/examples/syslog-ng.service" "$pkgdir/lib/systemd/system/syslog-ng.service" +} diff --git a/testing/syslog-ng/cap_syslog.patch b/testing/syslog-ng/cap_syslog.patch new file mode 100644 index 000000000..b6e6db6e4 --- /dev/null +++ b/testing/syslog-ng/cap_syslog.patch @@ -0,0 +1,101 @@ +diff --git a/lib/gprocess.h b/lib/gprocess.h +index cda35b0..5c449f7 100644 +--- a/lib/gprocess.h ++++ b/lib/gprocess.h +@@ -28,9 +28,14 @@ + #include "syslog-ng.h" + + #include <sys/types.h> ++#include <sys/utsname.h> + + #if ENABLE_LINUX_CAPS + # include <sys/capability.h> ++# ++# ifndef CAP_SYSLOG ++# define CAP_SYSLOG 34 ++# endif + #endif + + typedef enum +@@ -78,5 +83,8 @@ void g_process_finish(void); + + void g_process_add_option_group(GOptionContext *ctx); + ++extern int kernel_version; ++extern void get_kernel_version(void); ++#define LINUX_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z) + + #endif +diff --git a/modules/affile/affile.c b/modules/affile/affile.c +index e145324..886fa72 100644 +--- a/modules/affile/affile.c ++++ b/modules/affile/affile.c +@@ -59,7 +59,12 @@ affile_open_file(gchar *name, gint flags, + if (privileged) + { + g_process_cap_modify(CAP_DAC_READ_SEARCH, TRUE); +- g_process_cap_modify(CAP_SYS_ADMIN, TRUE); ++ if (!kernel_version) ++ get_kernel_version(); ++ if (kernel_version < LINUX_VERSION(2, 6, 38)) ++ g_process_cap_modify(CAP_SYS_ADMIN, TRUE); ++ else ++ g_process_cap_modify(CAP_SYSLOG, TRUE); + } + else + { +diff --git a/syslog-ng/main.c b/syslog-ng/main.c +index 9880c1f..ee5031b 100644 +--- a/syslog-ng/main.c ++++ b/syslog-ng/main.c +@@ -67,6 +67,7 @@ static gboolean syntax_only = FALSE; + static gboolean display_version = FALSE; + static gchar *ctlfilename = PATH_CONTROL_SOCKET; + static gchar *preprocess_into = NULL; ++int kernel_version; + + static volatile sig_atomic_t sig_hup_received = FALSE; + static volatile sig_atomic_t sig_term_received = FALSE; +@@ -363,6 +364,20 @@ version(void) + ON_OFF_STR(ENABLE_PACCT_MODULE)); + } + ++void ++get_kernel_version(void) { ++ static struct utsname uts; ++ int x = 0, y = 0, z = 0; ++ ++ if (uname(&uts) == -1) { ++ fprintf(stderr, "Unable to retrieve kernel version.\n"); ++ exit(1); ++ } ++ ++ sscanf(uts.release, "%d.%d.%d", &x, &y, &z); ++ kernel_version = LINUX_VERSION(x, y, z); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -379,9 +394,20 @@ main(int argc, char *argv[]) + * indicate readability. Enabling/disabling cap_sys_admin on every poll + * invocation seems to be too expensive. So I enable it for now. */ + +- g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," ++ if (!kernel_version) ++ get_kernel_version(); ++ if (kernel_version < LINUX_VERSION(2, 6, 34)) ++ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," + "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner=p " + "cap_sys_admin=ep"); ++ else if (kernel_version < LINUX_VERSION(2, 6, 38)) ++ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," ++ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," ++ "cap_sys_admin=p"); ++ else ++ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," ++ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," ++ "cap_syslog=p"); + ctx = g_option_context_new("syslog-ng"); + g_process_add_option_group(ctx); + msg_add_option_group(ctx); diff --git a/testing/syslog-ng/non-blocking-systemd-fds.patch b/testing/syslog-ng/non-blocking-systemd-fds.patch new file mode 100644 index 000000000..bd056088b --- /dev/null +++ b/testing/syslog-ng/non-blocking-systemd-fds.patch @@ -0,0 +1,32 @@ +From 2f214c4f87d944aa28d53e331a67b1fd88d9840f Mon Sep 17 00:00:00 2001 +From: Balazs Scheidler <bazsi@balabit.hu> +Date: Wed, 22 Jun 2011 12:50:53 +0200 +Subject: [PATCH] systemd: make sure the acquired fd is in non-blocking mode + +The fd acquired from systemd is in blocking mode, and syslog-ng +didn't explicitly set it to non-blocking, causing syslog-ng +to stall. This patch changes that, explicitly enables +O_NONBLOCK and O_CLOEXEC on systemd acquired fds. + +Reported-By: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> +Signed-off-by: Balazs Scheidler <bazsi@balabit.hu> +--- + modules/afsocket/afunix.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/modules/afsocket/afunix.c b/modules/afsocket/afunix.c +index cd9c205..9a4e37b 100644 +--- a/modules/afsocket/afunix.c ++++ b/modules/afsocket/afunix.c +@@ -108,6 +108,8 @@ afunix_sd_acquire_socket(AFSocketSourceDriver *s, gint *result_fd) + + if (*result_fd != -1) + { ++ g_fd_set_nonblock(*result_fd, TRUE); ++ g_fd_set_cloexec(*result_fd, TRUE); + msg_verbose("Acquired systemd socket", + evt_tag_str("filename", self->filename), + evt_tag_int("systemd-sock-fd", *result_fd), +-- +1.7.5.4 + diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..6e3362681 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.conf @@ -0,0 +1,92 @@ +@version: 3.2 +# +# /etc/syslog-ng/syslog-ng.conf +# + +options { + stats_freq (0); + flush_lines (0); + time_reopen (10); + log_fifo_size (1000); + long_hostnames(off); + use_dns (no); + use_fqdn (no); + create_dirs (no); + keep_hostname (yes); + perm(0640); + group("log"); +}; + +source src { + unix-dgram("/dev/log"); + internal(); + file("/proc/kmsg"); +}; + +destination d_authlog { file("/var/log/auth.log"); }; +destination d_syslog { file("/var/log/syslog.log"); }; +destination d_cron { file("/var/log/crond.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kernel { file("/var/log/kernel.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_news { file("/var/log/news.log"); }; +destination d_ppp { file("/var/log/ppp.log"); }; +destination d_debug { file("/var/log/debug.log"); }; +destination d_messages { file("/var/log/messages.log"); }; +destination d_errors { file("/var/log/errors.log"); }; +destination d_everything { file("/var/log/everything.log"); }; +destination d_iptables { file("/var/log/iptables.log"); }; +destination d_acpid { file("/var/log/acpid.log"); }; +destination d_console { usertty("root"); }; + +# Log everything to tty12 +destination console_all { file("/dev/tty12"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { program(syslog-ng); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kernel { facility(kern) and not filter(f_iptables); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_news { facility(news); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +filter f_ppp { facility(local2); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; +filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; +filter f_emergency { level(emerg); }; +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; +filter f_acpid { program("acpid"); }; + +log { source(src); filter(f_acpid); destination(d_acpid); }; +log { source(src); filter(f_authpriv); destination(d_authlog); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_cron); destination(d_cron); }; +log { source(src); filter(f_daemon); destination(d_daemon); }; +log { source(src); filter(f_kernel); destination(d_kernel); }; +log { source(src); filter(f_lpr); destination(d_lpr); }; +log { source(src); filter(f_mail); destination(d_mail); }; +log { source(src); filter(f_news); destination(d_news); }; +log { source(src); filter(f_ppp); destination(d_ppp); }; +log { source(src); filter(f_user); destination(d_user); }; +log { source(src); filter(f_uucp); destination(d_uucp); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); filter(f_messages); destination(d_messages); }; +log { source(src); filter(f_err); destination(d_errors); }; +log { source(src); filter(f_emergency); destination(d_console); }; +log { source(src); filter(f_everything); destination(d_everything); }; +log { source(src); filter(f_iptables); destination(d_iptables); }; + +# Log everything to tty12 +#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate new file mode 100644 index 000000000..e0e6929f2 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.logrotate @@ -0,0 +1,7 @@ +/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { + missingok + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true + endscript +} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc new file mode 100755 index 000000000..bb5320b2c --- /dev/null +++ b/testing/syslog-ng/syslog-ng.rc @@ -0,0 +1,63 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +checkconfig() { + syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf + if [ $? -gt 0 ]; then + stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)." + stat_fail + exit 0 + fi +} + +PID=`pidof -o %PPID /usr/sbin/syslog-ng` +case "$1" in + start) + stat_busy "Starting Syslog-NG" + checkconfig + [ -z "$PID" ] && /usr/sbin/syslog-ng + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon syslog-ng + stat_done + fi + ;; + stop) + stat_busy "Stopping Syslog-NG" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/syslog-ng.pid +# Removing stale syslog-ng.persist file. Its new location, as of 2.0.6-1, is /var/lib/syslog-ng/ + rm -f /var/syslog-ng.persist + rm_daemon syslog-ng + stat_done + fi + ;; + reload) + stat_busy "Reloading Syslog-NG configuration and re-opening log files" + if [ -z "$PID" ]; then + stat_fail + else + checkconfig + kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac +exit 0 |