git-crypt: update to 0.8.0
This commit is contained in:
parent
7114c32680
commit
d7c031adbe
@ -1,26 +1,22 @@
|
||||
# Maintainer: Ladislav Laska <krakonos@krakonos.org>
|
||||
|
||||
pkgname="git-crypt"
|
||||
pkgver=0.7.0
|
||||
pkgrel=4
|
||||
pkgver=0.8.0
|
||||
pkgrel=1
|
||||
pkgdesc="Transparent file encryption in git"
|
||||
arch=("i686" "x86_64")
|
||||
url="https://www.agwa.name/projects/git-crypt/"
|
||||
msys2_changelog_url='https://www.agwa.name/git/git-crypt.git/raw/master/NEWS.md'
|
||||
msys2_references=(
|
||||
'archlinux: git-crypt'
|
||||
'gentoo: dev-vcs/git-crypt'
|
||||
)
|
||||
license=("spdx:GPL-3.0-or-later")
|
||||
source=("https://www.agwa.name/projects/git-crypt/downloads/${pkgname}-${pkgver}.tar.gz"
|
||||
"openssl-3.0.patch")
|
||||
sha256sums=('50f100816a636a682404703b6c23a459e4d30248b2886a5cf571b0d52527c7d8'
|
||||
'b8dc43540bfd80993359890a6064ef51a932d9e677b3cd62527c6cff4bdfc1f4')
|
||||
source=("https://www.agwa.name/projects/git-crypt/downloads/${pkgname}-${pkgver}.tar.gz")
|
||||
sha256sums=('540d424f87bed7994a4551a8c24b16e50d3248a5b7c3fd8ceffe94bfd4af0ad9')
|
||||
makedepends=("openssl-devel" "make" "gcc")
|
||||
depends=("gnupg" "git" "zlib" "openssl" "gcc-libs")
|
||||
|
||||
prepare() {
|
||||
cd "$pkgname-$pkgver"
|
||||
|
||||
# from https://github.com/archlinux/svntogit-community/tree/c2618a7eb44a46636a78bdb85c6eabda956543cd/trunk
|
||||
patch -Np1 -i "${srcdir}"/openssl-3.0.patch
|
||||
}
|
||||
|
||||
build () {
|
||||
cd "$pkgname-$pkgver"
|
||||
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
From c1cdc4097a90d3314bb287d51ff83c98d86a677c Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 14 May 2022 00:03:51 +0200
|
||||
Subject: [PATCH] fix build with libressl >= 3.5.0
|
||||
|
||||
Fix the following build failure with libressl >= 3.5.0:
|
||||
|
||||
crypto-openssl-10.cpp:78:18: error: field 'ctx' has incomplete type 'HMAC_CTX' {aka 'hmac_ctx_st'}
|
||||
78 | HMAC_CTX ctx;
|
||||
| ^~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/98747d470c2ad59280934e160d24bd3fdad1503c
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
crypto-openssl-10.cpp | 5 ++---
|
||||
crypto-openssl-11.cpp | 5 ++---
|
||||
2 files changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/crypto-openssl-10.cpp b/crypto-openssl-10.cpp
|
||||
index f0f2c53..1623690 100644
|
||||
--- a/crypto-openssl-10.cpp
|
||||
+++ b/crypto-openssl-10.cpp
|
||||
@@ -28,16 +28,15 @@
|
||||
* as that of the covered work.
|
||||
*/
|
||||
|
||||
-#include <openssl/opensslconf.h>
|
||||
+#include <openssl/hmac.h>
|
||||
|
||||
-#if !defined(OPENSSL_API_COMPAT)
|
||||
+#if defined(HMAC_cleanup)
|
||||
|
||||
#include "crypto.hpp"
|
||||
#include "key.hpp"
|
||||
#include "util.hpp"
|
||||
#include <openssl/aes.h>
|
||||
#include <openssl/sha.h>
|
||||
-#include <openssl/hmac.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/rand.h>
|
||||
#include <openssl/err.h>
|
||||
diff --git a/crypto-openssl-11.cpp b/crypto-openssl-11.cpp
|
||||
index adf03bb..518b90c 100644
|
||||
--- a/crypto-openssl-11.cpp
|
||||
+++ b/crypto-openssl-11.cpp
|
||||
@@ -28,16 +28,15 @@
|
||||
* as that of the covered work.
|
||||
*/
|
||||
|
||||
-#include <openssl/opensslconf.h>
|
||||
+#include <openssl/hmac.h>
|
||||
|
||||
-#if defined(OPENSSL_API_COMPAT)
|
||||
+#if !defined(HMAC_cleanup)
|
||||
|
||||
#include "crypto.hpp"
|
||||
#include "key.hpp"
|
||||
#include "util.hpp"
|
||||
#include <openssl/aes.h>
|
||||
#include <openssl/sha.h>
|
||||
-#include <openssl/hmac.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/rand.h>
|
||||
#include <openssl/err.h>
|
||||
Loading…
x
Reference in New Issue
Block a user