|
@@ -0,0 +1,55 @@
|
|
|
+From 69774132422af1d017008eb5daed8e2099d2fa0a Mon Sep 17 00:00:00 2001
|
|
|
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
|
|
+Date: Wed, 31 Aug 2016 21:55:51 +0200
|
|
|
+Subject: [PATCH 2/2] Make sure @SHOUT_REQUIRES@ contains OpenSSL
|
|
|
+MIME-Version: 1.0
|
|
|
+Content-Type: text/plain; charset=UTF-8
|
|
|
+Content-Transfer-Encoding: 8bit
|
|
|
+
|
|
|
+Static linking userspace programs such as mpd against libshout
|
|
|
+currently doesn't work out of the box, because libshout is linked
|
|
|
+against libssl, but this isn't expressed in libshouts pkg-config
|
|
|
+file:
|
|
|
+
|
|
|
+```
|
|
|
+/usr/lib/libshout.a(tls.o): In function `tls_check_cert':
|
|
|
+tls.c:(.text+0x10): undefined reference to `SSL_get_peer_certificate'
|
|
|
+tls.c:(.text+0x24): undefined reference to `SSL_get_verify_result'
|
|
|
+tls.c:(.text+0x4c): undefined reference to `X509_get_subject_name'
|
|
|
+tls.c:(.text+0x60): undefined reference to `X509_NAME_get_text_by_NID'
|
|
|
+tls.c:(.text+0x118): undefined reference to `X509_NAME_get_entry'
|
|
|
+tls.c:(.text+0x11c): undefined reference to `X509_NAME_ENTRY_get_data'
|
|
|
+tls.c:(.text+0x120): undefined reference to `ASN1_STRING_length'
|
|
|
+tls.c:(.text+0x148): undefined reference to `X509_free'
|
|
|
+tls.c:(.text+0x178): undefined reference to `X509_NAME_get_index_by_NID'
|
|
|
+```
|
|
|
+
|
|
|
+Since OpenSSL installs its own .pc files, make sure that @SHOUT_REQUIRES@
|
|
|
+contains `ssl`.
|
|
|
+
|
|
|
+Upstream status: pending
|
|
|
+https://github.com/xiph/Icecast-libshout/pull/5
|
|
|
+
|
|
|
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
|
+---
|
|
|
+ configure.ac | 4 ++++
|
|
|
+ 1 file changed, 4 insertions(+)
|
|
|
+
|
|
|
+diff --git a/configure.ac b/configure.ac
|
|
|
+index 85f18ad..2b9c505 100644
|
|
|
+--- a/configure.ac
|
|
|
++++ b/configure.ac
|
|
|
+@@ -197,6 +197,10 @@ XIPH_PATH_OPENSSL([
|
|
|
+ ])
|
|
|
+ AC_SUBST([SHOUT_TLS])
|
|
|
+ AM_CONDITIONAL([HAVE_TLS], [test -n "$OPENSSL_LIBS"])
|
|
|
++if test "$SHOUT_TLS" = "1"
|
|
|
++then
|
|
|
++ SHOUT_REQUIRES="$SHOUT_REQUIRES, libssl"
|
|
|
++fi
|
|
|
+
|
|
|
+ SHOUT_VERSION="$VERSION"
|
|
|
+ SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS"
|
|
|
+--
|
|
|
+2.9.3
|
|
|
+
|