Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at Thu Jun 16 10:41:37 CEST 2011.
-------- --- fillup/fillup.changes 2010-06-28 08:48:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/fillup/fillup.changes 2011-05-21 22:36:25.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 21 20:34:06 UTC 2011 - [email protected] + +- Open all file descriptors with O_CLOEXEC +- handle out-of-disk-space situations somewhat better. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fillup-1.42-cloexec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fillup.spec ++++++ --- /var/tmp/diff_new_pack.UX2KtZ/_old 2011-06-16 10:39:50.000000000 +0200 +++ /var/tmp/diff_new_pack.UX2KtZ/_new 2011-06-16 10:39:50.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package fillup (Version 1.42) +# spec file for package fillup # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Provides: aaa_base:/bin/fillup AutoReqProv: on Version: 1.42 -Release: 246 +Release: 257 Summary: Tool for Merging Config Files Source: fillup-%{version}.tar.bz2 Patch: fillup-optflags.patch @@ -32,6 +32,7 @@ Patch2: fillup-%{version}.dif Patch3: fillup-retval.dif Patch4: fillup-nodate.patch +Patch5: fillup-1.42-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. @@ -49,11 +50,12 @@ %prep %setup -q -%patch -p1 +%patch %patch1 -p1 %patch2 -p0 %patch3 -p0 %patch4 -p0 +%patch5 %build # ++++++ fillup-1.42-cloexec.patch ++++++ --- SRC/services.c.orig +++ SRC/services.c @@ -342,7 +342,7 @@ openFileForReading { Service_t returnValue; - *filePointer = fopen( filename, "r" ); + *filePointer = fopen( filename, "re" ); if( *filePointer == NULL ) { fillup_exception( __FILE__, __LINE__, ServiceException, @@ -368,7 +368,7 @@ openFileForWriting { Service_t returnValue; - *filePointer = fopen( filename, "w" ); + *filePointer = fopen( filename, "we" ); if( *filePointer == NULL ) { fillup_exception( __FILE__, __LINE__, ServiceException, ++++++ fillup-1.42.dif ++++++ --- /var/tmp/diff_new_pack.UX2KtZ/_old 2011-06-16 10:39:50.000000000 +0200 +++ /var/tmp/diff_new_pack.UX2KtZ/_new 2011-06-16 10:39:50.000000000 +0200 @@ -1,6 +1,6 @@ ---- SRC/consume.c -+++ SRC/consume.c 2005-09-02 12:44:00.000000000 +0200 -@@ -140,7 +140,7 @@ +--- SRC/consume.c.orig ++++ SRC/consume.c +@@ -140,7 +140,7 @@ consumeUptoBreak { break; /* line break detected */ } @@ -9,9 +9,9 @@ { break; /* End-Of-File detected */ } ---- SRC/file.c -+++ SRC/file.c 2005-09-02 12:44:00.000000000 +0200 -@@ -35,18 +35,34 @@ +--- SRC/file.c.orig ++++ SRC/file.c +@@ -35,18 +35,34 @@ readFile File_t returnValue; FILE * filePointer; long fileLength; @@ -52,9 +52,9 @@ addToWatchdog( fileLength ); associateBuffer( fileSpecifier, fileLength, &buffer ); returnValue = FileOperationsSuccessful; ---- SRC/parameters.c -+++ SRC/parameters.c 2005-09-02 12:44:00.000000000 +0200 -@@ -368,6 +368,13 @@ +--- SRC/parameters.c.orig ++++ SRC/parameters.c +@@ -368,6 +368,13 @@ queryParameter } break; @@ -68,9 +68,18 @@ case IgnoreDefinites: if( parameterIgnoreDefinites == IsSet ) { ---- SRC/parser.c -+++ SRC/parser.c 2005-09-02 12:44:00.000000000 +0200 -@@ -296,6 +296,7 @@ +--- SRC/parser.c.orig ++++ SRC/parser.c +@@ -19,7 +19,7 @@ + /*--------------------------------- IMPORTS ----------------------------------*/ + + #include <ctype.h> +- ++#include <unistd.h> + #include "portab.h" + #include "variableblock.h" + #include "parameters.h" +@@ -296,6 +296,7 @@ createAdministrationInfo unsigned long Size; char * delimiterString; char delimiterChar; @@ -78,7 +87,7 @@ queryStringParameter( Delimiter, &delimiterString ); delimiterChar = delimiterString[ 0 ]; -@@ -305,23 +306,25 @@ +@@ -305,23 +306,25 @@ createAdministrationInfo countDelimiters( delimiterChar, baseFileBuffer, baseFileBufferLength ); baseFileBlocksLength++; /* add possible trailing comment */ Size = baseFileBlocksLength * sizeof( VariableBlock_t ); @@ -106,7 +115,7 @@ if( queryParameter( ForbiddenFile ) == TRUE ) { -@@ -329,12 +332,13 @@ +@@ -329,12 +332,13 @@ createAdministrationInfo delimiterChar, forbiddenFileBuffer, forbiddenFileBufferLength ); forbiddenFileBlocksLength++; /* add possible trailing comment */ Size = forbiddenFileBlocksLength * sizeof( VariableBlock_t ); @@ -121,7 +130,7 @@ } } -@@ -477,8 +481,8 @@ +@@ -477,8 +481,8 @@ getVariable getVBeginOfBlock( outputBuffer, &Line ); Line = Line + getVLength( outputBuffer ); LinePointer = Line; @@ -132,9 +141,29 @@ lineIndex++ ) { LinePointer++; /* concerns only the current line */ ---- SRC/services.c -+++ SRC/services.c 2005-09-02 12:44:00.000000000 +0200 -@@ -444,8 +444,9 @@ +@@ -1768,6 +1772,8 @@ writeOutput + } + listPointer++; + } ++ if(fflush( filePointer ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot flush stream"); ++ if(fdatasync ( fileno(filePointer) ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot sync stream"); + closeFile( filePointer ); + } + } +@@ -1830,7 +1836,9 @@ writeOutput + default: break; + } + listPointer++; +- } ++ } ++ if(fflush( filePointer ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot flush stream"); ++ if(fdatasync ( fileno(filePointer) ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot sync stream"); + closeFile( filePointer ); + } + } +--- SRC/services.c.orig ++++ SRC/services.c +@@ -444,8 +444,9 @@ readFileToBuffer if( 0 == fseek( filePointer, 0L, SEEK_SET ) ) { @@ -146,7 +175,7 @@ { returnValue = Success; } -@@ -558,23 +559,22 @@ +@@ -558,23 +559,22 @@ dumpBlock Service_t allocateBuffer ( @@ -174,3 +203,24 @@ returnValue = Success; } +--- SRC/metadata.c.orig ++++ SRC/metadata.c +@@ -17,7 +17,7 @@ + /*--------------------------------- IMPORTS ----------------------------------*/ + + #include <stdio.h> +- ++#include <unistd.h> + #include "variableblock.h" + #include "services.h" + #include "parser.h" +@@ -392,7 +392,8 @@ setMetadataInfo + logfile ); + fprintf( logfile, ">\n\n" ); + } +- ++ if(fflush( logfile ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot flush stream"); ++ if(fdatasync( fileno(logfile) ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot sync stream"); + closeFile( logfile ); + } + } ++++++ fillup-optflags.patch ++++++ --- /var/tmp/diff_new_pack.UX2KtZ/_old 2011-06-16 10:39:50.000000000 +0200 +++ /var/tmp/diff_new_pack.UX2KtZ/_new 2011-06-16 10:39:50.000000000 +0200 @@ -1,6 +1,15 @@ ---- fillup-1.42/SRC/Makefile -+++ fillup-1.42/SRC/Makefile -@@ -46,24 +46,23 @@ +--- SRC/Makefile.orig ++++ SRC/Makefile +@@ -37,7 +37,7 @@ ARCHIVE = ${PROJDIR}/ARCHIVE + WARNINGS = -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes + # WARNINGS = -Wunused -Wswitch -Wformat -Wreturn-type -Wimplicit -Wmissing-prototypes -Wmissing-declarations + +-DEFINES = ++DEFINES = -D_GNU_SOURCE + + # LINUX system + OPTISPLUS = +@@ -46,24 +46,23 @@ INC = -I/usr/include COMPILER = -DGCC=1 # Set OPTIS to the following values @@ -11,7 +20,7 @@ ifeq ($(COMPILE_OPTION),DEBUG) # compile for debugging - COMPILE = gcc -fsigned-char -DDEBUG -ansi -g -c ${WARNINGS} -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} -+ COMPILE = gcc -DDEBUG -ansi -g -c $(OPTIS) ${WARNINGS} -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} ++ COMPILE = gcc -DDEBUG -std=gnu99 -g -c $(OPTIS) ${WARNINGS} -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} LINK = gcc -g endif @@ -19,7 +28,7 @@ # compile with all optimizations - COMPILE = gcc -fsigned-char -ansi -c $(OPTIS) $(WARNINGS) -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} - LINK = gcc -O -s -+ COMPILE = gcc -ansi -c $(OPTIS) $(WARNINGS) -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} ++ COMPILE = gcc -std=gnu99 -c $(OPTIS) $(WARNINGS) -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} + LINK = gcc endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
