Hello community,
here is the log from the commit of package gpsdrive
checked in at Tue Oct 28 18:00:07 CET 2008.
--------
--- gpsdrive/gpsdrive.changes 2008-01-18 15:49:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/gpsdrive/gpsdrive.changes 2008-10-28 11:48:55.000000000 +0100
@@ -0,0 +1,5 @@
+Tue Oct 28 10:54:08 CET 2008 - jreuter@suse.de
+
+- Fix bogus fgets() return code handling (bnc#439326)
+- Fix off-by-one error while reading waypoints
+
calling whatdependson for head-i586
New:
----
gpsdrive-fgets.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpsdrive.spec ++++++
--- /var/tmp/diff_new_pack.N14562/_old 2008-10-28 17:59:39.000000000 +0100
+++ /var/tmp/diff_new_pack.N14562/_new 2008-10-28 17:59:39.000000000 +0100
@@ -2,14 +2,22 @@
# spec file for package gpsdrive (Version 2.10pre4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: gpsdrive
BuildRequires: gcc-c++ gtk2-devel libart_lgpl-devel libxml2-devel mysql-devel pcre-devel perl-libwww-perl update-desktop-files
Url: http://www.kraftvoll.at/software/
@@ -17,11 +25,12 @@
Group: Productivity/Graphics/Other
AutoReqProv: on
Version: 2.10pre4
-Release: 1
+Release: 89
Summary: Navigation via a GPS Receiver
Source: %{name}-%{version}.tar.bz2
Source1: %name.desktop
Patch: mapnik-handler.patch
+Patch1: gpsdrive-fgets.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -42,15 +51,15 @@
Dan Egnor
Dirk-Jan Faber
Douglas S. J. De Couto
- Emese Kov�cs
+ Emese Kovacs
F�lix Martos
Jaap Hogenberg
Jacky Francois
- J�rg Ostertag
+ Joerg Ostertag
Kevin Stephens
Manfred Caruso
Marco Molteni
- Martin Sj�gren
+ Martin Sjoegren
Remco Treffkorn
Richard Scheffenegger
Russell Harding
@@ -59,12 +68,13 @@
Timothy Witham
Wernle Daniel
Yiannis Pailas
- Zdeno Podobn�
+ Zdeno Podobny
%prep
%setup -q
-%patch
+%patch -p0
+%patch1 -p0
%build
CFLAGS=$RPM_OPT_FLAGS ./configure --disable-mapnik --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir}
@@ -91,11 +101,9 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-%run_ldconfig
+%post -p /sbin/ldconfig
-%postun
-%run_ldconfig
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
@@ -116,13 +124,6 @@
/usr/share/gpsdrive/poi/*
%dir /usr/share/map-icons
/usr/share/map-icons/*
-/usr/share/map-icons/*/*png
-/usr/share/map-icons/*/*/*png
-/usr/share/map-icons/*/*/*/*png
-/usr/share/map-icons/svg/*svg
-/usr/share/map-icons/svg/*/*svg
-/usr/share/map-icons/svg/*/*/*svg
-/usr/share/map-icons/svg/*/*/*/*svg
/usr/share/pixmaps/gpsdrive.png
%dir /usr/lib/perl5/*/*/Geo
%dir /usr/lib/perl5/*/*/Geo/Filter
@@ -138,6 +139,9 @@
/usr/lib/perl5/*/*/Geo/Tracks/*
%changelog
+* Tue Oct 28 2008 jreuter@suse.de
+- Fix bogus fgets() return code handling (bnc#439326)
+- Fix off-by-one error while reading waypoints
* Fri Jan 18 2008 jreuter@suse.de
- upgrade to version 2.10pre4:
* OpenStreetmap (OSM) POI support
++++++ gpsdrive-fgets.patch ++++++
diff -Nur ../gpsdrive-2.10pre4.orig/src/gpsdrive_config.c ./src/gpsdrive_config.c
--- ../gpsdrive-2.10pre4.orig/src/gpsdrive_config.c 2007-09-15 17:12:03.000000000 +0200
+++ ./src/gpsdrive_config.c 2008-10-28 10:51:22.000000000 +0100
@@ -289,7 +289,7 @@
if ( mydebug > 0 )
fprintf (stderr,"reading config file %s ...\n", local_config.config_file);
- while ((fgets (buf, 1000, fp)) > 0)
+ while (fgets (buf, 1000, fp))
{
g_strlcpy (par1, "", sizeof (par1));
g_strlcpy (par2, "", sizeof (par2));
diff -Nur ../gpsdrive-2.10pre4.orig/src/map_handler.c ./src/map_handler.c
--- ../gpsdrive-2.10pre4.orig/src/map_handler.c 2007-09-15 09:32:42.000000000 +0200
+++ ./src/map_handler.c 2008-10-28 10:51:34.000000000 +0100
@@ -458,7 +458,7 @@
gint i;
gint max_nrmaps = 1000;
gchar buf[1512], s1[40], s2[40], s3[40], filename[100], minlat[40], minlon[40], maxlat[40], maxlon[40];
- gint p, e;
+ gint e;
if (mydebug > 50)
fprintf (stderr, "loadmapconfig()\n");
@@ -494,7 +494,7 @@
maps = g_new (mapsstruct, max_nrmaps);
i = nrmaps = 0;
havenasa = -1;
- while ((p = fgets (buf, 1512, st) != 0))
+ while (fgets (buf, 1512, st))
{
e = sscanf (buf, "%s %s %s %s %s %s %s %s", filename, s1, s2, s3, minlat, minlon, maxlat, maxlon);
if ((mydebug > 50) && !(nrmaps % 1000))
diff -Nur ../gpsdrive-2.10pre4.orig/src/waypoint.c ./src/waypoint.c
--- ../gpsdrive-2.10pre4.orig/src/waypoint.c 2007-09-14 23:47:13.000000000 +0200
+++ ./src/waypoint.c 2008-10-28 11:12:53.000000000 +0100
@@ -564,11 +564,11 @@
/* limit waypoint type to 40 chars */
g_strlcpy ((wayp + i)->typ, wp_type, 40);
- (wayp + i)->typ[40] = 0;
+ (wayp + i)->typ[39] = 0;
/* limit waypoint comment to 80 chars */
g_strlcpy ((wayp + i)->comment, wp_comment, 80);
- (wayp + i)->comment[80] = 0;
+ (wayp + i)->comment[79] = 0;
(wayp + i)->wlan = 0;
@@ -998,7 +998,7 @@
{
gchar fn_way_txt[2048];
FILE *st;
- gint i, e, p, wlan, action, sqlnr, proximity;
+ gint i, e, wlan, action, sqlnr, proximity;
gchar buf[512], slat[80], slong[80], typ[40];
struct stat stat_buf;
@@ -1033,7 +1033,7 @@
}
i = 0;
- while ((p = fgets (buf, 512, st) != 0))
+ while (fgets (buf, 512, st))
{
e = sscanf (buf, "%s %s %s %s %d %d %d %d\n",
(wayp + i)->name, slat, slong, typ,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org