From 58259850fe6302a752548e910198fa080b49ea66 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Wed, 25 Feb 2026 20:16:32 +0100 Subject: [PATCH] owfs: upgrade 3.2p3 -> 3.2p4 Drop patch that's included in this release. Changelog: v3.2p4 is mainly a bugfix & cleanup release. Enhancements Add support for InfernoEmbedded soft-devices (GH-21) Bug fixes Fix bug (GH-55) related to split packet (GH-64) Fix copy paste bug (474f06d) Add \r to Http header to satisfy RFC2616 specification (GH-20) Maintenance build system cleanup (GH-72, GH-27, GH-16) Fix missing files in source distribution (GH-70, GH-69) Fix compilation with GCC10 (GH-62) Minor fixes Fix typos (GH-43 GH-23) Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- .../owfs/0001-Add-build-rule-for-README.patch | 6 +-- .../0001-Fix-compilation-with-GCC10.patch | 44 ------------------- .../owfs/{owfs_3.2p3.bb => owfs_3.2p4.bb} | 7 ++- 3 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch rename meta-filesystems/recipes-filesystems/owfs/{owfs_3.2p3.bb => owfs_3.2p4.bb} (96%) diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch index 870d0ef056..229c58f1d0 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch +++ b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch @@ -17,11 +17,11 @@ diff --git a/Makefile.am b/Makefile.am index e0c4ad6..0449321 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -35,3 +35,4 @@ rpmcvs: preparerpm +@@ -30,3 +30,5 @@ rpm: preparerpm + rpmcvs: preparerpm @LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz ${RPMDIR}/SOURCES/@PACKAGE@-@VERSION@_cvs_`date +"%Y%m%d"`.tar.gz cd ${RPMDIR}/SPECS && @RPMBUILD@ -ba @PACKAGE@.spec --define 'cvs 1' - ++ +README: README.md -- 2.7.4 - diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch deleted file mode 100644 index 6426ecb247..0000000000 --- a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a812202d22a2861318b8e39f1cd74cd222f8e76f 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. - -Upstream-Status: Backport [https://github.com/owfs/owfs/pull/62] -Signed-off-by: Khem Raj ---- - 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 ) ; - --- -2.28.0 - diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p4.bb similarity index 96% rename from meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb rename to meta-filesystems/recipes-filesystems/owfs/owfs_3.2p4.bb index 890c8aecc0..94379939de 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb +++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p4.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=628b867016631792781a8735a04760e5 \ file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099" DEPENDS = "fuse virtual/libusb0" -# v3.2p3 -SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47" -SRC_URI = "git://github.com/owfs/owfs;branch=master;protocol=https \ + +SRCREV = "c68deb1fc6d30fcc5eabe0a0d9c9dc2ca54e455a" +SRC_URI = "git://github.com/owfs/owfs;branch=master;protocol=https;tag=v${PV} \ file://0001-Add-build-rule-for-README.patch \ - file://0001-Fix-compilation-with-GCC10.patch \ file://owhttpd \ file://owserver \ "