Author: pfg
Date: Sat Dec 24 02:08:28 2016
New Revision: 1775936
URL: http://svn.apache.org/viewvc?rev=1775936&view=rev
Log:
Avoid including some dates in executable files.
Embedding build dates and other environment specific information may
casue gratuitous difference in the resulting binaries, which makes more
difficult security verifications and binary updates.
We currently make no claims but this is the first step to generate
reproducible builds. For more information check:
https://reproducible-builds.org/
While here, since we have been so lazy about updating it, also add the svn
Revision keyword to configure.ac.
Modified:
openoffice/trunk/main/configure.ac (contents, props changed)
openoffice/trunk/main/solenv/src/version.c
openoffice/trunk/main/svtools/workben/cui/loadlib.cxx
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1775936&r1=1775935&r2=1775936&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Sat Dec 24 02:08:28 2016
@@ -18,7 +18,7 @@ dnl * specific language governing permi
dnl * under the License.
dnl *
dnl * *************************************************************
-AC_REVISION( $Revision: 1.290 $ )
+AC_REVISION( $Revision$ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
@@ -2823,7 +2823,7 @@ if test "z$with_build_version" != "z"; t
BUILD_VER_STRING=$with_build_version
AC_MSG_RESULT([yes, $BUILD_VER_STRING])
else
- BUILD_VER_STRING=`date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)"`
+ BUILD_VER_STRING=`Apache Software Foundation`
AC_MSG_RESULT([no])
fi
AC_SUBST(BUILD_VER_STRING)
Propchange: openoffice/trunk/main/configure.ac
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: openoffice/trunk/main/solenv/src/version.c
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/src/version.c?rev=1775936&r1=1775935&r2=1775936&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/src/version.c (original)
+++ openoffice/trunk/main/solenv/src/version.c Sat Dec 24 02:08:28 2016
@@ -28,22 +28,16 @@
struct VersionInfo
{
- const char* pTime;
- const char* pDate;
const char* pUpd;
const char* pMinor;
const char* pBuild;
- const char* pInpath;
};
static const struct VersionInfo g_aVersionInfo =
{
- __TIME__,
- __DATE__,
_UPD,
_LAST_MINOR,
_BUILD,
- _INPATH
};
#if defined(WNT) || defined(OS2)
@@ -65,8 +59,6 @@ const struct VersionInfo *GetVersionInfo
int main( int argc, char **argv )
{
const VersionInfo *pInfo = GetVersionInfo();
- fprintf( stderr, "Date : %s\n", pInfo->pDate);
- fprintf( stderr, "Time : %s\n", pInfo->pTime);
fprintf( stderr, "UPD : %s\n", pInfo->pUpd);
delete pInfo;
return 0;
Modified: openoffice/trunk/main/svtools/workben/cui/loadlib.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/workben/cui/loadlib.cxx?rev=1775936&r1=1775935&r2=1775936&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/workben/cui/loadlib.cxx (original)
+++ openoffice/trunk/main/svtools/workben/cui/loadlib.cxx Sat Dec 24 02:08:28
2016
@@ -37,12 +37,9 @@ using namespace rtl;
extern "C" {
struct VersionInfo
{
- const char* pTime;
- const char* pDate;
const char* pUpd;
const char* pMinor;
const char* pBuild;
- const char* pInpath;
};
typedef VersionInfo*(__LOADONCALLAPI *GetVersionInfo)(void);
@@ -67,12 +64,9 @@ int __LOADONCALLAPI main( int argc, char
}
if ( pInfo )
{
- fprintf( stdout, "Date : %s\n", pInfo->pDate );
- fprintf( stdout, "Time : %s\n", pInfo->pTime );
fprintf( stdout, "UPD : %s\n", pInfo->pUpd );
fprintf( stdout, "Minor : %s\n", pInfo->pMinor );
fprintf( stdout, "Build : %s\n", pInfo->pBuild );
- fprintf( stdout, "Inpath : %s\n", pInfo->pInpath );
}
else
fprintf( stderr, "VersionInfo not Found !\n" );
