From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 17 Dec 2015 06:16:58 +0000 (+0100)
Subject: Remove string stat_version
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=03de35c0fe7c134458408dcb32c23bba8b1bb078

Remove string stat_version

This string contained a timestamp indicating when ./configure had
been run.  This makes for reproducibility issues and possibly
privacy issues too.
---

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 1a7b54f066..e6ebd251e1 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -122,8 +122,6 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 	$(AM_V_at)echo "#include \"version.h\"" >> $@,tmp
 	$(AM_V_at)echo "const char bare_version[] = \"$(VERSION)\";" >> $@,tmp
 	$(AM_V_at)echo "const char version[] = \"GNU $(PACKAGE) $(VERSION)\";" >> $@,tmp
-	$(AM_V_at)echo "const char stat_version[] = \"GNU $(PACKAGE) $(VERSION) \
-$(AM_V_at)(`LC_ALL=C TZ=UTC date`).\";" >> $@,tmp
 	$(AM_V_at)echo "const char host_system[] = \"$(host_triplet)\";" >> $@,tmp
 	$(AM_V_at)echo "const char build_system[] = \"$(build_triplet)\";" >> $@,tmp
 	$(AM_V_at)echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@,tmp
diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index 65432da652..0597588784 100644
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -396,7 +396,7 @@ request_bug_report (const char *msg)
   fprintf (stderr, "include the syntax file that triggered it and a sample\n");
   fprintf (stderr, "of any data file used for input.\n");
   fprintf (stderr, "proximate cause:     %s\n", msg);
-  fprintf (stderr, "version:             %s\n", stat_version);
+  fprintf (stderr, "version:             %s\n", version);
   fprintf (stderr, "host_system:         %s\n", host_system);
   fprintf (stderr, "build_system:        %s\n", build_system);
   fprintf (stderr, "locale_dir:          %s\n", locale_dir);
diff --git a/src/libpspp/version.h b/src/libpspp/version.h
index 4ce892f9a2..a89480e549 100644
--- a/src/libpspp/version.h
+++ b/src/libpspp/version.h
@@ -23,10 +23,6 @@ extern const char bare_version[];
 /* "GNU PSPP A.B.C" */
 extern const char version[];
 
-/* "GNU PSPP version A.B (date), Copyright (C) XXXX Free Software
-   Foundation, Inc." */
-extern const char stat_version[];
-
 /* Canonical name of host system type. */
 extern const char host_system[];
 
diff --git a/src/output/odt.c b/src/output/odt.c
index 8e94dd7ba6..521e5b877f 100644
--- a/src/output/odt.c
+++ b/src/output/odt.c
@@ -245,7 +245,7 @@ write_meta_data (struct odt_driver *odt)
   xmlTextWriterStartElement (w, _xml ("office:meta"));
   {
     xmlTextWriterStartElement (w, _xml ("meta:generator"));
-    xmlTextWriterWriteString (w, _xml (stat_version));
+    xmlTextWriterWriteString (w, _xml (version));
     xmlTextWriterEndElement (w);
   }
 
diff --git a/src/ui/terminal/terminal-reader.c b/src/ui/terminal/terminal-reader.c
index 0b47a3d3ed..87fca837f9 100644
--- a/src/ui/terminal/terminal-reader.c
+++ b/src/ui/terminal/terminal-reader.c
@@ -97,7 +97,7 @@ welcome (void)
 	 "it\nunder certain conditions; type \"show copying.\" to see the "
 	 "conditions.\nThere is ABSOLUTELY NO WARRANTY for PSPP; type \"show "
 	 "warranty.\" for details.\n", stdout);
-  puts (stat_version);
+  puts (version);
   journal_init ();
 }