[patch] 2.6.6-r1..2.6.7.patch

2.6.6-r1..2.6.7.patch (text/plain), 3.45 KB, created by Coacher on 2015-08-25 19:17:16 UTC

diff --git a/var/portage/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r9999.ebuild
index 7fcc35d..fda1e46 100644
--- a/var/portage/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r9999.ebuild
@@ -6,13 +6,15 @@ EAPI=5
 
 # Does work with python2_7, does not work with python3_3 on my machine
 # More feedback is welcome, since setup.py does not provide any info
+# See also https://github.com/mrash/fwknop/issues/167
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 DISTUTILS_SINGLE_IMPL=1
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
+DISABLE_AUTOFORMATTING=1
 
-inherit autotools-utils distutils-r1 systemd
+inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
 
 DESCRIPTION="Single Packet Authorization and Port Knocking application"
 HOMEPAGE="http://www.cipherdyne.org/fwknop/"
@@ -21,7 +23,7 @@ SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="client extras gdbm gpg python server udp-server"
+IUSE="client extras firewalld gdbm gpg iptables python server udp-server"
 
 RDEPEND="
 	client? ( net-misc/wget[ssl] )
@@ -34,18 +36,40 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	gdbm? ( sys-libs/gdbm )
 	gpg? ( app-crypt/gpgme )
-	server? (
-		!udp-server? ( net-libs/libpcap )
-		net-firewall/iptables
-	)
+	firewalld? ( net-firewall/firewalld )
+	iptables? ( net-firewall/iptables )
+	server? ( !udp-server? ( net-libs/libpcap ) )
 "
 
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
+	firewalld? ( server )
+	iptables? ( server )
+	server? ( ^^ ( firewalld iptables ) )
 	udp-server? ( server )
 "
 
 DOCS=( ChangeLog README.md )
+DOC_CONTENTS="
+Example configuration files were installed in /etc/fwknopd directory.
+Please edit them to fit 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_pretend() {
+	if use server; then
+		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
+			ewarn "fwknopd uses the iptables 'comment' match to expire SPA rules,"
+			ewarn "which is a major security feature and is enabled by default."
+			ewarn "Please either enable NETFILTER_XT_MATCH_COMMENT support in your"
+			ewarn "kernel, or set the appropriate ENABLE_{FIREWD,IPT}_COMMENT_OPTION"
+			ewarn "to 'N' in your fwknopd.conf file."
+		fi
+	fi
+}
 
 src_prepare() {
 	# Install example configs with .example suffix
@@ -71,6 +95,9 @@ src_configure() {
 		$(use_enable udp-server)
 		$(use_with gpg gpgme)
 	)
+	use firewalld && myeconfargs+=(--with-firewalld=/usr/sbin/firewalld)
+	use iptables && myeconfargs+=(--with-iptables=/sbin/iptables)
+
 	autotools-utils_src_configure
 }
 
@@ -90,8 +117,9 @@ src_install() {
 	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
+		systemd_dounit extras/systemd/fwknopd.service
+		systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
+		readme.gentoo_create_doc
 	fi
 
 	use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
@@ -103,3 +131,7 @@ src_install() {
 		distutils-r1_src_install
 	fi
 }
+
+pkg_postinst() {
+	use server && readme.gentoo_print_elog
+}