Commit Graph

5 Commits

Author SHA1 Message Date
Roger Pueyo Centelles b1882bc9a4 bird1: fix "Form token mismatch" errors in luci-app-bird1-ipv{4,6}
The "Filters", "Functions" and "Status" sections of the web interfaces
for both Bird4 and Bird6 threw the following error upon performing any
action:

   Form token mismatch
   The submitted security token is invalid or already expired!

Changing their entry types from "cbi" to "form" fixes them.

Fixes #922.

Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
(cherry picked from commit c37fbab8f5)
2023-03-08 22:19:17 +01:00
Roger Pueyo Centelles 258826e83a bird1: rename get_bool() to get_a_bool() in bird{4,6}-lib.sh
This patch renames the get_bool() function, implemented in the
bird4-lib.sh and bird6-lib.sh files (respectively, for the IPv4 and
the IPv6 versions of the package), as well as all the calls to it.
This way, we avoid a function name collision with the one provided by
file /lib/functions.sh, which is slightly different and caused an
out-of-memory error when parsing the bird4/bird6 UCI config files.

Fixes #920.

Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
(cherry picked from commit d32f93e049)
2023-03-08 22:19:17 +01:00
Roger Pueyo Centelles 7830857eee bird1-openwrt: fix Makefile issues
This commit replaces the deprecated licensing text with an SPDX license
identifier, and removes tab indentations in the conffiles sections.

Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
(cherry picked from commit 6697ca291f)
2023-03-08 22:19:17 +01:00
Roger Pueyo Centelles 812d8cc8a3 bird1-openwrt: use a single Makefile for IPv4 and IPv6 packages
Having two Makefile files, respectively in the bird1-openwrt-ipv4 and
bird1-ipv6-openwrt folders, made the CI tests fail at the time of
building the packages, due to a compilation error. This patch merges
both Makefile files into a single one. As a result, package compilation
succeeds during the CI tests.

Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
(cherry picked from commit 914c27aeb6)
2023-03-08 22:19:15 +01:00
Toke Høiland-Jørgensen ecbdeb0500 bird: Rename to bird1 and bump to v1.6.4
This renames the bird and bird-openwrt packages to bird1, to make it
possible for bird2 (added in a subsequent commit) to coexist with it.

The packages are renamed to bird1-ipv{4,6} to avoid the confusion of
having packages named 'bird2', 'bird4' and 'bird6'.

Also bump to v1.6.4 as that contains important bug fixes.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2018-05-16 12:34:51 +02:00