python-pyopenssl: Upgrade to 0.14

PATCH In review Saul Wold 2 participants 4 messages Mar 18, 2015

Share & tools

Saul Wold

author

2015-03-18 02:54 UTC #0 lore raw

PATCH 1/2 python-pyopenssl: Upgrade to 0.14

This upgrade will match with the openssl 1.0.2 changes
The newer verion of pyopenssl now uses setuptools instead of distutils

Signed-off-by Saul Wold <[email protected]>

---
 .../python/{python-pyopenssl_0.13.bb => python-pyopenssl_0.14.bb} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-devtools/python/{python-pyopenssl_0.13.bb => python-pyopenssl_0.14.bb} (75%)

meta-oe/recipes-devtools/python/python-pyopenssl_0.14.bb renamed from meta-oe/recipes-devtools/python/python-pyopenssl_0.13.bb +4 -4

similarity index 75%
rename from meta-oe/recipes-devtools/python/python-pyopenssl_0.13.bb
rename to meta-oe/recipes-devtools/python/python-pyopenssl_0.14.bb
index 01f43da..1f609e3 100644
@@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRCNAME = "pyOpenSSL"
 
 DEPENDS = "openssl"
-PR = "r1"
 
 SRC_URI = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${PV}.tar.gz"
-SRC_URI[md5sum] = "767bca18a71178ca353dff9e10941929"
-SRC_URI[sha256sum] = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b"
+
+SRC_URI[md5sum] = "8579ff3a1d858858acfba5f046a4ddf7"
+SRC_URI[sha256sum] = "a99db8e59c120138ad8a72eecedcc24b4510d2eed3ce48213b7e32f22cc4ee6e"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit distutils
+inherit setuptools
 
 PACKAGES =+ "${PN}-tests"
 FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test"

Signature · 1 line

2.1.0

Saul Wold

author

2015-03-18 02:54 UTC #1 lore raw

PATCH 2/2 openflow: update libopenflow.m4 to use openssl instead of libssl

openssl provides both the libssl and libcrypto APIs for linkage, the 1.0.2 of OpenSSL removed libcrypto from the libssl.pc

Signed-off-by Saul Wold <[email protected]>

---
 .../recipes-protocols/openflow/openflow.inc        |  4 ++-
 .../openflow/use-openssl-instead-of-libssl.patch   | 34 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-protocols/openflow/openflow/use-openssl-instead-of-libssl.patch

meta-networking/recipes-protocols/openflow/openflow.inc +3 -1

index 1a226f8..7eca1d7 100644
@@ -11,7 +11,9 @@ LICENSE = "GPLv2"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e870c934e2c3d6ccf085fd7cf0a1e2e2"
 
-SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git"
+SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git \
+           file://use-openssl-instead-of-libssl.patch \
+          "
 
 DEPENDS = "virtual/libc"

meta-networking/recipes-protocols/openflow/openflow/use-openssl-instead-of-libssl.patch new file +34 -0

