• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch
Jörg KrauseJörg Krause committed e65cf4c4ff131 Aug 2016
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
From 69774132422af1d017008eb5daed8e2099d2fa0a Mon Sep 17 00:00:00 2001
2
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
3
Date: Wed, 31 Aug 2016 21:55:51 +0200
4
Subject: [PATCH 2/2] Make sure @SHOUT_REQUIRES@ contains OpenSSL
5
MIME-Version: 1.0
6
Content-Type: text/plain; charset=UTF-8
7
Content-Transfer-Encoding: 8bit
8
​
9
Static linking userspace programs such as mpd against libshout
10
currently doesn't work out of the box, because libshout is linked
11
against libssl, but this isn't expressed in libshouts pkg-config
12
file:
13
​
14
```
15
/usr/lib/libshout.a(tls.o): In function `tls_check_cert':
16
tls.c:(.text+0x10): undefined reference to `SSL_get_peer_certificate'
17
tls.c:(.text+0x24): undefined reference to `SSL_get_verify_result'
18
tls.c:(.text+0x4c): undefined reference to `X509_get_subject_name'
19
tls.c:(.text+0x60): undefined reference to `X509_NAME_get_text_by_NID'
20
tls.c:(.text+0x118): undefined reference to `X509_NAME_get_entry'
21
tls.c:(.text+0x11c): undefined reference to `X509_NAME_ENTRY_get_data'
22
tls.c:(.text+0x120): undefined reference to `ASN1_STRING_length'
23
tls.c:(.text+0x148): undefined reference to `X509_free'
24
tls.c:(.text+0x178): undefined reference to `X509_NAME_get_index_by_NID'
25
```
26
​
27
Since OpenSSL installs its own .pc files, make sure that @SHOUT_REQUIRES@
28
contains `ssl`.
29
​
30
Upstream status: pending
31
https://github.com/xiph/Icecast-libshout/pull/5
32
​
33
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
34
---
35
 configure.ac | 4 ++++
36
 1 file changed, 4 insertions(+)
37
​
38
diff --git a/configure.ac b/configure.ac
39
index 85f18ad..2b9c505 100644
40
--- a/configure.ac
41
+++ b/configure.ac
42
@@ -197,6 +197,10 @@ XIPH_PATH_OPENSSL([
43
     ])
44
 AC_SUBST([SHOUT_TLS])
45
 AM_CONDITIONAL([HAVE_TLS], [test -n "$OPENSSL_LIBS"])
46
+if test "$SHOUT_TLS" = "1"
47
+then
48
+  SHOUT_REQUIRES="$SHOUT_REQUIRES, libssl"
49
+fi
50
 
51
 SHOUT_VERSION="$VERSION"
52
 SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS"
53
-- 
54
2.9.3
55
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.