[pkgsrc/trunk]: pkgsrc/sysutils/dvd+rw-tools Disable the mlockall() call whic...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed232a274e43
branches:  trunk
changeset: 507431:ed232a274e43
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Feb 01 12:51:27 2006 +0000

description:
Disable the mlockall() call which triggers an assertion on NetBSD's
libpthread (lib/libpthread/pthread.c line 173) and it will give you
a precious core dump.

Tested by hira@ and by myself@

diffstat:

 sysutils/dvd+rw-tools/distinfo         |   6 +++---
 sysutils/dvd+rw-tools/patches/patch-ab |  13 +++++++++++--
 sysutils/dvd+rw-tools/patches/patch-ac |  19 ++++++++++++++++---
 3 files changed, 30 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r dd3a80055672 -r ed232a274e43 sysutils/dvd+rw-tools/distinfo
--- a/sysutils/dvd+rw-tools/distinfo    Wed Feb 01 12:36:25 2006 +0000
+++ b/sysutils/dvd+rw-tools/distinfo    Wed Feb 01 12:51:27 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2006/01/31 19:01:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.13 2006/02/01 12:51:27 xtraeme Exp $
 
 SHA1 (dvd+rw-tools-6.0.tar.gz) = 964bae317a047cb8a7f311333b3cec5266f417e6
 RMD160 (dvd+rw-tools-6.0.tar.gz) = f4762e342b910867655f20858be8945ae7054f0b
 Size (dvd+rw-tools-6.0.tar.gz) = 118804 bytes
 SHA1 (patch-aa) = 36de21da2761352c6cf60498a4165ee7040bac2e
-SHA1 (patch-ab) = ec61b538213ca8b441593d5edcee1da8aa0e79ff
-SHA1 (patch-ac) = 58dd1273d655fbe97e3cc878e921c47b8e412cad
+SHA1 (patch-ab) = d6721684b65df62b348063bd680e9beb2d5ddc92
+SHA1 (patch-ac) = 9c530ccb42da11cdf6aa3ec35c1fbb199918d35f
 SHA1 (patch-ad) = 2f585dbdb9dd657d34e92e77f3347c00c742a32e
diff -r dd3a80055672 -r ed232a274e43 sysutils/dvd+rw-tools/patches/patch-ab
--- a/sysutils/dvd+rw-tools/patches/patch-ab    Wed Feb 01 12:36:25 2006 +0000
+++ b/sysutils/dvd+rw-tools/patches/patch-ab    Wed Feb 01 12:51:27 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2006/01/31 19:01:28 xtraeme Exp $
+$NetBSD: patch-ab,v 1.4 2006/02/01 12:51:27 xtraeme Exp $
 
 --- Makefile.m4.orig   2006-01-16 11:23:53.000000000 +0100
-+++ Makefile.m4        2006-01-31 19:12:25.000000000 +0100
++++ Makefile.m4        2006-02-01 12:35:14.000000000 +0100
 @@ -14,6 +14,7 @@
  ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix])
  ifelse(OS,OpenBSD,[define([OS],[BSD])])
@@ -10,3 +10,12 @@
  ifelse(OS,IRIX64,[define([OS],[IRIX])])
  
  ifelse(OS,MINGW32,[
+@@ -34,7 +35,7 @@
+ CC    ?=gcc
+ CFLAGS        +=$(WARN) -O2 -pthread -D_THREAD_SAFE -D_REENTRANT
+ CXX   ?=g++
+-CXXFLAGS+=$(WARN) -O2 -fno-exceptions -pthread -D_THREAS_SAFE -D_REENTRANT
++CXXFLAGS+=$(WARN) -O2 -fno-exceptions -pthread -D_THREAD_SAFE -D_REENTRANT
+ 
+ .SUFFIXES: .c .cpp .o
+ 
diff -r dd3a80055672 -r ed232a274e43 sysutils/dvd+rw-tools/patches/patch-ac
--- a/sysutils/dvd+rw-tools/patches/patch-ac    Wed Feb 01 12:36:25 2006 +0000
+++ b/sysutils/dvd+rw-tools/patches/patch-ac    Wed Feb 01 12:51:27 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2006/01/16 23:03:20 xtraeme Exp $
+$NetBSD: patch-ac,v 1.3 2006/02/01 12:51:27 xtraeme Exp $
 
---- growisofs.c.orig   2006-01-16 23:50:34.000000000 +0100
-+++ growisofs.c        2006-01-16 23:51:29.000000000 +0100
+--- growisofs.c.orig   2006-01-16 12:09:41.000000000 +0100
++++ growisofs.c        2006-02-01 12:34:24.000000000 +0100
 @@ -358,7 +358,7 @@
  # ifndef _GNU_SOURCE
  #  define _GNU_SOURCE
@@ -20,3 +20,16 @@
  
  #include <sys/cdio.h>
  #include <camlib.h>
+@@ -2194,9 +2194,12 @@
+     nice(-20);
+     /* I'd rather do it right after I allocate ring buffer and fire off
+      * threads, but I'll be running without extra privileges by then:-( */
++#ifndef __NetBSD__
+     mlockall(MCL_CURRENT|MCL_FUTURE);
+ #endif
+ 
++#endif
++
+     mkisofs_argv = malloc ((argc+3)*sizeof(char *));
+     if (mkisofs_argv == NULL)
+         fprintf (stderr,":-( unable to allocate %lu bytes: ",