8 files changed, 111 insertions, 77 deletions
diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD
index fc3f33d75..4dcc4b94b 100644
--- a/system/bc/APKBUILD
+++ b/system/bc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bc
-pkgver=2.0.3
+pkgver=2.1.0
 pkgrel=0
 pkgdesc="An arbitrary precision numeric processing language (calculator)"
 url="https://github.com/gavinhoward/bc"
@@ -26,4 +26,4 @@ package() {
 	make install
 }
 
-sha512sums="1eabc44a33c08e1cc20c7112843e18544860dc8621cf655c2453858d64b720cada4835ab6142110f296c4d6ad82e77725e603fd11b84b61b073efccc9f6a1c45  bc-2.0.3.tar.xz"
+sha512sums="d117c0433b08d7bf4986ff49a39b6cbd1048399e74a3781ba48b27008d18c1cedfaca79c1d0510919b194bc593699ba99a736c377815cb3659cec772b45b1cd1  bc-2.1.0.tar.xz"
diff --git a/system/perl-libwww/APKBUILD b/system/perl-libwww/APKBUILD
index 65aa812d8..6b62d0b33 100644
--- a/system/perl-libwww/APKBUILD
+++ b/system/perl-libwww/APKBUILD
@@ -5,7 +5,7 @@ _realname=libwww-perl
 _author1=O
 _author2=${_author1}A
 _author=${_author2}LDERS
-pkgver=6.38
+pkgver=6.39
 pkgrel=0
 pkgdesc="Perl module - World Wide Web library"
 url="https://metacpan.org/release/libwww-perl"
@@ -16,27 +16,22 @@ depends="perl-http-date perl-http-cookies perl-net-http perl-http-daemon
 	perl-http-negotiate perl-uri perl-http-message perl-test-needs
 	perl-lwp-mediatypes perl-encode-locale perl-try-tiny"
 makedepends="perl-dev perl-test-fatal perl-test-requiresinternet"
-install=
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://cpan.metacpan.org/authors/id/$_author1/$_author2/$_author/libwww-perl-$pkgver.tar.gz"
 builddir="$srcdir/$_realname-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="7f1332ea3b72ce01d4e20532cefa9229d0727c56d1a068f76983dd39a7d292b0a77fde93946ca16f2969e1a55b8ce8ba4cf22cd74bfe8cfda92204e3549b5cd0  perl-libwww-6.38.tar.gz"
+sha512sums="55360e971fada175cb37d8428ce7b0d6b4c3e3f1bf9129fbb15cdee1eea46d8ee4856b0c371849457625aeeb27b4eb751fb4d8510c28c968763aeda37fe1b7a6  perl-libwww-6.39.tar.gz"
diff --git a/system/perl-net-http/APKBUILD b/system/perl-net-http/APKBUILD
index 435372b19..c476f6c42 100644
--- a/system/perl-net-http/APKBUILD
+++ b/system/perl-net-http/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-net-http
-pkgver=6.18
+pkgver=6.19
 pkgrel=0
 pkgdesc="Low-level HTTP connection client library for Perl"
 url="https://metacpan.org/release/Net-HTTP"
@@ -9,26 +9,22 @@ arch="noarch"
 license="GPL-2.0-only OR Artistic-1.0-Perl"
 depends="perl perl-uri"
 makedepends="perl-dev"
-replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-$pkgver.tar.gz"
 builddir="$srcdir"/Net-HTTP-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="89cf197c8717fd368a892b0d37efccb7c2aa46ece7851906282f33aa5a2105809fa0b917c56f94d217731568c20e2ff86eb455607d0bc24eb6d093c3fbab185d  Net-HTTP-6.18.tar.gz"
+sha512sums="85b139150d8608f7439ef2f975afe884c1f5220726d45603427510e39ad2003e20ea30ed1326b4ff20527c4e625262769a5abaa5ef320f1c26bf3f8eafc9cd1b  Net-HTTP-6.19.tar.gz"
diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD
index dce6203e2..7ff1e0c6d 100644
--- a/system/perl-test-simple/APKBUILD
+++ b/system/perl-test-simple/APKBUILD
@@ -1,9 +1,8 @@
-# Automatically generated by apkbuild-cpan, template 2
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-test-simple
 _pkgreal=Test-Simple
-pkgver=1.302162
+pkgver=1.302164
 pkgrel=0
 pkgdesc="Basic utilities for writing Perl tests"
 url="https://metacpan.org/release/Test-Simple"
