From owner-svn-ports-all@FreeBSD.ORG  Thu Nov 22 17:42:13 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D3809C64;
 Thu, 22 Nov 2012 17:42:13 +0000 (UTC) (envelope-from nox@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9FFA78FC08;
 Thu, 22 Nov 2012 17:42:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAMHgDMf033443;
 Thu, 22 Nov 2012 17:42:13 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAMHgDNY033442;
 Thu, 22 Nov 2012 17:42:13 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201211221742.qAMHgDNY033442@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Thu, 22 Nov 2012 17:42:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r307658 - branches/RELENG_9_1_0/multimedia/vlc/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Nov 2012 17:42:13 -0000

Author: nox
Date: Thu Nov 22 17:42:13 2012
New Revision: 307658
URL: http://svnweb.freebsd.org/changeset/ports/307658

Log:
  MFH 307524:
  
  - Fix pulseaudio segfault. [1]
  - No PORTREVISION bump as PULSEAUDIO isn't a default option.
  
  Reported by:	Rainer Hurling <rhurlin@gwdg.de> on -multimedia [1]
  Feature safe:	yes
  Approved by:	portmgr (beat)

Added:
  branches/RELENG_9_1_0/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c
     - copied unchanged from r307524, head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c
Modified:
Directory Properties:
  branches/RELENG_9_1_0/   (props changed)

Copied: branches/RELENG_9_1_0/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c (from r307524, head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/RELENG_9_1_0/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c	Thu Nov 22 17:42:13 2012	(r307658, copy of r307524, head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c)
@@ -0,0 +1,32 @@
+--- modules/audio_output/vlcpulse.c.orig
++++ modules/audio_output/vlcpulse.c
+@@ -113,10 +113,12 @@ pa_context *vlc_pa_connect (vlc_object_t
+             struct passwd pwbuf, *pw;
+             char buf[len];
+ 
+-            if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0
+-             && pw != NULL)
+-                pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_USER,
+-                                  pw->pw_name);
++            if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0) {
++                if (pw != NULL)
++                    pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_USER,
++                                      pw->pw_name);
++                break;
++            }
+         }
+ 
+         for (size_t max = sysconf (_SC_HOST_NAME_MAX), len = max % 1024 + 1024;
+@@ -124,9 +126,11 @@ pa_context *vlc_pa_connect (vlc_object_t
+         {
+             char hostname[len];
+ 
+-            if (gethostname (hostname, sizeof (hostname)) == 0)
++            if (gethostname (hostname, sizeof (hostname)) == 0) {
+                 pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_HOST,
+                                   hostname);
++                break;
++            }
+         }
+ 
+         const char *session = getenv ("XDG_SESSION_COOKIE");