net-analyzer/darkstat: Really disable debug

- Passing --disable-debug to configure has the effect of enabling it.
  Rather than fixing the autoconf logic, simply remove the CFLAGS
  additions instead.
- Add a simple patch that ensures strncpy copies enough bytes

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
This commit is contained in:
Jeroen Roovers
2020-07-03 11:55:02 +02:00
parent f0dec48815
commit e980183fcb
2 changed files with 84 additions and 0 deletions
@@ -0,0 +1,73 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools user
DESCRIPTION="Network traffic analyzer with cute web interface"
HOMEPAGE="https://unix4lyfe.org/darkstat/"
SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
DEPEND="
dev-libs/libbsd
net-libs/libpcap
sys-libs/zlib
"
RDEPEND="
${DEPEND}
"
DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
DOCS=( AUTHORS ChangeLog README NEWS )
PATCHES=(
"${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch
)
src_prepare() {
default
sed -i \
-e '/-DNDEBUG/d' \
-e 's|-flto||g' \
configure.ac || die
eautoreconf
}
src_configure() {
econf --with-privdrop-user=darkstat
}
src_install() {
default
newinitd "${FILESDIR}"/darkstat-initd darkstat
newconfd "${FILESDIR}"/darkstat-confd darkstat
sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die
sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
keepdir "${DARKSTAT_CHROOT_DIR}"
chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
}
pkg_preinst() {
enewuser darkstat
}
pkg_postinst() {
# Workaround bug #141619
DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
elog "To start different darkstat instances which will listen on a different"
elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
elog "darkstat script where 'if' is the name of the interface."
elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
elog "and edit it to change default values."
elog
elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
}
@@ -0,0 +1,11 @@
--- a/localip.c
+++ b/localip.c
@@ -58,7 +58,7 @@
} else {
/* Warn about changed address. */
if (!addr_equal(ips->addrs + *idx, a)) {
- static char before[INET6_ADDRSTRLEN];
+ static char before[INET6_ADDRSTRLEN + 1];
strncpy(before, addr_to_str(ips->addrs + *idx), INET6_ADDRSTRLEN);
verbosef("interface '%s' address %d/%d changed from %s to %s",
iface, *idx+1, ips->num_addrs, before, addr_to_str(a));