@@ -16,35 +15,18 @@ subpackages="$pkgname-doc"
 source="https://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
 check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="1e8ac18986f4e8ae44f385a4db025adc714dd355b8590472392468a8865a2a21d0a30484c196f4cb31fcb1fcff85e7e06f8402931d8f9b04fea4139399aad116  Test-Simple-1.302162.tar.gz"
+sha512sums="6b1945bfc7766feabd9fe731b7d993ebdc0bacc0b770f680ece714c1d76708cf03d6ebf803761a1ab9670907d3ba9d201e5dc650901fc9d8e2207c226f5d3024  Test-Simple-1.302164.tar.gz"
diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD
index 56652dda1..85db9d603 100644
--- a/user/cbindgen/APKBUILD
+++ b/user/cbindgen/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Samuel Holland <samuel@sholland.org>
 # Maintainer: Molly Miller <adelie@m-squa.red>
 pkgname=cbindgen
-pkgver=0.8.7
+pkgver=0.9.0
 pkgrel=0
 pkgdesc="Tool to generate C bindings from Rust code"
 url="https://github.com/eqrion/cbindgen"
@@ -20,9 +20,9 @@ cargo_deps="$pkgname-$pkgver ansi_term-0.11.0 atty-0.2.11 autocfg-0.1.4
 	rand_core-0.3.1 rand_core-0.4.0 rand_hc-0.1.0 rand_isaac-0.1.1
 	rand_jitter-0.1.4 rand_os-0.1.3 rand_pcg-0.1.2 rand_xorshift-0.1.1
 	rdrand-0.4.0 redox_syscall-0.1.54 redox_termios-0.1.1
-	remove_dir_all-0.5.2 ryu-0.2.8 serde-1.0.92 serde_derive-1.0.92
-	serde_json-1.0.39 strsim-0.8.0 syn-0.15.36 tempfile-3.0.8 termion-1.5.3
-	textwrap-0.11.0 toml-0.4.10 unicode-width-0.1.5 unicode-xid-0.1.0
+	remove_dir_all-0.5.2 ryu-0.2.8 serde-1.0.93 serde_derive-1.0.93
+	serde_json-1.0.39 strsim-0.8.0 syn-0.15.38 tempfile-3.0.8 termion-1.5.3
+	textwrap-0.11.0 toml-0.5.1 unicode-width-0.1.5 unicode-xid-0.1.0
 	vec_map-0.8.1 winapi-0.3.7 winapi-i686-pc-windows-gnu-0.4.0
 	winapi-x86_64-pc-windows-gnu-0.4.0"
 
@@ -75,7 +75,7 @@ package() {
 	rm "$pkgdir"/usr/.crates.toml
 }
 
-sha512sums="0238fa87100f1792cbb2b2c977bdc13a9a8a3e916f841ee112f69335a8ecb2a9fc99d3a0ce5eda16c9eead7ccbe8e7b3b8248d4ceaa218bbea0ac9a6a20e805d  cbindgen-0.8.7.tar.gz
+sha512sums="134a748ec781dde54d7810d6f5f98a5a84784d4acdd13a4c13eb4ae67fc278ccd2b123eea56461a124e7aa17b99e0a5a20f39f06286ce259e6e3eb24c43f29ae  cbindgen-0.9.0.tar.gz
 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa  ansi_term-0.11.0.tar.gz
 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79  atty-0.2.11.tar.gz
 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce  autocfg-0.1.4.tar.gz
@@ -105,15 +105,15 @@ fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292
 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981  redox_termios-0.1.1.tar.gz
 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd  remove_dir_all-0.5.2.tar.gz
 15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4  ryu-0.2.8.tar.gz
-a8a33cf76a4f899205b2ede5e91859e03d038b178f685a36991c1836ab0c37f91ff50db4145e825838ac0fb4c526c9f496d00f87ac1790d101f4e83779fc5124  serde-1.0.92.tar.gz
-37da456bb1392e4eacad07118dd8a6590552f455151f35bf4b350305772eddc8b232b61c36940c287df85b61ccc9867602cfc7012f7b7b645ab97cff45baeaab  serde_derive-1.0.92.tar.gz
+ec7712ad54bae2d93524e49730e2707b20ef91c8aa05084c6bbbd17e3ca77532cc672b8ae8f3ace25fc72a109cdc06a4b3f74515b7afe35faff6887984ae9309  serde-1.0.93.tar.gz
+e9ba64c934eab1c2091697d36338ea6c47d0409b0097c87376fa6b05de21391aeb228e52b1c846894c37aee44550f4059c3ee9f58840d79d4ef5be4c61293f2b  serde_derive-1.0.93.tar.gz
 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036  serde_json-1.0.39.tar.gz
 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34  strsim-0.8.0.tar.gz
