Update "libcdio" to version 0.80. Changes since version 0.76:

- a lot of new features including C++ and UDF support
- a lot of bug fixes including a fix for CVE-2007-6613
- support for more platforms (e.g. DragonFly)

8 files changed, 54 insertions, 71 deletions

diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 789732e340b..fb2d121febd 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2008/04/15 12:35:10 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2008/04/15 16:13:12 tron Exp $
 
-DISTNAME=	libcdio-0.76
-PKGREVISION=	5
+DISTNAME=	libcdio-0.80
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=libcdio/}
 
@@ -14,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		perl:run pkg-config
+USE_TOOLS+=		gmake perl:run pkg-config
 USE_LANGUAGES=		c c++
 PKGCONFIG_OVERRIDE+=	libcdio.pc.in
 PKGCONFIG_OVERRIDE+=	libcdio_cdda.pc.in
diff --git a/misc/libcdio/PLIST b/misc/libcdio/PLIST
index e5c87ff7cf4..b649d2e40c4 100644
--- a/misc/libcdio/PLIST
+++ b/misc/libcdio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/04/12 16:47:51 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/04/15 16:13:12 tron Exp $
 bin/cd-drive
 bin/cd-info
 bin/cd-paranoia
@@ -6,6 +6,7 @@ bin/cd-read
 bin/cdda-player
 bin/iso-info
 bin/iso-read
+bin/mmc-tool
 include/cdio/audio.h
 include/cdio/bytesex.h
 include/cdio/bytesex_asm.h
@@ -24,22 +25,47 @@ include/cdio/mmc.h
 include/cdio/paranoia.h
 include/cdio/read.h
 include/cdio/rock.h
-include/cdio/scsi_mmc.h
 include/cdio/sector.h
 include/cdio/track.h
 include/cdio/types.h
 include/cdio/util.h
 include/cdio/version.h
 include/cdio/xa.h
+include/cdio/ecma_167.h
+include/cdio/posix.h
+include/cdio/udf.h
+include/cdio/udf_file.h
+include/cdio/udf_time.h
+include/cdio/utf8.h
+include/cdio++/cdio.hpp
+include/cdio++/cdtext.hpp
+include/cdio++/device.hpp
+include/cdio++/devices.hpp
+include/cdio++/disc.hpp
+include/cdio++/enum.hpp
+include/cdio++/iso9660.hpp
+include/cdio++/mmc.hpp
+include/cdio++/read.hpp
+include/cdio++/track.hpp
 info/libcdio.info
 lib/libcdio.la
+lib/libcdio++.la
 lib/libcdio_cdda.la
 lib/libcdio_paranoia.la
 lib/libiso9660.la
+lib/libiso9660++.la
+lib/libudf.la
 lib/pkgconfig/libcdio.pc
-lib/pkgconfig/libcdio_cdda.pc
-lib/pkgconfig/libcdio_paranoia.pc
+lib/pkgconfig/libcdio++.pc
 lib/pkgconfig/libiso9660.pc
+lib/pkgconfig/libiso9660++.pc
+lib/pkgconfig/libudf.pc
 man/jp/man1/cd-paranoia.1
+man/man1/cd-drive.1
+man/man1/cd-info.1
 man/man1/cd-paranoia.1
+man/man1/cd-read.1
+man/man1/iso-info.1
+man/man1/iso-read.1
+@dirrm include/cdio++
 @dirrm include/cdio
diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index cb061288891..d27877002fd 100644
--- a/misc/libcdio/distinfo
+++ b/misc/libcdio/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.14 2008/04/15 12:35:10 drochner Exp $
+$NetBSD: distinfo,v 1.15 2008/04/15 16:13:12 tron Exp $
 
-SHA1 (libcdio-0.76.tar.gz) = 55c738eb118e4d0f08b4af965899eb0c79b21906
-RMD160 (libcdio-0.76.tar.gz) = 3ebce21179c04c5a8d721d485a28244de9ac82f3
-Size (libcdio-0.76.tar.gz) = 1821519 bytes
+SHA1 (libcdio-0.80.tar.gz) = 40c1558a65a9eca2b693d1951ed2664efbe7d1ed
+RMD160 (libcdio-0.80.tar.gz) = 3ca404bffb107ad950505b8ccd9e659e306545cb
+Size (libcdio-0.80.tar.gz) = 2083287 bytes
 SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
-SHA1 (patch-ab) = 730adf8fd064877ec9691193027aa6dc5b7c6cc5
-SHA1 (patch-ac) = 2ed1f677b863c48d724dce6386ae960822a66a16
-SHA1 (patch-ba) = c2817b8ab8c7a316b969af56f30e779e5822ced5
-SHA1 (patch-bb) = 34386568c63c05ed839b37a44f83691c2a06754f
+SHA1 (patch-ac) = 7932908d34f8d1cc7946bce6a6d61d5036d102d6
diff --git a/misc/libcdio/files/_cdio_netbsd.c b/misc/libcdio/files/_cdio_netbsd.c
index a6415067a06..97483d04516 100644
--- a/misc/libcdio/files/_cdio_netbsd.c
+++ b/misc/libcdio/files/_cdio_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: _cdio_netbsd.c,v 1.4 2005/05/31 17:05:36 drochner Exp $ */
+/* $NetBSD: _cdio_netbsd.c,v 1.5 2008/04/15 16:13:12 tron Exp $ */
 
 /*
  * Copyright (c) 2003
@@ -75,7 +75,7 @@ typedef struct {
 static driver_return_code_t
 run_scsi_cmd_freebsd(void *p_user_data, unsigned int i_timeout_ms,
 		     unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
-		     mmc_direction_t e_direction, 
+		     cdio_mmc_direction_t e_direction, 
 		     unsigned int i_buf, void *p_buf )
 {
 	const _img_private_t *_obj = p_user_data;
@@ -466,9 +466,9 @@ _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
 	if (track_num > TOTAL_TRACKS + 1 || track_num == 0)
 		return false;
 
-	msf->m = to_bcd8(_obj->tocent[track_num - 1].addr.msf.minute);
-	msf->s = to_bcd8(_obj->tocent[track_num - 1].addr.msf.second);
-	msf->f = to_bcd8(_obj->tocent[track_num - 1].addr.msf.frame);
+	msf->m = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.minute);
+	msf->s = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.second);
+	msf->f = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.frame);
 
 	return true;
 }
diff --git a/misc/libcdio/patches/patch-ab b/misc/libcdio/patches/patch-ab
deleted file mode 100644
index 6b15abfc4e8..00000000000
--- a/misc/libcdio/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/08/28 17:10:59 dbj Exp $
-
---- configure.ac.orig	2005-09-23 05:08:48.000000000 -0400
-+++ configure.ac
-@@ -379,7 +379,7 @@ case $host_os in
-        ## AC_DEFINE([HAVE_AIX_CDROM], [1],
-        ##     [Define 1 if you have AIX CD-ROM support])
-        ;;
--     darwin6*|darwin7*)
-+     darwin*)
-        AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, 
-                         [have_iokit_h="yes"])
-        if test "x$have_iokit_h" = "xyes" ; then 
diff --git a/misc/libcdio/patches/patch-ac b/misc/libcdio/patches/patch-ac
index 951daf46e55..44c68f6fcf4 100644
--- a/misc/libcdio/patches/patch-ac
+++ b/misc/libcdio/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2006/08/28 17:10:59 dbj Exp $
+$NetBSD: patch-ac,v 1.3 2008/04/15 16:13:12 tron Exp $
 
---- configure.orig	2005-09-22 20:03:06.000000000 -0400
-+++ configure
-@@ -21860,7 +21860,7 @@ case $host_os in
-        ## AC_DEFINE([HAVE_AIX_CDROM], [1],
-        ##     [Define 1 if you have AIX CD-ROM support])
-        ;;
--     darwin6*|darwin7*)
-+     darwin*)
+--- src/cd-paranoia/cd-paranoia.c.orig	2008-03-03 12:07:37.000000000 +0000
++++ src/cd-paranoia/cd-paranoia.c	2008-04-15 13:30:03.000000000 +0100
+@@ -278,7 +278,7 @@
+   report("");
+ }
  
- 
- for ac_header in IOKit/IOKitLib.h CoreFoundation/CFBase.h
+-#include "usage.h"
++#include "usage-copy.h"
+ static void usage(FILE *f)
+ {
+   fprintf( f, usage_help);
diff --git a/misc/libcdio/patches/patch-ba b/misc/libcdio/patches/patch-ba
deleted file mode 100644
index 7440ea9cdf3..00000000000
--- a/misc/libcdio/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2008/04/15 12:35:10 drochner Exp $
-
---- src/cd-info.c.orig	2005-09-18 22:34:02.000000000 +0200
-+++ src/cd-info.c
-@@ -510,7 +510,7 @@ print_iso9660_recurse (CdIo_t *p_cdio, c
-       iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode);
-       char *psz_iso_name = p_statbuf->filename;
-       char _fullname[4096] = { 0, };
--      char translated_name[MAX_ISONAME+1];
-+      char *translated_name = (char *) alloca(strlen(psz_iso_name)+1);
- 
-       if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) {
- 	iso9660_name_translate_ext(psz_iso_name, translated_name, 
diff --git a/misc/libcdio/patches/patch-bb b/misc/libcdio/patches/patch-bb
deleted file mode 100644
index 33bb9ab22a6..00000000000
--- a/misc/libcdio/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2008/04/15 12:35:10 drochner Exp $
-
---- src/iso-info.c.orig	2005-03-18 13:56:00.000000000 +0100
-+++ src/iso-info.c
-@@ -199,7 +199,7 @@ print_iso9660_recurse (iso9660_t *p_iso,
-       iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode);
-       char *psz_iso_name = p_statbuf->filename;
-       char _fullname[4096] = { 0, };
--      char translated_name[MAX_ISONAME+1];
-+      char *translated_name = (char *) alloca(strlen(psz_iso_name)+1);
- 
-       if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) {
- 	iso9660_name_translate_ext(psz_iso_name, translated_name,