From c28860d5f8524f8dfd7d3932a6e4fd1a5e9c42af Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Sat, 22 Aug 2015 23:05:30 +0200
Subject: [PATCH 1/4] Removes an unwanted linebreak in the droopy startup

---
 piratebox/piratebox/init.d/piratebox | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox
index 92a1249..dcacc7d 100755
--- a/piratebox/piratebox/init.d/piratebox
+++ b/piratebox/piratebox/init.d/piratebox
@@ -145,8 +145,7 @@ case "$1" in
             DROOPY_USER=" -c $LIGHTTPD_USER:$LIGHTTPD_GROUP "
           fi
           log_daemon_msg "Starting droopy..."
-          start-stop-daemon $DROOPY_USER -m --start --background  --pidfile $PIDFILE_DROOPY --exec $PIRATEBOX/bin/droopy -- -d "$UPLOADFOLDER" -m "$DROOPY_TXT" --chmod $DROOPY_CHMOD $DROOPY_USERDIR  
-$DROOPY_PORT
+          start-stop-daemon $DROOPY_USER -m --start --background  --pidfile $PIDFILE_DROOPY --exec $PIRATEBOX/bin/droopy -- -d "$UPLOADFOLDER" -m "$DROOPY_TXT" --chmod $DROOPY_CHMOD $DROOPY_USERDIR $DROOPY_PORT
           log_end_msg $?
        fi
 

From d266d746cb656f830898354cc33bf20a59f89266 Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Sun, 23 Aug 2015 09:55:49 +0200
Subject: [PATCH 2/4] Better styling for droopy upload frame

---
 CHANGELOG                          | 3 +++
 piratebox/piratebox/www/index.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7a7da48..c82364d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 CHANGELOG
 
+=== 1.0.5 ===
+* [New] Improved styling for droopy iframe
+* [Fix] Droopy call in init.d/piratebox failed to use the correct port
 
 === 1.0.4 === 
 * [New] New feature: /opt/piratebox/bin/board-autoconf.sh for setting up the imageboard
diff --git a/piratebox/piratebox/www/index.html b/piratebox/piratebox/www/index.html
index 103e5dc..08af48c 100644
--- a/piratebox/piratebox/www/index.html
+++ b/piratebox/piratebox/www/index.html
@@ -42,7 +42,7 @@
 		<div id="sidebar">
 			<div id="upload" class="card">
 				<h2>Upload</h2>
-				<iframe width="100%" height="80" src='http://piratebox.lan:8080'>
+				<iframe width="100%" height="80" src='http://piratebox.lan:8080' style='border:0px'>
 					Your browser does not support iframes.. If you want to upload something, follow this <a href='http://piratebox.lan:8080'>Link</a>.
 				</iframe>
 				<h3><a href="/Shared">Browse Files -></a></h3>

From 66b840714e913b865c7a6f5893a39d016b524663 Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Sun, 23 Aug 2015 11:07:04 +0200
Subject: [PATCH 3/4] Improved handling of timesave script on normal Linux
 system.

  * Delivered the systemd file for restoring the file during boot.
  * Moved date format to piratebox.conf
  * Customize the date format for OpenWrt during build of
    piratebox_ws-img.tar.gz file, like other configuration files
---
 BuildScripts/timesave.service           | 10 ++++++++++
 CHANGELOG                               |  7 +++++--
 Makefile                                |  2 ++
 piratebox/piratebox/bin/timesave.sh     |  7 ++++---
 piratebox/piratebox/conf/piratebox.conf |  5 +++++
 5 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 BuildScripts/timesave.service

diff --git a/BuildScripts/timesave.service b/BuildScripts/timesave.service
new file mode 100644
index 0000000..26a4c13
--- /dev/null
+++ b/BuildScripts/timesave.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=PirateBox timesave service
+
+[Service]
+Type=oneshot
+ExecStart=/opt/piratebox/bin/timesave.sh /opt/piratebox/conf/piratebox.conf recover
+TimeoutSec=20
+
+[Install]
+WantedBy=multi-user.target
diff --git a/CHANGELOG b/CHANGELOG
index c82364d..f50ee12 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,11 @@
 CHANGELOG
 
 === 1.0.5 ===
