[arch-commits] Commit in lib32-openssl/trunk (2 files)

[Pierre Schmitz]

    Date: Tuesday, April 8, 2014 @ 05:49:31
  Author: pierre
Revision: 108953

upgpkg: lib32-openssl 1.0.1.g-1

Modified:
  lib32-openssl/trunk/PKGBUILD
Deleted:
  lib32-openssl/trunk/Makefile.org-Fix-usage-of-CC-gcc-m32.patch

--------------------------------------------+
 Makefile.org-Fix-usage-of-CC-gcc-m32.patch |   31 ---------------------------
 PKGBUILD                                   |   13 ++++-------
 2 files changed, 5 insertions(+), 39 deletions(-)

Deleted: Makefile.org-Fix-usage-of-CC-gcc-m32.patch
===================================================================
--- Makefile.org-Fix-usage-of-CC-gcc-m32.patch	2014-04-08 00:11:52 UTC (rev 108952)
+++ Makefile.org-Fix-usage-of-CC-gcc-m32.patch	2014-04-08 03:49:31 UTC (rev 108953)
@@ -1,31 +0,0 @@
-From 57bf275b260d74e9a1a6d84e180629b671e95fbe Mon Sep 17 00:00:00 2001
-From: Pierre Schmitz <pierre at archlinux.de>
-Date: Sun, 12 Jan 2014 11:31:05 +0100
-Subject: [PATCH] Makefile.org: Fix usage of CC=gcc -m32
-
-Commit 60adefa61025ffd7d56cf7ff8491008f783282bf introduced the use of the CC
-variable without quoting. This breaks e.g. multilib builds where CC is set to
-"gcc -m32".
-
-Signed-off-by: Pierre Schmitz <pierre at archlinux.de>
----
- Makefile.org | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.org b/Makefile.org
-index a9e2727..65a686d 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -302,7 +302,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
- 			FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
- 			export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
- 		fi; \
--		$(MAKE) -e SHLIBDIRS=crypto  CC=$${CC:-$(CC)} build-shared; \
-+		$(MAKE) -e SHLIBDIRS=crypto  CC="$${CC:-$(CC)}" build-shared; \
- 		touch -c fips_premain_dso$(EXE_EXT); \
- 	else \
- 		echo "There's no support for shared libraries on this platform" >&2; \
-
--- 
-1.8.5.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-08 00:11:52 UTC (rev 108952)
+++ PKGBUILD	2014-04-08 03:49:31 UTC (rev 108953)
@@ -3,11 +3,11 @@
 
 _pkgbasename=openssl
 pkgname=lib32-$_pkgbasename
-_ver=1.0.1f
+_ver=1.0.1g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=2
+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'
@@ -19,13 +19,11 @@
 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'
-        'Makefile.org-Fix-usage-of-CC-gcc-m32.patch')
-md5sums=('f26b09c028a0541cab33da697d522b25'
+        'ca-dir.patch')
+md5sums=('de62b43dfcd858e66a74bee1c834e959'
          'SKIP'
          'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90'
-         '538d32f38705a24789c86e7a5be771d1')
+         '3bf51be3a1bbd262be46dc619f92aa90')
 
 prepare() {
 	cd $srcdir/$_pkgbasename-$_ver
@@ -34,7 +32,6 @@
 	patch -p0 -i $srcdir/no-rpath.patch
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i $srcdir/ca-dir.patch
-	patch -p1 -i $srcdir/Makefile.org-Fix-usage-of-CC-gcc-m32.patch
 }
 
 build() {