rpms/pkgconfig/devel pkgconfig.spec, 1.59, 1.60 popt-compat.patch, 1.2, 1.3

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/pkgconfig/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10371

Modified Files:
	pkgconfig.spec popt-compat.patch 
Log Message:
Avoid segfaults



Index: pkgconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- pkgconfig.spec	27 May 2010 00:02:25 -0000	1.59
+++ pkgconfig.spec	27 May 2010 14:53:08 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.24
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/pk
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu May 27 2010 Matthias Clasen <mclasen at redhat.com> 0.24-6
+- Avoid segfaults
+
 * Wed May 26 2010 Matthias Clasen <mclasen at redhat.com> 0.24-5
 - Expand the popt-compat patch to cover empty Libs: as well
 

popt-compat.patch:
 parse.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: popt-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/popt-compat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- popt-compat.patch	27 May 2010 00:02:25 -0000	1.2
+++ popt-compat.patch	27 May 2010 14:53:08 -0000	1.3
@@ -1,7 +1,16 @@
 diff -up pkg-config-0.24/parse.c.popt-compat pkg-config-0.24/parse.c
---- pkg-config-0.24/parse.c.popt-compat	2010-05-26 19:56:12.296356199 -0400
-+++ pkg-config-0.24/parse.c	2010-05-26 19:59:46.212598850 -0400
-@@ -749,7 +749,7 @@ parse_libs (Package *pkg, const char *st
+--- pkg-config-0.24/parse.c.popt-compat	2010-05-27 10:39:25.541590283 -0400
++++ pkg-config-0.24/parse.c	2010-05-27 10:50:39.351362109 -0400
+@@ -735,7 +735,7 @@ parse_libs (Package *pkg, const char *st
+   
+   char *trimmed;
+   char **argv = NULL;
+-  int argc;
++  int argc = 0;
+   int result;
+   
+   if (pkg->libs_num > 0)
+@@ -749,10 +749,10 @@ parse_libs (Package *pkg, const char *st
  
    result = poptParseArgvString (trimmed, &argc, &argv);
  
@@ -9,7 +18,20 @@ diff -up pkg-config-0.24/parse.c.popt-co
 +  if (result < 0 && result != POPT_ERROR_NOARG)
      {
        verbose_error ("Couldn't parse Libs field into an argument vector: %s\n",
-                poptStrerror (result));
+-               poptStrerror (result));
++                     poptStrerror (result));
+ 
+       exit (1);
+     }
+@@ -781,7 +781,7 @@ parse_libs_private (Package *pkg, const 
+   
+   char *trimmed;
+   char **argv = NULL;
+-  int argc;
++  int argc = 0;
+   int result;
+   
+   if (pkg->libs_private_num > 0)
 @@ -795,7 +795,7 @@ parse_libs_private (Package *pkg, const 
  
    result = poptParseArgvString (trimmed, &argc, &argv);
@@ -19,6 +41,15 @@ diff -up pkg-config-0.24/parse.c.popt-co
      {
        verbose_error ("Couldn't parse Libs.private field into an argument vector: %s\n",
                 poptStrerror (result));
+@@ -818,7 +818,7 @@ parse_cflags (Package *pkg, const char *
+   
+   char *trimmed;
+   char **argv = NULL;
+-  int argc;
++  int argc = 0;
+   int result;
+   int i;
+   
 @@ -833,7 +833,7 @@ parse_cflags (Package *pkg, const char *
  
    result = poptParseArgvString (trimmed, &argc, &argv);