Fri Mar 23 00:01:14 UTC 2012

2 files changed, 47 insertions, 38 deletions

diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index a1169ae23..10e72fcc5 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67496 2012-03-12 21:07:25Z lcarlier $
+# $Id: PKGBUILD 68333 2012-03-21 21:30:50Z lcarlier $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
@@ -13,7 +13,7 @@ if [ "${_git}" = "true" ]; then
     #pkgver=7.10.99.git20110709
     pkgver=7.11
   else
-    pkgver=8.0.1
+    pkgver=8.0.2
 fi
 
 pkgrel=1
@@ -30,7 +30,7 @@ if [ "${_git}" = "true" ]; then
 else
   source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
   #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2")
-  md5sums=('24eeebf66971809d8f40775a379b36c9')
+  md5sums=('a368104e5700707048dc3e8691a9a7a1')
 fi
 
 build() {
@@ -84,7 +84,7 @@ build() {
 package_lib32-libgl() {
   depends=('lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
-  replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri')
+  #replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri')
 
   cd ${srcdir}/?esa-*
   install -m755 -d "${pkgdir}/usr/lib32"
diff --git a/multilib/lib32-openssl/PKGBUILD b/multilib/lib32-openssl/PKGBUILD
index ac6843135..feabb3be0 100644
--- a/multilib/lib32-openssl/PKGBUILD
+++ b/multilib/lib32-openssl/PKGBUILD
@@ -1,56 +1,65 @@
-# $Id: PKGBUILD 62560 2012-01-21 10:57:52Z bluewind $
+# $Id: PKGBUILD 68327 2012-03-21 19:26:09Z pschmitz $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 _pkgbasename=openssl
 pkgname=lib32-$_pkgbasename
-_ver=1.0.0g
+_ver=1.0.1
 # use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+pkgver=$_ver
 pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)'
 arch=('x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
-depends=(lib32-zlib $_pkgbasename)
-optdepends=('ca-certificates' perl gcc-multilib)
+depends=('lib32-zlib' "${_pkgbasename}")
+optdepends=('ca-certificates')
+makedepends=('gcc-multilib')
 options=('!makeflags')
 source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"
+        "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc"
         'no-rpath.patch'
         'ca-dir.patch')
-md5sums=('07ecbe4324f140d157478637d6beccf1'
+md5sums=('134f168bc2a8333f19f81d684841710b'
+         'efbe93c11747fed52e60567819409d8a'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90')
 
-
 build() {
-  export CC="gcc -m32 -mstackrealign"
-  export CXX="g++ -m32 -mstackrealign"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd $srcdir/$_pkgbasename-$_ver
-
-  # remove rpath: http://bugs.archlinux.org/task/14367
-  patch -p0 -i $srcdir/no-rpath.patch
-  # set ca dir to /etc/ssl by default
-  patch -p0 -i $srcdir/ca-dir.patch
-  # mark stack as non-executable: http://bugs.archlinux.org/task/12434
-  ./Configure linux-elf --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
-    shared zlib enable-md2 -Wa,--noexecstack
-
-  make
-
-  # the test fails due to missing write permissions in /etc/ssl
-  # revert this patch for make test
-  #patch -p0 -R -i $srcdir/ca-dir.patch
-  #make test
-  #patch -p0 -i $srcdir/ca-dir.patch
+	export CC="gcc -m32"
+	export CXX="g++ -m32"
+	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+	cd $srcdir/$_pkgbasename-$_ver
+
+	# remove rpath: http://bugs.archlinux.org/task/14367
+	patch -p0 -i $srcdir/no-rpath.patch
+	# set ca dir to /etc/ssl by default
+	patch -p0 -i $srcdir/ca-dir.patch
+	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
+		shared zlib enable-md2 \
+		linux-elf \
+		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
+
+	make MAKEDEPPROG="${CC}" depend
+	make
+}
+
+check() {
+	cd $srcdir/$_pkgbasename-$_ver
+	# the test fails due to missing write permissions in /etc/ssl
+	# revert this patch for make test
+	patch -p0 -R -i $srcdir/ca-dir.patch
+	make test
+	patch -p0 -i $srcdir/ca-dir.patch
 }
 
 package() {
-  cd $srcdir/$_pkgbasename-$_ver
-  make INSTALL_PREFIX=$pkgdir install
-  
-  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/etc"
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+	cd $srcdir/$_pkgbasename-$_ver
+	make INSTALL_PREFIX=$pkgdir install
+
+	rm -rf ${pkgdir}/{usr/{include,share,bin},etc}
+	mkdir -p $pkgdir/usr/share/licenses
+	ln -s $_pkgbasename $pkgdir/usr/share/licenses/$pkgname
 }