Update to 0.99.19

Updates include a use-after-free fix (thanks to sthen@ for pointing that
out)
ok sthen@
This commit is contained in:
bcallah 2014-06-07 20:29:32 +00:00
parent 4afa084881
commit 7dba317735
6 changed files with 19 additions and 33 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2014/01/15 22:57:44 bcallah Exp $
# $OpenBSD: Makefile,v 1.29 2014/06/07 20:29:32 bcallah Exp $
COMMENT= color ascii art library
DISTNAME= libcaca-0.99.beta18
PKGNAME= libcaca-0.99.18
REVISION= 0
SHARED_LIBS += caca 1.1 # .0.99
DISTNAME= libcaca-0.99.beta19
PKGNAME= libcaca-0.99.19
SHARED_LIBS += caca 1.2 # .0.99
CATEGORIES= graphics
HOMEPAGE= http://caca.zoy.org/wiki/libcaca

View File

@ -1,2 +1,2 @@
SHA256 (libcaca-0.99.beta18.tar.gz) = d+oGYz9KYCLczU92wYI+FnpAywUwj8HH6g+h+A9sM6E=
SIZE (libcaca-0.99.beta18.tar.gz) = 1168552
SHA256 (libcaca-0.99.beta19.tar.gz) = EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ=
SIZE (libcaca-0.99.beta19.tar.gz) = 1203495

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2014/01/05 18:39:05 bcallah Exp $
--- Makefile.in.orig Fri Apr 6 16:48:34 2012
+++ Makefile.in Sat Jan 4 14:38:00 2014
@@ -320,7 +320,7 @@ top_build_prefix = @top_build_prefix@
$OpenBSD: patch-Makefile_in,v 1.5 2014/06/07 20:29:32 bcallah Exp $
--- Makefile.in.orig Fri May 16 15:15:33 2014
+++ Makefile.in Sat Jun 7 14:03:02 2014
@@ -410,7 +410,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = kernel caca src examples tools \

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-caca_Makefile_in,v 1.3 2014/01/05 18:39:05 bcallah Exp $
--- caca/Makefile.in.orig Fri Apr 6 16:48:33 2012
+++ caca/Makefile.in Sat Jan 4 14:38:00 2014
@@ -1146,7 +1146,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLT
install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(libdir)
- . ./libcaca.la || exit 1; \
for x in $$library_names; do \
ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
done

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.4 2014/01/15 22:57:44 bcallah Exp $
$OpenBSD: patch-configure,v 1.5 2014/06/07 20:29:32 bcallah Exp $
1. Disable detection of pangoft2.
@ -6,9 +6,9 @@ $OpenBSD: patch-configure,v 1.4 2014/01/15 22:57:44 bcallah Exp $
3. Disable detection of ftgl. (no --disable-ftgl option.)
--- configure.orig Fri Apr 6 16:48:32 2012
+++ configure Wed Jan 15 15:16:46 2014
@@ -17412,8 +17412,7 @@ if test -n "$FTGL_CFLAGS"; then
--- configure.orig Fri May 16 15:15:32 2014
+++ configure Sat Jun 7 14:03:02 2014
@@ -17495,8 +17495,7 @@ if test -n "$FTGL_CFLAGS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.4 2014/01/15 22:57:44 bcallah Exp $
else
pkg_failed=yes
fi
@@ -17429,8 +17428,7 @@ if test -n "$FTGL_LIBS"; then
@@ -17512,8 +17511,7 @@ if test -n "$FTGL_LIBS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.4 2014/01/15 22:57:44 bcallah Exp $
else
pkg_failed=yes
fi
@@ -18553,7 +18551,7 @@ fi
@@ -18672,7 +18670,7 @@ fi
# Build development tools?
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.4 2014/01/15 22:57:44 bcallah Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5
$as_echo_n "checking for PANGOFT2... " >&6; }
@@ -18844,7 +18842,7 @@ fi
@@ -18963,7 +18961,7 @@ fi
# Use cppunit for unit tests?

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2013/10/17 14:31:53 naddy Exp $
@comment $OpenBSD: PLIST,v 1.6 2014/06/07 20:29:32 bcallah Exp $
bin/caca-config
@bin bin/cacaclock
@bin bin/cacademo
@bin bin/cacafire
@bin bin/cacaplay
@ -10,14 +11,11 @@ include/caca.h
include/caca0.h
include/caca_conio.h
include/caca_types.h
include/cucul.h
lib/libcaca.a
lib/libcaca.la
@lib lib/libcaca.so.${LIBcaca_VERSION}
lib/libcucul.la
lib/pkgconfig/
lib/pkgconfig/caca.pc
lib/pkgconfig/cucul.pc
@man man/man1/caca-config.1
@man man/man1/cacademo.1
@man man/man1/cacafire.1