patch-libressl 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. --- files/patch-libarchive-archive_openssl_evp_private.h (revision 465490)
  2. +++ files/patch-libarchive-archive_openssl_evp_private.h (working copy)
  3. @@ -1,11 +1,12 @@
  4. ---- libarchive/archive_openssl_evp_private.h.orig Sun Jan 29 06:06:27 2017
  5. -+++ libarchive/archive_openssl_evp_private.h Fri Mar 10 12:53:43 2017
  6. -@@ -28,7 +28,7 @@
  7. +--- libarchive/archive_openssl_evp_private.h.orig 2017-01-29 05:06:27 UTC
  8. ++++ libarchive/archive_openssl_evp_private.h
  9. +@@ -28,7 +28,8 @@
  10. #include <openssl/evp.h>
  11. #include <openssl/opensslv.h>
  12. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  13. -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  14. ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  15. ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
  16. #include <stdlib.h> /* malloc, free */
  17. #include <string.h> /* memset */
  18. static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
  19. Index: files/patch-libarchive_archive__openssl__hmac__private.h
  20. ===================================================================
  21. --- files/patch-libarchive_archive__openssl__hmac__private.h (nonexistent)
  22. +++ files/patch-libarchive_archive__openssl__hmac__private.h (working copy)
  23. @@ -0,0 +1,12 @@
  24. +--- libarchive/archive_openssl_hmac_private.h.orig 2018-03-22 20:47:12 UTC
  25. ++++ libarchive/archive_openssl_hmac_private.h
  26. +@@ -28,7 +28,8 @@
  27. + #include <openssl/hmac.h>
  28. + #include <openssl/opensslv.h>
  29. +
  30. +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  31. ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  32. ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
  33. + #include <stdlib.h> /* malloc, free */
  34. + #include <string.h> /* memset */
  35. + static inline HMAC_CTX *HMAC_CTX_new(void)
  36. Property changes on: files/patch-libarchive_archive__openssl__hmac__private.h
  37. ___________________________________________________________________
  38. Added: fbsd:nokeywords
  39. ## -0,0 +1 ##
  40. +yes
  41. \ No newline at end of property
  42. Added: svn:eol-style
  43. ## -0,0 +1 ##
  44. +native
  45. \ No newline at end of property
  46. Added: svn:mime-type
  47. ## -0,0 +1 ##
  48. +text/plain
  49. \ No newline at end of property