Re: Bump LIBRESSL_VERSION defines

2015-07-16 Thread Bob Beck
ok beck@

after much discusison :)

On Thu, Jul 16, 2015 at 4:08 PM, Brent Cook  wrote:
> Up to now, we have only bumped the LIBRESSL_VERSION_TEXT for each
> portable release in the portable tree, and the VERSION_NUMBER has never
> incremented.
>
> This change establishes a policy of bumping the number for each portable
> release, and syncs the version string between the portable and in-tree
> releases. This is the simplest way to allow software not using
> auto-configuration mechanisms to determine what LibreSSL version is in
> use without breaking backward compatibility.
>
> Index: src/crypto/opensslv.h
> ===
> RCS file: /cvs/src/lib/libssl/src/crypto/opensslv.h,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 opensslv.h
> --- src/crypto/opensslv.h   23 May 2015 21:09:46 -  1.29
> +++ src/crypto/opensslv.h   16 Jul 2015 22:00:18 -
> @@ -2,9 +2,13 @@
>  #ifndef HEADER_OPENSSLV_H
>  #define HEADER_OPENSSLV_H
>
> -#define LIBRESSL_VERSION_NUMBER0x2000L
> +/* These will change with each release of LibreSSL-portable */
> +#define LIBRESSL_VERSION_NUMBER0x20020002L
> +#define LIBRESSL_VERSION_TEXT  "LibreSSL 2.2.2"
> +
> +/* These will never change */
>  #define OPENSSL_VERSION_NUMBER 0x2000L
> -#define OPENSSL_VERSION_TEXT   "LibreSSL 2.2"
> +#define OPENSSL_VERSION_TEXT   LIBRESSL_VERSION_TEXT
>  #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT
>
>  #define SHLIB_VERSION_HISTORY ""
>



Bump LIBRESSL_VERSION defines

2015-07-16 Thread Brent Cook
Up to now, we have only bumped the LIBRESSL_VERSION_TEXT for each
portable release in the portable tree, and the VERSION_NUMBER has never
incremented.

This change establishes a policy of bumping the number for each portable
release, and syncs the version string between the portable and in-tree
releases. This is the simplest way to allow software not using
auto-configuration mechanisms to determine what LibreSSL version is in
use without breaking backward compatibility.

Index: src/crypto/opensslv.h
===
RCS file: /cvs/src/lib/libssl/src/crypto/opensslv.h,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 opensslv.h
--- src/crypto/opensslv.h   23 May 2015 21:09:46 -  1.29
+++ src/crypto/opensslv.h   16 Jul 2015 22:00:18 -
@@ -2,9 +2,13 @@
 #ifndef HEADER_OPENSSLV_H
 #define HEADER_OPENSSLV_H

-#define LIBRESSL_VERSION_NUMBER0x2000L
+/* These will change with each release of LibreSSL-portable */
+#define LIBRESSL_VERSION_NUMBER0x20020002L
+#define LIBRESSL_VERSION_TEXT  "LibreSSL 2.2.2"
+
+/* These will never change */
 #define OPENSSL_VERSION_NUMBER 0x2000L
-#define OPENSSL_VERSION_TEXT   "LibreSSL 2.2"
+#define OPENSSL_VERSION_TEXT   LIBRESSL_VERSION_TEXT
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT

 #define SHLIB_VERSION_HISTORY ""