--- ploticus-2.42.orig/debian/changelog +++ ploticus-2.42/debian/changelog @@ -1,3 +1,12 @@ +ploticus (2.42-1) unstable; urgency=low + + * New Upstream release. + * Bump Standards-Version to 3.9.5 (No changes required). + * Upstream Bugfix: Instability with multiline attribute in execline.c + (LP: #692567) + + -- Colin Tuckley Wed, 08 Jan 2014 11:02:15 +0000 + ploticus (2.41-6) unstable; urgency=low * Add dpkg-buildflags to debian/rules --- ploticus-2.42.orig/debian/control +++ ploticus-2.42/debian/control @@ -4,7 +4,7 @@ Maintainer: Colin Tuckley Homepage: http://ploticus.sourceforge.net Build-Depends: debhelper (>= 9), zlib1g-dev, libgd2-noxpm-dev, libjpeg-dev, libfreetype6-dev, libx11-dev, x11proto-core-dev, libpng-dev, dpkg-dev (>= 1.16.1~) -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Package: ploticus Section: misc --- ploticus-2.42.orig/debian/rules +++ ploticus-2.42/debian/rules @@ -18,6 +18,7 @@ build: build-stamp build-stamp: configure-stamp + dh_prep dh_testdir $(MAKE) @@ -34,9 +35,9 @@ dh_clean install: build + dh_prep dh_testdir dh_testroot - dh_clean -k dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp --- ploticus-2.42.orig/src/Makefile +++ ploticus-2.42/src/Makefile @@ -1,4 +1,4 @@ -######## PLOTICUS version 2.41 Copyright 1998-2009 Stephen C. Grubb http://ploticus.sourceforge.net +######## PLOTICUS version 2.42 Copyright 1998-2009 Stephen C. Grubb http://ploticus.sourceforge.net ######## ######## Use this Makefile to build pl executable or libploticus. Root permission is not required. ######## Configure the 3 settings below then do: make clean; make @@ -13,6 +13,12 @@ NOX11 = -DNOX11 NOSWF = -DNOSWF EXE = pl +LIBEXT = a +FPIC = +ARCOM = ar r +SHARELIBEXT = so.0.0.0 +SONAME = libploticus.so.0 +SHAREFLAG = -shared -Wl,-soname,$(SONAME) @@ -25,21 +31,21 @@ ############ Option 1: build the pl executable (unix), no X11 .... -NOX11 = -DNOX11 +# NOX11 = -DNOX11 ############ Option 2: build the pl executable (unix), with X11 enabled .... -# NOX11 = -# XOBJ = x11.o interact.o +NOX11 = +XOBJ = x11.o interact.o ############ ...AND... activate the lines below for your platform... (X11 libs & header files) #### linux # XLIBS = -L/usr/X11R6/lib -lX11 # XINCLUDEDIR = -I/usr/X11R6/include #### alt linux -# XLIBS = -lX11 -# XINCLUDEDIR = -I/usr/include/X11 +XLIBS = -lX11 +XINCLUDEDIR = -I/usr/include/X11 #### 64bit linux # XLIBS = -L/usr/X11R6/lib64 -lX11 #### solaris @@ -100,7 +106,7 @@ ### GD16H = -I/home/scg/lib ########### Option 2: use bundled GD13 (GIF only). No additional lib dependencies. -exetarget: pl +# exetarget: pl ########### Option 3: use your own GD resource. Requires GD 1.84+, libpng, zlib, libjpeg # exetarget: plgd18 @@ -111,11 +117,11 @@ ########### Option 4: use your own GD resource with FreeType2 (ttf) fonts enabled. ########### Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype -# exetarget: plgd18 -# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype -# GD18H = -# GDFREETYPE = -DGDFREETYPE -# ZFLAG = -DWZ +exetarget: plgd18 +GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +GD18H = +GDFREETYPE = -DGDFREETYPE +ZFLAG = -DWZ ########### Option 5: don't use GD at all. # exetarget: plnogd @@ -144,8 +150,8 @@ #### For LOCALE support (non-roman alphabets & collation), uncomment the following.. -# LOCALEOBJ = localef.o -# LOCALE_FLAG = -DLOCALE +LOCALEOBJ = localef.o +LOCALE_FLAG = -DLOCALE #### SVG output is always available by default. #### If you want compressed SVG (.svgz), and you selected GD13 or no GD above, @@ -160,7 +166,7 @@ # NOSVG = -DNOSVG #### To see all possible compiler warnings, uncomment the following line.. -# WALL = -Wall +WALL = -Wall -g @@ -229,8 +235,8 @@ # this one needs work... suggestions welcome libploticus-so: $(OBJ) $(GDOBJ) - $(RMCOM) libploticus.$(LIBEXT) - $(CC) $(SHAREFLAG) -o libploticus.$(LIBEXT) $(OBJ) $(GDOBJ) + $(RMCOM) libploticus.$(SHARELIBEXT) + $(CC) $(SHAREFLAG) -o libploticus.$(SHARELIBEXT) $(OBJ) $(GDOBJ) gd00files: @@ -269,7 +275,7 @@ $(RMCOM) *.o gd??files distclean: clean - $(RMCOM) $(EXE) + $(RMCOM) $(EXE) libploticus.$(LIBEXT) libploticus.$(SHARELIBEXT) ######## --- ploticus-2.42.orig/src/execline.c +++ ploticus-2.42/src/execline.c @@ -459,6 +459,7 @@ /* go until we hit an empty line, or reach end of proc.. */ for( iline = txtstartline; iline <= procstop ; iline++ ) { line = PLL.procline[ iline ]; + if( line == NULL ) break; /* stmt added scg 1/7/2014 ... bug fix, multiline attribute followed immed by #proc (no blank line) causes instability */ for( i = 0, emptyline = 1; line[i] != '\0'; i++ ) if( !isspace( (int) line[i] )) { emptyline = 0; break; } if( emptyline ) break; if( mode[0] == 'g' ) txtlen += (strlen( &line[i] ) + 2); /* mode = "get", accumulate length sans leading ws */ --- ploticus-2.42.orig/src/pl.h +++ ploticus-2.42/src/pl.h @@ -8,7 +8,7 @@ #include #include "plg.h" -#define PREFABS_DIR "" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */ +#define PREFABS_DIR "/usr/share/ploticus" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */ #define PLVERSION "2.42-May2013" /* see also the Copyright page, and page headers and footers */