Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package transfig for openSUSE:Factory checked in at 2023-09-21 22:13:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/transfig (Old) and /work/SRC/openSUSE:Factory/.transfig.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transfig" Thu Sep 21 22:13:18 2023 rev:56 rq:1112311 version:3.2.9 Changes: -------- --- /work/SRC/openSUSE:Factory/transfig/transfig.changes 2023-03-22 22:28:58.329689080 +0100 +++ /work/SRC/openSUSE:Factory/.transfig.new.1770/transfig.changes 2023-09-21 22:13:39.084403310 +0200 @@ -1,0 +2,20 @@ +Fri Sep 15 07:41:38 UTC 2023 - Dr. Werner Fink <wer...@suse.de> + +- Update to fig2dev version 3.2.9 (Aug 2023) + o Write utf8-encoded postscript and tex-outputs. + Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#. + o Include sys/wait.h to build on some bsds. + o Process crafted input files, tickets #142, #145, #146, #147, #148, + and #152. + o Correctly scale dxf output, ticket #91. + o Correct a typo causing incorrect eps import, ticket #137. + o Regression, pass driver names to driver, ticket #139. +- Port and rename patch transfig-3.2.8.dif which is now transfig-3.2.9.dif +- Port patches + * fig2dev-3.2.6-fig2mpdf.patch + * transfig-fix-afl.patch +- Remove patches now upstream + * 0001-Make-ModDate-and-CreationDate-in-PDF-reproducible.patch + * 1b09a8.patch + +------------------------------------------------------------------- Old: ---- 0001-Make-ModDate-and-CreationDate-in-PDF-reproducible.patch 1b09a8.patch fig2dev-3.2.8b.tar.xz transfig-3.2.8.dif New: ---- fig2dev-3.2.9.tar.xz transfig-3.2.9.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ transfig.spec ++++++ --- /var/tmp/diff_new_pack.3jfz5b/_old 2023-09-21 22:13:40.564457026 +0200 +++ /var/tmp/diff_new_pack.3jfz5b/_new 2023-09-21 22:13:40.568457171 +0200 @@ -17,7 +17,7 @@ Name: transfig -Version: 3.2.8b +Version: 3.2.9 Release: 0 Summary: Graphic Converter # www.xfig.org is dead @@ -26,12 +26,10 @@ Group: Productivity/Graphics/Convertors #Source: http://sourceforge.net/projects/mcj/files/fig2dev-%%{version}.tar.xz/download#/fig2dev-%%{version}.tar.xz Source: fig2dev-%{version}.tar.xz -Patch0: transfig-3.2.8.dif -Patch1: 1b09a8.patch +Patch0: transfig-3.2.9.dif Patch4: transfig-fix-afl.patch Patch43: fig2dev-3.2.6-fig2mpdf.patch Patch44: fig2dev-3.2.6-fig2mpdf-doc.patch -Patch46: 0001-Make-ModDate-and-CreationDate-in-PDF-reproducible.patch Patch47: 0001-Use-native-fig2dev-pdf-output-instead-of-epstopdf.patch BuildRequires: fdupes BuildRequires: libjpeg-devel @@ -70,11 +68,9 @@ %setup -q -n fig2dev-%{version} find -type f -exec chmod a-x,go-w '{}' \; %patch0 -p0 -b .0 -%patch1 -p0 -b .1 %patch4 -p1 -b .afl %patch43 -p1 -b .mpdf %patch44 -p1 -b .mpdfdoc -%patch46 -p1 -b .pdfmark %patch47 -p1 -b .epstopdf # remove obsolete libc fallback implementations rm fig2dev/lib/*.c ++++++ fig2dev-3.2.6-fig2mpdf.patch ++++++ --- /var/tmp/diff_new_pack.3jfz5b/_old 2023-09-21 22:13:40.588457897 +0200 +++ /var/tmp/diff_new_pack.3jfz5b/_new 2023-09-21 22:13:40.592458042 +0200 @@ -25,7 +25,7 @@ extern double rad2deg; -@@ -78,6 +81,308 @@ extern void genps_grid(float major, floa +@@ -74,6 +78,308 @@ extern void genps_grid(float major, floa static char pstex_file[1000] = ""; @@ -334,7 +334,7 @@ void genpstex_t_option(char opt, char *optarg) { -@@ -127,6 +432,32 @@ genpstex_option(char opt, char *optarg) +@@ -123,6 +429,32 @@ genpstex_option(char opt, char *optarg) genlatex_option(opt, optarg); } @@ -400,7 +400,7 @@ diff --git a/fig2dev/fig2dev.c b/fig2dev/fig2dev.c --- a/fig2dev/fig2dev.c +++ b/fig2dev/fig2dev.c -@@ -844,6 +844,23 @@ help_msg(void) +@@ -829,6 +829,23 @@ help_msg(void) ); } @@ -424,7 +424,7 @@ if (dev == NULL || !strcmp(lang, "shape")) { puts( "SHAPE (ShapePar driver) Options:\n" -@@ -991,6 +1008,12 @@ static int compound_dump(F_compound *com +@@ -974,6 +991,12 @@ static int compound_dump(F_compound *com static int rec_comp(struct obj_rec *r1, struct obj_rec *r2) { @@ -1349,7 +1349,7 @@ shape (LaTeX shaped paragraphs), sld (AutoCad slide format), svg, textyl, tiff, tikz, tk (tcl/tk), tpic, xbm and xpm\fR. -@@ -1178,6 +1178,61 @@ text flagged as "TeX Text". +@@ -1145,6 +1145,61 @@ text flagged as "TeX Text". The pstex and pdftex drivers accept the same options that the EPS driver accepts. @@ -1411,7 +1411,7 @@ .TP .B \-n name Set the Title part of the PostScript output to -@@ -1601,6 +1656,12 @@ The string \fIfont\fR can be one of +@@ -1551,6 +1606,12 @@ The string \fIfont\fR can be one of .SH BUGS and RESTRICTIONS @@ -1424,7 +1424,7 @@ Please send bug reports, fixes, new features etc. to: .br \&@PACKAGE_BUGREPORT@ -@@ -1690,3 +1751,7 @@ Michael Schrick (m_schr...@hotmail.com) +@@ -1640,3 +1701,7 @@ Michael Schrick (m_schr...@hotmail.com) The GBX (Gerber) driver was written by .br Edward Grace (ej.gr...@imperial.ac.uk). ++++++ fig2dev-3.2.8b.tar.xz -> fig2dev-3.2.9.tar.xz ++++++ ++++ 36220 lines of diff (skipped) ++++++ transfig-3.2.8.dif -> transfig-3.2.9.dif ++++++ --- /work/SRC/openSUSE:Factory/transfig/transfig-3.2.8.dif 2023-03-22 22:28:58.261688737 +0100 +++ /work/SRC/openSUSE:Factory/.transfig.new.1770/transfig-3.2.9.dif 2023-09-21 22:13:38.996400116 +0200 @@ -1,15 +1,13 @@ --- configure | 2 +- - fig2dev/dev/genps.c | 32 ++++++++++++++++++++++---------- - fig2dev/dev/genpstex.c | 8 ++++++-- + fig2dev/dev/genps.c | 34 ++++++++++++++++++++++------------ fig2dev/fig2ps2tex.csh | 2 +- - fig2dev/lib/getopt.c | 9 +++++++++ transfig/transfig.c | 2 ++ - 6 files changed, 41 insertions(+), 14 deletions(-) + 4 files changed, 26 insertions(+), 14 deletions(-) --- configure -+++ configure 2021-02-12 08:54:37.958704809 +0000 -@@ -2341,7 +2341,7 @@ ac_c_conftest_c99_main=' ++++ configure 2023-09-15 07:11:23.442594968 +0000 +@@ -2340,7 +2340,7 @@ ac_c_conftest_c99_main=' int dynamic_array[ni.number]; dynamic_array[0] = argv[0][0]; dynamic_array[ni.number - 1] = 543; @@ -19,80 +17,77 @@ ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' || dynamic_array[ni.number - 1] != 543); --- fig2dev/dev/genps.c -+++ fig2dev/dev/genps.c 2021-02-12 09:13:56.896176342 +0000 -@@ -56,6 +56,7 @@ - #include <pwd.h> - #endif ++++ fig2dev/dev/genps.c 2023-09-15 07:31:46.828409272 +0000 +@@ -53,6 +53,7 @@ + #include <ctype.h> /* tolower() */ + #include <sys/stat.h> /* struct stat */ #include <locale.h> +#include <langinfo.h> #include "fig2dev.h" /* includes bool.h and object.h */ //#include "object.h" /* NUMSHADES, NUMTINTS */ -@@ -958,9 +959,10 @@ genps_start(F_compound *objects) - fprintf(tfp, "%s\n", SPLINE_PS); - #ifdef I18N - if (support_i18n && iso_text_exist(objects)) { -- char *libdir, *locale; -- char localefile_buf[128]; -- char *localefile = localefile_buf; -+ char *libdir, *locale, *codeset; -+ char *localefile = NULL; -+ size_t llen; -+ int ret; - FILE *fp; - libdir = getenv("FIG2DEV_LIBDIR"); +@@ -1363,10 +1364,10 @@ append(const char *restrict infilename, + static bool + append_find_composite(FILE *restrict out) + { +- char *libdir, *locale; +- char localefile_buf[128]; +- char *localefile = localefile_buf; ++ char *libdir, *locale, *codeset; ++ char *localefile = NULL; + FILE *in; ++ int ret; + + libdir = getenv("FIG2DEV_LIBDIR"); #ifdef I18N_DATADIR -@@ -968,19 +970,30 @@ genps_start(F_compound *objects) - libdir = I18N_DATADIR; - #endif - locale = setlocale(LC_CTYPE, NULL); -+ llen = strcspn(locale, ".@"); -+ codeset = nl_langinfo(CODESET); - if (locale == NULL) { - fprintf(stderr, - "fig2dev: LANG not defined; assuming C locale\n"); - locale = "C"; - } -- if (strlen(libdir) + strlen(locale) + 5 > sizeof localefile_buf) -- localefile = malloc(strlen(libdir) + strlen(locale) + 5); -- if (localefile != NULL) { -- sprintf(localefile, "%s/%s.ps", libdir, locale); -+ retry: -+ ret = asprintf(&localefile, "%s/%s.ps", libdir, locale); -+ if (ret > 0) { - /* get filename like - ``/usr/local/lib/fig2dev/japanese.ps'' */ - fp = fopen(localefile, "rb"); - if (fp == NULL) { -+ if (strlen(locale) != llen) { -+ free(localefile); -+ locale[llen] = '\0'; -+ goto retry; -+ } -+ if (codeset && locale != codeset) { -+ free(localefile); -+ locale = codeset; -+ goto retry; -+ } - fprintf(stderr, "fig2dev: can not open file: %s\n", - localefile); - } else { -@@ -998,11 +1011,10 @@ genps_start(F_compound *objects) - "The output might be broken.\n", - localefile); - } -- fclose(fp); -+ fclose(fp); - } -- } +@@ -1378,18 +1379,28 @@ append_find_composite(FILE *restrict out + fputs(COMPOSITE_ERRMSG, stderr); + return false; + } +- if (strlen(libdir) + strlen(locale) + 5 > sizeof localefile_buf && +- !(localefile = malloc(strlen(libdir) + strlen(locale) + 5))) { +- put_msg(Err_mem); ++ codeset = nl_langinfo(CODESET); ++retry: ++ ret = asprintf(&localefile, "%s/%s.ps", libdir, locale); ++ if (ret < 0) { ++ err_msg("Unable to open postscript prologue file %s"); + return false; + } +- +- sprintf(localefile, "%s/%s.ps", libdir, locale); + /* get filename like /usr/local/lib/fig2dev/japanese.ps */ + if (!(in = fopen(localefile, "rb"))) { +- err_msg("Unable to open postscript prologue file %s"); - if (localefile != localefile_buf) ++ size_t llen = strcspn(locale, ".@"); ++ if (strlen(locale) != llen) { ++ free(localefile); ++ locale[llen] = '\0'; ++ goto retry; ++ } ++ if (codeset && locale != codeset) { free(localefile); ++ locale = codeset; ++ goto retry; + } ++ err_msg("Unable to open postscript prologue file %s"); ++ free(localefile); + return false; + } + +@@ -1443,8 +1454,7 @@ append_find_composite(FILE *restrict out + put_msg("The output might be broken."); } - #endif /* I18N */ + +- if (localefile != localefile_buf) +- free(localefile); ++ free(localefile); + return found; + } --- fig2dev/fig2ps2tex.csh -+++ fig2dev/fig2ps2tex.csh 2021-02-12 08:54:37.954704887 +0000 ++++ fig2dev/fig2ps2tex.csh 2023-09-15 07:11:23.442594968 +0000 @@ -22,7 +22,7 @@ # 2016-07-07 Thomas Loimer # * use here-document, instead of echo @@ -103,7 +98,7 @@ set xsp = `echo "3k $bbox[4] $bbox[2] - 72 / p" | dc` --- transfig/transfig.c -+++ transfig/transfig.c 2021-02-12 08:54:37.954704887 +0000 ++++ transfig/transfig.c 2023-09-15 07:11:23.442594968 +0000 @@ -26,6 +26,8 @@ #include <stdio.h> ++++++ transfig-fix-afl.patch ++++++ --- /var/tmp/diff_new_pack.3jfz5b/_old 2023-09-21 22:13:40.816466172 +0200 +++ /var/tmp/diff_new_pack.3jfz5b/_new 2023-09-21 22:13:40.816466172 +0200 @@ -1,33 +1,33 @@ --- - fig2dev-3.2.8/fig2dev/alloc.h | 20 ++++++++++---------- + fig2dev-3.2.9/fig2dev/alloc.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---- fig2dev-3.2.8/fig2dev/alloc.h -+++ fig2dev-3.2.8/fig2dev/alloc.h 2021-02-12 09:43:47.313357380 +0000 +--- fig2dev-3.2.9/fig2dev/alloc.h ++++ fig2dev-3.2.9/fig2dev/alloc.h 2023-09-15 06:57:41.669499853 +0000 @@ -19,15 +19,15 @@ #ifndef ALLOC_H #define ALLOC_H --#define Line_malloc(z) z = malloc(LINOBJ_SIZE) --#define Pic_malloc(z) z = malloc(PIC_SIZE) --#define Spline_malloc(z) z = malloc(SPLOBJ_SIZE) --#define Ellipse_malloc(z) z = malloc(ELLOBJ_SIZE) --#define Arc_malloc(z) z = malloc(ARCOBJ_SIZE) --#define Compound_malloc(z) z = malloc(COMOBJ_SIZE) --#define Text_malloc(z) z = malloc(TEXOBJ_SIZE) --#define Point_malloc(z) z = malloc(POINT_SIZE) --#define Control_malloc(z) z = malloc(CONTROL_SIZE) --#define Arrow_malloc(z) z = malloc(ARROW_SIZE) -+#define Line_malloc(z) z = calloc(LINOBJ_SIZE,1) -+#define Pic_malloc(z) z = calloc(PIC_SIZE,1) -+#define Spline_malloc(z) z = calloc(SPLOBJ_SIZE,1) -+#define Ellipse_malloc(z) z = calloc(ELLOBJ_SIZE,1) -+#define Arc_malloc(z) z = calloc(ARCOBJ_SIZE,1) -+#define Compound_malloc(z) z = calloc(COMOBJ_SIZE,1) -+#define Text_malloc(z) z = calloc(TEXOBJ_SIZE,1) -+#define Point_malloc(z) z = calloc(POINT_SIZE,1) -+#define Control_malloc(z) z = calloc(CONTROL_SIZE,1) -+#define Arrow_malloc(z) z = calloc(ARROW_SIZE,1) +-#define Line_malloc(z) ((z) = malloc(LINOBJ_SIZE)) +-#define Pic_malloc(z) ((z) = malloc(PIC_SIZE)) +-#define Spline_malloc(z) ((z) = malloc(SPLOBJ_SIZE)) +-#define Ellipse_malloc(z) ((z) = malloc(ELLOBJ_SIZE)) +-#define Arc_malloc(z) ((z) = malloc(ARCOBJ_SIZE)) +-#define Compound_malloc(z) ((z) = malloc(COMOBJ_SIZE)) +-#define Text_malloc(z) ((z) = malloc(TEXOBJ_SIZE)) +-#define Point_malloc(z) ((z) = malloc(POINT_SIZE)) +-#define Control_malloc(z) ((z) = malloc(CONTROL_SIZE)) +-#define Arrow_malloc(z) ((z) = malloc(ARROW_SIZE)) ++#define Line_malloc(z) ((z) = calloc(LINOBJ_SIZE,1)) ++#define Pic_malloc(z) ((z) = calloc(PIC_SIZE,1)) ++#define Spline_malloc(z) ((z) = calloc(SPLOBJ_SIZE,1)) ++#define Ellipse_malloc(z) ((z) = calloc(ELLOBJ_SIZE,1)) ++#define Arc_malloc(z) ((z) = calloc(ARCOBJ_SIZE,1)) ++#define Compound_malloc(z) ((z) = calloc(COMOBJ_SIZE,1)) ++#define Text_malloc(z) ((z) = calloc(TEXOBJ_SIZE,1)) ++#define Point_malloc(z) ((z) = calloc(POINT_SIZE,1)) ++#define Control_malloc(z) ((z) = calloc(CONTROL_SIZE,1)) ++#define Arrow_malloc(z) ((z) = calloc(ARROW_SIZE,1)) #endif /* ALLOC_H */
