From 9d879855acc071405b2442bf5e221a39836221f1 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 8 Feb 2020 12:59:34 +0100 Subject: net-firewall/fwknop: Switch to python-single-r1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch to python-single-r1 since the dependency net-firewall/firewalld is single-r1. Signed-off-by: Michał Górny --- net-firewall/fwknop/fwknop-2.6.10-r1.ebuild | 136 ++++++++++++++++++++++++++++ net-firewall/fwknop/fwknop-2.6.10.ebuild | 130 -------------------------- net-firewall/fwknop/fwknop-2.6.9-r1.ebuild | 10 +- 3 files changed, 144 insertions(+), 132 deletions(-) create mode 100644 net-firewall/fwknop/fwknop-2.6.10-r1.ebuild delete mode 100644 net-firewall/fwknop/fwknop-2.6.10.ebuild (limited to 'net-firewall/fwknop') diff --git a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild new file mode 100644 index 000000000000..52c57d2312c0 --- /dev/null +++ b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Python extension supports only Python 2. +# See https://github.com/mrash/fwknop/issues/167 +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_OPTIONAL=1 + +inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd + +DESCRIPTION="Single Packet Authorization and Port Knocking application" +HOMEPAGE="https://www.cipherdyne.org/fwknop/" +SRC_URI="https://www.cipherdyne.org/fwknop/download/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server" + +DEPEND=" + client? ( net-misc/wget[ssl] ) + firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] ) + gdbm? ( sys-libs/gdbm ) + gpg? ( + app-crypt/gpgme + dev-libs/libassuan + dev-libs/libgpg-error + ) + iptables? ( net-firewall/iptables ) + nfqueue? ( net-libs/libnetfilter_queue ) + python? ( ${PYTHON_DEPS} ) + server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) ) +" +RDEPEND="${DEPEND}" + +REQUIRED_USE=" + nfqueue? ( server ) + python? ( ${PYTHON_REQUIRED_USE} ) + server? ( ^^ ( firewalld iptables ) ) + udp-server? ( server ) +" + +DOCS=( AUTHORS ChangeLog README ) + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=" +Example configuration files were installed to '${EPREFIX}/etc/fwknopd/'. +Please edit them to suit your needs and then remove the .example suffix. + +fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf. +You can set the desired backend via FIREWALL_EXE option in fwknopd.conf +instead of the default one chosen at compile time. +" + +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + default_src_prepare + + # Install example configs with .example suffix. + if use server; then + sed -i -e 's|conf;|conf.example;|g' Makefile.am || die + fi + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --localstatedir="${EPREFIX}/run" + $(use_enable client) + $(use_enable !gdbm file-cache) + $(use_enable nfqueue nfq-capture) + $(use_enable server) + $(use_enable udp-server) + $(use_with gpg gpgme) + ) + use firewalld && myeconfargs+=(--with-firewalld="${EPREFIX}/usr/sbin/firewalld") + use iptables && myeconfargs+=(--with-iptables="${EPREFIX}/sbin/iptables") + + econf "${myeconfargs[@]}" +} + +src_install() { + default_src_install + + if use extras; then + dodoc extras/apparmor/usr.sbin.fwknopd + dodoc extras/console-qr/console-qr.sh + dodoc extras/fwknop-launcher/* + fi + + if use server; then + newinitd "${FILESDIR}/fwknopd.init" fwknopd + newconfd "${FILESDIR}/fwknopd.confd" fwknopd + systemd_dounit "${FILESDIR}/fwknopd.service" + systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf + readme.gentoo_create_doc + fi + + if use python; then + # Redefine DOCS, otherwise distutils-r1 eclass interferes. + local DOCS=() + cd python || die + distutils-r1_src_install + fi + + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_postinst() { + if use server; then + readme.gentoo_print_elog + + if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then + echo + ewarn "fwknopd daemon relies on the 'comment' match in order to expire" + ewarn "created firewall rules, which is an important security feature." + ewarn "Please enable NETFILTER_XT_MATCH_COMMENT support in your kernel." + echo + fi + if use nfqueue && \ + ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE; then + echo + ewarn "fwknopd daemon relies on the 'NFQUEUE' target for NFQUEUE mode." + ewarn "Please enable NETFILTER_XT_TARGET_NFQUEUE support in your kernel." + echo + fi + fi +} diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild b/net-firewall/fwknop/fwknop-2.6.10.ebuild deleted file mode 100644 index 41a07f7c1a83..000000000000 --- a/net-firewall/fwknop/fwknop-2.6.10.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Python extension supports only Python 2. -# See https://github.com/mrash/fwknop/issues/167 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_OPTIONAL=1 - -inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd - -DESCRIPTION="Single Packet Authorization and Port Knocking application" -HOMEPAGE="https://www.cipherdyne.org/fwknop/" -SRC_URI="https://www.cipherdyne.org/fwknop/download/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server" - -DEPEND=" - client? ( net-misc/wget[ssl] ) - firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] ) - gdbm? ( sys-libs/gdbm ) - gpg? ( - app-crypt/gpgme - dev-libs/libassuan - dev-libs/libgpg-error - ) - iptables? ( net-firewall/iptables ) - nfqueue? ( net-libs/libnetfilter_queue ) - python? ( ${PYTHON_DEPS} ) - server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) ) -" -RDEPEND="${DEPEND}" - -REQUIRED_USE=" - nfqueue? ( server ) - python? ( ${PYTHON_REQUIRED_USE} ) - server? ( ^^ ( firewalld iptables ) ) - udp-server? ( server ) -" - -DOCS=( AUTHORS ChangeLog README ) - -DISABLE_AUTOFORMATTING=1 -DOC_CONTENTS=" -Example configuration files were installed to '${EPREFIX}/etc/fwknopd/'. -Please edit them to suit your needs and then remove the .example suffix. - -fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf. -You can set the desired backend via FIREWALL_EXE option in fwknopd.conf -instead of the default one chosen at compile time. -" - -src_prepare() { - default_src_prepare - - # Install example configs with .example suffix. - if use server; then - sed -i -e 's|conf;|conf.example;|g' Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}/run" - $(use_enable client) - $(use_enable !gdbm file-cache) - $(use_enable nfqueue nfq-capture) - $(use_enable server) - $(use_enable udp-server) - $(use_with gpg gpgme) - ) - use firewalld && myeconfargs+=(--with-firewalld="${EPREFIX}/usr/sbin/firewalld") - use iptables && myeconfargs+=(--with-iptables="${EPREFIX}/sbin/iptables") - - econf "${myeconfargs[@]}" -} - -src_install() { - default_src_install - - if use extras; then - dodoc extras/apparmor/usr.sbin.fwknopd - dodoc extras/console-qr/console-qr.sh - dodoc extras/fwknop-launcher/* - fi - - if use server; then - newinitd "${FILESDIR}/fwknopd.init" fwknopd - newconfd "${FILESDIR}/fwknopd.confd" fwknopd - systemd_dounit "${FILESDIR}/fwknopd.service" - systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf - readme.gentoo_create_doc - fi - - if use python; then - # Redefine DOCS, otherwise distutils-r1 eclass interferes. - local DOCS=() - cd python || die - distutils-r1_src_install - fi - - find "${ED}" -type f -name "*.la" -delete || die -} - -pkg_postinst() { - if use server; then - readme.gentoo_print_elog - - if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then - echo - ewarn "fwknopd daemon relies on the 'comment' match in order to expire" - ewarn "created firewall rules, which is an important security feature." - ewarn "Please enable NETFILTER_XT_MATCH_COMMENT support in your kernel." - echo - fi - if use nfqueue && \ - ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE; then - echo - ewarn "fwknopd daemon relies on the 'NFQUEUE' target for NFQUEUE mode." - ewarn "Please enable NETFILTER_XT_TARGET_NFQUEUE support in your kernel." - echo - fi - fi -} diff --git a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild index 5c86df5bfb0c..03699570bd46 100644 --- a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,6 +7,7 @@ EAPI=6 # See https://github.com/mrash/fwknop/issues/167 PYTHON_COMPAT=( python2_7 ) DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd @@ -21,7 +22,7 @@ IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-ser DEPEND=" client? ( net-misc/wget[ssl] ) - firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] ) + firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme @@ -54,6 +55,11 @@ You can set the desired backend via FIREWALL_EXE option in fwknopd.conf instead of the default one chosen at compile time. " +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + src_prepare() { default_src_prepare -- cgit v1.2.3-65-gdbad