[arch-commits] Commit in lib32-openssl/repos/multilib-x86_64 (7 files)

Pierre Schmitz pierre at nymeria.archlinux.org
Sun Jan 12 10:50:50 UTC 2014


    Date: Sunday, January 12, 2014 @ 11:50:50
  Author: pierre
Revision: 103845

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-openssl/repos/multilib-x86_64/Makefile.org-Fix-usage-of-CC-gcc-m32.patch
    (from rev 103844, lib32-openssl/trunk/Makefile.org-Fix-usage-of-CC-gcc-m32.patch)
  lib32-openssl/repos/multilib-x86_64/PKGBUILD
    (from rev 103844, lib32-openssl/trunk/PKGBUILD)
  lib32-openssl/repos/multilib-x86_64/ca-dir.patch
    (from rev 103844, lib32-openssl/trunk/ca-dir.patch)
  lib32-openssl/repos/multilib-x86_64/no-rpath.patch
    (from rev 103844, lib32-openssl/trunk/no-rpath.patch)
Deleted:
  lib32-openssl/repos/multilib-x86_64/PKGBUILD
  lib32-openssl/repos/multilib-x86_64/ca-dir.patch
  lib32-openssl/repos/multilib-x86_64/no-rpath.patch

--------------------------------------------+
 Makefile.org-Fix-usage-of-CC-gcc-m32.patch |   31 +++++
 PKGBUILD                                   |  144 +++++++++++++--------------
 ca-dir.patch                               |   66 ++++++------
 no-rpath.patch                             |   22 ++--
 4 files changed, 148 insertions(+), 115 deletions(-)

Copied: lib32-openssl/repos/multilib-x86_64/Makefile.org-Fix-usage-of-CC-gcc-m32.patch (from rev 103844, lib32-openssl/trunk/Makefile.org-Fix-usage-of-CC-gcc-m32.patch)
===================================================================
--- Makefile.org-Fix-usage-of-CC-gcc-m32.patch	                        (rev 0)
+++ Makefile.org-Fix-usage-of-CC-gcc-m32.patch	2014-01-12 10:50:50 UTC (rev 103845)
@@ -0,0 +1,31 @@
+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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-12 10:50:39 UTC (rev 103844)
+++ PKGBUILD	2014-01-12 10:50:50 UTC (rev 103845)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-_pkgbasename=openssl
-pkgname=lib32-$_pkgbasename
-_ver=1.0.1e
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-#pkgver=$_ver
-pkgrel=2
-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')
-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=('66bf6f10f060d561929de96f9dfe5b8c'
-         'e18847df48d39416f4ca5064887a2e28'
-         'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90')
-
-build() {
-	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
-	# workaround for https://rt.openssl.org/Ticket/Display.html?id=2771
-	# See Changes file "Changes between 1.0.1 and 1.0.1a [19 Apr 2012]"
-	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
-		shared zlib enable-md2 \
-		linux-elf \
-		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \
-		-DOPENSSL_NO_TLS1_2_CLIENT \
-		-DOPENSSL_MAX_TLS1_2_CIPHER_LENGTH=50
-
-	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
-	# Do not test TLS1.2 as we disabled it above using OPENSSL_NO_TLS1_2_CLIENT
-	sed 's/TLSv1.2 //g' -i test/testssl
-	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},etc}
-	mkdir -p $pkgdir/usr/share/licenses
-	ln -s $_pkgbasename $pkgdir/usr/share/licenses/$pkgname
-}

Copied: lib32-openssl/repos/multilib-x86_64/PKGBUILD (from rev 103844, lib32-openssl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-01-12 10:50:50 UTC (rev 103845)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+_pkgbasename=openssl
+pkgname=lib32-$_pkgbasename
+_ver=1.0.1f
+# use a pacman compatible version scheme
+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')
+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'
+        'Makefile.org-Fix-usage-of-CC-gcc-m32.patch')
+md5sums=('f26b09c028a0541cab33da697d522b25'
+         'SKIP'
+         'dc78d3d06baffc16217519242ce92478'
+         '3bf51be3a1bbd262be46dc619f92aa90'
+         '538d32f38705a24789c86e7a5be771d1')
+
+prepare() {
+	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
+	patch -p1 -i $srcdir/Makefile.org-Fix-usage-of-CC-gcc-m32.patch
+}
+
+build() {
+ 	export CC="gcc -m32"
+	export CXX="g++ -m32"
+	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+	cd $srcdir/$_pkgbasename-$_ver
+
+	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
+		shared zlib \
+		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_sw
+
+	rm -rf ${pkgdir}/{usr/{include,bin},etc}
+	mkdir -p $pkgdir/usr/share/licenses
+	ln -s $_pkgbasename $pkgdir/usr/share/licenses/$pkgname
+}

