gentoo resync : 10.11.2019

3 files changed, 141 insertions, 2 deletions

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 3f79edcce261..e6f0abbc8143 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -2,6 +2,8 @@ AUX fwknopd.confd 475 BLAKE2B 46c87fd251ab4bf57a35a6604e01a5a0ac80bdaca0c00f0fc8
 AUX fwknopd.init 2706 BLAKE2B 561cc62b1e557d425648947c25751dfb2fe323b04cb96ea1d05e395cbe1cd61466e11689f93d02569545057e43fedfa405558106bf687c2b16cd9c7bde9928a1 SHA512 6e58cb40bd2c69b624fa5bb320f79e6befd91bc39e4aa66ec0b2a2a014b9342377ea919b364cf52cfda76b924d5d497a79b0d66f2e0c7339894b75bfa9e165fa
 AUX fwknopd.service 235 BLAKE2B c46c01121a745ee46a5415654c0ba422531008ed52915833712f748026eda3afd8019d6ec6bb86434b40ad273a4cc46115d3a64a73b621731ec68f3bad92dc41 SHA512 890bbba586183275cbd3b420a9c0d609ff3eca0fd239b4af97e2730e2790f317fc114f51d60107ba4fbddd2cabb60c70d8b615e2a75bb80cf27d352c894a1c6d
 AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19dd65ad67e114d692731cb532162ac877f0239879ebfcf0432d61053adcddd2c234d85ed60bf33720b22dcc SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae
+DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
 DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3 SHA512 4706560d44c911c8604059d88dded9c1b8c333399d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
+EBUILD fwknop-2.6.10.ebuild 3547 BLAKE2B 6e8fe513e25749fad0dde47ea4e28cdfb0c2f878684dc2b8c8adf74d88678afd4316ad63c60770044e33e584cc2a9844204ce4e2d1af5a3865959ae79caab06f SHA512 18ec5b1ce8632f81b3bbf13d08d2275120b9e364d2d764446393840b5ba7003842a2f3df74cc35d48b4a90167d2c7f56a3878af53e52cd0a704465fc180d6c7c
 EBUILD fwknop-2.6.9-r1.ebuild 3691 BLAKE2B babb21cf1329d59180d03fca97865bdee9d50cb3e10ab3e837784078ebbd4110791c7832f9db32ed9126518cae0c5d74a9bac13d0f0409ddce36aaa8e9bed62f SHA512 ee6a6065e916cf745dfa9e8903166ab0de571138720134568349767f9f63ea0b00d5991a2b29206279f17d0e2968fb573195d3191c89bd0d1b2ca34c21a18473
-MISC metadata.xml 1018 BLAKE2B c8ebfede556ff455c9ecb0548ce0d7668be39bedaca89449bc28565bdf11a78119e7797861ede4cfe1fab2302d534aea6a4bf0cce49cc213b1052d7d737575d5 SHA512 c0f5cf642da2b03bcb7c1a0563fadf90300e2d79f9b2f48ffafe58c64f66f8438a6c6c8c224203d4eb24c146a26883577800002d7fb9c5bd822b4055e0bb9219
+MISC metadata.xml 1217 BLAKE2B 2b44d1d81f7d4bc625c3130cf29328fce6d85fbeedfb5376146dad93b020f03440f620e68187fa1ffd496fdff0cedaa6f02d015578ec0620070ea97029b9eec8 SHA512 b215b1ad55f6ba7e9f4ac316916241ec2084bcd2e3e5ca6a7d81c935df6affdbc36066914b1bb4d984333e005a57f54c6c8f07013a4e14e465f9dd6dbc6c93d2
diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild b/net-firewall/fwknop/fwknop-2.6.10.ebuild
new file mode 100644
index 000000000000..41a07f7c1a83
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.10.ebuild
@@ -0,0 +1,130 @@
+# 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/metadata.xml b/net-firewall/fwknop/metadata.xml
index 096122a1ea1e..abed2bc853d1 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="client">Build fwknop client</flag>
 		<flag name="extras">Install utility scripts and AppArmor policy for fwknopd</flag>