Fri May 20 22:47:13 UTC 2011

10 files changed, 115 insertions, 43 deletions

diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD
index 2e1f2dd4e..13048e9d9 100644
--- a/extra/curl/PKGBUILD
+++ b/extra/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 120474 2011-04-24 01:23:51Z angvp $
+# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
@@ -6,12 +6,12 @@
 
 pkgname=curl
 pkgver=7.21.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
 license=('MIT')
-depends=('zlib' 'openssl' 'bash' 'ca-certificates')
+depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
 options=('!libtool')
 source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2
         curlbuild.h)
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 62c9797a6..d2cc35459 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 123419 2011-05-11 10:13:28Z bisson $
+# $Id: PKGBUILD 124340 2011-05-19 23:17:46Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=1.14
+pkgver=1.14.1
 pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('da8886b62aa46c8e85cbced73ef14d704ab66907')
+sha1sums=('4d35b14c41cd8a753e6d8d334bab216c69361688')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD
new file mode 100644
index 000000000..ddf30e72c
--- /dev/null
+++ b/extra/libssh2/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 124297 2011-05-19 05:00:38Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: ice-man <icemanf@gmail.com>
+
+pkgname=libssh2
+pkgver=1.2.7
+pkgrel=2
+pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
+url="http://www.libssh2.org/"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('openssl')
+makedepends=('zlib')
+options=('!libtool')
+source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('a5d78344886f1282e4008c09bf568076')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 1cde9ae89..4ab535225 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,11 +1,9 @@
-# $Id: PKGBUILD 107458 2011-01-25 20:51:09Z remy $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 124292 2011-05-19 04:47:01Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=2.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64')
 url="http://moc.daper.net/"
@@ -18,27 +16,32 @@ optdepends=('speex: for using the speex plugin'
 	    'libmpcdec: for using the musepack plugin' 
             'wavpack: for using the wavpack plugin' 
 	    'libmodplug: for using the modplug plugin')
-options=('!libtool' 'force')
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('647c770a5542a4ae5437386807a89796')
-sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db')
+options=('!libtool')
+source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \
+        gcc-undefined-symbols.diff curl-streams.diff)
+md5sums=('647c770a5542a4ae5437386807a89796'
+         'efacb8559e9145e15b0c25f8fa2a9d79'
+         'bb9be1e80762851c57075c99a612af2f')
+sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db'
+          'a811a4ac7e049914aab528d3f06a6be6634c2720'
+          'a58ca952d7f3b0ede19b95c53da96c090d0a94c4')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
-	sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
-	# Disabling aac to use the external ffmpeg to play them (FS#13164)
-	./configure --prefix=/usr --without-rcc --without-aac \
-	    --with-oss  --with-alsa  --with-jack --with-mp3 \
-	    --with-musepack --with-vorbis --with-flac --with-wavpack \
-	    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
-	    --with-samplerate --with-curl
-	make
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../gcc-undefined-symbols.diff
+  patch -p1 -i ../curl-streams.diff
+  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
+  sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
+# Disabling aac to use the external ffmpeg to play them (FS#13164)
+  ./configure --prefix=/usr --without-rcc --without-aac \
+    --with-oss  --with-alsa  --with-jack --with-mp3 \
+    --with-musepack --with-vorbis --with-flac --with-wavpack \
+    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
+    --with-samplerate --with-curl
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff
new file mode 100644
index 000000000..2dbc38d54
--- /dev/null
+++ b/extra/moc/curl-streams.diff
@@ -0,0 +1,28 @@
+diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c
+--- a/io_curl.c	2007-07-08 08:54:45.000000000 +0200
++++ b/io_curl.c	2011-05-18 09:09:40.000000000 +0200
+@@ -338,6 +338,8 @@
+ 			fd_set read_fds, write_fds, exc_fds;
+ 			int max_fd;
+ 			int ret;
++         long milliseconds;
++         struct timeval timeout;
+ 
+ 			logit ("Doing select()...");
+ 
+@@ -356,8 +358,14 @@
+ 			if (s->curl.wake_up_pipe[0] > max_fd)
+ 				max_fd = s->curl.wake_up_pipe[0];
+ 
++         curl_multi_timeout(s->curl.multi_handle, &milliseconds);
++         if(milliseconds <= 0)
++           milliseconds = 1000; /* just a cautionary default */
++         timeout.tv_sec = milliseconds / 1000;
++         timeout.tv_usec = (milliseconds % 1000) * 1000;
++
+ 			ret = select (max_fd + 1, &read_fds, &write_fds,
+-					&exc_fds, NULL);
++					&exc_fds, &timeout);
+ 
+ 			if (ret < 0 && errno == EINTR) {
+ 				logit ("Interrupted");
diff --git a/extra/moc/gcc-undefined-symbols.diff b/extra/moc/gcc-undefined-symbols.diff
new file mode 100644
index 000000000..09e9b8bda
--- /dev/null
+++ b/extra/moc/gcc-undefined-symbols.diff
@@ -0,0 +1,12 @@
+--- decoder.c~	2011-05-08 09:28:28.077137883 +0200
++++ decoder.c	2011-05-10 21:40:48.887941968 +0200
+@@ -259,6 +259,9 @@
+ 	for (i = 0; i < plugins_num; i++)
+ 		if (plugins[i].decoder->destroy)
+ 			plugins[i].decoder->destroy ();
++	for (i = 0; i < plugins_num; i++)
++		if (plugins[i].handle)
++                    lt_dlclose(plugins[i].handle);
+ 
+ 	if (lt_dlexit())
+ 		logit ("lt_exit() failed: %s", lt_dlerror());
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 6843a2881..d22a45cfd 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 123813 2011-05-13 12:45:42Z bisson $
+# $Id: PKGBUILD 124325 2011-05-19 16:07:15Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
 pkgver=2.8.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)'
 url='http://www.postfix.org/'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p
         'rc.d')
 sha1sums=('2604066f158f5327449960afd6334b996dc01799'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '050e6afc5886049682c945ce147b3c47fe113939')
