From 1c9a2b6cf059fca455a527c1bd76a2321f93b310 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Aug 2022 20:33:10 +0100 Subject: gentoo auto-resync : 17:08:2022 - 20:33:10 --- dev-libs/libcdio/Manifest | 3 - .../libcdio/files/libcdio-2.0.0-iso-ioleak.patch | 37 ----------- dev-libs/libcdio/libcdio-2.0.0-r1.ebuild | 76 ---------------------- 3 files changed, 116 deletions(-) delete mode 100644 dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch delete mode 100644 dev-libs/libcdio/libcdio-2.0.0-r1.ebuild (limited to 'dev-libs/libcdio') diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest index 5f50733297aa..9cd52d0a5195 100644 --- a/dev-libs/libcdio/Manifest +++ b/dev-libs/libcdio/Manifest @@ -1,7 +1,4 @@ -AUX libcdio-2.0.0-iso-ioleak.patch 1093 BLAKE2B bd30e99cd35d2cb09dbbc7dd91133f1649a8761e7f23b1544a65477a77466f6b72bb99eb3ac21980b1cca54590fd5852dc1b9f7fde28a50bc5e101320576bdf5 SHA512 851fb3610ab801a5c62075426b9b51d42c60d35aaf4d247a825f8323d41bce692f48632604b7e6bc03ef83974f077ced371812ce50397dc054d16e353074f625 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b -DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f -EBUILD libcdio-2.0.0-r1.ebuild 1847 BLAKE2B 46f0f04beba6fa89e3723e2299654caf6e9c1c6cbdadb03e39773f093d6b896e10092171908d29bb7bc06c32a5108e4c1455322e9c678a92f86139ceffd69a55 SHA512 69595476e44d13d348716e78fa953f5f83f718d0605f1fc9df5766b871713944adcf551936af86fb2588947c933be6af62ff8ce767dc79f3ac8c365ed384c26c EBUILD libcdio-2.1.0-r1.ebuild 1804 BLAKE2B f573289277702791fcf1d6cf3156820306bd523e087ee98af0b66810a48f04d97559a3befe0fac13f58fb06d0a7e993aa6dab51835dafe2420f31ad0120dbe58 SHA512 ed841a3e8801138e2108ff87de988797de65c4cf0a0f9c1cd5ac74e047bad022ca4bed96d76c8a8f048675c92773c0330a61b801f8a3d581432115b1d94b0acb MISC metadata.xml 529 BLAKE2B 904a44230f894763ce7100a7816ec624427963881db42af35739fb3b31c811df8142eed82fd20946bc4fbede978bc3f561fbbcb85fe949f21cbf2e72bf6a1169 SHA512 76dc080e917f5d0bb5238eab5af3d890b6e2023866ddd1aec938f12044347269bff733278a4bdfa7655759baa20056ef565aebbcd4eacf78a772ac40e64386a8 diff --git a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch deleted file mode 100644 index 17732104c3d1..000000000000 --- a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8c0de2d3f0324ecf3fd135589589dcd783c15556 Mon Sep 17 00:00:00 2001 -From: rocky -Date: Fri, 16 Feb 2018 09:14:17 -0500 -Subject: Fix small I/O leak when we can't read ISO file - -See Savannah bug #53170. Thanks to David Binderman. ---- - src/iso-read.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/iso-read.c b/src/iso-read.c -index 0541e27..8647485 100644 ---- a/src/iso-read.c -+++ b/src/iso-read.c -@@ -1,5 +1,6 @@ - /* -- Copyright (C) 2004-2006, 2008, 2012-2013, 2017 Rocky Bernstein -+ Copyright (C) 2004-2006, 2008, 2012-2013, 2017-2018 Rocky Bernstein -+ - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -364,7 +365,10 @@ main(int argc, char *argv[]) - ret = read_iso_file (opts.iso9660_image, opts.file_name, - outfd, &bytes_written); - } -- if (ret != 0) return ret; -+ if (ret != 0) { -+ fclose (outfd); -+ return ret; -+ } - - fflush (outfd); - --- -cgit v1.0-41-gc330 - diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild deleted file mode 100644 index 4144e54f2f0d..000000000000 --- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools libtool multilib-minimal toolchain-funcs - -DESCRIPTION="A library to encapsulate CD-ROM reading and control" -HOMEPAGE="https://www.gnu.org/software/libcdio/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/18" # subslot is based on SONAME -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -IUSE="cddb +cxx minimal static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=sys-libs/ncurses-5.7-r7:0= - cddb? ( >=media-libs/libcddb-1.3.2 ) - ) - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - sys-apps/sed - sys-devel/gettext - virtual/pkgconfig - test? ( dev-lang/perl ) -" - -DOCS=( AUTHORS ChangeLog NEWS README{,.libcdio} THANKS TODO ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/cdio/cdio_config.h - /usr/include/cdio/version.h -) - -PATCHES=( "${FILESDIR}/${P}-iso-ioleak.patch" ) - -src_prepare() { - default - - eautoreconf - - sed \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i configure || die - - elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510 -} - -multilib_src_configure() { - local util_switch - if ! multilib_is_native_abi || use minimal ; then - util_switch="--without" - else - util_switch="--with" - fi - - # Tests fail if ECONF_SOURCE is not relative - ECONF_SOURCE="../${P}" econf \ - --disable-maintainer-mode \ - $(use_enable cxx) \ - --disable-cpp-progs \ - --disable-example-progs \ - $(use_enable static-libs static) \ - $(use_enable cddb) \ - --disable-vcd-info \ - ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read} -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3