Revision: 23939
http://sourceforge.net/p/gar/code/23939
Author: chninkel
Date: 2014-08-07 21:23:32 +0000 (Thu, 07 Aug 2014)
Log Message:
-----------
openssl1/trunk: remove patch
0011-link-heartbeat_test-with-static-libraries.patch that has been applied
upstream
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/Makefile
csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
Removed 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-08-07 20:57:51 UTC (rev
23938)
+++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 21:23:32 UTC (rev
23939)
@@ -160,16 +160,6 @@
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
-
-
# Building openssl with "-j" option doesn't work properly because of
dependencies
# in the Makefile.
# This patch fixes this problem, it's taken from gentoo and adapted so that it
works
Deleted:
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
2014-08-07 20:57:51 UTC (rev 23938)
+++
csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch
2014-08-07 21:23:32 UTC (rev 23939)
@@ -1,40 +0,0 @@
-From 2e251ba8feaa696f9408a19336d1fbab148df55e Mon Sep 17 00:00:00 2001
-From: Kurt Roeckx <[email protected]>
-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 005f2e8..d68e8b0 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -358,6 +358,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}
-+
- FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
- shlib_target="$(SHLIB_TARGET)"; \
- fi; \
-@@ -476,7 +483,7 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
- @target=$(SRPTEST); $(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-08-07 20:57:51 UTC
(rev 23938)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-08-07 21:23:32 UTC
(rev 23939)
@@ -1,6 +1,8 @@
openssl (1.0.1i,rev=2014.08.07) unstable
* New upstream release.
+ * Remove patch 0011-link-heartbeat_test-with-static-libraries
+ that has been applied upstream.
-- yann rouillard <[email protected]> Thu, 07 Aug 2014 22:57:06 +0200
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
