Sat Dec 1 01:48:48 PST 2012

15 files changed, 169 insertions, 61 deletions

diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index bbeb27b28..a8b191b88 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165272 2012-08-14 19:57:06Z ronald $
+# $Id: PKGBUILD 172156 2012-11-30 08:00:25Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,13 +6,13 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.6.0
-pkgrel=1
+pkgrel=3
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'mesa')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
              'libmygpo-qt')
 optdepends=("libgpod: support for Apple iPod audio devices"
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 85df42f9e..d75d064e7 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165883 2012-09-02 19:21:35Z ronald $
+# $Id: PKGBUILD 172158 2012-11-30 10:06:04Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,14 +6,14 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=2.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen')
+             'cmake' 'automoc4' 'doxygen' 'mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('df4b879a95f4ccac4480c5161d66fb05d6fbefcd')
 
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 2628e71a0..464433ecb 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 172133 2012-11-29 19:39:59Z andyrtr $
+# $Id: PKGBUILD 172165 2012-11-30 14:16:13Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.1.11
-pkgrel=2
+pkgver=2.1.12
+pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
@@ -22,8 +22,8 @@ install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.sh
         dovecot.tmpfilesd)
-md5sums=('28443208243171423437daaf89db7e18'
-         'b3dd87d3dac492c172c0f399a82e88df'
+md5sums=('b575dfb5db954132f41e7c390e7e11ff'
+         '86abccd4ac989be71a33ff856b25057a'
          '587159e84e2da6f83d70b3c706ba87cc'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
@@ -79,7 +79,4 @@ package() {
   # systemd tmpfile
   install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d
   install -m 644  ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf
-  
-  # fix some missing quotes that make pigeonhole fail to build
-  sed -i "s:LIBDOVECOT_LOGIN=-ldovecot-login -lssl -lcrypto:LIBDOVECOT_LOGIN=\'-ldovecot-login -lssl -lcrypto \':" ${pkgdir}/usr/lib/dovecot/dovecot-config
 }
diff --git a/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch b/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch
new file mode 100644
index 000000000..8ad67ee74
--- /dev/null
+++ b/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch
@@ -0,0 +1,93 @@
+From dbd00cfc3805b6f1ff794f7de0b52b1a7893401f Mon Sep 17 00:00:00 2001
+From: Alexandre Bique <bique.alexandre@gmail.com>
+Date: Thu, 15 Nov 2012 20:43:41 +0100
+Subject: [PATCH 07/12] Check that added torrents from the disk are still on
+ the disk.
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ hefur/fs-tree-white-list.cc | 20 ++++++++++++++++++++
+ hefur/fs-tree-white-list.hh |  1 +
+ hefur/torrent-db.hh         |  4 +++-
+ 3 files changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/hefur/fs-tree-white-list.cc b/hefur/fs-tree-white-list.cc
+index f493e95..61714d0 100644
+--- a/hefur/fs-tree-white-list.cc
++++ b/hefur/fs-tree-white-list.cc
+@@ -54,10 +54,30 @@ namespace hefur
+   }
+ 
+   void
++  FsTreeWhiteList::check()
++  {
++    std::vector<m::StringRef> keys;
++    auto db = Hefur::instance().torrentDb();
++    m::SharedMutex::Locker locker(db->torrents_lock_);
++    db->torrents_.foreach([this, &keys] (Torrent::Ptr torrent) {
++        if (::strncmp(torrent->path().c_str(), root_.c_str(), root_.size()))
++          return;
++
++        struct ::stat st;
++        if (::stat(torrent->path().c_str(), &st) && errno == ENOENT)
++          keys.push_back(torrent->key());
++      });
++
++    for (auto it = keys.begin(); it != keys.end(); ++it)
++      db->torrents_.erase(*it);
++  }
++
++  void
+   FsTreeWhiteList::loopScan()
+   {
+     do {
+       scan();
++      check();
+     } while (!stop_.timedWait(m::time() + rescan_interval_));
+   }
+ }
+diff --git a/hefur/fs-tree-white-list.hh b/hefur/fs-tree-white-list.hh
+index c32bcd4..643fb78 100644
+--- a/hefur/fs-tree-white-list.hh
++++ b/hefur/fs-tree-white-list.hh
+@@ -30,6 +30,7 @@ namespace hefur
+      * When a .torrent is found, call TorrentDb::addTorrent().
+      */
+     void scan();
++    void check();
+ 
+   private:
+     /**
+diff --git a/hefur/torrent-db.hh b/hefur/torrent-db.hh
+index a1e5d38..e25ed33 100644
+--- a/hefur/torrent-db.hh
++++ b/hefur/torrent-db.hh
+@@ -17,6 +17,7 @@ namespace hefur
+ {
+   class StatHandler;
+   class PeersHandler;
++  class FsTreeWhiteList;
+ 
+   /**
+    * This is the "in memory" torrent database.
+@@ -63,6 +64,7 @@ namespace hefur
+     friend class StatHandler;
+     friend class PeersHandler;
+     friend class FileHandler;
++    friend class FsTreeWhiteList;
+ 
+     /** helper to use torrent->key() as a key for the trie */
+     static inline m::StringRef torrentKey(Torrent::Ptr torrent) {
+@@ -77,7 +79,7 @@ namespace hefur
+     m::Future<bool> cleanup_stop_;
+     m::Thread       cleanup_thread_;
+     m::SharedMutex  torrents_lock_;
+-    torrents_type        torrents_;
++    torrents_type   torrents_;
+   };
+ }
+ 
+-- 
+1.8.0.1
+
diff --git a/extra/hefur/PKGBUILD b/extra/hefur/PKGBUILD
index 09db3f623..7b593a50c 100644
--- a/extra/hefur/PKGBUILD
+++ b/extra/hefur/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169811 2012-10-29 22:16:57Z thomas $
+# $Id: PKGBUILD 172176 2012-11-30 21:59:44Z thomas $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Alexandre Bique <bique.alexandre@gmail.com>
 
 pkgname=hefur
 pkgver=0.3
