Merge pull request nodogsplash#352 from nodogsplash/3.3.1-beta

bluewavenet · web-flow · commit 48209133aa6c · 2019-04-07T20:50:41.000+01:00
Bump to version 3.3.1
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,17 @@
+nodogsplash (3.3.1)
+
+  * Include preinstalled PreAuth Login script in package [bluewavenet]
+  * Documentation updates PreAuth [bluewavenet]
+  * Generate Error 403 Forbidden, if Gateway Port is accessed directly when FAS is enabled and client is not authenticated [bluewavenet]
+  * Improve splash.css, tidy up splash/status.html, tidy up Preauth demo script [bluewavenet]
+  * Remove some redundant code [mwarning]
+  * ndsctl_thread - ignore interupts when returning from epoll [lynxis]
+  * auth.c - use correct types to prevent cast and comparement of uint and int [lynxis]
+  * openwrt/init.d - prevent start of the daemon if configuration generation fails [lynxis]
+  * Known Issue - on OpenWrt >18.x.x, an issue with libmicrohttpd results in the gnutls suite being installed causing potential out of memory errors on devices <= 64M RAM
+
+ -- Rob White <dot@blue-wave.net> Fri, 7 Apr 2019 19:43:00 +0000
+
 nodogsplash (3.3.0)
 
   * Add PreAuth functionality - support for Dynamic Splash Pages, served by NDS directly [bluewavenet]
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,16 @@
+nodogsplash (3.3.1-1) stable; urgency=medium
+
+  * Include preinstalled PreAuth Login script in package [bluewavenet]
+  * Documentation updates PreAuth [bluewavenet]
+  * Generate Error 403 Forbidden, if Gateway Port is accessed directly when FAS is enabled and client is not authenticated [bluewavenet]
+  * Improve splash.css, tidy up splash/status.html, tidy up Preauth demo script [bluewavenet]
+  * Remove some redundant code [mwarning]
+  * ndsctl_thread - ignore interupts when returning from epoll [lynxis]
+  * auth.c - use correct types to prevent cast and comparement of uint and int [lynxis]
+  * openwrt/init.d - prevent start of the daemon if configuration generation fails [lynxis]
+
+ -- Rob White <dot@blue-wave.net> Fri, 7 Apr 2019 19:43:00 +0000
+
 nodogsplash (3.3.0-1) stable; urgency=medium
 
   * Add PreAuth functionality - support for Dynamic Splash Pages, served by NDS directly [bluewavenet]
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.3.1-beta'
+version = '3.3.1'
 # The full version, including alpha/beta/rc tags.
-release = '3.3.1-beta'
+release = '3.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/forward_authentication_service/PreAuth/demo-preauth.sh b/forward_authentication_service/PreAuth/demo-preauth.sh
@@ -111,12 +111,13 @@ header="
 
 # Define a common footer for every page served
 version="$(ndsctl status | grep Version)"
+year="$(date | awk -F ' ' '{print $(6)}')"
 footer="
 	<img src=\"/images/splash.jpg\" alt=\"Splash Page: For access to the Internet.\">
 	<hr>
 	<copy-right>
 		Nodogsplash $version.
-		Copyright &copy; The Nodogsplash Contributors 2004-2019.
+		Copyright &copy; The Nodogsplash Contributors 2004-$year.
 		This software is released under the GNU GPL license.
 	</copy-right>
 	</div>
diff --git a/notes/release_todos b/notes/release_todos
@@ -4,12 +4,14 @@ When ready to do a release, do the following:
 2. Changelog - list changes
 3. debian/changelog - list changes
 4. debian/copyright - update copyright dates as required eg current year
-5. docs/source/conf.py - update copyright notice eg current year, version and release numbers
-6. "cd docs" then "make man". Copy resulting docs/build/man/nodogsplash.1 to overwrite old debian/doc/nodogsplash.1
-7. remove /docs/build directory created in step 6
-8. Push to origin
-9. Github - Create Pull Request and Merge to master
-10. Github proceed to "Draft New Release"
-11. Github tag release as eg. v3.3.0 (remembering the leading "v"") (or use git tag -a v3.3.0 -m "nodogsplash release 3.3.0 " and git push --tags.)
-12. In your local repository, make a new branch called "stable"
-13. Push branch "stable" to origin, overwriting the existing "stable". Branch stable is the source for the readthedocs stable documentation at https://nodogsplashdocs.readthedocs.io/en/stable/
+5. docs/source/conf.py openwrt/Makefile - update copyright notice eg current year, version and release numbers as applicable
+6. resources/splash.html and resources/status.html - update copyright dates as required eg current year
+7. "cd docs" then "make man". Copy resulting docs/build/man/nodogsplash.1 to overwrite old debian/doc/nodogsplash.1
+8. remove /docs/build directory created in step 6
+9. Push to origin
+10. Github - Create Pull Request and Merge to master
+11. Github proceed to "Draft New Release"
+12. Github tag release as eg. v3.3.0 (remembering the leading "v"") (or use git tag -a v3.3.0 -m "nodogsplash release 3.3.0 " and git push --tags.)
+13. In your local repository, make a new branch called "stable"
+14. Push branch "stable" to origin, overwriting the existing "stable". Branch stable is the source for the readthedocs stable documentation at https://nodogsplashdocs.readthedocs.io/en/stable/
+15. In Master, set version to -beta eg 3.1.1-beta in conf.h, conf.py, openwrt/Makefile
diff --git a/openwrt/nodogsplash/Makefile b/openwrt/nodogsplash/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
-PKG_VERSION:=3.2.1
+PKG_VERSION:=3.3.1
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://codeload.github.com/nodogsplash/nodogsplash/tar.gz/v$(PKG_VERSION)?
diff --git a/src/conf.h b/src/conf.h
@@ -29,7 +29,7 @@
 #ifndef _CONF_H_
 #define _CONF_H_
 
-#define VERSION "3.3.1-beta"
+#define VERSION "3.3.1"
 
 /*@{*/
 /** Defines */
