Hello community, here is the log from the commit of package xfig for openSUSE:Factory checked in at 2014-07-15 16:25:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfig (Old) and /work/SRC/openSUSE:Factory/.xfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfig" Changes: -------- --- /work/SRC/openSUSE:Factory/xfig/xfig.changes 2014-02-11 13:15:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfig.new/xfig.changes 2014-07-15 16:25:43.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jul 4 12:48:32 UTC 2014 - [email protected] + +- Fix patches + xfig.3.2.5b-mediaboxrealnb.dif + xfig.3.2.5b-pspdftex.dif (bnc#882692) +- Add patch set from Debian xfig package as well + 31_spelling.patch + 39_man_hyphen.patch + 40_XAW3D1_5E_notlocal.patch + 41_mkstemp.patch (CVE-2009-1962) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfig.3.2.5b-mediaboxrealnb.dif ++++++ --- /var/tmp/diff_new_pack.hgT7I4/_old 2014-07-15 16:25:44.000000000 +0200 +++ /var/tmp/diff_new_pack.hgT7I4/_new 2014-07-15 16:25:44.000000000 +0200 @@ -12,7 +12,7 @@ - c = strchr(buf, '[') + 1; - if (c && sscanf(c, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) { -+ c = strchr(buf, '['); ++ c = strchr(s, '['); + if (c && sscanf(c+1, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) { llx = lly = 0; urx = paper_sizes[0].width * 72 / PIX_PER_INCH; ++++++ xfig.3.2.5b-pspdftex.dif ++++++ --- /var/tmp/diff_new_pack.hgT7I4/_old 2014-07-15 16:25:44.000000000 +0200 +++ /var/tmp/diff_new_pack.hgT7I4/_new 2014-07-15 16:25:44.000000000 +0200 @@ -12,25 +12,16 @@ if (backgrnd[0]) { strcat(prcmd," -g \\"); /* must escape the #rrggbb color spec */ -@@ -369,13 +371,13 @@ int print_to_file(char *file, char *lang - strcat(prcmd,tmp_name); - +@@ -370,7 +373,7 @@ int print_to_file(char *file, char *lang /* make it suitable for pstex. */ -- strsub(prcmd,"pspdftex","pstex",tmpcmd,0); -+ strsub(prcmd,"eps","pstex",tmpcmd,0); + strsub(prcmd,"pspdftex","pstex",tmpcmd,0); strcat(tmpcmd,".eps"); - (void) exec_prcmd(tmpcmd, "EXPORT of PostScript part"); + (void) exec_prcmd(tmpcmd, "EXPORT of EPS part"); /* make it suitable for pdftex. */ -- strsub(prcmd,"ps","pdf",tmpcmd,0); -- strsub(tmpcmd,"pspdftex","pdftex",prcmd,0); -+ strsub(prcmd,"pstex","pdf",tmpcmd,0); -+ strsub(tmpcmd,"eps","pdftex",prcmd,0); - strcat(prcmd,".pdf"); - (void) exec_prcmd(prcmd, "EXPORT of PDF part"); - -@@ -383,10 +385,11 @@ int print_to_file(char *file, char *lang + strsub(prcmd,"ps","pdf",tmpcmd,0); +@@ -382,10 +385,11 @@ int print_to_file(char *file, char *lang #ifdef I18N /* set the numeric locale to C so we get decimal points for numbers */ setlocale(LC_NUMERIC, "C"); @@ -45,7 +36,7 @@ #endif /* I18N */ "pstex_t", tmp_name, mag/100.0, layers, tmp_fig_file, outfile); #ifdef I18N -@@ -743,7 +746,7 @@ void build_layer_list(char *layers) +@@ -742,7 +746,7 @@ void build_layer_list(char *layers) { char list[PATH_MAX], notlist[PATH_MAX], num[10]; int layer, len, notlen; ++++++ xfig.3.2.5c-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/31_spelling.patch new/patches/31_spelling.patch --- old/patches/31_spelling.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/31_spelling.patch 2013-10-15 15:46:37.000000000 +0200 @@ -0,0 +1,12 @@ +From: Roland Rosenfeld <[email protected]> +Subject: Fix spelling errors in binary. + +--- a/f_load.c ++++ b/f_load.c +@@ -373,5 +373,5 @@ + /* Format error; relevant error message is already delivered */ + ; + else +- file_msg("File \"%s\" is not accessable; %s.", file, strerror(err)); ++ file_msg("File \"%s\" is not accessible; %s.", file, strerror(err)); + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/39_man_hyphen.patch new/patches/39_man_hyphen.patch --- old/patches/39_man_hyphen.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/39_man_hyphen.patch 2014-07-04 14:43:54.000000000 +0200 @@ -0,0 +1,14 @@ +From: Roland Rosenfeld <[email protected]> +Subject: escape "-" in man page to make lintian happy + +--- a/Doc/xfig.man ++++ b/Doc/xfig.man 2014-07-04 12:41:06.938235879 +0000 +@@ -1180,7 +1180,7 @@ option. + .BR \-write_bak + .Ap + When saving a drawing into an existing .fig file xfig will first rename that file by +-appending \".bak\" to the name. This is the default. Use -nowrite_bak to disable this feature. ++appending \".bak\" to the name. This is the default. Use \-nowrite_bak to disable this feature. + .\"------- + .At + .BR \-zoom diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/40_XAW3D1_5E_notlocal.patch new/patches/40_XAW3D1_5E_notlocal.patch --- old/patches/40_XAW3D1_5E_notlocal.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/40_XAW3D1_5E_notlocal.patch 2014-07-04 14:43:06.000000000 +0200 @@ -0,0 +1,70 @@ +From be8cf541743060921f629d5bfe990d985ecf1813 Mon Sep 17 00:00:00 2001 +From: Vladislav Zavjalov <[email protected]> +Origin: http://git.altlinux.org/people/slazav/packages/?p=xfig.git;a=patch;h=be8cf541743060921f629d5bfe990d985ecf1813 +Date: Wed, 29 May 2013 02:18:13 +0400 +Subject: [PATCH] Don't use local SimpleMenu.c with XAW3D1_5E +Bug-Debian: http://bugs.debian.org/296703 + +--- + xfig/SmeCascade.h | 5 +++++ + xfig/SmeCascadeP.h | 5 +++++ + xfig/w_menuentry.h | 4 ++++ + xfig/w_util.c | 2 ++ + 4 files changed, 16 insertions(+), 0 deletions(-) + +--- a/SmeCascade.h ++++ b/SmeCascade.h +@@ -27,7 +27,12 @@ + #else + #include <X11/Xaw/Sme.h> + #endif ++ ++#ifdef XAW3D1_5E ++#include <X11/Xaw3d/SmeBSB.h> ++#else + #include "SmeBSB.h" ++#endif + + /**************************************************************** + * +--- a/SmeCascadeP.h ++++ b/SmeCascadeP.h +@@ -32,8 +32,12 @@ + #include <X11/Xaw/SmeP.h> + #endif + ++#ifdef XAW3D1_5E ++#include <X11/Xaw3d/SmeBSBP.h> ++#else + #include "SmeBSBP.h" + #include "SmeCascade.h" ++#endif + + /************************************************************ + * +--- a/w_menuentry.h ++++ b/w_menuentry.h +@@ -30,7 +30,11 @@ + #include <X11/Xaw/Sme.h> + #endif + ++#ifdef XAW3D1_5E ++#include <X11/Xaw3d/SmeBSB.h> ++#else + #include "SmeBSB.h" ++#endif + + /**************************************************************** + * +--- a/w_util.c ++++ b/w_util.c +@@ -351,7 +351,9 @@ + * (use -1 if no line desired) + */ + ++#ifndef XAW3D1_5E + #include "SmeCascade.h" ++#endif /* XAW3D1_5E */ + + #include "d_text.h" + #include "e_placelib.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/41_mkstemp.patch new/patches/41_mkstemp.patch --- old/patches/41_mkstemp.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/41_mkstemp.patch 2013-11-11 11:03:29.000000000 +0100 @@ -0,0 +1,35 @@ +From: Thomas Hoger +Origin: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch?revision=1.1 +Date: Thu Jan 14 20:26:23 2010 UTC +Subject: Missed hunk noticed https://bugzilla.redhat.com/show_bug.cgi?id=505257#c1 is recreated. +Bug-Debian: http://bugs.debian.org/565341 +Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=264575 +Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2009-1962 + + +--- a/u_print.c ++++ b/u_print.c +@@ -202,14 +202,22 @@ + char tmp_fig_file[PATH_MAX]; + char *outfile, *name, *real_lang; + char *suf; ++ int fd; + + /* if file exists, ask if ok */ + if (!ok_to_write(file, "EXPORT")) + return (1); + +- sprintf(tmp_fig_file, "%s/%s%06d", TMPDIR, "xfig-fig", getpid()); ++ snprintf(tmp_fig_file, sizeof(tmp_fig_file), "%s/xfig-fig.XXXXXX", TMPDIR); + /* write the fig objects to a temporary file */ + warnexist = False; ++ ++ if ((fd = mkstemp(tmp_fig_file)) == -1) { ++ file_msg("Can't open temp file %s: %s\n", tmp_fig_file, strerror(errno)); ++ return; ++ } ++ close(fd); ++ + init_write_tmpfile(); + if (write_file(tmp_fig_file, False)) { + end_write_tmpfile(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
