SBo scripts not building on current (read 1st post, pls)

nobodino · 05-08-2018, 09:05 AM

fine, it's works.
added your patch to the SlackBuild:
-------------------------
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;

zcat $CWD/cmake_python.patch.gz | patch -Esp1 --verbose || exit 1

mkdir build
-------------------------

55020 · 05-08-2018, 02:59 PM

Someone at our LUG had a moan just now -- since The Day Of The Rebuild, aaa_elflibs no longer has libpng14, which apparently the OpenOffice binary needs. I guess it's time to add a libpng-legacy14 package to your repo, Matteo, and/or to the main SBo repo?

ponce · 05-08-2018, 03:47 PM

Quote:

Originally Posted by 55020

Someone at our LUG had a moan just now -- since The Day Of The Rebuild, aaa_elflibs no longer has libpng14, which apparently the OpenOffice binary needs. I guess it's time to add a libpng-legacy14 package to your repo, Matteo, and/or to the main SBo repo?

I tried to push something, but I don't use OpenOffice here...

https://github.com/Ponce/slackbuilds...ibpng-legacy14

USUARIONUEVO · 05-11-2018, 11:14 AM

Hi , some hard work after openssl pushed to 1.1.x

First i encounter

sbsigntools not build and efitools same not build. (sbsigntools is required by efitools and i have now broken packages, im not sure if after rebuild sbsigntools , the efitools package builds or not)

For sbsigntools , make a look in arch repo

https://www.archlinux.org/packages/e...4/sbsigntools/

ponce · 05-11-2018, 12:23 PM

Quote:

Originally Posted by USUARIONUEVO

Hi , some hard work after openssl pushed to 1.1.x

eh, I started already

http://cgit.ponce.cc/slackbuilds/refs/heads

Quote:

Originally Posted by USUARIONUEVO

First i encounter

sbsigntools not build and efitools same not build. (sbsigntools is required by efitools and i have now broken packages, im not sure if after rebuild sbsigntools , the efitools package builds or not)

For sbsigntools , make a look in arch repo

https://www.archlinux.org/packages/e...4/sbsigntools/

I have done in a different way using the last version from their git repository: check if it's ok for you

http://ponce.cc/slackware/testing/sbsigntools/

if you like you can try also an up-to-date version of efitools

http://ponce.cc/slackware/testing/efitools/

USUARIONUEVO · 05-11-2018, 05:24 PM

Quote:

Originally Posted by ponce

eh, I started already

http://cgit.ponce.cc/slackbuilds/refs/heads

I have done in a different way using the last version from their git repository: check if it's ok for you

http://ponce.cc/slackware/testing/sbsigntools/

if you like you can try also an up-to-date version of efitools

http://ponce.cc/slackware/testing/efitools/

works perfectly man !!!!

Thanks !!!

Melke · 05-12-2018, 02:13 AM

liboauth doesn't compile after the openssl upgrade. After applying a patch from linux from scratch it works again:

http://www.linuxfromscratch.org/patc...-1.1.0-2.patch

ponce · 05-12-2018, 02:22 AM

Quote:

Originally Posted by mmawhin

liboauth doesn't compile after the openssl upgrade. After applying a patch from linux from scratch it works again:

http://www.linuxfromscratch.org/patc...-1.1.0-2.patch

thanks, pushed!

orbea · 05-16-2018, 01:27 AM

Claws-mail stopped working after rebuilding against the newer openssl with the following error.

Code:

*** SSL/TLS handshake failed

Rebuilding libetpan and claws-mail against the older openssl following the instructions in the ChangeLog didn't seem to work and resulted it in not building with openssl at all. I worked around this by building libetpan with the following configure argument.

Code:

--with-gnutls

Edit: The problem with the newer openssl in libetpan is essentially.

Code:

checking openssl/ssl.h usability... yes
checking openssl/ssl.h presence... yes
checking for openssl/ssl.h... yes
checking for main in -lrsaref... no
checking for main in -lcrypto... yes
checking for SSL_library_init in -lssl... no
configure: WARNING: OpenSSL support disabled

Edit: There is also a merged PR for OpenSSL 1.1.0 in the libetpan git master which fixes this issue.

Code:

From f45dff1271ad1718d02356f615f620e6980930ea Mon Sep 17 00:00:00 2001
From: Markus Beth <markus.beth@web.de>
Date: Wed, 6 Dec 2017 23:33:07 +0100
Subject: [PATCH] changes for OpenSSL 1.1.0

- the function SSL_library_init does not exist any more - use SSL_CTX_new
  for the detection of OpenSSL in the configure script
- do not access the SSL structure directly - use the function
  SSL_get_SSL_CTX to access the SSL_CTX
---
 configure.ac                    | 2 +-
 src/data-types/mailstream_ssl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b9130a8e..d99074b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ if test "x$with_openssl" != "xno"; then
   AC_CHECK_HEADER(openssl/ssl.h, [
    AC_CHECK_LIB(rsaref, main, [SSLLIBS="-lrsaref"])
    AC_CHECK_LIB(crypto, main, [SSLLIBS="-lcrypto $SSLLIBS"], [], [$SSLLIBS])
-   AC_CHECK_LIB(ssl, SSL_library_init, with_openssl=yes, [], [$SSLLIBS])])
+   AC_CHECK_LIB(ssl, SSL_CTX_new, with_openssl=yes, [], [$SSLLIBS])])
   if test "x$with_openssl" != "xyes"; then
     CPPFLAGS="$OCPPFLAGS"
     LDFLAGS="$OLDFLAGS"
diff --git a/src/data-types/mailstream_ssl.c b/src/data-types/mailstream_ssl.c
index 25d5845f..ba918f4d 100644
--- a/src/data-types/mailstream_ssl.c
+++ b/src/data-types/mailstream_ssl.c
@@ -408,7 +408,7 @@ static void mailstream_ssl_context_free(struct mailstream_ssl_context * ssl_ctx)
 
 static int mailstream_openssl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 {
-	struct mailstream_ssl_context * ssl_context = (struct mailstream_ssl_context *)SSL_CTX_get_app_data(ssl->ctx);
+	struct mailstream_ssl_context * ssl_context = (struct mailstream_ssl_context *)SSL_CTX_get_app_data(SSL_get_SSL_CTX(ssl));
 	
 	if (x509 == NULL || pkey == NULL) {
 		return 0;

https://github.com/dinhviethoa/libetpan/pull/284

gmgf · 05-16-2018, 01:46 AM

Sorry, posted in bad tread.

ponce · 05-16-2018, 01:49 AM

Quote:

Originally Posted by orbea

Claws-mail stopped working after rebuilding against the newer openssl with the following error.

Code:

*** SSL/TLS handshake failed

Rebuilding libetpan and claws-mail against the older openssl following the instructions in the ChangeLog didn't seem to work and resulted it in not building with openssl at all. I worked around this by building libetpan with the following configure argument.

Code:

--with-gnutls

Edit: The problem with the newer openssl in libetpan is essentially.

Code:

checking openssl/ssl.h usability... yes
checking openssl/ssl.h presence... yes
checking for openssl/ssl.h... yes
checking for main in -lrsaref... no
checking for main in -lcrypto... yes
checking for SSL_library_init in -lssl... no
configure: WARNING: OpenSSL support disabled

I've checked its github and seen that openssl-1.1.x support should be fixed in the latest master: could you please check if building against the latest snapshot works for you?

http://ponce.cc/slackware/testing/libetpan/

orbea · 05-16-2018, 01:54 AM

Yes, it works now. Please check the edit in my post.

orbea · 05-16-2018, 02:49 AM

libtorrent is another build broken by the newer openssl. Here is a relevant issue.

https://github.com/rakshasa/libtorrent/issues/138

It is fixed upstream in the feature-bind branch, specifically in this commit.

Code:

From 4607bbf78040789dee29266878ce109136b984ef Mon Sep 17 00:00:00 2001
From: rakshasa <sundell.software@gmail.com>
Date: Tue, 20 Dec 2016 19:51:02 +0900
Subject: [PATCH] Added support for openssl 1.1.

---
 configure.ac                |  4 ++++
 src/utils/diffie_hellman.cc | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 65e34872..27e33570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,12 +69,15 @@ AC_ARG_ENABLE(openssl,
   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],
   [
     if test "$enableval" = "yes"; then
+dnl move to scripts.
       PKG_CHECK_MODULES(OPENSSL, libcrypto,
         CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
         LIBS="$LIBS $OPENSSL_LIBS")
 
       AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
       AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
+      AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
+
     else
       AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.)
     fi
@@ -85,6 +88,7 @@ AC_ARG_ENABLE(openssl,
 
     AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
     AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
+    AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
   ]
 )
 
diff --git a/src/utils/diffie_hellman.cc b/src/utils/diffie_hellman.cc
index aa653d45..7ec13165 100644
--- a/src/utils/diffie_hellman.cc
+++ b/src/utils/diffie_hellman.cc
@@ -54,11 +54,23 @@ DiffieHellman::DiffieHellman(const unsigned char *prime, int primeLength,
   m_secret(NULL), m_size(0) {
 
 #ifdef USE_OPENSSL
+
   m_dh = DH_new();
+
+#ifdef USE_OPENSSL_1_1
+  BIGNUM * const dh_p = BN_bin2bn(prime, primeLength, NULL);
+  BIGNUM * const dh_g = BN_bin2bn(generator, generatorLength, NULL);
+
+  if (dh_p == NULL || dh_g == NULL ||
+      !DH_set0_pqg(m_dh, dh_p, NULL, dh_g))
+	  throw internal_error("Could not generate Diffie-Hellman parameters");
+#else
   m_dh->p = BN_bin2bn(prime, primeLength, NULL);
   m_dh->g = BN_bin2bn(generator, generatorLength, NULL);
+#endif
 
   DH_generate_key(m_dh);
+
 #else
   throw internal_error("Compiled without encryption support.");
 #endif
@@ -74,7 +86,19 @@ DiffieHellman::~DiffieHellman() {
 bool
 DiffieHellman::is_valid() const {
 #ifdef USE_OPENSSL
+  if (m_dh == NULL)
+    return false;
+
+#ifdef USE_OPENSSL_1_1
+  const BIGNUM *pub_key;
+
+  DH_get0_key(m_dh, &pub_key, NULL);
+
+  return pub_key != NULL;
+#else
   return m_dh != NULL && m_dh->pub_key != NULL;
+#endif
+
 #else
   return false;
 #endif
@@ -103,8 +127,16 @@ DiffieHellman::store_pub_key(unsigned char* dest, unsigned int length) {
 #ifdef USE_OPENSSL
   std::memset(dest, 0, length);
 
-  if ((int)length >= BN_num_bytes(m_dh->pub_key))
-    BN_bn2bin(m_dh->pub_key, dest + length - BN_num_bytes(m_dh->pub_key));
+  const BIGNUM *pub_key;
+
+#ifdef USE_OPENSSL_1_1
+  DH_get0_key(m_dh, &pub_key, NULL);
+#else
+  pub_key = m_dh->pub_key;
+#endif
+
+  if ((int)length >= BN_num_bytes(pub_key))
+    BN_bn2bin(pub_key, dest + length - BN_num_bytes(pub_key));
 #endif
 }

https://github.com/rakshasa/libtorre...ce109136b984ef

This however reveals a second build issue, autoreconf no longer works with libtorrent, but this is fixed in the master branch in this merged PR.

Code:

From b8b24b58a9bed6db1c886ea71a9bb407fb41fc2f Mon Sep 17 00:00:00 2001
From: rakshasa <sundell.software@gmail.com>
Date: Sun, 23 Oct 2016 08:54:11 +0900
Subject: [PATCH] Use pkg-config for cppunit.

---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2b3eb7ab..65e34872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS(config.h)
-AM_PATH_CPPUNIT(1.9.6)
 
 AC_PROG_CXX
 
@@ -60,9 +59,11 @@ CC_ATTRIBUTE_VISIBILITY
 AX_PTHREAD
 AX_CHECK_ZLIB
 
-CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
-CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
-LIBS="$PTHREAD_LIBS $LIBS"
+PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
+
+CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
+CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
+LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
 
 AC_ARG_ENABLE(openssl,
   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],

https://github.com/rakshasa/libtorrent/pull/118

After applying both patches and adding 'autoreconf -fi' before configure libtorrent now builds and works.

ponce · 05-16-2018, 03:26 AM

Quote:

Originally Posted by orbea

libtorrent is another build broken by the newer openssl. Here is a relevant issue.
[...]

maybe you missed it, but I should had fixed this some days ago (I used autogen.sh, not autoreconf)...

http://cgit.ponce.cc/slackbuilds/commit/?h=libtorrent

orbea · 05-16-2018, 03:28 AM

Yes, I missed it.

That said the second patch is probably better to use than sed here?