-7cd22f17d3740223d94b64405ba6283fb90a4ec170bd55de652a409a537b5355717dfb09dab991e1bbb799e57d1d48fc07c061adbe35f5b7da3bcdcdc8723ddf  syn-0.15.36.tar.gz
+e460d6b67e3237e8e88292e2fd170ef16f6b0e30b1c7c11b8177f36c86b083ca1de2727e75f183d2708f6839138aa73865e7944a822c2d85783a79caf3fa2e6c  syn-0.15.38.tar.gz
 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00  tempfile-3.0.8.tar.gz
 1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb  termion-1.5.3.tar.gz
 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a  textwrap-0.11.0.tar.gz
-15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160  toml-0.4.10.tar.gz
+4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073  toml-0.5.1.tar.gz
 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2  unicode-width-0.1.5.tar.gz
 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d  unicode-xid-0.1.0.tar.gz
 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40  vec_map-0.8.1.tar.gz
diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD
index 554916af7..b892fef2f 100644
--- a/user/i3status/APKBUILD
+++ b/user/i3status/APKBUILD
@@ -1,35 +1,40 @@
 # Contributor: Luis Ressel <aranea@aixah.de>
 # Maintainer: Luis Ressel <aranea@aixah.de>
 pkgname=i3status
-pkgver=2.12
+pkgver=2.13
 pkgrel=0
 pkgdesc="Status bar generator for dzen2, xmobar or similar"
 url="https://i3wm.org/i3status/"
 arch="all"
-options="!check"  # No test suite
+options="!check" # No test suite
 license="MIT"
 depends=""
-makedepends="alsa-lib-dev confuse-dev libnl3-dev pkgconf pulseaudio-dev yajl-dev"
+makedepends="alsa-lib-dev asciidoctor confuse-dev libnl3-dev pkgconf
+	pulseaudio-dev yajl-dev"
 subpackages="$pkgname-doc"
 source="$url/$pkgname-$pkgver.tar.bz2
+	asciidoctor.patch
 	glob_tilde.patch"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
-	# TODO: The setcap part can be dropped after the 2.13 release
-	sed -i -e '/^CFLAGS+=-g$/d' -e '/setcap/d' Makefile
+	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
-	make i3status
+	mkdir build
+	cd build
+
+	PATH_ASCIIDOC=/usr/bin/asciidoctor ../configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	make -C build DESTDIR="$pkgdir" install
 }
