fix logroate script wrt #505596

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

5 files changed, 286 insertions, 16 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index cf85b0b99c6d..9ada38967c6c 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.61 2014/03/08 23:58:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.62 2014/06/01 20:09:54 hasufell Exp $
+
+*jabberd2-2.3.2-r1 (01 Jun 2014)
+
+  01 Jun 2014; Julian Ospald <hasufell@gentoo.org> +jabberd2-2.3.2-r1.ebuild,
+  +files/jabberd2-2.3.2.init, +files/jabberd2-2.3.2.logrotate:
+  fix logroate script wrt #505596
 
   08 Mar 2014; Julian Ospald <hasufell@gentoo.org> jabberd2-2.3.2.ebuild,
   metadata.xml:
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 205b23d08f82..9a53206fade0 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -4,28 +4,31 @@ Hash: SHA256
 AUX jabberd2-2.3.1.init 1750 SHA256 ee0d31d5e9d8142eb3e7f080c4d012397988a69e21f18107c06dd52e750a7efe SHA512 e5673ce660b4bd82d52a378fd1e6ec02d0aa1dd68243ae43f7accec1cb1aad98d02ad49798783479898152554b97471b0e0f6e8419306c42ed0f166782a63006 WHIRLPOOL 66d996a3ecfdac415c6e62b7b2ac0af067dc230b607297115fd43b421cd1f0100514d9e89c515e8ab6efecd556da5fa5b677bb08516f0da19b6a8f7e834fc943
 AUX jabberd2-2.3.1.logrotate 332 SHA256 a53d3f86221fc226ddc0a023ea731f2915bf00fac39849a418a5342aea0933c3 SHA512 47cec1568d7c62ac810ec5ffa53eef70595cd5b9808849ee501f50144d5c5a18146449ae74aec88b193047b9649340469c1c0565aa4c41351ded50e3185e574a WHIRLPOOL 5ff2716e332085f0794513732c1f1ab443a1aa9518cc54b2ad294af7e9de3ffeb5c38a6d34be83c529b04b6b986299c8f54f61f6e556c150638fe9d3106ea3ae
 AUX jabberd2-2.3.1.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
+AUX jabberd2-2.3.2.init 2007 SHA256 b17e4fdb4a6b6eae24c2e4d99dad4e2ee980633ad82a6679765872327fa477c3 SHA512 469e2b1bd706f0bee0d62c12f56c33d562874aad0604bd99718acb81d4231cf1d2998d5a5544da0aa452d3e806da3e7389afc10c9f82e2c9f36d4208f2d0a2a3 WHIRLPOOL 254930e9319691013355d07e63178e4a71044edd6a80c9197365de4bd480fd8123328349cf3846f85318584da12a656975d357eb8be2927be1583d4fa5eb183e
+AUX jabberd2-2.3.2.logrotate 186 SHA256 3adf8fd7971a5dc8e085b86bed74e9a520621ebf349a7d11ad2e9c9a15ca4c17 SHA512 cc2a4124faee216ff98afe77ee7606b40f94a63399d9a90b4a80086877fdf98120324ac459f39652b313889e0bef002a343f01f2a6e0cbe323396f0b30913e76 WHIRLPOOL 04282f0a1632f503a70958762e54346aec1a2a68677ea3a929962101502a732870754d7f1a3129281a6a319f25633a040e037e4ac53ebb03b903034da0d6db44
 DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
 DIST jabberd-2.3.2.tar.xz 1473436 SHA256 ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03 WHIRLPOOL 42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
 EBUILD jabberd2-2.3.1-r1.ebuild 4756 SHA256 5033bf243f0cbbce66adf20ac8bd66482e8ac8f0e1df26b0318388f42c5801ff SHA512 6e68ad5279373f53f97fc706942968bcb509b3c2e9cd025add0789f1e1a715117ef4045132d799c502faebffd89b3db5574debbd0c387715e94e18401f8f056e WHIRLPOOL d6c66d59c3e18c77f2261b11ead8787c4553f16e9a5ac4ef4b05101968190eb12ec3bbdedf82415580f9359ee2463e85ba67018e382ddca917337ba8b49df31d
