Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

2025-02-10 08:44:36 +08:00 · 2011-05-28 23:11:18 +00:00 · 2011-05-28 23:11:18 +00:00 · 0cb870e774
commit 0cb870e774
parent 9a4351175b b0daacd2d6
18 changed files with 157 additions and 81 deletions
--- a/bogofilter/PKGBUILD
+++ b/bogofilter/PKGBUILD
@ -1,12 +1,12 @@
 #
-# Core Packages for Chakra, part of chakra-project.org
+# Platform Packages for Chakra, part of chakra-project.org
 #
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=bogofilter
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast Bayesian spam filtering tool"
 arch=('i686' 'x86_64')
 license=(GPL3)
--- a/cups/PKGBUILD
+++ b/cups/PKGBUILD
@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.4.5
+pkgver=1.4.6
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@ -19,7 +19,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
 	cups-avahi.patch
        cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('50729f6fc46ba54223e0eaf5009f3419'
+md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1'
         '8ebd390197501ffd709f0ee546937fd5'
         '5c85b7d8d2ddd02c2c64955cebbf55ea'
         'f861b18f4446c43918c8643dcbbd7f6d'
--- a/cyrus-sasl-plugins/PKGBUILD
+++ b/cyrus-sasl-plugins/PKGBUILD
@ -6,12 +6,12 @@

 pkgname=cyrus-sasl-plugins
 pkgver=2.1.23
-pkgrel=4
+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>=8.4.1' 'heimdal>=1.2-1' 'libldap>2.4' 'libmysqlclient')
+depends=('postgresql-libs>=8.4.1' 'krb5' 'libldap>2.4' 'libmysqlclient')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
        cyrus-sasl-2.1.22-gcc44.patch)
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
--- a/cyrus-sasl/PKGBUILD
+++ b/cyrus-sasl/PKGBUILD
@ -1,14 +1,17 @@
-# $Id: PKGBUILD 75335 2010-04-01 10:43:20Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+#
+# Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=5
+pkgrel=6
 pkgdesc="SASL authentication daemon"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://asg.web.cmu.edu/cyrus/download/"
-depends=('pam>=1.0.1-2' 'heimdal>=1.3.1' 'libldap' 'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
+depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
 replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 backup=(etc/conf.d/saslauthd)
--- a/ebook-tools/PKGBUILD
+++ b/ebook-tools/PKGBUILD
@ -1,9 +1,15 @@
-# $Id: PKGBUILD 68030 2010-02-10 14:53:32Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=ebook-tools
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools for accessing and converting various ebook file formats"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/ebook-tools"
--- a/gnash/PKGBUILD
+++ b/gnash/PKGBUILD
@ -6,13 +6,14 @@
 
 pkgname=gnash
 pkgver=0.8.9
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Flash player and kpath plugin for KDE 4."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gnash/"
 license=('GPL')
 depends=('agg' 'ffmpeg' 'libjpeg' 'libpng' 'giflib' 'zlib' 'curl' 'giflib' 'boost' 'libldap' 'sdl'
-         'speex' 'fontconfig' 'libva' 'libxinerama' 'gstreamer0.10-base' 'gstreamer0.10-ffmpeg')
+         'speex' 'fontconfig' 'libva' 'libxinerama' 'gstreamer0.10-base' 'gstreamer0.10-ffmpeg'
+         'libdca' 'kdebase' 'xulrunner')
 provides=('gnash' 'gnash-common')
 conflicts=('flashplugin' 'flashplugin-square')
 source=("http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
--- a/hplip/PKGBUILD
+++ b/hplip/PKGBUILD
@ -1,9 +1,13 @@
-# $Id: PKGBUILD 81454 2010-05-30 16:59:25Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=hplip
-pkgver=3.11.3
+pkgver=3.11.5
 pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet."
 arch=('i686' 'x86_64')
@ -51,4 +55,4 @@ build() {
 # fix sysfs rules
 sed -i -e "s|SYSFS|ATTRS|g" -e "s|sysfs|attrs|g" $pkgdir/lib/udev/rules.d/56-hpmud_support.rules || return 1
 }
-md5sums=('9a2f39cb02214ee0def550defac0d240')
+md5sums=('0a3d0f46ec89857b4c0feea6923864f1')
--- a/ilmbase/PKGBUILD
+++ b/ilmbase/PKGBUILD
@ -1,22 +1,38 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=ilmbase
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 depends=('gcc-libs')
 pkgdesc="IlmThread is a thread abstraction library for use with OpenEXR"
 arch=(i686 x86_64)
 license=('custom')
 options=('!libtool')
-source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz)
-url="http://www.openexr.org"
-md5sums=('f76f094e69a6079b0beb93d97e2a217e')
+source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz
+        tests-compile-fixes.patch)
+url="http://www.openexr.com"
+md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4'
+         'f9f8efce85c056d9a03b1a45f981dd6a')

 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/$pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/tests-compile-fixes.patch
  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
