packages: xfig/xfig-config.patch, xfig/xfig.spec, xfig/xfig-3.2.5b-CVE-2010...
arekm
arekm at pld-linux.org
Fri Feb 10 12:01:02 CET 2012
Author: arekm Date: Fri Feb 10 11:01:01 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.2.5b
---- Files affected:
packages/xfig:
xfig-config.patch (1.9 -> 1.10) , xfig.spec (1.80 -> 1.81) , xfig-3.2.5b-CVE-2010-4262.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-app-defaults.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-figparserstack.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-fix-eps-reading.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-libpng-1.5.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-mkstemp.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-network_images.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-papersize_b1.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-pdfimport_mediabox.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-spelling.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-urwfonts.patch (NONE -> 1.1) (NEW), xfig-3.2.5b-zoom-during-edit.patch (NONE -> 1.1) (NEW), xfig-debian.patch (1.1 -> NONE) (REMOVED), xfig-fixes.patch (1.1 -> NONE) (REMOVED), xfig-mkstemp.diff (1.4 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/xfig/xfig-config.patch
diff -u packages/xfig/xfig-config.patch:1.9 packages/xfig/xfig-config.patch:1.10
--- packages/xfig/xfig-config.patch:1.9 Thu Jan 22 17:51:01 2009
+++ packages/xfig/xfig-config.patch Fri Feb 10 12:00:56 2012
@@ -1,32 +1,15 @@
-diff -urN xfig.3.2.5.org/Fig.ad xfig.3.2.5/Fig.ad
---- xfig.3.2.5.org/Fig.ad 2005-03-16 19:25:01.000000000 +0100
-+++ xfig.3.2.5/Fig.ad 2009-01-22 17:49:41.795513188 +0100
-@@ -24,7 +24,7 @@
-
- ! pdfviewer - put your favorite pdf viewer here.
- ! This is for viewing the xfig how-to guide and man pages
--Fig.pdfviewer: acroread %f
-+Fig.pdfviewer: xpdf %f
-
- ! Spell check program - put your favorite spelling check program here.
- ! It must write the misspelled words to standard output.
diff -urN xfig.3.2.5.org/Imakefile xfig.3.2.5/Imakefile
--- xfig.3.2.5.org/Imakefile 2006-10-11 01:19:22.000000000 +0200
+++ xfig.3.2.5/Imakefile 2009-01-22 17:50:16.832801134 +0100
-@@ -55,11 +55,11 @@
- XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
+@@ -60,7 +60,7 @@
XCOMM some new features, including "Tips", which replace xfig's "help balloons"
+ XCOMM NOTE: This is the default for many X systems now.
-XCOMM #define XAW3D1_5E
+#define XAW3D1_5E
#ifdef XAW3D1_5E
DUSEXAW3D = -DXAW3D -DXAW3D1_5E
-- XAWLIB = -lXaw3d15e
-+ XAWLIB = -lXaw3d
- #else
- XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
- XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
@@ -73,7 +73,7 @@
XCOMM are in different places
@@ -36,17 +19,6 @@
ZLIBDIR = $(USRLIBDIR)
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
-@@ -93,8 +93,8 @@
-
- #ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
--JPEGLIBDIR = /usr/local/lib
--JPEGINC = -I/usr/include/X11
-+JPEGLIBDIR = /usr/lib
-+JPEGINC =
- #else
- JPEGLIBDIR = ../jpeg
- JPEGINC = -I$(JPEGLIBDIR)
@@ -117,7 +117,7 @@
#ifdef USEXPM
@@ -65,15 +37,6 @@
XCOMM use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
-@@ -175,7 +175,7 @@
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
- XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
--MANDIR = /usr/local/xfig/man
-+MANDIR = /usr/share/man/man1
-
- XCOMM If your system doesn't have strstr undefine the following definition
- XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
@@ -241,7 +241,7 @@
#endif /* USEJPEG */
================================================================
Index: packages/xfig/xfig.spec
diff -u packages/xfig/xfig.spec:1.80 packages/xfig/xfig.spec:1.81
--- packages/xfig/xfig.spec:1.80 Tue Feb 7 23:08:57 2012
+++ packages/xfig/xfig.spec Fri Feb 10 12:00:56 2012
@@ -9,20 +9,31 @@
Summary(tr.UTF-8): X11 çizim aracı
Summary(uk.UTF-8): Інструмент для малювання простої векторної графіки
Name: xfig
-Version: 3.2.5
-Release: 7
+Version: 3.2.5b
+Release: 1
License: Freeware
Group: X11/Applications/Graphics
#Source0Download: http://xfig.org/art15.html
-Source0: http://files.xfig.org/%{name}.%{version}.full.tar.gz
-# Source0-md5: fae0c67a3951bd41c057deb63b6aa47a
+#Source0: http://files.xfig.org/%{name}.%{version}.full.tar.gz
+Source0: http://downloads.sourceforge.net/mcj/%{name}.%{version}.full.tar.gz
+# Source0-md5: 499b0ce103a6b353453bf7e327f9a3b9
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-config.patch
Patch1: %{name}-i18n.patch
-Patch2: %{name}-mkstemp.diff
-Patch3: %{name}-debian.patch
-Patch4: %{name}-fixes.patch
+
+Patch5: %{name}-3.2.5b-zoom-during-edit.patch
+Patch6: xfig-3.2.5b-urwfonts.patch
+Patch7: xfig-3.2.5b-spelling.patch
+Patch8: xfig-3.2.5b-pdfimport_mediabox.patch
+Patch9: xfig-3.2.5b-papersize_b1.patch
+Patch10: xfig-3.2.5b-network_images.patch
+Patch11: xfig-3.2.5b-mkstemp.patch
+Patch12: xfig-3.2.5b-figparserstack.patch
+Patch13: xfig-3.2.5b-app-defaults.patch
+Patch14: xfig-3.2.5b-cve-2010-4262.patch
+Patch15: xfig-3.2.5b-libpng-1.5.patch
+Patch16: xfig-3.2.5b-fix-eps-reading.patch
URL: http://www.xfig.org/
BuildRequires: Xaw3d-devel
BuildRequires: libjpeg-devel
@@ -91,9 +102,19 @@
%setup -q -n %{name}.%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+%patch5 -p2
+%patch6 -p0
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p0
+%patch12 -p1
+%patch13 -p0
+%patch14 -p0
+%patch15 -p1
+%patch16 -p1
%build
xmkmf -a
@@ -114,6 +135,7 @@
BINDIR=%{_bindir} \
CONFDIR=%{_datadir}/X11 \
MANPATH=%{_mandir} \
+ MANSUFFIX="1" \
XFIGLIBDIR=%{_datadir}/xfig
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
@@ -123,7 +145,6 @@
(
cat $RPM_BUILD_ROOT%{_appdefsdir}/Fig
-tail -n +2 $RPM_BUILD_ROOT%{_appdefsdir}/Fig-color
echo 'Fig.inches: off'
) > $RPM_BUILD_ROOT%{_appdefsdir}/Fig.new
mv -f $RPM_BUILD_ROOT%{_appdefsdir}/Fig.new $RPM_BUILD_ROOT%{_appdefsdir}/Fig
@@ -137,7 +158,7 @@
%attr(755,root,root) %{_bindir}/xfig
%{_datadir}/xfig
%{_appdefsdir}/Fig
-%{_appdefsdir}/Fig-color
+#%{_appdefsdir}/Fig-color
%{_mandir}/man1/*
%{_pixmapsdir}/*
%{_desktopdir}/*.desktop
@@ -148,6 +169,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.81 2012/02/10 11:00:56 arekm
+- up to 3.2.5b
+
Revision 1.80 2012/02/07 22:08:57 arekm
- release 7
================================================================
Index: packages/xfig/xfig-3.2.5b-CVE-2010-4262.patch
diff -u /dev/null packages/xfig/xfig-3.2.5b-CVE-2010-4262.patch:1.1
--- /dev/null Fri Feb 10 12:01:02 2012
+++ packages/xfig/xfig-3.2.5b-CVE-2010-4262.patch Fri Feb 10 12:00:56 2012
@@ -0,0 +1,22 @@
+--- w_msgpanel.c
++++ w_msgpanel.c 2010-12-03 14:21:07.931926127 +0000
+@@ -60,7 +60,7 @@ DeclareStaticArgs(12);
+ /* for the popup message (file_msg) window */
+
+ static int file_msg_length=0;
+-static char tmpstr[300];
++static char tmpstr[512];
+ static Widget file_msg_panel,
+ file_msg_win, file_msg_dismiss;
+
+@@ -582,8 +582,8 @@ file_msg(char *format,...)
+ }
+
+ va_start(ap, format);
+- /* format the string */
+- vsprintf(tmpstr, format, ap);
++ /* format the string (but leave room for \n and \0) */
++ vsnprintf(tmpstr, sizeof(tmpstr)-2, format, ap);
+ va_end(ap);
+
+ strcat(tmpstr,"\n");
================================================================
Index: packages/xfig/xfig-3.2.5b-app-defaults.patch
diff -u /dev/null packages/xfig/xfig-3.2.5b-app-defaults.patch:1.1
--- /dev/null Fri Feb 10 12:01:02 2012
+++ packages/xfig/xfig-3.2.5b-app-defaults.patch Fri Feb 10 12:00:56 2012
@@ -0,0 +1,24 @@
+Defaults for xfig. Idea from Roland Rosenfeld <roland at debian.org>
+
+diff -urNad xfig~/Fig.ad xfig/Fig.ad
+--- Fig.ad
++++ Fig.ad
+@@ -10,13 +10,17 @@
+
+ ! some sample settings you may want to change
+
++! If the following resource is set to false, xfig will use metric units
++! by default.
++Fig.inches: false
++
+ ! The following fixes a problem that some window managers have
+ ! with xfig continually resizing itself
+
+ Fig*AllowShellResize: false
+
+ ! Image editor - can edit imported image
+-Fig.image_editor: xv
++Fig.image_editor: gimp
+
+ ! name of ghostscript (not ghostview)
+ Fig.ghostscript: gs
================================================================
Index: packages/xfig/xfig-3.2.5b-figparserstack.patch
diff -u /dev/null packages/xfig/xfig-3.2.5b-figparserstack.patch:1.1
--- /dev/null Fri Feb 10 12:01:02 2012
+++ packages/xfig/xfig-3.2.5b-figparserstack.patch Fri Feb 10 12:00:56 2012
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_figparserstack.dpatch by Hans de Goede <j.w.r.degoede at hhs.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix Stack-based buffer overflow by loading malformed .FIG files
+## DP: https://bugzilla.redhat.com/show_bug.cgi?id=543905
+## DP: Closes: #559274
+
+ at DPATCH@
+diff -urNad xfig~/f_readold.c xfig/f_readold.c
+--- xfig~/f_readold.c
++++ xfig/f_readold.c
+@@ -471,7 +471,7 @@
+ F_text *t;
+ int n;
+ int dum;
+- char buf[128];
++ char buf[512];
+ PR_SIZE tx_dim;
+
+ if ((t = create_text()) == NULL)
+@@ -485,22 +485,34 @@
+ t->pen_style = -1;
+ t->angle = 0.0;
+ t->next = NULL;
++ if (!fgets(buf, sizeof(buf), fp)) {
++ file_msg("Incomplete text data");
++ free((char *) t);
++ return (NULL);
++ }
++
++ /* Note using strlen(buf) here will waste a few bytes, as the
++ various text attributes are counted into this length too. */
++ if ((t->cstring = new_string(strlen(buf))) == NULL)
++ return (NULL);
++
+ /* ascent and length will be recalculated later */
+- n = fscanf(fp, " %d %d %d %d %d %d %d %[^\n]",
++ n = sscanf(buf, " %d %d %d %d %d %d %d %[^\n]",
+ &t->font, &dum, &dum, &t->ascent, &t->length,
+- &t->base_x, &t->base_y, buf);
++ &t->base_x, &t->base_y, t->cstring);
+ if (n != 8) {
+ file_msg("Incomplete text data");
++ free(t->cstring);
+ free((char *) t);
+ return (NULL);
+ }
+- if ((t->cstring = new_string(strlen(buf))) == NULL) {
++
++ if (!strlen(t->cstring)) {
++ free(t->cstring);
+ free((char *) t);
+ file_msg("Empty text string at line %d.", line_no);
+ return (NULL);
+ }
+- /* put string in structure */
+- strcpy(t->cstring, buf);
+
+ /* get the font struct */
+ t->zoom = zoomscale;
================================================================
Index: packages/xfig/xfig-3.2.5b-fix-eps-reading.patch
diff -u /dev/null packages/xfig/xfig-3.2.5b-fix-eps-reading.patch:1.1
--- /dev/null Fri Feb 10 12:01:02 2012
+++ packages/xfig/xfig-3.2.5b-fix-eps-reading.patch Fri Feb 10 12:00:56 2012
@@ -0,0 +1,46 @@
+diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c
+--- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200
++++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100
+@@ -252,12 +252,13 @@
+ {
+ char buf[300];
+ FILE *tmpfp, *pixfile, *gsfile;
+- char *psnam, *driver;
++ char *driver;
+ int status, wid, ht, nbitmap, fd;
+ char tmpfile[PATH_MAX],
+ pixnam[PATH_MAX],
+ errnam[PATH_MAX],
+- gscom[2 * PATH_MAX];
++ gscom[2 * PATH_MAX],
++ psnam[PATH_MAX];
+
+ wid = urx - llx;
+ ht = ury - lly;
+@@ -307,19 +308,14 @@
+ /* for color, use pcx */
+ driver = "pcx256";
+ }
+- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */
+- if (tmpfile[0] == '/') {
+- psnam = strrchr(tmpfile, '/');
+- *psnam = 0;
+- sprintf(gscom, "cd \"%s/\";", tmpfile);
+- *psnam++ = '/'; /* Restore name for unlink() below */
+- } else {
+- psnam = tmpfile;
+- gscom[0] = '\0';
++ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */
++ if (!realpath(tmpfile, psnam)) {
++ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno));
++ return False;
+ }
+- sprintf(&gscom[strlen(gscom)],
+- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1",
+- appres.ghostscript, driver, wid, ht, pixnam, errnam);
++ sprintf(gscom,
++ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1",
++ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam);
+ if (appres.DEBUG)
+ fprintf(stderr,"calling: %s\n",gscom);
+ if ((gsfile = popen(gscom, "w")) == 0) {
================================================================
Index: packages/xfig/xfig-3.2.5b-libpng-1.5.patch
diff -u /dev/null packages/xfig/xfig-3.2.5b-libpng-1.5.patch:1.1
--- /dev/null Fri Feb 10 12:01:02 2012
+++ packages/xfig/xfig-3.2.5b-libpng-1.5.patch Fri Feb 10 12:00:56 2012
@@ -0,0 +1,70 @@
+Index: xfig.3.2.5b/f_readpng.c
+===================================================================
+--- xfig.3.2.5b.orig/f_readpng.c
++++ xfig.3.2.5b/f_readpng.c
+@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic
+ }
+
+ /* set long jump recovery here */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* if we get here there was a problem reading the file */
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ close_picfile(file,filetype);
+@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic
+ png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
+ &interlace_type, &compression_type, &filter_type);
+
+- if (info_ptr->valid & PNG_INFO_gAMA)
+- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
+- else
+- png_set_gamma(png_ptr, 2.2, 0.45);
++ png_fixed_point gamma = 0.45;
++ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
++ png_set_gamma(png_ptr, 2.2, gamma);
+
+- if (info_ptr->valid & PNG_INFO_bKGD)
++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
+ /* set the background to the one supplied */
+- png_set_background(png_ptr, &info_ptr->background,
++ png_color_16p background;
++ png_get_bKGD(png_ptr,info_ptr,&background);
++ png_set_background(png_ptr, background,
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
++ }
+ else {
+ /* blend the canvas background using the alpha channel */
+ background.red = x_bg_color.red >> 8;
+@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic
+
+ if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
+ png_get_hIST(png_ptr, info_ptr, &histogram);
++#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5
+ png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
++#else
++ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
++#endif
+ }
+ }
+ if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+Index: xfig.3.2.5b/f_wrpng.c
+===================================================================
+--- xfig.3.2.5b.orig/f_wrpng.c
++++ xfig.3.2.5b/f_wrpng.c
+@@ -20,6 +20,7 @@
+ #include "w_msgpanel.h"
+ #include "w_setup.h"
+ #include <png.h>
++#include <zlib.h>
+
+ /*
+ * Write PNG file from rgb data
+@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat
+ }
+
+ /* set long jump recovery here */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* if we get here there was a problem reading the file */
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return False;
================================================================
Index: packages/xfig/xfig-3.2.5b-mkstemp.patch
diff -u /dev/null packages/xfig/xfig-3.2.5b-mkstemp.patch:1.1
--- /dev/null Fri Feb 10 12:01:02 2012
+++ packages/xfig/xfig-3.2.5b-mkstemp.patch Fri Feb 10 12:00:56 2012
@@ -0,0 +1,32 @@
+Missed hunk noticed https://bugzilla.redhat.com/show_bug.cgi?id=505257#c1 is recreated.
+
+http://bugs.gentoo.org/show_bug.cgi?id=264575
+
+=== modified file 'u_print.c'
+--- u_print.c 2010-01-14 19:50:08 +0000
++++ u_print.c 2010-01-14 19:54:14 +0000
+@@ -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();
+
================================================================
Index: packages/xfig/xfig-3.2.5b-network_images.patch
diff -u /dev/null packages/xfig/xfig-3.2.5b-network_images.patch:1.1
--- /dev/null Fri Feb 10 12:01:02 2012
+++ packages/xfig/xfig-3.2.5b-network_images.patch Fri Feb 10 12:00:56 2012
@@ -0,0 +1,371 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_network_images.dpatch by Roland Rosenfeld <roland at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Some network icons colored and/or combined by Roland Rosenfeld.
+
+ at DPATCH@
+diff -urNad xfig~/Libraries/Networks/Devices/firewall-pair.fig xfig/Libraries/Networks/Devices/firewall-pair.fig
+--- Libraries/Networks/Devices/firewall-pair.fig
++++ Libraries/Networks/Devices/firewall-pair.fig
+@@ -0,0 +1,75 @@
++#FIG 3.2 Produced by xfig version 3.2.5-alpha5
++Portrait
++Center
++Inches
++A4
++100.00
++Single
++-2
++# A pair of firewalls
++# Combined by Roland Rosenfeld
++1200 2
++0 32 #aeaaae
++# A pair of firewalls
++6 3375 2175 4050 3075
++6 3600 2250 4050 3075
++# Firewall
++# (from TomiOllila <Tomi.Ollila at tfi.net> )
++6 3600 2250 4050 3075
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++ 3825 3075 3825 2475
++2 1 0 1 0 20 2 0 20 0.000 0 0 -1 0 0 5
++ 3675 2475 3675 3075 3825 3075 3975 2925 3975 2400
++2 1 0 1 0 32 1 0 20 0.000 0 0 -1 0 0 7
++ 3600 2400 3600 2475 3900 2475 4050 2325 4050 2250 3750 2250
++ 3600 2400
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
++ 3900 2475 3900 2400 3600 2400
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++ 3900 2400 4050 2250
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
++ 3675 2625 3825 2625 3975 2475
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
++ 3675 2775 3825 2775 3975 2625
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
++ 3675 2925 3825 2925 3975 2775
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++ 3900 3000 3900 2850
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++ 3900 2700 3900 2550
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++ 3750 2475 3750 2625
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++ 3750 2775 3750 2925
++-6
++-6
++6 3375 2175 3825 3000
++6 3450 2175 3825 3000
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++ 3600 3000 3600 2400
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++ 3675 2325 3825 2175
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
++ 3450 2550 3600 2550 3750 2400
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
++ 3450 2700 3600 2700 3750 2550
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
++ 3450 2850 3600 2850 3750 2700
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++ 3675 2925 3675 2775
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++ 3675 2625 3675 2475
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++ 3525 2400 3525 2550
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++ 3525 2700 3525 2850
++-6
++2 1 0 1 0 20 22 0 20 0.000 0 0 -1 0 0 5
++ 3450 2400 3450 3000 3600 3000 3750 2850 3750 2325
++2 1 0 1 0 32 21 0 20 0.000 0 0 -1 0 0 7
++ 3375 2325 3375 2400 3675 2400 3825 2250 3825 2175 3525 2175
++ 3375 2325
++2 1 0 1 0 7 20 0 -1 0.000 0 0 -1 0 0 3
++ 3675 2400 3675 2325 3375 2325
++-6
++-6
+diff -urNad xfig~/Libraries/Networks/Devices/internet.fig xfig/Libraries/Networks/Devices/internet.fig
+--- Libraries/Networks/Devices/internet.fig
++++ Libraries/Networks/Devices/internet.fig
+@@ -0,0 +1,39 @@
++#FIG 3.2 Produced by xfig version 3.2.5-alpha5
++Portrait
++Center
++Inches
++A4
++100.00
++Single
++-2
++# Internet cloud
++# By Roland Rosenfeld
++1200 2
++# An Internet cloud
++6 4275 5700 7200 7650
++2 1 0 0 7 7 970 0 20 4.000 0 0 0 0 0 65
++ 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
++ 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
++ 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
++ 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
++ 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
++ 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
++ 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
++ 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
++ 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
++ 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
++ 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
++2 1 0 2 1 0 969 0 -1 0.000 0 0 0 0 0 65
++ 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
++ 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
++ 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
++ 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
++ 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
++ 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
++ 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
++ 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfig/xfig-config.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfig/xfig.spec?r1=1.80&r2=1.81&f=u
More information about the pld-cvs-commit
mailing list