Deleted: ca-dir.patch
===================================================================
--- ca-dir.patch	2014-01-12 10:50:39 UTC (rev 103844)
+++ ca-dir.patch	2014-01-12 10:50:50 UTC (rev 103845)
@@ -1,33 +0,0 @@
---- apps/CA.pl.in	2006-04-28 02:30:49.000000000 +0200
-+++ apps/CA.pl.in	2010-04-01 00:35:02.600553509 +0200
-@@ -53,7 +53,7 @@
- $X509="$openssl x509";
- $PKCS12="$openssl pkcs12";
- 
--$CATOP="./demoCA";
-+$CATOP="/etc/ssl";
- $CAKEY="cakey.pem";
- $CAREQ="careq.pem";
- $CACERT="cacert.pem";
---- apps/CA.sh	2009-10-15 19:27:47.000000000 +0200
-+++ apps/CA.sh	2010-04-01 00:35:02.600553509 +0200
-@@ -68,7 +68,7 @@
- X509="$OPENSSL x509"
- PKCS12="openssl pkcs12"
- 
--if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
-+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
- CAKEY=./cakey.pem
- CAREQ=./careq.pem
- CACERT=./cacert.pem
---- apps/openssl.cnf	2009-04-04 20:09:43.000000000 +0200
-+++ apps/openssl.cnf	2010-04-01 00:35:02.607220681 +0200
-@@ -39,7 +39,7 @@
- ####################################################################
- [ CA_default ]
- 
--dir		= ./demoCA		# Where everything is kept
-+dir		= /etc/ssl		# Where everything is kept
- certs		= $dir/certs		# Where the issued certs are kept
- crl_dir		= $dir/crl		# Where the issued crl are kept
- database	= $dir/index.txt	# database index file.

Copied: lib32-openssl/repos/multilib-x86_64/ca-dir.patch (from rev 103844, lib32-openssl/trunk/ca-dir.patch)
===================================================================
--- ca-dir.patch	                        (rev 0)
+++ ca-dir.patch	2014-01-12 10:50:50 UTC (rev 103845)
@@ -0,0 +1,33 @@
+--- apps/CA.pl.in	2006-04-28 02:30:49.000000000 +0200
++++ apps/CA.pl.in	2010-04-01 00:35:02.600553509 +0200
+@@ -53,7 +53,7 @@
+ $X509="$openssl x509";
+ $PKCS12="$openssl pkcs12";
+ 
+-$CATOP="./demoCA";
++$CATOP="/etc/ssl";
+ $CAKEY="cakey.pem";
+ $CAREQ="careq.pem";
+ $CACERT="cacert.pem";
+--- apps/CA.sh	2009-10-15 19:27:47.000000000 +0200
++++ apps/CA.sh	2010-04-01 00:35:02.600553509 +0200
+@@ -68,7 +68,7 @@
+ X509="$OPENSSL x509"
+ PKCS12="openssl pkcs12"
+ 
+-if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
++if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
+ CAKEY=./cakey.pem
+ CAREQ=./careq.pem
+ CACERT=./cacert.pem
+--- apps/openssl.cnf	2009-04-04 20:09:43.000000000 +0200
++++ apps/openssl.cnf	2010-04-01 00:35:02.607220681 +0200
+@@ -39,7 +39,7 @@
+ ####################################################################
+ [ CA_default ]
+ 
+-dir		= ./demoCA		# Where everything is kept
++dir		= /etc/ssl		# Where everything is kept
+ certs		= $dir/certs		# Where the issued certs are kept
+ crl_dir		= $dir/crl		# Where the issued crl are kept
+ database	= $dir/index.txt	# database index file.

Deleted: no-rpath.patch
===================================================================
--- no-rpath.patch	2014-01-12 10:50:39 UTC (rev 103844)
+++ no-rpath.patch	2014-01-12 10:50:50 UTC (rev 103845)
@@ -1,11 +0,0 @@
---- Makefile.shared.no-rpath	2005-06-23 22:47:54.000000000 +0200
-+++ Makefile.shared	2005-11-16 22:35:37.000000000 +0100
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to

Copied: lib32-openssl/repos/multilib-x86_64/no-rpath.patch (from rev 103844, lib32-openssl/trunk/no-rpath.patch)
===================================================================
--- no-rpath.patch	                        (rev 0)
+++ no-rpath.patch	2014-01-12 10:50:50 UTC (rev 103845)
@@ -0,0 +1,11 @@
+--- Makefile.shared.no-rpath	2005-06-23 22:47:54.000000000 +0200
++++ Makefile.shared	2005-11-16 22:35:37.000000000 +0100
+@@ -153,7 +153,7 @@
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(CFLAGS)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to




More information about the arch-commits mailing list