From 12a50f3cd45159cc344e0e909813c1c73763150d Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jul 19 2013 08:33:27 +0000 Subject: import autotrace-0.31.1-35.el7.src.rpm --- diff --git a/.autotrace.metadata b/.autotrace.metadata new file mode 100644 index 0000000..8f82d54 --- /dev/null +++ b/.autotrace.metadata @@ -0,0 +1 @@ +679e4912528030b86f23db5b99e60f8e7df883fd SOURCES/autotrace-0.31.1.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/autotrace-0.31.1-CVE-2013-1953.patch b/SOURCES/autotrace-0.31.1-CVE-2013-1953.patch new file mode 100644 index 0000000..38d7eae --- /dev/null +++ b/SOURCES/autotrace-0.31.1-CVE-2013-1953.patch @@ -0,0 +1,12 @@ +diff -up autotrace-0.31.1/input-bmp.c.orig autotrace-0.31.1/input-bmp.c +--- autotrace-0.31.1/input-bmp.c.orig 2002-10-10 22:44:08.000000000 +0200 ++++ autotrace-0.31.1/input-bmp.c 2013-06-28 10:24:58.336056959 +0200 +@@ -166,7 +166,7 @@ input_bmp_reader (at_string filename, + /* 36 */ + Maps = 4; + } +- else if (Bitmap_File_Head.biSize <= 64) /* Probably OS/2 2.x */ ++ else if (Bitmap_File_Head.biSize >= 40 && Bitmap_File_Head.biSize <= 64) /* Probably OS/2 2.x */ + { + if (!ReadOK (fd, buffer, Bitmap_File_Head.biSize - 4)) + { diff --git a/SOURCES/autotrace-0.31.1-multilib-fix.patch b/SOURCES/autotrace-0.31.1-multilib-fix.patch new file mode 100644 index 0000000..1950c2c --- /dev/null +++ b/SOURCES/autotrace-0.31.1-multilib-fix.patch @@ -0,0 +1,20 @@ +diff -up autotrace-0.31.1/autotrace-config.in.orig autotrace-0.31.1/autotrace-config.in +--- autotrace-0.31.1/autotrace-config.in.orig 2002-11-08 19:18:31.000000000 +0100 ++++ autotrace-0.31.1/autotrace-config.in 2013-07-19 10:05:14.516133368 +0200 +@@ -4,6 +4,7 @@ af_libs= + af_cflags= + prefix=@prefix@ + exec_prefix=@exec_prefix@ ++libdir=`pkg-config --variable=libdir autotrace` + + + ## +@@ -205,7 +206,7 @@ fi + #dummy because this should always be selected + + af_cflags="$af_cflags -I@includedir@" +-af_libs="-L@libdir@ -lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@ @LIBSWF_LDFLAGS@ @LIBPSTOEDIT_LIBS@ $af_libs" ++af_libs="-L$libdir -lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@ @LIBSWF_LDFLAGS@ @LIBPSTOEDIT_LIBS@ $af_libs" + + + diff --git a/SOURCES/autotrace-0001-Modify-GetOnePixel-usage-to-build-against-current-Im.patch b/SOURCES/autotrace-0001-Modify-GetOnePixel-usage-to-build-against-current-Im.patch new file mode 100644 index 0000000..d9b1448 --- /dev/null +++ b/SOURCES/autotrace-0001-Modify-GetOnePixel-usage-to-build-against-current-Im.patch @@ -0,0 +1,29 @@ +From 296538ef2754df0c6e704ac172854816d4ff5cd2 Mon Sep 17 00:00:00 2001 +From: Caolan McNamara +Date: Mon, 2 Mar 2009 12:21:34 +0000 +Subject: [PATCH 1/3] Modify GetOnePixel usage to build against current + ImageMagick api + +--- + input-magick.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/input-magick.c b/input-magick.c +index 51c6409..bc36b8f 100644 +--- a/input-magick.c ++++ b/input-magick.c +@@ -83,7 +83,11 @@ at_bitmap_type input_magick_reader(at_string filename, + + for(j=0,runcount=0,point=0;jrows;j++) + for(i=0;icolumns;i++) { ++#if (MagickLibVersion < 0x0645) || (MagickLibVersion >= 0x0649) + p=GetOnePixel(image,i,j); ++#else ++ GetOnePixel(image,i,j,pixel); ++#endif + AT_BITMAP_BITS(bitmap)[point++]=pixel->red; /* if gray: red=green=blue */ + if(np==3) { + AT_BITMAP_BITS(bitmap)[point++]=pixel->green; +-- +1.7.11.2 + diff --git a/SOURCES/autotrace-0002-Fixed-underquoted-AM_PATH_AUTOTRACE-definition.patch b/SOURCES/autotrace-0002-Fixed-underquoted-AM_PATH_AUTOTRACE-definition.patch new file mode 100644 index 0000000..d70c1ad --- /dev/null +++ b/SOURCES/autotrace-0002-Fixed-underquoted-AM_PATH_AUTOTRACE-definition.patch @@ -0,0 +1,31 @@ +From c3410ede752b3b0a092a2a4d196f4a6ccf8c3a10 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 27 Jul 2009 14:20:46 +0000 +Subject: [PATCH 2/3] Fixed underquoted AM_PATH_AUTOTRACE definition + +See rhbz #477980 for the details: + +* https://bugzilla.redhat.com/477980 + +Reported-by: Jerry James +Signed-off-by: Peter Lemenkov +--- + autotrace.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autotrace.m4 b/autotrace.m4 +index 4b16a77..11d6276 100644 +--- a/autotrace.m4 ++++ b/autotrace.m4 +@@ -4,7 +4,7 @@ + dnl AM_PATH_AUTOTRACE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) + dnl Test to see if libautotrace is installed, and define AUTOTRACE_CFLAGS, LIBS + dnl +-AC_DEFUN(AM_PATH_AUTOTRACE, ++AC_DEFUN([AM_PATH_AUTOTRACE], + [dnl + dnl Get the cflags and libraries from the autotrace-config script + dnl +-- +1.7.11.2 + diff --git a/SOURCES/autotrace-0003-libpng-fix.patch b/SOURCES/autotrace-0003-libpng-fix.patch new file mode 100644 index 0000000..f88cc23 --- /dev/null +++ b/SOURCES/autotrace-0003-libpng-fix.patch @@ -0,0 +1,68 @@ +From 56103b05af8a9d67ce158eceab9f7c984b38eabb Mon Sep 17 00:00:00 2001 +From: Jon Ciesla +Date: Fri, 2 Mar 2012 09:39:36 -0600 +Subject: [PATCH 3/3] libpng fix. + +--- + input-png.c | 22 ++++++---------------- + 1 file changed, 6 insertions(+), 16 deletions(-) + +diff --git a/input-png.c b/input-png.c +index 77b96f1..b631f07 100644 +--- a/input-png.c ++++ b/input-png.c +@@ -42,7 +42,7 @@ static png_bytep * read_png(png_structp png_ptr, png_infop info_ptr, at_input_op + + static void handle_warning(png_structp png, const at_string message) { + LOG1("PNG warning: %s", message); +- at_exception_warning((at_exception_type *)png->error_ptr, ++ at_exception_warning((at_exception_type *)png_get_error_ptr(png), + message); + /* at_exception_fatal((at_exception_type *)at_png->error_ptr, + "PNG warning"); */ +@@ -50,7 +50,7 @@ static void handle_warning(png_structp png, const at_string message) { + + static void handle_error(png_structp png, const at_string message) { + LOG1("PNG error: %s", message); +- at_exception_fatal((at_exception_type *)png->error_ptr, ++ at_exception_fatal((at_exception_type *)png_get_error_ptr(png), + message); + /* at_exception_fatal((at_exception_type *)at_png->error_ptr, + "PNG error"); */ +@@ -157,8 +157,8 @@ read_png(png_structp png_ptr, png_infop info_ptr, at_input_opts_type * opts) + + png_set_strip_16(png_ptr); + png_set_packing(png_ptr); +- if ((png_ptr->bit_depth < 8) || +- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) || ++ if ((png_get_bit_depth(png_ptr, info_ptr) < 8) || ++ (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) || + (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))) + png_set_expand(png_ptr); + +@@ -181,20 +181,10 @@ read_png(png_structp png_ptr, png_infop info_ptr, at_input_opts_type * opts) + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); + } else + png_set_strip_alpha(png_ptr); ++ png_set_interlace_handling(png_ptr); + png_read_update_info(png_ptr, info_ptr); + +- +- info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr, +- info_ptr->height * sizeof(png_bytep)); +-#ifdef PNG_FREE_ME_SUPPORTED +- info_ptr->free_me |= PNG_FREE_ROWS; +-#endif +- for (row = 0; row < (int)info_ptr->height; row++) +- info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr, +- png_get_rowbytes(png_ptr, info_ptr)); +- +- png_read_image(png_ptr, info_ptr->row_pointers); +- info_ptr->valid |= PNG_INFO_IDAT; ++ png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); + png_read_end(png_ptr, info_ptr); + return png_get_rows(png_ptr, info_ptr); + } +-- +1.7.11.2 + diff --git a/SPECS/autotrace.spec b/SPECS/autotrace.spec new file mode 100644 index 0000000..d236b91 --- /dev/null +++ b/SPECS/autotrace.spec @@ -0,0 +1,209 @@ +Name: autotrace +Version: 0.31.1 +Release: 35%{?dist} +Summary: Utility for converting bitmaps to vector graphics +Group: Applications/Multimedia +License: GPLv2+ and LGPLv2+ +URL: http://autotrace.sourceforge.net/ +Source0: http://download.sf.net/autotrace/autotrace-0.31.1.tar.gz +Patch1: autotrace-0001-Modify-GetOnePixel-usage-to-build-against-current-Im.patch +Patch2: autotrace-0002-Fixed-underquoted-AM_PATH_AUTOTRACE-definition.patch +Patch3: autotrace-0003-libpng-fix.patch +# Sent upstream +Patch4: autotrace-0.31.1-CVE-2013-1953.patch +Patch5: autotrace-0.31.1-multilib-fix.patch +BuildRequires: ImageMagick-devel +BuildRequires: libpng-devel > 2:1.2 +BuildRequires: libexif-devel +BuildRequires: libtiff-devel +BuildRequires: libjpeg-devel +BuildRequires: libxml2-devel +BuildRequires: bzip2-devel +BuildRequires: freetype-devel +#BuildRequires: pstoedit-devel +BuildConflicts: pstoedit-devel + + +%description +AutoTrace is a program for converting bitmaps to vector graphics. + +Supported input formats include BMP, TGA, PNM, PPM, and any format +supported by ImageMagick, whereas output can be produced in +Postscript, SVG, xfig, SWF, and others. + +%package devel +Summary: Header files for autotrace +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig +Requires: ImageMagick-devel +#Requires: pstoedit-devel + + +%description devel +This package contains header files and development libraries for autotrace. + + +%prep +%setup -q +%patch1 -p1 -b .GetOnePixel +%patch2 -p1 -b .aclocal18 +%patch3 -p1 -b .libpng15 +%patch4 -p1 -b .CVE-2013-1953 +%patch5 -p1 -b .multilib-fix + +%build +%configure + +# remove rpaths +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make %{?_smp_mflags} + + +%install +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' + + +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + +%files +%doc AUTHORS COPYING COPYING.LIB ChangeLog FAQ NEWS README THANKS TODO +%{_bindir}/autotrace +%{_libdir}/*.so.* +%{_mandir}/man[^3]/* + +%files devel +%doc HACKING +%{_bindir}/autotrace-config +%{_libdir}/*.so +%{_libdir}/pkgconfig/autotrace.pc +%{_includedir}/autotrace/ +%{_datadir}/aclocal/autotrace.m4 + + +%changelog +* Fri Jul 19 2013 Jaroslav Škarvada - 0.31.1-35 +- Fixed multilib conflict in devel package (by multilib-fix patch) +- Removed rpaths + +* Fri Jun 28 2013 Jaroslav Škarvada - 0.31.1-34 +- Fixed buffer overflow when parsing BMP files + Resolves: CVE-2013-1953 + +* Mon Mar 18 2013 Jon Ciesla - 0.31.1-33 +- ImageMagick rebuild. + +* Wed Feb 13 2013 Fedora Release Engineering - 0.31.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Peter Lemenkov - 0.31.1-31 +- Cosmetic changes in the spec-file (closes rhbz #803928 and #817950) + +* Wed Jul 18 2012 Fedora Release Engineering - 0.31.1-30.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Mar 02 2012 Jon Ciesla - 0.31.1-29.1 +- Libpng 1.5 fix. + +* Thu Jan 12 2012 Fedora Release Engineering - 0.31.1-28.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 0.31.1-27.1 +- Rebuild for new libpng + +* Mon Feb 07 2011 Fedora Release Engineering - 0.31.1-26.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Sep 29 2010 jkeating - 0.31.1-25.1 +- Rebuilt for gcc bug 634757 + +* Fri Sep 17 2010 Rex Dieter - 0.31.1-24.1 +- rebuild (ImageMagick) + +* Mon May 17 2010 Peter Lemenkov - 0.31.1-24 +- Changed description (closes rhbz #591659). + +* Mon Jul 27 2009 Peter Lemenkov - 0.31.1-23 +- Removed static libraries from -devel +- Changed %%makeinstall to "make install DESTDIR=blablabla" +- Fixed rhbz# 477980 + +* Fri Jul 24 2009 Fedora Release Engineering - 0.31.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Mar 13 2009 Hans de Goede - 0.31.1-21 +- Rebuild for new ImageMagick + +* Mon Mar 02 2009 Caolán McNamara - 0.31.1-20 +- Modify GetOnePixel usage to build against current ImageMagick api + +* Mon Feb 23 2009 Fedora Release Engineering - 0.31.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jul 14 2008 Tom "spot" Callaway - 0.31.1-18 +- fix license tag + +* Mon May 19 2008 Fedora Release Engineering - 0.31.1-17 +- Rebuild for new ImageMagick. + +* Tue Feb 19 2008 Fedora Release Engineering - 0.31.1-16 +- Autorebuild for GCC 4.3 + +* Wed Aug 22 2007 Quentin Spencer - 0.31.1-15 +- Rebuild for F8. + +* Thu Oct 05 2006 Christian Iseli 0.31.1-14 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Quentin Spencer - 0.31.1-13 +- Rebuild for FC6. + +* Mon Feb 13 2006 Roozbeh Pournader - 0.31.1-12 +- Rebuild for Fedora Extras 5 + +* Sat Jan 28 2006 Roozbeh Pournader - 0.31.1-11 +- rebuild + +* Tue Jan 17 2006 Roozbeh Pournader - 0.31.1-10 +- add BuildRequires on freetype-devel + +* Tue Jan 17 2006 Roozbeh Pournader - 0.31.1-9 +- remove BuildRequires on XFree86-devel + +* Mon Jan 16 2006 Roozbeh Pournader - 0.31.1-8 +- add %%{?dist} tag +- add a BuildRequires on bzip2-devel +- add ldconfig to %%post and %%postun + +* Thu May 26 2005 Jeremy Katz - 0.31.1-7 +- and more buildrequires + +* Thu May 26 2005 Jeremy Katz - 0.31.1-6 +- BR libtiff-devel + +* Wed May 25 2005 Jeremy Katz - 0.31.1-5 +- rebuild + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Sat Aug 21 2004 Marius L. Jøhndal - 0:0.31.1-3 +- Temporarily changed buildreq pstoedit-devel to buildconflicts. + +* Thu Apr 22 2004 Marius L. Jøhndal - 0:0.31.1-0.fdr.2 +- Added new BuildReq pstoedit-devel. +- Added missing BuildReq libexif-devel. +- Added missing -devel requires pkgconfig, ImageMagick-devel. +- Converted spec file to UTF-8. + +* Mon Sep 29 2003 Marius L. Johndal 0:0.31.1-0.fdr.1 +- Initial RPM release. +