Merge updates from master

This commit is contained in:
Repository QA checks
2015-09-21 04:01:58 -04:00
5 changed files with 69 additions and 153 deletions
+41
View File
@@ -0,0 +1,41 @@
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
extra_started_commands="reload reopen"
: ${ULOGD_BINARY:=/usr/sbin/ulogd}
: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
depend() {
before iptables ip6tables ebtables nftables firewall
after mysql postgresql
}
start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start \
--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
-- ${ULOGD_OPTS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
eend $?
}
reload() {
ebegin "Reloading ${SVCNAME} configuration"
start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
eend $?
}
reopen() {
ebegin "Reopening ${SVCNAME} logfiles"
start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
eend $?
}
+13
View File
@@ -0,0 +1,13 @@
[Unit]
Description=A userspace logging daemon for netfilter/iptables related logging
Before=iptables.service ip6tables.service ebtables.service nftables.service
After=mysql.service postgresql.service
[Service]
Type=forking
PIDFile=/run/ulogd.pid
ExecStart=/usr/sbin/ulogd --daemon --uid ulogd --pidfile /run/ulogd.pid
ExecReload=/bin/kill -USR1 $MAINPID
[Install]
WantedBy=network.target
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
RDEPEND="
net-firewall/iptables
|| ( net-firewall/iptables net-firewall/nftables )
>=net-libs/libnfnetlink-1.0.1
dbi? ( dev-db/libdbi )
json? ( dev-libs/jansson )
@@ -33,20 +33,23 @@ RDEPEND="
mysql? ( virtual/mysql )
pcap? ( net-libs/libpcap )
postgres? ( dev-db/postgresql:= )
sqlite? ( dev-db/sqlite:3 )"
sqlite? ( dev-db/sqlite:3 )
"
DEPEND="${RDEPEND}
doc? (
app-text/linuxdoc-tools
app-text/texlive-core
virtual/latex-base
)"
)
"
PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
DOCS=( AUTHORS README TODO )
DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
Please edit example configuration located at /etc/ulogd.conf"
DOC_CONTENTS="
You must have at least one logging stack enabled to make ulogd work.
Please edit example configuration located at /etc/ulogd.conf
"
pkg_setup() {
enewgroup ulogd
@@ -55,12 +58,12 @@ pkg_setup() {
linux-info_pkg_setup
if kernel_is lt 2 6 14; then
die "ulogd2 requires kernel newer than 2.6.14"
die "ulogd requires kernel newer than 2.6.14"
fi
if kernel_is lt 2 6 18; then
ewarn "You are using kernel older than 2.6.18"
ewarn "Some ulogd2 features may be unavailable"
ewarn "Some ulogd features may be unavailable"
fi
if use nfacct && kernel_is lt 3 3 0; then
@@ -105,7 +108,7 @@ src_compile() {
autotools-utils_src_compile
if use doc; then
# prevent access violations from generation of bitmap font files
# Prevent access violations from bitmap font files generation
export VARTEXFONTS="${T}"/fonts
emake -C doc
fi
@@ -131,8 +134,8 @@ src_install() {
fowners root:ulogd /etc/ulogd.conf
fperms 640 /etc/ulogd.conf
newinitd "${FILESDIR}/${PN}.init" ${PN}
systemd_dounit "${FILESDIR}/${PN}.service"
newinitd "${FILESDIR}/${PN}.init-r1" ${PN}
systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" ${PN}
-141
View File
@@ -1,141 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
inherit autotools-utils eutils linux-info readme.gentoo systemd user
DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
RDEPEND="
net-firewall/iptables
>=net-libs/libnfnetlink-1.0.1
dbi? ( dev-db/libdbi )
json? ( dev-libs/jansson )
nfacct? (
>=net-libs/libmnl-1.0.3
>=net-libs/libnetfilter_acct-1.0.1
)
nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
mysql? ( virtual/mysql )
pcap? ( net-libs/libpcap )
postgres? ( dev-db/postgresql:= )
sqlite? ( dev-db/sqlite:3 )"
DEPEND="${RDEPEND}
doc? (
app-text/linuxdoc-tools
app-text/texlive-core
virtual/latex-base
)"
PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
DOCS=( AUTHORS README TODO )
DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
Please edit example configuration located at /etc/ulogd.conf"
pkg_setup() {
enewgroup ulogd
enewuser ulogd -1 -1 /var/log/ulogd ulogd
linux-info_pkg_setup
if kernel_is lt 2 6 14; then
die "ulogd2 requires kernel newer than 2.6.14"
fi
if kernel_is lt 2 6 18; then
ewarn "You are using kernel older than 2.6.18"
ewarn "Some ulogd2 features may be unavailable"
fi
if use nfacct && kernel_is lt 3 3 0; then
ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
fi
if use ulog && kernel_is gt 3 17 0; then
ewarn "ULOG target was removed since 3.17.0 kernel release"
ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
fi
}
src_prepare() {
# - make all logs to be kept in a single dir /var/log/ulogd
# - place sockets in /run instead of /tmp
sed -i \
-e 's:var/log:var/log/ulogd:g' \
-e 's:tmp:run:g' \
ulogd.conf.in || die 'sed on ulogd.conf.in failed'
autotools-utils_src_prepare
}
src_configure() {
local myeconfargs=(
$(use_with dbi)
$(use_with json jansson)
$(use_enable nfacct)
$(use_enable nfct)
$(use_enable nflog)
$(use_with mysql)
$(use_with pcap)
$(use_with postgres pgsql)
$(use_with sqlite)
$(use_enable ulog)
)
autotools-utils_src_configure
}
src_compile() {
autotools-utils_src_compile
if use doc; then
# prevent access violations from generation of bitmap font files
export VARTEXFONTS="${T}"/fonts
emake -C doc
fi
}
src_install() {
autotools-utils_src_install
readme.gentoo_create_doc
prune_libtool_files --modules
if use doc; then
dohtml doc/${PN}.html
dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
fi
use sqlite && dodoc doc/sqlite3.table
use mysql && dodoc doc/mysql-*.sql
use postgres && dodoc doc/pgsql-*.sql
doman ${PN}.8
insinto /etc
doins ${PN}.conf
fowners root:ulogd /etc/ulogd.conf
fperms 640 /etc/ulogd.conf
newinitd "${FILESDIR}/${PN}.init" ${PN}
systemd_dounit "${FILESDIR}/${PN}.service"
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" ${PN}
diropts -o ulogd -g ulogd
keepdir /var/log/ulogd
}
+1 -1
View File
@@ -265,7 +265,7 @@ texlive-module_src_compile() {
# later
for i in "${S}"/tlpkg/tlpobj/*;
do
grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' |sort|uniq >> "${T}/jobs"
grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' >> "${T}/jobs"
done
for i in $(<"${T}/jobs");