netatalk: fix compilation with GCC10 12696/head
authorRosen Penev <rosenp@gmail.com>
Thu, 2 Jul 2020 00:00:37 +0000 (17:00 -0700)
committerRosen Penev <rosenp@gmail.com>
Thu, 2 Jul 2020 18:47:58 +0000 (11:47 -0700)
Upstream patch: https://github.com/Netatalk/Netatalk/pull/125

Signed-off-by: Rosen Penev <rosenp@gmail.com>
net/netatalk/Makefile
net/netatalk/patches/010-gcc10.patch [new file with mode: 0644]

index d34b5f895f81f2f95fd64a8acc1c4e15d998a6b8..af798611b018d0c10227c38e43ded275bb8c7816 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netatalk
 PKG_VERSION:=3.1.12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/netatalk
diff --git a/net/netatalk/patches/010-gcc10.patch b/net/netatalk/patches/010-gcc10.patch
new file mode 100644 (file)
index 0000000..8652b68
--- /dev/null
@@ -0,0 +1,22 @@
+From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001
+From: Andrew Bauer <zonexpertconsulting@outlook.com>
+Date: Wed, 22 Jan 2020 09:59:47 -0600
+Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries
+
+---
+ etc/afpd/directory.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
+index eb89c606..81bfa9cb 100644
+--- a/etc/afpd/directory.h
++++ b/etc/afpd/directory.h
+@@ -91,7 +91,7 @@ struct maccess {
+ #define       AR_UWRITE       (1<<2)
+ #define       AR_UOWN         (1<<7)
+-q_t *invalid_dircache_entries;
++extern q_t *invalid_dircache_entries;
+ typedef int (*dir_loop)(struct dirent *, char *, void *);