commit: e165fdb0cfb398fd4daf82945bd7f66948af68d8 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Aug 17 13:46:31 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Aug 17 16:21:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e165fdb0
media-libs/dumb: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/dumb/Manifest | 1 - media-libs/dumb/dumb-0.9.3-r3.ebuild | 69 --------------------- .../dumb/files/dumb-0.9.3-PIC-as-needed.patch | 72 ---------------------- .../dumb/files/dumb-0.9.3_CVE-2006-3668.patch | 16 ----- 4 files changed, 158 deletions(-) diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest index 4f2c4403b6ae..51a1a920a57a 100644 --- a/media-libs/dumb/Manifest +++ b/media-libs/dumb/Manifest @@ -1,2 +1 @@ -DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658 DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf diff --git a/media-libs/dumb/dumb-0.9.3-r3.ebuild b/media-libs/dumb/dumb-0.9.3-r3.ebuild deleted file mode 100644 index 83ad5b247d53..000000000000 --- a/media-libs/dumb/dumb-0.9.3-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multilib-build multilib-minimal - -DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters" -HOMEPAGE="http://dumb.sourceforge.net/"; -SRC_URI="mirror://sourceforge/dumb/${P}.tar.gz" - -LICENSE="DUMB-0.9.3" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" -IUSE="debug" - -RDEPEND="" -DEPEND="" - -PATCHES=( - "${FILESDIR}"/${P}-PIC-as-needed.patch - "${FILESDIR}"/${P}_CVE-2006-3668.patch -) - -src_prepare() { - default - - cat << EOF > make/config.txt -include make/unix.inc -ALL_TARGETS := core core-examples core-headers -PREFIX := /usr -EOF - - sed -i '/= -s/d' Makefile || die "sed failed" - cp -f Makefile Makefile.rdy - - multilib_copy_sources -} - -multilib_src_compile() { - emake CC="$(tc-getCC)" OFLAGS="${CFLAGS}" all -} - -multilib_src_install() { - dolib.so lib/unix/libdumb.so - use debug && dolib.so lib/unix/libdumbd.so - - doheader include/dumb.h - - dobin examples/{dumbout,dumb2wav} - dodoc readme.txt release.txt docs/* -} - -pkg_postinst() { - elog "DUMB's core has been installed. This will enable you to convert module" - elog "files to PCM data (ready for sending to /dev/dsp, writing to a .wav" - elog "file, piping through oggenc, etc.)." - elog - elog "If you are using Allegro, you will also want to 'emerge aldumb'. This" - elog "provides you with a convenient API for playing module files through" - elog "Allegro's sound system, and also enables DUMB to integrate with" - elog "Allegro's datafile system so you can add modules to datafiles." - elog - elog "As a developer, when you distribute your game and write your docs, be" - elog "aware that 'dumb' and 'aldumb' actually come from the same download." - elog "People who don't use Gentoo will only have to download and install one" - elog "package. See readme.txt in /usr/share/doc/${PF} for details on" - elog "how DUMB would be compiled manually." -} diff --git a/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch b/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch deleted file mode 100644 index 217caa406b3e..000000000000 --- a/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -Naur dumb.orig/Makefile dumb/Makefile ---- dumb.orig/Makefile 2003-04-03 16:34:18.000000000 -0800 -+++ dumb/Makefile 2004-07-06 14:43:38.158063165 -0700 -@@ -199,11 +199,11 @@ - ALLEGRO_EXAMPLES_EXE := $(addprefix examples/, $(notdir $(patsubst %.c, %$(EXE_SUFFIX), $(ALLEGRO_EXAMPLES)))) - - --CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.a --ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.a -+CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.so -+ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.so - --CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.a --ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a -+CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.so -+ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.so - - - core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG) -@@ -272,22 +272,22 @@ - - OBJDIR := $(OBJDIR_BASE)/release - CFLAGS := $(CFLAGS_RELEASE) --CORE_LIB_FILE := $(LIBDIR)/libdumb.a --ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a -+CORE_LIB_FILE := $(LIBDIR)/libdumb.so -+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.so - include make/Makefile.inc - - OBJDIR := $(OBJDIR_BASE)/debug - CFLAGS := $(CFLAGS_DEBUG) --CORE_LIB_FILE := $(LIBDIR)/libdumbd.a --ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a -+CORE_LIB_FILE := $(LIBDIR)/libdumbd.so -+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.so - include make/Makefile.inc - - - $(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE) -- $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH) -+ $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH) - - $(ALLEGRO_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(ALLEGRO_LIB_FILE_RELEASE) $(CORE_LIB_FILE_RELEASE) -- $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO) -+ $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO) - - $(CORE_EXAMPLES_OBJ): examples/%.o: examples/%.c include/dumb.h - $(CC) -c $< -o $@ $(CFLAGS_RELEASE) -diff -Naur dumb.orig/make/Makefile.inc dumb/make/Makefile.inc ---- dumb.orig/make/Makefile.inc 2003-04-03 16:34:18.000000000 -0800 -+++ dumb/make/Makefile.inc 2004-07-06 14:37:13.082037585 -0700 -@@ -10,8 +10,8 @@ - # accurately, create a local copy of the current CFLAGS variable. This is - # necessary because Make doesn't expand variables in commands until they are - # executed. --$(CORE_LIB_FILE): CFLAGS := $(CFLAGS) --$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS) -+$(CORE_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC -+$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC - - - $(OBJDIR)/%.o: src/core/%.c include/dumb.h include/internal/dumb.h -@@ -28,7 +28,7 @@ - $(CC) -c -o $@ $< $(CFLAGS) $(WFLAGS_ALLEGRO) - - $(CORE_LIB_FILE): $(CORE_OBJECTS) -- $(AR) rs $@ $^ -+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm - - $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS) -- $(AR) rs $@ $^ -+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb diff --git a/media-libs/dumb/files/dumb-0.9.3_CVE-2006-3668.patch b/media-libs/dumb/files/dumb-0.9.3_CVE-2006-3668.patch deleted file mode 100644 index 09d2fb68f4cb..000000000000 --- a/media-libs/dumb/files/dumb-0.9.3_CVE-2006-3668.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: libdumb-0.9.3/src/it/itread.c -=================================================================== ---- libdumb-0.9.3.orig/src/it/itread.c 2006-07-21 11:05:48.000000000 +0200 -+++ libdumb-0.9.3/src/it/itread.c 2006-07-21 11:07:22.000000000 +0200 -@@ -292,6 +292,11 @@ - - envelope->flags = dumbfile_getc(f); - envelope->n_nodes = dumbfile_getc(f); -+ if(envelope->n_nodes > 25) { -+ TRACE("IT error: wrong number of envelope nodes (%d)\n", envelope->n_nodes); -+ envelope->n_nodes = 0; -+ return -1; -+ } - envelope->loop_start = dumbfile_getc(f); - envelope->loop_end = dumbfile_getc(f); - envelope->sus_loop_start = dumbfile_getc(f);
