This patch bumps owfs version to 2.8p21. It also includes a patch which fixes broken compilation when HA7Net support is disabled.
Signed-off-by: Marcin Jurkowski <[email protected]> --- Index: utils/owfs/Makefile =================================================================== --- utils/owfs/Makefile (revision 35892) +++ utils/owfs/Makefile (working copy) @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=owfs -PKG_VERSION:=2.8p13 +PKG_VERSION:=2.8p21 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=cc3e2542aed41c753bffca13f2a0a84e +PKG_MD5SUM:=372361dc6316fcadc80029626f6c3d7f PKG_FIXUP:=autoreconf PKG_INSTALL:=1 Index: utils/owfs/patches/001_fix_compile_no_ha7net.patch =================================================================== --- utils/owfs/patches/001_fix_compile_no_ha7net.patch (revision 0) +++ utils/owfs/patches/001_fix_compile_no_ha7net.patch (working copy) @@ -0,0 +1,55 @@ +Index: owfs-2.8p21/module/owlib/src/c/ow_enet_discover.c +=================================================================== +--- owfs-2.8p21.orig/module/owlib/src/c/ow_enet_discover.c ++++ owfs-2.8p21/module/owlib/src/c/ow_enet_discover.c +@@ -21,6 +21,8 @@ $Id: ow_enet_discover.c,v 1.6 2012/10/04 + #include <arpa/inet.h> + #endif + ++#if OW_HA7 && OW_MT ++ + #include "jsmn.h" + /* from http://stackoverflow.com/questions/337422/how-to-udp-broadcast-with-c-in-linux */ + static void Setup_ENET_hint( struct addrinfo * hint ) +@@ -297,3 +299,4 @@ void enet_list_add( char * ip, char * po + elist->head = new ; + } + ++#endif /* OW_HA7 && OW_MT */ +Index: owfs-2.8p21/module/owlib/src/c/ow_enet_monitor.c +=================================================================== +--- owfs-2.8p21.orig/module/owlib/src/c/ow_enet_monitor.c ++++ owfs-2.8p21/module/owlib/src/c/ow_enet_monitor.c +@@ -186,13 +186,4 @@ static void ENET_scan_for_adapters(void) + MONITOR_RUNLOCK ; + } + +-#else /* OW_HA7 && OW_MT */ +- +-GOOD_OR_BAD ENET_monitor_detect(struct port_in *pin) +-{ +- (void) pin ; +- LEVEL_CALL( "ENET monitoring support not enabled" ) ; +- return gbBAD ; +-} +- + #endif /* OW_HA7 && OW_MT */ +Index: owfs-2.8p21/module/owlib/src/c/ow_server_enet.c +=================================================================== +--- owfs-2.8p21.orig/module/owlib/src/c/ow_server_enet.c ++++ owfs-2.8p21/module/owlib/src/c/ow_server_enet.c +@@ -18,6 +18,8 @@ $Id: ow_server_enet.c,v 1.73 2012/10/31 + #include "ow_connection.h" + #include "ow_codes.h" + ++#if OW_HA7 && OW_MT ++ + #define BYTE_string(x) ((BYTE *)(x)) + + static RESET_TYPE OWServer_Enet_reset(const struct parsedname *pn); +@@ -544,3 +546,5 @@ static void OWServer_Enet_close(struct c + // the standard COM_free cleans up the connection + (void) in ; + } ++ ++#endif /* OW_HA7 && OW_MT */ _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
