pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/archivers/libarchive/files/libarchive



Module Name:    pkgsrc
Committed By:   sevan
Date:           Mon Oct  1 00:37:51 UTC 2018

Modified Files:
        pkgsrc/archivers/libarchive/files/libarchive:
            archive_openssl_hmac_private.h

Log Message:
Fix build with LibreSSL 2.7
https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h:1.1.1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h:1.1.1.2 Tue Aug  1 22:21:17 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h Mon Oct  1 00:37:51 2018
@@ -28,7 +28,8 @@
 #include <openssl/hmac.h>
 #include <openssl/opensslv.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+       (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 #include <stdlib.h> /* malloc, free */
 #include <string.h> /* memset */
 static inline HMAC_CTX *HMAC_CTX_new(void)



Home | Main Index | Thread Index | Old Index