aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2020-11-17 16:29:03 +0200
committerTimo Teräs <timo.teras@iki.fi>2020-11-17 16:29:03 +0200
commit5fdf78d9599d9cf6a39a384f81c0f2835000871f (patch)
tree41202e93960448e291d39c5623b4621e471ed7c0
parent77ebe2b83e9b8d65b5036aca862cd916d8c3926c (diff)
downloadaports-5fdf78d9599d9cf6a39a384f81c0f2835000871f.tar.gz
aports-5fdf78d9599d9cf6a39a384f81c0f2835000871f.tar.bz2
aports-5fdf78d9599d9cf6a39a384f81c0f2835000871f.tar.xz
main/opennhrp: fix gcc10 build
-rw-r--r--main/opennhrp/0008-fix-builds-with-gcc10.patch25
-rw-r--r--main/opennhrp/APKBUILD4
2 files changed, 28 insertions, 1 deletions
diff --git a/main/opennhrp/0008-fix-builds-with-gcc10.patch b/main/opennhrp/0008-fix-builds-with-gcc10.patch
new file mode 100644
index 0000000000..7d717fd365
--- /dev/null
+++ b/main/opennhrp/0008-fix-builds-with-gcc10.patch
@@ -0,0 +1,25 @@
+From 2e0ae487a84864263509284715222ff79c3e79f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Tue, 17 Nov 2020 16:23:45 +0200
+Subject: [PATCH] fix builds with gcc10
+
+---
+ nhrp/nhrp_peer.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nhrp/nhrp_peer.h b/nhrp/nhrp_peer.h
+index e0e77f6..1fef210 100644
+--- a/nhrp/nhrp_peer.h
++++ b/nhrp/nhrp_peer.h
+@@ -138,7 +138,7 @@ struct nhrp_peer_selector {
+ struct nhrp_address local_nbma_address;
+ };
+
+-const char * const nhrp_peer_type[NHRP_PEER_TYPE_MAX];
++extern const char * const nhrp_peer_type[NHRP_PEER_TYPE_MAX];
+ typedef int (*nhrp_peer_enumerator)(void *ctx, struct nhrp_peer *peer);
+
+ void nhrp_peer_cleanup(void);
+--
+2.29.2
+
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 75613f9a45..2e55785619 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=opennhrp
pkgver=0.14.1
-pkgrel=6
+pkgrel=7
pkgdesc="NBMA Next Hop Resolution Protocol daemon"
url="https://sourceforge.net/projects/opennhrp"
arch="all"
@@ -17,6 +17,7 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
0005-do-not-establish-shortcut-entry-if-cie-code-indicate.patch
0006-modify-packet-destination-only-for-registration-requ.patch
0007-fix-race-condition-to-stop-processing-dns-requests.patch
+ 0008-fix-builds-with-gcc10.patch
opennhrp-0.9.3-peer-up-bgp.patch
$pkgname.initd
@@ -58,6 +59,7 @@ sha512sums="dd0d5debf86d195256995406909c7406d4b60dcdd3a47fca95fd7053b1691e1863b4
46dc3a8bb2e919092388b20691adcf59f32f5d49b0b952c5187ada40f0ce9fa552e0f4334645a73002ef1970c18e1131c881af231a5956a5875cdc1111bdb259 0005-do-not-establish-shortcut-entry-if-cie-code-indicate.patch
a9c523c6c73c3376c3939bf04b873f1eba0d1f5855e2a979c6788a8ddabd2c9712539f8c8509174dc76b861036873384aef387fe08cfd22dcecece7098acc49d 0006-modify-packet-destination-only-for-registration-requ.patch
4c2e103bdf8c97fdfdbcea5b796dd72b2db3522b0e9eb3543a00fcb6a8b7dc38c8e0cd59baa9a0a474b1d5827c321e2733e5b5b6bd34e03903cfbdcd0ad76963 0007-fix-race-condition-to-stop-processing-dns-requests.patch
+14d5cd94ec597f583a2c00b6b08c9c750d703b10846fdf02e50fb7091e47da45ff021361bf00183d04a6da637c1178a1133b69b3368676ed91de2cf8b15935b7 0008-fix-builds-with-gcc10.patch
6ce107a2ad59331ab130108b49e80de5902d96002480f0465f7ad15b5146637a67982d2edaa392117a3f1820381b6b4a8985bef2a49364ce269c0bbc632d1739 opennhrp-0.9.3-peer-up-bgp.patch
97046d2ee2d9b5c2e91e6358807f797454d6daa129244d81a2e1e4afac739567d09425751e7d4a83922ce509a56d5d2f059117c408111fe8d7a2ef2543cba3f8 opennhrp.initd
c998a0ba198e187c72d09ed3ba2e12fbd30c5d998ed06da01394058741c28a534f1c7e9d692f931ff00dac76c7d4e19e911f7d2ad48deb94f0cef8bd706c4315 opennhrp.confd"