[138467] trunk/dports/devel/openssl
larryv at macports.org
larryv at macports.org
Thu Jul 9 09:51:21 PDT 2015
Revision: 138467
https://trac.macports.org/changeset/138467
Author: larryv at macports.org
Date: 2015-07-09 09:51:20 -0700 (Thu, 09 Jul 2015)
Log Message:
-----------
openssl: Rename patches
Modified Paths:
--------------
trunk/dports/devel/openssl/Portfile
Added Paths:
-----------
trunk/dports/devel/openssl/files/install-headers-HFS+.patch
trunk/dports/devel/openssl/files/parallel-building.patch
trunk/dports/devel/openssl/files/remove-duplicate-bn_print-doc.patch
trunk/dports/devel/openssl/files/x86_64-asm-on-i386.patch
Removed Paths:
-------------
trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff
trunk/dports/devel/openssl/files/patch-bn_internal.pod.diff
trunk/dports/devel/openssl/files/patch-crypto-Makefile.diff
trunk/dports/devel/openssl/files/patch-crypto-perlasm-x86_64-xlate.pl.diff
Modified: trunk/dports/devel/openssl/Portfile
===================================================================
--- trunk/dports/devel/openssl/Portfile 2015-07-09 14:51:46 UTC (rev 138466)
+++ trunk/dports/devel/openssl/Portfile 2015-07-09 16:51:20 UTC (rev 138467)
@@ -35,10 +35,10 @@
rmd160 a54501f8bdfe0608f1020b7401eca83b8d947e58 \
sha256 0038ba37f35a6367c58f17a7a7f687953ef8ce4f9684bbdec63e62515ed36a83
-patchfiles patch-bn_internal.pod.diff \
- patch-crypto-Makefile.diff \
- patch-Makefile.org-parallel.diff \
- patch-crypto-perlasm-x86_64-xlate.pl.diff
+patchfiles install-headers-HFS+.patch \
+ parallel-building.patch \
+ remove-duplicate-bn_print-doc.patch \
+ x86_64-asm-on-i386.patch
configure.ccache no
configure.perl /usr/bin/perl
Copied: trunk/dports/devel/openssl/files/install-headers-HFS+.patch (from rev 138466, trunk/dports/devel/openssl/files/patch-crypto-Makefile.diff)
===================================================================
--- trunk/dports/devel/openssl/files/install-headers-HFS+.patch (rev 0)
+++ trunk/dports/devel/openssl/files/install-headers-HFS+.patch 2015-07-09 16:51:20 UTC (rev 138467)
@@ -0,0 +1,24 @@
+--- crypto/bf/Makefile.orig 2005-09-28 16:51:37.000000000 -0700
++++ crypto/bf/Makefile 2005-09-28 16:52:25.000000000 -0700
+@@ -2,6 +2,9 @@
+ # OpenSSL/crypto/blowfish/Makefile
+ #
+
++# Case-insensitive HFS+
++.PHONY: install
++
+ DIR= bf
+ TOP= ../..
+ CC= cc
+--- crypto/des/Makefile.orig 2005-09-28 16:51:42.000000000 -0700
++++ crypto/des/Makefile 2005-09-28 16:52:15.000000000 -0700
+@@ -2,6 +2,9 @@
+ # OpenSSL/crypto/des/Makefile
+ #
+
++# Case-insensitive HFS+
++.PHONY: install
++
+ DIR= des
+ TOP= ../..
+ CC= cc
Copied: trunk/dports/devel/openssl/files/parallel-building.patch (from rev 138466, trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff)
===================================================================
--- trunk/dports/devel/openssl/files/parallel-building.patch (rev 0)
+++ trunk/dports/devel/openssl/files/parallel-building.patch 2015-07-09 16:51:20 UTC (rev 138467)
@@ -0,0 +1,46 @@
+Index: Makefile.org
+===================================================================
+--- Makefile.org.orig
++++ Makefile.org
+@@ -275,15 +275,15 @@ build_libs: build_crypto build_ssl build
+
+ build_crypto:
+ @dir=crypto; target=all; $(BUILD_ONE_CMD)
+-build_ssl:
++build_ssl: build_crypto
+ @dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines:
++build_engines: build_crypto
+ @dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps:
++build_apps: build_libs
+ @dir=apps; target=all; $(BUILD_ONE_CMD)
+-build_tests:
++build_tests: build_libs
+ @dir=test; target=all; $(BUILD_ONE_CMD)
+-build_tools:
++build_tools: build_libs
+ @dir=tools; target=all; $(BUILD_ONE_CMD)
+
+ all_testapps: build_libs build_testapps
+@@ -536,9 +536,9 @@ dist:
+ dist_pem_h:
+ (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+
+-install: all install_docs install_sw
++install: install_docs install_sw
+
+-install_sw:
++install_sw: build_all openssl.pc libssl.pc libcrypto.pc
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+@@ -636,7 +636,7 @@ install_html_docs:
+ done; \
+ done
+
+-install_docs:
++install_docs: build_all
+ @$(PERL) $(TOP)/util/mkdir-p.pl \
+ $(INSTALL_PREFIX)$(MANDIR)/man1 \
+ $(INSTALL_PREFIX)$(MANDIR)/man3 \
Deleted: trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff
===================================================================
--- trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff 2015-07-09 14:51:46 UTC (rev 138466)
+++ trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff 2015-07-09 16:51:20 UTC (rev 138467)
@@ -1,46 +0,0 @@
-Index: Makefile.org
-===================================================================
---- Makefile.org.orig
-+++ Makefile.org
-@@ -275,15 +275,15 @@ build_libs: build_crypto build_ssl build
-
- build_crypto:
- @dir=crypto; target=all; $(BUILD_ONE_CMD)
--build_ssl:
-+build_ssl: build_crypto
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
--build_engines:
-+build_engines: build_crypto
- @dir=engines; target=all; $(BUILD_ONE_CMD)
--build_apps:
-+build_apps: build_libs
- @dir=apps; target=all; $(BUILD_ONE_CMD)
--build_tests:
-+build_tests: build_libs
- @dir=test; target=all; $(BUILD_ONE_CMD)
--build_tools:
-+build_tools: build_libs
- @dir=tools; target=all; $(BUILD_ONE_CMD)
-
- all_testapps: build_libs build_testapps
-@@ -536,9 +536,9 @@ dist:
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
-
--install: all install_docs install_sw
-+install: install_docs install_sw
-
--install_sw:
-+install_sw: build_all openssl.pc libssl.pc libcrypto.pc
- @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -636,7 +636,7 @@ install_html_docs:
- done; \
- done
-
--install_docs:
-+install_docs: build_all
- @$(PERL) $(TOP)/util/mkdir-p.pl \
- $(INSTALL_PREFIX)$(MANDIR)/man1 \
- $(INSTALL_PREFIX)$(MANDIR)/man3 \
Deleted: trunk/dports/devel/openssl/files/patch-bn_internal.pod.diff
===================================================================
--- trunk/dports/devel/openssl/files/patch-bn_internal.pod.diff 2015-07-09 14:51:46 UTC (rev 138466)
+++ trunk/dports/devel/openssl/files/patch-bn_internal.pod.diff 2015-07-09 16:51:20 UTC (rev 138467)
@@ -1,36 +0,0 @@
---- doc/crypto/bn_internal.pod.orig 2009-10-28 14:51:56.000000000 +0100
-+++ doc/crypto/bn_internal.pod 2011-09-19 13:23:54.000000000 +0200
-@@ -8,7 +8,7 @@
- bn_mul_low_normal, bn_mul_recursive, bn_mul_part_recursive,
- bn_mul_low_recursive, bn_mul_high, bn_sqr_normal, bn_sqr_recursive,
- bn_expand, bn_wexpand, bn_expand2, bn_fix_top, bn_check_top,
--bn_print, bn_dump, bn_set_max, bn_set_high, bn_set_low - BIGNUM
-+bn_dump, bn_set_max, bn_set_high, bn_set_low - BIGNUM
- library internal functions
-
- =head1 SYNOPSIS
-@@ -57,7 +57,6 @@
- void bn_fix_top(BIGNUM *a);
-
- void bn_check_top(BIGNUM *a);
-- void bn_print(BIGNUM *a);
- void bn_dump(BN_ULONG *d, int n);
- void bn_set_max(BIGNUM *a);
- void bn_set_high(BIGNUM *r, BIGNUM *a, int n);
-@@ -221,14 +220,14 @@
- bn_check_top() verifies that C<((a)-E<gt>top E<gt>= 0 && (a)-E<gt>top
- E<lt>= (a)-E<gt>dmax)>. A violation will cause the program to abort.
-
--bn_print() prints B<a> to stderr. bn_dump() prints B<n> words at B<d>
-+bn_dump() prints B<n> words at B<d>
- (in reverse order, i.e. most significant word first) to stderr.
-
- bn_set_max() makes B<a> a static number with a B<dmax> of its current size.
- This is used by bn_set_low() and bn_set_high() to make B<r> a read-only
- B<BIGNUM> that contains the B<n> low or high words of B<a>.
-
--If B<BN_DEBUG> is not defined, bn_check_top(), bn_print(), bn_dump()
-+If B<BN_DEBUG> is not defined, bn_check_top(), bn_dump()
- and bn_set_max() are defined as empty macros.
-
- =head1 SEE ALSO
Deleted: trunk/dports/devel/openssl/files/patch-crypto-Makefile.diff
===================================================================
--- trunk/dports/devel/openssl/files/patch-crypto-Makefile.diff 2015-07-09 14:51:46 UTC (rev 138466)
+++ trunk/dports/devel/openssl/files/patch-crypto-Makefile.diff 2015-07-09 16:51:20 UTC (rev 138467)
@@ -1,24 +0,0 @@
---- crypto/bf/Makefile.orig 2005-09-28 16:51:37.000000000 -0700
-+++ crypto/bf/Makefile 2005-09-28 16:52:25.000000000 -0700
-@@ -2,6 +2,9 @@
- # OpenSSL/crypto/blowfish/Makefile
- #
-
-+# Case-insensitive HFS+
-+.PHONY: install
-+
- DIR= bf
- TOP= ../..
- CC= cc
---- crypto/des/Makefile.orig 2005-09-28 16:51:42.000000000 -0700
-+++ crypto/des/Makefile 2005-09-28 16:52:15.000000000 -0700
-@@ -2,6 +2,9 @@
- # OpenSSL/crypto/des/Makefile
- #
-
-+# Case-insensitive HFS+
-+.PHONY: install
-+
- DIR= des
- TOP= ../..
- CC= cc
Deleted: trunk/dports/devel/openssl/files/patch-crypto-perlasm-x86_64-xlate.pl.diff
===================================================================
--- trunk/dports/devel/openssl/files/patch-crypto-perlasm-x86_64-xlate.pl.diff 2015-07-09 14:51:46 UTC (rev 138466)
+++ trunk/dports/devel/openssl/files/patch-crypto-perlasm-x86_64-xlate.pl.diff 2015-07-09 16:51:20 UTC (rev 138467)
@@ -1,42 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
-
-From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier at gentoo.org>
-Date: Sat, 21 Mar 2015 06:01:25 -0400
-Subject: [PATCH] crypto: use bigint in x86-64 perl
-
-When building on x32 systems where the default type is 32bit, make sure
-we can transparently represent 64bit integers. Otherwise we end up with
-build errors like:
-/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s
-Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890.
-...
-ghash-x86_64.s: Assembler messages:
-ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression
-
-We don't enable this globally as there are some cases where we'd get
-32bit values interpreted as unsigned when we need them as signed.
-
-Reported-by: Bertrand Jacquin <bertrand at jacquin.bzh>
-URL: https://bugs.gentoo.org/542618
----
- crypto/perlasm/x86_64-xlate.pl | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
-index aae8288..0bf9774 100755
---- crypto/perlasm/x86_64-xlate.pl
-+++ crypto/perlasm/x86_64-xlate.pl
-@@ -195,6 +195,10 @@ my %globals;
- sub out {
- my $self = shift;
-
-+ # When building on x32 ABIs, the expanded hex value might be too
-+ # big to fit into 32bits. Enable transparent 64bit support here
-+ # so we can safely print it out.
-+ use bigint;
- if ($gas) {
- # Solaris /usr/ccs/bin/as can't handle multiplications
- # in $self->{value}
---
-2.3.3
Copied: trunk/dports/devel/openssl/files/remove-duplicate-bn_print-doc.patch (from rev 138466, trunk/dports/devel/openssl/files/patch-bn_internal.pod.diff)
===================================================================
--- trunk/dports/devel/openssl/files/remove-duplicate-bn_print-doc.patch (rev 0)
+++ trunk/dports/devel/openssl/files/remove-duplicate-bn_print-doc.patch 2015-07-09 16:51:20 UTC (rev 138467)
@@ -0,0 +1,36 @@
+--- doc/crypto/bn_internal.pod.orig 2009-10-28 14:51:56.000000000 +0100
++++ doc/crypto/bn_internal.pod 2011-09-19 13:23:54.000000000 +0200
+@@ -8,7 +8,7 @@
+ bn_mul_low_normal, bn_mul_recursive, bn_mul_part_recursive,
+ bn_mul_low_recursive, bn_mul_high, bn_sqr_normal, bn_sqr_recursive,
+ bn_expand, bn_wexpand, bn_expand2, bn_fix_top, bn_check_top,
+-bn_print, bn_dump, bn_set_max, bn_set_high, bn_set_low - BIGNUM
++bn_dump, bn_set_max, bn_set_high, bn_set_low - BIGNUM
+ library internal functions
+
+ =head1 SYNOPSIS
+@@ -57,7 +57,6 @@
+ void bn_fix_top(BIGNUM *a);
+
+ void bn_check_top(BIGNUM *a);
+- void bn_print(BIGNUM *a);
+ void bn_dump(BN_ULONG *d, int n);
+ void bn_set_max(BIGNUM *a);
+ void bn_set_high(BIGNUM *r, BIGNUM *a, int n);
+@@ -221,14 +220,14 @@
+ bn_check_top() verifies that C<((a)-E<gt>top E<gt>= 0 && (a)-E<gt>top
+ E<lt>= (a)-E<gt>dmax)>. A violation will cause the program to abort.
+
+-bn_print() prints B<a> to stderr. bn_dump() prints B<n> words at B<d>
++bn_dump() prints B<n> words at B<d>
+ (in reverse order, i.e. most significant word first) to stderr.
+
+ bn_set_max() makes B<a> a static number with a B<dmax> of its current size.
+ This is used by bn_set_low() and bn_set_high() to make B<r> a read-only
+ B<BIGNUM> that contains the B<n> low or high words of B<a>.
+
+-If B<BN_DEBUG> is not defined, bn_check_top(), bn_print(), bn_dump()
++If B<BN_DEBUG> is not defined, bn_check_top(), bn_dump()
+ and bn_set_max() are defined as empty macros.
+
+ =head1 SEE ALSO
Copied: trunk/dports/devel/openssl/files/x86_64-asm-on-i386.patch (from rev 138466, trunk/dports/devel/openssl/files/patch-crypto-perlasm-x86_64-xlate.pl.diff)
===================================================================
--- trunk/dports/devel/openssl/files/x86_64-asm-on-i386.patch (rev 0)
+++ trunk/dports/devel/openssl/files/x86_64-asm-on-i386.patch 2015-07-09 16:51:20 UTC (rev 138467)
@@ -0,0 +1,42 @@
+https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
+
+From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier at gentoo.org>
+Date: Sat, 21 Mar 2015 06:01:25 -0400
+Subject: [PATCH] crypto: use bigint in x86-64 perl
+
+When building on x32 systems where the default type is 32bit, make sure
+we can transparently represent 64bit integers. Otherwise we end up with
+build errors like:
+/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s
+Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890.
+...
+ghash-x86_64.s: Assembler messages:
+ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression
+
+We don't enable this globally as there are some cases where we'd get
+32bit values interpreted as unsigned when we need them as signed.
+
+Reported-by: Bertrand Jacquin <bertrand at jacquin.bzh>
+URL: https://bugs.gentoo.org/542618
+---
+ crypto/perlasm/x86_64-xlate.pl | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
+index aae8288..0bf9774 100755
+--- crypto/perlasm/x86_64-xlate.pl
++++ crypto/perlasm/x86_64-xlate.pl
+@@ -195,6 +195,10 @@ my %globals;
+ sub out {
+ my $self = shift;
+
++ # When building on x32 ABIs, the expanded hex value might be too
++ # big to fit into 32bits. Enable transparent 64bit support here
++ # so we can safely print it out.
++ use bigint;
+ if ($gas) {
+ # Solaris /usr/ccs/bin/as can't handle multiplications
+ # in $self->{value}
+--
+2.3.3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150709/95e9019b/attachment-0001.html>
More information about the macports-changes
mailing list