Wed May 4 12:58:31 UTC 2011

12 files changed, 334 insertions, 4 deletions

diff --git a/staging/cyrus-sasl-plugins/PKGBUILD b/staging/cyrus-sasl-plugins/PKGBUILD
new file mode 100644
index 000000000..5817bb657
--- /dev/null
+++ b/staging/cyrus-sasl-plugins/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=cyrus-sasl-plugins
+pkgver=2.1.23
+pkgrel=5
+pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
+arch=('i686' 'x86_64')
+url="http://cyrusimap.web.cmu.edu/"
+license=('custom')
+depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4'
+        'libmysqlclient>=5.5.10')
+source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
+        cyrus-sasl-2.1.22-gcc44.patch
+    	cyrus-sasl-2.1.23-db5-fix.patch)
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+         '5deb4d67b53ecba20c7887fc8fdebee1'
+         '3ae4347705141145f31cf786c38ea9ef')
+options=('!libtool')
+
+build() {
+  cd ${srcdir}/cyrus-sasl-${pkgver}
+  patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch
+  # from http://bugs.gentoo.org/show_bug.cgi?id=319935
+  patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-db5-fix.patch
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-login \
+    --disable-plain \
+    --enable-sql \
+    --disable-sqlite \
+    --enable-gssapi=/usr/include/gssapi \
+    --with-mysql=/usr \
+    --with-pgsql=/usr \
+    --enable-postgresql \
+    --enable-ldapdb \
+    --with-ldap=/usr
+  cd sasldb
+  make
+  cd ../plugins
+  make
+}
+
+package () {
+  cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
+  make DESTDIR=${pkgdir} install
+  
+  install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+
+  rm -f ${pkgdir}/usr/lib/sasl2/libsasldb.*
+}
diff --git a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
new file mode 100644
index 000000000..e2621278b
--- /dev/null
+++ b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
@@ -0,0 +1,24 @@
+fix warnings with gcc-4.4
+
+http://bugs.gentoo.org/248738
+
+--- cyrus-sasl-2.1.22/plugins/digestmd5.c
++++ cyrus-sasl-2.1.22/plugins/digestmd5.c
+@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch
new file mode 100644
index 000000000..2ccd6cdb3
--- /dev/null
+++ b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch
@@ -0,0 +1,23 @@
+--- sasldb/db_berkeley.c.orig	2010-10-04 21:11:15.044010468 -0400
++++ sasldb/db_berkeley.c	2010-10-04 21:12:18.921998718 -0400
+@@ -100,7 +100,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+
+--- utils/dbconverter-2.c.orig	2010-10-04 21:23:39.778000256 -0400
++++ utils/dbconverter-2.c	2010-10-04 21:24:50.384999893 -0400
+@@ -214,7 +214,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/staging/cyrus-sasl/PKGBUILD b/staging/cyrus-sasl/PKGBUILD
new file mode 100644
index 000000000..6d42f9f75
--- /dev/null
+++ b/staging/cyrus-sasl/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=cyrus-sasl
+pkgver=2.1.23
+pkgrel=5
+pkgdesc="SASL authentication daemon"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://asg.web.cmu.edu/cyrus/download/"
+depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0')
+replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
+conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
+backup=(etc/conf.d/saslauthd)
+source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz
+        saslauthd
+        saslauthd.conf.d
+        cyrus-sasl-2.1.23-gcc4.patch
+        cyrus-sasl-2.1.23+db-5.0.patch)
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+         '697dfb51206c398bc976ce9f4cffe72d'
+         '96d8a2f6189501f8044838e04d5cae7f'
+         '3a71688df7d5724cd55a8de17d74f34e'
+         '35c189c8e93ad37e3ae3c49386fdeb2c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix building with db v5.x
+  patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch
+
+  # Fix error: #elif with no expression
+  patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch
+
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+    --with-ldap=/usr --with-saslauthd=/var/run/saslauthd \
+    --disable-krb4 --with-gss_impl=mit --disable-otp
+  cd saslauthd
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/saslauthd"
+  make DESTDIR="${pkgdir}" install
+  make testsaslauthd
+  install -m755 testsaslauthd "${pkgdir}/usr/sbin"
+
+  install -dm766 "${pkgdir}/var/run/saslauthd"
+  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
+  install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
+
+  install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING"
+}
diff --git a/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
new file mode 100644
index 000000000..62df3e67e
--- /dev/null
+++ b/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
@@ -0,0 +1,24 @@
+diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c
+--- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c	2009-04-28 08:09:18.000000000 -0700
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c	2011-05-02 07:16:42.748675977 -0700
+@@ -100,7 +100,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c
+--- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c	2003-02-13 11:56:17.000000000 -0800
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c	2011-05-02 07:16:42.748675977 -0700
+@@ -214,7 +214,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
new file mode 100644
index 000000000..0d8627b1f
--- /dev/null
+++ b/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
@@ -0,0 +1,21 @@
+diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c
+--- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c	2009-04-28 08:09:17.000000000 -0700
++++ cyrus-sasl-2.1.23/plugins/digestmd5.c	2011-05-02 07:56:55.375403814 -0700
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/staging/cyrus-sasl/saslauthd b/staging/cyrus-sasl/saslauthd
new file mode 100644
index 000000000..c470c801c
--- /dev/null
+++ b/staging/cyrus-sasl/saslauthd
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# source application-specific settings
+[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="saslauthd"
+SASLAUTHD_BIN=/usr/sbin/saslauthd
+SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN`
+
+case "$1" in
+  start)
+    stat_busy "Starting $DAEMON_NAME"
+    [ -z "$SASLAUTHD_PID" ] && $SASLAUTHD_BIN $SASLAUTHD_OPTS
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      echo `pidof -o %PPID $SASLAUTHD_BIN` > /var/run/$DAEMON_NAME.pid
+    fi
+    add_daemon $DAEMON_NAME
+    stat_done
+    ;;
+
+  stop)
+    stat_busy "Stopping $DAEMON_NAME"
+    [ ! -z "$SASLAUTHD_PID" ]  && kill $SASLAUTHD_PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm /var/run/$DAEMON_NAME.pid &> /dev/null
+    fi
+    rm_daemon $DAEMON_NAME
+    stat_done
+    ;;
+
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/cyrus-sasl/saslauthd.conf.d b/staging/cyrus-sasl/saslauthd.conf.d
new file mode 100644
index 000000000..b42b5d0b0
--- /dev/null
+++ b/staging/cyrus-sasl/saslauthd.conf.d
@@ -0,0 +1 @@
+SASLAUTHD_OPTS="-m /var/run/saslauthd -a pam"
diff --git a/staging/gtk2/PKGBUILD b/staging/gtk2/PKGBUILD
new file mode 100644
index 000000000..e67d63520
--- /dev/null
+++ b/staging/gtk2/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 122323 2011-05-03 20:18:27Z stephane $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.4
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls'
+             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
+options=('!libtool' '!docs')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2
+        xid-collision-debug.patch)
+sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+build() {
+    cd "${srcdir}/gtk+-${pkgver}"
+    patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-xinput=yes
+    make
+}
+package_gtk2() {
+    pkgdesc="The GTK+ Toolkit (v2)"
+    install=gtk2.install
+    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+    backup=(etc/gtk-2.0/gtkrc)
+
+    cd "${srcdir}/gtk+-${pkgver}"
+
+    make DESTDIR="${pkgdir}" install
+    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+    echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
+    #split this out to use with gtk3 too
+    rm ${pkgdir}/usr/bin/gtk-update-icon-cache
+}
+package_gtk-update-icon-cache() {
+    pkgdesc="The GTK+ update icon cache tool"
+    depends=('gdk-pixbuf2')
+
+    cd "${srcdir}/gtk+-${pkgver}/gtk"
+
+    install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
+}
diff --git a/staging/gtk2/gtk2.install b/staging/gtk2/gtk2.install
new file mode 100644
index 000000000..4e2b72f1b
--- /dev/null
+++ b/staging/gtk2/gtk2.install
@@ -0,0 +1,16 @@
+post_install() {
+  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
+  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
+}
diff --git a/staging/gtk2/xid-collision-debug.patch b/staging/gtk2/xid-collision-debug.patch
new file mode 100644
index 000000000..d61238c3b
--- /dev/null
+++ b/staging/gtk2/xid-collision-debug.patch
@@ -0,0 +1,15 @@
+--- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
+@@ -56,10 +56,10 @@
+   if (!display_x11->xid_ht)
+     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ 					    (GEqualFunc) gdk_xid_equal);
+-
++/*
+   if (g_hash_table_lookup (display_x11->xid_ht, xid))
+     g_warning ("XID collision, trouble ahead");
+-
++*/
+   g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
+ 
diff --git a/staging/openssh/PKGBUILD b/staging/openssh/PKGBUILD
index 42443afc2..d00f114f3 100644
--- a/staging/openssh/PKGBUILD
+++ b/staging/openssh/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 121075 2011-04-28 23:41:59Z stephane $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 122205 2011-05-03 02:22:30Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=5.8p1
+pkgver=5.8p2
 pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
@@ -15,7 +16,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
         'sshd.confd'
         'sshd.pam'
         'sshd')
-sha1sums=('adebb2faa9aba2a3a3c8b401b2b19677ab53f0de'
+sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '660092c57bde28bed82078f74011f95fc51c2293'
           '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')