+          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
 provides=('smtp-server' 'smtp-forwarder')
 replaces=('postfix-mysql' 'postfix-pgsql')
diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d
index 94ccc2af0..fa314bb84 100755
--- a/extra/postfix/rc.d
+++ b/extra/postfix/rc.d
@@ -4,24 +4,23 @@
 . /etc/rc.d/functions
 
 name=postfix
-PID=$(pidof -o %PPID /usr/lib/postfix/master)
 
 case "$1" in
 start)
 	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/postfix start &>/dev/null \
+	/usr/sbin/postfix start &>/dev/null \
 	&& { add_daemon $name; stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;
 stop)
 	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && /usr/sbin/postfix stop &>/dev/null \
+	/usr/sbin/postfix stop &>/dev/null \
 	&& { rm_daemon $name; stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;
 reload)
 	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
+	/usr/sbin/postfix reload &>/dev/null \
 	&& { stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
index 72c54c85e..033611f63 100644
--- a/extra/telepathy-qt4/PKGBUILD
+++ b/extra/telepathy-qt4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122345 2011-05-03 23:56:05Z andrea $
+# $Id: PKGBUILD 124315 2011-05-19 11:49:47Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt4
-pkgver=0.5.16
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ options=('!libtool')
 depends=('qt' 'telepathy-farsight')
 makedepends=('libxslt' 'python2' 'cmake')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('82e36c051c74d323b329f69ac2c5427f')
+md5sums=('2acb266af1a3f55f7104830ac8db2090')
 
 build() {
     cd "${srcdir}"
diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD
index 9758849a8..ba264dd3d 100644
--- a/extra/xfce4-settings/PKGBUILD
+++ b/extra/xfce4-settings/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112925 2011-03-07 18:53:16Z andyrtr $
+# $Id: PKGBUILD 124328 2011-05-19 16:30:23Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=xfce4-settings
-pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
 pkgdesc="Settings manager for xfce"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -16,7 +16,7 @@ makedepends=('intltool')
 optdepends=('libcanberra: for sound control')
 source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2
 	xfce4-settings-4.6.0.patch)
-md5sums=('0097476baadcc9bc9841d6b8e687b8eb'
+md5sums=('a45420fea20f29265ab6785cb1d07377'
          '3046732e5d73c9939e7674602eadb1e2')
 
 build() {