-* [New] Improved styling for droopy iframe
-* [Fix] Droopy call in init.d/piratebox failed to use the correct port
+* [New] Improved styling for droopy iframe.
+* [New] Timesave script service file to run set the time during startup.
+* [Fix] Droopy call in init.d/piratebox failed to use the correct port.
+* [Fix] Timesave script behaviour fixed on full Linux systems. 
+*       OpenWrt's date format is now customized during build & piratebox.conf .
 
 === 1.0.4 === 
 * [New] New feature: /opt/piratebox/bin/board-autoconf.sh for setting up the imageboard
diff --git a/Makefile b/Makefile
index d9ca19b..590d190 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,8 @@ $(OPENWRT_CONFIG_FOLDER):
 	sed 's:192.168.77:192.168.1:g' -i $@/piratebox.conf 
 	sed 's:DROOPY_USE_USER="yes":DROOPY_USE_USER="no":' -i  $@/piratebox.conf
 	sed 's:LEASE_FILE_LOCATION=$$PIRATEBOX_FOLDER/tmp/lease.file:LEASE_FILE_LOCATION=/tmp/lease.file:' -i  $@/piratebox.conf
+	sed 's:TIMESAVE_FORMAT="":TIMESAVE_FORMAT="+%C%g%m%d%H%M":' -i $@/piratebox.conf
+
 
 $(OPENWRT_BIN_FOLDER):
 	mkdir -p $@
diff --git a/piratebox/piratebox/bin/timesave.sh b/piratebox/piratebox/bin/timesave.sh
index 55514b1..73f9356 100755
--- a/piratebox/piratebox/bin/timesave.sh
+++ b/piratebox/piratebox/bin/timesave.sh
@@ -8,12 +8,13 @@
 #  gives a sort of stability to complete standalone 
 #  systems.
 #
-#  Licenced under GPL-2  @ 2012
+#  Licenced under GPL-2  @ 2012,2015
 #    Matthias Strubel    matthias.strubel@aod-rgp.de
 
 ##function for similar saving & getting time
 get_datetime() {
-	date +%C%g%m%d%H%M  
+	# Get format from piratebox.conf
+	date $TIMESAVE_FORMAT
 }
 
 
@@ -66,7 +67,7 @@ fi
 
 if [ "$2" = "recover" ] ; then
     if [ `get_datetime` -lt  `cat $TIMESAVE` ] ; then
-	    date  `cat $TIMESAVE `
+	    date -s `cat $TIMESAVE `
 	    [ "$?" != "0" ] &&  echo "error in recovering time" && exit 255
 	    echo "Time recovered"
 	    exit 0
diff --git a/piratebox/piratebox/conf/piratebox.conf b/piratebox/piratebox/conf/piratebox.conf
index 2b3cecd..44c9a98 100644
--- a/piratebox/piratebox/conf/piratebox.conf
+++ b/piratebox/piratebox/conf/piratebox.conf
@@ -118,6 +118,11 @@ IP=$NET.$IP_SHORT
 ## Timesave file for non RTC devices
 TIMESAVE="$PIRATEBOX_FOLDER/share/timesave_file"
 
+#On non OpenWRT you can use the default output format
+# as an input format. For OpenWrt you need to specify +%C%g%m%d%H%M
+# The content is exchanged during makefile processing and image build
+TIMESAVE_FORMAT=""
+
 #Start droopy? - Enable upload?
 DROOPY_ENABLED="yes"
 #Image-SRC

From 4c6c297a1b36c90e7f31cab83837f6443360e4f1 Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Sat, 12 Sep 2015 16:07:42 +0200
Subject: [PATCH 4/4] Release preparation for 1.0.5

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 590d190..f9d4754 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = piratebox-ws
-VERSION = 1.0.4
+VERSION = 1.0.5
 ARCH = all
 PB_FOLDER=piratebox
 PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER)