[arch-commits] Commit in dumb/trunk (CVE-2006-3668.patch PKGBUILD as-needed.patch)
Antonio Rojas
arojas at archlinux.org
Mon Aug 28 18:43:21 UTC 2017
Date: Monday, August 28, 2017 @ 18:43:20
Author: arojas
Revision: 254668
Update to kode54's fork as recommended by upstream
Modified:
dumb/trunk/PKGBUILD
Deleted:
dumb/trunk/CVE-2006-3668.patch
dumb/trunk/as-needed.patch
---------------------+
CVE-2006-3668.patch | 16 -----------
PKGBUILD | 59 +++++++++++-----------------------------
as-needed.patch | 72 --------------------------------------------------
3 files changed, 16 insertions(+), 131 deletions(-)
Deleted: CVE-2006-3668.patch
===================================================================
--- CVE-2006-3668.patch 2017-08-28 18:37:37 UTC (rev 254667)
+++ CVE-2006-3668.patch 2017-08-28 18:43:20 UTC (rev 254668)
@@ -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);
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-08-28 18:37:37 UTC (rev 254667)
+++ PKGBUILD 2017-08-28 18:43:20 UTC (rev 254668)
@@ -5,59 +5,32 @@
# Contributor: Bjørn Lindeijer <bjorn lindeijer nl>
pkgname=dumb
-pkgver=0.9.3
-pkgrel=8
+pkgver=1.0
+pkgrel=1
pkgdesc='IT, XM, S3M and MOD player library'
arch=('x86_64' 'i686')
license=('custom:dumb' 'GPL')
url='http://dumb.sourceforge.net/'
-makedepends=('setconf')
-depends=('glibc' 'allegro4')
-source=("http://downloads.sourceforge.net/sourceforge/dumb/$pkgname-$pkgver.tar.gz"
- 'as-needed.patch'
- 'CVE-2006-3668.patch')
-sha256sums=('8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33'
- 'f7a41576d5dcecad2f9a01cbb0228457b434423046cb67c9a0a720ec87f43fb9'
- '9f6785435757db725bc73b1c4874b91e80b9277c6fdd2b56e47dae1cfbc968e6')
+makedepends=('cmake')
+depends=('glibc')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/kode54/dumb/archive/$pkgver.tar.gz")
+sha256sums=('09ea62fd01f6e71cb28a8a8c1c1e356e7eb38f5e003b684e12eb1944c6d35fa5')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
- # Add -fPIC for anything but i686
- [ "$CARCH" = 'i686' ] || export CFLAGS="${CFLAGS} -fPIC"
-
- # Patch from Gentoo for CVE-2006-3668
- patch -p1 < "$srcdir/CVE-2006-3668.patch"
-
- # Patch from Gentoo for binutils >= 2.22
- patch -p1 < "$srcdir/as-needed.patch"
- sed -i '/LDFLAGS :=/d' Makefile
- cp Makefile Makefile.rdy
-
- # Make with Allegro support
- # Upstream's make process is interactive, and we can't simply pass
- # a here-document to the make command. The best way is to write our
- # own config.txt, circumventing the interactive configuration step,
- # as is done in Gentoo's ebuild.
- cat << EOF > make/config.txt
-include make/unix.inc
-ALL_TARGETS := core core-examples core-headers
-ALL_TARGETS += allegro allegro-examples allegro-headers
-PREFIX := /usr
-EOF
-
- # Use OFLAGS to be able to set CFLAGS without replacing the -I directives
- make -j1 OFLAGS="${CFLAGS}"
+ mkdir -p build
+ cd build
+ cmake ../dumb/cmake \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=ON
+ make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver/build
- install -d "$pkgdir"/usr/{lib,bin,include}
- install -Dm644 licence.txt \
- "$pkgdir/usr/share/licenses/$pkgname/licence.txt"
- setconf make/config.txt PREFIX "$pkgdir/usr"
make DESTDIR="$pkgdir" install
+ install -Dm644 ../dumb/licence.txt "$pkgdir"/usr/share/licenses/$pkgname/license.txt
}
-
-# vim:set ts=2 sw=2 et:
Deleted: as-needed.patch
===================================================================
--- as-needed.patch 2017-08-28 18:37:37 UTC (rev 254667)
+++ as-needed.patch 2017-08-28 18:43:20 UTC (rev 254668)
@@ -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 $@ -Llib/unix $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb
More information about the arch-commits
mailing list