Version bump due to security bug #86649.

(Portage version: 2.0.51.22-r1)

9 files changed, 357 insertions, 5 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 0ef299e2036a..3f378bd25e2f 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.118 2005/05/30 18:42:48 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.119 2005/05/30 21:00:00 pylon Exp $
+
+*cdrtools-2.01.01_alpha01-r2 (30 May 2005)
+*cdrtools-2.01-r3 (30 May 2005)
+
+  30 May 2005; Lars Weiler <pylon@gentoo.org> +cdrtools-2.01-r1.ebuild,
+  +cdrtools-2.01-r3.ebuild, +cdrtools-2.01.01_alpha01-r2.ebuild:
+  Version bump due to security bug #86649.
 
   30 May 2005; Lars Weiler <pylon@gentoo.org> cdrtools-2.01.ebuild:
   Changed to toolchain-funcs; bug #92745.
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 85abca8c5745..43d60c0f2b95 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,10 +1,13 @@
 MD5 fb7c98c4ada508b4870303b6cf6f327c metadata.xml 450
-MD5 540e7f0c511432eab0c5c2153543c510 cdrtools-2.01.01_alpha01-r1.ebuild 3378
-MD5 8bc1fbdbaf56694f26d999992288c9b4 cdrtools-2.01-r2.ebuild 3418
 MD5 538ff085c77ea097ba54aa4908dc1919 ChangeLog 17162
-MD5 bc36c4d3881cd53fc32082e8130174cd cdrtools-2.01.ebuild 2840
+MD5 8bc1fbdbaf56694f26d999992288c9b4 cdrtools-2.01-r3.ebuild 3418
+MD5 bc36c4d3881cd53fc32082e8130174cd cdrtools-2.01-r1.ebuild 2840
+MD5 540e7f0c511432eab0c5c2153543c510 cdrtools-2.01.01_alpha01-r2.ebuild 3378
 MD5 3b1ffea11e1653b7b16c2c89597d1c5a files/cdrtools-2.01-scsi-remote.patch 938
 MD5 c848b3b9b6921469483a22caa0fd40c3 files/digest-cdrtools-2.01 67
 MD5 1a596f5cae257e97c559716336b30e5b files/mkisofs-iconv-10.patch 16986
 MD5 8165b59a7b14939c58a88ca1f272cad4 files/digest-cdrtools-2.01-r2 147
 MD5 0e8283f78b14f3ead0e78d197e1d5ed1 files/digest-cdrtools-2.01.01_alpha01-r1 153
