Florian Eckert [Thu, 25 Apr 2019 10:52:44 +0000 (12:52 +0200)]
collectd: update forgotten PKG_RELEASE number after last change
Update PKG_RELEASE mumber.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Daniel Engberg [Thu, 25 Apr 2019 10:52:39 +0000 (12:52 +0200)]
Merge pull request #8794 from albert-lopez/oor
oor: update to 1.3.0
Florian Eckert [Thu, 25 Apr 2019 10:44:31 +0000 (12:44 +0200)]
Merge pull request #8138 from TDT-AG/pr/
20190206-collectd
collectd: enable lua support
Florian Eckert [Tue, 19 Feb 2019 09:25:58 +0000 (10:25 +0100)]
collectd: fix lua callback registration
If you want to register more than one lua plugin, you cannot start the
collectd.
You get always the error message:
"The read function "lua/(null)" is already registered. Check for
duplicates in your configuration!"
This is not what I expect and what the documenation says.
With this change it is now possible to registrate more then one lua
Script.
See https://github.com/collectd/collectd/pull/2379
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Thu, 24 Jan 2019 12:53:17 +0000 (13:53 +0100)]
collectd: enable lua support
This will enable the lua support for collectd.
The new package name is collectd-mod-lua
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Albert Lopez [Thu, 25 Apr 2019 08:48:50 +0000 (10:48 +0200)]
oor: update to release 1.3.0
Signed-off-by: Albert Lopez <alopez@ac.upc.edu>
Josef Schlehofer [Thu, 25 Apr 2019 07:48:09 +0000 (09:48 +0200)]
Merge pull request #8790 from BKPepe/youtube-dl_bump
youtube-dl: update to version 2019.4.24
Rosen Penev [Thu, 25 Apr 2019 07:46:48 +0000 (00:46 -0700)]
Merge pull request #8791 from MikePetullo/lighttpd
lighttpd: mark module configuration files
Florian Eckert [Thu, 25 Apr 2019 07:44:46 +0000 (09:44 +0200)]
Merge pull request #8783 from TDT-AG/pr/
20190424-stunnel
stunnel: update to version 5.53
Rosen Penev [Thu, 25 Apr 2019 07:19:31 +0000 (00:19 -0700)]
Merge pull request #8793 from zhaojh329/rtty
rtty: update to 6.6.1
Jianhui Zhao [Thu, 25 Apr 2019 03:01:28 +0000 (11:01 +0800)]
rtty: update to 6.6.1
Signed-off-by: Jianhui Zhao <jianhuizhao329@gmail.com>
Rosen Penev [Thu, 25 Apr 2019 03:37:16 +0000 (20:37 -0700)]
Merge pull request #8792 from zhaojh329/libuwsc
libuwsc: update to 3.2.2
Jianhui Zhao [Thu, 25 Apr 2019 02:55:54 +0000 (10:55 +0800)]
libuwsc: update to 3.2.2
Signed-off-by: Jianhui Zhao <jianhuizhao329@gmail.com>
Josef Schlehofer [Wed, 24 Apr 2019 22:06:04 +0000 (00:06 +0200)]
Merge pull request #8754 from BKPepe/urllib3
python-urllib3: update to version 1.25
W. Michael Petullo [Wed, 24 Apr 2019 19:57:34 +0000 (15:57 -0400)]
lighttpd: mark module configuration files
Signed-off-by: W. Michael Petullo <mike@flyn.org>
Josef Schlehofer [Wed, 24 Apr 2019 16:56:48 +0000 (18:56 +0200)]
youtube-dl: update to version 2019.4.24
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Hannu Nyman [Wed, 24 Apr 2019 13:22:11 +0000 (16:22 +0300)]
nano: update to 4.2
* update nano to 4.2
Release notes at https://nano-editor.org/news.php
2019.04.24 - GNU nano 4.2
* The integrated spell checker does not crash when 'spell' is missing.
* Option --breaklonglines works also when --ignorercfiles is used.
* Automatic hard-wrapping is more persistent in pushing words to the
same overflow line.
Tested with ipq806x/R7800 and mvebu/WRT3200ACM
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Josef Schlehofer [Wed, 24 Apr 2019 12:58:13 +0000 (14:58 +0200)]
Merge pull request #8749 from BKPepe/home-assistant-deps
Add Python packages (ifaddr, zeroconf, netdisco)
Josef Schlehofer [Mon, 22 Apr 2019 16:17:41 +0000 (18:17 +0200)]
python-urllib3: update to version 1.25
Add PKG_CPE_ID
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Josef Schlehofer [Wed, 24 Apr 2019 12:07:08 +0000 (14:07 +0200)]
Merge pull request #8214 from dddaniel/master
Adding awscli to python packages
Hannu Nyman [Wed, 24 Apr 2019 12:01:52 +0000 (15:01 +0300)]
Merge pull request #8784 from Andy2244/samba-fix-parallel-jobs
samba4: fix build with parallel jobs
Andy Walsh [Wed, 24 Apr 2019 09:59:06 +0000 (11:59 +0200)]
samba4: fix build with parallel jobs
* fixes openwrt/packages#8721
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
Florian Eckert [Tue, 23 Apr 2019 07:57:48 +0000 (09:57 +0200)]
stunnel: update to version 5.53
Update to version 5.53
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Rosen Penev [Wed, 24 Apr 2019 07:48:47 +0000 (00:48 -0700)]
Merge pull request #8735 from neheb/joe
jose: Fix compilation without deprecated OpenSSL APIs
Daniel Golle [Tue, 23 Apr 2019 21:12:00 +0000 (23:12 +0200)]
Merge pull request #8689 from BKPepe/jinja
Jinja2: update to version 2.10.1
Josef Schlehofer [Mon, 22 Apr 2019 06:50:23 +0000 (08:50 +0200)]
python3-ifaddr: add a new package
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Josef Schlehofer [Sun, 21 Apr 2019 13:45:56 +0000 (15:45 +0200)]
python3-zeroconf: add a new package
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Josef Schlehofer [Sun, 21 Apr 2019 13:45:45 +0000 (15:45 +0200)]
python3-netdisco: add a new package
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Hannu Nyman [Tue, 23 Apr 2019 08:16:18 +0000 (11:16 +0300)]
Merge pull request #8726 from jefferyto/python-hyperlink-19.0.0
python-hyperlink: Update to 19.0.0
Hannu Nyman [Tue, 23 Apr 2019 08:16:08 +0000 (11:16 +0300)]
Merge pull request #8727 from jefferyto/python-twisted-19.2.0
python-twisted: Update to 19.2.0, refresh patches
Rosen Penev [Tue, 23 Apr 2019 05:54:56 +0000 (22:54 -0700)]
Merge pull request #8703 from neheb/minic
miniupnpc: Update to 2.1.
20190408
Rosen Penev [Tue, 23 Apr 2019 01:41:47 +0000 (18:41 -0700)]
Merge pull request #8747 from neheb/xer
xerces-c: Use libstdcpp instead of uclibc++
Rosen Penev [Mon, 22 Apr 2019 20:50:06 +0000 (13:50 -0700)]
Merge pull request #8757 from neheb/gst1
gst1-libav: Add a hack to get it to build on mips64
Rosen Penev [Mon, 22 Apr 2019 19:53:22 +0000 (12:53 -0700)]
gst1-libav: Add a hack to get it to build on mips64
octeonplus is being passed to gcc, which is incorrect and causes build
failure. This works around it.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Rosen Penev [Mon, 22 Apr 2019 18:46:45 +0000 (11:46 -0700)]
Merge pull request #8743 from lucize/libreswan-klips
libreswan: backport deprecating KLIPS
Rosen Penev [Mon, 22 Apr 2019 18:16:30 +0000 (11:16 -0700)]
Merge pull request #8671 from neheb/mini
miniupnpd: Update to 2.1.
20190408
Florian Eckert [Tue, 12 Feb 2019 12:43:01 +0000 (13:43 +0100)]
micrond: use procd for service start
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Florian Eckert [Mon, 11 Feb 2019 06:44:11 +0000 (07:44 +0100)]
micrond: initial check-in from freifunk-gluon package feed
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Rosen Penev [Sun, 21 Apr 2019 23:48:49 +0000 (16:48 -0700)]
xerces-c: Use libstdcpp instead of uclibc++
Both dependent packages (sumo and libelektra) use (and must use) libstdcpp
Two libc++ cannot be linked against each other at the same time. I believe
this causes xerces-c to not be used even though it is listed as a
dependency.
Took the time to clean up the Makefile. Also replaced -fPIC with -fpic to
eliminate potential issues. Added linker flags for smaller size.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Hannu Nyman [Mon, 22 Apr 2019 17:05:03 +0000 (20:05 +0300)]
Merge pull request #8725 from nxhack/bump_8_16_0
node: update to 8.16.0
Hannu Nyman [Mon, 22 Apr 2019 17:04:10 +0000 (20:04 +0300)]
Merge pull request #8712 from jefferyto/obfs4proxy-0.0.10
obfs4proxy: Update to 0.0.10
Rosen Penev [Mon, 22 Apr 2019 16:29:23 +0000 (09:29 -0700)]
Merge pull request #8751 from micmac1/sql327
sqlite3: bump to 3.27.2
Rosen Penev [Mon, 22 Apr 2019 16:26:57 +0000 (09:26 -0700)]
Merge pull request #8753 from jefferyto/python-cffi-1.12.3
python-cffi: Update to 1.12.3
Jeffery To [Mon, 22 Apr 2019 13:18:58 +0000 (21:18 +0800)]
python-cffi: Update to 1.12.3
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Peter Wagner [Mon, 22 Apr 2019 10:12:48 +0000 (12:12 +0200)]
libsndfile: update to 2019-04-21-
25824cb9
Signed-off-by: Peter Wagner <tripolar@gmx.at>
Peter Wagner [Mon, 22 Apr 2019 09:26:00 +0000 (11:26 +0200)]
nfs-kernel-server: create nfs user and group
Signed-off-by: Peter Wagner <tripolar@gmx.at>
Josef Schlehofer [Sun, 21 Apr 2019 13:33:36 +0000 (15:33 +0200)]
python3-netifaces: add a new package
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Sebastian Kemper [Mon, 22 Apr 2019 07:48:25 +0000 (09:48 +0200)]
sqlite3: bump to 3.27.2
No ABI/API changes, backward compatible.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Rosen Penev [Sun, 21 Apr 2019 23:07:54 +0000 (16:07 -0700)]
Merge pull request #8744 from ammubhave/bump_zstd
zstd: bump zstd version to 1.4.0
Rosen Penev [Sun, 21 Apr 2019 20:27:08 +0000 (13:27 -0700)]
Merge pull request #8731 from neheb/lzmq
lzmq: Fix homepage URL
Daniel Engberg [Sun, 21 Apr 2019 20:15:29 +0000 (22:15 +0200)]
Merge pull request #8702 from diizzyy/samba4-urls
Samba4: Rework URLs
Rosen Penev [Sun, 21 Apr 2019 20:12:47 +0000 (13:12 -0700)]
Merge pull request #8685 from ClaymorePT/boost_1.70.0_r1
boost: Update makefile to version 1.70.0 + minor updates
Amol Bhave [Sun, 21 Apr 2019 19:32:51 +0000 (12:32 -0700)]
zstd: bump zstd version to 1.4.0
This diff bumps the zstd version to 1.4.0
Tested with NBG6817
Signed-off-by: Amol Bhave <ambhave@fb.com>
Rosen Penev [Sun, 21 Apr 2019 17:09:54 +0000 (10:09 -0700)]
Merge pull request #8739 from bluewavenet/patch-4
libmicrohttpd: Prevent Recursive Dependency
Josef Schlehofer [Sun, 21 Apr 2019 17:08:07 +0000 (19:08 +0200)]
python-urllib3: update to version 1.24.2 (#8714)
Changed TITLE as the current was too long
Added PKG_LICENSE_FILES
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Lucian Cristian [Sun, 21 Apr 2019 13:47:51 +0000 (16:47 +0300)]
libreswan: backport deprecating KLIPS
remove building kernel module, it is not used and is not working with 4.19
rework the ready to use l2tp-ipsec example
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
Peter Wagner [Sun, 21 Apr 2019 09:57:17 +0000 (11:57 +0200)]
libsndfile: update to 2019-04-07-
d5531723
Signed-off-by: Peter Wagner <tripolar@gmx.at>
Rob White [Sun, 21 Apr 2019 07:39:30 +0000 (08:39 +0100)]
libmicrohttpd: Prevent Recursive Dependency
Maintainer: Alexander Couzens lynxis@fe80.eu
Compile Tested: Snapshot SDK
Run Tested: target - ath79, hardware - gl-ar300m16, package - nodogsplash v3.2.1 and nodogsplash v3.3.1, Openwrt Snapshot.
Description: Bump to PKG_RELEASE:=3
Signed-off-by: Rob White <rob@blue-wave.net>
Rob White [Sun, 21 Apr 2019 07:18:53 +0000 (08:18 +0100)]
libmicrohttpd: Prevent Recursive Dependency
Maintainer: Alexander Couzens lynxis@fe80.eu
Compile Tested: Snapshot SDK
Run Tested: target - ath79, hardware - gl-ar300m16, package - nodogsplash v3.2.1 and nodogsplash v3.3.1, Openwrt Snapshot.
Description: If a package depends on libmicrohttpd but does not specify which variant,
a recursive dependency error occurs caused by the superfluous CONFLICTS line.
With this change, a package will get the named variant, or default to the
no-ssl variant if only libmicrohttpd is specified.
Signed-off-by: Rob White <rob@blue-wave.net>
Rosen Penev [Sat, 20 Apr 2019 20:25:48 +0000 (13:25 -0700)]
jose: Fix compilation without deprecated OpenSSL APIs
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Ted Hess [Sat, 20 Apr 2019 20:05:04 +0000 (16:05 -0400)]
Merge pull request #8709 from BKPepe/license
CONTRIBUTING.md: update Identifier for Licenses
Peter Wagner [Sat, 20 Apr 2019 16:08:52 +0000 (18:08 +0200)]
openssh: update to 8.0p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
Rosen Penev [Sat, 20 Apr 2019 15:52:55 +0000 (08:52 -0700)]
Merge pull request #8730 from dengqf6/npn
nginx: fix #8729
Rosen Penev [Tue, 16 Apr 2019 02:07:12 +0000 (19:07 -0700)]
nfs-utils: Fix compilation on some platforms
Added a patch sent upstream.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Daniel Danzberger [Thu, 4 Apr 2019 12:00:16 +0000 (14:00 +0200)]
python-awscli: Add new package
Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Daniel Danzberger [Thu, 4 Apr 2019 11:59:53 +0000 (13:59 +0200)]
python-botocore: Add new package
Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Rosen Penev [Sat, 20 Apr 2019 03:47:13 +0000 (20:47 -0700)]
Merge pull request #8724 from MikePetullo/snort3
snort3: ignore liblzma if present
Rosen Penev [Sat, 20 Apr 2019 01:04:14 +0000 (18:04 -0700)]
lzmq: Fix homepage URL
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Deng Qingfang [Sat, 20 Apr 2019 00:49:17 +0000 (08:49 +0800)]
nginx: fix #8729
Let nginx's config depend on CONFIG_OPENSSL_WITH_NPN
Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
Rosen Penev [Fri, 19 Apr 2019 23:58:05 +0000 (16:58 -0700)]
Merge pull request #8728 from ammubhave/fix_zmq_for_glibc
zmq: Fix compilation for c++ stdlib
Amol Bhave [Fri, 19 Apr 2019 14:33:25 +0000 (07:33 -0700)]
zmq: Fix compilation for c++ stdlib
Compilation for the zmq lib is broken for c++ stdlib in openwrt since the
patches add uclibc++ specific code.
This diffs changes the patch to only include the code conditioned
on if we are actually using uclibc++.
Signed-off-by: Amol Bhave <amol@amolbhave.com>
W. Michael Petullo [Fri, 19 Apr 2019 02:11:01 +0000 (22:11 -0400)]
snort3: ignore liblzma if present
Signed-off-by: W. Michael Petullo <mike@flyn.org>
Josef Schlehofer [Thu, 18 Apr 2019 15:28:05 +0000 (17:28 +0200)]
youtube-dl: update to version 2019.4.17
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Jeffery To [Fri, 19 Apr 2019 12:18:45 +0000 (20:18 +0800)]
python-twisted: Update to 19.2.0, refresh patches
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Daniel Danzberger [Thu, 4 Apr 2019 11:59:33 +0000 (13:59 +0200)]
python-colorama: Add new package
Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Daniel Danzberger [Thu, 4 Apr 2019 11:59:13 +0000 (13:59 +0200)]
python-docutils: Add new package
Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Daniel Danzberger [Thu, 4 Apr 2019 11:58:52 +0000 (13:58 +0200)]
python-futures: Add new package
Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Daniel Danzberger [Thu, 4 Apr 2019 11:58:29 +0000 (13:58 +0200)]
python-jmespath: Add new package
Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Daniel Danzberger [Thu, 4 Apr 2019 11:58:11 +0000 (13:58 +0200)]
python-rsa: Add new package
Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Daniel Danzberger [Thu, 4 Apr 2019 11:57:46 +0000 (13:57 +0200)]
python-s3transfer: Add new package
Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Jeffery To [Fri, 19 Apr 2019 08:28:46 +0000 (16:28 +0800)]
python-hyperlink: Update to 19.0.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Hirokazu MORIKAWA [Fri, 19 Apr 2019 06:03:03 +0000 (15:03 +0900)]
node: update to 8.16.0
Update to v8.16.0
Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Rosen Penev [Fri, 19 Apr 2019 01:28:23 +0000 (18:28 -0700)]
Merge pull request #8723 from nxhack/node_serialport_add_pic
node-serialport: fix i386 build fail
Hirokazu MORIKAWA [Fri, 19 Apr 2019 00:22:23 +0000 (09:22 +0900)]
node-serialport: fix i386 build fail
more stability for parallel build
Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Josef Schlehofer [Sat, 13 Apr 2019 14:16:09 +0000 (16:16 +0200)]
python3-unidecode: add package
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Jeffery To [Thu, 18 Apr 2019 14:14:53 +0000 (22:14 +0800)]
obfs4proxy: Update to 0.0.10
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Josef Schlehofer [Mon, 15 Apr 2019 21:38:08 +0000 (23:38 +0200)]
Jinja2: update to version 2.10.1
- Reordered things in Makefile
- Removed PKG_BUILD_DIR and PKG_UNPACK as it isn't necessary
- Changed TITLE from python3-jinja2 to Jinja2
- Added src package
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Josef Schlehofer [Thu, 18 Apr 2019 12:06:56 +0000 (14:06 +0200)]
Merge pull request #8646 from mmtj/pyroute2
python3-pyroute2: add new package
Josef Schlehofer [Thu, 18 Apr 2019 10:04:39 +0000 (12:04 +0200)]
CONTRIBUTING.md: update Identifier for Licenses
Use HTTPS in URL for spdx.org
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Rosen Penev [Thu, 18 Apr 2019 08:50:35 +0000 (01:50 -0700)]
Merge pull request #8708 from ysc3839/transmission-web
transmission: add PKGARCH:=all for transmission-web
Richard Yu [Thu, 18 Apr 2019 08:36:17 +0000 (16:36 +0800)]
transmission: add PKGARCH:=all for transmission-web
Signed-off-by: Richard Yu <yurichard3839@gmail.com>
Josef Schlehofer [Mon, 15 Apr 2019 21:41:43 +0000 (23:41 +0200)]
golang: update to version 1.12.4
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Rosen Penev [Thu, 18 Apr 2019 05:46:01 +0000 (22:46 -0700)]
Merge pull request #8705 from nxhack/icu_64_2_REIWA
icu: update to 64.2
Hirokazu MORIKAWA [Thu, 18 Apr 2019 01:26:42 +0000 (10:26 +0900)]
icu: update to 64.2
locale data and support for new Japanese era Reiwa
Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Daniel Engberg [Tue, 16 Apr 2019 22:04:43 +0000 (00:04 +0200)]
Samba4: Rework URLs
Avoid Hetzner hosted servers due to availability (.ru users)
and try to keep availability as good as possible without
sacrificing performance for the majority of users.
Update upstream project download URL
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Rosen Penev [Wed, 17 Apr 2019 18:37:04 +0000 (11:37 -0700)]
Merge pull request #8701 from wvdakker/master
Shorewall: Bump to version 5.2.3.3
Rosen Penev [Wed, 17 Apr 2019 18:36:44 +0000 (11:36 -0700)]
Merge pull request #8681 from Robby-/master-freeradius3update
freeradius3: update to 3.0.19, workaround fifo error, and fix libpcre dependency
Rosen Penev [Sat, 13 Apr 2019 22:32:08 +0000 (15:32 -0700)]
miniupnpc: Update to 2.1.
20190408
Switched to CMake. This allows getting rid of several patches and hacks.
Added PKG_LICENSE information
Rearranged some stuff for consistency between packages.
Added some linked flags for smaller size. Saves around 500 bytes on MIPS.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Josef Schlehofer [Wed, 17 Apr 2019 18:02:38 +0000 (20:02 +0200)]
Merge pull request #8700 from ja-pa/measurement-kit-0.10.1
measurement-kit: update to version 0.10.1
W. van den Akker [Wed, 17 Apr 2019 13:31:34 +0000 (15:31 +0200)]
Shorewall6: Bump to version 5.2.3.3.
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>