diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-05-11 08:39:06 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-05-11 13:24:53 +0200 |
| commit | ac35a507fc57b996cfd1bf11821771db667ebb78 (patch) | |
| tree | 41b4c7a29163f0c5d573f980d697748e8d8e958e | |
| parent | 77b90997dd228b071603c9ade96a16610a6df222 (diff) | |
| download | curl-ac35a507fc57b996cfd1bf11821771db667ebb78.tar.gz | |
curl: show the libcurl release date in --version outputbagder/curl-version-date
... and support and additional "security patched" date for those who
enhance older versions that way. Pass on the define CURL_PATCHSTAMP with
a date for that.
Building with non-release headers shows the date as [unreleased].
Also: this changes the date format generated in the curlver.h file to be
"YYYY-MM-DD" (no name of the day or month, no time, no time zone) to
make it easier on the eye and easier to parse. Example (new) date
string: 2017-05-09
Suggested-by: Brian Childs
| -rw-r--r-- | include/curl/curlver.h | 6 | ||||
| -rwxr-xr-x | maketgz | 4 | ||||
| -rw-r--r-- | src/tool_help.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/include/curl/curlver.h b/include/curl/curlver.h index 5d3e160f0..227571cd3 100644 --- a/include/curl/curlver.h +++ b/include/curl/curlver.h @@ -64,11 +64,11 @@ * timestamp is not stored in git, as the timestamp is properly set in the * tarballs by the maketgz script. * - * The format of the date should follow this template: + * The format of the date follows this template: * - * "Mon Feb 12 11:35:33 UTC 2007" + * "2007-11-23" */ -#define LIBCURL_TIMESTAMP "DEV" +#define LIBCURL_TIMESTAMP "[unreleased]" #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z) #define CURL_AT_LEAST_VERSION(x,y,z) \ @@ -67,8 +67,8 @@ if test -z "$only"; then PLIST="$PLIST$ext" fi -# requires a date command that knows -u for UTC time zone -datestamp=`LC_TIME=C date -u` +# requires a date command that knows + for format +datestamp=`date +"%F"` # Replace version number in header file: sed -i -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION "'$libversion'"/g' \ diff --git a/src/tool_help.c b/src/tool_help.c index 668499cca..46aae4527 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -516,6 +516,12 @@ void tool_version_info(void) const char *const *proto; printf(CURL_ID "%s\n", curl_version()); +#ifdef CURL_PATCHSTAMP + printf("Release-Date: %s, security patched: %s\n", + LIBCURL_TIMESTAMP, CURL_PATCHSTAMP); +#else + printf("Release-Date: %s\n", LIBCURL_TIMESTAMP); +#endif if(curlinfo->protocols) { printf("Protocols: "); for(proto = curlinfo->protocols; *proto; ++proto) { |