-
-sha512sums="687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3  i3status-2.12.tar.bz2
-2a0a85dba02b9e9962f13d4bc151fd1672f215292800d9eeff5a10bd363b74f422d3b320851f31b73062ceeded974f5b105aec914c84f78ba418312bed189aa4  glob_tilde.patch"
+sha512sums="6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2  i3status-2.13.tar.bz2
+26527b9a0053d363f2b2991f9be3a15cb5fbf5553dca9498a9cff1c1a65e887f392215b60a484e329e6ef8efd63f9b67727826fb6ccfe1033c653feef34aaab8  asciidoctor.patch
+765a5b64d79f61cd68280d77a7316e7f571a3c2e385d9a227885cde5fc057b1a892e92a65c0fc54832bfdda30743df6e9f82a847b55c9e7389575c7fbad9e0d4  glob_tilde.patch"
diff --git a/user/i3status/asciidoctor.patch b/user/i3status/asciidoctor.patch
new file mode 100644
index 000000000..575a00e1b
--- /dev/null
+++ b/user/i3status/asciidoctor.patch
@@ -0,0 +1,50 @@
+From 1821c7cd94e2424352f0fcb1f2933b368a4c381c Mon Sep 17 00:00:00 2001
+From: Luis Ressel <aranea@aixah.de>
+Date: Tue, 9 Jul 2019 13:18:43 +0200
+Subject: [PATCH] Build man pages with asciidoctor
+
+asciidoctor doesn't support the -f option. Furthermore, its docbook
+output appears to be unsuitable for xmlto, so make it generate a manpage
+directly.
+---
+ Makefile.am  | 7 ++-----
+ configure.ac | 3 ---
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bb251f0..93ef552 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,13 +11,10 @@ dist_man1_MANS = \
+ asciidoc_MANS = \
+ 	man/i3status.1
+ 
+-$(asciidoc_MANS): man/%.1: man/%.xml man/$(dirstamp)
+-	$(AM_V_GEN) out='$@'; @PATH_XMLTO@ man -o "$${out%/*}" $<
++$(asciidoc_MANS): man/%.1: man/%.man man/$(dirstamp)
++	$(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b manpage -o $@ $<
+ 	@stamp='$@'; $(MKDIR_P) "$${stamp%/*}"
+ 
+-man/%.xml: man/%.man man/asciidoc.conf man/$(dirstamp)
+-	$(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b docbook -f $(top_builddir)/man/asciidoc.conf -o $@ $<
+-
+ AM_CPPFLAGS = \
+ 	-DSYSCONFDIR="\"$(sysconfdir)\"" \
+ 	-I$(top_srcdir)/include \
+diff --git a/configure.ac b/configure.ac
+index cf9e430..78c4aa5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,9 +104,6 @@ AC_PROG_LN_S
+ AC_PATH_PROG([PATH_ASCIIDOC], [asciidoc], [no])
+ AS_IF([test x"$PATH_ASCIIDOC" = x"no"],
+       [AC_MSG_ERROR([asciidoc is required for generating man pages])])
+-AC_PATH_PROG([PATH_XMLTO], [xmlto], [no])
+-AS_IF([test x"$PATH_XMLTO" = x"no"],
+-      [AC_MSG_ERROR([xmlto is required for generating man pages])])
+ 
+ AM_PROG_AR
+ 
+-- 
+2.22.0
+
diff --git a/user/i3status/glob_tilde.patch b/user/i3status/glob_tilde.patch
index b1f2ba667..87177d78e 100644
--- a/user/i3status/glob_tilde.patch
+++ b/user/i3status/glob_tilde.patch
@@ -1,8 +1,14 @@
-diff --git i/i3status.c w/i3status.c
-index 5088c96..3c18214 100644
---- i/i3status.c
-+++ w/i3status.c
-@@ -210,29 +210,19 @@ static int valid_color(const char *value) {
+diff --git a/i3status.c b/i3status.c
+index 0898da3..f4b10fd 100644
+--- a/i3status.c
++++ b/i3status.c
+@@ -207,35 +207,23 @@ static int valid_color(const char *value) {
+ 
+ /*
+  * This function resolves ~ in pathnames.
+- * It may resolve wildcards in the first part of the path, but if no match
+- * or multiple matches are found, it just returns a copy of path as given.
++ * The syntax '~user' is not supported.
   *
   */
  static char *resolve_tilde(const char *path) {
@@ -22,19 +28,19 @@ index 5088c96..3c18214 100644
 -    } else {
 -        head = globbuf.gl_pathv[0];
 -        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1);
--        strncpy(result, head, strlen(head));
--        if (tail)
--            strncat(result, tail, strlen(tail));
+-        strcpy(result, head);
+-        if (tail) {
+-            strcat(result, tail);
 +    char *home, *result = NULL;
 +
-+    if (strncmp(path, "~/", 2) == 0) {
++    if (path[0] == '~' && (path[1] == '/' || path[1] == '\0')) {
 +        home = getenv("HOME");
 +        if (home != NULL) {
 +            result = scalloc(strlen(home) + strlen(path));
 +            strcpy(result, home);
-+            strcat(result, path+1);
++            strcat(result, path + 1);
 +            return result;
-+        }
+         }
      }
 -    globfree(&globbuf);
  
@@ -43,11 +49,11 @@ index 5088c96..3c18214 100644
  }
  
  static char *get_config_path(void) {
-diff --git i/include/i3status.h w/include/i3status.h
-index 9ac471d..27ecae4 100644
---- i/include/i3status.h
-+++ w/include/i3status.h
-@@ -236,4 +236,9 @@ extern cfg_t *cfg, *cfg_general, *cfg_section;
+diff --git a/include/i3status.h b/include/i3status.h
+index 217376a..34e44a0 100644
+--- a/include/i3status.h
++++ b/include/i3status.h
+@@ -241,4 +241,9 @@ extern cfg_t *cfg, *cfg_general, *cfg_section;
  extern void **cur_instance;
  
  extern pthread_t main_thread;