+MD5 8165b59a7b14939c58a88ca1f272cad4 files/digest-cdrtools-2.01-r1 147
+MD5 8165b59a7b14939c58a88ca1f272cad4 files/digest-cdrtools-2.01-r3 147
+MD5 0e8283f78b14f3ead0e78d197e1d5ed1 files/digest-cdrtools-2.01.01_alpha01-r2 153
diff --git a/app-cdr/cdrtools/cdrtools-2.01-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01-r1.ebuild
new file mode 100644
index 000000000000..3d4ebcbd0b67
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01-r1.ebuild,v 1.3 2005/05/30 21:00:00 pylon Exp $
+
+inherit eutils toolchain-funcs gnuconfig
+
+DESCRIPTION="A set of tools for CD recording, including cdrecord"
+HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/${P}.tar.bz2"
+
+LICENSE="GPL-2 freedist"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86 ~ppc-macos"
+IUSE=""
+
+DEPEND="virtual/libc
+	!app-cdr/dvdrtools"
+PROVIDE="virtual/cdrtools"
+
+S=${WORKDIR}/${PN}-2.01
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# CAN-2004-0806 - Bug 63187
+	epatch ${FILESDIR}/${PN}-2.01-scsi-remote.patch
+
+	cd ${S}/DEFAULTS
+	use ppc-macos && MYARCH="mac-os10" || MYARCH="linux"
+	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
+	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
+
+	cd ${S}/librscg
+	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
+
+	cd ${S}/RULES
+	ln -sf i386-linux-cc.rul x86_64-linux-cc.rul
+	ln -sf i386-linux-gcc.rul x86_64-linux-gcc.rul
+	ln -sf ppc-linux-cc.rul ppc64-linux-cc.rul
+	ln -sf mips-linux-cc.rul mips64-linux-cc.rul
+}
+
+src_compile() {
+	gnuconfig_update
+
+	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
+}
+
+src_install() {
+	cd ${S}
+
+	dobin cdda2wav/OBJ/*-*-cc/cdda2wav || die "cdda2wav"
+	dobin cdrecord/OBJ/*-*-cc/cdrecord  || die "cdrecord"
+	dobin mkisofs/OBJ/*-*-cc/mkisofs || die "mkisofs"
+	dobin readcd/OBJ/*-*-cc/readcd || die "readcd"
+	dosbin rscsi/OBJ/*-*-cc/rscsi || die "rscsi"
+
+	insinto /usr/include
+	doins incs/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include"
+
+	cd mkisofs/diag/OBJ/*-*-cc
+	dobin devdump isodump isoinfo isovfy || die "dobin"
+
+	cd ${S}
+	insinto /etc/default
+	doins rscsi/rscsi.dfl
+	doins cdrecord/cdrecord.dfl
+
+	cd ${S}/libs/*-*-cc
+	dolib.a *.a || die "dolib failed"
+
+	cd ${S}
+	insinto /usr/include/scsilib
+	doins include/*.h
+	insinto /usr/include/scsilib/scg
+	doins include/scg/*.h
+
+	cd ${S}
+	dodoc ABOUT Changelog README README.{ATAPI,audio,cdplus,cdrw,cdtext,cdclone,copy,DiskT@2,linux,linux-shm,multi,parallel,raw,rscsi,sony,verify} START
+	doman */*.1
+	doman */*.8
+
+	cd ${S}/doc
+	dodoc cdrecord-1.8.1_de-doc_0.1.tar
+	docinto print
+	dodoc *.ps
+}
+
+pkg_postinst() {
+	einfo "Note the special license on cdrecord/cdrecord.c starting from line 4648."
+	if use ppc-macos ; then
+		einfo ""
+		einfo "Darwin/OS X use the following device names: "
+		einfo ""
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices "
+		einfo ""
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices "
+		einfo ""
+	else
+	echo
+	einfo "The command line option 'dev=ATAPI:' should be used for IDE CD writers."
+	fi
+}
diff --git a/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild b/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild
new file mode 100644
index 000000000000..a3d3342f4248
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild,v 1.1 2005/05/30 21:00:00 pylon Exp $
+
+inherit eutils gnuconfig versionator toolchain-funcs
+
+MY_CRYPT_VERS="$(get_version_component_range 1-2 )-encrypt-1.0rc1"
+
+DESCRIPTION="A set of tools for CD recording, including cdrecord"
+HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/${P}.tar.bz2
+	crypt? ( http://burbon04.gmxhome.de/linux/files/${PN}-${MY_CRYPT_VERS}.diff.gz )"
+
+LICENSE="GPL-2 freedist"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 m68k ppc s390 sh sparc x86"
+IUSE="crypt unicode"
+
+DEPEND="!app-cdr/dvdrtools"
+RDEPEND="crypt? ( sys-fs/cryptsetup )"
+PROVIDE="virtual/cdrtools"
+
+S=${WORKDIR}/${PN}-2.01
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# CAN-2004-0806 - Bug 63187
+	epatch ${FILESDIR}/${PN}-2.01-scsi-remote.patch || die "Can't apply SCSI-remote patch"
+
+	# UTF-8 support, see Bug #28369
+	if use unicode; then
+		epatch ${FILESDIR}/mkisofs-iconv-10.patch || die "Can't apply utf-8 patch"
+	fi
+
+	# Add support for On-The-Fly AES encryption
+	# http://burbon04.gmxhome.de/linux/CDREncryption.html
+	if use crypt; then
+		epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
+	fi
+
+	cd ${S}/DEFAULTS
+	use ppc-macos && MYARCH="mac-os10" || MYARCH="linux"
+	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
+	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
+
+	cd ${S}/librscg
+	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
+
+	cd ${S}/RULES
+	ln -sf i386-linux-cc.rul x86_64-linux-cc.rul
+	ln -sf i386-linux-gcc.rul x86_64-linux-gcc.rul
+	ln -sf ppc-linux-cc.rul ppc64-linux-cc.rul
+	ln -sf mips-linux-cc.rul mips64-linux-cc.rul
+}
+
+src_compile() {
+	gnuconfig_update
+
+	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
+}
+
+src_install() {
+	cd ${S}
+
+	dobin cdda2wav/OBJ/*-*-cc/cdda2wav || die "cdda2wav"
+	dobin cdrecord/OBJ/*-*-cc/cdrecord  || die "cdrecord"
+	dobin mkisofs/OBJ/*-*-cc/mkisofs || die "mkisofs"
+	dobin readcd/OBJ/*-*-cc/readcd || die "readcd"
+	dosbin rscsi/OBJ/*-*-cc/rscsi || die "rscsi"
+
+	insinto /usr/include
+	doins incs/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include"
+
+	cd mkisofs/diag/OBJ/*-*-cc
+	dobin devdump isodump isoinfo isovfy || die "dobin"
+
+	cd ${S}
+	insinto /etc/default
+	doins rscsi/rscsi.dfl
+	doins cdrecord/cdrecord.dfl
+
+	cd ${S}/libs/*-*-cc
+	dolib.a *.a || die "dolib failed"
+
+	cd ${S}
+	insinto /usr/include/scsilib
+	doins include/*.h
+	insinto /usr/include/scsilib/scg
+	doins include/scg/*.h
+
+	cd ${S}
+	dodoc ABOUT Changelog README README.{ATAPI,audio,cdplus,cdrw,cdtext,cdclone,copy,DiskT@2,linux,linux-shm,multi,parallel,raw,rscsi,sony,verify} START
+	doman */*.1
+	doman */*.8
+
+	cd ${S}/doc
+	dodoc cdrecord-1.8.1_de-doc_0.1.tar
+	docinto print
+	dodoc *.ps
+}
+
+pkg_postinst() {
+	einfo "Note the special license on cdrecord/cdrecord.c starting from line 4648."
+	if use ppc-macos ; then
+		einfo ""
+		einfo "Darwin/OS X use the following device names: "
+		einfo ""
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices "
+		einfo ""
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices "
+		einfo ""
+	else
+	echo
+	einfo "The command line option 'dev=ATAPI:' should be used for IDE CD writers."
+	fi
+}
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild
new file mode 100644
index 000000000000..652d9ed10010
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild,v 1.1 2005/05/30 21:00:00 pylon Exp $
+
+inherit eutils gnuconfig toolchain-funcs
+
+MY_CRYPT_VERS="2.01-encrypt-1.0rc1"
+
+DESCRIPTION="A set of tools for CD recording, including cdrecord"
+HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2
+	crypt? ( http://burbon04.gmxhome.de/linux/files/${PN}-${MY_CRYPT_VERS}.diff.gz )"
+
+LICENSE="GPL-2 freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
+IUSE="crypt unicode"
+
+DEPEND="virtual/libc
+	!app-cdr/dvdrtools"
+RDEPEND="crypt? ( sys-fs/cryptsetup )"
+PROVIDE="virtual/cdrtools"
+
+S=${WORKDIR}/${PN}-2.01.01
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# CAN-2004-0806 - Bug 63187
+	epatch ${FILESDIR}/${PN}-2.01-scsi-remote.patch
+
+	# UTF-8 support, see Bug #28369
+	if use unicode; then
+		epatch ${FILESDIR}/mkisofs-iconv-10.patch || die "Can't apply utf-8 patch"
+	fi
+
+	# Add support for On-The-Fly AES encryption
+	# http://burbon04.gmxhome.de/linux/CDREncryption.html
+	if use crypt; then
+		epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
+	fi
+
+	cd ${S}/DEFAULTS
+	use ppc-macos && MYARCH="mac-os10" || MYARCH="linux"
+	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
+	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
+
+	cd ${S}/librscg
+	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
+
+	cd ${S}/RULES
+	ln -sf i386-linux-cc.rul x86_64-linux-cc.rul
+	ln -sf i386-linux-gcc.rul x86_64-linux-gcc.rul
+	ln -sf ppc-linux-cc.rul ppc64-linux-cc.rul
+	ln -sf mips-linux-cc.rul mips64-linux-cc.rul
+}
+
+src_compile() {
+	gnuconfig_update
+
+	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
+}
+
+src_install() {
+	cd ${S}
+
+	dobin cdda2wav/OBJ/*-*-cc/cdda2wav || die "cdda2wav"
+	dobin cdrecord/OBJ/*-*-cc/cdrecord  || die "cdrecord"
+	dobin mkisofs/OBJ/*-*-cc/mkisofs || die "mkisofs"
+	dobin readcd/OBJ/*-*-cc/readcd || die "readcd"
+	dosbin rscsi/OBJ/*-*-cc/rscsi || die "rscsi"
+
+	insinto /usr/include
+	doins incs/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include"
+
+	cd mkisofs/diag/OBJ/*-*-cc
+	dobin devdump isodump isoinfo isovfy || die "dobin"
+
+	cd ${S}
+	insinto /etc/default
+	doins rscsi/rscsi.dfl
+	doins cdrecord/cdrecord.dfl
+
+	cd ${S}/libs/*-*-cc
+	dolib.a *.a || die "dolib failed"
+
+	cd ${S}
+	insinto /usr/include/scsilib
+	doins include/*.h
+	insinto /usr/include/scsilib/scg
+	doins include/scg/*.h
+
+	cd ${S}
+	dodoc ABOUT Changelog README README.{ATAPI,audio,cdplus,cdrw,cdtext,cdclone,copy,DiskT@2,linux,linux-shm,multi,parallel,raw,rscsi,sony,verify} START
+	doman */*.1
+	doman */*.8
+
+	cd ${S}/doc
+	dodoc cdrecord-1.8.1_de-doc_0.1.tar
+	docinto print
+	dodoc *.ps
+}
+
+pkg_postinst() {
+	einfo "Note the special license on cdrecord/cdrecord.c starting from line 4648."
+	if use ppc-macos ; then
+		einfo ""
+		einfo "Darwin/OS X use the following device names: "
+		einfo ""
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices "
+		einfo ""
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices "
+		einfo ""
+	else
+	echo
+	einfo "The command line option 'dev=ATAPI:' should be used for IDE CD writers."
+	fi
+}
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01 b/app-cdr/cdrtools/files/digest-cdrtools-2.01
deleted file mode 100644
index 15a9f734b606..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d44a81460e97ae02931c31188fe8d3fd cdrtools-2.01.tar.bz2 1400389
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01-r2 b/app-cdr/cdrtools/files/digest-cdrtools-2.01-r1
index 239cdde935f8..239cdde935f8 100644
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01-r2
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01-r1
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01-r3 b/app-cdr/cdrtools/files/digest-cdrtools-2.01-r3
new file mode 100644
index 000000000000..239cdde935f8
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01-r3
@@ -0,0 +1,2 @@
+MD5 d44a81460e97ae02931c31188fe8d3fd cdrtools-2.01.tar.bz2 1400389
+MD5 785184b45952798c72b26e3da9db0e0f cdrtools-2.01-encrypt-1.0rc1.diff.gz 25384
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha01-r1 b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha01-r2
index 22dab35c723a..22dab35c723a 100644
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha01-r1
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha01-r2