[1/1] Nodewatcher: interpret 'description' and 'position_comment' purely as textual data

Submitted by Steffen Pankratz on Sept. 18, 2016, 1:54 p.m.

Details

Message ID 20160918135400.9921-2-kratz00@gmx.de
State Accepted
Commit 03e310427318e7dd2773e25c1d9a673f4efc8414
Headers show

Commit Message

Steffen Pankratz Sept. 18, 2016, 1:54 p.m. 
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
---
 src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
 src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
index 0238791..56b0508 100644
--- a/src/packages/fff/fff-nodewatcher/Makefile
+++ b/src/packages/fff/fff-nodewatcher/Makefile
@@ -1,7 +1,7 @@ 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-nodewatcher
-PKG_VERSION:=39
+PKG_VERSION:=40
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index aeb457b..daff06f 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -2,7 +2,7 @@ 
 # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
 # License; GPL v3
 
-SCRIPT_VERSION="39"
+SCRIPT_VERSION="40"
 
 test -f /tmp/started || exit
 
@@ -58,7 +58,7 @@  crawl() {
     hostname="$(cat /proc/sys/kernel/hostname)"
     description="$(uci get system.@system[0].description)"
     if [ -n "$description" ]; then
-        description="<description>$description</description>"
+        description="<description><![CDATA[$description]]></description>"
     fi
     latitude="$(uci get system.@system[0].latitude)"
     longitude="$(uci get system.@system[0].longitude)"
@@ -67,7 +67,7 @@  crawl() {
     fi
     position_comment="$(uci get system.@system[0].position_comment)"
     if [ -n "$position_comment" ]; then
-        position_comment="<position_comment>$position_comment</position_comment>"
+        position_comment="<position_comment><![CDATA[$position_comment]]></position_comment>"
     fi
     contact="$(uci get system.@system[0].contact)"
     if [ -n "$contact" ]; then

Comments

Tim Niemeyer Sept. 18, 2016, 6:27 p.m. 
Am Sonntag, den 18.09.2016, 15:54 +0200 schrieb Steffen Pankratz:
> Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>

Tim


> ---
>  src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
>  src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
> index 0238791..56b0508 100644
> --- a/src/packages/fff/fff-nodewatcher/Makefile
> +++ b/src/packages/fff/fff-nodewatcher/Makefile
> @@ -1,7 +1,7 @@
>  include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=fff-nodewatcher
> -PKG_VERSION:=39
> +PKG_VERSION:=40
>  PKG_RELEASE:=1
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> index aeb457b..daff06f 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -2,7 +2,7 @@
>  # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
>  # License; GPL v3
>  
> -SCRIPT_VERSION="39"
> +SCRIPT_VERSION="40"
>  
>  test -f /tmp/started || exit
>  
> @@ -58,7 +58,7 @@ crawl() {
>      hostname="$(cat /proc/sys/kernel/hostname)"
>      description="$(uci get system.@system[0].description)"
>      if [ -n "$description" ]; then
> -        description="<description>$description</description>"
> +        description="<description><![CDATA[$description]]></description>"
>      fi
>      latitude="$(uci get system.@system[0].latitude)"
>      longitude="$(uci get system.@system[0].longitude)"
> @@ -67,7 +67,7 @@ crawl() {
>      fi
>      position_comment="$(uci get system.@system[0].position_comment)"
>      if [ -n "$position_comment" ]; then
> -        position_comment="<position_comment>$position_comment</position_comment>"
> +        position_comment="<position_comment><![CDATA[$position_comment]]></position_comment>"
>      fi
>      contact="$(uci get system.@system[0].contact)"
>      if [ -n "$contact" ]; then
> -- 
> 2.9.3
>
Tobias Klaus Oct. 25, 2016, 10:12 p.m. 
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>

On Sonntag, 18. September 2016 15:54:00 CEST Steffen Pankratz wrote:
> Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
> ---
>  src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
>  src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile
> b/src/packages/fff/fff-nodewatcher/Makefile index 0238791..56b0508 100644
> --- a/src/packages/fff/fff-nodewatcher/Makefile
> +++ b/src/packages/fff/fff-nodewatcher/Makefile
> @@ -1,7 +1,7 @@
>  include $(TOPDIR)/rules.mk
> 
>  PKG_NAME:=fff-nodewatcher
> -PKG_VERSION:=39
> +PKG_VERSION:=40
>  PKG_RELEASE:=1
> 
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index
> aeb457b..daff06f 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -2,7 +2,7 @@
>  # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
>  # License; GPL v3
> 
> -SCRIPT_VERSION="39"
> +SCRIPT_VERSION="40"
> 
>  test -f /tmp/started || exit
> 
> @@ -58,7 +58,7 @@ crawl() {
>      hostname="$(cat /proc/sys/kernel/hostname)"
>      description="$(uci get system.@system[0].description)"
>      if [ -n "$description" ]; then
> -        description="<description>$description</description>"
> +        description="<description><![CDATA[$description]]></description>"
>      fi
>      latitude="$(uci get system.@system[0].latitude)"
>      longitude="$(uci get system.@system[0].longitude)"
> @@ -67,7 +67,7 @@ crawl() {
>      fi
>      position_comment="$(uci get system.@system[0].position_comment)"
>      if [ -n "$position_comment" ]; then
> -       
> position_comment="<position_comment>$position_comment</position_comment>" +
>       
> position_comment="<position_comment><![CDATA[$position_comment]]></position
> _comment>" fi
>      contact="$(uci get system.@system[0].contact)"
>      if [ -n "$contact" ]; then
Tobias Klaus Oct. 26, 2016, 10:10 p.m. 
Hallo,

Auch diesen Change sehe ich eher als Bugfix und würde ihn in der neuen Beta 
inkludieren. Wie gestern warte ich mal bis morgen ob das jemand anders sieht.

Viele Grüße
Tobias


Am Sonntag, 18. September 2016, 15:54:00 CEST schrieb Steffen Pankratz:
> Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
> ---
>  src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
>  src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile
> b/src/packages/fff/fff-nodewatcher/Makefile index 0238791..56b0508 100644
> --- a/src/packages/fff/fff-nodewatcher/Makefile
> +++ b/src/packages/fff/fff-nodewatcher/Makefile
> @@ -1,7 +1,7 @@
>  include $(TOPDIR)/rules.mk
> 
>  PKG_NAME:=fff-nodewatcher
> -PKG_VERSION:=39
> +PKG_VERSION:=40
>  PKG_RELEASE:=1
> 
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index
> aeb457b..daff06f 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -2,7 +2,7 @@
>  # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
>  # License; GPL v3
> 
> -SCRIPT_VERSION="39"
> +SCRIPT_VERSION="40"
> 
>  test -f /tmp/started || exit
> 
> @@ -58,7 +58,7 @@ crawl() {
>      hostname="$(cat /proc/sys/kernel/hostname)"
>      description="$(uci get system.@system[0].description)"
>      if [ -n "$description" ]; then
> -        description="<description>$description</description>"
> +        description="<description><![CDATA[$description]]></description>"
>      fi
>      latitude="$(uci get system.@system[0].latitude)"
>      longitude="$(uci get system.@system[0].longitude)"
> @@ -67,7 +67,7 @@ crawl() {
>      fi
>      position_comment="$(uci get system.@system[0].position_comment)"
>      if [ -n "$position_comment" ]; then
> -       
> position_comment="<position_comment>$position_comment</position_comment>" +
>       
> position_comment="<position_comment><![CDATA[$position_comment]]></position
> _comment>" fi
>      contact="$(uci get system.@system[0].contact)"
>      if [ -n "$contact" ]; then
Tim Niemeyer Oct. 30, 2016, 12:07 p.m. 
Am Donnerstag, den 27.10.2016, 00:10 +0200 schrieb Tobias Klaus:
> Hallo,
> 
> Auch diesen Change sehe ich eher als Bugfix und würde ihn in der neuen Beta 
> inkludieren. Wie gestern warte ich mal bis morgen ob das jemand anders sieht.
Jo, ich hab ihn applied.

Tim
> 
> Viele Grüße
> Tobias
> 
> 
> Am Sonntag, 18. September 2016, 15:54:00 CEST schrieb Steffen Pankratz:
> > Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
> > ---
> >  src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
> >  src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++---
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/src/packages/fff/fff-nodewatcher/Makefile
> > b/src/packages/fff/fff-nodewatcher/Makefile index 0238791..56b0508 100644
> > --- a/src/packages/fff/fff-nodewatcher/Makefile
> > +++ b/src/packages/fff/fff-nodewatcher/Makefile
> > @@ -1,7 +1,7 @@
> >  include $(TOPDIR)/rules.mk
> > 
> >  PKG_NAME:=fff-nodewatcher
> > -PKG_VERSION:=39
> > +PKG_VERSION:=40
> >  PKG_RELEASE:=1
> > 
> >  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
> > diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index
> > aeb457b..daff06f 100755
> > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > @@ -2,7 +2,7 @@
> >  # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
> >  # License; GPL v3
> > 
> > -SCRIPT_VERSION="39"
> > +SCRIPT_VERSION="40"
> > 
> >  test -f /tmp/started || exit
> > 
> > @@ -58,7 +58,7 @@ crawl() {
> >      hostname="$(cat /proc/sys/kernel/hostname)"
> >      description="$(uci get system.@system[0].description)"
> >      if [ -n "$description" ]; then
> > -        description="<description>$description</description>"
> > +        description="<description><![CDATA[$description]]></description>"
> >      fi
> >      latitude="$(uci get system.@system[0].latitude)"
> >      longitude="$(uci get system.@system[0].longitude)"
> > @@ -67,7 +67,7 @@ crawl() {
> >      fi
> >      position_comment="$(uci get system.@system[0].position_comment)"
> >      if [ -n "$position_comment" ]; then
> > -       
> > position_comment="<position_comment>$position_comment</position_comment>" +
> >       
> > position_comment="<position_comment><![CDATA[$position_comment]]></position
> > _comment>" fi
> >      contact="$(uci get system.@system[0].contact)"
> >      if [ -n "$contact" ]; then
> 
> -- 
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net