From trasz@pin.if.uz.zgora.pl  Wed Apr  4 14:36:22 2007
Return-Path: <trasz@pin.if.uz.zgora.pl>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E171C16A401;
	Wed,  4 Apr 2007 14:36:22 +0000 (UTC)
	(envelope-from trasz@pin.if.uz.zgora.pl)
Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251])
	by mx1.freebsd.org (Postfix) with ESMTP id A83B213C459;
	Wed,  4 Apr 2007 14:36:22 +0000 (UTC)
	(envelope-from trasz@pin.if.uz.zgora.pl)
Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001)
	id 31F5439DC9; Wed,  4 Apr 2007 16:46:55 +0200 (CEST)
Message-Id: <20070404144655.31F5439DC9@pin.if.uz.zgora.pl>
Date: Wed,  4 Apr 2007 16:46:55 +0200 (CEST)
From: trasz <trasz@pin.if.uz.zgora.pl>
To: FreeBSD-gnats-submit@freebsd.org
Cc: multimedia@FreeBSD.org
Subject: [PATCH] audio/jack: don't crash with -R
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         111235
>Category:       ports
>Synopsis:       [PATCH] audio/jack: don't crash with -R
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-multimedia
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 04 14:40:04 GMT 2007
>Closed-Date:    Mon Apr 16 19:31:20 GMT 2007
>Last-Modified:  Mon Apr 16 19:31:20 GMT 2007
>Originator:     trasz
>Release:        FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006
>Description:
Prevent 'jackd -R' from crashing at startup in dlopen(3).

Port maintainer (multimedia@FreeBSD.org) is cc'd.

This patch is orthogonal to ports/111157, i.e. i'd like both to be commited.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- jack-0.102.28.20061216_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/jack/files/patch-jackd_engine.c /home/trasz/jack/files/patch-jackd_engine.c
--- /usr/ports/audio/jack/files/patch-jackd_engine.c	Thu Dec  7 20:42:00 2006
+++ /home/trasz/jack/files/patch-jackd_engine.c	Wed Apr  4 16:42:39 2007
@@ -1,6 +1,6 @@
---- jackd/engine.c.orig	Wed Dec  6 23:40:20 2006
-+++ jackd/engine.c	Wed Dec  6 23:40:58 2006
-@@ -1444,7 +1444,7 @@
+--- jackd/engine.c.orig	Tue Mar  6 06:24:05 2007
++++ jackd/engine.c	Tue Apr  3 18:01:29 2007
+@@ -1442,7 +1442,7 @@
  				    (engine, pfd[i].fd)) {
  					jack_error ("could not handle external"
  						    " client request");
@@ -9,3 +9,13 @@
                                      /* poll is implemented using
  				       select (see the macosx/fakepoll
  				       code). When the socket is closed
+@@ -1552,7 +1552,8 @@
+ 
+ 		jack_drop_real_time_scheduling (pthread_self());
+ 
+-#ifdef USE_MLOCK
++/* Workaround to prevent 'jackd -R' from crashing at startup. */
++#if 0
+ 
+ 		if (do_mlock && (mlockall (MCL_CURRENT | MCL_FUTURE) != 0)) {
+ 			jack_error ("cannot lock down memory for jackd (%s)",
--- jack-0.102.28.20061216_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Apr 4 14:40:16 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111235 
Responsible-Changed-From-To: multimedia->freebsd-multimedia 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Apr 16 12:41:16 UTC 2007 
Responsible-Changed-Why:  
Canonicalize assignment. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111235 
State-Changed-From-To: open->closed  
State-Changed-By: ahze 
State-Changed-When: Mon Apr 16 19:31:11 UTC 2007 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111235 
>Unformatted:
