rpms/mapserver/F-7 .cvsignore, NONE, 1.1 mapserver-4.10.3-ldfix.patch, NONE, 1.1 mapserver.spec, 1.2, 1.3 sources, 1.1, 1.2

[Oliver Falk (oliver)]

Author: oliver

Update of /cvs/pkgs/rpms/mapserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25264

Modified Files:
	mapserver.spec sources 
Added Files:
	.cvsignore mapserver-4.10.3-ldfix.patch 
Log Message:

* Thu Aug 30 2007 Oliver Falk <oliver at linux-kernel.at> 4.10.3-2
- Add fix to include libmapserver (in some places), instead of
  libmap, that doesn't exist (anymore)

* Thu Aug 30 2007 Oliver Falk <oliver at linux-kernel.at> 4.10.3-1
- Update to fix bz#256561, CVE-2007-4542



--- NEW FILE .cvsignore ---
mapserver-4.10.3.tar.gz

mapserver-4.10.3-ldfix.patch:

--- NEW FILE mapserver-4.10.3-ldfix.patch ---
--- mapserver-4.10.3/mapscript/java/Makefile.in.ldfix	2007-08-30 11:59:03.000000000 +0200
+++ mapserver-4.10.3/mapscript/java/Makefile.in	2006-08-27 18:41:36.000000000 +0200
@@ -184,9 +184,9 @@ SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(TIFF_
 # STATIC_LIBS is full filename with path of libs that will be statically linked
 STATIC_LIBS= $(GD_STATIC)
 
-EXE_LDFLAGS =	$(RUNPATHS) -L. -lmap $(SUP_LIBS) $(STATIC_LIBS)
+EXE_LDFLAGS =	$(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
 
-LDFLAGS= $(RUNPATHS) -L../.. -lmap $(SUP_LIBS) $(STATIC_LIBS)
+LDFLAGS= $(RUNPATHS) -L../.. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
 
 # END OF CONFIGURE----
 
--- mapserver-4.10.3/mapscript/csharp/Makefile.in.ldfix	2007-08-30 11:58:29.000000000 +0200
+++ mapserver-4.10.3/mapscript/csharp/Makefile.in	2007-08-30 11:58:42.000000000 +0200
@@ -188,7 +188,7 @@ SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(TIFF_
 # STATIC_LIBS is full filename with path of libs that will be statically linked
 STATIC_LIBS= $(GD_STATIC)
 
-LDFLAGS= $(RUNPATHS) -L../.. -lmap $(SUP_LIBS) $(STATIC_LIBS)
+LDFLAGS= $(RUNPATHS) -L../.. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
 
 LIBMAPSCRIPT_SHARED= libmapscript. at SO_EXT@
 LD_SHARED= @LD_SHARED@


Index: mapserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/F-7/mapserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapserver.spec	11 May 2007 21:58:53 -0000	1.2
+++ mapserver.spec	30 Aug 2007 10:41:56 -0000	1.3
@@ -1,11 +1,12 @@
 Name:           mapserver
-Version:        4.10.2
-Release:        4%{?dist}
+Version:        4.10.3
+Release:        2%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
 URL:            http://mapserver.gis.umn.edu
 Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
+Patch0:         %{name}-%{version}-ldfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd 
 BuildRequires:  libXpm-devel
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # fix spurious perm bits
 chmod -x tests/home.png
 chmod -x rfc/ms-rfc-8.txt
@@ -218,6 +220,13 @@
 %{_javadir}/*.jar
 
 %changelog
+* Thu Aug 30 2007 Oliver Falk <oliver at linux-kernel.at> 4.10.3-2
+- Add fix to include libmapserver (in some places), instead of
+  libmap, that doesn't exist (anymore)
+
+* Thu Aug 30 2007 Oliver Falk <oliver at linux-kernel.at> 4.10.3-1
+- Update to fix bz#256561, CVE-2007-4542
+
 * Fri May 11 2007 Balint Cristian <cbalint at redhat.com> 4.10.2-4
 - update require list properly.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 May 2007 09:50:50 -0000	1.1
+++ sources	30 Aug 2007 10:41:56 -0000	1.2
@@ -1 +1 @@
-5e36e2d788599505590501c981eb44a7  mapserver-4.10.2.tar.gz
+b988cdfece7c2f02b0cd186b5090729b  mapserver-4.10.3.tar.gz