+}
+
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
+  # one of the tests fails randomly for an unknown reason
+  make check || true
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
--- a/ilmbase/tests-compile-fixes.patch
+++ b/ilmbase/tests-compile-fixes.patch
@ -0,0 +1,11 @@
+diff -ur ilmbase-1.0.2/Imath/ImathMatrix.h ilmbase-1.0.2.new/Imath/ImathMatrix.h
+--- ilmbase-1.0.2/Imath/ImathMatrix.h	2010-07-17 00:48:40.000000000 +0200
+++ ilmbase-1.0.2.new/Imath/ImathMatrix.h	2011-04-25 10:15:21.121608420 +0200
+@@ -49,6 +49,8 @@
+ #include "ImathVec.h"
+ #include "ImathShear.h"
+ 
+#include <cstdlib>
+#include <cstring>
+ #include <iostream>
+ #include <iomanip>
--- a/libzip/PKGBUILD
+++ b/libzip/PKGBUILD
@ -1,9 +1,14 @@
-# $Id: PKGBUILD 77453 2010-04-13 12:26:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=libzip
-pkgver=0.9.3
+pkgver=0.10
 pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives"
 url="http://www.nih.at/libzip/index.html"
@ -11,11 +16,15 @@ license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('zlib')
 options=('!libtool')
-source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e5fa5d0c5d2ad4c7a0c0fc7f5a1695b9')
+source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'fix-headers.patch')
+md5sums=('47cdfcbc08c8bea0b52fdee4bf591622'
+         '249395bd3a426c4c4e993e9d4753e1dd')

 build() {
  cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -p1 -i "${srcdir}/fix-headers.patch"
  ./configure --prefix=/usr
  make || return 1
 }
--- a/libzip/fix-headers.patch
+++ b/libzip/fix-headers.patch
@ -0,0 +1,15 @@
+diff -urN libzip-0.10rc1.old/lib/Makefile.am libzip-0.10rc1/lib/Makefile.am
+--- libzip-0.10rc1.old/lib/Makefile.am	2011-03-05 01:07:33.921722002 +0100
+++ libzip-0.10rc1/lib/Makefile.am	2011-03-05 20:29:30.349388003 +0100
+@@ -2,8 +2,9 @@
+ 
+ lib_LTLIBRARIES = libzip.la
+ noinst_HEADERS = zipint.h
+-include_HEADERS = zip.h
+-libinclude_HEADERS = zipconf.h
+include_HEADERS = \
+	zip.h \
+	zipconf.h
+ 
+ # also update CMakeLists.txt when changing version
+ libzip_la_LDFLAGS=-no-undefined -version-info 2:0
--- a/openexr/PKGBUILD
+++ b/openexr/PKGBUILD
@ -1,23 +1,30 @@
-# $Id: PKGBUILD 17480 2008-10-30 16:52:29Z pierre $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=openexr
-pkgver=1.6.1
+pkgver=1.7.0
 pkgrel=1
 depends=('zlib' 'ilmbase')
 pkgdesc="openexr library for EXR images"
 arch=(i686 x86_64)
 options=('!libtool')
 license=('custom')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" 'gcc43.patch')
+source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'gcc43.patch')
 url="http://www.openexr.org"
-md5sums=('11951f164f9c872b183df75e66de145a' '7c83ee3d69ad688142e7de63cb68e70a')
+md5sums=('27113284f7d26a58f853c346e0851d7a' 'd91fae759053a70bcedcf02eb33ca4a2')

 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p1 -i $srcdir/gcc43.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ${srcdir}/gcc43.patch
  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
