From 2ab3df4b170a17ba4092dcc0c6645aa12e1d7c94 Mon Sep 17 00:00:00 2001
From: lean <coolsnowwolf@gmail.com>
Date: Wed, 30 Mar 2022 00:07:33 +0800
Subject: [PATCH] owfs: bump version

---
 utils/owfs/Makefile                           | 14 +++++----
 ...-netlink-w1-status-message-detection.patch | 30 -------------------
 .../101-fix-no-reset-routine-segfault.patch   | 13 --------
 3 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 utils/owfs/patches/100-fix-netlink-w1-status-message-detection.patch
 delete mode 100644 utils/owfs/patches/101-fix-no-reset-routine-segfault.patch

diff --git a/utils/owfs/Makefile b/utils/owfs/Makefile
index 37a61c61..4b611d1b 100644
--- a/utils/owfs/Makefile
+++ b/utils/owfs/Makefile
@@ -8,14 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owfs
-PKG_VERSION:=2.9p5
-PKG_RELEASE:=1
+PKG_VERSION:=3.2p3
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=f7e11bae6cd29d58726e6d29b297834e5656d6069a407d798067ae25cb0812ea
+PKG_SOURCE_URL:=https://github.com/owfs/owfs/releases/download/v$(PKG_VERSION)
+PKG_HASH:=b8d33eba57d4a2f6c8a11ff23f233e3248bd75a42c8219b058a888846edd8717
+
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0
+PKG_CPE_ID:=cpe:/a:owfs:owfs
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -36,7 +38,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/owfs/Default
   TITLE:=OWFS (1-Wire File System)
-  URL:=http://owfs.sourceforge.net/
+  URL:=https://github.com/owfs/owfs
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Filesystem
@@ -118,7 +120,6 @@ endef
 define Package/owshell
   $(call Package/owfs/Utility)
   TITLE:=OWFS - shell utilities
-  DEPENDS+= +USE_UCLIBC:librpc
 endef
 
 define Package/owshell/description
@@ -191,6 +192,7 @@ CONFIGURE_ARGS += \
 	--disable-owphp \
 	--disable-owtcl \
 	--disable-swig \
+	--disable-avahi \
 	$(if $(CONFIG_LIBOW_MASTER_USB),--enable-usb,--disable-usb) \
 	$(if $(CONFIG_LIBOW_MASTER_W1),--enable-w1,--disable-w1) \
 	$(if $(CONFIG_LIBOW_MASTER_I2C),--enable-i2c,--disable-i2c) \
diff --git a/utils/owfs/patches/100-fix-netlink-w1-status-message-detection.patch b/utils/owfs/patches/100-fix-netlink-w1-status-message-detection.patch
deleted file mode 100644
index 251065fa..00000000
--- a/utils/owfs/patches/100-fix-netlink-w1-status-message-detection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-AaAA
---- a/module/owlib/src/c/ow_w1_parse.c
-+++ b/module/owlib/src/c/ow_w1_parse.c
-@@ -237,7 +237,7 @@ enum Netlink_Read_Status W1_Process_Resp
- 			owfree(nlp.nlm) ;
- 			return nrs_nodev ;
- 		}
--		if ( nrs_callback == NULL ) { // status message
-+		if ( nrs_callback == NULL ) { // bus reset
- 			owfree(nlp.nlm) ;
- 			return nrs_complete ;
- 		}
-@@ -246,7 +246,7 @@ enum Netlink_Read_Status W1_Process_Resp
- 		nrs_callback( &nlp, v, pn ) ;
- 		LEVEL_DEBUG("Called nrs_callback");
- 		owfree(nlp.nlm) ;
--		if ( nlp.cn->ack != 0 ) {
-+		if ( nlp.cn->seq != nlp.cn->ack ) {
- 			if ( nlp.w1m->type == W1_LIST_MASTERS ) {
- 				continue ; // look for more data
- 			}
-@@ -254,7 +254,7 @@ enum Netlink_Read_Status W1_Process_Resp
- 				continue ; // look for more data
- 			}
- 		}
--		nrs_callback = NULL ; // now look for status message
-+		return nrs_complete ; // status message
- 	}
- 	return nrs_timeout ;
- }
diff --git a/utils/owfs/patches/101-fix-no-reset-routine-segfault.patch b/utils/owfs/patches/101-fix-no-reset-routine-segfault.patch
deleted file mode 100644
index 731c4a04..00000000
--- a/utils/owfs/patches/101-fix-no-reset-routine-segfault.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/module/owlib/src/c/ow_reset.c
-+++ b/module/owlib/src/c/ow_reset.c
-@@ -21,6 +21,10 @@ RESET_TYPE BUS_reset(const struct parsed
- 	struct connection_in * in = pn->selected_connection ;
- 	STAT_ADD1_BUS(e_bus_resets, in);
- 
-+	if ( in->iroutines.reset == NO_RESET_ROUTINE ) {
-+		return BUS_RESET_OK;
-+	}
-+
- 	switch ( (in->iroutines.reset) (pn) ) {
- 	case BUS_RESET_OK:
- 		in->reconnect_state = reconnect_ok;	// Flag as good!