+EBUILD jabberd2-2.3.2-r1.ebuild 4825 SHA256 d50ef083d58f312db0775c85afb3b6b7f35ceff3aa36073dee76b2b23f289fcc SHA512 f6a4884136ca6edaf05d2b4c88d2e0d332a719fe4e2dd2eb03b5d2a853c1552f337ab18839f3f1004ee2541410296d6b2acd56750685bde4333fc7e1fb2a46f5 WHIRLPOOL b52aee4b1b7446f587f26cf023bf637feac4b17c4ad0b19f33227dd14e17df916ea3d7f25b6cb9b321e2b7d1526c88e7980dd09ad7e5d151cdc532d67e6c81df
 EBUILD jabberd2-2.3.2.ebuild 4822 SHA256 61183edd9ad6b30ed0288c172c2f2d4ebea9b69f3a0ea5bfd2f945bbe0c047c8 SHA512 e25c3e98288317ab27265788b84111e346cdedbfb8621195f5fed69a3f30ab233f7aa0382623baeaf1ff196eac086f0bd695bc0a702ecb53836b7bcfe47e86c7 WHIRLPOOL bebac4495826b1ed6b188c59dd85cf1a046a89ba5c3efb3f1e352bf802772a9d147f5195eb362f2b8a56f462db9f1fc4553e434eb73ae0cae4a858a019a08ee5
-MISC ChangeLog 10592 SHA256 5c37f667dca0dc54db988cb50666bec8663d5aff6895cfde3358cf8926333052 SHA512 6e37cf15398aa7008a9e73d8f737ac0aba1b83791f53cc825622be8e09bf8fa802d3730871cabca80b4735cebf2075edc8bd49dca4ed78bfbef9442d047ef964 WHIRLPOOL b9b7ed084005729ccb564bfc1959e7eb3f0135283adea7cf041f2edb3ef57ca9ae1da5f2013639909fa5f75ce8395a9234034302814093cc3f8abfcb47e38878
+MISC ChangeLog 10802 SHA256 88fe76a4b756cbcbbe0b0b42818f46ff56b6e20493c8f57ab6cbf3575a571964 SHA512 e1115d5da33c611fb440c614eb6c3e677e0d92a5d55f82a7f279d8c34a7fdd01f591bc4901786778ca5f92d4735d927418c996de0cd8620294aa19996bcd3b74 WHIRLPOOL 2bafe22ea3cdbd0ecc2d9f7c6b66440304de25be5284624feabb4f66cd7b8f0e06db29d48ab519c53757842de43ade8b40a258febda4bd6ac902d95f37f0493c
 MISC metadata.xml 539 SHA256 c82b73803455570567750c1e5302cf7f47feef7691e3c816579de11e3d52a48b SHA512 907add96c21679c3f1089f4979f4e1fa8b6d53a114c52d950d5813a1a2851f44791bf48bb655285239b23743358286afe428fc766cf5da37b0ca1c763502fb34 WHIRLPOOL 6d0942c19f3d11be9f728b5c72bc8f33099423dcb524248f51a7a965ca108dca2b9371006741709a8605d68c0aac831850c96d3dc22764826b8dc2f608ddfaa9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTG66RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTi4iXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgLwsP/jyMuEMgIrRREiIm+JZxnfat
