Wed Aug 24 23:14:37 UTC 2011

10 files changed, 103 insertions, 42 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 1711534b8..c380932b8 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127641 2011-06-17 11:09:38Z bisson $
+# $Id: PKGBUILD 136183 2011-08-23 19:33:20Z bisson $
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
@@ -7,12 +7,12 @@
 
 pkgname=bitlbee
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64')
 url='http://www.bitlbee.org/'
 license=('GPL')
-depends=('openssl' 'glib2' 'libotr')
+depends=('gnutls' 'glib2' 'libotr')
 optdepends=('xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
 	'xinetd'
@@ -32,7 +32,7 @@ build() {
 		--pidfile=/var/run/bitlbee/bitlbee.pid \
 		--ipcsocket=/var/run/bitlbee/bitlbee.sock \
 		--systemdsystemunitdir=/lib/systemd/system \
-		--ssl=openssl \
+		--ssl=gnutls \
 		--strip=0 \
 		--otr=1 \
 
diff --git a/extra/fwbuilder/PKGBUILD b/extra/fwbuilder/PKGBUILD
index 055db9e92..31018c3d3 100644
--- a/extra/fwbuilder/PKGBUILD
+++ b/extra/fwbuilder/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 109609 2011-02-11 02:28:42Z kevin $
+# $Id: PKGBUILD 136184 2011-08-24 01:47:26Z kevin $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fwbuilder
-pkgver=4.1.3
+pkgver=5.0.0.3568
 pkgrel=1
 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
 url="http://www.fwbuilder.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=("libfwbuilder=${pkgver}" 'qt' 'net-snmp' 'hicolor-icon-theme')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7cb6d50ce6f02b485525405bd00d8c33')
+depends=('libxslt' 'net-snmp' 'qt')
+conflicts=('libfwbuilder')
+source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.0.0/fwbuilder-${pkgver}.tar.gz")
+md5sums=('0324edab10329dde029953d646aa8dad')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/fwbuilder-${pkgver}"
   ./autogen.sh
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/fwbuilder-${pkgver}"
   make INSTALL_ROOT=${pkgdir} install
 }
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 0dc103a82..808c0885b 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 125631 2011-05-27 10:55:14Z heftig $
+# $Id: PKGBUILD 136177 2011-08-23 18:46:06Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.8.8
+pkgver=4.8.9
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('b3a961d2e0ff3331745220984c70b6a9'
+md5sums=('60770d45dc08c0f181b22cdfce5be3e8'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index bdd3377d4..33c4c3771 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 125630 2011-05-27 10:55:00Z heftig $
+# $Id: PKGBUILD 136180 2011-08-23 18:59:12Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=nss
-pkgver=3.12.10
+pkgver=3.12.11
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.8.7
-depends=("nspr>=${_nsprver}" 'sqlite3>=3.7.5' 'zlib' 'sh')
+_nsprver=4.8.9
+depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
 makedepends=('perl')
 replaces=('nss-nspr')
 options=('!strip')
@@ -18,7 +18,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
         nss-config.in
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-md5sums=('027954e894f02732f4e66cd854261145'
+md5sums=('ca0ca058380be200cf247ea2496b5352'
          'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '46bee81908f1e5b26d6a7a2e14c64d9f'
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index dc3699a5b..5a2ff5ec4 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136081 2011-08-22 13:27:31Z pierre $
+# $Id: PKGBUILD 136162 2011-08-23 15:55:48Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -22,9 +22,9 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.7
-_suhosinver=${pkgver}-0.9.10
-pkgrel=3
+pkgver=5.3.8
+_suhosinver=5.3.7-0.9.10
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -35,16 +35,14 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm'
-        'crypt.patch')
-md5sums=('2d47d003c96de4e88863ff38da61af33'
+        'logrotate.d.php-fpm')
+md5sums=('704cd414a0565d905e1074ffdc1fadfb'
          '08582e502fed8221c6577042ca45ddb8'
          '39eaa70d276fc3d45d6bcf6cd5ae1106'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
          '09005dabd90c48ddd392b3dbf05f8a82'
-         '07c4e412909ac65a44ec90e7a2c4bade'
-         '8e079c6d9b31358d59b98aa3dbd7d692')
+         '07c4e412909ac65a44ec90e7a2c4bade')
 
 build() {
 	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
@@ -137,9 +135,6 @@ build() {
 
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
-	# Fix MD5 crypt(); see https://bugs.php.net/bug.php?id=55439
-	patch -p0 -i ${srcdir}/crypt.patch
-
 	# apply suhosin patch
 	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
 
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 5afcac5a1..d147e5e76 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 135006 2011-08-09 21:00:16Z schiv $
+# $Id: PKGBUILD 136171 2011-08-23 17:11:36Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=snd
-pkgver=12.3
+pkgver=12.4
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
 url="http://ccrma.stanford.edu/software/snd/"
 license=('custom')
-depends=('lesstif' 'jack' 'fam' 'gsl' 'fftw')
+depends=('lesstif' 'jack' 'gamin' 'gsl' 'fftw')
 makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm'
              'timidity++' 'mpg123' 'vorbis-tools' 'gmp')
 optdepends=('ladspa' 'wavpack' 'flac' 'speex'
             'timidity++' 'mpg123' 'vorbis-tools')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('e1dab6945b9583f02aa6ae73d3780c98')
+md5sums=('107e5a4fd5df2d1432d0ec51cb31a88b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 5f793c68b..f8179e2e3 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136078 2011-08-22 13:09:39Z andyrtr $
+# $Id: PKGBUILD 136121 2011-08-23 06:05:20Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
diff --git a/extra/xfce4-session/gdm.patch b/extra/xfce4-session/gdm.patch
new file mode 100644
index 000000000..e89e6a0b6
--- /dev/null
+++ b/extra/xfce4-session/gdm.patch
@@ -0,0 +1,21 @@
+From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001
+From: Panu Matilainen <pmatilai@laiskiainen.org>
+Date: Wed, 23 Mar 2011 21:13:40 +0000
+Subject: Fix GDM_LANG usage to be compatible with GDM3 (bug #7400).
+
+---
+diff --git a/xfce4-session/main.c b/xfce4-session/main.c
+index ff6e324..fcf69f8 100644
+--- a/xfce4-session/main.c
++++ b/xfce4-session/main.c
+@@ -103,7 +103,7 @@ setup_environment (void)
+ 
+   /* this is for compatibility with the GNOME Display Manager */
+   lang = g_getenv ("GDM_LANG");
+-  if (lang != NULL)
++  if (lang != NULL && strlen (lang) > 0)
+     {
+       xfce_setenv ("LANG", lang, TRUE);
+       xfce_unsetenv ("GDM_LANG");
+--
+cgit 
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index dc77e6923..eafe6f472 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135629 2011-08-16 19:39:58Z ibiru $
+# $Id: PKGBUILD 136174 2011-08-23 18:08:58Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
 pkgver=6.0
 _ffoxver=6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -13,15 +13,23 @@ makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'm
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
         mozconfig
-        mozilla-pkgconfig.patch)
+        mozilla-pkgconfig.patch
+        moz-639554.patch)
 options=('!emptydirs' '!buildflags')
 replaces=('xulrunner-oss')
+md5sums=('1840185865a1a8975df4a3db59080ddc'
+         '2358a2ddd35bcdd62ff42442dfe548d9'
+         '639ea80e823543dd415b90c0ee804186'
+         '96d3c1790a56f8e6df88e327adccf3bf')
+
 build() {
   cd "${srcdir}/mozilla-release"
   cp "${srcdir}/mozconfig" .mozconfig
 
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
+  #upstream fixes
+  patch -Np1 -i "${srcdir}/moz-639554.patch"
 
   export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
 
@@ -40,7 +48,8 @@ package() {
   # add xulrunner library path to ld.so.conf
   install -d ${pkgdir}/etc/ld.so.conf.d
   echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
+
+  #wtf mozilla!
+  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-6.0/sdk/bin/xpt.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "${pkgdir}/usr/lib/xulrunner-devel-6.0/sdk/bin/xpt.py"
 }
-md5sums=('1840185865a1a8975df4a3db59080ddc'
-         '2358a2ddd35bcdd62ff42442dfe548d9'
-         '639ea80e823543dd415b90c0ee804186')
diff --git a/extra/xulrunner/moz-639554.patch b/extra/xulrunner/moz-639554.patch
new file mode 100644
index 000000000..30fe15c6e
--- /dev/null
+++ b/extra/xulrunner/moz-639554.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Chris Coulson <chrisccoulson@ubuntu.com>
+# Date 1306390403 -7200
+# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
+# Parent  831f8e040f381ed58441d8bf413f9845f26ce08e
+Bug 639554 - Install sdk/bin with make install. r=bsmedberg
+
+diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
+--- a/toolkit/mozapps/installer/packager.mk
++++ b/toolkit/mozapps/installer/packager.mk
+@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard 
+ 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
+ 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)
+ 	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(idldir) && tar -xf -)
+ # SDK directory is the libs + a bunch of symlinks
+ 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
++	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
+ 	if test -f $(DIST)/include/xpcom-config.h; then \
+ 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ 	fi
+ 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
++	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
+ 	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
+ 	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
+ endif # INSTALL_SDK
+ 
+ make-sdk:
+