rpms/gd/FC-6 .cvsignore, 1.11, 1.12 gd-2.0.33-multilib.patch, 1.1, 1.2 gd-sparc64.patch, 1.1, 1.2 gd.spec, 1.38, 1.39 sources, 1.10, 1.11
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 5 12:10:35 UTC 2007
Author: varekova
Update of /cvs/dist/rpms/gd/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv32057
Modified Files:
.cvsignore gd-2.0.33-multilib.patch gd-sparc64.patch gd.spec
sources
Log Message:
- update to 2.0.35
- fix several vulnerabilities #277421
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gd/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 7 Sep 2005 15:21:28 -0000 1.11
+++ .cvsignore 5 Sep 2007 12:10:33 -0000 1.12
@@ -1 +1 @@
-gd-2.0.33.tar.gz
+gd-2.0.35.tar.bz2
gd-2.0.33-multilib.patch:
Makefile.in | 14 ++++++++++++--
config/gdlib-config.in | 7 ++++---
config/gdlib.pc.in | 14 ++++++++++++++
configure | 3 ++-
4 files changed, 32 insertions(+), 6 deletions(-)
Index: gd-2.0.33-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/gd/FC-6/gd-2.0.33-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gd-2.0.33-multilib.patch 25 May 2006 08:24:50 -0000 1.1
+++ gd-2.0.33-multilib.patch 5 Sep 2007 12:10:33 -0000 1.2
@@ -1,5 +1,66 @@
---- gd-2.0.33/config/gdlib-config.in.pom 2004-10-27 16:22:07.000000000 +0200
-+++ gd-2.0.33/config/gdlib-config.in 2006-05-24 15:42:32.000000000 +0200
+--- gd-2.0.34/Makefile.in.pom 2007-02-03 02:41:46.000000000 +0100
++++ gd-2.0.34/Makefile.in 2007-02-08 13:34:06.000000000 +0100
+@@ -341,6 +341,7 @@
+ ACLOCAL_AMFLAGS = -I config
+ SUBDIRS = config test
+ bin_SCRIPTS = bdftogd config/gdlib-config
++pkgconf_CFILE = config/gdlib.pc
+ EXTRA_DIST = README-JPEG.TXT README.TXT configure.pl bdftogd demoin.png err.out index.html install-item makefile.sample readme.jpn entities.html entities.tcl
+ include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h entities.h
+ lib_LTLIBRARIES = libgd.la
+@@ -553,6 +554,15 @@
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
+
++install-pkgconfigCF:
++ $(mkdir_p) "$(DESTDIR)$(libdir)/pkgconfig"
++ echo " cp $(pkgconf_CFILE) $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc"
++ cp $(pkgconf_CFILE) $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc
++
++uninstall-pkgconfigCF:
++ echo " rm $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc"
++ rm $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc
++
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+@@ -986,7 +996,7 @@
+
+ install-data-am: install-includeHEADERS
+
+-install-exec-am: install-binPROGRAMS install-binSCRIPTS \
++install-exec-am: install-binPROGRAMS install-binSCRIPTS install-pkgconfigCF\
+ install-libLTLIBRARIES
+
+ install-info: install-info-recursive
+@@ -1015,7 +1025,7 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
++uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-pkgconfigCF\
+ uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES
+
+--- gd-2.0.34/config/gdlib.pc.in.pom 2007-02-08 13:29:04.000000000 +0100
++++ gd-2.0.34/config/gdlib.pc.in 2007-01-29 09:51:29.000000000 +0100
+@@ -0,0 +1,14 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++bindir=@bindir@
++ldflags=@LDFLAGS@
++
++
++Name: gd-devel
++Description: A graphics library for quick creation of PNG or JPEG images
++Version: @VERSION@
++Requires:
++Libs: @LIBS@
++Cflags: -I at includedir@
+--- gd-2.0.34/config/gdlib-config.in.pom 2007-02-03 02:41:00.000000000 +0100
++++ gd-2.0.34/config/gdlib-config.in 2007-02-08 13:27:25.000000000 +0100
@@ -7,9 +7,10 @@
# installation directories
prefix=@prefix@
@@ -8,7 +69,7 @@
+libdir=`pkg-config gdlib --variable=libdir`
includedir=@includedir@
bindir=@bindir@
-+ldflags=`pkg-config gdlib --variable=ldflags`
++ldflags=`pkg-config gdlib --variable=ldflags`
usage()
{
@@ -17,96 +78,35 @@
;;
--ldflags)
- echo @LDFLAGS@
-+ echo $ldflags
++ echo $ldflags
;;
--libs)
- echo @LIBS@
+ echo @LIBS@ @LIBICONV@
@@ -83,7 +84,7 @@
echo "GD library @VERSION@"
echo "includedir: $includedir"
echo "cflags: -I at includedir@"
- echo "ldflags: @LDFLAGS@"
+ echo "ldflags: $ldflags"
- echo "libs: @LIBS@"
+ echo "libs: @LIBS@ @LIBICONV@"
echo "libdir: $libdir"
echo "features: @FEATURES@"
---- /dev/null 2006-05-22 08:57:38.164651760 +0200
-+++ gd-2.0.33/config/gdlib.pc.in 2006-05-24 15:42:32.000000000 +0200
-@@ -0,0 +1,14 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+bindir=@bindir@
-+ldflags=@LDFLAGS@
-+
-+
-+Name: gd-devel
-+Description: A graphics library for quick creation of PNG or JPEG images
-+Version: @VERSION@
-+Requires:
-+Libs: @LIBS@
-+Cflags: -I at includedir@
---- gd-2.0.33/configure.pom 2006-05-24 15:42:32.000000000 +0200
-+++ gd-2.0.33/configure 2006-05-24 15:42:32.000000000 +0200
-@@ -12688,7 +12688,7 @@
+--- gd-2.0.34/configure.pom 2007-02-08 13:25:00.000000000 +0100
++++ gd-2.0.34/configure 2007-02-08 13:31:53.000000000 +0100
+@@ -24672,7 +24672,7 @@
Support for pthreads: $acx_pthread_ok
- " >&6
+ " >&6; }
-- ac_config_files="$ac_config_files Makefile config/Makefile config/gdlib-config test/Makefile"
-+ ac_config_files="$ac_config_files Makefile config/Makefile config/gdlib-config config/gdlib.pc test/Makefile"
+-ac_config_files="$ac_config_files Makefile config/Makefile config/gdlib-config test/Makefile"
++ac_config_files="$ac_config_files Makefile config/Makefile config/gdlib-config config/gdlib.pc test/Makefile"
cat >confcache <<\_ACEOF
-@@ -13250,6 +13250,7 @@
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
- "config/gdlib-config" ) CONFIG_FILES="$CONFIG_FILES config/gdlib-config" ;;
-+ "config/gdlib.pc" ) CONFIG_FILES="$CONFIG_FILES config/gdlib.pc" ;;
- "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
---- gd-2.0.33/Makefile.in.pom 2004-11-04 00:14:44.000000000 +0100
-+++ gd-2.0.33/Makefile.in 2006-05-24 15:42:47.000000000 +0200
-@@ -317,6 +317,7 @@
- ACLOCAL_AMFLAGS = -I config
- SUBDIRS = config test
- bin_SCRIPTS = bdftogd config/gdlib-config
-+pkgconf_CFILE = config/gdlib.pc
- EXTRA_DIST = README-JPEG.TXT README.TXT configure.pl bdftogd demoin.png err.out index.html install-item makefile.sample readme.jpn entities.html entities.tcl
- include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h entities.h
- lib_LTLIBRARIES = libgd.la
-@@ -528,6 +529,15 @@
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
-+install-pkgconfigCF:
-+ $(mkdir_p) "$(DESTDIR)$(libdir)/pkgconfig"
-+ echo " cp $(pkgconf_CFILE) $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc"
-+ cp $(pkgconf_CFILE) $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc
-+
-+uninstall-pkgconfigCF:
-+ echo " rm $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc"
-+ rm $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc
-+
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-@@ -949,7 +959,7 @@
-
- install-data-am: install-includeHEADERS
-
--install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-+install-exec-am: install-binPROGRAMS install-binSCRIPTS install-pkgconfigCF \
- install-libLTLIBRARIES
-
- install-info: install-info-recursive
-@@ -978,7 +988,7 @@
-
- ps-am:
-
--uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-pkgconfigCF\
- uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLTLIBRARIES
+@@ -25257,6 +25257,7 @@
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
+ "config/gdlib-config") CONFIG_FILES="$CONFIG_FILES config/gdlib-config" ;;
++ "config/gdlib.pc" ) CONFIG_FILES="$CONFIG_FILES config/gdlib.pc" ;;
+ "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
gd-sparc64.patch:
configure | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: gd-sparc64.patch
===================================================================
RCS file: /cvs/dist/rpms/gd/FC-6/gd-sparc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gd-sparc64.patch 19 Jul 2006 07:59:51 -0000 1.1
+++ gd-sparc64.patch 5 Sep 2007 12:10:33 -0000 1.2
@@ -1,13 +1,13 @@
---- gd-2.0.33/configure.sparc64 2006-07-14 00:46:04.000000000 -0400
-+++ gd-2.0.33/configure 2006-07-14 00:47:14.000000000 -0400
-@@ -6679,8 +6679,8 @@
+--- gd-2.0.34/configure.sp 2007-02-08 13:44:32.000000000 +0100
++++ gd-2.0.34/configure 2007-02-08 13:50:39.000000000 +0100
+@@ -9075,8 +9075,8 @@
- *)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_cmds='$CC $CFLAGS -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC $CFLAGS -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds='$CC $CFLAGS -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC $CFLAGS -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
Index: gd.spec
===================================================================
RCS file: /cvs/dist/rpms/gd/FC-6/gd.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gd.spec 29 May 2007 13:11:07 -0000 1.38
+++ gd.spec 5 Sep 2007 12:10:33 -0000 1.39
@@ -1,20 +1,15 @@
Summary: A graphics library for quick creation of PNG or JPEG images
Name: gd
-Version: 2.0.33
-Release: 11%{?dist}
+Version: 2.0.35
+Release: 1%{?dist}
Group: System Environment/Libraries
License: BSD-style
URL: http://www.boutell.com/gd/
-Source0: http://www.boutell.com/gd/http/%{name}-%{version}.tar.gz
+Source0: http://www.boutell.com/gd/http/%{name}-%{version}.tar.bz2
Patch0: gd-2.0.33-freetype.patch
-Patch1: gd-2.0.33-SetAAPixel.patch
-Patch2: gd-2.0.33-security.patch
Patch3: gd-2.0.33-multilib.patch
Patch4: gd-loop.patch
Patch5: gd-sparc64.patch
-Patch6: gd-2.0.33-cve-07-0455.patch
-Patch7: gd-2.0.33-loop1.patch
-Patch8: gd-2.0.33-sf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig
@@ -55,14 +50,9 @@
%prep
%setup -q
%patch0 -p1 -b .freetype
-%patch1 -p1 -b .SetAAPixel
-%patch2 -p1 -b .security
%patch3 -p1 -b .mlib
%patch4 -p1 -b .loop
%patch5 -p1 -b .sparc64
-%patch6 -p1 -b .cve-07-0455
-%patch7 -p1 -b .loop1
-%patch8 -p1 -b .sf
%build
%configure --disable-rpath
@@ -102,6 +92,10 @@
%changelog
+* Wed Sep 5 2007 Ivana Varekova <varekova at redhat.com> - 2.0.35-1
+- update to 2.0.35
+- fix several vulnerabilities #277421
+
* Tue May 29 2007 Ivana Varekova <varekova at redhat.com> - 2.0.33-11
- fix problem with potential infinite loop
- fix problem with possible stack overflow
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gd/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 22 Mar 2005 17:58:20 -0000 1.10
+++ sources 5 Sep 2007 12:10:33 -0000 1.11
@@ -1 +1 @@
-be0a6d326cd8567e736fbc75df0a5c45 gd-2.0.33.tar.gz
+6c6c3dbb7bf079e0bb5fbbfd3bb8a71c gd-2.0.35.tar.bz2
More information about the fedora-cvs-commits
mailing list