rpms/mdsplib/F-9 mdsplib-0.11-nullcheck.patch, NONE, 1.1 mdsplib-0.11-typeerror.patch, NONE, 1.1 mdsplib.spec, 1.4, 1.5

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/mdsplib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27456/F-9

Modified Files:
	mdsplib.spec 
Added Files:
	mdsplib-0.11-nullcheck.patch mdsplib-0.11-typeerror.patch 
Log Message:
Backport changes from devel (fixes) to all current branches.


mdsplib-0.11-nullcheck.patch:

--- NEW FILE mdsplib-0.11-nullcheck.patch ---
diff -Naupr mdsplib-0.11.orig/src/dcdmtrmk.c mdsplib-0.11/src/dcdmtrmk.c
--- mdsplib-0.11.orig/src/dcdmtrmk.c	2003-12-10 22:28:15.000000000 +0100
+++ mdsplib-0.11/src/dcdmtrmk.c	2009-06-11 12:00:39.887533211 +0200
@@ -1987,11 +1987,11 @@ MDSP_BOOL static isLTGfreq( char **strin
    }
    else {
  
+      (--string);
+ 
       if( *string == NULL )
          return FALSE;
  
-      (--string);
- 
  
       LTG_FREQ_FLAG = FALSE;
                         /*-- CHECK FOR LIGHTNING FREQUENCY -----------*/

mdsplib-0.11-typeerror.patch:

--- NEW FILE mdsplib-0.11-typeerror.patch ---
diff -up mdsplib-0.11/src/local.h.typeerr mdsplib-0.11/src/local.h
--- mdsplib-0.11/src/local.h.typeerr	2003-12-10 22:30:56.000000000 +0100
+++ mdsplib-0.11/src/local.h	2009-03-24 00:50:51.000000000 +0100
@@ -1175,7 +1175,7 @@ MDSP_BOOL std2ccap(Devaddr *, Diskaddr *
 char *strupr(char *);
 char *strlwr(char *);
 /* char *strdup(char *); */
-char *strndup(char *, int);
+char *strndup(const char *, size_t);
 int strcmpi(char *, char *);
  
 /* void *memccpy(void *, void *, int, unsigned); */


Index: mdsplib.spec
===================================================================
RCS file: /cvs/extras/rpms/mdsplib/F-9/mdsplib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mdsplib.spec	20 Feb 2008 04:24:18 -0000	1.4
+++ mdsplib.spec	11 Jun 2009 10:36:08 -0000	1.5
@@ -1,13 +1,15 @@
 Summary: METAR Decoder Software Package Library
 Name: mdsplib
 Version: 0.11
-Release: 6%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://limulus.net/mdsplib/
 Source: http://limulus.net/mdsplib/mdsplib-%{version}.tar.gz
 Patch0: mdsplib-0.11-makefile.patch
 Patch1: mdsplib-0.11-shared.patch
+Patch2: mdsplib-0.11-typeerror.patch
+Patch3: mdsplib-0.11-nullcheck.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -41,6 +43,8 @@ library. Also prtDMETR, which prints out
 %setup -q
 %patch0 -p1 -b .makefile
 %patch1 -p1 -b .shared
+%patch2 -p1 -b .typeerr
+%patch3 -p1 -b .nullcheck
 
 
 %build
@@ -73,7 +77,16 @@ library. Also prtDMETR, which prints out
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11-6
+* Thu Jun 11 2009 Matthias Saou <http://freshrpms.net/> 0.11-9
+- Fix null check which could cause segfaults (#505050).
+
+* Mon Mar 23 2009 Karsten Hopp <karsten at redhat.com> 0.11-8
+- fix conflicting types for 'strndup' on s390*
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.11-5