owfs: version bump 2.7p7 -> 2.8p6

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

6 files changed, 33 insertions, 32 deletions

diff --git a/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff b/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff
deleted file mode 100644
index e362528a4..000000000
--- a/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: cleanup configure output
-
-The configure script currently outputs this:
-
-checking if owftpd is enabled... configure: error: no
-make: ***
-[/ptx/work/minime/rsc/svn/OSELAS.BSP-phyCORE-trunk/platform-phyCORE-i.MX27/state/owfs.prepare]
-Error 1
-
-Fixup for proper linebreaks.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: owfs-2.7p7/configure.ac
-===================================================================
---- owfs-2.7p7.orig/configure.ac
-+++ owfs-2.7p7/configure.ac
-@@ -371,7 +371,7 @@ AC_ARG_ENABLE(owftpd,
- [
-     if test ! "$enableval" = "yes" ; then
- 	ENABLE_OWFTPD="false"
--	AC_MSG_ERROR([no])
-+	AC_MSG_RESULT([no])
-     else
- 	if test ! "${ENABLE_MT}" = "true" ; then
- 	    AC_MSG_ERROR([owftpd needs multithreading])
diff --git a/patches/owfs-2.7p26/series b/patches/owfs-2.7p26/series
deleted file mode 100644
index 5678fedea..000000000
--- a/patches/owfs-2.7p26/series
+++ /dev/null
@@ -1 +0,0 @@
-owfs-2.7p7-pkgconfigize-fuse.diff
diff --git a/patches/owfs-2.7p26/autogen.sh b/patches/owfs-2.8p6/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/owfs-2.7p26/autogen.sh
+++ b/patches/owfs-2.8p6/autogen.sh
diff --git a/patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff b/patches/owfs-2.8p6/owfs-2.7p7-pkgconfigize-fuse.diff
index 8c3334695..8c3334695 100644
--- a/patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff
+++ b/patches/owfs-2.8p6/owfs-2.7p7-pkgconfigize-fuse.diff
diff --git a/patches/owfs-2.8p6/owfs-2.8p6-add-missing-semicolon.diff b/patches/owfs-2.8p6/owfs-2.8p6-add-missing-semicolon.diff
new file mode 100644
index 000000000..15d446950
--- /dev/null
+++ b/patches/owfs-2.8p6/owfs-2.8p6-add-missing-semicolon.diff
@@ -0,0 +1,31 @@
+Subject: owfs: add missing ;
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+
+Without this patch, we get this compile error:
+
+libtool: compile:  arm-1136jfs-linux-gnueabi-gcc -DHAVE_CONFIG_H -I. -I../../../../src/include -isystem /home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/sysroot-target/include -isystem /home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/sysroot-target/usr/include -I../include -fexceptions -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wredundant-decls -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -pthread -g -O2 -D_XOPEN_SOURCE=500 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -MT ow_simultaneous.lo -MD -MP -MF .deps/ow_simultaneous.Tpo -c ow_simultaneous.c  -fPIC -DPIC -o .libs/ow_simultaneous.o
+ow_simultaneous.c: In function 'FS_Test_Simultaneous':
+ow_simultaneous.c:81: warning: unused parameter 'type'
+ow_simultaneous.c:81: warning: unused parameter 'pn'
+ow_simultaneous.c: In function 'FS_w_convert_temp':
+ow_simultaneous.c:152: error: expected ';' before 'return'
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ module/owlib/src/c/ow_simultaneous.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: owfs-2.8p6/module/owlib/src/c/ow_simultaneous.c
+===================================================================
+--- owfs-2.8p6.orig/module/owlib/src/c/ow_simultaneous.c
++++ owfs-2.8p6/module/owlib/src/c/ow_simultaneous.c
+@@ -148,7 +148,7 @@ static ZERO_OR_ERROR FS_w_convert_temp(s
+ 			break ;
+ 	}
+ 	if ( BAD(ret) ) {
+-		LEVEL_DEBUG("Trouble setting simultaneous for %s",pn_directory->path)
++		LEVEL_DEBUG("Trouble setting simultaneous for %s",pn_directory->path);
+ 		return -EINVAL ;
+ 	}
+ 	Cache_Add_Simul(simul_temp, pn_directory);	// Mark start time
diff --git a/patches/owfs-2.8p6/series b/patches/owfs-2.8p6/series
new file mode 100644
index 000000000..88e459cd8
--- /dev/null
+++ b/patches/owfs-2.8p6/series
@@ -0,0 +1,2 @@
+owfs-2.7p7-pkgconfigize-fuse.diff
+owfs-2.8p6-add-missing-semicolon.diff