diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | gcc10.patch | 66 |
3 files changed, 5 insertions, 77 deletions
@@ -1,6 +1,6 @@ pkgbase = owfs pkgdesc = An easy way to use the powerful 1-wire system of Dallas/Maxim. - pkgver = 3.2p3 + pkgver = 3.2p4 pkgrel = 1 url = http://www.owfs.org/ arch = i686 @@ -10,16 +10,13 @@ pkgbase = owfs depends = avahi depends = fuse depends = perl - source = https://github.com/owfs/owfs/releases/download/v3.2p3/owfs-3.2p3.tar.gz - source = gcc10.patch + source = https://github.com/owfs/owfs/releases/download/v3.2p4/owfs-3.2p4.tar.gz source = systemd_journal.patch source = sysmacros.patch source = owfs.conf - sha1sums = c7c7ee31062f15ff7ed40f8acde1b7bb92d185ec - sha1sums = ffa508b864ad69caf0bddad869844e286cd42844 + sha1sums = 972ec907dc2d6db238288fb5de730e9b78790955 sha1sums = ff13b0a3d56206e32cf0307042351298e3f27d2d sha1sums = 98d66d560509e1be20e4ad3cb812d934ed1e3bbe sha1sums = 99a72935a8d2bdcd79a745983cda85fd5d3035f4 pkgname = owfs - @@ -1,21 +1,19 @@ # Maintainer: Spyros Stathopoulos <spystath@gmail.com> pkgname=owfs -pkgver=3.2p3 +pkgver=3.2p4 pkgrel=1 pkgdesc="An easy way to use the powerful 1-wire system of Dallas/Maxim." arch=('i686' 'x86_64') url="http://www.owfs.org/" license=('GPL') source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz" - "gcc10.patch" "systemd_journal.patch" "sysmacros.patch" "owfs.conf") depends=('avahi' 'fuse' 'perl') makedepends=('swig') -sha1sums=('c7c7ee31062f15ff7ed40f8acde1b7bb92d185ec' - 'ffa508b864ad69caf0bddad869844e286cd42844' +sha1sums=('972ec907dc2d6db238288fb5de730e9b78790955' 'ff13b0a3d56206e32cf0307042351298e3f27d2d' '98d66d560509e1be20e4ad3cb812d934ed1e3bbe' '99a72935a8d2bdcd79a745983cda85fd5d3035f4') @@ -24,7 +22,6 @@ prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's|<libusb.h>|<libusb-1.0/libusb.h>|' "module/owlib/src/include/ow.h" patch -p1 < "../systemd_journal.patch" - patch -p1 < "../gcc10.patch" patch -p1 < "../sysmacros.patch" } diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index 52aedb8bcf7a..000000000000 --- a/gcc10.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 95f3676aaad77c3a2c19eec5db73b42d3762b53a Mon Sep 17 00:00:00 2001 -From: Tomasz Torcz <tomek@pipebreaker.pl> -Date: Wed, 29 Jan 2020 20:28:56 +0100 -Subject: [PATCH] move persistence_mutex variable to the file where it is used - most - - GCC 10 default to -fno-common, which uncovers following errors: -/usr/bin/ld: from_client.o:/builddir/build/BUILD/owfs-3.2p3/module/owserver/src/c/../include/owserver.h:21: -multiple definition of `persistence_mutex'; -owserver.o:/builddir/build/BUILD/owfs-3.2p3/module/owserver/src/c/../include/owserver.h:21: first defined here - - This can be fixed by moving variable definition from .h into .c file, -and using "extern" for other uses of the variable. For more info -see https://bugzilla.redhat.com/show_bug.cgi?id=1794368 - -Note: this commit partially reverts 34276f3412a3cdbe0f98142420ad271fab0ec5d3 ---- - module/owserver/src/c/handler.c | 4 ++++ - module/owserver/src/c/owserver.c | 3 +++ - module/owserver/src/include/owserver.h | 4 ---- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/module/owserver/src/c/handler.c b/module/owserver/src/c/handler.c -index 56c2da1e..b6aa4d93 100644 ---- a/module/owserver/src/c/handler.c -+++ b/module/owserver/src/c/handler.c -@@ -36,6 +36,10 @@ - - #include "owserver.h" - -+pthread_mutex_t persistence_mutex ; -+#define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; -+#define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; -+ - /* Counters for persistent connections */ - int persistent_connections = 0; - int handler_count = 0 ; -diff --git a/module/owserver/src/c/owserver.c b/module/owserver/src/c/owserver.c -index db29988e..1714f459 100644 ---- a/module/owserver/src/c/owserver.c -+++ b/module/owserver/src/c/owserver.c -@@ -36,6 +36,9 @@ - - #include "owserver.h" - -+/* defined in handler.c */ -+extern 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..a6f085a7 100644 ---- a/module/owserver/src/include/owserver.h -+++ b/module/owserver/src/include/owserver.h -@@ -18,10 +18,6 @@ - #include "ow.h" - #include "ow_connection.h" - --pthread_mutex_t persistence_mutex ; --#define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; --#define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; -- - #define TOCLIENTLOCK(hd) _MUTEX_LOCK( (hd)->to_client ) - #define TOCLIENTUNLOCK(hd) _MUTEX_UNLOCK( (hd)->to_client ) - |