CVS commit: pkgsrc/audio/libshout

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Mon Mar  5 09:16:28 UTC 2018

Modified Files:
        pkgsrc/audio/libshout: distinfo
Added Files:
        pkgsrc/audio/libshout/patches: patch-src_tls.c

Log Message:
libshout: Support OpenSSL 1.1

Keep backwards-compatible support for OpenSSL 1.0.

Patch inspired by ArchLinux AUR: libshout-idjc-git.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/libshout/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/libshout/patches/patch-src_tls.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/libshout/distinfo
diff -u pkgsrc/audio/libshout/distinfo:1.8 pkgsrc/audio/libshout/distinfo:1.9
--- pkgsrc/audio/libshout/distinfo:1.8  Mon Nov 23 09:51:48 2015
+++ pkgsrc/audio/libshout/distinfo      Mon Mar  5 09:16:28 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/23 09:51:48 wiz Exp $
+$NetBSD: distinfo,v 1.9 2018/03/05 09:16:28 kamil Exp $
 
 SHA1 (libshout-2.4.1.tar.gz) = cca5606f38e84a4c46223796b06cf7483abaa32f
 RMD160 (libshout-2.4.1.tar.gz) = 4dc076d0d12161202110b4fd53954314db5e6ebf
 SHA512 (libshout-2.4.1.tar.gz) = 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 Size (libshout-2.4.1.tar.gz) = 516161 bytes
+SHA1 (patch-src_tls.c) = 09e5ce5f0dc7c5a3581fe98b7245ea51daced303

Added files:

Index: pkgsrc/audio/libshout/patches/patch-src_tls.c
diff -u /dev/null pkgsrc/audio/libshout/patches/patch-src_tls.c:1.1
--- /dev/null   Mon Mar  5 09:16:28 2018
+++ pkgsrc/audio/libshout/patches/patch-src_tls.c       Mon Mar  5 09:16:28 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_tls.c,v 1.1 2018/03/05 09:16:28 kamil Exp $
+
+Support OpenSSL 1.1
+
+--- src/tls.c.orig     2015-06-18 04:27:45.000000000 +0000
++++ src/tls.c
+@@ -65,7 +65,11 @@ static inline int tls_setup(shout_tls_t 
+ 
+       SSL_library_init();
+       SSL_load_error_strings();
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++      OpenSSL_add_all_algorithms();
++#else
+       SSLeay_add_all_algorithms();
++#endif
+       SSLeay_add_ssl_algorithms();
+ 
+       meth = TLSv1_client_method();