Merge branch 'v2018.1.x' into v2018.1.x-tecff

README.md

@@ -19,7 +19,7 @@ the future development of Gluon.
 
 Please refrain from using the `master` branch for anything else but development purposes!
 Use the most recent release instead. You can list all releases by running `git tag`
-and switch to one by running `git checkout v2018.1.3 && make update`.
+and switch to one by running `git checkout v2018.1.4 && make update`.
 
 If you're using the autoupdater, do not autoupdate nodes with anything but releases.
 If you upgrade using random master commits the nodes *will break* eventually.

docs/conf.py

@@ -52,7 +52,7 @@
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-version = release = '2018.1.3'
+version = release = '2018.1.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -70,6 +70,7 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre
    :caption: Releases
    :maxdepth: 1
 
+   releases/v2018.1.4
    releases/v2018.1.3
    releases/v2018.1.2
    releases/v2018.1.1

docs/releases/v2018.1.4.rst

@@ -0,0 +1,49 @@
+Gluon 2018.1.4
+==============
+
+Bugfixes
+~~~~~~~~
+
+* Fix regression in autoupdater version comparison function
+
+  Due to a regression in Gluon 2018.1, the autoupdater would incorrectly
+  consider certain version strings equal and not attempt to upgrade.
+  In particular, any string and its prefix were considered equal when the
+  prefix did not end with a digit. For example, the following relations were
+  not evaluated correctly:
+
+  * ``1.0`` < ``1.0.1``
+  * ``1.0~pre`` < ``1.0``
+
+* Fix unintended difference between autoupdater version comparison and dpkg/opkg
+
+  Alphanumeric characters were considered less than end-of-string, when the
+  intended bahaviour (as implemented by dpkg and opkg) is that only ``~`` is
+  less than end-of-string. This broke relations like the following:
+
+  * ``1.0`` < ``1.0a``
+  * ``1.0a`` < ``1.0ab``
+  * ``1.0a`` < ``1.0a1``
+
+
+Known issues
+~~~~~~~~~~~~
+
+* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
+
+  Reducing the TX power in the Advanced Settings is recommended.
+
+* The MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
+
+  This may lead to issues in environments where a fixed MAC address is expected (like VMware when promicious mode is disallowed).
+
+* Inconsistent respondd API (`#522 <https://github.com/freifunk-gluon/gluon/issues/522>`_)
+
+  The current API is inconsistent and will be replaced eventually. The old API will still be supported for a while.
+
+* Frequent reboots due to out-of-memory or high load due to memory pressure on weak hardware specially in larger meshes
+  (`#1243 <https://github.com/freifunk-gluon/gluon/issues/1243>`_)
+
+  Optimizations in Gluon 2018.1 have significantly improved memory usage.
+  There are still known bugs leading to unreasonably high load that we hope to
+  solve in future releases.

docs/site-example/site.conf

@@ -1,4 +1,4 @@
--- This is an example site configuration for Gluon v2018.1.3
+-- This is an example site configuration for Gluon v2018.1.4
 --
 -- Take a look at the documentation located at
 -- http://gluon.readthedocs.org/ for details.

docs/user/getting_started.rst

@@ -8,7 +8,7 @@ Gluon's releases are managed using `Git tags`_. If you are just getting
 started with Gluon we recommend to use the latest stable release of Gluon.
 
 Take a look at the `list of gluon releases`_ and notice the latest release,
-e.g. *v2018.1.3*. Always get Gluon using git and don't try to download it
+e.g. *v2018.1.4*. Always get Gluon using git and don't try to download it
 as a Zip archive as the archive will be missing version information.
 
 Please keep in mind that there is no "default Gluon" build; a site configuration
@@ -43,7 +43,7 @@ Building the images
 -------------------
 
 To build Gluon, first check out the repository. Replace *RELEASE* with the
-version you'd like to checkout, e.g. *v2018.1.3*.
+version you'd like to checkout, e.g. *v2018.1.4*.
 
 ::
 

modules

@@ -9,7 +9,8 @@ PACKAGES_OPENWRT_BRANCH=lede-17.01
 PACKAGES_OPENWRT_COMMIT=40da7ecf21ffe1f3523ffa430c406e1db58ce3d4
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=be2c35785994e443d895225c7240474a46f64f5e
+PACKAGES_GLUON_BRANCH=v2018.1.x
+PACKAGES_GLUON_COMMIT=f49aef69e8e454f236215fdea19f0ef5864e9acc
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git
 PACKAGES_ROUTING_BRANCH=openwrt-18.06