-pkgrel=3
+pkgrel=4
 pkgdesc='A standalone and lightweight BitTorrent tracker'
 arch=('i686' 'x86_64')
 url='http://github.com/abique/hefur'
@@ -12,12 +12,18 @@ license=('MIT')
 makedepends=('cmake')
 depends=('gnutls' 'xz')
 source=("https://github.com/downloads/abique/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'hefurd.service')
+        'hefurd.service'
+        'Check-that-added-torrents-from-the-disk-are-still-on.patch'
+        'Replace-by-amp-in-stat.html.patch')
 md5sums=('446ca4e659ce0ca3c8f32b0990ee7f5f'
-         'fec6d1a7a96bd6c5605d5316fec4fc2f')
+         '731d5be04d74a52541450b5127abeff3'
+         'f912a75467a30251403923c0a7abe049'
+         'f11af93e9a8074c8ba73f7a47e978362')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
+	patch -p1 -i ${srcdir}/Check-that-added-torrents-from-the-disk-are-still-on.patch
+	patch -p1 -i ${srcdir}/Replace-by-amp-in-stat.html.patch
 	mkdir build
 	cd build
 	cmake -DCMAKE_INSTALL_PREFIX=/usr ..
diff --git a/extra/hefur/Replace-by-amp-in-stat.html.patch b/extra/hefur/Replace-by-amp-in-stat.html.patch
new file mode 100644
index 000000000..a11406a2f
--- /dev/null
+++ b/extra/hefur/Replace-by-amp-in-stat.html.patch
@@ -0,0 +1,27 @@
+From 6986df22d293b7a149f51d4d8ba4a995645a4560 Mon Sep 17 00:00:00 2001
+From: Alexandre Bique <bique.alexandre@gmail.com>
+Date: Sun, 4 Nov 2012 14:08:47 +0100
+Subject: [PATCH 03/12] Replace & by &amp; in stat.html.
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ www/tpl/stat.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/www/tpl/stat.html b/www/tpl/stat.html
+index 3234679..1e3b148 100644
+--- a/www/tpl/stat.html
++++ b/www/tpl/stat.html
+@@ -21,7 +21,7 @@
+     {{*torrents}}
+     <tr>
+       <td>
+-        <a href="magnet:?xt=urn:btih:{{info_sha1|b16}}&dn={{name|u}}&tr={{tracker_udp|u}}&tr={{tracker_http|u}}"
++        <a href="magnet:?xt=urn:btih:{{info_sha1|b16}}&amp;dn={{name|u}}&amp;tr={{tracker_udp|u}}&amp;tr={{tracker_http|u}}"
+            title="Magnet link">
+           <img src="/img/magnet-icon.gif"/>
+         </a>
+-- 
+1.8.0.1
+
diff --git a/extra/hefur/hefurd.service b/extra/hefur/hefurd.service
index cdfc461ab..a5766225f 100644
--- a/extra/hefur/hefurd.service
+++ b/extra/hefur/hefurd.service
@@ -6,6 +6,7 @@ After=network.target
 ExecStart=/usr/bin/hefurd -torrent-dir /var/lib/hefurd
 User=nobody
 Group=nobody
+CPUSchedulingPolicy=batch
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD
index d2ceb9a2c..de2d548bb 100644
--- a/extra/ltrace/PKGBUILD
+++ b/extra/ltrace/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 170791 2012-11-11 15:22:36Z foutrelis $
+# $Id: PKGBUILD 172160 2012-11-30 11:07:55Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ltrace
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="Tracks runtime library calls in dynamically linked programs"
 arch=('i686' 'x86_64')
 url="http://ltrace.alioth.debian.org/"
 license=('GPL')
 depends=('elfutils')
