Merge pull request #458 from nodogsplash/4.3.3beta

Version 4.3.3

ChangeLog

@@ -1,3 +1,13 @@
+nodogsplash (4.3.3)
+
+  * Fix Memory corruption at high loads [bluewavenet]
+  * Prevent iptables and ndsctl deadlocks [lynxis]
+  * Prevent query string truncation for deauthenticated client when client is using some types of vpn software [bluewavenet]
+  * Add debuglevel logging for case of firewall restart in OpenWrt [bluewavenet]
+  * Return error 403(forbidden) when client attempts to use a forbidden http method [bluewavenet]
+
+ -- Rob White <dot@blue-wave.net> Sat, 19 Oct 2019 13:42:16 +0000
+
 nodogsplash (4.3.2)
 
   * Fix deb package build error [martignoni]

debian/changelog

@@ -1,3 +1,13 @@
+nodogsplash (4.3.3-1) stable; urgency=medium
+
+  * Fix Memory corruption at high loads [bluewavenet]
+  * Prevent iptables and ndsctl deadlocks [lynxis]
+  * Prevent query string truncation for deauthenticated client when client is using some types of vpn software [bluewavenet]
+  * Add debuglevel logging for case of firewall restart in OpenWrt [bluewavenet]
+  * Return error 403(forbidden) when client attempts to use a forbidden http method [bluewavenet]
+
+ -- Rob White <dot@blue-wave.net>  Sat, 19 Oct 2019 13:42:16 +0000
+
 nodogsplash (4.3.2-1) stable; urgency=medium
 
   * Fix deb package build error [martignoni]

debian/doc/nodogsplash.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NODOGSPLASH" "1" "Oct 10, 2019" "4.3.2" "NoDogSplash"
+.TH "NODOGSPLASH" "1" "Oct 19, 2019" "4.3.3" "NoDogSplash"
 .SH NAME
 nodogsplash \- nodogsplash Documentation
 .
@@ -163,55 +163,17 @@ To uninstall Nodogsplash:
 .UNINDENT
 .SS Debian
 .sp
