Tue Jun 14 22:59:43 UTC 2011

author: root <root@rshg047.dnsready.net> 2011-06-14 22:59:43 +0000
committer: root <root@rshg047.dnsready.net> 2011-06-14 22:59:43 +0000
commit: ba3afb3907fc927bd08713613d4a30a9479c715c (patch)
tree: 1f1353c475b7709a692e3d42a8ac9c2e0e8ad02a
parent: 7c64c5039335c73eaa1a402c417235e8ca9a5109 (diff)
40 files changed, 1023 insertions, 127 deletions
diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD
index b0e744e0e..713974d5f 100644
--- a/community/chicken/PKGBUILD
+++ b/community/chicken/PKGBUILD
@@ -2,15 +2,14 @@
 # Contributor: <david@pako.st>
 
 pkgname=chicken
-pkgver=4.6.0
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
 pkgdesc='A compiler for R5RS scheme, featuring handy extensions'
 arch=('i686' 'x86_64')
 url='http://www.call-with-current-continuation.org/'
 license=('BSD')
 depends=('gcc')
 source=("http://code.call-cc.org/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('538a93e786e550ad848a040bcd902184')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -25,12 +24,12 @@ build() {
 package() {
   cd ${pkgname}-${pkgver}
 
+  
+  # parallel builds are not supported..
+  export MAKEFLAGS="${MAKEFLAGS/-j?/}"
   make PLATFORM=linux PREFIX=/usr DESTDIR=${pkgdir} install
 
   install -D -m644 LICENSE \
     ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # should be a symbolic link not a copy otherwise ldconfig will cry
-  rm -f ${pkgdir}/usr/lib/libchicken.so
-  ln -s /usr/lib/libchicken.so.5 ${pkgdir}/usr/lib/libchicken.so
 }
+md5sums=('9389388fdf04c3c64de29633aae12539')
diff --git a/community/dar/PKGBUILD b/community/dar/PKGBUILD
index 6c3331934..fd4af6747 100644
--- a/community/dar/PKGBUILD
+++ b/community/dar/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 48698 2011-06-05 04:47:47Z shusmann $
+# $Id: PKGBUILD 49277 2011-06-13 15:55:00Z shusmann $
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=dar
 pkgver=2.4.0
-pkgrel=1
+pkgrel=3
 pkgdesc='A full featured command-line backup tool, short for Disk ARchive'
 arch=('i686' 'x86_64')
 url='http://dar.linux.free.fr/'
 license=('GPL')
 depends=('bzip2' 'lzo2' 'libgcrypt')
 optdepends=('perl: for running some samples')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('1e0e02d3c90cdaaaf2850eff25599fba')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+"patch-2.4.1_interim.patch.gz::http://sourceforge.net/tracker/download.php?group_id=65612&atid=511612&file_id=413935&aid=3312050")
+md5sums=('1e0e02d3c90cdaaaf2850eff25599fba'
+         '006ab95d969f32771940a3115dea8199')
 options=('!libtool')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  
+  patch -p2 < $srcdir/patch-2.4.1_interim.patch
   ./configure --prefix=/usr --sysconfdir=/etc 
   make 
 }
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index a07670b6c..bcfbce419 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-modules-extra-svn
-pkgver=59230
+pkgver=60246
 pkgrel=1
 pkgdesc="Extra gadgets for e17"
 arch=('i686' 'x86_64')
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index c8cd05745..9d8cabd17 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46667 2011-05-10 10:41:31Z rvanharen $
+# $Id: PKGBUILD 49239 2011-06-13 09:40:13Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-svn
-pkgver=59304
+pkgver=60263
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64')
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index 929de691d..23786e06e 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46193 2011-05-04 10:10:41Z rvanharen $
+# $Id: PKGBUILD 49234 2011-06-13 09:39:28Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e_dbus-svn
-pkgver=58954
+pkgver=60246
 pkgrel=1
 pkgdesc="dbus abstraction layer for e17"
 arch=('i686' 'x86_64')
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index a2b3ce343..3849eb2b9 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46641 2011-05-10 10:36:24Z rvanharen $
+# $Id: PKGBUILD 49213 2011-06-13 09:36:25Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ecore-svn
-pkgver=59292
+pkgver=60253
 pkgrel=1
 pkgdesc="Ecore is an abstraction layer for e17"
 arch=('i686' 'x86_64')
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index dfebb98dd..9f7c14bb9 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46654 2011-05-10 10:39:07Z rvanharen $
+# $Id: PKGBUILD 49224 2011-06-13 09:37:58Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=edje-svn
-pkgver=59305
+pkgver=60246
 pkgrel=1
 pkgdesc="A graphical design and layout library based on Evas"
 arch=('i686' 'x86_64')
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index 5e2430d82..b3bd228f2 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46164 2011-05-04 10:00:51Z rvanharen $
+# $Id: PKGBUILD 49203 2011-06-13 09:34:45Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eet-svn
-pkgver=58955
+pkgver=60246
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64')
diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD
index 5f54563fd..e24051922 100644
--- a/community/eeze-svn/PKGBUILD
+++ b/community/eeze-svn/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: bluebugs
 
 pkgname=eeze-svn
-pkgver=58668
+pkgver=60034
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64')
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index c00133004..f6a086d1e 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46188 2011-05-04 10:08:58Z rvanharen $
+# $Id: PKGBUILD 49229 2011-06-13 09:38:46Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=efreet-svn
-pkgver=58672
+pkgver=60246
 pkgrel=1
 pkgdesc="freedesktop.org specifications for e17"
 arch=('i686' 'x86_64')
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index f13808d17..b9c9bc4ee 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46627 2011-05-10 10:33:50Z rvanharen $
+# $Id: PKGBUILD 49198 2011-06-13 09:33:59Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eina-svn
-pkgver=59299
+pkgver=60246
 pkgrel=1
 pkgdesc="E17 file chunk reading/writing library"
 arch=('i686' 'x86_64')
diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD
index 7c849b2d2..f63153b71 100644
--- a/community/elementary-svn/PKGBUILD
+++ b/community/elementary-svn/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=elementary-svn
-pkgver=59308
+pkgver=60261
 pkgrel=1
 pkgdesc="Enlightenment's basic widget set"
 arch=('i686' 'x86_64')
diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD
index 8eca8df79..258c2a3db 100755
--- a/community/emprint-svn/PKGBUILD
+++ b/community/emprint-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41239 2011-03-04 22:20:13Z rvanharen $
+# $Id: PKGBUILD 49244 2011-06-13 09:42:08Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=emprint-svn
-pkgver=57490
+pkgver=60246
 pkgrel=1
 pkgdesc="screenshot module for e17"
 arch=('i686' 'x86_64')
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index 9f1b1a3de..059ad25c3 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46636 2011-05-10 10:35:23Z rvanharen $
+# $Id: PKGBUILD 49208 2011-06-13 09:35:30Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=evas-svn
-pkgver=59306
+pkgver=60260
 pkgrel=1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64')
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index cf0b1ccfa..d243c8c33 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=fotoxx
-pkgver=11.06
+pkgver=11.06.1
 pkgrel=1
 pkgdesc="A program for improving image files made with a digital camera"
 url="http://kornelix.squarespace.com/fotoxx"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils')
-optdepends=('mashup: for printing from within fotoxx' 'brasero: for burning')
+optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('e636e10f6a46f0a813e704f18eac3176')
+md5sums=('d485750bd0d808e5df41bddeae8de00c')
 install=fotoxx.install
 
 build() {
diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD
index 9ba6f1cf4..df63e9f89 100644
--- a/community/ldns/PKGBUILD
+++ b/community/ldns/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: mathieui <mathieui@mathieui.net>
 
 pkgname=ldns
-pkgver=1.6.9
+pkgver=1.6.10
 pkgrel=1
 pkgdesc='Fast DNS library with DNSSEC support, including tools such as Drill'
 arch=('i686' 'x86_64')
@@ -13,25 +13,25 @@ depends=('openssl')
 makedepends=('libpcap')
 optdepends=('libpcap: ldns-dpa tool')
 options=('!libtool')
-source=("http://www.nlnetlabs.nl/downloads/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('30d136792433bef44454dc1c70bf55449160c3ad')
+source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('7798a32c6f50a4fb7d56ddf772163dc1cb79c1a4')
 
 build() {
 	_conf='--prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-static=no --disable-rpath'
 
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure $_conf
 	make
-	make DESTDIR="$pkgdir" install
-	install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	make DESTDIR="${pkgdir}" install
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	cd drill
-	./configure $_conf --with-ldns="$pkgdir"
+	./configure $_conf --with-ldns="${pkgdir}"
 	make
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="${pkgdir}" install
 
 	cd ../examples
-	./configure $_conf --with-ldns="$pkgdir"
+	./configure $_conf --with-ldns="${pkgdir}"
 	make
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index e2d4aa951..4c92c4539 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49014 2011-06-09 17:05:59Z stativ $
+# $Id: PKGBUILD 49263 2011-06-13 14:27:33Z icelaya $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Initial contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
@@ -7,14 +7,14 @@ pkgver=0.8
 _pkgver=45d3e13eb94c
 _luxblend=9cb3fcee0be8
 _blender=2.57
-pkgrel=2
+pkgrel=3
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
 depends=('boost-libs' 'freeimage' 'openexr')
 optdepends=('blender: Blender exporter' 'qt: Qt GUI')
-makedepends=('cmake' 'boost' 'qt' 'luxrays')
+makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python')
 source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
         https://bitbucket.org/luxrender/luxblend25/get/$_luxblend.tar.bz2)
 md5sums=('0f2d856385db72131f51e44a7ee527fa'
@@ -23,9 +23,14 @@ md5sums=('0f2d856385db72131f51e44a7ee527fa'
 build() {
   cd "$srcdir"/luxrender-lux-$_pkgver
 
+  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
+
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=ON \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
     .
   make
 }
@@ -41,6 +46,7 @@ package() {
   install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons
   cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \
     "$pkgdir"/usr/share/blender/$_blender/scripts/addons
+  cp -a "$srcdir"/luxrender-lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch b/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch
new file mode 100644
index 000000000..a0c7e6c4d
--- /dev/null
+++ b/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch
@@ -0,0 +1,39 @@
+From 50b7344bc2cc941a43b3adfaebdc96dd1935e747 Mon Sep 17 00:00:00 2001
+From: Jonathan Ross Rogers <jrogers@socialserve.com>
+Date: Mon, 9 May 2011 18:16:29 -0400
+Subject: [PATCH] Cause qgit to use "git config" everywhere.
+
+Whenever starting up qgit, it pops up a dialog showing that git
+complained about the obsolete command "repo-config". This patch
+replaces remaining calls to "git repo-config" with "git config".
+
+Signed-off-by: Jonathan Ross Rogers <jrogers@socialserve.com>
+---
+ src/git.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/git.cpp b/src/git.cpp
+index 50e6dd3..8e9365c 100644
+--- a/src/git.cpp
++++ b/src/git.cpp
+@@ -427,7 +427,7 @@ void Git::setTextCodec(QTextCodec* tc) {
+ 	if (name == "Big5-HKSCS")
+ 		name = "Big5";
+ 
+-	run("git repo-config i18n.commitencoding " + name);
++	run("git config i18n.commitencoding " + name);
+ }
+ 
+ QTextCodec* Git::getTextCodec(bool* isGitArchive) {
+@@ -437,7 +437,7 @@ QTextCodec* Git::getTextCodec(bool* isGitArchive) {
+ 		return NULL;
+ 
+ 	QString runOutput;
+-	if (!run("git repo-config --get i18n.commitencoding", &runOutput))
++	if (!run("git config --get i18n.commitencoding", &runOutput))
+ 		return NULL;
+ 
+ 	if (runOutput.isEmpty()) // git docs says default is utf-8
+-- 
+1.7.5
+
diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD
index f06f20937..696f3c03b 100644
--- a/community/qgit/PKGBUILD
+++ b/community/qgit/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 78123 2010-04-19 12:09:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 49264 2011-06-13 14:58:16Z schuay $
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=qgit
 pkgver=2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A GIT GUI viewer built on Qt/C++"
 url="http://digilander.libero.it/mcostalba/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('qt' 'git')
-options=(!makeflags !ccache) #makepkg3 options, ccache is a no-go
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'qgit.desktop' 'qgit.png')
+        'qgit.desktop' 'qgit.png'
+		'0001-Cause-qgit-to-use-git-config-everywhere.patch')
 md5sums=('1f6cd60cc1b92973718b108d542e3270'
          'ecb8b35e17163a7ec6893ffa71445c40'
-         '85138f44d577b03dfc738d3f27e04992')
+         '85138f44d577b03dfc738d3f27e04992'
+		 '8b8eda62d6f4d04ed57f87d4dbda9fa9')
 
 build() {
   cd ${srcdir}/${pkgname}
+  # patch taken from http://sourceforge.net/tracker/?func=detail&aid=3299672&group_id=139897&atid=744829
+  patch -Np1 < ${srcdir}/0001-Cause-qgit-to-use-git-config-everywhere.patch
   qmake qgit.pro
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}
-  install -Dm755 bin/qgit ${pkgdir}/usr/bin/qgit || return 1
-  install -Dm644 ${srcdir}/qgit.desktop ${pkgdir}/usr/share/applications/qgit.desktop || return 1
-  install -Dm644 ${srcdir}/qgit.png ${pkgdir}/usr/share/pixmaps/qgit.png || return 1
+  install -Dm755 bin/qgit ${pkgdir}/usr/bin/qgit
+  install -Dm644 ${srcdir}/qgit.desktop ${pkgdir}/usr/share/applications/qgit.desktop
+  install -Dm644 ${srcdir}/qgit.png ${pkgdir}/usr/share/pixmaps/qgit.png
 }
diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD
index 859c5d737..0e4920fe7 100644
--- a/extra/bochs/PKGBUILD
+++ b/extra/bochs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127306 2011-06-13 00:31:34Z kevin $
+# $Id: PKGBUILD 127309 2011-06-13 01:13:14Z kevin $
 #Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
@@ -9,14 +9,12 @@ pkgdesc="A portable x86 PC emulation software package"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://bochs.sourceforge.net/"
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-2.4.5-fetchcode.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 depends=('gcc-libs' 'libxrandr')
-# 'libxpm')
+sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  #patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch
   ./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \
               --enable-fpu --enable-3dnow 
   make
@@ -27,5 +25,3 @@ package() {
   make prefix=${pkgdir}/usr install
   install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt
 }
-sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9'
-            '3dba808614da7d0fa1a3d6ddaceabf027a873d1f45fb90ec43b8dce876baa8ff')
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index c8e7f282c..7c7951c04 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 63924 2010-01-19 03:33:08Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
+# $Id: PKGBUILD 127320 2011-06-13 04:06:23Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=icewm
-pkgver=1.2.37
-pkgrel=3
+pkgver=1.3.7
+pkgrel=1
 pkgdesc="A Window Manager designed for speed, usability, and consistency"
 arch=('i686' 'x86_64')
 url="http://www.icewm.org/"
 license=('LGPL')
-depends=('gcc-libs' 'imlib' 'libxrandr' 'libxft' 'libsm' 'libxinerama' 'giflib')
-source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz icewm.desktop)
-md5sums=('970a21588d26eb361020fd60a61a482c' 'a3ed467f0199792205b04272402a9945')
-sha1sums=('bee1ca66d2282888807551bc28a65b08e4108027' '7dcb1f2c89792a35b687182584ed9baa0d34cc80')
+depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
+makedepends=('xorg-mkfontdir')
+source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz)
+md5sums=('224695231aedb2b91db3254a13e1c8dd')
+sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure --prefix=/usr --sysconfdir=/etc --with-imlib \
-     --enable-shaped-decorations --enable-gradients || return 1
-   make || return 1
-   make DESTDIR="${pkgdir}" install install-man install-docs || return 1
-   install -D -m644 "${srcdir}/icewm.desktop" "${pkgdir}/etc/X11/sessions/icewm.desktop" || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-shaped-decorations --enable-gradients
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install install-man install-docs install-desktop
 }
diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD
index de378611e..8ac2de017 100644
--- a/extra/indent/PKGBUILD
+++ b/extra/indent/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 53903 2009-10-03 20:21:21Z eric $
+# $Id: PKGBUILD 127328 2011-06-13 05:26:28Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: aurelien <aurelien@archlinux.org>
 # Contributor: Herb Rose (hrose56@yahoo.com)
 
 pkgname=indent
-pkgver=2.2.10
-pkgrel=4
-pkgdesc="The GNU Pretty-printer"
+pkgver=2.2.11
+pkgrel=1
+pkgdesc="A tool to change the appearance of a C program by inserting or deleting whitespace"
 arch=('i686' 'x86_64')
 url="http://indent.isidore-it.eu/beautify.html"
-depends=('glibc' 'texinfo')
+depends=('glibc')
+makedepends=('texi2html')
 license=('GPL3')
 install=indent.install
-source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz)
-md5sums=('be35ea62705733859fbf8caf816d8959')
-sha1sums=('20fa8a7a4af6670c3254c8b87020291c3db37ed1')
+source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz indent-2.2.11-segfault.patch)
+md5sums=('98beafca62472805a3739d3867d5d70f'
+         'e5ded8513547ff4555dec2bb805dd2ab')
+sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
+          '31a6dcd5edcac4decac81dbb52bc9415b8b148e4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  # Fix doc install path
-  sed -i 's|^docdir = .*$|docdir = @docdir@|' doc/Makefile.in || return 1
-  
-  # Fix manpage installation
-  sed -i 's|\(info texinfo2man\)\.c  Makefile\.am|\1|' man/Makefile.in || return 1
-  rm man/indent.1
+  patch -p1 -i ../indent-2.2.11-segfault.patch
+  sed -i 's/-number/-number-sections/' doc/Makefile.in
+  ./configure --prefix=/usr
+  make
+}
 
-  ./configure --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/indent || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" docdir=/usr/share/doc/indent install
 }
diff --git a/extra/indent/indent-2.2.11-segfault.patch b/extra/indent/indent-2.2.11-segfault.patch
new file mode 100644
index 000000000..e91922480
--- /dev/null
+++ b/extra/indent/indent-2.2.11-segfault.patch
@@ -0,0 +1,16 @@
+--- a/man/texinfo2man.c
++++ b/man/texinfo2man.c
+@@ -287,6 +287,13 @@
+    char buf[1024];
+    int line_no = 0;
+ 
++   if (argc != 3)
++   {
++      fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++      fprintf(stderr, "  The man page will be written to stdout.\n");
++      return -1;
++   }
++
+    texinfoname = argv[2];
+ 
+    in = fopen (argv[2], "r");
diff --git a/extra/indent/indent.install b/extra/indent/indent.install
index c48622c55..c5a87a6d9 100644
--- a/extra/indent/indent.install
+++ b/extra/indent/indent.install
@@ -1,7 +1,8 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
 info_file=indent.info.gz
 
 post_install() {
+    [ -x usr/bin/install-info ] || return 0
     install-info ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
 }
 
