Pullup ticket 529 - requested by Lubomir Sedlacik

security update for cdrdao

Revisions pulled up:
- pkgsrc/sysutils/cdrdao/Makefile	1.22, 1.23
- pkgsrc/sysutils/cdrdao/distinfo	1.12

    Module Name:    pkgsrc
    Committed By:   adrianp
    Date:           Fri May 27 08:39:26 UTC 2005

    Modified Files:
            pkgsrc/sysutils/cdrdao: Makefile distinfo

    Log Message:
    - Update cdrdao to 1.2.0
    - NOTE: pkgsrc does _not_ install cdrdao suid root so the noted security fix
      does not apply to us.
    - From the ChangeLog:
    > --------------------------------------------------------------------------
    >   cdrdao 1.2.0 (2005-05-12)
    > --------------------------------------------------------------------------
    >
    >  o  SECURITY FIX: cdrdao now gives up its root privileges after setting
    >     up real-time scheduling, as well as before saving settings through
    >     the --save option. This fixes a potential local root exploit when
    >     cdrdao is installed with the +s chmod flag. Using --save now also
    >     forces an early exit after the settings are saved.
    >
    >  o  Added MP3 and Ogg Vorbis file support (through respectively the
    >     libmad and libvorbis libraries). cdrdao will decode the MP3 and
    >     Ogg files into temporary WAV files that will be deleted upon exit
    >     (unless the new option --keep is used). The directory used to
    >     store those temporary WAV files can be specified with the --tmpdir
    >     option (default is /tmp).
    >
    >  o  Improved native CUE file support: replaced old incomplete existing
    >     parser with the one from Matthias Czapla's excellent
    >     cue2toc. Added support for cutting binary files.
    >
    >  o  Added --rspeed option to manually set the device reading speed. Be
    >     warned not all devices support this.
    >
    >  o  Packaged scsilib library upgraded from cdrtools 2.01 (previously
    >     was from 2.01a31).
    >
    >  o  Added --no-mode2-mixed option. Don't read a MODE2 disk as
    >     MODE2_FORM_MIXED, only read MODE2_FORM1 or MODE2_FORM2 (Matthieu
    >     Castet).
    >
    >  o  Added help for little-known drive-info command.
    >
    > GCDMaster changes:
    >
    >  o  MP3 and Ogg Vorbis support: you can drag and drop .mp3, .m3u and
    >     .ogg files from Nautilus into the sample display window.
    >
    >  o  Switched to gtkmm24 API. Improved file browsers.
    >
    >  o  CUE files support.
    >
    >  o  Sound output now uses libao library.
    >
    >  o  Added help for little-known drive-info command.
    >
    > GCDMaster changes:
    >
    >  o  MP3 and Ogg Vorbis support: you can drag and drop .mp3, .m3u and
    >     .ogg files from Nautilus into the sample display window.
    >
    >  o  Switched to gtkmm24 API. Improved file browsers.
    >
    >  o  CUE files support.
    >
    >  o  Sound output now uses libao library.
    >
    >  o  Added 'Select All' item in menu.
    >
    >  o  Added 'Eject' button to progress dialog
    >
    >  o  Bug fixes (sample selection weirdness, couldn't close window during
    >     play, problems with gcdmaster command-line argument, crashes with
    >     multiple project windows, drive status not reported correctly).
    ----
    Module Name:    pkgsrc
    Committed By:   tron
    Date:           Sat May 28 21:50:19 UTC 2005

    Modified Files:
            pkgsrc/sysutils/cdrdao: Makefile

    Log Message:
    Add missing dependences on "libao", "libmad" and "libvorbis" for full
    audio support. Bump package revision.

2 files changed, 10 insertions, 7 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index e2f7ca7fdae..76b6b179319 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/02/23 04:09:51 minskim Exp $
-#
+# $NetBSD: Makefile,v 1.19.2.1 2005/06/02 22:53:12 snj Exp $
 
-DISTNAME=		cdrdao-1.1.9
+DISTNAME=		cdrdao-1.2.0
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cdrdao/}
 
@@ -59,5 +59,8 @@ post-install:
 			${PREFIX}/share/examples/cdrdao
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../audio/libao/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/pccts/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index ac6c465478d..1ce4d7cbb53 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2005/02/24 13:40:51 agc Exp $
+$NetBSD: distinfo,v 1.11.2.1 2005/06/02 22:53:12 snj Exp $
 
-SHA1 (cdrdao-1.1.9.tar.gz) = e406940bbc2784ba249e3b7198ac7834ebda18f7
-RMD160 (cdrdao-1.1.9.tar.gz) = f420b3b5c39a5c5bf9abee18a0531788e7043d16
-Size (cdrdao-1.1.9.tar.gz) = 1581717 bytes
+SHA1 (cdrdao-1.2.0.tar.gz) = 0da9f0ae829dba5afe7efc34981ce4ad1dd7d210
+RMD160 (cdrdao-1.2.0.tar.gz) = 031be2ce0ed0894d1026a90f9ce62b3154849d14
+Size (cdrdao-1.2.0.tar.gz) = 2041966 bytes
 SHA1 (patch-aa) = ac38ac97ffbd502c5b5ea4de771ce92c520ae10e
 SHA1 (patch-ab) = 5cbacba844e1fa3c55634bdbbe3ec8a998d20273
 SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f