[pkgsrc/trunk]: pkgsrc/multimedia/libbluray libbluray: Fix potential segfault...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c85d18d49e74
branches:  trunk
changeset: 423192:c85d18d49e74
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Feb 12 15:33:37 2020 +0000

description:
libbluray: Fix potential segfault on recent NetBSD-current

diffstat:

 multimedia/libbluray/Makefile                       |   3 +-
 multimedia/libbluray/distinfo                       |   3 +-
 multimedia/libbluray/patches/patch-src_util_mutex.c |  24 +++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r 7611e77ab97f -r c85d18d49e74 multimedia/libbluray/Makefile
--- a/multimedia/libbluray/Makefile     Wed Feb 12 15:26:20 2020 +0000
+++ b/multimedia/libbluray/Makefile     Wed Feb 12 15:33:37 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2020/01/26 17:31:46 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2020/02/12 15:33:37 ryoon Exp $
 
 DISTNAME=      libbluray-1.1.2
+PKGREVISION=   1
 CATEGORIES=    multimedia
 MASTER_SITES=  http://download.videolan.org/pub/videolan/libbluray/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.bz2
diff -r 7611e77ab97f -r c85d18d49e74 multimedia/libbluray/distinfo
--- a/multimedia/libbluray/distinfo     Wed Feb 12 15:26:20 2020 +0000
+++ b/multimedia/libbluray/distinfo     Wed Feb 12 15:33:37 2020 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2019/06/10 14:40:52 adam Exp $
+$NetBSD: distinfo,v 1.15 2020/02/12 15:33:37 ryoon Exp $
 
 SHA1 (libbluray-1.1.2.tar.bz2) = 3885c0d0bd0f04a3a372ceec3a01a44a7624f272
 RMD160 (libbluray-1.1.2.tar.bz2) = bbfea1093f9fc5ea089cf5860e55e020b916a4b0
 SHA512 (libbluray-1.1.2.tar.bz2) = 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7
 Size (libbluray-1.1.2.tar.bz2) = 745779 bytes
+SHA1 (patch-src_util_mutex.c) = 0c14aa467b0025f23c1cfda824e10cdd3fcdbd7b
diff -r 7611e77ab97f -r c85d18d49e74 multimedia/libbluray/patches/patch-src_util_mutex.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libbluray/patches/patch-src_util_mutex.c       Wed Feb 12 15:33:37 2020 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_util_mutex.c,v 1.1 2020/02/12 15:33:37 ryoon Exp $
+
+* Fix segfault on NetBSD/amd64 9.99.46
+
+--- src/util/mutex.c.orig      2019-06-07 18:00:28.000000000 +0000
++++ src/util/mutex.c
+@@ -89,7 +89,7 @@ static int _mutex_init(MUTEX_IMPL *p)
+ 
+ static int _mutex_lock(MUTEX_IMPL *p)
+ {
+-    if (pthread_equal(p->owner, pthread_self())) {
++    if (p->owner == pthread_self()) {
+         /* recursive lock */
+         p->lock_count++;
+         return 0;
+@@ -108,7 +108,7 @@ static int _mutex_lock(MUTEX_IMPL *p)
+ 
+ static int _mutex_unlock(MUTEX_IMPL *p)
+ {
+-    if (!pthread_equal(p->owner, pthread_self())) {
++    if (!(p->owner == pthread_self())) {
+         BD_DEBUG(DBG_BLURAY|DBG_CRIT, "bd_mutex_unlock(): not owner !\n");
+         return -1;
+     }