move override to patches so we still start with a clean slate with dist.shv3.1.3

2 files changed, 21 insertions, 1 deletions

diff --git a/patches/opensslv.h b/patches/opensslv.h
new file mode 100644
index 0000000..6303d4a
--- /dev/null
+++ b/patches/opensslv.h
@@ -0,0 +1,18 @@
+/* $OpenBSD: opensslv.h,v 1.57.4.1 2020/05/21 02:27:34 bcook Exp $ */
+#ifndef HEADER_OPENSSLV_H
+#define HEADER_OPENSSLV_H
+
+/* These will change with each release of LibreSSL-portable */
+#define LIBRESSL_VERSION_NUMBER 0x3010300fL
+/*                                    ^ Patch starts here   */
+#define LIBRESSL_VERSION_TEXT   "LibreSSL 3.1.3"
+
+/* These will never change */
+#define OPENSSL_VERSION_NUMBER  0x20000000L
+#define OPENSSL_VERSION_TEXT    LIBRESSL_VERSION_TEXT
+#define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
+
+#define SHLIB_VERSION_HISTORY ""
+#define SHLIB_VERSION_NUMBER "1.0.0"
+
+#endif /* HEADER_OPENSSLV_H */
diff --git a/update.sh b/update.sh
index a3cc27d..4c58569 100755
--- a/update.sh
+++ b/update.sh
@@ -138,7 +138,9 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
 copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
 
 # override upstream opensslv.h if a local version exists
-if [ ! -f include/openssl/opensslv.h ]; then
+if [ -f patches/opensslv.h ]; then
+        $CP patches/opensslv.h include/openssl
+else
         $CP $libcrypto_src/opensslv.h include/openssl
 fi