new file mode 100644
index 0000000..724855f
@@ -0,0 +1,34 @@
+OpenSSL 1.0.2 removed -lcrypto from the libssl.pc, but the openssl.pc
+contains both. Since openflow uses both libcrypto and libssl API we
+should use openssl.pc.
+
+Signed-off-by: Saul Wold <[email protected]>
+
+Upstream-Status: Inappropriate [upstream obsolete]
+
+Index: git/m4/libopenflow.m4
+===================================================================
+--- git.orig/m4/libopenflow.m4
++++ git/m4/libopenflow.m4
+@@ -65,7 +65,7 @@ AC_DEFUN([OFP_CHECK_OPENSSL],
+   [AC_ARG_ENABLE(
+      [ssl],
+      [AC_HELP_STRING([--enable-ssl], 
+-                     [Enable ssl support (requires libssl)])],
++                     [Enable ssl support (requires libssl and libcrypto)])],
+      [case "${enableval}" in
+         (yes) ssl=true ;;
+         (no)  ssl=false ;;
+@@ -76,10 +76,10 @@ AC_DEFUN([OFP_CHECK_OPENSSL],
+    if test "$ssl" = true; then
+    dnl Make sure that pkg-config is installed.
+    m4_pattern_forbid([PKG_CHECK_MODULES])
+-   PKG_CHECK_MODULES([SSL], [libssl], 
++   PKG_CHECK_MODULES([SSL], [openssl], 
+      [HAVE_OPENSSL=yes],
+      [HAVE_OPENSSL=no
+-      AC_MSG_WARN([Cannot find libssl:
++      AC_MSG_WARN([Cannot find OpenSSL Libraries:
+ 
+    $SSL_PKG_ERRORS
+

Signature · 1 line

2.1.0

Martin Jansa

2015-03-18 13:44 UTC #2 lore raw

Re: [PATCH 2/2] openflow: update libopenflow.m4 to use openssl instead of libssl

Quoted 2 lines · Saul Wold

openssl provides both the libssl and libcrypto APIs for linkage, the 1.0.2 of OpenSSL removed libcrypto from the libssl.pc

This should be already resolved by:
Joe MacDonald : openflow: add libcrypto to static openflow library which was merged today.

Quoted 71 lines

Signed-off-by Saul Wold <[email protected]>

---
 .../recipes-protocols/openflow/openflow.inc        |  4 ++-
 .../openflow/use-openssl-instead-of-libssl.patch   | 34 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-protocols/openflow/openflow/use-openssl-instead-of-libssl.patch

meta-networking/recipes-protocols/openflow/openflow.inc +3 -1

index 1a226f8..7eca1d7 100644
@@ -11,7 +11,9 @@ LICENSE = "GPLv2"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e870c934e2c3d6ccf085fd7cf0a1e2e2"
 
-SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git"
+SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git \
+           file://use-openssl-instead-of-libssl.patch \
+          "
 
 DEPENDS = "virtual/libc"

meta-networking/recipes-protocols/openflow/openflow/use-openssl-instead-of-libssl.patch new file +34 -0

new file mode 100644
index 0000000..724855f
@@ -0,0 +1,34 @@
+OpenSSL 1.0.2 removed -lcrypto from the libssl.pc, but the openssl.pc
+contains both. Since openflow uses both libcrypto and libssl API we
+should use openssl.pc.
+
+Signed-off-by: Saul Wold <[email protected]>
+
+Upstream-Status: Inappropriate [upstream obsolete]
+
+Index: git/m4/libopenflow.m4
+===================================================================
+--- git.orig/m4/libopenflow.m4
++++ git/m4/libopenflow.m4
+@@ -65,7 +65,7 @@ AC_DEFUN([OFP_CHECK_OPENSSL],
+   [AC_ARG_ENABLE(
+      [ssl],
+      [AC_HELP_STRING([--enable-ssl], 
+-                     [Enable ssl support (requires libssl)])],
++                     [Enable ssl support (requires libssl and libcrypto)])],
+      [case "${enableval}" in
+         (yes) ssl=true ;;
+         (no)  ssl=false ;;
+@@ -76,10 +76,10 @@ AC_DEFUN([OFP_CHECK_OPENSSL],
+    if test "$ssl" = true; then
+    dnl Make sure that pkg-config is installed.
+    m4_pattern_forbid([PKG_CHECK_MODULES])
+-   PKG_CHECK_MODULES([SSL], [libssl], 
++   PKG_CHECK_MODULES([SSL], [openssl], 
+      [HAVE_OPENSSL=yes],
+      [HAVE_OPENSSL=no
+-      AC_MSG_WARN([Cannot find libssl:
++      AC_MSG_WARN([Cannot find OpenSSL Libraries:
+ 
+    $SSL_PKG_ERRORS
+

Signature · 7 lines

2.1.0

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

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Saul Wold

author

2015-03-18 22:23 UTC #3 lore raw

Re: [PATCH 2/2] openflow: update libopenflow.m4 to use openssl instead of libssl

Quoted 8 lines · Martin Jansa

Quoted 2 lines · Saul Wold
openssl provides both the libssl and libcrypto APIs for linkage, the 1.0.2 of OpenSSL removed libcrypto from the libssl.pc
This should be already resolved by:
Joe MacDonald : openflow: add libcrypto to static openflow library which was merged today.

Oh well, this is a more correct fix I think. Timing is.

Sau!

Quoted 74 lines

Quoted 71 lines

Signed-off-by Saul Wold <[email protected]>

---
  .../recipes-protocols/openflow/openflow.inc        |  4 ++-
  .../openflow/use-openssl-instead-of-libssl.patch   | 34 ++++++++++++++++++++++
  2 files changed, 37 insertions(+), 1 deletion(-)

create mode 100644 meta-networking/recipes-protocols/openflow/openflow/use-openssl-instead-of-libssl.patch

meta-networking/recipes-protocols/openflow/openflow.inc +3 -1

index 1a226f8..7eca1d7 100644
@@ -11,7 +11,9 @@ LICENSE = "GPLv2"
 
  LIC_FILES_CHKSUM = "file://COPYING;md5=e870c934e2c3d6ccf085fd7cf0a1e2e2"
 
-SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git"
+SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git \
+           file://use-openssl-instead-of-libssl.patch \
+          "
 
  DEPENDS = "virtual/libc"

meta-networking/recipes-protocols/openflow/openflow/use-openssl-instead-of-libssl.patch new file +34 -1

new file mode 100644
index 0000000..724855f
@@ -0,0 +1,34 @@
+OpenSSL 1.0.2 removed -lcrypto from the libssl.pc, but the openssl.pc
+contains both. Since openflow uses both libcrypto and libssl API we
+should use openssl.pc.
+
+Signed-off-by: Saul Wold <[email protected]>
+
+Upstream-Status: Inappropriate [upstream obsolete]
+
+Index: git/m4/libopenflow.m4
+===================================================================
+--- git.orig/m4/libopenflow.m4
++++ git/m4/libopenflow.m4
+@@ -65,7 +65,7 @@ AC_DEFUN([OFP_CHECK_OPENSSL],
+   [AC_ARG_ENABLE(
+      [ssl],
+      [AC_HELP_STRING([--enable-ssl],
+-                     [Enable ssl support (requires libssl)])],
++                     [Enable ssl support (requires libssl and libcrypto)])],
+      [case "${enableval}" in
+         (yes) ssl=true ;;
+         (no)  ssl=false ;;
+@@ -76,10 +76,10 @@ AC_DEFUN([OFP_CHECK_OPENSSL],
+    if test "$ssl" = true; then
+    dnl Make sure that pkg-config is installed.
+    m4_pattern_forbid([PKG_CHECK_MODULES])
+-   PKG_CHECK_MODULES([SSL], [libssl],
++   PKG_CHECK_MODULES([SSL], [openssl],
+      [HAVE_OPENSSL=yes],
+      [HAVE_OPENSSL=no
+-      AC_MSG_WARN([Cannot find libssl:
++      AC_MSG_WARN([Cannot find OpenSSL Libraries:
+
+    $SSL_PKG_ERRORS
+
--

2.1.0

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