testing/fastd: fix segfault and modernize

2 files changed, 59 insertions, 23 deletions

diff --git a/testing/fastd/APKBUILD b/testing/fastd/APKBUILD
index dac2e79bf0..80db1445a0 100644
--- a/testing/fastd/APKBUILD
+++ b/testing/fastd/APKBUILD
@@ -2,38 +2,38 @@
 # Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
 pkgname=fastd
 pkgver=18
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast and Secure Tunneling Daemon"
-url="https://projects.universe-factory.net/projects/fastd"
+url="https://github.com/NeoRaider/fastd/"
 arch="all"
-license="BSD"
-depends=""
-depends_dev=""
+license="BSD-2-Clause AND BSD-3-Clause"
 makedepends="$depends_dev cmake doxygen bison bsd-compat-headers
         linux-headers libsodium-dev libcap-dev libuecc-dev json-c-dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://git.universe-factory.net/${pkgname}/snapshot/${pkgname}-${pkgver}.tar
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://git.universe-factory.net/fastd/snapshot/fastd-$pkgver.tar
+        fix-segfault-with-musl.patch
         fastd.conf
         fastd.initd"
 
-builddir="$srcdir/${pkgname}-${pkgver}"
 build() {
-        mkdir "$builddir"/build && cd "$builddir"/build
-        cmake \
-                -D CMAKE_AR=/usr/bin/ar \
-                -D CMAKE_RANLIB=/usr/bin/ranlib \
-                -D CMAKE_NM=/usr/bin/nm \
-                -D CMAKE_INSTALL_PREFIX=/usr \
-                -D ENABLE_SYSTEMD=OFF \
-                -D WITH_CIPHER_AES128_CTR_NACL=OFF \
-                ..
-        make || return 1
+        cmake -B build \
+                -DCMAKE_BUILD_TYPE=None \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DCMAKE_C_FLAGS="$CFLAGS" \
+                -DENABLE_SYSTEMD=OFF \
+                -DWITH_CIPHER_AES128_CTR_NACL=OFF \
+                .
+        make -C build
+}
+
+check() {
+        # no testsuite
+        ./build/src/fastd --version
+        ./build/src/fastd --verify-config
 }
 
 package() {
-        cd "$builddir"
-        make -C build install DESTDIR="$pkgdir" || return 1
+        make -C build install DESTDIR="$pkgdir"
 
         install -Dm644 COPYRIGHT \
                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
@@ -42,11 +42,12 @@ package() {
 
         install -dm700 "$pkgdir"/etc/fastd/peers/
         install -Dm600 "$srcdir"/fastd.conf \
-                "$pkgdir"/etc/fastd/fastd.conf || return 1
+                "$pkgdir"/etc/fastd/fastd.conf
         install -Dm755 "$srcdir"/fastd.initd \
-                "$pkgdir"/etc/init.d/fastd || return 1
+                "$pkgdir"/etc/init.d/fastd
 }
 
 sha512sums="b732e8c083a5a35b7995f511673a3637d1f2b4893824867338dbeb06a73d8b7fd5658a7e459d1f44f1f247f06850c7720e2674c5a78a6b188334b35be352b2d0  fastd-18.tar
+4bb4fdf422f53562db5017f8c49ba3f95bde97a5afe8d94c8530848c054cdab05850f6a20498641a6adb1f023cd9c66a6a1a7ee183fd24898088d4cb3e8a5810  fix-segfault-with-musl.patch
 3e6c3a77f93a1e670e8f018833c499e8ec57b8240a6f472da03254ad9a7e6fed2c3459fa47b06c97e42afcfe6f0adfaaec39bce6b6a286a1ce7ef3585853b118  fastd.conf
 e64b0c548cf063624ac0b632bac672c5f204586aa03aa9b06afc46f48645f1458e2400e98ee993c74aa5da3a9e86c4151e2e29c634ee59941cd81a216cea308a  fastd.initd"
diff --git a/testing/fastd/fix-segfault-with-musl.patch b/testing/fastd/fix-segfault-with-musl.patch
new file mode 100644
index 0000000000..fc822a1a8b
--- /dev/null
+++ b/testing/fastd/fix-segfault-with-musl.patch
@@ -0,0 +1,35 @@
+From 7d9f90ebe9dd3a7f6af1fbb97d8cc228fb0fded4 Mon Sep 17 00:00:00 2001
+From: David Bauer <mail@david-bauer.net>
+Date: Thu, 25 Jul 2019 18:51:25 +0200
+Subject: resolve: fix segmentation fault with musl >1.1.20
+
+When compiled with musl >1.1.20, fastd will crash in case it can't
+resolve a peers hostname. This is due to a changed implementation of
+freeaddrinfo in musl 1.1.21 onwards.
+
+This segfault is fixed by not calling freeaddrinfo in case the supplied
+pointer is null.
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+---
+ src/resolve.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/resolve.c b/src/resolve.c
+index 9bdfa1c..bfd2a59 100644
+--- a/src/resolve.c
++++ b/src/resolve.c
+@@ -104,7 +104,9 @@ static void * resolve_peer(void *varg) {
+ 
+        fastd_async_enqueue(ASYNC_TYPE_RESOLVE_RETURN, ret, sizeof(fastd_async_resolve_return_t) + n_addr*sizeof(fastd_peer_address_t));
+ 
+-       freeaddrinfo(res);
++       if (res)
++               freeaddrinfo(res);
++
+        free(arg->hostname);
+        free(arg);
+ 
+-- 
+cgit v1.2.1
+