On Thu, Nov 25, 2021 at 07:49:08PM -0800, Nam Nguyen wrote: > Nam Nguyen writes: > > > Here is an update for graphics/libcaca to 0.99.beta20. > > > > Changelog: > > https://github.com/cacalabs/libcaca/releases/tag/v0.99.beta20 > > > > There are some CVE fixes listed there (e.g., buffer overflow, illegal > > WRITE access, illegal READ access). Here is one: > > https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3410 > > https://github.com/cacalabs/libcaca/issues/52 > > > > This diff: > > - Moves MASTER_SITES to github > > (http://caca.zoy.org/browser/libcaca/trunk/README) > > - Defines V and V_BETA for use in MASTER_SITES
I don't see V_BETA anywhere. On the other hand, I don't think it's needed. > > - Bumps major because of removed symbols. libcaca is moving away from > > using libcucul. > > (https://namtsui.com/public/caca_check_sym.txt) Agree. > > - Disable building ruby subdirectory in Makefile.in patch to be > > consistent with --disable-ruby. > > - Remove bash-ism =~ in patch-configure bash-ism throws an error > > otherwise. Reorder comments while here. > > > > I tested with misc/toilet, the only consumer. Not sure how much misc/toilet uses it without '--export <format>', but the bundled applications cacademo and cacafire work fine. cacaclock complains about not finding a font, but that was already there in the previous version and doesn't need to hold up the update in my opinion. > > > > Feedback? OK? > > ping. This diff has a tweak for PKGNAME substitution for updating > verison number in one place. ok thfr@, but a few comments for maybe future update considerations: 1. version 0.99.beta20 => 0.99.20 is in line with what the previous version did, but in the future after a major/minor update it might be worth considering keeping the "beta": 0.99beta20. This is based on packages-specs(7): "The last part may contain an extra suffix matching rc[N], alpha[N], beta[N],..." 2. There are some stray compiler flags in configure, probably this: 19672:CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer" I think the "-g -O2" could interfere with builder setting other flags. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/graphics/libcaca/Makefile,v > retrieving revision 1.36 > diff -u -p -u -p -r1.36 Makefile > --- Makefile 26 Jan 2020 11:14:32 -0000 1.36 > +++ Makefile 26 Nov 2021 03:43:57 -0000 > @@ -2,11 +2,11 @@ > > COMMENT= color ascii art library > > -DISTNAME= libcaca-0.99.beta19 > -PKGNAME= libcaca-0.99.19 > -SHARED_LIBS += caca 1.2 # .0.99 > +V= 0.99.beta20 > +DISTNAME= libcaca-${V} > +PKGNAME= ${DISTNAME:S/beta//} > +SHARED_LIBS += caca 2.0 # .0.99 > CATEGORIES= graphics > -REVISION= 2 > > HOMEPAGE= http://caca.zoy.org/wiki/libcaca > > @@ -15,8 +15,7 @@ PERMIT_PACKAGE= Yes > > WANTLIB= c curses m z > > -MASTER_SITES= http://caca.zoy.org/files/libcaca/ \ > - https://distfiles.sigtrap.nl/ > +MASTER_SITES= > https://github.com/cacalabs/libcaca/releases/download/v${V}/ > > FLAVORS= no_x11 > FLAVOR?= > Index: distinfo > =================================================================== > RCS file: /cvs/ports/graphics/libcaca/distinfo,v > retrieving revision 1.10 > diff -u -p -u -p -r1.10 distinfo > --- distinfo 7 Jun 2014 20:29:32 -0000 1.10 > +++ distinfo 26 Nov 2021 03:43:57 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (libcaca-0.99.beta19.tar.gz) = > EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ= > -SIZE (libcaca-0.99.beta19.tar.gz) = 1203495 > +SHA256 (libcaca-0.99.beta20.tar.gz) = > itdLq8Y79mWwsjeNlbTaZbdJPBG9nzrGAFFwhbDErPI= > +SIZE (libcaca-0.99.beta20.tar.gz) = 1099916 > Index: patches/patch-Makefile_in > =================================================================== > RCS file: /cvs/ports/graphics/libcaca/patches/patch-Makefile_in,v > retrieving revision 1.5 > diff -u -p -u -p -r1.5 patch-Makefile_in > --- patches/patch-Makefile_in 7 Jun 2014 20:29:32 -0000 1.5 > +++ patches/patch-Makefile_in 26 Nov 2021 03:43:57 -0000 > @@ -1,12 +1,13 @@ > $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@ > +Index: Makefile.in > +--- Makefile.in.orig > ++++ Makefile.in > +@@ -427,7 +427,7 @@ top_builddir = @top_builddir@ > top_srcdir = @top_srcdir@ > + AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca > SUBDIRS = kernel caca src examples tools \ > -- cxx caca-sharp python ruby java \ > -+ cxx ruby \ > - doc test > +- cxx caca-sharp python ruby java doc > ++ cxx doc > > - DIST_SUBDIRS = $(SUBDIRS) win32 > + DIST_SUBDIRS = $(SUBDIRS) build > + EXTRA_DIST = NOTES COPYING.GPL COPYING.ISC COPYING.LGPL bootstrap > caca-config.in libcaca.spec libcaca.sln > Index: patches/patch-configure > =================================================================== > RCS file: /cvs/ports/graphics/libcaca/patches/patch-configure,v > retrieving revision 1.5 > diff -u -p -u -p -r1.5 patch-configure > --- patches/patch-configure 7 Jun 2014 20:29:32 -0000 1.5 > +++ patches/patch-configure 26 Nov 2021 03:43:57 -0000 > @@ -1,16 +1,17 @@ > $OpenBSD: patch-configure,v 1.5 2014/06/07 20:29:32 bcallah Exp $ > > -1. Disable detection of pangoft2. > +1. Disable detection of ftgl. (no --disable-ftgl option.) > > -2. Disable detection of cppunit. (--disable-cppunit is a NOP.) > +2. Remove bash-ism =~ > > -3. Disable detection of ftgl. (no --disable-ftgl option.) > +3. Disable detection of pangoft2. > > ---- 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 > +Index: configure > +--- configure.orig > ++++ configure > +@@ -19339,8 +19339,7 @@ if test -n "$FTGL_CFLAGS"; then > ac_status=$? > - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then > - pkg_cv_FTGL_CFLAGS=`$PKG_CONFIG --cflags "ftgl >= 2.1.3" 2>/dev/null` > - test "x$?" != "x0" && pkg_failed=yes > @@ -18,9 +19,9 @@ $OpenBSD: patch-configure,v 1.5 2014/06/ > else > pkg_failed=yes > fi > -@@ -17512,8 +17511,7 @@ if test -n "$FTGL_LIBS"; then > +@@ -19356,8 +19355,7 @@ if test -n "$FTGL_LIBS"; then > ac_status=$? > - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then > - pkg_cv_FTGL_LIBS=`$PKG_CONFIG --libs "ftgl >= 2.1.3" 2>/dev/null` > - test "x$?" != "x0" && pkg_failed=yes > @@ -28,21 +29,21 @@ $OpenBSD: patch-configure,v 1.5 2014/06/ > else > pkg_failed=yes > fi > -@@ -18672,7 +18670,7 @@ fi > +@@ -19422,7 +19420,7 @@ fi > + done > + CFLAGS="$save_CFLAGS" > + if test "${ac_cv_my_have_cocoa}" = "yes"; then > +- [[ "$target_os" =~ [0-9]+ ]] && darwin_ver="${BASH_REMATCH[0]}" > ++ [[ "$target_os" = [0-9]+ ]] && darwin_ver="${BASH_REMATCH[0]}" > + case x${target} in > + xpowerpc*darwin*) > + # 10.3 needed to link with X11 > +@@ -20696,7 +20694,7 @@ fi > > # Build development tools? > > -pkg_failed=no > +pkg_failed=yes > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5 > - $as_echo_n "checking for PANGOFT2... " >&6; } > - > -@@ -18963,7 +18961,7 @@ fi > - > - # Use cppunit for unit tests? > - > --pkg_failed=no > -+pkg_failed=yes > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5 > - $as_echo_n "checking for CPPUNIT... " >&6; } > + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pangoft2" >&5 > + printf %s "checking for pangoft2... " >&6; } > > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/graphics/libcaca/pkg/PLIST,v > retrieving revision 1.7 > diff -u -p -u -p -r1.7 PLIST > --- pkg/PLIST 22 May 2015 11:31:15 -0000 1.7 > +++ pkg/PLIST 26 Nov 2021 03:43:57 -0000 > @@ -11,7 +11,7 @@ include/caca.h > include/caca0.h > include/caca_conio.h > include/caca_types.h > -lib/libcaca.a > +@static-lib lib/libcaca.a > lib/libcaca.la > @lib lib/libcaca.so.${LIBcaca_VERSION} > lib/pkgconfig/caca.pc >