@@ -10,5 +11,6 @@ post_upgrade() {
 }
 
 pre_remove() {
+    [ -x usr/bin/install-info ] || return 0
     install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
 }
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index f33702fb4..7cdcf8bfa 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 111439 2011-02-26 20:12:41Z heftig $
+# $Id: PKGBUILD 127369 2011-06-13 20:26:40Z eric $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=lcms2
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc="Small-footprint color management engine, version 2"
 arch=(i686 x86_64)
-license=('custom')
+license=('MIT')
 depends=('libtiff>=3.9.4')
 url="http://www.littlecms.com"
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/lcms/$pkgname-$pkgver.tar.gz)
-md5sums=('08036edb115ad74456dfa20b1998b5f4')
+md5sums=('aaf33c7c25675e6163189ba488ae20f5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index 3961405be..76b468174 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96222 2010-10-19 12:09:31Z giovanni $
+# $Id: PKGBUILD 127374 2011-06-14 00:06:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
 # Contributor: Ralf Barth <archlinux.org@haggy.org>
 
 pkgname=smartmontools
-pkgver=5.40
+pkgver=5.41
 pkgrel=1
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
 url="http://smartmontools.sourceforge.net"
@@ -17,25 +17,23 @@ backup=('etc/smartd.conf'
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
         smartd.conf
         smartd.rc)
-md5sums=('0f0be0239914ad87830a4fff594bda5b'
+md5sums=('4577886bea79d4ff12bd9a7d323ce692'
          '28c1b80c41dac52d433961dcfb4f70e0'
          'fb30e07f87f2c1d99532e018291ad3e8')
 
-build()
-{
+build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --enable-drivedb
-  make || return 1
+  make
 }
 
-package()
-{
+package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir}/ install || return 1
+  make DESTDIR=${pkgdir}/ install
   rm -rf ${pkgdir}/etc/rc.d
   install -Dm755 ${srcdir}/smartd.rc ${pkgdir}/etc/rc.d/smartd
   install -Dm644 ${srcdir}/smartd.conf ${pkgdir}/etc/conf.d/smartd
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index b29567abf..2d2aba652 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=audacious-plugins-libre
-pkgver=2.4.4
-pkgrel=3
+pkgver=2.5.1
+pkgrel=2
 pkgdesc='Plugins for Audacious without unfree plugins'
 arch=('i686' 'x86_64')
 url='http://audacious-media-player.org/'
@@ -74,8 +74,7 @@ build() {
 		--disable-adplug \
 		--disable-psf \
 		$extraopts \
-		--disable-projectm # no support for projectm-2.0.1, cf. FS#21344
-		                   # would require libvisual-projectm in make/optdeps
+
 	make
 }
 
@@ -83,4 +82,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums=('df761a2d07e2ad1221c5fe61fa32dcb0')
+md5sums=('510b325eb3b13621b6f0e6745f6d0961')
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index 0c0c0b6b1..f04ec2f47 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbasename=xchat
 pkgname=xchat-libre
 pkgver=2.8.8
-pkgrel=3.1
+pkgrel=7
 pkgdesc="A GTK+ based IRC client without non-free browser reference"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
@@ -12,20 +12,27 @@ provides=("xchat=$pkgver")
 replaces=('xchat')
 conflicts=('xchat')
 license=('GPL')
-depends=('gtk2' 'openssl' 'dbus-glib')
+depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify')
 makedepends=('tcl' 'perl' 'python2')
-optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' \
+optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
             'python2: for python plugin')
 options=('!libtool')
 changelog=ChangeLog
 source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz
+        xchat-2.8.8-libnotify07.patch
+        xchat-2.8.8-link-against-libnotify.patch
         remove-non-free-suggestion.patch
         no-firefox.patch)
 
 build() {
   cd "${srcdir}/${pkgbasename}-${pkgver}"
-  patch -p1 < ../remove-non-free-suggestion.patch
-  patch -p1 < ../no-firefox.patch
+  patch -Np1 -i ${srcdir}/remove-non-free-suggestion.patch
+  patch -Np1 -i ${srcdir}/no-firefox.patch
+  patch -Np1 -i ${srcdir}/xchat-2.8.8-libnotify07.patch
+  patch -Np1 -i ${srcdir}/xchat-2.8.8-link-against-libnotify.patch
+  autoconf
+  autoheader
+
   ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \
     --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static
   make
@@ -37,8 +44,7 @@ package() {
 }
 
 md5sums=('9a11f13121ff0af787bba3b014378e58'
-         '47c665961f11a803e9a12007811a04c9'
+         '8f0ba48dc3d151cd9b4fbef3255e8c95'
+         '805893e0d8f7c9713d703f34b6bb4b89'
+         'd0968310982fa9e30d43dd43536b7387'
          'ba11c3e889509d1b46307d6ebf74509c')
-sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
-          '05e673aa44813ddac8aabb251d5f0124efde91a2'
-          '3a1c115c4436bdfb1882bcf93dedbe0d40dad9ae')
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch
index 8b0f4e41f..943daff60 100644
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ b/libre/xchat-libre/remove-non-free-suggestion.patch
@@ -6,7 +6,7 @@ diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
  
  static char defaultconf_urlhandlers[] =
 -		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		"NAME Open Link in Web Browser\n"		"CMD !icecat 'openURL(%s)'\n\n";
