From 4beb1ca01a8b1184835604a370cebf3d6f3a4eec Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 20 Sep 2020 16:18:12 -0700 Subject: [PATCH] owfs: update to 3.2p4 Signed-off-by: Rosen Penev --- utils/owfs/Makefile | 6 ++--- utils/owfs/patches/010-gcc10.patch | 38 ------------------------------ 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 utils/owfs/patches/010-gcc10.patch diff --git a/utils/owfs/Makefile b/utils/owfs/Makefile index e4f33e2145..0cb620e8a4 100644 --- a/utils/owfs/Makefile +++ b/utils/owfs/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=owfs -PKG_VERSION:=3.2p3 -PKG_RELEASE:=3 +PKG_VERSION:=3.2p4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/owfs/owfs/releases/download/v$(PKG_VERSION) -PKG_HASH:=b8d33eba57d4a2f6c8a11ff23f233e3248bd75a42c8219b058a888846edd8717 +PKG_HASH:=af0a5035f3f3df876ca15aea13486bfed6b3ef5409dee016db0be67755c35fcc PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 diff --git a/utils/owfs/patches/010-gcc10.patch b/utils/owfs/patches/010-gcc10.patch deleted file mode 100644 index 307f3a1d52..0000000000 --- a/utils/owfs/patches/010-gcc10.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 43a4bc6b750c37f585d03b14941f3633ed5348d8 Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" -Date: Tue, 9 Jun 2020 11:30:38 +0300 -Subject: [PATCH] Fix compilation with GCC10 - -Fixed compilation with -fno-common, which enabled in GCC 10 by default. -See https://bugs.gentoo.org/707438. ---- - module/owserver/src/c/owserver.c | 2 ++ - module/owserver/src/include/owserver.h | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/module/owserver/src/c/owserver.c b/module/owserver/src/c/owserver.c -index db29988e..2ed29161 100644 ---- a/module/owserver/src/c/owserver.c -+++ b/module/owserver/src/c/owserver.c -@@ -36,6 +36,8 @@ - - #include "owserver.h" - -+pthread_mutex_t persistence_mutex ; -+ - /* --- Prototypes ------------ */ - static void SetupAntiloop(int argc, char **argv); - -diff --git a/module/owserver/src/include/owserver.h b/module/owserver/src/include/owserver.h -index 8be582f0..a257ed02 100644 ---- a/module/owserver/src/include/owserver.h -+++ b/module/owserver/src/include/owserver.h -@@ -18,7 +18,7 @@ - #include "ow.h" - #include "ow_connection.h" - --pthread_mutex_t persistence_mutex ; -+extern pthread_mutex_t persistence_mutex ; - #define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; - #define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; -