diff options
author | Matthias Schiffer | 2018-01-08 19:03:26 +0100 |
---|---|---|
committer | Matthias Schiffer | 2018-01-08 19:08:27 +0100 |
commit | a4a8531e5310a44789663185bdf7533794577be7 (patch) | |
tree | 01b54f4bad1719584b75ad3be3ecc24c21b2fe4a | |
parent | 11e739b5fbc0e189af084e93fd36b59b49359e5e (diff) | |
download | aur-a4a8531e5310a44789663185bdf7533794577be7.tar.gz |
fastd 18-3: fix build with new GCC, fix OpenSSL 1.1 compat
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch | 36 | ||||
-rw-r--r-- | PKGBUILD | 55 |
3 files changed, 77 insertions, 20 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Wed Oct 18 12:16:49 UTC 2017 pkgbase = fastd pkgdesc = Fast and secure tunneling daemon pkgver = 18 - pkgrel = 2 + pkgrel = 3 url = https://projects.universe-factory.net/projects/fastd arch = i686 arch = x86_64 @@ -18,7 +16,9 @@ pkgbase = fastd depends = json-c depends = openssl source = https://projects.universe-factory.net/attachments/download/86/fastd-18.tar.xz + source = 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch sha512sums = ec3a9f86bd539d7ffe751a81328f44671f0facca624e23ac273ac7e54da68de0dc0b50d1be490082bbb25f2896de0428802f74fc023f9acc986607875417bdae + sha512sums = 93c0e11a9d61effbd8a62e00e191e8a9bf29e39b7bb1ec2d40eb932403e679f94a106907a7dcbc89ca65e52ea3681b68961846079c179feb7ec65b261763b32e pkgname = fastd diff --git a/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch b/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch new file mode 100644 index 000000000000..d44761ae3c2f --- /dev/null +++ b/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch @@ -0,0 +1,36 @@ +From 8505374ee208d51a39e7b22846f9b781b9ccb452 Mon Sep 17 00:00:00 2001 +Message-Id: <8505374ee208d51a39e7b22846f9b781b9ccb452.1515434692.git.mschiffer@universe-factory.net> +From: Matthias Schiffer <mschiffer@universe-factory.net> +Date: Fri, 19 May 2017 19:36:24 +0200 +Subject: [PATCH] cipher: aes128-ctr: openssl: fix compatiblity with OpenSSL + 1.1 + +--- + src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c b/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c +index 7a2b565..c44427f 100644 +--- a/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c ++++ b/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c +@@ -47,7 +47,7 @@ static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) { + fastd_cipher_state_t *state = fastd_new(fastd_cipher_state_t); + + state->aes = EVP_CIPHER_CTX_new(); +- EVP_EncryptInit(state->aes, EVP_aes_128_ctr(), (const unsigned char *)key, NULL); ++ EVP_EncryptInit_ex(state->aes, EVP_aes_128_ctr(), NULL, (const unsigned char *)key, NULL); + + return state; + } +@@ -56,7 +56,7 @@ static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) { + static bool aes128_ctr_crypt(const fastd_cipher_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t len, const uint8_t *iv) { + int clen, clen2; + +- if (!EVP_EncryptInit(state->aes, NULL, NULL, iv)) ++ if (!EVP_EncryptInit_ex(state->aes, NULL, NULL, NULL, iv)) + return false; + + if (!EVP_EncryptUpdate(state->aes, (unsigned char *)out, &clen, (const unsigned char *)in, len)) +-- +2.15.1 + @@ -1,7 +1,7 @@ pkgname=fastd arch=(i686 x86_64) pkgver=18 -pkgrel=2 +pkgrel=3 pkgdesc="Fast and secure tunneling daemon" # Enabled for fast AES implementations @@ -14,27 +14,48 @@ depends=('libcap' 'gcc-libs' 'libuecc>=6' 'libsodium' 'json-c') url="https://projects.universe-factory.net/projects/fastd" license=('BSD') -source=("https://projects.universe-factory.net/attachments/download/86/${pkgname}-${pkgver}.tar.xz") -sha512sums=('ec3a9f86bd539d7ffe751a81328f44671f0facca624e23ac273ac7e54da68de0dc0b50d1be490082bbb25f2896de0428802f74fc023f9acc986607875417bdae') +source=( + "https://projects.universe-factory.net/attachments/download/86/${pkgname}-${pkgver}.tar.xz" + '0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch' +) +sha512sums=( + 'ec3a9f86bd539d7ffe751a81328f44671f0facca624e23ac273ac7e54da68de0dc0b50d1be490082bbb25f2896de0428802f74fc023f9acc986607875417bdae' + '93c0e11a9d61effbd8a62e00e191e8a9bf29e39b7bb1ec2d40eb932403e679f94a106907a7dcbc89ca65e52ea3681b68961846079c179feb7ec65b261763b32e' +) + + +prepare() { + cd "$srcdir/fastd-${pkgver}" + patch -p1 < "$srcdir/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch" +} build() { - mkdir -p "$srcdir/build-${pkgver}" - cd "$srcdir/build-${pkgver}" - - opts='' - [ $ENABLE_OPENSSL -eq 0 ] || opts="${opts} -D ENABLE_OPENSSL=ON" - - cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr -D ENABLE_SYSTEMD=ON -D ENABLE_LTO=ON -D WITH_CIPHER_AES128_CTR_NACL=OFF ${opts} "../${pkgname}-${pkgver}" - make + mkdir -p "$srcdir/build-${pkgver}" + cd "$srcdir/build-${pkgver}" + + opts='' + [ $ENABLE_OPENSSL -eq 0 ] || opts="${opts} -D ENABLE_OPENSSL=ON" + + cmake \ + -D CMAKE_BUILD_TYPE=RELEASE \ + -D CMAKE_AR=/usr/bin/gcc-ar \ + -D CMAKE_NM=/usr/bin/gcc-nm \ + -D CMAKE_RANLIB=/usr/bin/gcc-ranlib \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D ENABLE_SYSTEMD=ON \ + -D ENABLE_LTO=ON \ + -D WITH_CIPHER_AES128_CTR_NACL=OFF \ + ${opts} "../${pkgname}-${pkgver}" + make } package() { - cd "$srcdir/build-${pkgver}" - make install DESTDIR="${pkgdir}" + cd "$srcdir/build-${pkgver}" + make install DESTDIR="${pkgdir}" - install -dm755 "${pkgdir}/etc/fastd/" + install -dm755 "${pkgdir}/etc/fastd/" - install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" - install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/examples/fastd@.service" "${pkgdir}/usr/lib/systemd/system/fastd@.service" - install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/fastd.1" "${pkgdir}/usr/share/man/man1/fastd.1" + install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" + install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/examples/fastd@.service" "${pkgdir}/usr/lib/systemd/system/fastd@.service" + install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/fastd.1" "${pkgdir}/usr/share/man/man1/fastd.1" } |