From cc78dd0b502b4e4b6ab5f726c3bd4089c714b649d03270204e6d120c7fe6a2be Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 26 Dec 2009 11:19:29 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/fillup revision 7.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=32f0ab70b84c787744a0efa30ecf4a72 --- fillup-nodate.patch | 23 +++++++++++++++++++++++ fillup.changes | 5 +++++ fillup.spec | 4 +++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 fillup-nodate.patch diff --git a/fillup-nodate.patch b/fillup-nodate.patch new file mode 100644 index 0000000..c642b88 --- /dev/null +++ b/fillup-nodate.patch @@ -0,0 +1,23 @@ +Index: SRC/services.c +=================================================================== +--- SRC/services.c.orig ++++ SRC/services.c +@@ -263,11 +263,15 @@ displayVersion + ) + { + static const char *versionString = +- "This is fillup, version %1.2f, compiled on %s\n\n"; ++ "This is fillup, version %1.2f\n\n"; + +- if( ( int )( strlen( versionString ) + strlen( __DATE__ ) - 3 ) != +- fprintf( stderr, versionString, VERSION, __DATE__ ) ) ++ if( ( int )( strlen( versionString ) - 1 ) != ++ fprintf( stderr, versionString, VERSION ) ) + { ++int res= fprintf( stderr, versionString, VERSION ); ++ ++fprintf (stderr,"strlen: %d, res: %d\n", strlen( versionString ), res); ++ + fillup_exception( __FILE__, __LINE__, ServiceException, + "displayVersion" ); + exitOnFailure( ); diff --git a/fillup.changes b/fillup.changes index b0e329a..5acae16 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 13 13:17:06 UTC 2009 - aj@suse.de + +- Do not compile in date into binary to create reproduceable binaries. + ------------------------------------------------------------------- Sun Dec 13 01:25:18 CET 2009 - jengelh@medozas.de diff --git a/fillup.spec b/fillup.spec index 2bb8013..a6c816c 100644 --- a/fillup.spec +++ b/fillup.spec @@ -24,13 +24,14 @@ Group: System/Base Provides: aaa_base:/bin/fillup AutoReqProv: on Version: 1.42 -Release: 244 +Release: 245 Summary: Tool for Merging Config Files Source: fillup-%{version}.tar.bz2 Patch: fillup-optflags.patch Patch1: fillup-warnings.dif Patch2: fillup-%{version}.dif Patch3: fillup-retval.dif +Patch4: fillup-nodate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. @@ -52,6 +53,7 @@ Authors: %patch1 -p1 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %build #