From 9ccebbf79be1958741f1905c6bf3e2a0400bcc92 Mon Sep 17 00:00:00 2001
From: TBK <tbk@jjtc.eu>
Date: Wed, 16 Dec 2020 20:00:20 +0100
Subject: [PATCH] community/fwknop: fix for -fno-common
---
community/fwknop/APKBUILD | 13 ++++++++-----
community/fwknop/gcc10.patch | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 5 deletions(-)
create mode 100644 community/fwknop/gcc10.patch
diff --git a/community/fwknop/APKBUILD b/community/fwknop/APKBUILD
index 972227214b40..f86afed8bbe3 100644
--- a/community/fwknop/APKBUILD
+++ b/community/fwknop/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=fwknop
pkgver=2.6.10
-pkgrel=0
-pkgdesc="A Single Packet Authorization (SPA) implementation"
+pkgrel=1
+pkgdesc="Single Packet Authorization (SPA) implementation"
url="http://www.cipherdyne.org/fwknop/"
arch="all"
license="GPL-2.0-or-later"
@@ -10,7 +10,9 @@ depends="iptables"
makedepends="libpcap-dev gpgme-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc $pkgname-server"
source="http://cipherdyne.org/fwknop/download/fwknop-$pkgver.tar.gz
- fwknopd.initd"
+ fwknopd.initd
+ gcc10.patch
+ "
build() {
./configure \
@@ -41,11 +43,12 @@ package() {
}
server() {
- pkgdesc="A Single Packet Authorization (SPA) server"
+ pkgdesc="Single Packet Authorization (SPA) server"
mkdir -p "$subpkgdir"/usr
mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/ \
&& mv "$pkgdir"/etc "$subpkgdir"/
}
sha512sums="3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80 fwknop-2.6.10.tar.gz
-e3558c4a1579ea66b19451acc476f3cfec782b052f6d96a57ffc520169db755739e2bf3a815802cc5958a7b2fdeb9b39cf2182e5d89882cf4502985401352465 fwknopd.initd"
+e3558c4a1579ea66b19451acc476f3cfec782b052f6d96a57ffc520169db755739e2bf3a815802cc5958a7b2fdeb9b39cf2182e5d89882cf4502985401352465 fwknopd.initd
+e045c0936ea03e0f472e3bee7911c01e6ec16b51231f572ec943e1bff5a7e8e5d57739c040affe4d77f6b463d29e52bbe035e9f84a1e03c9a1de9b4c50b27e21 gcc10.patch"
diff --git a/community/fwknop/gcc10.patch b/community/fwknop/gcc10.patch
new file mode 100644
index 000000000000..fee4105ff8a4
--- /dev/null
+++ b/community/fwknop/gcc10.patch
@@ -0,0 +1,22 @@
+From a8214fd58bc46d23b64b3a55db023c7f5a5ea6af Mon Sep 17 00:00:00 2001
+From: Francois Marier <francois@debian.org>
+Date: Fri, 24 Jul 2020 21:22:47 -0700
+Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305)
+
+---
+ client/log_msg.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/log_msg.h b/client/log_msg.h
+index cc17716b..3dda1614 100644
+--- a/client/log_msg.h
++++ b/client/log_msg.h
+@@ -38,7 +38,7 @@ enum
+ LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */
+ LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */
+ LOG_LAST_VERBOSITY
+-} log_level_t;
++};
+
+ #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */
+
--
GitLab