-There isn\(aqt a package in the repository (yet). But we have support for a debian package.
+There isn\(aqt a package in the repository (yet). But we have support for a Debian package.
 .sp
-Requirements beside debian tools are:
+Requirements beside Debian tools are:
 .INDENT 0.0
 .IP \(bu 2
 libmicrohttpd\-dev (>= 0.9.51) [avaiable in \fBstretch\fP]
 .UNINDENT
 .sp
-But you can also compile libmicrohttpd on your own if you\(aqre still running jessie or older.
+But you can also compile libmicrohttpd your self if you\(aqre still running jessie or older.
 .sp
-\fBsudo apt\-get install debhelper dpkg\-dev dh\-systemd libmicrohttpd\-dev\fP
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-apt\-get install build\-essential debhelper devscripts hardening\-includes
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Run this command in the repository root folder to create the package:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-dpkg\-buildpackage
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-The package will be created in the parent directory.
-.sp
-Use this command if you want to create an unsigned package:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-dpkg\-buildpackage \-b \-rfakeroot \-us \-uc
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-You will find the .deb packages in parent directory.
+To compile NoDogSplash and create the Debian package, see the chapter "How to Compile Nodogsplash".
 .SH HOW NODOGSPLASH (NDS) WORKS
 .sp
 NoDogSplash is a Captive Portal Engine. Any Captive Portal, including NDS, will have two main components:
@@ -2087,7 +2049,7 @@ Prohibit the execution of javascript.
 .SH HOW TO COMPILE NODOGSPLASH
 .SS Linux/Unix
 .sp
-Install libmicrohttpd including the header files (often call \-dev package).
+The Libmicrohttpd library is a dependency of NoDogSplash so you must first iInstall libmicrohttpd including the header files (often called \-dev package). Then proceed to download the NoDogSplash source files:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -2114,10 +2076,11 @@ make CFLAGS="\-I/tmp/libmicrohttpd_install/include" LDFLAGS="\-L/tmp/libmicrohtt
 .UNINDENT
 .UNINDENT
 .sp
-After compiling you can call \fBmake install\fP to install nodogsplash to /usr/
-.SS OpenWrt
+After compiling you can call \fBmake install\fP to install NoDogSplash to /usr/
+.SS Making a Package for Installation
+.SS OpenWrt Package
 .sp
-To compile nodogsplash please use the package definition from the feeds package.
+To compile NoDogSplash and create its installable package, please use the package definition from the feeds package.
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -2146,6 +2109,20 @@ make
 .fi
 .UNINDENT
 .UNINDENT
+.SS Debian Package
+.sp
+First you must compile NoDogSplash as described above for Linux/Unix.
+Then run the command:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+make deb
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
 .SH DEBUGGING NODOGSPLASH
 .SS Syslog Logging
 .sp

docs/source/compile.rst

@@ -1,10 +1,10 @@
-How to compile Nodogsplash
+How to Compile Nodogsplash
 ##########################
 
 Linux/Unix
 **********
 
-Install libmicrohttpd including the header files (often call -dev package).
+The Libmicrohttpd library is a dependency of NoDogSplash so you must first iInstall libmicrohttpd including the header files (often called -dev package). Then proceed to download the NoDogSplash source files: 
 
 .. code::
 
@@ -19,12 +19,15 @@ replace path in the make call with
 
    make CFLAGS="-I/tmp/libmicrohttpd_install/include" LDFLAGS="-L/tmp/libmicrohttpd_install/lib"
 
-After compiling you can call ``make install`` to install nodogsplash to /usr/
+After compiling you can call ``make install`` to install NoDogSplash to /usr/
 
-OpenWrt
-*******
+Making a Package for Installation
+*********************************
 
-To compile nodogsplash please use the package definition from the feeds package.
+OpenWrt Package
+===============
+
+To compile NoDogSplash and create its installable package, please use the package definition from the feeds package.
 
 .. code::
 
@@ -41,3 +44,13 @@ Select the appropriate "Target System" and "Target Profile" in the menuconfig me
    make defconfig
    make menuconfig
    make
+
+Debian Package
+==============
+
+First you must compile NoDogSplash as described above for Linux/Unix.
+Then run the command:
+
+.. code::
+
+   make deb

docs/source/conf.py

@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.3.3beta'
+version = '4.3.3'
 # The full version, including alpha/beta/rc tags.
-release = '4.3.2=3beta'
+release = '4.3.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/install.rst

@@ -52,35 +52,12 @@ OpenWrt
 Debian
 ******
 
-There isn't a package in the repository (yet). But we have support for a debian package.
+There isn't a package in the repository (yet). But we have support for a Debian package.
 
-Requirements beside debian tools are:
+Requirements beside Debian tools are:
 
 - libmicrohttpd-dev (>= 0.9.51) [avaiable in **stretch**]
 
-But you can also compile libmicrohttpd on your own if you're still running jessie or older.
+But you can also compile libmicrohttpd your self if you're still running jessie or older.
 
-
-``sudo apt-get install debhelper dpkg-dev dh-systemd libmicrohttpd-dev``
-
-
-.. code::
-
-   apt-get install build-essential debhelper devscripts hardening-includes
-
-Run this command in the repository root folder to create the package:
-
-.. code::
-
-   dpkg-buildpackage
-
-The package will be created in the parent directory.
-
-
-Use this command if you want to create an unsigned package:
-
-.. code::
-
-   dpkg-buildpackage -b -rfakeroot -us -uc
-
-You will find the .deb packages in parent directory.
+To compile NoDogSplash and create the Debian package, see the chapter "How to Compile Nodogsplash".

notes/release_todos

@@ -10,7 +10,7 @@ When ready to do a release, do the following:
 8. resources/splash.html and resources/status.html - update copyright dates as required eg current year
 9. "cd docs" then "make man". Copy resulting docs/build/man/nodogsplash.1 to overwrite old debian/doc/nodogsplash.1
 10. remove /docs/build directory created in step 9
-11. Push to origin
+11. Commit and Push to origin
 12. Github - Create Pull Request and Merge to master
 13. Github proceed to "Draft New Release"
 14. Github tag release as eg. v3.3.0 (remembering the leading "v"")

openwrt/nodogsplash/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
-PKG_VERSION:=4.3.3beta
+PKG_VERSION:=4.3.3
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://codeload.github.com/nodogsplash/nodogsplash/tar.gz/v$(PKG_VERSION)?

src/conf.h

@@ -29,7 +29,7 @@
 #ifndef _CONF_H_
 #define _CONF_H_
 
-#define VERSION "4.3.3beta"
+#define VERSION "4.3.3"
 
 /*@{*/
 /** Defines */