diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2013-10-02 15:03:31 -0400 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2013-10-02 15:03:31 -0400 |
commit | 47f24d452aeedd33500516cc43c0206fb5de1790 (patch) | |
tree | 79d42fcf16f760b1e56a9942f9d9dc9182a85e75 | |
parent | media-libs/mesa: version bump (diff) | |
download | hardened-dev-47f24d452aeedd33500516cc43c0206fb5de1790.tar.gz hardened-dev-47f24d452aeedd33500516cc43c0206fb5de1790.tar.bz2 hardened-dev-47f24d452aeedd33500516cc43c0206fb5de1790.zip |
app-cdr/cdrtools-3.01_alpha17: fix bug #486782
-rw-r--r-- | app-cdr/cdrtools/Manifest | 4 | ||||
-rw-r--r-- | app-cdr/cdrtools/cdrtools-3.01_alpha17-r99.ebuild | 159 | ||||
-rw-r--r-- | app-cdr/cdrtools/files/cdrtools-3.01-rename-clone.patch | 69 | ||||
-rw-r--r-- | app-cdr/cdrtools/metadata.xml | 10 |
4 files changed, 242 insertions, 0 deletions
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest new file mode 100644 index 00000000..ef066ebc --- /dev/null +++ b/app-cdr/cdrtools/Manifest @@ -0,0 +1,4 @@ +AUX cdrtools-3.01-rename-clone.patch 2554 SHA256 50ffac2b22108d2a244a2cd68668a7aaa5442f0850f6e9561d6e0d0f4e0aaa3e SHA512 7f8507b79d862a06914546ae8ae1f33accebf3b86e92887fbd107a5a6e9de8fa23c861dcc09071c9c1884b71a21365ced796f5e761fe2659d49636d516bf9315 WHIRLPOOL 2cc3cbf2b72476e965872c0027bcbc1c348893999a4424929a464bff56093a733d9b8a5638a6105218e07668f509e14ffef971311320419091fccb23ed81b6c1 +DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1 +EBUILD cdrtools-3.01_alpha17-r99.ebuild 5017 SHA256 c334c856dc1cbdb138120c97483ccc7850aa3b852a1c0234291e49e3f8d8fafc SHA512 e6faa4eea98869168aa6f8f19beb6a78cea87c3c77486e76c0a3721123e024cb08abdfa4c0166cb09b07a13532883897d394ea861eed2e5490c89c374994c27f WHIRLPOOL 80ff4965c88f5610f249da7b2bbd123e98467ca2195846368c3252c6fb91fdd3fca828eb46a49cc77caaf22c58efcb94d3b0b3bd0cc1b0ce2bd0b19998f33016 +MISC metadata.xml 344 SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8 SHA512 0d461f000a4dd8557ec9020785c12c7875437c2061c3fd7f9cc54df089309dadf71435ac9d0f29bc5ee1785c9398661c78b1095b512b5fc91071dc63a818e567 WHIRLPOOL e27e3f17bcc9151f0f7c9a21a13c556e27a71499d613937a1eaa0176ad203c208e58b0af6f82edaed69ff929885c1f4b6f4fa15093a3d1a12b3f2a0c77e8bb86 diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha17-r99.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha17-r99.ebuild new file mode 100644 index 00000000..d6d11763 --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01_alpha17-r99.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild,v 1.2 2013/09/28 19:50:34 ago Exp $ + +EAPI=5 + +inherit fcaps multilib eutils toolchain-funcs flag-o-matic + +MY_P="${P/_alpha/a}" + +DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" +HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html" +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha/')/${MY_P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="acl nls unicode" + +RDEPEND="acl? ( virtual/acl ) + nls? ( virtual/libintl ) + !app-cdr/cdrkit" +DEPEND="${RDEPEND} + nls? ( >=sys-devel/gettext-0.18.1.1 )" + +S=${WORKDIR}/${P/_alpha[0-9][0-9]} + +FILECAPS=( + cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord -- + cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav -- + cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd +) + +src_prepare() { + # Avoid collision with clone() system call, bug #486782 + epatch "${FILESDIR}"/${PN}-3.01-rename-clone.patch + + # Remove profiled make files. + rm -f $(find . -name '*_p.mk') || die "rm profiled" + + # Adjusting hardcoded paths. + sed -i -e 's:opt/schily:usr:' \ + $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \ + || die "sed opt/schily" + + sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \ + $(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \ + || die "sed doc" + + # Respect libdir. + sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \ + $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \ + || die "sed multilib" + + # Do not install static libraries. + sed -i -e 's:include\t\t.*rules.lib::' \ + $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \ + || die "sed rules" + + # Respect CC/CXX variables. + cd "${S}"/RULES + local tcCC=$(tc-getCC) + local tcCXX=$(tc-getCXX) + sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ + rules1.top || die "sed rules1.top" + sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \ + -e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \ + -e "/COPTOPT=/s/-O//" \ + -e 's/$(GCCOPTOPT)//' \ + cc-gcc.rul || die "sed cc-gcc.rul" + sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \ + rules.cnf || die "sed rules.cnf" + + # Create additional symlinks needed for some archs (armv4l already created) + local t + for t in armv4tl armv5tel armv7l ppc64 s390x; do + ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die + ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die + done + + # Schily make setup. + cd "${S}"/DEFAULTS + local os="linux" + [[ ${CHOST} == *-darwin* ]] && os="mac-os10" + + sed -i \ + -e "s:/opt/schily:/usr:g" \ + -e "s:/usr/src/linux/include::g" \ + -e "s:bin:root:g" \ + Defaults.${os} || die "sed Schily make setup" +} + +# skip obsolete configure script +src_configure() { : ; } + +src_compile() { + if use unicode; then + local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)" + if [[ -n ${flags} ]]; then + append-flags ${flags} + else + ewarn "Your compiler does not support the options required to build" + ewarn "cdrtools with unicode in USE. unicode flag will be ignored." + fi + fi + + if ! use filecaps; then + CFLAGS="${CFLAGS} -DNO_LINUX_CAPS" + fi + + if ! use acl; then + CFLAGS="${CFLAGS} -DNO_ACL" + fi + + # If not built with -j1, "sometimes" cdda2wav will not be built. + emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ + LDOPTX="${LDFLAGS}" \ + INS_BASE="${ED}/usr" INS_RBASE="${ED}" LINKMODE="dynamic" \ + RUNPATH="" GMAKE_NOWARN="true" +} + +src_install() { + # If not built with -j1, "sometimes" manpages are not installed. + emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ + LDOPTX="${LDFLAGS}" \ + INS_BASE="${ED}/usr" INS_RBASE="${ED}" LINKMODE="dynamic" \ + RUNPATH="" GMAKE_NOWARN="true" install + + # These symlinks are for compat with cdrkit. + dosym schily /usr/include/scsilib + dosym ../scg /usr/include/schily/scg + + dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux + + cd "${S}"/cdda2wav + docinto cdda2wav + dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO + + cd "${S}"/mkisofs + docinto mkisofs + dodoc ChangeLog* TODO + + # Remove man pages related to the build system + rm -rvf "${ED}"/usr/share/man/man5 +} + +pkg_postinst() { + fcaps_pkg_postinst + + if [[ ${CHOST} == *-darwin* ]] ; 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 + fi +} diff --git a/app-cdr/cdrtools/files/cdrtools-3.01-rename-clone.patch b/app-cdr/cdrtools/files/cdrtools-3.01-rename-clone.patch new file mode 100644 index 00000000..483841b6 --- /dev/null +++ b/app-cdr/cdrtools/files/cdrtools-3.01-rename-clone.patch @@ -0,0 +1,69 @@ +diff -Naur cdrtools-3.01.orig/readcd/readcd.c cdrtools-3.01/readcd/readcd.c +--- cdrtools-3.01.orig/readcd/readcd.c 2013-05-30 16:56:24.000000000 -0400 ++++ cdrtools-3.01/readcd/readcd.c 2013-10-02 14:54:49.697222392 -0400 +@@ -255,7 +255,7 @@ + BOOL pifscan; + BOOL plot; + BOOL fulltoc; +-BOOL clone; ++BOOL clonetoc; + BOOL edc_corr; + BOOL noerror; + BOOL nocorr; +@@ -291,7 +291,7 @@ + error(_("\t-plot Print data suitable for gnuplot\n")); + #ifdef CLONE_WRITE + error(_("\t-fulltoc Retrieve the full TOC\n")); +- error(_("\t-clone Retrieve the full TOC and all data\n")); ++ error(_("\t-clonetoc Retrieve the full TOC and all data\n")); + error(_("\t-edc-corr Try to do user level Reed Solomon repair (experimental)\n")); + #endif + error(_("\ttimeout=# set the default SCSI command timeout to #.\n")); +@@ -317,7 +317,7 @@ + } + + /* CSTYLED */ +-char opts[] = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#"; ++char opts[] = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#"; + + EXPORT int + main(ac, av) +@@ -393,7 +393,7 @@ + &scanbus, &dev, §ors, &do_write, + &c2scan, &cxscan, &pi8scan, &pifscan, + &plot, +- &fulltoc, &clone, ++ &fulltoc, &clonetoc, + &edc_corr, + &noerror, &nocorr, + ¬runc, &retries, &do_factor, &filename, +@@ -664,7 +664,7 @@ + + if (filename || sectors || c2scan || cxscan || pi8scan || pifscan || + meshpoints || fulltoc || +- clone || edc_corr) { ++ clonetoc || edc_corr) { + dorw(scgp, filename, sectors); + } else { + doit(scgp); +@@ -879,9 +879,9 @@ + if (params.name == NULL) + params.name = "/dev/null"; + read_ftoc(scgp, ¶ms, FALSE); +- } else if (clone || edc_corr) { ++ } else if (clonetoc || edc_corr) { + if (!is_mmc(scgp, NULL, NULL)) +- comerrno(EX_BAD, _("Unsupported device for clone mode.\n")); ++ comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n")); + if (!edc_corr) + noerror = TRUE; + if (retries == MAX_RETRY) +@@ -889,7 +889,7 @@ + if (params.name == NULL) + params.name = "/dev/null"; + +- if (clone) ++ if (clonetoc) + if (read_ftoc(scgp, ¶ms, TRUE) < 0) + comerrno(EX_BAD, _("Read fulltoc problems.\n")); + readcd_disk(scgp, ¶ms); diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml new file mode 100644 index 00000000..31e9f7e5 --- /dev/null +++ b/app-cdr/cdrtools/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>media-optical</herd> +<maintainer> +<email>billie@gentoo.org</email> +<name>Daniel Pielmeier</name> +</maintainer> +<longdescription>CD and DVD command line recording and ripping tools.</longdescription> +</pkgmetadata> |