From 1e3051c5ad1748ec119a856cb6856b3bc1cb3fc8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 28 Mar 2020 17:00:32 -0700 Subject: [PATCH] softflowd: fix compilation with newer musl __uid_t is a glibc extension. Switch to standard uid_t. Signed-off-by: Rosen Penev --- net/softflowd/Makefile | 2 +- net/softflowd/patches/020-uid.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 net/softflowd/patches/020-uid.patch diff --git a/net/softflowd/Makefile b/net/softflowd/Makefile index cf379ce708..3e966e4956 100644 --- a/net/softflowd/Makefile +++ b/net/softflowd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=softflowd PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/irino/softflowd/tar.gz/softflowd-$(PKG_VERSION)? diff --git a/net/softflowd/patches/020-uid.patch b/net/softflowd/patches/020-uid.patch new file mode 100644 index 0000000000..fe2ea7c1ec --- /dev/null +++ b/net/softflowd/patches/020-uid.patch @@ -0,0 +1,11 @@ +--- a/common.h ++++ b/common.h +@@ -179,7 +179,7 @@ struct ip6_ext { + + /* following lines are copy from unistd.h in Linux for avoidance warnings in compilation */ + #if defined(HAVE_SETRESGID) && !defined(_GNU_SOURCE) +-extern int setresgid (__uid_t __ruid, __uid_t __euid, __uid_t __suid); ++extern int setresgid (uid_t __ruid, uid_t __euid, uid_t __suid); + #endif + #if defined(HAVE_SETRESUID) && !defined(_GNU_SOURCE) + extern int setresuid (__uid_t __ruid, __uid_t __euid, __uid_t __suid); -- 2.30.2