SF.net SVN: gar:[23774] csw/mgar/pkg/openssl1/trunk

[chninkel at users.sourceforge.net]

Revision: 23774
          http://sourceforge.net/p/gar/code/23774
Author:   chninkel
Date:     2014-06-08 12:00:02 +0000 (Sun, 08 Jun 2014)
Log Message:
-----------
openssl1/trunk: fix a compilation issue with the heartbeat_test file

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-06-08 10:32:17 UTC (rev 23773)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-06-08 12:00:02 UTC (rev 23774)
@@ -162,7 +162,16 @@
 PATCHFILES += $(PATCHFILES.$(GARCH).$(GAROSREL))
 
 
+# Currently the heartbeat_test test file doesn't compile because it is linked 
+# dynamically and try to use an internal symbol of libssl.
+# See bug report http://rt.openssl.org/Ticket/Display.html?id=3378
+# This patch solves the problem by linking to the static libraries instead of 
+# dynamic ones (it doesn't matter for a test).
+# It has been sent upstream by the Debian Maintainer of the openssl package
+# see: https://github.com/openssl/openssl/pull/125
+PATCHFILES += 0011-link-heartbeat_test-with-static-libraries.patch
 
+
 LICENSE = LICENSE
 
 ##### Build and installation information #####

Added: csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch	2014-06-08 12:00:02 UTC (rev 23774)
@@ -0,0 +1,41 @@
+From 2e251ba8feaa696f9408a19336d1fbab148df55e Mon Sep 17 00:00:00 2001
+From: Kurt Roeckx <kurt at roeckx.be>
+Date: Sat, 7 Jun 2014 13:32:23 +0200
+Subject: [PATCH] Link heartbeat_test with the static version of the libraries
+
+It's using an internal API that that might not be available in the shared
+library.
+---
+ test/Makefile | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index f1816ac..1dd7bb9 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -420,6 +420,13 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
+ 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+ 		link_app.$${shlib_target}
+ 
++BUILD_CMD_STATIC=shlib_target=; \
++	LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO) $(LIBKRB5)"; \
++	$(MAKE) -f $(TOP)/Makefile.shared -e \
++		APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
++		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
++		link_app.$${shlib_target}
++
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
+ 	@target=$(RSATEST); $(BUILD_CMD)
+ 
+@@ -618,7 +625,7 @@ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
+ 	@target=$(V3NAMETEST); $(BUILD_CMD)
+ 
+ $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
+-	@target=$(HEARTBEATTEST); $(BUILD_CMD)
++	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+ 
+ #$(AESTEST).o: $(AESTEST).c
+ #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
+-- 
+1.9.3
+

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-06-08 10:32:17 UTC (rev 23773)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-06-08 12:00:02 UTC (rev 23774)
@@ -1,5 +1,12 @@
-openssl (1.0.1h,rev=2014.05.06) unstable
+openssl (1.0.1h,rev=2014.06.08) unstable
 
+  * Add the 0011-link-heartbeat_test-with-static-libraries patch to solve a
+  compilation failure for the heartbeat_test file.
+
+   -- yann rouillard <yann at opencsw.org>  Sun, 08 Jun 2014 13:57:57 +0200
+
+openssl (1.0.1h,rev=2014.06.06) unstable
+
   * New upstream release.
 
    -- yann rouillard <yann at opencsw.org>  Thu, 05 Jun 2014 15:09:12 +0200

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.