++		"NAME Open Link in Web Browser\n"		"CMD !icecat '%s'\n\n";
  
  #ifdef USE_SIGACTION
  /* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
new file mode 100644
index 000000000..95d429542
--- /dev/null
+++ b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
@@ -0,0 +1,25 @@
+diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c
+--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07	2010-11-15 17:32:15.708325783 -0500
++++ xchat-2.8.8/src/fe-gtk/plugin-tray.c	2010-11-15 18:05:17.322141789 -0500
+@@ -125,8 +125,9 @@ static void *nn_mod = NULL;
+ /* prototypes */
+ static gboolean (*nn_init) (char *);
+ static void (*nn_uninit) (void);
+-static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
+-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
++/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
++ * extra NULL argument will be fine */
++static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
+ static gboolean (*nn_show) (void *noti, GError **error);
+ static void (*nn_set_timeout) (void *noti, gint timeout);
+ 
+@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
+ 			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
+ 			goto bad;
+-		if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
+-			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
+ 			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
+
diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
new file mode 100644
index 000000000..6dad938ea
--- /dev/null
+++ b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
@@ -0,0 +1,344 @@
+From: Christopher Aillon <caillon@redhat.com>
+Date: Thu, 7 Apr 2011 19:34:14 -0700
+Subject: [PATCH] Link directly against libnotify
+
+Dynamically loading the library isn't ideal since the soname
+can change silently on us.  Additionally, notify-send is
+shipped as part of libnotify, so we aren't actually bringing
+in a new dependency.  Since we'd need to patch the source and
+rebuild for new sonames anyway, there's little benefit to
+dynamically loading libnotify.
+
+Plus, this has the benefit of cleaning up the code, as well as
+ensuring we'll catch any future soname changes sooner.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=693362
+https://sourceforge.net/tracker/?func=detail&aid=3280223&group_id=239&atid=100239
+---
+ configure.in             |   23 +++++++
+ src/fe-gtk/plugin-tray.c |  144 ++++++++++-------------------------------------
+ 2 files changed, 55 insertions(+), 112 deletions(-)
+
+diff -p -U8 xchat-2.8.8/configure.in.libnotifyso4 xchat-2.8.8/configure.in
+--- xchat-2.8.8/configure.in.libnotifyso4	2010-05-29 23:01:16.000000000 -0700
++++ xchat-2.8.8/configure.in	2011-04-07 19:27:00.448137113 -0700
+@@ -34,16 +34,17 @@ AH_VERBATIM([PREFIX],[#undef PREFIX])
+ AH_VERBATIM([XCHATLIBDIR],[#undef XCHATLIBDIR])
+ AH_VERBATIM([XCHATSHAREDIR],[#undef XCHATSHAREDIR])
+ AH_VERBATIM([SOCKS],[#undef SOCKS])
+ AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY])
+ dnl AH_VERBATIM([USE_GNOME],[#undef USE_GNOME])
+ AH_VERBATIM([USE_SHM],[#undef USE_SHM])
+ AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL])
+ AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY])
++AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY])
+ AH_VERBATIM([USE_IPV6],[#undef USE_IPV6])
+ AH_VERBATIM([USE_MMX],[#undef USE_MMX])
+ AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL])
+ AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN])
+ AH_VERBATIM([USE_XFT],[#undef USE_XFT])
+ AH_VERBATIM([USE_XLIB],[#undef USE_XLIB])
+ AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION])
+ AH_VERBATIM([USING_FREEBSD],[#undef USING_FREEBSD])
+@@ -126,16 +127,20 @@ AC_ARG_ENABLE(tcl,
+ AC_ARG_ENABLE(plugin,
+ [  --disable-plugin        disable plugin support],
+         plugin=$enableval, plugin=yes)
+ 
+ AC_ARG_ENABLE(dbus,
+ [  --disable-dbus          disable DBUS support],
+         dbus=$enableval, dbus=yes)
+ 
++AC_ARG_ENABLE(libnotify,
++[  --disable-libnotify     disable libnotify support],
++        libnotify=$enableval, libnotify=yes)
++
+ AC_ARG_ENABLE(mmx,
+ [  --disable-mmx           disable MMX assembly routines],
+         mmx=$enableval, mmx=yes)
+ 
+ AC_ARG_ENABLE(shm,
+ [  --enable-shm            enable use of XShm for fast tinting (default: no)],
+         shm=$enableval, shm=no)
+ 
+@@ -482,16 +487,32 @@ if test "x$dbus" = "xyes" ; then
+ 
+ 		DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
+ 		AC_SUBST(DBUS_SERVICES_DIR)
+ 		AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
+ 	fi
+ fi
+ 
+ dnl *********************************************************************
++dnl ** LIBNOTIFY ********************************************************
++dnl *********************************************************************
++
++if test "x$libnotify" = "xyes" ; then
++	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [
++		AC_MSG_RESULT(no)
++		libnotify=no
++	])
++	if test "$libnotify" != "no" ; then
++		GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS"
++		GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS"
++		AC_DEFINE(USE_LIBNOTIFY)
++	fi
++fi
++
++dnl *********************************************************************
+ dnl ** SPELL ************************************************************
+ dnl *********************************************************************
+ 
+ if test "$spell" = "gtkspell" ; then
+ 	PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [
+ 		AC_MSG_RESULT(no)
+ 		spell=no
+ 	])
+@@ -519,16 +540,17 @@ if test "$spell" = "static" ; then
+ fi
+ 
+ dnl *********************************************************************
+ dnl ** CONDITIONALS *****************************************************
+ dnl *********************************************************************
+ 
+ AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
+ AM_CONDITIONAL(USE_LIBSEXY, test "x$spell" = "xstatic")
++AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
+ AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
+ AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
+ AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
+ AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
+ AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
+ AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
+ AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
+ AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
+@@ -807,16 +829,17 @@ echo mmx tinting ......... : $mmx\	spell
+ echo XShm tinting ........ : $shm\	plugin interface ...... : $plugin
+ if test "$xft" = no; then
+   echo text backend ........ : pango\	nls/gettext ........... : $USE_NLS
+ else
+   echo text backend ........ : xft\	nls/gettext ........... : $USE_NLS
+ fi
+ echo openssl support ..... : $openssl\	ipv6 support .......... : $ipv6
+ echo dbus support ........ : $dbus\	msproxy ntlm \(ISA\) .... : $have_ntlm
++echo libnotify support ... : $libnotify
+ echo
+ echo The binary will be installed in $prefix/bin
+ echo
+ 
+ if test "$gtkfe" = no; then
+ 	echo Warning: The GTK \(GUI\) frontend will not be built.
+ 	echo
+ fi
+diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe-gtk/plugin-tray.c
+--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4	2011-04-07 17:57:27.524307905 -0700
++++ xchat-2.8.8/src/fe-gtk/plugin-tray.c	2011-04-07 19:18:33.429475719 -0700
+@@ -10,17 +10,27 @@
+ #include "../common/fe.h"
+ #include "../common/util.h"
+ #include "fe-gtk.h"
+ #include "pixmaps.h"
+ #include "maingui.h"
+ #include "menu.h"
+ #include <gtk/gtk.h>
+ 
+-#define LIBNOTIFY
++#ifdef USE_LIBNOTIFY
++#include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++#if NOTIFY_CHECK_VERSION(0,7,0)
++#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c)
++#else
++#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c,d)
++#endif
++#endif
+ 
+ typedef enum	/* current icon status */
+ {
+ 	TS_NONE,
+ 	TS_MESSAGE,
+ 	TS_HIGHLIGHT,
+ 	TS_FILEOFFER,
+ 	TS_CUSTOM /* plugin */
+@@ -112,90 +122,16 @@ tray_count_networks (void)
+ 
+ void
+ fe_tray_set_tooltip (const char *text)
+ {
+ 	if (sticon)
+ 		gtk_status_icon_set_tooltip (sticon, text);
+ }
+ 
+-#ifdef LIBNOTIFY
+-
+-/* dynamic access to libnotify.so */
+-
+-static void *nn_mod = NULL;
+-/* prototypes */
+-static gboolean (*nn_init) (char *);
+-static void (*nn_uninit) (void);
+-/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
+- * extra NULL argument will be fine */
+-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
+-static gboolean (*nn_show) (void *noti, GError **error);
+-static void (*nn_set_timeout) (void *noti, gint timeout);
+-
+-static void
+-libnotify_cleanup (void)
+-{
+-	if (nn_mod)
+-	{
+-		nn_uninit ();
+-		g_module_close (nn_mod);
+-		nn_mod = NULL;
+-	}
+-}
+-
+-static gboolean
+-libnotify_notify_new (const char *title, const char *text, GtkStatusIcon *icon)
+-{
+-	void *noti;
+-
+-	if (!nn_mod)
+-	{
+-		nn_mod = g_module_open ("libnotify", G_MODULE_BIND_LAZY);
+-		if (!nn_mod)
+-		{
+-			nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY);
+-			if (!nn_mod)
+-				return FALSE;
+-		}
+-
+-		if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init))
+-			goto bad;
+-		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
+-			goto bad;
+-		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
+-			goto bad;
+-		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
+-			goto bad;
+-		if (!g_module_symbol (nn_mod, "notify_notification_set_timeout", (gpointer)&nn_set_timeout))
+-			goto bad;
+-		if (!nn_init (PACKAGE_NAME))
+-			goto bad;
+-	}
+-
+-	text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
+-	title = strip_color (title, -1, STRIP_ALL);
+-	noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
+-	g_free ((char *)title);
+-	g_free ((char *)text);
+-
+-	nn_set_timeout (noti, prefs.input_balloon_time*1000);
+-	nn_show (noti, NULL);
+-	g_object_unref (G_OBJECT (noti));
+-
+-	return TRUE;
+-
+-bad:
+-	g_module_close (nn_mod);
+-	nn_mod = NULL;
+-	return FALSE;
+-}
+-
+-#endif
+-
+ void
+ fe_tray_set_balloon (const char *title, const char *text)
+ {
+ #ifndef WIN32
+ 	const char *argv[8];
+ 	const char *path;
+ 	char time[16];
+ 	WinStatus ws;
+@@ -208,52 +144,36 @@ fe_tray_set_balloon (const char *title, 
+ 	/* bit 1 of flags means "no balloons unless hidden/iconified" */
+ 	if (ws != WS_HIDDEN && (prefs.gui_tray_flags & 2))
+ 		return;
+ 
+ 	/* FIXME: this should close the current balloon */
+ 	if (!text)
+ 		return;
+ 
+-#ifdef LIBNOTIFY
+-	/* try it via libnotify.so */
+-	if (libnotify_notify_new (title, text, sticon))
+-		return;	/* success */
+-#endif
++#ifdef USE_LIBNOTIFY
++	NotifyNotification *notification;
++	char *notify_text, *notify_title;
+ 
+-	/* try it the crude way */
+-	path = g_find_program_in_path ("notify-send");
+-	if (path)
+-	{
+-		sprintf(time, "%d000",prefs.input_balloon_time);
+-		argv[0] = path;
+-		argv[1] = "-i";
+-		argv[2] = "gtk-dialog-info";
+-		if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0)
+-			argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png";
+-		argv[3] = "-t";
+-		argv[4] = time;
+-		argv[5] = title;
+-		text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
+-		argv[6] = text;
+-		argv[7] = NULL;
+-		xchat_execv (argv);
+-		g_free ((char *)path);
+-		g_free ((char *)text);
+-	}
+-	else
+-	{
+-		/* show this error only once */
+-		static unsigned char said_it = FALSE;
+-		if (!said_it)
+-		{
+-			said_it = TRUE;
+-			fe_message (_("Cannot find 'notify-send' to open balloon alerts.\nPlease install libnotify."), FE_MSG_ERROR);
+-		}
+-	}
++	if (!notify_is_initted())
++		notify_init(PACKAGE_NAME);
++
++	notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
++	notify_title = strip_color (title, -1, STRIP_ALL);
++
++	notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
++
++	g_free ((char *)notify_title);
++	g_free ((char *)notify_text);
++
++	notify_notification_set_timeout (notification, prefs.input_balloon_time*1000);
++	notify_notification_show (notification, NULL);
++
++	g_object_unref (notification);
++#endif
+ #endif
+ }
+ 
+ static void
+ tray_set_balloonf (const char *text, const char *format, ...)
+ {
+ 	va_list args;
+ 	char *buf;
+@@ -840,13 +760,13 @@ tray_plugin_init (xchat_plugin *plugin_h
+ 	return 1;       /* return 1 for success */
+ }
+ 
+ int
+ tray_plugin_deinit (xchat_plugin *plugin_handle)
+ {
+ #ifdef WIN32
+ 	tray_cleanup ();
+-#elif defined(LIBNOTIFY)
+-	libnotify_cleanup ();
++#elif defined(USE_LIBNOTIFY)
++	notify_uninit ();
+ #endif
+ 	return 1;
+ }
+
diff --git a/staging/libmtp/PKGBUILD b/staging/libmtp/PKGBUILD
new file mode 100644
index 000000000..9632630d0
--- /dev/null
+++ b/staging/libmtp/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $
+# Contributor: damir <damir@archlinux.org>
+# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
+
+pkgname=libmtp
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="library implementation of the Media Transfer Protocol"
+arch=("i686" "x86_64")
+url="http://libmtp.sourceforge.net"
+license=('LGPL')
+depends=('libusb-compat')
+makedepends=('doxygen')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('fd7b293436528f4c780a9da6e5cc5398')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/rhythmbox/PKGBUILD b/staging/rhythmbox/PKGBUILD
new file mode 100644
index 000000000..a1644664b
--- /dev/null
+++ b/staging/rhythmbox/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=rhythmbox
+pkgver=2.90.1.git20110610
+pkgrel=2
+pkgdesc="An iTunes-like music player/libary"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.rhythmbox.org"
+depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify'
+         'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins'
+         'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'dconf')
+makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
+optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs'
+            'brasero: cd burning')
+options=('!libtool' '!emptydirs' '!strip')
+install=rhythmbox.install
+#source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('20e9bf31f3fbd2b4e4db86ab12aeee8175a8a49a5c3ec2081a8ca3880d01fba0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  export CFLAGS="$CFLAGS -g -O1"
+  export CXXFLAGS="$CXXFLAGS -g -O1"
+  PYTHON=/usr/bin/python2 ./autogen.sh
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/rhythmbox \
+      --localstatedir=/var --disable-static \
+      --enable-daap --enable-python \
+      --with-mdns=avahi --disable-scrollkeeper
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/rhythmbox/rhythmbox.install b/staging/rhythmbox/rhythmbox.install
new file mode 100644
index 000000000..cbea0e6b3
--- /dev/null
+++ b/staging/rhythmbox/rhythmbox.install
@@ -0,0 +1,22 @@
+pkgname=rhythmbox
+
+post_install() {
+    glib-compile-schemas usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+     if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+         usr/sbin/gconfpkg --uninstall ${pkgname}
+     fi
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+
+post_remove() {
+    post_install $1
+}
diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD
new file mode 100644
index 000000000..21f3f6722
--- /dev/null
+++ b/testing/libevent/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 127366 2011-06-13 18:59:12Z eric $
+# Maintainer: 
+# Contributor: Judd <jvinet@zeroflux.org>
+
+pkgname=libevent
+pkgver=2.0.12
+pkgrel=1
+pkgdesc="An event notification library"
+arch=('i686' 'x86_64')
+url="http://www.monkey.org/~provos/libevent/"
+license=('GPL2')
+depends=('openssl')
+optdepends=('python2: to use event_rpcgen.py')
+options=('!libtool')
+source=("http://www.monkey.org/~provos/libevent-$pkgver-stable.tar.gz")
+md5sums=('42986228baf95e325778ed328a93e070')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-stable"
+  sed -i 's#python#python2#' event_rpcgen.py
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}-stable"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-stable"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
new file mode 100644
index 000000000..0520c9b7f
--- /dev/null
+++ b/testing/openssh/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 127348 2011-06-13 11:08:41Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=openssh
+pkgver=5.8p2
+pkgrel=7
+pkgdesc='Free version of the SSH connectivity tools'
+arch=('i686' 'x86_64')
+license=('custom:BSD')
+url='http://www.openssh.org/portable.html'
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
+source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
+        'authfile.c.patch'
+        'sshd.confd'
+        'sshd.pam'
+        'sshd')
+sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5'
+          '3669cb5ca6149f69015df5ce8e60b82c540eb0a4'
+          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+          '660092c57bde28bed82078f74011f95fc51c2293'
+          '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../authfile.c.patch # fix FS#24693 using http://anoncvs.mindrot.org/index.cgi/openssh/authfile.c?revision=1.95
+
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/ssh \
+		--sysconfdir=/etc/ssh \
+		--with-tcp-wrappers \
+		--with-privsep-user=nobody \
+		--with-md5-passwords \
+		--with-pam \
+		--with-mantype=man \
+		--mandir=/usr/share/man \
+		--with-xauth=/usr/bin/xauth \
+		--with-kerberos5=/usr \
+		--with-ssl-engine \
+		--with-libedit=/usr/lib \
+		--disable-strip # stripping is done by makepkg
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
+	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
+	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+
+	rm "${pkgdir}"/usr/share/man/man1/slogin.1
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
+
+	# additional contrib scripts that we like
+	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
+	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
+	install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
+
+	# PAM is a common, standard feature to have
+	sed -i	-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
+		-e '/^#UsePAM no$/c UsePAM yes' \
+		"${pkgdir}"/etc/ssh/sshd_config
+}
diff --git a/testing/openssh/authfile.c.patch b/testing/openssh/authfile.c.patch
new file mode 100644
index 000000000..6c18fe807
--- /dev/null
+++ b/testing/openssh/authfile.c.patch
@@ -0,0 +1,198 @@
+diff -aur old/authfile.c new/authfile.c
+--- old/authfile.c	2011-06-12 02:21:52.262338254 +0200
++++ new/authfile.c	2011-06-12 02:13:43.051467269 +0200
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */
++/* $OpenBSD: authfile.c,v 1.95 2011/05/29 11:42:08 djm Exp $ */
+ /*
+  * Author: Tatu Ylonen <ylo@cs.hut.fi>
+  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+@@ -69,6 +69,8 @@
+ #include "misc.h"
+ #include "atomicio.h"
+ 
++#define MAX_KEY_FILE_SIZE	(1024 * 1024)
++
+ /* Version identification string for SSH v1 identity files. */
+ static const char authfile_id_string[] =
+     "SSH PRIVATE KEY FILE FORMAT 1.1\n";
+@@ -312,12 +314,12 @@
+ 	return pub;
+ }
+ 
+-/* Load the contents of a key file into a buffer */
+-static int
++/* Load a key from a fd into a buffer */
++int
+ key_load_file(int fd, const char *filename, Buffer *blob)
+ {
++	u_char buf[1024];
+ 	size_t len;
+-	u_char *cp;
+ 	struct stat st;
+ 
+ 	if (fstat(fd, &st) < 0) {
+@@ -325,30 +327,45 @@
+ 		    filename == NULL ? "" : filename,
+ 		    filename == NULL ? "" : " ",
+ 		    strerror(errno));
+-		close(fd);
+ 		return 0;
+ 	}
+-	if (st.st_size > 1*1024*1024) {
++	if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
++	    st.st_size > MAX_KEY_FILE_SIZE) {
++ toobig:
+ 		error("%s: key file %.200s%stoo large", __func__,
+ 		    filename == NULL ? "" : filename,
+ 		    filename == NULL ? "" : " ");
+-		close(fd);
+ 		return 0;
+ 	}
+-	len = (size_t)st.st_size;		/* truncated */
+-
+ 	buffer_init(blob);
+-	cp = buffer_append_space(blob, len);
+-
+-	if (atomicio(read, fd, cp, len) != len) {
+-		debug("%s: read from key file %.200s%sfailed: %.100s", __func__,
+-		    filename == NULL ? "" : filename,
+-		    filename == NULL ? "" : " ",
+-		    strerror(errno));
++	for (;;) {
++		if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) {
++			if (errno == EPIPE)
++				break;
++			debug("%s: read from key file %.200s%sfailed: %.100s",
++			    __func__, filename == NULL ? "" : filename,
++			    filename == NULL ? "" : " ", strerror(errno));
++			buffer_clear(blob);
++			bzero(buf, sizeof(buf));
++			return 0;
++		}
++		buffer_append(blob, buf, len);
++		if (buffer_len(blob) > MAX_KEY_FILE_SIZE) {
++			buffer_clear(blob);
++			bzero(buf, sizeof(buf));
++			goto toobig;
++		}
++	}
++	bzero(buf, sizeof(buf));
++	if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
++	    st.st_size != buffer_len(blob)) {
++		debug("%s: key file %.200s%schanged size while reading",
++		    __func__, filename == NULL ? "" : filename,
++		    filename == NULL ? "" : " ");
+ 		buffer_clear(blob);
+-		close(fd);
+ 		return 0;
+ 	}
++
+ 	return 1;
+ }
+ 
+@@ -606,7 +623,7 @@
+ 		error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+ 		error("Permissions 0%3.3o for '%s' are too open.",
+ 		    (u_int)st.st_mode & 0777, filename);
+-		error("It is recommended that your private key files are NOT accessible by others.");
++		error("It is required that your private key files are NOT accessible by others.");
+ 		error("This private key will be ignored.");
+ 		return 0;
+ 	}
+@@ -626,6 +643,7 @@
+ 	case KEY_UNSPEC:
+ 		return key_parse_private_pem(blob, type, passphrase, commentp);
+ 	default:
++		error("%s: cannot parse key type %d", __func__, type);
+ 		break;
+ 	}
+ 	return NULL;
+@@ -670,11 +688,38 @@
+ }
+ 
+ Key *
++key_parse_private(Buffer *buffer, const char *filename,
++    const char *passphrase, char **commentp)
++{
++	Key *pub, *prv;
++	Buffer pubcopy;
++
++	buffer_init(&pubcopy);
++	buffer_append(&pubcopy, buffer_ptr(buffer), buffer_len(buffer));
++	/* it's a SSH v1 key if the public key part is readable */
++	pub = key_parse_public_rsa1(&pubcopy, commentp);
++	buffer_free(&pubcopy);
++	if (pub == NULL) {
++		prv = key_parse_private_type(buffer, KEY_UNSPEC,
++		    passphrase, NULL);
++		/* use the filename as a comment for PEM */
++		if (commentp && prv)
++			*commentp = xstrdup(filename);
++	} else {
++		key_free(pub);
++		/* key_parse_public_rsa1() has already loaded the comment */
++		prv = key_parse_private_type(buffer, KEY_RSA1, passphrase,
++		    NULL);
++	}
++	return prv;
++}
++
++Key *
+ key_load_private(const char *filename, const char *passphrase,
+     char **commentp)
+ {
+-	Key *pub, *prv;
+-	Buffer buffer, pubcopy;
++	Key *prv;
++	Buffer buffer;
+ 	int fd;
+ 
+ 	fd = open(filename, O_RDONLY);
+@@ -697,23 +742,7 @@
+ 	}
+ 	close(fd);
+ 
+-	buffer_init(&pubcopy);
+-	buffer_append(&pubcopy, buffer_ptr(&buffer), buffer_len(&buffer));
+-	/* it's a SSH v1 key if the public key part is readable */
+-	pub = key_parse_public_rsa1(&pubcopy, commentp);
+-	buffer_free(&pubcopy);
+-	if (pub == NULL) {
+-		prv = key_parse_private_type(&buffer, KEY_UNSPEC,
+-		    passphrase, NULL);
+-		/* use the filename as a comment for PEM */
+-		if (commentp && prv)
+-			*commentp = xstrdup(filename);
+-	} else {
+-		key_free(pub);
+-		/* key_parse_public_rsa1() has already loaded the comment */
+-		prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase,
+-		    NULL);
+-	}
++	prv = key_parse_private(&buffer, filename, passphrase, commentp);
+ 	buffer_free(&buffer);
+ 	return prv;
+ }
+@@ -737,13 +766,19 @@
+ 			case '\0':
+ 				continue;
+ 			}
++			/* Abort loading if this looks like a private key */
++			if (strncmp(cp, "-----BEGIN", 10) == 0)
++				break;
+ 			/* Skip leading whitespace. */
+ 			for (; *cp && (*cp == ' ' || *cp == '\t'); cp++)
+ 				;
+ 			if (*cp) {
+ 				if (key_read(k, &cp) == 1) {
+-					if (commentp)
+-						*commentp=xstrdup(filename);
++					cp[strcspn(cp, "\r\n")] = '\0';
++					if (commentp) {
++						*commentp = xstrdup(*cp ?
++						    cp : filename);
++					}
+ 					fclose(f);
+ 					return 1;
+ 				}
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
new file mode 100755
index 000000000..2ee1091f0
--- /dev/null
+++ b/testing/openssh/sshd
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sshd
+
+PIDFILE=/var/run/sshd.pid
+PID=$(cat $PIDFILE 2>/dev/null)
+if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
+  PID=
+  rm $PIDFILE 2>/dev/null
+fi
+
+case "$1" in
+  start)
+    stat_busy "Starting Secure Shell Daemon"
+    [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; }
+    [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; }
+    [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
+    [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; }
+    [ -d /var/empty ] || mkdir -p /var/empty
+    [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon sshd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Secure Shell Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon sshd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
new file mode 100644
index 000000000..5ce7c0079
--- /dev/null
+++ b/testing/openssh/sshd.confd
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to sshd
+#
+SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
new file mode 100644
index 000000000..ae028ceb5
--- /dev/null
+++ b/testing/openssh/sshd.pam
@@ -0,0 +1,10 @@
+#%PAM-1.0
+#auth		required	pam_securetty.so	#Disable remote root
+auth		required	pam_unix.so
+auth		required	pam_env.so
+account		required	pam_nologin.so
+account		required	pam_unix.so
+account		required	pam_time.so
+password	required	pam_unix.so
+session		required	pam_unix_session.so
+session		required	pam_limits.so
author	root <root@rshg047.dnsready.net>	2011-06-14 22:59:43 +0000
committer	root <root@rshg047.dnsready.net>	2011-06-14 22:59:43 +0000
commit	ba3afb3907fc927bd08713613d4a30a9479c715c (patch)
tree	1f1353c475b7709a692e3d42a8ac9c2e0e8ad02a
parent	7c64c5039335c73eaa1a402c417235e8ca9a5109 (diff)