From 387f0290ca5d146a449d7a5678e33718fc9466b7 Mon Sep 17 00:00:00 2001
From: leot <leot@pkgsrc.org>
Date: Sat, 16 Jun 2018 14:43:21 +0000
Subject: mpg321: Do not unlock unititialized main_lock

Bump PKGREVISION

Problem spotted by <maya>, fixes PR pkg/53369 by <sevan>.
---
 audio/mpg321/Makefile               |  3 ++-
 audio/mpg321/distinfo               |  4 ++--
 audio/mpg321/patches/patch-mpg321.c | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'audio/mpg321')

diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 9604ba0cafd..6e4bfdbe0c5 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2016/06/02 09:18:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2018/06/16 14:43:21 leot Exp $
 
 DISTNAME=	mpg321_0.3.2.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpg321/}
 
diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo
index 0c12609677d..276a7fae2b7 100644
--- a/audio/mpg321/distinfo
+++ b/audio/mpg321/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2016/06/02 09:18:19 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2018/06/16 14:43:21 leot Exp $
 
 SHA1 (mpg321_0.3.2.orig.tar.gz) = bf1c22542c86af69267828e45f217fdeb49e5d43
 RMD160 (mpg321_0.3.2.orig.tar.gz) = 04ea36c893bbe6fb0054a7fcd71294927cf70ac9
 SHA512 (mpg321_0.3.2.orig.tar.gz) = f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234
 Size (mpg321_0.3.2.orig.tar.gz) = 151139 bytes
 SHA1 (patch-ao.c) = cb404acdfb032c5a823c717965d14319db0d4466
-SHA1 (patch-mpg321.c) = 0f82c72976ce1f1e7d16cd972eb1e38a0e305f86
+SHA1 (patch-mpg321.c) = c874219aa316899af42d5984ca06860642260d4b
diff --git a/audio/mpg321/patches/patch-mpg321.c b/audio/mpg321/patches/patch-mpg321.c
index 3fb6c6a0315..f76d9f4a51a 100644
--- a/audio/mpg321/patches/patch-mpg321.c
+++ b/audio/mpg321/patches/patch-mpg321.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-mpg321.c,v 1.1 2016/06/02 09:18:19 jperkin Exp $
+$NetBSD: patch-mpg321.c,v 1.2 2018/06/16 14:43:21 leot Exp $
 
-Ensure structs are zero'd before use.
+- Ensure structs are zero'd before use.
+- Do not unlock uninitialized main_lock
 
 --- mpg321.c.orig	2012-03-25 12:27:49.000000000 +0000
 +++ mpg321.c
@@ -12,3 +13,12 @@ Ensure structs are zero'd before use.
      playbuf.pl = pl = new_playlist();
  
      if (!pl)
+@@ -750,8 +751,6 @@ int main(int argc, char *argv[])
+ 	    	    if (tcgetattr(0, &terminal_settings) < 0)
+ 	    		    perror("tcgetattr()");
+ 	    	    memcpy(&old_terminal_settings, &terminal_settings, sizeof(struct termios));
+-		    /* Early thread start */
+-		    sem_post(&main_lock);
+ 	    }
+     }
+     /* Play the mpeg files or zip it! */
-- 
cgit v1.2.3