--- a/openexr/gcc43.patch
+++ b/openexr/gcc43.patch
@ -1,22 +1,11 @@
-diff -Nura openexr-1.6.1/exrenvmap/main.cpp openexr-1.6.1.new/exrenvmap/main.cpp
--- openexr-1.6.1/exrenvmap/main.cpp	2007-04-25 03:07:51.000000000 +0200
-+++ openexr-1.6.1.new/exrenvmap/main.cpp	2008-10-30 17:18:13.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <stdlib.h>
-+#include <string.h>
+--- exrenvmap/blurImage.cpp
+++ exrenvmap/blurImage.cpp
+@@ -39,6 +39,8 @@
+ //
+ //-----------------------------------------------------------------------------
 
- using namespace Imf;
- using namespace std;
-diff -Nura openexr-1.6.1/exrmaketiled/main.cpp openexr-1.6.1.new/exrmaketiled/main.cpp
--- openexr-1.6.1/exrmaketiled/main.cpp	2007-04-25 03:08:45.000000000 +0200
-+++ openexr-1.6.1.new/exrmaketiled/main.cpp	2008-10-30 17:18:40.000000000 +0100
-@@ -46,6 +46,7 @@
- #include <exception>
- #include <string>
- #include <stdlib.h>
-+#include <string.h>
+#include <cstring>
+
+ #include <blurImage.h>
 
- using namespace Imf;
- using namespace std;
+ #include <resizeImage.h>
--- a/openldap/PKGBUILD
+++ b/openldap/PKGBUILD
@ -1,10 +1,12 @@
-# $Id: PKGBUILD 65246 2010-01-25 19:54:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+#
+# Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=openldap
-pkgver=2.4.21
-pkgrel=2
+pkgver=2.4.24
+pkgrel=1
 pkgdesc="LDAP Server"
 arch=('i686' 'x86_64')
 license=('custom')
@ -16,7 +18,7 @@ replaces=('openldap-clients')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgname}-${pkgver}.tgz
 	'slapd'
 	'slapd.default')
-md5sums=('e7128c57b2bacd940e8906057c94ff26'
+md5sums=('116fe1e23a7b67686d5e62274367e6c0'
         'a9c9d906b2132ee3cb3d100ef1c068ae'
         '95f50ebf185b1caf299fa4e3970d8ec2')
 options=('!emptydirs')
@ -28,6 +30,7 @@ build() {
              --libexecdir=/usr/sbin \
              --sysconfdir=/etc \
              --localstatedir=/var/lib/openldap \
+              --enable-bdb \
              --enable-crypt \
              --enable-dynamic \
              --with-threads \
--- a/postfix/PKGBUILD
+++ b/postfix/PKGBUILD
@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=postfix
-pkgver=2.8.1
+pkgver=2.8.3
 pkgrel=1
 pkgdesc="Secure, fast, easy to administer drop in replacement for Sendmail (MTA)"
 arch=('i686' 'x86_64')
@ -23,7 +23,7 @@ url="http://www.postfix.org/"
 source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz \
        ${pkgname}.patch.bz2 \
 	${pkgname})
-md5sums=('3be685a786d36d310cc77b0567b98215'
+md5sums=('b3922ededd3fd6051f759e58a4ada3ae'
         'a3c45ff23ef036143711793fcf2478c3'
         'c847b96f08925f08b0f610468a8e21f6')

--- a/redland/PKGBUILD
+++ b/redland/PKGBUILD
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=redland
 pkgver=1.0.12
-pkgrel=4
+pkgrel=5
 pkgdesc="Library that provides a high-level interface to RDF data"
 url="http://librdf.org/"
 license=("GPL")
--- a/samba/PKGBUILD
+++ b/samba/PKGBUILD
@ -1,6 +1,12 @@
-# $Id: PKGBUILD 76074 2010-04-07 16:41:49Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
 pkgbase=samba
 pkgname=('smbclient' 'samba')
 pkgver=3.5.8
@ -8,7 +14,7 @@ pkgver=3.5.8
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.5.8
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
--- a/zip/PKGBUILD
+++ b/zip/PKGBUILD
@ -1,9 +1,15 @@
-# $Id: PKGBUILD 37029 2009-04-30 04:02:57Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=zip
 pkgver=3.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Creates PKZIP-compatible .zip files"
 arch=(i686 x86_64)
 url="http://www.info-zip.org/pub/infozip/Zip.html"