Mailinglist Archive: opensuse-commit (1262 mails)
| < Previous | Next > |
commit freeglut
- From: root@xxxxxxx (h_root)
- Date: Thu, 7 Sep 2006 01:13:55 +0200 (CEST)
- Message-id: <20060906231355.4E0C118A198@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package freeglut
checked in at Thu Sep 7 01:13:55 CEST 2006.
--------
--- freeglut/freeglut.changes 2006-07-23 16:42:30.000000000 +0200
+++ freeglut/freeglut.changes 2006-09-03 22:04:56.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Sep 3 22:04:01 CEST 2006 - sndirsch@xxxxxxx
+
+- update to current CVS (2006-09-03)
+ * Check fgets for return value to avoid warnings
+
+-------------------------------------------------------------------
Old:
----
freeglut-051110.diff
freeglut-051110.tar.bz2
New:
----
freeglut-060903.diff
freeglut-060903.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freeglut.spec ++++++
--- /var/tmp/diff_new_pack.5DeYxE/_old 2006-09-07 01:13:07.000000000 +0200
+++ /var/tmp/diff_new_pack.5DeYxE/_new 2006-09-07 01:13:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package freeglut (Version 051110)
+# spec file for package freeglut (Version 060903)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,8 +13,8 @@
Name: freeglut
BuildRequires: Mesa-devel gcc-c++ libdrm-devel pkgconfig xorg-x11-devel
Summary: Freely Licensed Alternative to the GLUT Library
-Version: 051110
-Release: 15
+Version: 060903
+Release: 1
URL: http://freeglut.sourceforge.net/
%define USE_EXTERNAL_MESA 1
Source0: freeglut-%{version}.tar.bz2
@@ -157,6 +157,9 @@
%{_mandir}/man3/*
%changelog -n freeglut
+* Sun Sep 03 2006 - sndirsch@xxxxxxx
+- update to current CVS (2006-09-03)
+ * Check fgets for return value to avoid warnings
* Sun Jul 23 2006 - sndirsch@xxxxxxx
- updated xdriinfo
- fixed build for X.Org 7
++++++ freeglut-051110.diff -> freeglut-060903.diff ++++++
++++++ freeglut-051110.tar.bz2 -> freeglut-060903.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freeglut/ChangeLog new/freeglut/ChangeLog
--- old/freeglut/ChangeLog 2005-10-12 16:20:35.000000000 +0200
+++ new/freeglut/ChangeLog 2006-09-03 06:42:25.000000000 +0200
@@ -1168,3 +1168,11 @@
(303) Moved GLUT_INIT_STATE to <GL/freeglut_ext.h>, it is not part of the
original GLUT.
+
+**************************************************************************
+* Changes on August 05, 2006.
+**************************************************************************
+
+(304) Updated build requirements for SuSE 10.1.
+
+(305) Check fgets for return value to avoid warnings.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freeglut/freeglut.spec new/freeglut/freeglut.spec
--- old/freeglut/freeglut.spec 2005-06-14 17:37:09.000000000 +0200
+++ new/freeglut/freeglut.spec 2006-09-03 06:42:25.000000000 +0200
@@ -9,9 +9,9 @@
#
# norootforbuild
-# neededforbuild gcc-c++ gcc-g77 libstdc++ libstdc++-devel mesa-devel-packages x-devel-packages
+# usedforbuild Mesa Mesa-devel aaa_base acl attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db diffutils e2fsprogs expat file filesystem fillup findutils flex fontconfig fontconfig-devel gawk gcc gcc-c++ gdbm gdbm-devel gettext gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libdrm libdrm-devel libgcc libnscd libstdc++ libstdc++-devel libtool libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openmotif-libs openssl pam pam-modules patch perl permissions popt procinfo procps psmisc pwdutils rcs readline rpm sed strace sysvinit tar tcpd texinfo timezone unzip util-linux vim xorg-x11-devel xorg-x11-libs zlib zlib-devel
-BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libgcc libnscd libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace syslogd sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils expat fontconfig fontconfig-devel gcc gcc-c++ gcc-g77 gdbm gettext libstdc++-devel libtool perl rpm xorg-x11-Mesa xorg-x11-Mesa-devel xorg-x11-devel xorg-x11-libs
+BuildRequires: Mesa-devel gcc-c++ libdrm-devel
Name: freeglut
Summary: Freely Licensed Alternative to the GLUT Library
@@ -108,6 +108,8 @@
%{_libdir}/libglut.so
%changelog -n freeglut
+* Sat Aug 05 2006 - sven.panne@xxxxxxxxx
+- Updated build requirements for SuSE 10.1
* Mon Jun 13 2005 - sven.panne@xxxxxxxxx
- updated to release 2.4.0
- use autogen.sh
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freeglut/progs/demos/Fractals/fractals.c new/freeglut/progs/demos/Fractals/fractals.c
--- old/freeglut/progs/demos/Fractals/fractals.c 2003-12-25 15:39:38.000000000 +0100
+++ new/freeglut/progs/demos/Fractals/fractals.c 2006-09-03 06:42:26.000000000 +0200
@@ -208,6 +208,16 @@
}
+static void
+checkedFGets ( char *s, int size, FILE *stream )
+{
+ if ( fgets ( s, size, stream ) == NULL ) {
+ fprintf ( stderr, "fgets failed\n");
+ exit ( EXIT_FAILURE );
+ }
+}
+
+
void readConfigFile ( char *fnme )
{
FILE *fptr = fopen ( fnme, "rt" ) ;
@@ -217,13 +227,13 @@
if ( fptr )
{
/* Read a header line */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
/* Read a comment line */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
/* Read the window title */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
/* We assume here that this line will not exceed 79 characters plus a
newline (window_title is 80 characters long). That'll cause a buffer
overflow. For a simple program like this, though, we're letting it
@@ -232,21 +242,21 @@
sscanf ( inputline, "%[a-zA-Z0-9!@#$%^&*()+=/\\_-\" ]", window_title ) ;
/* Read a comment line */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
/* Read the number of affine transformations */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
sscanf ( inputline, "%d", &num_trans ) ;
affine = (AffineTrans *)malloc ( num_trans * sizeof(AffineTrans) ) ;
/* Read a comment line */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
for ( i = 0; i < num_trans; i++ )
{
/* Read an affine transformation definition */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
sscanf ( inputline, "%lf %lf %lf %lf %lf %lf", &affine[i].a00, &affine[i].a01,
&affine[i].a10, &affine[i].a11, &affine[i].b0, &affine[i].b1 ) ;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freeglut/progs/demos/Fractals_random/fractals_random.c new/freeglut/progs/demos/Fractals_random/fractals_random.c
--- old/freeglut/progs/demos/Fractals_random/fractals_random.c 2005-01-01 17:09:39.000000000 +0100
+++ new/freeglut/progs/demos/Fractals_random/fractals_random.c 2006-09-03 06:42:26.000000000 +0200
@@ -255,6 +255,16 @@
}
+static void
+checkedFGets ( char *s, int size, FILE *stream )
+{
+ if ( fgets ( s, size, stream ) == NULL ) {
+ fprintf ( stderr, "fgets failed\n");
+ exit ( EXIT_FAILURE );
+ }
+}
+
+
void readConfigFile ( char *fnme )
{
FILE *fptr = fopen ( fnme, "rt" ) ;
@@ -264,13 +274,13 @@
if ( fptr )
{
/* Read a header line */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
/* Read a comment line */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
/* Read the window title */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
/* We assume here that this line will not exceed 79 characters plus a
newline (window_title is 80 characters long). That'll cause a buffer
overflow. For a simple program like this, though, we're letting it
@@ -279,21 +289,21 @@
sscanf ( inputline, "%[a-zA-Z0-9!@#$%^&*()+=/\\_-\" ]", window_title ) ;
/* Read a comment line */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
/* Read the number of affine transformations */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
sscanf ( inputline, "%d", &num_trans ) ;
affine = (AffineTrans *)malloc ( num_trans * sizeof(AffineTrans) ) ;
/* Read a comment line */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
for ( i = 0; i < num_trans; i++ )
{
/* Read an affine transformation definition */
- fgets ( inputline, 256, fptr ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
sscanf ( inputline, "%lf %lf %lf %lf %lf %lf", &affine[i].a00, &affine[i].a01,
&affine[i].a10, &affine[i].a11, &affine[i].b0, &affine[i].b1 ) ;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freeglut/progs/demos/Lorenz/lorenz.c new/freeglut/progs/demos/Lorenz/lorenz.c
--- old/freeglut/progs/demos/Lorenz/lorenz.c 2005-07-06 11:19:37.000000000 +0200
+++ new/freeglut/progs/demos/Lorenz/lorenz.c 2006-09-03 06:42:26.000000000 +0200
@@ -107,6 +107,16 @@
( deriv0[i] + 2.0 * ( deriv1[i] + deriv2[i] ) + deriv3[i] ) ;
}
+static void
+checkedFGets ( char *s, int size, FILE *stream )
+{
+ if ( fgets ( s, size, stream ) == NULL ) {
+ fprintf ( stderr, "fgets failed\n");
+ exit ( EXIT_FAILURE );
+ }
+}
+
+
/* GLUT callbacks */
#define INPUT_LINE_LENGTH 80
@@ -142,15 +152,15 @@
case 'm' : case 'M' : /* Modify the Lorenz parameters */
printf ( "Please enter new value for <sigma> (default %f, currently %f): ", s0, sigma ) ;
- fgets ( inputline, INPUT_LINE_LENGTH-1, stdin ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), stdin ) ;
sscanf ( inputline, "%lf", &sigma ) ;
printf ( "Please enter new value for <b> (default %f, currently %f): ", b0, b ) ;
- fgets ( inputline, INPUT_LINE_LENGTH-1, stdin ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), stdin ) ;
sscanf ( inputline, "%lf", &b ) ;
printf ( "Please enter new value for <r> (default %f, currently %f): ", r0, r ) ;
- fgets ( inputline, INPUT_LINE_LENGTH-1, stdin ) ;
+ checkedFGets ( inputline, sizeof ( inputline ), stdin ) ;
sscanf ( inputline, "%lf", &r ) ;
break ;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |