diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5da7d2bd7f04ede6a56a1520b79c815257387be..c11adf0d9d1e031eee0cf6dff425e2835cdd697d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ before_script:
test:
stage: test
script:
- - ./configure --bindir=/usr/bin
+ - ./configure --prefix=/usr
- make
- make DESTDIR=gitlab-ci install
@@ -18,7 +18,7 @@ test:
build:
stage: build
script:
- - ./configure --bindir=/usr/bin
+ - ./configure --prefix=/usr
- make
- make DESTDIR=gitlab-ci install
diff --git a/INSTALL.md b/INSTALL.md
index 118124cc206080c0808704a9cb8822288dba8fc3..109c73bbd08b26770afc29d521d43b14ac87e58a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,13 +1,13 @@
-Build Instructions
-------------------
+# Build Instructions
## Requirements
- A POSIX-compliant C development environment
- GNU make version 3.81 or later
-- skalibs version 2.14.1.1: http://skarnet.org/software/skalibs/
-- execline version 2.9.4.0: http://skarnet.org/software/execline/
-- oblibs version 0.3.0.0: https://git.obarun.org/Obarun/oblibs/
+- skalibs version 2.14.3.0: http://skarnet.org/software/skalibs/
+- execline version 2.9.6.1: http://skarnet.org/software/execline/
+- oblibs version 0.3.1.0: https://git.obarun.org/Obarun/oblibs/
+- 66 version 0.8.0.0: https://git.obarun.org/Obarun/66 (only for 66-dbus-launch tool)
- lowdown version 0.6.4 or later for man and html pages: https://kristaps.bsd.lv/lowdown/
- If cross-compiling: the sysdeps for your target architecture (see the [Cross-compilation](INSTALL.md#Cross-compilation) section below)
@@ -46,11 +46,13 @@ You can invoke make with a few variables for more configuration.
*DESTDIR* can be given on the `make install` command line in order to install to a staging directory.
## Static binaries
+
By default, binaries are linked against static versions of all the libraries they depend on, except for the libc. You can enforce linking against the static libc with *--enable-static-libc*.
-(If you are using a GNU/Linux system, be aware that the GNU libc behaves badly with static linking and produces huge executables, which is why it is not the default. Other libcs are better suited to static linking, for instance [musl](http://musl-libc.org/)
+If you are using a GNU/Linux system, be aware that the GNU libc behaves badly with static linking and produces huge executables, which is why it is not the default. Other libcs are better suited to static linking, for instance [musl](http://musl-libc.org/).
## Cross-compilation
+
skarnet.org packages centralize all the difficulty of cross-compilation in one place: skalibs. Once you have
cross-compiled skalibs, the rest is easy.
@@ -65,4 +67,4 @@ obarun.org packages do not support out-of-tree builds. They are small, so it doe
## Dbus support
-The 66-dbus-broker-launch tool is built if you give the `--enable-dbus=<implementation>` flag to configure. There are two supported values for `<implementation>: basu and elogind. You should install the relevant header and library files for your chosen implementation before building the 66-dbus-broker-launch.
\ No newline at end of file
+The *66-dbus-launch* tool is built if you give the `--enable-dbus=<implementation>` flag to configure. There are two supported values for `<implementation>: basu and elogind. You should install the relevant header and library files for your chosen implementation before building the *66-dbus-launch*.
\ No newline at end of file
diff --git a/README.md b/README.md
index 0af8831e032965d0ce1cf8573fb4a8946b52ffdb..1b82cddd053acdefc6f75f9a36bc3c1515aef366 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,20 @@
-66-tools: A set of helper tools designed to simplify and automate various repetitive tasks commonly encountered in service script administration. These tools also provide additional functionalities to enhance service management.
+# 66-tools - A set of helper tools
-====
+A set of helper tools designed to simplify and automate various repetitive tasks commonly encountered in service script administration. These tools also provide additional functionalities to enhance service management.
Some utilities are language [execline](https://skarnet.org/software/execline) specific (usually named with `execl-` prefix) where other can be used on classic shell.
-Installation
-------------
+## Installation
See the INSTALL.md file.
-Documentation
--------------
+## Documentation
Online [documentation](https://web.obarun.org/software/66-tools/)
-Contact information
--------------------
+## Contact information
* Email:
Eric Vidal `<eric@obarun.org>`
@@ -31,7 +28,6 @@ Contact information
* XMPP Channel:
obarun@conference.xmpp.obarun.org
-Supports the project
----------------------
+## Supports the project
Please consider to make [donation](https://web.obarun.org/index.php?id=18)
diff --git a/build_toolchain.sh b/build_toolchain.sh
index 0d98bf05380da13b2283a3d5763485eee39b8dd9..06572fee9f0427816415110be3a20be8267ac0d0 100755
--- a/build_toolchain.sh
+++ b/build_toolchain.sh
@@ -6,9 +6,9 @@ if [ "$1" == "commit" ]; then
tag=0
fi
-skalibs_tag="v2.14.1.0"
-execline_tag="v2.9.4.0"
-oblibs_tag="0.3.0.0"
+skalibs_tag="v2.14.3.0"
+execline_tag="v2.9.6.1"
+oblibs_tag="0.3.1.0"
check_tag(){
@@ -24,9 +24,7 @@ build_skalibs() {
cd skalibs
check_tag "${skalibs_tag}"
./configure \
- --prefix=/usr \
- --with-default-path=/usr/bin \
- --enable-shared
+ --prefix=/usr
make install || return 1
cd ..
@@ -40,11 +38,8 @@ build_execline() {
check_tag "${execline_tag}"
./configure \
--prefix=/usr \
- --libexecdir=/usr/libexec \
- --bindir=/usr/bin \
- --sbindir=/usr/bin \
- --shebangdir=/usr/bin \
- --enable-shared
+ --enable-shared \
+ --disable-allstatic
make install || return 1
cd ..
@@ -57,7 +52,7 @@ build_oblibs() {
cd oblibs
check_tag "${oblibs_tag}"
./configure \
- --enable-shared
+ --prefix=/usr
make install || return 1
cd ..
diff --git a/doc/66-dbus-launch.md b/doc/66-dbus-launch.md
index 22927051569b99f8cad58a1e0da25aaa6c79d412..9d74617527794601dc54f58d3b7311545205c656 100644
--- a/doc/66-dbus-launch.md
+++ b/doc/66-dbus-launch.md
@@ -26,6 +26,8 @@ When started by a regular user, *66-dbus-launch* will drop privileges before exe
This program is only built if the `--enable-dbus=` option is passed during compilation (see [Build Requirements](#build-requirements)).
+This tool is inspired by the [dbus-controllers](https://github.com/st3r4g/dbus-controllers) project and the original [dbus-broker](https://github.com/bus1/dbus-broker) program.
+
## Exit codes
- *0* success
diff --git a/doc/upgrade.md b/doc/upgrade.md
index fc0c189f187863ec9694a6ef57ba40ae2ec3ed98..1a2467a4ac545ac42001c3ad5b74364ce0cd12c1 100644
--- a/doc/upgrade.md
+++ b/doc/upgrade.md
@@ -11,6 +11,19 @@ author: Eric Vidal <eric@obarun.org>
---
+# In 0.1.1.0
+
+- Adapt to `oblibs` 0.3.1.0
+
+## New features
+
+- [66-dbus-launch](66-dbus-launch.html): A tool for launching, supervising, and reacting to [dbus-broker](https://github.com/bus1/dbus-broker) events emitted by relevant D-Bus signals. This tool is not build by default, see `./configure --help` at `Dbus support` section and [66-dbus-launch documentation](66-dbus-launch.html) for build requirements and use.
+
+## Bug Fixes
+
+- Typo fix
+
+---
# In 0.1.0.2
- Adapt to `oblibs` 0.3.0.0