Skip to contentSkip to conversation

openssl: fix libssl.pc to use libcrypto

PATCH In review Saul Wold 2 participants 3 messages Mar 17, 2015

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH v2 1/1 openssl: fix libssl.pc to use libcrypto

The 1.0.2 version of libssl requires that libcrypto be linked so don't keep it private anymore.

---
 .../openssl/fix_Makefile_creation_of_libssl.patch        | 16 ++++++++++++++++
 meta/recipes-connectivity/openssl/openssl_1.0.2.bb       |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch
meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +16 -0
new file mode 100644
index 0000000..e76ab2e
@@ -0,0 +1,16 @@
+Upstream-Status: Pending
+Signed-off-by: Saul Wold <[email protected]>
+
+Index: openssl-1.0.2/Makefile.org
+===================================================================
+--- openssl-1.0.2.orig/Makefile.org
++++ openssl-1.0.2/Makefile.org
+@@ -381,7 +381,7 @@ libssl.pc: Makefile
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires.private: libcrypto'; \
+-	    echo 'Libs: -L$${libdir} -lssl'; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+ 	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+ 
meta/recipes-connectivity/openssl/openssl_1.0.2.bb +1 -0
index 79537f9..a980855 100644
@@ -37,6 +37,7 @@ SRC_URI += "file://configure-targets.patch \
             file://Makefiles-ptest.patch \
             file://ptest-deps.patch \
             file://run-ptest \
+            file://fix_Makefile_creation_of_libssl.patch \
            "
 
 SRC_URI[md5sum] = "38373013fc85c790aabf8837969c5eba"
Signature · 1 line
2.1.0
#1 lore raw
Quoted 22 lines · Saul Wold

The 1.0.2 version of libssl requires that libcrypto be linked so don't keep it private anymore.

---
.../openssl/fix_Makefile_creation_of_libssl.patch | 16 ++++++++++++++++
meta/recipes-connectivity/openssl/openssl_1.0.2.bb | 1 +

2 files changed, 17 insertions(+)

create mode 100644 meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch

meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +3 -0
new file mode 100644
index 0000000..e76ab2e
@@ -0,0 +1,16 @@
+Upstream-Status: Pending
+Signed-off-by: Saul Wold <[email protected]>
+

meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch line 13

Quoted 10 lines
meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +10 -0
+Index: openssl-1.0.2/Makefile.org
+===================================================================
+--- openssl-1.0.2.orig/Makefile.org
++++ openssl-1.0.2/Makefile.org
+@@ -381,7 +381,7 @@ libssl.pc: Makefile
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires.private: libcrypto'; \
+-	    echo 'Libs: -L$${libdir} -lssl'; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \

There must be a reason why upstream changed it to be private. What is the reason ? since reverting like this can have consequences, we need to understand this.

Quoted 23 lines
meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +3 -0
+ 	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+ 
meta/recipes-connectivity/openssl/openssl_1.0.2.bb +1 -0
index 79537f9..a980855 100644
@@ -37,6 +37,7 @@ SRC_URI += "file://configure-targets.patch \
            file://Makefiles-ptest.patch \
            file://ptest-deps.patch \
            file://run-ptest \
+            file://fix_Makefile_creation_of_libssl.patch \
           "
 

SRC_URI[md5sum] = "38373013fc85c790aabf8837969c5eba"

Signature · 7 lines
2.1.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
author
#2 lore raw
Quoted 27 lines · Khem Raj
Quoted 27 lines · Saul Wold

The 1.0.2 version of libssl requires that libcrypto be linked so don't keep it private anymore.

---
.../openssl/fix_Makefile_creation_of_libssl.patch | 16 ++++++++++++++++
meta/recipes-connectivity/openssl/openssl_1.0.2.bb | 1 +

2 files changed, 17 insertions(+)

create mode 100644 meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch

meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +8 -0
new file mode 100644
index 0000000..e76ab2e
@@ -0,0 +1,16 @@
+Upstream-Status: Pending
+Signed-off-by: Saul Wold <[email protected]>
+
+Index: openssl-1.0.2/Makefile.org
+===================================================================
+--- openssl-1.0.2.orig/Makefile.org
++++ openssl-1.0.2/Makefile.org
+@@ -381,7 +381,7 @@ libssl.pc: Makefile
Quoted 9 lines

meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch line 13

Quoted 5 lines
meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +5 -0
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires.private: libcrypto'; \
+-	    echo 'Libs: -L$${libdir} -lssl'; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \

There must be a reason why upstream changed it to be private. What is the reason ? since reverting like this can have consequences, we need to understand this.

Ok drop this patch, it means that we need to fix the openflow recipe since it really is using APIs from both libssl and libcrypto which can be summed up by using the openssl.pc instead of trying to just use libssl.pc which was used because of history in openflow.

Patches to meta-oe will be forth coming for openflow to use openssl.pc and a pyopenssl upgrade.

Sorry for the noise here.

Sau!

Quoted 26 lines
Quoted 23 lines
meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +3 -0
+ 	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+
meta/recipes-connectivity/openssl/openssl_1.0.2.bb +1 -0
index 79537f9..a980855 100644
@@ -37,6 +37,7 @@ SRC_URI += "file://configure-targets.patch \
             file://Makefiles-ptest.patch \
             file://ptest-deps.patch \
             file://run-ptest \
+            file://fix_Makefile_creation_of_libssl.patch \
            "
 

SRC_URI[md5sum] = "38373013fc85c790aabf8837969c5eba" --
2.1.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core