+makedepends=('dejagnu')
 backup=('etc/ltrace.conf')
-source=(https://alioth.debian.org/frs/download.php/3822/$pkgname-$pkgver.tar.bz2)
-sha256sums=('5438ce286f072f0e0448db046657466f9bd142600013329063aecf7cf809fd10')
+source=(https://alioth.debian.org/frs/download.php/3844/$pkgname-$pkgver.tar.bz2)
+sha256sums=('9010ab85444c44e2f1b340049b6ce877e41566996f0045af9519ad056ae9b83d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -24,14 +25,16 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make -k check
+}
+
 package(){
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-
-  # ltrace.conf.5 needs to be installed to man5 (fixed in upstream git repo)
-  install -d "$pkgdir/usr/share/man/man5"
-  mv "$pkgdir/usr/share/man/man"{1/ltrace.conf.1,5/ltrace.conf.5}
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 45de7f3cc..d0712b912 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172134 2012-11-29 19:40:00Z andyrtr $
+# $Id: PKGBUILD 172166 2012-11-30 14:16:14Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,12 +7,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.1.11
+_dcpkgver=2.1.12
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
 arch=('i686' 'x86_64')
 url="http://pigeonhole.dovecot.org/"
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 77bd108c3..81bc33e83 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171529 2012-11-18 11:57:31Z andrea $
+# $Id: PKGBUILD 172171 2012-11-30 15:30:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.3
-pkgrel=6
+pkgver=4.8.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -19,20 +19,14 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop'
         'improve-cups-support.patch'
-        'fix-crash-in-assistant.patch'
-        'disable-ssl-compression.patch'
-        'fix-qtscript-crash.patch'
-        'qsortfilterproxymodel.patch')
-md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
-         'fc211414130ab2764132e7370f8e5caa'
-         '85179f5e0437514f8639957e1d8baf62'
-         'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
+        'fix-crash-in-assistant.patch')
+md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+         'f1837a03fd0ebbd2da58975845f278e3'
+         '480fea1ed076992b688373c8db274be0'
+         '5595c24d5bb942c21e3a4d299e6d0bf1'
+         '824a3b77a25e98567f640e0441ccdebc'
          'c439c7731c25387352d8453ca7574971'
-         '57590084078b6379f0501f7728b02ae2'
-         '94e9e433342018bf35e8d6d968b7432c'
-         '71579422635e9343665de1c1ba5a3f91'
-         'cd550cd628d10459128ca5f231ca6d3f')
+         '57590084078b6379f0501f7728b02ae2')
 
 build() {
   cd ${_pkgfqn}
@@ -43,15 +37,6 @@ build() {
   # (FS#29469)
   patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
 
-  # Security fix
-  patch -p1 -i "${srcdir}"/disable-ssl-compression.patch
-
-  # QTBUG#27322
-  patch -p1 -i "${srcdir}"/fix-qtscript-crash.patch
-  
-  # QTBUG#27122
-  patch -p1 -i "${srcdir}"/qsortfilterproxymodel.patch
-  
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
diff --git a/extra/qt/assistant.desktop b/extra/qt/assistant.desktop
index a9e98c44b..37ff84b44 100644
--- a/extra/qt/assistant.desktop
+++ b/extra/qt/assistant.desktop
@@ -4,6 +4,5 @@ Comment=Shows Qt documentation and examples
 Exec=/usr/bin/assistant
 Icon=assistant
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;Documentation;
diff --git a/extra/qt/designer.desktop b/extra/qt/designer.desktop
index 9b7b6e9aa..f0b381d02 100644
--- a/extra/qt/designer.desktop
+++ b/extra/qt/designer.desktop
@@ -6,6 +6,5 @@ Exec=/usr/bin/designer
 Icon=designer
 MimeType=application/x-designer;
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;
diff --git a/extra/qt/linguist.desktop b/extra/qt/linguist.desktop
index 8cbe86599..3b203e0bd 100644
--- a/extra/qt/linguist.desktop
+++ b/extra/qt/linguist.desktop
@@ -5,6 +5,5 @@ Exec=/usr/bin/linguist
 Icon=linguist
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;
diff --git a/extra/qt/qtconfig.desktop b/extra/qt/qtconfig.desktop
index 46dcf9e3d..95770ff6a 100644
--- a/extra/qt/qtconfig.desktop
+++ b/extra/qt/qtconfig.desktop
@@ -4,7 +4,6 @@ Comment=Configure Qt behavior, styles, fonts
 Exec=/usr/bin/qtconfig
 Icon=qtlogo
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Settings;
 NoDisplay=true
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 6699cf306..cc3134130 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171096 2012-11-16 17:03:26Z andyrtr $
+# $Id: PKGBUILD 172167 2012-11-30 14:16:54Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.13
+pkgver=2.20.14
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3')
+sha256sums=('f85019afd5ddead6606bf89855d209d5369823a6e96b779fa956e0cc78d3b09b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"