Update transfig to 3.2.8b.

This commit is contained in:
fcambus 2022-12-08 20:33:24 +00:00
parent af51ff3cfb
commit eccb8ff6c5
8 changed files with 42 additions and 55 deletions

View File

@ -1,8 +1,7 @@
COMMENT= tools to convert Xfig's .fig files #'
VERSION= 3.2.7b
VERSION= 3.2.8b
DISTNAME= fig2dev-${VERSION}
REVISION= 1
EXTRACT_SUFX = .tar.xz
PKGNAME= transfig-${VERSION}
CATEGORIES= print

View File

@ -1,2 +1,2 @@
SHA256 (fig2dev-3.2.7b.tar.xz) = R9wbRCChvFA7N3GZPhnNr3USDTi+ZUhwn32E97B9aLI=
SIZE (fig2dev-3.2.7b.tar.xz) = 512224
SHA256 (fig2dev-3.2.8b.tar.xz) = QYoWSqn61y0lu0/sjXtFL+Oi8S+ZDPIuBcDrFs7LaMs=
SIZE (fig2dev-3.2.8b.tar.xz) = 522756

View File

@ -1,12 +0,0 @@
Index: fig2dev/Makefile.in
--- fig2dev/Makefile.in.orig
+++ fig2dev/Makefile.in
@@ -125,7 +125,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_fig2dev_OBJECTS = arrow.$(OBJEXT) bound.$(OBJEXT) colors.$(OBJEXT) \
creationdate.$(OBJEXT) fig2dev.$(OBJEXT) free.$(OBJEXT) \
iso2tex.$(OBJEXT) localmath.$(OBJEXT) read1_3.$(OBJEXT) \
- read.$(OBJEXT) trans_spline.$(OBJEXT) getopt.$(OBJEXT)
+ read.$(OBJEXT) trans_spline.$(OBJEXT)
fig2dev_OBJECTS = $(am_fig2dev_OBJECTS)
LIBOBJDIR = ../fig2dev/lib/
am__dirstamp = $(am__leading_dot)dirstamp

View File

@ -0,0 +1,13 @@
Fix undefined references to `WIFEXITED' and `WEXITSTATUS'.
Index: fig2dev/dev/genbitmaps.c
--- fig2dev/dev/genbitmaps.c.orig
+++ fig2dev/dev/genbitmaps.c
@@ -36,6 +36,7 @@
#include <stdlib.h>
#include <string.h>
#include <signal.h>
+#include <sys/wait.h>
#include "bool.h"
#include "fig2dev.h" /* includes bool.h and object.h */

View File

@ -0,0 +1,13 @@
Fix undefined references to `WIFEXITED' and `WEXITSTATUS'.
Index: fig2dev/dev/readeps.c
--- fig2dev/dev/readeps.c.orig
+++ fig2dev/dev/readeps.c
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
+#include <sys/wait.h>
#include "fig2dev.h" /* includes bool.h and object.h */
//#include "object.h"

View File

@ -0,0 +1,13 @@
Fix undefined references to `WIFEXITED' and `WEXITSTATUS'.
Index: fig2dev/dev/readpics.c
--- fig2dev/dev/readpics.c.orig
+++ fig2dev/dev/readpics.c
@@ -31,6 +31,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
+#include <sys/wait.h>
#include "messages.h"
#include "xtmpfile.h"

View File

@ -1,21 +0,0 @@
Index: fig2dev/fig2dev.c
--- fig2dev/fig2dev.c.orig
+++ fig2dev/fig2dev.c
@@ -45,7 +45,7 @@
#include "read.h"
/* the three lines below could go into a getopt.h file */
-extern int fig_getopt(int nargc, char **nargv, char *ostr); /* getopt.c */
+#include <unistd.h>
extern char *optarg; /* getopt.c */
extern int optind; /* getopt.c */
@@ -219,7 +219,7 @@ get_args(int argc, char *argv[])
if (argc == 1)
fprintf(stderr, Usage, prog, prog);
/* sum of all arguments */
- while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
+ while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {
/* global (all drivers) option handling */
switch (c) {

View File

@ -1,18 +0,0 @@
Fix for CVE-2019-19555.
- Stack-based buffer overflow in read_textobject()
Upstream commit 19db5fe6f77ebad91af4b4ef0defd61bd0bb358f.
Index: fig2dev/read.c
--- fig2dev/read.c.orig
+++ fig2dev/read.c
@@ -1328,7 +1328,7 @@ read_textobject(FILE *fp)
If we do not find the CONTROL-A on this line then this must
be a multi-line text object and we will have to read more. */
- n = sscanf(buf,"%*d%d%d%lf%d%d%d%lf%d%lf%lf%d%d%[^\1]%[\1]",
+ n = sscanf(buf,"%*d%d%d%lf%d%d%d%lf%d%lf%lf%d%d%[^\1]%1[\1]",
&t->type, &t->font, &t->size, &t->pen,
&t->color, &t->depth, &t->angle,
&t->flags, &t->height, &t->length,