From 2fb0c650ae966e2c00a2cc8739fabb05cb13acff Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 11 Mar 2021 11:32:15 +0000 Subject: net-firewall/conntrack-tools: add systemd unit for conntrackd from Debian The linked bug requested a systemd unit for nfct, but I don't use it and can't see one in Debian or Arch Linux. Bug: https://bugs.gentoo.org/573566 Signed-off-by: Sam James --- .../conntrack-tools-1.4.6-r1.ebuild | 101 +++++++++++++++++++++ .../conntrack-tools/conntrack-tools-1.4.6.ebuild | 98 -------------------- .../conntrack-tools/files/conntrackd.service | 13 +++ 3 files changed, 114 insertions(+), 98 deletions(-) create mode 100644 net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild delete mode 100644 net-firewall/conntrack-tools/conntrack-tools-1.4.6.ebuild create mode 100644 net-firewall/conntrack-tools/files/conntrackd.service (limited to 'net-firewall/conntrack-tools') diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild new file mode 100644 index 000000000000..5c420d948769 --- /dev/null +++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info systemd + +DESCRIPTION="Connection tracking userspace tools" +HOMEPAGE="http://conntrack-tools.netfilter.org" +SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="doc +cthelper +cttimeout systemd" + +RDEPEND=" + >=net-libs/libmnl-1.0.3 + >=net-libs/libnetfilter_conntrack-1.0.8 + >=net-libs/libnetfilter_queue-1.0.2 + >=net-libs/libnfnetlink-1.0.1 + net-libs/libtirpc + cthelper? ( + >=net-libs/libnetfilter_cthelper-1.0.0 + ) + cttimeout? ( + >=net-libs/libnetfilter_cttimeout-1.0.0 + ) + systemd? ( + >=sys-apps/systemd-227 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) +" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is lt 2 6 18 ; then + die "${PN} requires at least 2.6.18 kernel version" + fi + + #netfilter core team has changed some option names with kernel 2.6.20 + if kernel_is lt 2 6 20 ; then + CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" + else + CONFIG_CHECK="~NF_CT_NETLINK" + fi + CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK + ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS" + + check_extra_config + + linux_config_exists || \ + linux_chkconfig_present "NF_CONNTRACK_IPV4" || \ + linux_chkconfig_present "NF_CONNTRACK_IPV6" || \ + ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \ + "are not set when one at least should be." +} + +src_prepare() { + # bug #474858 + sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die + + default +} + +src_configure() { + econf \ + $(use_enable cthelper) \ + $(use_enable cttimeout) \ + $(use_enable systemd) +} + +src_compile() { + default + use doc && emake -C doc/manual +} + +src_install() { + default + + newinitd "${FILESDIR}/conntrackd.initd-r3" conntrackd + newconfd "${FILESDIR}/conntrackd.confd-r2" conntrackd + + insinto /etc/conntrackd + doins doc/stats/conntrackd.conf + + systemd_dounit "${FILESDIR}/conntrackd.service" + + dodoc -r doc/sync doc/stats AUTHORS TODO + use doc && dodoc doc/manual/${PN}.html +} diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.6.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.6.ebuild deleted file mode 100644 index 2ac5faccf0f8..000000000000 --- a/net-firewall/conntrack-tools/conntrack-tools-1.4.6.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit linux-info - -DESCRIPTION="Connection tracking userspace tools" -HOMEPAGE="http://conntrack-tools.netfilter.org" -SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="doc +cthelper +cttimeout systemd" - -RDEPEND=" - >=net-libs/libmnl-1.0.3 - >=net-libs/libnetfilter_conntrack-1.0.8 - >=net-libs/libnetfilter_queue-1.0.2 - >=net-libs/libnfnetlink-1.0.1 - net-libs/libtirpc - cthelper? ( - >=net-libs/libnetfilter_cthelper-1.0.0 - ) - cttimeout? ( - >=net-libs/libnetfilter_cttimeout-1.0.0 - ) - systemd? ( - >=sys-apps/systemd-227 - ) -" -DEPEND=" - ${RDEPEND} - doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) - virtual/pkgconfig - sys-devel/bison - sys-devel/flex -" - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is lt 2 6 18 ; then - die "${PN} requires at least 2.6.18 kernel version" - fi - - #netfilter core team has changed some option names with kernel 2.6.20 - if kernel_is lt 2 6 20 ; then - CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" - else - CONFIG_CHECK="~NF_CT_NETLINK" - fi - CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK - ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS" - - check_extra_config - - linux_config_exists || \ - linux_chkconfig_present "NF_CONNTRACK_IPV4" || \ - linux_chkconfig_present "NF_CONNTRACK_IPV6" || \ - ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \ - "are not set when one at least should be." -} - -src_prepare() { - # bug #474858 - sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die - - default -} - -src_configure() { - econf \ - $(use_enable cthelper) \ - $(use_enable cttimeout) \ - $(use_enable systemd) -} - -src_compile() { - default - use doc && emake -C doc/manual -} - -src_install() { - default - - newinitd "${FILESDIR}/conntrackd.initd-r3" conntrackd - newconfd "${FILESDIR}/conntrackd.confd-r2" conntrackd - - insinto /etc/conntrackd - doins doc/stats/conntrackd.conf - - dodoc -r doc/sync doc/stats AUTHORS TODO - use doc && dodoc doc/manual/${PN}.html -} diff --git a/net-firewall/conntrack-tools/files/conntrackd.service b/net-firewall/conntrack-tools/files/conntrackd.service new file mode 100644 index 000000000000..26f950c0d9cc --- /dev/null +++ b/net-firewall/conntrack-tools/files/conntrackd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Conntrack Daemon +Documentation=man:conntrackd(8) man:conntrackd.conf(5) + +[Service] +Type=notify +ExecStart=/usr/sbin/conntrackd -C /etc/conntrackd/conntrackd.conf +Restart=on-failure +ProtectSystem=full +ProtectHome=true + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3-65-gdbad