-1pd5aubTX0Rw0GrKU+5dLmNLMv7uxZpL6Mck6omQetFmzrU1p7zpDUL5hUAhL3Z+
-iI65hU/tt4CA4daYDZr5VZPWI/FetLWSc2PealzkKSZM1TgDc/iJOmUkY+bwL7ap
-kBezG2M48j11f4DqvtNq/Fr/FI0vnkBiYCC8GCrrpDfuGK6m+rzMsPRieugGpVYZ
-it/Skf9AUU/uHQ8CQXthza5gptvmC5HURSEBCd1jf/xY1S+QeN1AihkRVpOKqjbq
-KkBQKtyzCLhEPZvHKSAdphyK5dNzZB0hhxcADv2H+pXg0qG8USOZ/aCTsW9MZNRU
-l0oxtPSlttNQGPvBBDBgyhVPpHdifA5GQZT+6ft1YfMdfCk8NW+n5dCmaMaaJ79J
-XQj7Csk/9OJlEEaFBUloWxsYW6Rtlp91u9GMGXvQXLXQMzSMoz+ySrcxB6pJd/Zu
-yJKrUAbw/RI6PMqoj64fWDumIK38NWrzcHt232W57lWnYqR0/KBNK92K2NrsTJmc
-5TLUgYshY9smwkKxBR0LtQjfz/+w7AbBDH4AsXhfqwJOLbQdl6TD/cUKBQqQP+aX
-rLdL1+on+kux38szM0jjvPPom+lzRuGz4vkHcdxHqjgnr6qCIqUCH9voxaE0vjEp
-IiadrP0mGdnokw6goiZl
-=5Ezl
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgeVoQAOquoDOofHPRcmhLsspTxDWO
+sK7PY5al+fwillwf8uZxhwfE+fbEcW6GJVpr76myn+v3ldGlkqn8Qm6PAlbWpbIg
+3LdXhk1WHoS4/sXhBbsoXmfij/uYu6iIPN3NVhlVac+KWDFv2nvXplpLzdcfA4to
+LL2HWPumu4eOQ2oo+OqYj6iyMXrjA8qye+c+ZGHu/e+RG0ETAOu0O3bYZlYS0xLG
+H66oKtFIlv6MR7d8tZYq68MKvaAn2lVgjEwRbKaGjTHGYr8g6cHs0f41PKpmAzV8
+DFoUGPGqWGSfpk34MCNfn/yCOxiTNxp1p7eBngvj9x/XaV+bGk2E9HtxNhKIUkrd
+MN0/iGB6PBh/91t8uOEPw0tVrZ/9dMzjaqS1JGfETfcYWVKS3DHpcI9A7KPuuXuL
+oQ2GOmIP99B79lUD7zbBh5gAyhO2j+ad6TFH13cyM5dZfU/DZEoI1X0vU2CYQOsw
+X0/IXM1rzkTwpvhnE/J4BT2fIiYOwKnJme7S/Zt8zcG8TShef73DuRlxikUwQX+j
+TuhURo3+Ld7vVbA5BjJM2S58EWHq76Zimll9BoPSXHCt/nN+PFZPVKkeGaxeskiu
+AOy9Z5SHxXqPog3NxgqhMBieVG9gBzRfDXTpRB6VHmOkcN0gRh+6kXtrTtUa/Uqc
+P3ano4i5hkfte0PlbHWf
+=vsiO
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init
new file mode 100644
index 000000000000..87f0808f801d
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.init
@@ -0,0 +1,97 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.3.2.init,v 1.1 2014/06/01 20:09:54 hasufell Exp $
+
+extra_commands="reload"
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+stopJabberServices() {
+
+	eindent
+	for pidfile in /var/run/jabber/*.pid; do
+		if [ -f "${pidfile}" ]; then
+			service=$(basename ${pidfile} .pid)
+			ebegin "Stopping ${service}"
+			start-stop-daemon \
+				--stop \
+				--pidfile ${pidfile}
+			eend $?
+		fi
+	done
+	eoutdent
+
+}
+
+start_pre() {
+	checkpath -d -o jabber /var/run/jabber
+}
+
+start() {
+
+	einfo "Starting Jabber Server ..."
+	local services executable cfgfile pidfile
+	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+	eindent
+	for service in ${services}; do
+
+		cfgfile=$(echo ${service} | cut -d ':' -f 2)
+		service=$(echo ${service} | cut -d ':' -f 1)
+		if [ ! -f "${cfgfile}" ]; then
+			if [ -f "/etc/jabber/${service}.xml" ]; then
+				cfgfile="/etc/jabber/${service}.xml"
+			else
+				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
+				stopJabberServices
+				return 1
+			fi
+		fi
+
+		executable=/usr/bin/${service}
+
+		if [ ! -f "${executable}" ]; then
+			eerror "Can't find executable: ${executable}"
+			stopJabberServices
+			return 1
+		fi
+
+		ebegin "Starting ${service} (${cfgfile})"
+		pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')"
+		start-stop-daemon \
+			--background \
+			--start  \
+			--user jabber:jabber \
+			--exec /usr/bin/${service} \
+			--pid ${pidfile} \
+			-- -c ${cfgfile}
+		eend $?
+
+	done
+	eoutdent
+
+}
+
+reload() {
+	eindent
+	for pidfile in /var/run/jabber/*.pid; do
+		if [ -f "${pidfile}" ]; then
+			service=$(basename ${pidfile} .pid)
+			ebegin "Reloading ${service}"
+			kill -HUP $(cat ${pidfile})
+			eend $?
+		fi
+	done
+ 	eoutdent
+}
+
+stop() {
+
+	einfo "Stopping Jabber Server"
+	stopJabberServices
+
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate
new file mode 100644
index 000000000000..ba4628f3a0ad
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate
@@ -0,0 +1,7 @@
+/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log {
+	su jabber jabber
+	sharedscripts
+	postrotate
+	/etc/init.d/jabberd reload
+	endscript
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..760b35159b0e
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild,v 1.1 2014/06/01 20:09:54 hasufell Exp $
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	ssl? ( >=dev-libs/openssl-1.0.1:0 )
+	sqlite? ( dev-db/sqlite:3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+		-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+		-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+		-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+		etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+	# https://github.com/jabberd2/jabberd2/issues/34
+	replace-flags -O[3s] -O2
+
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+	fi
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}