[arch-commits] Commit in fastd/repos/community-x86_64 (4 files)

Baptiste Jonglez zorun at archlinux.org
Sun Oct 11 09:28:51 UTC 2020


    Date: Sunday, October 11, 2020 @ 09:28:50
  Author: zorun
Revision: 723453

archrelease: copy trunk to community-x86_64

Added:
  fastd/repos/community-x86_64/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch
    (from rev 723452, fastd/trunk/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch)
  fastd/repos/community-x86_64/PKGBUILD
    (from rev 723452, fastd/trunk/PKGBUILD)
Deleted:
  fastd/repos/community-x86_64/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch
  fastd/repos/community-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch |   72 ++++----
 PKGBUILD                                                        |   88 +++++-----
 2 files changed, 82 insertions(+), 78 deletions(-)

Deleted: 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch
===================================================================
--- 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch	2020-10-11 09:28:40 UTC (rev 723452)
+++ 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch	2020-10-11 09:28:50 UTC (rev 723453)
@@ -1,36 +0,0 @@
-From 8505374ee208d51a39e7b22846f9b781b9ccb452 Mon Sep 17 00:00:00 2001
-Message-Id: <8505374ee208d51a39e7b22846f9b781b9ccb452.1515434692.git.mschiffer at universe-factory.net>
-From: Matthias Schiffer <mschiffer at 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
-

Copied: fastd/repos/community-x86_64/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch (from rev 723452, fastd/trunk/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch)
===================================================================
--- 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch	                        (rev 0)
+++ 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch	2020-10-11 09:28:50 UTC (rev 723453)
@@ -0,0 +1,36 @@
+From 8505374ee208d51a39e7b22846f9b781b9ccb452 Mon Sep 17 00:00:00 2001
+Message-Id: <8505374ee208d51a39e7b22846f9b781b9ccb452.1515434692.git.mschiffer at universe-factory.net>
+From: Matthias Schiffer <mschiffer at 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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-11 09:28:40 UTC (rev 723452)
+++ PKGBUILD	2020-10-11 09:28:50 UTC (rev 723453)
@@ -1,42 +0,0 @@
-# Maintainer: Baptiste Jonglez <archlinux at bitsofnetworks dot org>
-# Contributor: NeoRaider
-
-pkgname=fastd
-arch=("x86_64")
-pkgver=19
-pkgrel=1
-pkgdesc="Fast and secure tunneling daemon"
-makedepends=('cmake')
-depends=('libcap' 'gcc-libs' 'libuecc>=6' 'libsodium' 'json-c' 'openssl')
-url="https://projects.universe-factory.net/projects/fastd"
-license=('BSD')
-source=("https://projects.universe-factory.net/attachments/download/86/${pkgname}-${pkgver}.tar.xz")
-sha512sums=('fc15c34214c41880449fe5f47c7577e31b61dda68eb8b3aa5a0b1ad2ab1922a3c4a92afa87a318ea30bb4579b8b0f6cee510312d895c16b3f5824bbc23523a3e')
-
-build() {
-  mkdir -p "$srcdir/build-${pkgver}"
-  cd "$srcdir/build-${pkgver}"
-  
-  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 ENABLE_OPENSSL=ON \
-    "../${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "$srcdir/build-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-  
-  install -dm755 "${pkgdir}/etc/fastd/"
-  
-  install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/examples/fastd at .service" "${pkgdir}/usr/lib/systemd/system/fastd at .service"
-  install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/fastd.1" "${pkgdir}/usr/share/man/man1/fastd.1"
-}

Copied: fastd/repos/community-x86_64/PKGBUILD (from rev 723452, fastd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-11 09:28:50 UTC (rev 723453)
@@ -0,0 +1,46 @@
+# Maintainer: Baptiste Jonglez <archlinux at bitsofnetworks dot org>
+# Contributor: NeoRaider
+
+pkgname=fastd
+arch=("x86_64")
+pkgver=20
+pkgrel=1
+pkgdesc="Fast and secure tunneling daemon"
+makedepends=('meson')
+checkdepends=('cmocka')
+depends=('libcap' 'gcc-libs' 'libuecc>=6' 'libsodium' 'json-c' 'openssl')
+url="https://projects.universe-factory.net/projects/fastd"
+license=('BSD')
+source=("https://projects.universe-factory.net/attachments/download/86/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('56cab8639218d63237d9a5508fb2bf6fa637374d53fb7fa55b7e92e4d4dfeb00')
+sha512sums=('8cb722a12fff9f6ee068f67c7a03c287c82b97d851e580070a9bc94fac3b33395203617309e8aaea1c91781a7245ec872442f8567d10dc6d1efac8de89c050b3')
+
+build() {
+  cd "$srcdir/fastd-${pkgver}"
+  meson setup               \
+    --prefix=/usr           \
+    -Dbuildtype=release     \
+    -Db_lto=true            \
+    -Dsystemd=enabled       \
+    -Dbuild_tests=true      \
+    . "$srcdir/build-${pkgver}"
+
+  cd "$srcdir/build-${pkgver}"
+  ninja
+}
+
+check() {
+  cd "$srcdir/build-${pkgver}"
+  ninja test
+}
+
+package() {
+  cd "$srcdir/build-${pkgver}"
+  DESTDIR="$pkgdir" ninja install
+  
+  install -dm755 "${pkgdir}/etc/fastd/"
+  
+  install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/examples/fastd at .service" "${pkgdir}/usr/lib/systemd/system/fastd at .service"
+  install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/fastd.1" "${pkgdir}/usr/share/man/man1/fastd.1"
+}


More information about the arch-commits mailing list